jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 00:54:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge with master

Browse source
This commit is contained in:
Fabio Bas 2015-08-31 22:55:46 +02:00
parent 5cfb034452
commit 6d7baec37b
9 changed files with 87 additions and 416 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/dlg_settings.cpp
View file

@ -802,7 +802,7 @@ void DlgSettings::createIcons()
shortcutsButton = new QListWidgetItem(contentsWidget);
shortcutsButton->setTextAlignment(Qt::AlignHCenter);
shortcutsButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
shortcutsButton->setIcon(QIcon(":/resources/icon_config_shorcuts.svg"));
shortcutsButton->setIcon(QIcon("theme:config/shorcuts.svg"));
connect(contentsWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(changePage(QListWidgetItem *, QListWidgetItem *)));
}