tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configuration GUI: adjust add/remove buttons margins on Mac OS

Browse Source
This commit is contained in:
Jean-Francois Dockes 2021-10-05 08:02:52 -07:00
parent 7c93f3a057
commit 02fe696406
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/qtgui/confgui/confgui.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2005-2016 J.F.Dockes /* Copyright (C) 2005-2021 J.F.Dockes
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by * it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or * the Free Software Foundation; either version 2.1 of the License, or
@ -57,19 +57,27 @@ using namespace std;
namespace confgui { namespace confgui {
// Main layout spacing
static const int spacing = 3; static const int spacing = 3;
// left,top,right, bottom // left,top,right, bottom
static QMargins margin(4,3,4,3); static QMargins margin(4,3,4,3);
ConfTabsW::ConfTabsW(QWidget *parent, const QString& title, // Margin around text to explicitely set pushbutton sizes lower than
ConfLinkFact *fact) // the default min (80?). Different on Mac OS for some reason
#ifdef __APPLE__
static const int pbTextMargin = 30;
#else
static const int pbTextMargin = 15;
#endif
ConfTabsW::ConfTabsW(QWidget *parent, const QString& title, ConfLinkFact *fact)
: QDialog(parent), m_makelink(fact) : QDialog(parent), m_makelink(fact)
{ {
setWindowTitle(title); setWindowTitle(title);
tabWidget = new QTabWidget; tabWidget = new QTabWidget;
buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
| QDialogButtonBox::Cancel);
QVBoxLayout *mainLayout = new QVBoxLayout; QVBoxLayout *mainLayout = new QVBoxLayout;
mainLayout->setSpacing(spacing); mainLayout->setSpacing(spacing);
@ -226,6 +234,7 @@ ConfParamW *ConfTabsW::findParamW(const QString& varname)
} }
return nullptr; return nullptr;
} }
void ConfTabsW::endOfList(int tabindex) void ConfTabsW::endOfList(int tabindex)
{ {
ConfPanelW *panel = dynamic_cast<ConfPanelW*>(tabWidget->widget(tabindex)); ConfPanelW *panel = dynamic_cast<ConfPanelW*>(tabWidget->widget(tabindex));
@ -612,7 +621,7 @@ ConfParamFNW::ConfParamFNW(
QString text = tr("Choose"); QString text = tr("Choose");
m_pb->setText(text); m_pb->setText(text);
int width = m_pb->fontMetrics().boundingRect(text).width() + 15; int width = m_pb->fontMetrics().boundingRect(text).width() + pbTextMargin;
m_pb->setMaximumWidth(width); m_pb->setMaximumWidth(width);
setSzPol(m_pb, QSizePolicy::Minimum, QSizePolicy::Fixed, 0, 0); setSzPol(m_pb, QSizePolicy::Minimum, QSizePolicy::Fixed, 0, 0);
m_hl->addWidget(m_pb); m_hl->addWidget(m_pb);
@ -688,7 +697,7 @@ ConfParamSLW::ConfParamSLW(
QString text = tr("+"); QString text = tr("+");
pbA->setText(text); pbA->setText(text);
pbA->setToolTip(tr("Add entry")); pbA->setToolTip(tr("Add entry"));
int width = pbA->fontMetrics().boundingRect(text).width() + 15; int width = pbA->fontMetrics().boundingRect(text).width() + pbTextMargin;
pbA->setMaximumWidth(width); pbA->setMaximumWidth(width);
setSzPol(pbA, QSizePolicy::Minimum, QSizePolicy::Fixed, 0, 0); setSzPol(pbA, QSizePolicy::Minimum, QSizePolicy::Fixed, 0, 0);
hl1->addWidget(pbA); hl1->addWidget(pbA);
@ -698,7 +707,7 @@ ConfParamSLW::ConfParamSLW(
text = tr("-"); text = tr("-");
pbD->setText(text); pbD->setText(text);
pbD->setToolTip(tr("Delete selected entries")); pbD->setToolTip(tr("Delete selected entries"));
width = pbD->fontMetrics().boundingRect(text).width() + 15; width = pbD->fontMetrics().boundingRect(text).width() + pbTextMargin;
pbD->setMaximumWidth(width); pbD->setMaximumWidth(width);
setSzPol(pbD, QSizePolicy::Minimum, QSizePolicy::Fixed, 0, 0); setSzPol(pbD, QSizePolicy::Minimum, QSizePolicy::Fixed, 0, 0);
hl1->addWidget(pbD); hl1->addWidget(pbD);
@ -708,7 +717,7 @@ ConfParamSLW::ConfParamSLW(
text = tr("~"); text = tr("~");
m_pbE->setText(text); m_pbE->setText(text);
m_pbE->setToolTip(tr("Edit selected entries")); m_pbE->setToolTip(tr("Edit selected entries"));
width = m_pbE->fontMetrics().boundingRect(text).width() + 15; width = m_pbE->fontMetrics().boundingRect(text).width() + pbTextMargin;
m_pbE->setMaximumWidth(width); m_pbE->setMaximumWidth(width);
setSzPol(m_pbE, QSizePolicy::Minimum, QSizePolicy::Fixed, 0, 0); setSzPol(m_pbE, QSizePolicy::Minimum, QSizePolicy::Fixed, 0, 0);
hl1->addWidget(m_pbE); hl1->addWidget(m_pbE);