diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc index 4fecaa62..fda3c178 100644 --- a/cockatrice/cockatrice.qrc +++ b/cockatrice/cockatrice.qrc @@ -1,62 +1,56 @@ resources/back.svg - resources/lock.svg - resources/icon_delete.svg - resources/icon_tab_changed.svg - resources/icon_config_general.svg - resources/icon_config_appearance.svg - resources/icon_config_interface.svg - resources/icon_config_messages.svg - resources/icon_config_deckeditor.svg - resources/icon_config_sound.svg - resources/phases/icon_phase_untap.svg - resources/phases/icon_phase_upkeep.svg - resources/phases/icon_phase_draw.svg - resources/phases/icon_phase_main1.svg - resources/phases/icon_phase_combat_start.svg - resources/phases/icon_phase_combat_attackers.svg - resources/phases/icon_phase_combat_blockers.svg - resources/phases/icon_phase_combat_damage.svg - resources/phases/icon_phase_combat_end.svg - resources/phases/icon_phase_main2.svg - resources/phases/icon_phase_cleanup.svg - resources/phases/icon_phase_nextturn.svg - resources/icon_settings.svg + resources/cockatrice.svg resources/hand.svg - resources/pencil.svg - resources/icon_search_black.svg - resources/icon_clearsearch.svg - resources/icon_update.png - resources/icon_view.svg resources/hr.jpg - resources/cockatrice.svg - - resources/add_to_sideboard.svg - resources/decrement.svg - resources/increment.svg - resources/remove_row.svg - resources/arrow_left_green.svg - resources/arrow_right_green.svg - resources/arrow_top_green.svg - resources/arrow_up_green.svg - resources/arrow_down_green.svg - resources/arrow_bottom_green.svg - - resources/icon_ready_start.svg - resources/icon_not_ready_start.svg - resources/icon_conceded.svg - resources/icon_player.svg - resources/icon_spectator.svg + resources/icons/arrow_bottom_green.svg + resources/icons/arrow_down_green.svg + resources/icons/arrow_left_green.svg + resources/icons/arrow_right_blue.svg + resources/icons/arrow_right_green.svg + resources/icons/arrow_top_green.svg + resources/icons/arrow_up_green.svg + resources/icons/clearsearch.svg + resources/icons/conceded.svg + resources/icons/decrement.svg + resources/icons/delete.svg + resources/icons/increment.svg + resources/icons/lock.svg + resources/icons/not_ready_start.svg + resources/icons/pencil.svg + resources/icons/player.svg + resources/icons/ready_start.svg + resources/icons/remove_row.svg + resources/icons/search.svg + resources/icons/settings.svg + resources/icons/spectator.svg + resources/icons/tab_changed.svg + resources/icons/update.png + resources/icons/view.svg - resources/replay_start.svg - resources/replay_fastforward.svg - resources/replay_pause.svg + resources/config/general.svg + resources/config/appearance.svg + resources/config/interface.svg + resources/config/messages.svg + resources/config/deckeditor.svg + resources/config/sound.svg - resources/genders/male.svg - resources/genders/female.svg - resources/genders/unknown.svg + resources/counters/w.svg + resources/counters/w_highlight.svg + resources/counters/u.svg + resources/counters/u_highlight.svg + resources/counters/b.svg + resources/counters/b_highlight.svg + resources/counters/r.svg + resources/counters/r_highlight.svg + resources/counters/g.svg + resources/counters/g_highlight.svg + resources/counters/storm.svg + resources/counters/storm_highlight.svg + resources/counters/general.svg + resources/counters/general_highlight.svg resources/countries/ad.svg resources/countries/ae.svg @@ -308,20 +302,26 @@ resources/countries/zm.svg resources/countries/zw.svg - resources/counters/w.svg - resources/counters/w_highlight.svg - resources/counters/u.svg - resources/counters/u_highlight.svg - resources/counters/b.svg - resources/counters/b_highlight.svg - resources/counters/r.svg - resources/counters/r_highlight.svg - resources/counters/g.svg - resources/counters/g_highlight.svg - resources/counters/storm.svg - resources/counters/storm_highlight.svg - resources/counters/general.svg - resources/counters/general_highlight.svg + resources/genders/male.svg + resources/genders/female.svg + resources/genders/unknown.svg + + resources/phases/untap.svg + resources/phases/upkeep.svg + resources/phases/draw.svg + resources/phases/main1.svg + resources/phases/combat_start.svg + resources/phases/combat_attackers.svg + resources/phases/combat_blockers.svg + resources/phases/combat_damage.svg + resources/phases/combat_end.svg + resources/phases/main2.svg + resources/phases/cleanup.svg + resources/phases/nextturn.svg + + resources/replay/start.svg + resources/replay/fastforward.svg + resources/replay/pause.svg resources/userlevels/normal.svg resources/userlevels/registered.svg @@ -330,8 +330,5 @@ resources/userlevels/moderator_buddy.svg resources/userlevels/admin.svg resources/userlevels/admin_buddy.svg - - resources/news/exclamation_mark.svg - resources/news/question_mark.svg diff --git a/cockatrice/resources/icon_config_appearance.svg b/cockatrice/resources/config/appearance.svg similarity index 100% rename from cockatrice/resources/icon_config_appearance.svg rename to cockatrice/resources/config/appearance.svg diff --git a/cockatrice/resources/icon_config_deckeditor.svg b/cockatrice/resources/config/deckeditor.svg similarity index 100% rename from cockatrice/resources/icon_config_deckeditor.svg rename to cockatrice/resources/config/deckeditor.svg diff --git a/cockatrice/resources/icon_config_general.svg b/cockatrice/resources/config/general.svg similarity index 100% rename from cockatrice/resources/icon_config_general.svg rename to cockatrice/resources/config/general.svg diff --git a/cockatrice/resources/icon_config_interface.svg b/cockatrice/resources/config/interface.svg similarity index 100% rename from cockatrice/resources/icon_config_interface.svg rename to cockatrice/resources/config/interface.svg diff --git a/cockatrice/resources/icon_config_messages.svg b/cockatrice/resources/config/messages.svg similarity index 100% rename from cockatrice/resources/icon_config_messages.svg rename to cockatrice/resources/config/messages.svg diff --git a/cockatrice/resources/icon_config_sound.svg b/cockatrice/resources/config/sound.svg similarity index 100% rename from cockatrice/resources/icon_config_sound.svg rename to cockatrice/resources/config/sound.svg diff --git a/cockatrice/resources/arrow_bottom_green.svg b/cockatrice/resources/icons/arrow_bottom_green.svg similarity index 100% rename from cockatrice/resources/arrow_bottom_green.svg rename to cockatrice/resources/icons/arrow_bottom_green.svg diff --git a/cockatrice/resources/arrow_down_green.svg b/cockatrice/resources/icons/arrow_down_green.svg similarity index 100% rename from cockatrice/resources/arrow_down_green.svg rename to cockatrice/resources/icons/arrow_down_green.svg diff --git a/cockatrice/resources/arrow_left_green.svg b/cockatrice/resources/icons/arrow_left_green.svg similarity index 100% rename from cockatrice/resources/arrow_left_green.svg rename to cockatrice/resources/icons/arrow_left_green.svg diff --git a/cockatrice/resources/add_to_sideboard.svg b/cockatrice/resources/icons/arrow_right_blue.svg similarity index 100% rename from cockatrice/resources/add_to_sideboard.svg rename to cockatrice/resources/icons/arrow_right_blue.svg diff --git a/cockatrice/resources/arrow_right_green.svg b/cockatrice/resources/icons/arrow_right_green.svg similarity index 100% rename from cockatrice/resources/arrow_right_green.svg rename to cockatrice/resources/icons/arrow_right_green.svg diff --git a/cockatrice/resources/arrow_top_green.svg b/cockatrice/resources/icons/arrow_top_green.svg similarity index 100% rename from cockatrice/resources/arrow_top_green.svg rename to cockatrice/resources/icons/arrow_top_green.svg diff --git a/cockatrice/resources/arrow_up_green.svg b/cockatrice/resources/icons/arrow_up_green.svg similarity index 100% rename from cockatrice/resources/arrow_up_green.svg rename to cockatrice/resources/icons/arrow_up_green.svg diff --git a/cockatrice/resources/icon_clearsearch.svg b/cockatrice/resources/icons/clearsearch.svg similarity index 100% rename from cockatrice/resources/icon_clearsearch.svg rename to cockatrice/resources/icons/clearsearch.svg diff --git a/cockatrice/resources/icon_conceded.svg b/cockatrice/resources/icons/conceded.svg similarity index 100% rename from cockatrice/resources/icon_conceded.svg rename to cockatrice/resources/icons/conceded.svg diff --git a/cockatrice/resources/decrement.svg b/cockatrice/resources/icons/decrement.svg similarity index 100% rename from cockatrice/resources/decrement.svg rename to cockatrice/resources/icons/decrement.svg diff --git a/cockatrice/resources/icon_delete.svg b/cockatrice/resources/icons/delete.svg similarity index 100% rename from cockatrice/resources/icon_delete.svg rename to cockatrice/resources/icons/delete.svg diff --git a/cockatrice/resources/increment.svg b/cockatrice/resources/icons/increment.svg similarity index 100% rename from cockatrice/resources/increment.svg rename to cockatrice/resources/icons/increment.svg diff --git a/cockatrice/resources/lock.svg b/cockatrice/resources/icons/lock.svg similarity index 100% rename from cockatrice/resources/lock.svg rename to cockatrice/resources/icons/lock.svg diff --git a/cockatrice/resources/icon_not_ready_start.svg b/cockatrice/resources/icons/not_ready_start.svg similarity index 100% rename from cockatrice/resources/icon_not_ready_start.svg rename to cockatrice/resources/icons/not_ready_start.svg diff --git a/cockatrice/resources/pencil.svg b/cockatrice/resources/icons/pencil.svg similarity index 100% rename from cockatrice/resources/pencil.svg rename to cockatrice/resources/icons/pencil.svg diff --git a/cockatrice/resources/icon_player.svg b/cockatrice/resources/icons/player.svg similarity index 100% rename from cockatrice/resources/icon_player.svg rename to cockatrice/resources/icons/player.svg diff --git a/cockatrice/resources/icon_ready_start.svg b/cockatrice/resources/icons/ready_start.svg similarity index 100% rename from cockatrice/resources/icon_ready_start.svg rename to cockatrice/resources/icons/ready_start.svg diff --git a/cockatrice/resources/remove_row.svg b/cockatrice/resources/icons/remove_row.svg similarity index 100% rename from cockatrice/resources/remove_row.svg rename to cockatrice/resources/icons/remove_row.svg diff --git a/cockatrice/resources/icon_search_black.svg b/cockatrice/resources/icons/search.svg similarity index 100% rename from cockatrice/resources/icon_search_black.svg rename to cockatrice/resources/icons/search.svg diff --git a/cockatrice/resources/icon_settings.svg b/cockatrice/resources/icons/settings.svg similarity index 100% rename from cockatrice/resources/icon_settings.svg rename to cockatrice/resources/icons/settings.svg diff --git a/cockatrice/resources/icon_spectator.svg b/cockatrice/resources/icons/spectator.svg similarity index 100% rename from cockatrice/resources/icon_spectator.svg rename to cockatrice/resources/icons/spectator.svg diff --git a/cockatrice/resources/icon_tab_changed.svg b/cockatrice/resources/icons/tab_changed.svg similarity index 100% rename from cockatrice/resources/icon_tab_changed.svg rename to cockatrice/resources/icons/tab_changed.svg diff --git a/cockatrice/resources/icon_update.png b/cockatrice/resources/icons/update.png similarity index 100% rename from cockatrice/resources/icon_update.png rename to cockatrice/resources/icons/update.png diff --git a/cockatrice/resources/icon_view.svg b/cockatrice/resources/icons/view.svg similarity index 100% rename from cockatrice/resources/icon_view.svg rename to cockatrice/resources/icons/view.svg diff --git a/cockatrice/resources/news/exclamation_mark.svg b/cockatrice/resources/news/exclamation_mark.svg deleted file mode 100644 index a4994777..00000000 --- a/cockatrice/resources/news/exclamation_mark.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/cockatrice/resources/news/question_mark.svg b/cockatrice/resources/news/question_mark.svg deleted file mode 100644 index 9272381f..00000000 --- a/cockatrice/resources/news/question_mark.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - ? - - diff --git a/cockatrice/resources/phases/icon_phase_cleanup.svg b/cockatrice/resources/phases/cleanup.svg similarity index 100% rename from cockatrice/resources/phases/icon_phase_cleanup.svg rename to cockatrice/resources/phases/cleanup.svg diff --git a/cockatrice/resources/phases/icon_phase_combat_attackers.svg b/cockatrice/resources/phases/combat_attackers.svg similarity index 100% rename from cockatrice/resources/phases/icon_phase_combat_attackers.svg rename to cockatrice/resources/phases/combat_attackers.svg diff --git a/cockatrice/resources/phases/icon_phase_combat_blockers.svg b/cockatrice/resources/phases/combat_blockers.svg similarity index 100% rename from cockatrice/resources/phases/icon_phase_combat_blockers.svg rename to cockatrice/resources/phases/combat_blockers.svg diff --git a/cockatrice/resources/phases/icon_phase_combat_damage.svg b/cockatrice/resources/phases/combat_damage.svg similarity index 100% rename from cockatrice/resources/phases/icon_phase_combat_damage.svg rename to cockatrice/resources/phases/combat_damage.svg diff --git a/cockatrice/resources/phases/icon_phase_combat_end.svg b/cockatrice/resources/phases/combat_end.svg similarity index 100% rename from cockatrice/resources/phases/icon_phase_combat_end.svg rename to cockatrice/resources/phases/combat_end.svg diff --git a/cockatrice/resources/phases/icon_phase_combat_start.svg b/cockatrice/resources/phases/combat_start.svg similarity index 100% rename from cockatrice/resources/phases/icon_phase_combat_start.svg rename to cockatrice/resources/phases/combat_start.svg diff --git a/cockatrice/resources/phases/icon_phase_draw.svg b/cockatrice/resources/phases/draw.svg similarity index 100% rename from cockatrice/resources/phases/icon_phase_draw.svg rename to cockatrice/resources/phases/draw.svg diff --git a/cockatrice/resources/phases/icon_phase_main1.svg b/cockatrice/resources/phases/main1.svg similarity index 100% rename from cockatrice/resources/phases/icon_phase_main1.svg rename to cockatrice/resources/phases/main1.svg diff --git a/cockatrice/resources/phases/icon_phase_main2.svg b/cockatrice/resources/phases/main2.svg similarity index 100% rename from cockatrice/resources/phases/icon_phase_main2.svg rename to cockatrice/resources/phases/main2.svg diff --git a/cockatrice/resources/phases/icon_phase_nextturn.svg b/cockatrice/resources/phases/nextturn.svg similarity index 100% rename from cockatrice/resources/phases/icon_phase_nextturn.svg rename to cockatrice/resources/phases/nextturn.svg diff --git a/cockatrice/resources/phases/icon_phase_untap.svg b/cockatrice/resources/phases/untap.svg similarity index 100% rename from cockatrice/resources/phases/icon_phase_untap.svg rename to cockatrice/resources/phases/untap.svg diff --git a/cockatrice/resources/phases/icon_phase_upkeep.svg b/cockatrice/resources/phases/upkeep.svg similarity index 100% rename from cockatrice/resources/phases/icon_phase_upkeep.svg rename to cockatrice/resources/phases/upkeep.svg diff --git a/cockatrice/resources/replay_fastforward.svg b/cockatrice/resources/replay/fastforward.svg similarity index 100% rename from cockatrice/resources/replay_fastforward.svg rename to cockatrice/resources/replay/fastforward.svg diff --git a/cockatrice/resources/replay_pause.svg b/cockatrice/resources/replay/pause.svg similarity index 100% rename from cockatrice/resources/replay_pause.svg rename to cockatrice/resources/replay/pause.svg diff --git a/cockatrice/resources/replay_start.svg b/cockatrice/resources/replay/start.svg similarity index 100% rename from cockatrice/resources/replay_start.svg rename to cockatrice/resources/replay/start.svg diff --git a/cockatrice/resources/replay_stop.svg b/cockatrice/resources/replay_stop.svg deleted file mode 100644 index 8791b3c0..00000000 --- a/cockatrice/resources/replay_stop.svg +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/cockatrice/src/dlg_edit_tokens.cpp b/cockatrice/src/dlg_edit_tokens.cpp index 4f32890b..9f024ed5 100644 --- a/cockatrice/src/dlg_edit_tokens.cpp +++ b/cockatrice/src/dlg_edit_tokens.cpp @@ -83,10 +83,10 @@ DlgEditTokens::DlgEditTokens(CardDatabaseModel *_cardDatabaseModel, QWidget *par connect(chooseTokenView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, SLOT(tokenSelectionChanged(QModelIndex, QModelIndex))); QAction *aAddToken = new QAction(tr("Add token"), this); - aAddToken->setIcon(QIcon("theme:increment.svg")); + aAddToken->setIcon(QIcon("theme:icons/increment.svg")); connect(aAddToken, SIGNAL(triggered()), this, SLOT(actAddToken())); QAction *aRemoveToken = new QAction(tr("Remove token"), this); - aRemoveToken->setIcon(QIcon("theme:decrement.svg")); + aRemoveToken->setIcon(QIcon("theme:icons/decrement.svg")); connect(aRemoveToken, SIGNAL(triggered()), this, SLOT(actRemoveToken())); QToolBar *databaseToolBar = new QToolBar; diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp index 006301bc..9428b6e1 100644 --- a/cockatrice/src/dlg_settings.cpp +++ b/cockatrice/src/dlg_settings.cpp @@ -468,10 +468,10 @@ MessagesSettingsPage::MessagesSettingsPage() messageList->addItem(settings.value(QString("msg%1").arg(i)).toString()); aAdd = new QAction(this); - aAdd->setIcon(QIcon("theme:increment.svg")); + aAdd->setIcon(QIcon("theme:icons/increment.svg")); connect(aAdd, SIGNAL(triggered()), this, SLOT(actAdd())); aRemove = new QAction(this); - aRemove->setIcon(QIcon("theme:decrement.svg")); + aRemove->setIcon(QIcon("theme:icons/decrement.svg")); connect(aRemove, SIGNAL(triggered()), this, SLOT(actRemove())); QToolBar *messageToolBar = new QToolBar; @@ -559,7 +559,7 @@ void MessagesSettingsPage::retranslateUi() SoundSettingsPage::SoundSettingsPage() { - QIcon deleteIcon("theme:icon_delete.svg"); + QIcon deleteIcon("theme:icons/delete.svg"); soundEnabledCheckBox.setChecked(settingsCache->getSoundEnabled()); connect(&soundEnabledCheckBox, SIGNAL(stateChanged(int)), settingsCache, SLOT(setSoundEnabled(int))); @@ -695,32 +695,32 @@ void DlgSettings::createIcons() generalButton = new QListWidgetItem(contentsWidget); generalButton->setTextAlignment(Qt::AlignHCenter); generalButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - generalButton->setIcon(QIcon("theme:icon_config_general.svg")); + generalButton->setIcon(QIcon("theme:config/general.svg")); appearanceButton = new QListWidgetItem(contentsWidget); appearanceButton->setTextAlignment(Qt::AlignHCenter); appearanceButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - appearanceButton->setIcon(QIcon("theme:icon_config_appearance.svg")); + appearanceButton->setIcon(QIcon("theme:config/appearance.svg")); userInterfaceButton = new QListWidgetItem(contentsWidget); userInterfaceButton->setTextAlignment(Qt::AlignHCenter); userInterfaceButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - userInterfaceButton->setIcon(QIcon("theme:icon_config_interface.svg")); + userInterfaceButton->setIcon(QIcon("theme:config/interface.svg")); deckEditorButton = new QListWidgetItem(contentsWidget); deckEditorButton->setTextAlignment(Qt::AlignHCenter); deckEditorButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - deckEditorButton->setIcon(QIcon("theme:icon_config_deckeditor.svg")); + deckEditorButton->setIcon(QIcon("theme:config/deckeditor.svg")); messagesButton = new QListWidgetItem(contentsWidget); messagesButton->setTextAlignment(Qt::AlignHCenter); messagesButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - messagesButton->setIcon(QIcon("theme:icon_config_messages.svg")); + messagesButton->setIcon(QIcon("theme:config/messages.svg")); soundButton = new QListWidgetItem(contentsWidget); soundButton->setTextAlignment(Qt::AlignHCenter); soundButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - soundButton->setIcon(QIcon("theme:icon_config_sound.svg")); + soundButton->setIcon(QIcon("theme:config/sound.svg")); connect(contentsWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(changePage(QListWidgetItem *, QListWidgetItem *))); } diff --git a/cockatrice/src/gameselector.cpp b/cockatrice/src/gameselector.cpp index a3454856..44ff8013 100644 --- a/cockatrice/src/gameselector.cpp +++ b/cockatrice/src/gameselector.cpp @@ -60,10 +60,10 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup gameListView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents); #endif filterButton = new QPushButton; - filterButton->setIcon(QIcon("theme:icon_search_black.svg")); + filterButton->setIcon(QIcon("theme:icons/search.svg")); connect(filterButton, SIGNAL(clicked()), this, SLOT(actSetFilter())); clearFilterButton = new QPushButton; - clearFilterButton->setIcon(QIcon("theme:icon_clearsearch.svg")); + clearFilterButton->setIcon(QIcon("theme:icons/clearsearch.svg")); clearFilterButton->setEnabled(true); connect(clearFilterButton, SIGNAL(clicked()), this, SLOT(actClearFilter())); diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index f7d941c9..2dadfb62 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -204,7 +204,7 @@ int main(int argc, char *argv[]) MainWindow ui; qDebug("main(): MainWindow constructor finished"); - QIcon icon("theme:appicon.svg"); + QIcon icon("theme:cockatrice.svg"); ui.setWindowIcon(icon); ui.show(); diff --git a/cockatrice/src/pixmapgenerator.cpp b/cockatrice/src/pixmapgenerator.cpp index 8bb64ed9..1df69988 100644 --- a/cockatrice/src/pixmapgenerator.cpp +++ b/cockatrice/src/pixmapgenerator.cpp @@ -16,7 +16,7 @@ QPixmap PhasePixmapGenerator::generatePixmap(int height, QString name) if (pmCache.contains(key)) return pmCache.value(key); - QSvgRenderer svg(QString("theme:phases/icon_phase_" + name + ".svg")); + QSvgRenderer svg(QString("theme:phases/" + name + ".svg")); QPixmap pixmap(height, height); pixmap.fill(Qt::transparent); @@ -175,7 +175,7 @@ QPixmap LockPixmapGenerator::generatePixmap(int height) if (pmCache.contains(key)) return pmCache.value(key); - QSvgRenderer svg(QString("theme:lock.svg")); + QSvgRenderer svg(QString("theme:icons/lock.svg")); int width = (int) round(height * (double) svg.defaultSize().width() / (double) svg.defaultSize().height()); QPixmap pixmap(width, height); pixmap.fill(Qt::transparent); diff --git a/cockatrice/src/playerlistwidget.cpp b/cockatrice/src/playerlistwidget.cpp index 354ed669..fb729e5c 100644 --- a/cockatrice/src/playerlistwidget.cpp +++ b/cockatrice/src/playerlistwidget.cpp @@ -51,12 +51,12 @@ bool PlayerListTWI::operator<(const QTreeWidgetItem &other) const PlayerListWidget::PlayerListWidget(TabSupervisor *_tabSupervisor, AbstractClient *_client, TabGame *_game, QWidget *parent) : QTreeWidget(parent), tabSupervisor(_tabSupervisor), client(_client), game(_game), gameStarted(false) { - readyIcon = QIcon("theme:icon_ready_start.svg"); - notReadyIcon = QIcon("theme:icon_not_ready_start.svg"); - concededIcon = QIcon("theme:icon_conceded.svg"); - playerIcon = QIcon("theme:icon_player.svg"); - spectatorIcon = QIcon("theme:icon_spectator.svg"); - lockIcon = QIcon("theme:lock.svg"); + readyIcon = QIcon("theme:icons/ready_start.svg"); + notReadyIcon = QIcon("theme:icons/not_ready_start.svg"); + concededIcon = QIcon("theme:icons/conceded.svg"); + playerIcon = QIcon("theme:icons/player.svg"); + spectatorIcon = QIcon("theme:icons/spectator.svg"); + lockIcon = QIcon("theme:icons/lock.svg"); if (tabSupervisor) { itemDelegate = new PlayerListItemDelegate(this); diff --git a/cockatrice/src/remotereplaylist_treewidget.cpp b/cockatrice/src/remotereplaylist_treewidget.cpp index 47da5f91..fa6a2e98 100644 --- a/cockatrice/src/remotereplaylist_treewidget.cpp +++ b/cockatrice/src/remotereplaylist_treewidget.cpp @@ -35,7 +35,7 @@ RemoteReplayList_TreeModel::RemoteReplayList_TreeModel(AbstractClient *_client, QFileIconProvider fip; dirIcon = fip.icon(QFileIconProvider::Folder); fileIcon = fip.icon(QFileIconProvider::File); - lockIcon = QIcon("theme:lock.svg"); + lockIcon = QIcon("theme:icons/lock.svg"); refreshTree(); } diff --git a/cockatrice/src/tab_deck_editor.cpp b/cockatrice/src/tab_deck_editor.cpp index e6ddc382..a875e1f4 100644 --- a/cockatrice/src/tab_deck_editor.cpp +++ b/cockatrice/src/tab_deck_editor.cpp @@ -51,16 +51,16 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent) : Tab(_tabSupervisor, parent), modified(false) { aClearFilterAll = new QAction(QString(), this); - aClearFilterAll->setIcon(QIcon("theme: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("theme:decrement.svg")); + aClearFilterOne->setIcon(QIcon("theme:icons/decrement.svg")); connect(aClearFilterOne, SIGNAL(triggered()), this, SLOT(actClearFilterOne())); searchEdit = new SearchLineEdit; #if QT_VERSION >= 0x050300 - searchEdit->addAction(QIcon("theme:icon_search_black.svg"), QLineEdit::LeadingPosition); + searchEdit->addAction(QIcon("theme:icons/search.svg"), QLineEdit::LeadingPosition); #endif searchEdit->setObjectName("searchEdit"); @@ -193,7 +193,7 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent) /* Update price aUpdatePrices = new QAction(QString(), this); - aUpdatePrices->setIcon(QIcon("theme:icon_update.png")); + aUpdatePrices->setIcon(QIcon("theme:icons/update.png")); connect(aUpdatePrices, SIGNAL(triggered()), this, SLOT(actUpdatePrices())); if (!settingsCache->getPriceTagFeature()) aUpdatePrices->setVisible(false); @@ -282,19 +282,19 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent) addTabMenu(dbMenu); aAddCard = new QAction(QString(), this); - aAddCard->setIcon(QIcon("theme: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("theme: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("theme: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("theme:increment.svg")); + aIncrement->setIcon(QIcon("theme:icons/increment.svg")); connect(aIncrement, SIGNAL(triggered()), this, SLOT(actIncrement())); aDecrement = new QAction(QString(), this); - aDecrement->setIcon(QIcon("theme:decrement.svg")); + aDecrement->setIcon(QIcon("theme:icons/decrement.svg")); connect(aDecrement, SIGNAL(triggered()), this, SLOT(actDecrement())); deckEditToolBar->addAction(aAddCard); diff --git a/cockatrice/src/tab_deck_storage.cpp b/cockatrice/src/tab_deck_storage.cpp index c4e23eaf..fa30ff0b 100644 --- a/cockatrice/src/tab_deck_storage.cpp +++ b/cockatrice/src/tab_deck_storage.cpp @@ -80,25 +80,25 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_c hbox->addWidget(rightGroupBox); aOpenLocalDeck = new QAction(this); - aOpenLocalDeck->setIcon(QIcon("theme:pencil.svg")); + aOpenLocalDeck->setIcon(QIcon("theme:icons/pencil.svg")); connect(aOpenLocalDeck, SIGNAL(triggered()), this, SLOT(actOpenLocalDeck())); aUpload = new QAction(this); - aUpload->setIcon(QIcon("theme:arrow_right_green.svg")); + aUpload->setIcon(QIcon("theme:icons/arrow_right_green.svg")); connect(aUpload, SIGNAL(triggered()), this, SLOT(actUpload())); aDeleteLocalDeck = new QAction(this); - aDeleteLocalDeck->setIcon(QIcon("theme:remove_row.svg")); + aDeleteLocalDeck->setIcon(QIcon("theme:icons/remove_row.svg")); connect(aDeleteLocalDeck, SIGNAL(triggered()), this, SLOT(actDeleteLocalDeck())); aOpenRemoteDeck = new QAction(this); - aOpenRemoteDeck->setIcon(QIcon("theme:pencil.svg")); + aOpenRemoteDeck->setIcon(QIcon("theme:icons/pencil.svg")); connect(aOpenRemoteDeck, SIGNAL(triggered()), this, SLOT(actOpenRemoteDeck())); aDownload = new QAction(this); - aDownload->setIcon(QIcon("theme:arrow_left_green.svg")); + aDownload->setIcon(QIcon("theme:icons/arrow_left_green.svg")); connect(aDownload, SIGNAL(triggered()), this, SLOT(actDownload())); aNewFolder = new QAction(this); aNewFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder)); connect(aNewFolder, SIGNAL(triggered()), this, SLOT(actNewFolder())); aDeleteRemoteDeck = new QAction(this); - aDeleteRemoteDeck->setIcon(QIcon("theme:remove_row.svg")); + aDeleteRemoteDeck->setIcon(QIcon("theme:icons/remove_row.svg")); connect(aDeleteRemoteDeck, SIGNAL(triggered()), this, SLOT(actDeleteRemoteDeck())); leftToolBar->addAction(aOpenLocalDeck); diff --git a/cockatrice/src/tab_game.cpp b/cockatrice/src/tab_game.cpp index 4c52066e..517e6d85 100644 --- a/cockatrice/src/tab_game.cpp +++ b/cockatrice/src/tab_game.cpp @@ -305,17 +305,17 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay) replayStartButton = new QToolButton; replayStartButton->setIconSize(QSize(32, 32)); - replayStartButton->setIcon(QIcon("theme:replay_start.svg")); + replayStartButton->setIcon(QIcon("theme:replay/start.svg")); connect(replayStartButton, SIGNAL(clicked()), this, SLOT(replayStartButtonClicked())); replayPauseButton = new QToolButton; replayPauseButton->setIconSize(QSize(32, 32)); replayPauseButton->setEnabled(false); - replayPauseButton->setIcon(QIcon("theme:replay_pause.svg")); + replayPauseButton->setIcon(QIcon("theme:replay/pause.svg")); connect(replayPauseButton, SIGNAL(clicked()), this, SLOT(replayPauseButtonClicked())); replayFastForwardButton = new QToolButton; replayFastForwardButton->setIconSize(QSize(32, 32)); replayFastForwardButton->setEnabled(false); - replayFastForwardButton->setIcon(QIcon("theme:replay_fastforward.svg")); + replayFastForwardButton->setIcon(QIcon("theme:replay/fastforward.svg")); replayFastForwardButton->setCheckable(true); connect(replayFastForwardButton, SIGNAL(toggled(bool)), this, SLOT(replayFastForwardButtonToggled(bool))); diff --git a/cockatrice/src/tab_replays.cpp b/cockatrice/src/tab_replays.cpp index 8e42bbd3..d6d36077 100644 --- a/cockatrice/src/tab_replays.cpp +++ b/cockatrice/src/tab_replays.cpp @@ -78,22 +78,22 @@ TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client) hbox->addWidget(rightGroupBox); aOpenLocalReplay = new QAction(this); - aOpenLocalReplay->setIcon(QIcon("theme:icon_view.svg")); + aOpenLocalReplay->setIcon(QIcon("theme:icons/view.svg")); connect(aOpenLocalReplay, SIGNAL(triggered()), this, SLOT(actOpenLocalReplay())); aDeleteLocalReplay = new QAction(this); - aDeleteLocalReplay->setIcon(QIcon("theme:remove_row.svg")); + aDeleteLocalReplay->setIcon(QIcon("theme:icons/remove_row.svg")); connect(aDeleteLocalReplay, SIGNAL(triggered()), this, SLOT(actDeleteLocalReplay())); aOpenRemoteReplay = new QAction(this); - aOpenRemoteReplay->setIcon(QIcon("theme:icon_view.svg")); + aOpenRemoteReplay->setIcon(QIcon("theme:icons/view.svg")); connect(aOpenRemoteReplay, SIGNAL(triggered()), this, SLOT(actOpenRemoteReplay())); aDownload = new QAction(this); - aDownload->setIcon(QIcon("theme:arrow_left_green.svg")); + aDownload->setIcon(QIcon("theme:icons/arrow_left_green.svg")); connect(aDownload, SIGNAL(triggered()), this, SLOT(actDownload())); aKeep = new QAction(this); - aKeep->setIcon(QIcon("theme:lock.svg")); + aKeep->setIcon(QIcon("theme:icons/lock.svg")); connect(aKeep, SIGNAL(triggered()), this, SLOT(actKeepRemoteReplay())); aDeleteRemoteReplay = new QAction(this); - aDeleteRemoteReplay->setIcon(QIcon("theme:remove_row.svg")); + aDeleteRemoteReplay->setIcon(QIcon("theme:icons/remove_row.svg")); connect(aDeleteRemoteReplay, SIGNAL(triggered()), this, SLOT(actDeleteRemoteReplay())); leftToolBar->addAction(aOpenLocalReplay); diff --git a/cockatrice/src/tab_room.cpp b/cockatrice/src/tab_room.cpp index ea5d7613..f41ba307 100644 --- a/cockatrice/src/tab_room.cpp +++ b/cockatrice/src/tab_room.cpp @@ -68,7 +68,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, ServerI connect(aOpenChatSettings, SIGNAL(triggered()), this, SLOT(actOpenChatSettings())); QToolButton *chatSettingsButton = new QToolButton; - chatSettingsButton->setIcon(QIcon("theme:icon_settings.svg")); + chatSettingsButton->setIcon(QIcon("theme:icons/settings.svg")); chatSettingsButton->setMenu(chatSettingsMenu); chatSettingsButton->setPopupMode(QToolButton::InstantPopup); diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp index 1f2f0524..3edb4775 100644 --- a/cockatrice/src/tab_supervisor.cpp +++ b/cockatrice/src/tab_supervisor.cpp @@ -79,7 +79,7 @@ void CloseButton::paintEvent(QPaintEvent * /*event*/) TabSupervisor::TabSupervisor(AbstractClient *_client, QWidget *parent) : QTabWidget(parent), userInfo(0), client(_client), tabServer(0), tabUserLists(0), tabDeckStorage(0), tabReplays(0), tabAdmin(0) { - tabChangedIcon = new QIcon("theme:icon_tab_changed.svg"); + tabChangedIcon = new QIcon("theme:icons/tab_changed.svg"); setElideMode(Qt::ElideRight); setMovable(true); setIconSize(QSize(15, 15)); diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp index d0720d9a..710291cf 100644 --- a/cockatrice/src/window_main.cpp +++ b/cockatrice/src/window_main.cpp @@ -561,7 +561,7 @@ void MainWindow::createTrayIcon() { trayIcon = new QSystemTrayIcon(this); trayIcon->setContextMenu(trayIconMenu); - trayIcon->setIcon(QIcon("theme:appicon.svg")); + trayIcon->setIcon(QIcon("theme:cockatrice.svg")); trayIcon->show(); connect(trayIcon,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),this, diff --git a/cockatrice/src/window_sets.cpp b/cockatrice/src/window_sets.cpp index e8cb852a..d529ad06 100644 --- a/cockatrice/src/window_sets.cpp +++ b/cockatrice/src/window_sets.cpp @@ -24,28 +24,28 @@ WndSets::WndSets(QWidget *parent) setsEditToolBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); aTop = new QAction(QString(), this); - aTop->setIcon(QIcon("theme:arrow_top_green.svg")); + aTop->setIcon(QIcon("theme:icons/arrow_top_green.svg")); aTop->setToolTip(tr("Move selected set to the top")); aTop->setEnabled(false); connect(aTop, SIGNAL(triggered()), this, SLOT(actTop())); setsEditToolBar->addAction(aTop); aUp = new QAction(QString(), this); - aUp->setIcon(QIcon("theme:arrow_up_green.svg")); + aUp->setIcon(QIcon("theme:icons/arrow_up_green.svg")); aUp->setToolTip(tr("Move selected set up")); aUp->setEnabled(false); connect(aUp, SIGNAL(triggered()), this, SLOT(actUp())); setsEditToolBar->addAction(aUp); aDown = new QAction(QString(), this); - aDown->setIcon(QIcon("theme:arrow_down_green.svg")); + aDown->setIcon(QIcon("theme:icons/arrow_down_green.svg")); aDown->setToolTip(tr("Move selected set down")); aDown->setEnabled(false); connect(aDown, SIGNAL(triggered()), this, SLOT(actDown())); setsEditToolBar->addAction(aDown); aBottom = new QAction(QString(), this); - aBottom->setIcon(QIcon("theme:arrow_bottom_green.svg")); + aBottom->setIcon(QIcon("theme:icons/arrow_bottom_green.svg")); aBottom->setToolTip(tr("Move selected set to the bottom")); aBottom->setEnabled(false); connect(aBottom, SIGNAL(triggered()), this, SLOT(actBottom())); diff --git a/cockatrice/src/zoneviewwidget.cpp b/cockatrice/src/zoneviewwidget.cpp index fd27bae7..6cc8a092 100644 --- a/cockatrice/src/zoneviewwidget.cpp +++ b/cockatrice/src/zoneviewwidget.cpp @@ -250,5 +250,5 @@ void ZoneViewWidget::zoneDeleted() void ZoneViewWidget::initStyleOption(QStyleOption *option) const { QStyleOptionTitleBar *titleBar = qstyleoption_cast(option); if (titleBar) - titleBar->icon = QIcon("theme:appicon.svg"); + titleBar->icon = QIcon("theme:cockatrice.svg"); }