Merge with master

cockatrice/src/dlg_edit_user.cpp

@@ -19,9 +19,9 @@ DlgEditUser::DlgEditUser(QWidget *parent, QString email, int gender, QString cou
     genderLabel = new QLabel(tr("Pronouns:"));
     genderEdit = new QComboBox();
     genderLabel->setBuddy(genderEdit);
-    genderEdit->insertItem(0, QIcon(":/resources/genders/unknown.svg"), tr("Neutral"));
-    genderEdit->insertItem(1, QIcon(":/resources/genders/male.svg"), tr("Masculine"));
-    genderEdit->insertItem(2, QIcon(":/resources/genders/female.svg"), tr("Feminine"));
+    genderEdit->insertItem(0, QIcon("theme:genders/unknown.svg"), tr("Neutral"));
+    genderEdit->insertItem(1, QIcon("theme:genders/male.svg"), tr("Masculine"));
+    genderEdit->insertItem(2, QIcon("theme:genders/female.svg"), tr("Feminine"));
     genderEdit->setCurrentIndex(gender + 1);
 
     countryLabel = new QLabel(tr("Country:"));
@@ -34,7 +34,7 @@ DlgEditUser::DlgEditUser(QWidget *parent, QString email, int gender, QString cou
     int i = 1;
     foreach(QString c, countries)
     {
-        countryEdit->addItem(QPixmap(":/resources/countries/" + c + ".svg"), c);
+        countryEdit->addItem(QPixmap("theme:countries/" + c.toLower() + ".svg"), c);
         if (c == country)
             countryEdit->setCurrentIndex(i);
 

cockatrice/src/dlg_register.cpp

@@ -311,7 +311,7 @@ DlgRegister::DlgRegister(QWidget *parent)
     countryEdit->setCurrentIndex(0);
     QStringList countries = settingsCache->getCountries();
     foreach(QString c, countries)
-        countryEdit->addItem(QPixmap(":/resources/countries/" + c + ".svg"), c);
+        countryEdit->addItem(QPixmap("theme:countries/" + c.toLower() + ".svg"), c);
 
     realnameLabel = new QLabel(tr("Real name:"));
     realnameEdit = new QLineEdit();

cockatrice/src/dlg_settings.cpp

@@ -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 *)));
 }

cockatrice/src/sequenceEdit/sequenceedit.cpp

@@ -25,8 +25,8 @@ SequenceEdit::SequenceEdit(QString _shorcutName, QWidget *parent) : QWidget(pare
     clearButton->setMaximumHeight(lineEdit->height());
     defaultButton->setMaximumHeight(lineEdit->height());
 
-    clearButton->setIcon(QIcon(":/resources/icon_clearsearch.svg"));
-    defaultButton->setIcon(QIcon(":/resources/icon_update.png"));
+    clearButton->setIcon(QIcon("theme:icons/clearsearch.svg"));
+    defaultButton->setIcon(QIcon("theme:icons/update.png"));
 
     clearButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
     defaultButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);

cockatrice/src/tab_deck_editor.cpp

@@ -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);

cockatrice/src/window_main.cpp

@@ -100,7 +100,7 @@ void MainWindow::processConnectionClosedEvent(const Event_ConnectionClosed &even
 void MainWindow::processServerShutdownEvent(const Event_ServerShutdown &event)
 {
     serverShutdownMessageBox.setInformativeText(tr("The server is going to be restarted in %n minute(s).\nAll running games will be lost.\nReason for shutdown: %1", "", event.minutes()).arg(QString::fromStdString(event.reason())));
-    serverShutdownMessageBox.setIconPixmap(QPixmap(":/resources/appicon.svg").scaled(64, 64));
+    serverShutdownMessageBox.setIconPixmap(QPixmap("theme:appicon.svg").scaled(64, 64));
     serverShutdownMessageBox.setText(tr("Scheduled server shutdown"));
     serverShutdownMessageBox.setWindowModality(Qt::ApplicationModal);
     serverShutdownMessageBox.setVisible(true);

oracle/src/main.cpp

@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 
 	OracleWizard wizard;
 
-    QIcon icon(":/resources/appicon.svg");
+    QIcon icon("theme:appicon.svg");
     wizard.setWindowIcon(icon);
 
 	wizard.show();