From 1ab2ba3f6f4d9807f26b3fe1e111bf5d3463117d Mon Sep 17 00:00:00 2001 From: Matt Lowe Date: Thu, 23 Apr 2015 18:42:49 +0200 Subject: [PATCH 1/3] Updated + / - buttons + moved to the left to make it easier to move from buttons to macros + changed buttons to + / - + made buttons a bit bigger --- cockatrice/src/dlg_settings.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp index 5163ffa2..dc69870f 100644 --- a/cockatrice/src/dlg_settings.cpp +++ b/cockatrice/src/dlg_settings.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include "carddatabase.h" #include "dlg_settings.h" #include "main.h" @@ -640,8 +641,8 @@ MessagesSettingsPage::MessagesSettingsPage() messageToolBar->addAction(aRemove); QHBoxLayout *messageListLayout = new QHBoxLayout; - messageListLayout->addWidget(messageList); messageListLayout->addWidget(messageToolBar); + messageListLayout->addWidget(messageList); messageShortcuts = new QGroupBox; messageShortcuts->setLayout(messageListLayout); @@ -704,8 +705,10 @@ void MessagesSettingsPage::actRemove() void MessagesSettingsPage::retranslateUi() { - aAdd->setText(tr("&Add")); - aRemove->setText(tr("&Remove")); + aAdd->setText(tr("+")); + aAdd->setFont(QFont("Times", 20)); + aRemove->setText(tr("-")); + aRemove->setFont(QFont("Times", 20)); chatGroupBox->setTitle(tr("Chat settings")); chatMentionCheckBox.setText(tr("Enable chat mentions")); messageShortcuts->setTitle(tr("In-game message macros")); From 637bd767bbb43d9774d573d9c6c6c45cdcc56031 Mon Sep 17 00:00:00 2001 From: Matt Lowe Date: Thu, 23 Apr 2015 22:43:24 +0200 Subject: [PATCH 2/3] Updated to use svgs --- cockatrice/src/dlg_settings.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp index dc69870f..0aeab319 100644 --- a/cockatrice/src/dlg_settings.cpp +++ b/cockatrice/src/dlg_settings.cpp @@ -631,8 +631,10 @@ MessagesSettingsPage::MessagesSettingsPage() messageList->addItem(settings.value(QString("msg%1").arg(i)).toString()); aAdd = new QAction(this); + aAdd->setIcon(QIcon(":/resources/increment.svg")); connect(aAdd, SIGNAL(triggered()), this, SLOT(actAdd())); aRemove = new QAction(this); + aRemove->setIcon(QIcon(":/resources/decrement.svg")); connect(aRemove, SIGNAL(triggered()), this, SLOT(actRemove())); QToolBar *messageToolBar = new QToolBar; @@ -705,10 +707,6 @@ void MessagesSettingsPage::actRemove() void MessagesSettingsPage::retranslateUi() { - aAdd->setText(tr("+")); - aAdd->setFont(QFont("Times", 20)); - aRemove->setText(tr("-")); - aRemove->setFont(QFont("Times", 20)); chatGroupBox->setTitle(tr("Chat settings")); chatMentionCheckBox.setText(tr("Enable chat mentions")); messageShortcuts->setTitle(tr("In-game message macros")); From 74f140ade899d678daf5e62a618c68903a536267 Mon Sep 17 00:00:00 2001 From: Matt Lowe Date: Thu, 23 Apr 2015 23:06:21 +0200 Subject: [PATCH 3/3] removed qfont import --- cockatrice/src/dlg_settings.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp index 0aeab319..00fe9b6a 100644 --- a/cockatrice/src/dlg_settings.cpp +++ b/cockatrice/src/dlg_settings.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include "carddatabase.h" #include "dlg_settings.h" #include "main.h"