Merge pull request #1016 from poixen/add_remove_buttons

Updated + / - buttons
This commit is contained in:
Zach 2015-04-23 17:48:13 -04:00
commit a16f8e02e3

View file

@ -630,8 +630,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;
@ -640,8 +642,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 +706,6 @@ void MessagesSettingsPage::actRemove()
void MessagesSettingsPage::retranslateUi()
{
aAdd->setText(tr("&Add"));
aRemove->setText(tr("&Remove"));
chatGroupBox->setTitle(tr("Chat settings"));
chatMentionCheckBox.setText(tr("Enable chat mentions"));
messageShortcuts->setTitle(tr("In-game message macros"));