gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-17 23:35:50 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Refactor-settings

Browse Source 
Conflicts:
	oracle/CMakeLists.txt
This commit is contained in:
marco
2015-09-01 21:28:53 +02:00
parent 0b94b47f72 0a9057d1b8
commit baa61d0571
330 changed files with 37514 additions and 13448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cockatrice/src/tab_deck_editor.cpp
View File

@@ -53,21 +53,21 @@ void SearchLineEdit::keyPressEvent(QKeyEvent *event)
void TabDeckEditor::createShowHideDocksButtons()
{
btnFilter = new QPushButton(QIcon("://resources/icon_view.svg"),QString());
btnFilter = new QPushButton(QIcon("theme:icons/view.svg"),QString());
btnFilter->setObjectName("btnFilter");
btnFilter->setCheckable(true);
btnFilter->setChecked(true);
btnFilter->setMaximumWidth(30);
searchLayout->addWidget(btnFilter);
btnDeck = new QPushButton(QIcon("://resources/hand.svg"),QString());
btnDeck = new QPushButton(QIcon("theme:hand.svg"),QString());
btnDeck->setObjectName("btnDeck");
btnDeck->setCheckable(true);
btnDeck->setChecked(true);
btnDeck->setMaximumWidth(30);
searchLayout->addWidget(btnDeck);
btnCard = new QPushButton(QIcon("://back.svg"),QString());
btnCard = new QPushButton(QIcon("theme:back.svg"),QString());
btnCard->setObjectName("btnCard");
btnCard->setCheckable(true);
btnCard->setChecked(true);
@@ -134,7 +134,7 @@ void TabDeckEditor::createDeckDock()
/* Update price
aUpdatePrices = new QAction(QString(), this);
aUpdatePrices->setIcon(QIcon(":/resources/icon_update.png"));
aUpdatePrices->setIcon(QIcon("theme:icons/update.png"));
connect(aUpdatePrices, SIGNAL(triggered()), this, SLOT(actUpdatePrices()));
if (!settingsCache->getPriceTagFeature())
aUpdatePrices->setVisible(false);
@@ -316,11 +316,11 @@ void TabDeckEditor::createMenus()
addTabMenu(deckMenu);
aClearFilterAll = new QAction(QString(), this);
aClearFilterAll->setIcon(QIcon(":/resources/icon_clearsearch.svg"));
aClearFilterAll->setIcon(QIcon("theme:icons/clearsearch.svg"));
connect(aClearFilterAll, SIGNAL(triggered()), this, SLOT(actClearFilterAll()));
aClearFilterOne = new QAction(QString(), this);
aClearFilterOne->setIcon(QIcon(":/resources/decrement.svg"));
aClearFilterOne->setIcon(QIcon("theme:icons/decrement.svg"));
connect(aClearFilterOne, SIGNAL(triggered()), this, SLOT(actClearFilterOne()));
dbMenu = new QMenu(this);
@@ -342,7 +342,7 @@ void TabDeckEditor::createCentralFrame()
searchEdit = new SearchLineEdit;
searchEdit->setObjectName("searchEdit");
#if QT_VERSION >= 0x050300
searchEdit->addAction(QIcon(":/resources/icon_search_black.svg"), QLineEdit::LeadingPosition);
searchEdit->addAction(QIcon("theme:icons/search.svg"), QLineEdit::LeadingPosition);
#endif
setFocusProxy(searchEdit);
@@ -381,19 +381,19 @@ void TabDeckEditor::createCentralFrame()
searchEdit->setTreeView(databaseView);
aAddCard = new QAction(QString(), this);
aAddCard->setIcon(QIcon(":/resources/arrow_right_green.svg"));
aAddCard->setIcon(QIcon("theme:icons/arrow_right_green.svg"));
connect(aAddCard, SIGNAL(triggered()), this, SLOT(actAddCard()));
aAddCardToSideboard = new QAction(QString(), this);
aAddCardToSideboard->setIcon(QIcon(":/resources/add_to_sideboard.svg"));
aAddCardToSideboard->setIcon(QIcon("theme:icons/arrow_right_blue.svg"));
connect(aAddCardToSideboard, SIGNAL(triggered()), this, SLOT(actAddCardToSideboard()));
aRemoveCard = new QAction(QString(), this);
aRemoveCard->setIcon(QIcon(":/resources/remove_row.svg"));
aRemoveCard->setIcon(QIcon("theme:icons/remove_row.svg"));
connect(aRemoveCard, SIGNAL(triggered()), this, SLOT(actRemoveCard()));
aIncrement = new QAction(QString(), this);
aIncrement->setIcon(QIcon(":/resources/increment.svg"));
aIncrement->setIcon(QIcon("theme:icons/increment.svg"));
connect(aIncrement, SIGNAL(triggered()), this, SLOT(actIncrement()));
aDecrement = new QAction(QString(), this);
aDecrement->setIcon(QIcon(":/resources/decrement.svg"));
aDecrement->setIcon(QIcon("theme:icons/decrement.svg"));
connect(aDecrement, SIGNAL(triggered()), this, SLOT(actDecrement()));
QToolBar *deckEditToolBar = new QToolBar;