From a6fb7a7f866312eb999724d3bba82d219de3b56e Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Tue, 25 Dec 2012 11:34:16 +0000 Subject: [PATCH] UI Nits: QMactyle QToolButtons are ugly I really hate the way QMacStyle changes the style of a button based upon its size. Its really annoying, especially since you cannot override it. Updated last couple of commits to have no effect on Mac where they make some of the buttons in the preferences pane look ugly. --- src/Pages.cpp | 50 ++++++++++++++++++++++++++++++++++++-------------- src/Pages.h | 31 ++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 15 deletions(-) diff --git a/src/Pages.cpp b/src/Pages.cpp index deab8a6ec..af1c21bc7 100644 --- a/src/Pages.cpp +++ b/src/Pages.cpp @@ -1208,6 +1208,7 @@ IntervalMetricsPage::IntervalMetricsPage(QWidget *parent) : QVBoxLayout *selectedLayout = new QVBoxLayout; selectedLayout->addWidget(new QLabel(tr("Selected Metrics"))); selectedLayout->addWidget(selectedList); +#ifndef Q_OS_MAC upButton = new QToolButton(this); downButton = new QToolButton(this); leftButton = new QToolButton(this); @@ -1216,11 +1217,15 @@ IntervalMetricsPage::IntervalMetricsPage(QWidget *parent) : downButton->setArrowType(Qt::DownArrow); leftButton->setArrowType(Qt::LeftArrow); rightButton->setArrowType(Qt::RightArrow); -#ifndef Q_OS_MAC upButton->setFixedSize(20,20); downButton->setFixedSize(20,20); leftButton->setFixedSize(20,20); rightButton->setFixedSize(20,20); +#else + upButton = new QPushButton(tr("Up")); + downButton = new QPushButton(tr("Down")); + leftButton = new QPushButton("<"); + rightButton = new QPushButton(">"); #endif QVBoxLayout *buttonGrid = new QVBoxLayout; QHBoxLayout *upLayout = new QHBoxLayout; @@ -1396,6 +1401,7 @@ SummaryMetricsPage::SummaryMetricsPage(QWidget *parent) : QVBoxLayout *selectedLayout = new QVBoxLayout; selectedLayout->addWidget(new QLabel(tr("Selected Metrics"))); selectedLayout->addWidget(selectedList); +#ifndef Q_OS_MAC upButton = new QToolButton(this); downButton = new QToolButton(this); leftButton = new QToolButton(this); @@ -1404,11 +1410,15 @@ SummaryMetricsPage::SummaryMetricsPage(QWidget *parent) : downButton->setArrowType(Qt::DownArrow); leftButton->setArrowType(Qt::LeftArrow); rightButton->setArrowType(Qt::RightArrow); -#ifndef Q_OS_MAC upButton->setFixedSize(20,20); downButton->setFixedSize(20,20); leftButton->setFixedSize(20,20); rightButton->setFixedSize(20,20); +#else + upButton = new QPushButton(tr("Up")); + downButton = new QPushButton(tr("Down")); + leftButton = new QPushButton("<"); + rightButton = new QPushButton(">"); #endif QVBoxLayout *buttonGrid = new QVBoxLayout; QHBoxLayout *upLayout = new QHBoxLayout; @@ -1635,17 +1645,20 @@ KeywordsPage::KeywordsPage(MetadataPage *parent, QListkeyword field->addStretch(); mainLayout->addLayout(field); + addButton = new QPushButton(tr("+")); + deleteButton = new QPushButton(tr("-")); +#ifndef Q_OS_MAC upButton = new QToolButton(this); downButton = new QToolButton(this); upButton->setArrowType(Qt::UpArrow); downButton->setArrowType(Qt::DownArrow); - addButton = new QPushButton(tr("+")); - deleteButton = new QPushButton(tr("-")); -#ifndef Q_OS_MAC upButton->setFixedSize(20,20); downButton->setFixedSize(20,20); addButton->setFixedSize(20,20); deleteButton->setFixedSize(20,20); +#else + upButton = new QPushButton(tr("Up")); + downButton = new QPushButton(tr("Down")); #endif QHBoxLayout *actionButtons = new QHBoxLayout; @@ -1842,17 +1855,20 @@ FieldsPage::FieldsPage(QWidget *parent, QListfieldDefinitions) { QGridLayout *mainLayout = new QGridLayout(this); + addButton = new QPushButton(tr("+")); + deleteButton = new QPushButton(tr("-")); +#ifndef Q_OS_MAC upButton = new QToolButton(this); downButton = new QToolButton(this); upButton->setArrowType(Qt::UpArrow); downButton->setArrowType(Qt::DownArrow); - addButton = new QPushButton(tr("+")); - deleteButton = new QPushButton(tr("-")); -#ifndef Q_OS_MAC upButton->setFixedSize(20,20); downButton->setFixedSize(20,20); addButton->setFixedSize(20,20); deleteButton->setFixedSize(20,20); +#else + upButton = new QPushButton(tr("Up")); + downButton = new QPushButton(tr("Down")); #endif QHBoxLayout *actionButtons = new QHBoxLayout; actionButtons->setSpacing(2); @@ -3271,17 +3287,20 @@ MeasuresPage::MeasuresPage(MainWindow *main) : main(main) { QGridLayout *mainLayout = new QGridLayout(this); + addButton = new QPushButton(tr("+")); + deleteButton = new QPushButton(tr("-")); +#ifndef Q_OS_MAC upButton = new QToolButton(this); downButton = new QToolButton(this); upButton->setArrowType(Qt::UpArrow); downButton->setArrowType(Qt::DownArrow); - addButton = new QPushButton(tr("+")); - deleteButton = new QPushButton(tr("-")); -#ifndef Q_OS_MAC upButton->setFixedSize(20,20); downButton->setFixedSize(20,20); addButton->setFixedSize(20,20); deleteButton->setFixedSize(20,20); +#else + upButton = new QPushButton(tr("Up")); + downButton = new QPushButton(tr("Down")); #endif QHBoxLayout *actionButtons = new QHBoxLayout; @@ -3555,17 +3574,20 @@ SeasonsPage::SeasonsPage(QWidget *parent, MainWindow *mainWindow) : QWidget(pare editLayout->addRow(new QLabel("From"), fromEdit); editLayout->addRow(new QLabel("To"), toEdit); + addButton = new QPushButton(tr("+")); + deleteButton = new QPushButton(tr("-")); +#ifndef Q_OS_MAC upButton = new QToolButton(this); downButton = new QToolButton(this); upButton->setArrowType(Qt::UpArrow); downButton->setArrowType(Qt::DownArrow); - addButton = new QPushButton(tr("+")); - deleteButton = new QPushButton(tr("-")); -#ifndef Q_OS_MAC upButton->setFixedSize(20,20); downButton->setFixedSize(20,20); addButton->setFixedSize(20,20); deleteButton->setFixedSize(20,20); +#else + upButton = new QPushButton(tr("Up")); + downButton = new QPushButton(tr("Down")); #endif QVBoxLayout *actionButtons = new QVBoxLayout; diff --git a/src/Pages.h b/src/Pages.h index 2d9589bf6..f51953eb9 100644 --- a/src/Pages.h +++ b/src/Pages.h @@ -265,10 +265,17 @@ class IntervalMetricsPage : public QWidget bool changed; QListWidget *availList; QListWidget *selectedList; +#ifndef Q_OS_MAC QToolButton *upButton; QToolButton *downButton; QToolButton *leftButton; QToolButton *rightButton; +#else + QPushButton *upButton; + QPushButton *downButton; + QPushButton *leftButton; + QPushButton *rightButton; +#endif }; class SummaryMetricsPage : public QWidget @@ -294,10 +301,17 @@ class SummaryMetricsPage : public QWidget bool changed; QListWidget *availList; QListWidget *selectedList; +#ifndef Q_OS_MAC QToolButton *upButton; QToolButton *downButton; QToolButton *leftButton; QToolButton *rightButton; +#else + QPushButton *upButton; + QPushButton *downButton; + QPushButton *leftButton; + QPushButton *rightButton; +#endif }; @@ -325,7 +339,11 @@ class KeywordsPage : public QWidget QTreeWidget *keywords; +#ifndef Q_OS_MAC QToolButton *upButton, *downButton; +#else + QPushButton *upButton, *downButton; +#endif QPushButton *addButton, *renameButton, *deleteButton; QLabel *fieldLabel; QComboBox *fieldChooser; @@ -395,7 +413,11 @@ class FieldsPage : public QWidget QTreeWidget *fields; +#ifndef Q_OS_MAC QToolButton *upButton, *downButton; +#else + QPushButton *upButton, *downButton; +#endif QPushButton *addButton, *renameButton, *deleteButton; }; @@ -654,8 +676,11 @@ class SeasonsPage : public QWidget QLineEdit *nameEdit; QComboBox *typeEdit; QDateEdit *fromEdit, *toEdit; - +#ifndef Q_OS_MAC QToolButton *upButton, *downButton; +#else + QPushButton *upButton, *downButton; +#endif QPushButton *addButton, *renameButton, *deleteButton; QList array; @@ -683,7 +708,11 @@ class MeasuresPage : public QWidget MainWindow *main; QTreeWidget *fields; +#ifndef Q_OS_MAC QToolButton *upButton, *downButton; +#else + QPushButton *upButton, *downButton; +#endif QPushButton *addButton, *renameButton, *deleteButton; };