Merge pull request #1511 from ctrlaltca/theme_extensions

Themes: don't use hardcoded extensions on images

cockatrice/cockatrice.qrc

 <RCC>
     <qresource prefix="/" >
-        <file>resources/back.svg</file>
+        <file>resources/cardback.svg</file>
         <file>resources/cockatrice.svg</file>
         <file>resources/hand.svg</file>
         <file>resources/hr.jpg</file>

cockatrice/src/carddatabase.cpp

@@ -625,7 +625,7 @@ void CardInfo::loadPixmap(QPixmap &pixmap)
     pixmap = QPixmap();
 
     if (getName().isEmpty()) {
-        pixmap = themeManager->getCardBackPixmap();
+        pixmap = QPixmap("theme:cardback");
         return;
     }
 
@@ -656,7 +656,7 @@ void CardInfo::getPixmap(QSize size, QPixmap &pixmap)
     loadPixmap(bigPixmap);
     if (bigPixmap.isNull()) {
         if (getName().isEmpty()) {
-            pixmap = themeManager->getCardBackPixmap();
+            pixmap = pixmap = QPixmap("theme:cardback");
         } else {
             pixmap = QPixmap(); // null
             return;

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:icons/increment.svg"));
+    aAddToken->setIcon(QPixmap("theme:icons/increment"));
     connect(aAddToken, SIGNAL(triggered()), this, SLOT(actAddToken()));
     QAction *aRemoveToken = new QAction(tr("Remove token"), this);
-    aRemoveToken->setIcon(QIcon("theme:icons/decrement.svg"));
+    aRemoveToken->setIcon(QPixmap("theme:icons/decrement"));
     connect(aRemoveToken, SIGNAL(triggered()), this, SLOT(actRemoveToken()));
     
     QToolBar *databaseToolBar = new QToolBar;

cockatrice/src/dlg_edit_user.cpp

@@ -18,9 +18,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("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->insertItem(0, QPixmap("theme:genders/unknown"), tr("Neutral"));
+    genderEdit->insertItem(1, QPixmap("theme:genders/male"), tr("Masculine"));
+    genderEdit->insertItem(2, QPixmap("theme:genders/female"), tr("Feminine"));
     genderEdit->setCurrentIndex(gender + 1);
 
     countryLabel = new QLabel(tr("Country:"));
@@ -33,7 +33,7 @@ DlgEditUser::DlgEditUser(QWidget *parent, QString email, int gender, QString cou
     int i = 1;
     foreach(QString c, countries)
     {
-        countryEdit->addItem(QPixmap("theme:countries/" + c.toLower() + ".svg"), c);
+        countryEdit->addItem(QPixmap("theme:countries/" + c.toLower()), c);
         if (c == country)
             countryEdit->setCurrentIndex(i);
 

cockatrice/src/dlg_settings.cpp

@@ -522,10 +522,10 @@ MessagesSettingsPage::MessagesSettingsPage()
         messageList->addItem(settingsCache->messages().getMessageAt(i));
     
     aAdd = new QAction(this);
-    aAdd->setIcon(QIcon("theme:icons/increment.svg"));
+    aAdd->setIcon(QPixmap("theme:icons/increment"));
     connect(aAdd, SIGNAL(triggered()), this, SLOT(actAdd()));
     aRemove = new QAction(this);
-    aRemove->setIcon(QIcon("theme:icons/decrement.svg"));
+    aRemove->setIcon(QPixmap("theme:icons/decrement"));
     connect(aRemove, SIGNAL(triggered()), this, SLOT(actRemove()));
 
     QToolBar *messageToolBar = new QToolBar;
@@ -635,14 +635,12 @@ void MessagesSettingsPage::retranslateUi()
 
 SoundSettingsPage::SoundSettingsPage()
 {
-    QIcon deleteIcon("theme:icons/delete.svg");
-
     soundEnabledCheckBox.setChecked(settingsCache->getSoundEnabled());
     connect(&soundEnabledCheckBox, SIGNAL(stateChanged(int)), settingsCache, SLOT(setSoundEnabled(int)));
 
     soundPathEdit = new QLineEdit(settingsCache->getSoundPath());
     soundPathEdit->setReadOnly(true);
-    QPushButton *soundPathClearButton = new QPushButton(deleteIcon, QString());
+    QPushButton *soundPathClearButton = new QPushButton(QPixmap("theme:icons/delete"), QString());
     connect(soundPathClearButton, SIGNAL(clicked()), this, SLOT(soundPathClearButtonClicked()));
     QPushButton *soundPathButton = new QPushButton("...");
     connect(soundPathButton, SIGNAL(clicked()), this, SLOT(soundPathButtonClicked()));
@@ -772,37 +770,37 @@ void DlgSettings::createIcons()
     generalButton = new QListWidgetItem(contentsWidget);
     generalButton->setTextAlignment(Qt::AlignHCenter);
     generalButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    generalButton->setIcon(QIcon("theme:config/general.svg"));
+    generalButton->setIcon(QPixmap("theme:config/general"));
     
     appearanceButton = new QListWidgetItem(contentsWidget);
     appearanceButton->setTextAlignment(Qt::AlignHCenter);
     appearanceButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    appearanceButton->setIcon(QIcon("theme:config/appearance.svg"));
+    appearanceButton->setIcon(QPixmap("theme:config/appearance"));
     
     userInterfaceButton = new QListWidgetItem(contentsWidget);
     userInterfaceButton->setTextAlignment(Qt::AlignHCenter);
     userInterfaceButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    userInterfaceButton->setIcon(QIcon("theme:config/interface.svg"));
+    userInterfaceButton->setIcon(QPixmap("theme:config/interface"));
     
     deckEditorButton = new QListWidgetItem(contentsWidget);
     deckEditorButton->setTextAlignment(Qt::AlignHCenter);
     deckEditorButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    deckEditorButton->setIcon(QIcon("theme:config/deckeditor.svg"));
+    deckEditorButton->setIcon(QPixmap("theme:config/deckeditor"));
     
     messagesButton = new QListWidgetItem(contentsWidget);
     messagesButton->setTextAlignment(Qt::AlignHCenter);
     messagesButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    messagesButton->setIcon(QIcon("theme:config/messages.svg"));
+    messagesButton->setIcon(QPixmap("theme:config/messages"));
 
     soundButton = new QListWidgetItem(contentsWidget);
     soundButton->setTextAlignment(Qt::AlignHCenter);
     soundButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    soundButton->setIcon(QIcon("theme:config/sound.svg"));
+    soundButton->setIcon(QPixmap("theme:config/sound"));
     
     shortcutsButton = new QListWidgetItem(contentsWidget);
     shortcutsButton->setTextAlignment(Qt::AlignHCenter);
     shortcutsButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    shortcutsButton->setIcon(QIcon("theme:config/shorcuts.svg"));
+    shortcutsButton->setIcon(QPixmap("theme:config/shorcuts"));
 
     connect(contentsWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(changePage(QListWidgetItem *, QListWidgetItem *)));
 }

cockatrice/src/filterbuilder.cpp

@@ -26,7 +26,7 @@ FilterBuilder::FilterBuilder(QWidget *parent)
             QVariant(i)
         );
 
-    QPushButton *ok = new QPushButton(QIcon("theme:icons/increment.svg"), QString());
+    QPushButton *ok = new QPushButton(QPixmap("theme:icons/increment"), QString());
     ok->setObjectName("ok");
     ok->setMaximumSize(20, 20);
 

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:icons/search.svg"));
+    filterButton->setIcon(QPixmap("theme:icons/search"));
     connect(filterButton, SIGNAL(clicked()), this, SLOT(actSetFilter()));
     clearFilterButton = new QPushButton;
-    clearFilterButton->setIcon(QIcon("theme:icons/clearsearch.svg"));
+    clearFilterButton->setIcon(QPixmap("theme:icons/clearsearch"));
     clearFilterButton->setEnabled(true);
     connect(clearFilterButton, SIGNAL(clicked()), this, SLOT(actClearFilter()));
 

cockatrice/src/handcounter.cpp

 #include <QPainter>
-#include <QSvgRenderer>
 #include <QPixmapCache>
 #include <QGraphicsSceneMouseEvent>
 #include "handcounter.h"
@@ -36,11 +35,7 @@ void HandCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op
 #else
     if (!QPixmapCache::find("handCounter" + QString::number(translatedSize.width()), cachedPixmap)) {
 #endif
-        QSvgRenderer svg(QString("theme:hand.svg"));
-        cachedPixmap = QPixmap(translatedSize);
-        cachedPixmap.fill(Qt::transparent);
-        QPainter painter(&cachedPixmap);
-        svg.render(&painter, QRectF(0, 0, translatedSize.width(), translatedSize.height()));
+        cachedPixmap = QPixmap("theme:hand").scaled(translatedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
         QPixmapCache::insert("handCounter" + QString::number(translatedSize.width()), cachedPixmap);
     }
     painter->resetTransform();

cockatrice/src/main.cpp

@@ -26,7 +26,6 @@
 #include <QTranslator>
 #include <QLibraryInfo>
 #include <QDateTime>
-#include <QIcon>
 #include <QDir>
 #include <QDesktopServices>
 #include <QDebug>
@@ -221,8 +220,7 @@ int main(int argc, char *argv[])
         MainWindow ui;
         qDebug("main(): MainWindow constructor finished");
 
-        QIcon icon("theme:cockatrice.svg");
-        ui.setWindowIcon(icon);
+        ui.setWindowIcon(QPixmap("theme:cockatrice"));
         
         settingsCache->setClientID(generateClientID());
 

cockatrice/src/pixmapgenerator.cpp

 #include "pixmapgenerator.h"
 #include "pb/serverinfo_user.pb.h"
 #include <QPainter>
-#include <QSvgRenderer>
 #include <cmath>
 #ifdef _WIN32
 #include "round.h"
@@ -16,12 +15,8 @@ QPixmap PhasePixmapGenerator::generatePixmap(int height, QString name)
     if (pmCache.contains(key))
         return pmCache.value(key);
     
-    QSvgRenderer svg(QString("theme:phases/" + name + ".svg"));
-    
-    QPixmap pixmap(height, height);
-    pixmap.fill(Qt::transparent);
-    QPainter painter(&pixmap);
-    svg.render(&painter, QRectF(0, 0, height, height));
+    QPixmap pixmap = QPixmap("theme:phases/" + name).scaled(height, height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+
     pmCache.insert(key, pixmap);
     return pixmap;
 }
@@ -36,20 +31,16 @@ QPixmap CounterPixmapGenerator::generatePixmap(int height, QString name, bool hi
     if (pmCache.contains(key))
         return pmCache.value(key);
     
-    QSvgRenderer svg(QString("theme:counters/" + name + ".svg"));
-    
-    if (!svg.isValid()) {
+    QPixmap pixmap = QPixmap("theme:counters/" + name).scaled(height, height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    if(pixmap.isNull())
+    {
         name = "general";
         if (highlight)
             name.append("_highlight");
-        svg.load(QString("theme:counters/" + name + ".svg"));
+        pixmap = QPixmap("theme:counters/" + name).scaled(height, height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+       
     }
-    
-    int width = (int) round(height * (double) svg.defaultSize().width() / (double) svg.defaultSize().height());
-    QPixmap pixmap(width, height);
-    pixmap.fill(Qt::transparent);
-    QPainter painter(&pixmap);
-    svg.render(&painter, QRectF(0, 0, width, height));
+
     pmCache.insert(key, pixmap);
     return pixmap;
 }
@@ -97,14 +88,8 @@ QPixmap GenderPixmapGenerator::generatePixmap(int height, int _gender)
         case ServerInfo_User::Female: genderStr = "female"; break;
         default: genderStr = "unknown";
     };
-    
-    QSvgRenderer svg(QString("theme:genders/" + genderStr + ".svg"));
-    int width = (int) round(height * (double) svg.defaultSize().width() / (double) svg.defaultSize().height());
-    QPixmap pixmap(width, height);
-    pixmap.fill(Qt::transparent);
-    QPainter painter(&pixmap);
-    svg.render(&painter, QRectF(0, 0, width, height));
-    
+
+    QPixmap pixmap = QPixmap("theme:genders/" + genderStr).scaled(height, height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
     pmCache.insert(key, pixmap);
     return pixmap;
 }
@@ -119,14 +104,12 @@ QPixmap CountryPixmapGenerator::generatePixmap(int height, const QString &countr
     if (pmCache.contains(key))
         return pmCache.value(key);
     
-    QSvgRenderer svg(QString("theme:countries/" + countryCode.toLower() + ".svg"));
-    int width = (int) round(height * (double) svg.defaultSize().width() / (double) svg.defaultSize().height());
-    QPixmap pixmap(width, height);
-    pixmap.fill(Qt::transparent);
+    int width = height * 2;
+    QPixmap pixmap = QPixmap("theme:countries/" + countryCode.toLower()).scaled(width, height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+
     QPainter painter(&pixmap);
-    svg.render(&painter, QRectF(0, 0, width, height));
     painter.setPen(Qt::black);
-    painter.drawRect(0, 0, width - 1, height - 1);
+    painter.drawRect(0, 0, pixmap.width() - 1, pixmap.height() - 1);
     
     pmCache.insert(key, pixmap);
     return pixmap;
@@ -154,13 +137,7 @@ QPixmap UserLevelPixmapGenerator::generatePixmap(int height, UserLevelFlags user
     if (isBuddy)
         levelString.append("_buddy");
 
-    QSvgRenderer svg(QString("theme:userlevels/" + levelString + ".svg"));
-    int width = (int) round(height * (double) svg.defaultSize().width() / (double) svg.defaultSize().height());
-    QPixmap pixmap(width, height);
-    pixmap.fill(Qt::transparent);
-    QPainter painter(&pixmap);
-    svg.render(&painter, QRectF(0, 0, width, height));
-
+    QPixmap pixmap = QPixmap("theme:userlevels/" + levelString).scaled(height, height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
     pmCache.insert(key, pixmap);
     return pixmap;
 }
@@ -175,13 +152,7 @@ QPixmap LockPixmapGenerator::generatePixmap(int height)
     if (pmCache.contains(key))
         return pmCache.value(key);
 
-    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);
-    QPainter painter(&pixmap);
-    svg.render(&painter, QRectF(0, 0, width, height));
-
+    QPixmap pixmap = QPixmap("theme:icons/lock").scaled(height, height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
     pmCache.insert(key, pixmap);
     return pixmap;
 }

cockatrice/src/playerlistwidget.cpp

@@ -50,12 +50,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: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");
+    readyIcon = QPixmap("theme:icons/ready_start");
+    notReadyIcon = QPixmap("theme:icons/not_ready_start");
+    concededIcon = QPixmap("theme:icons/conceded");
+    playerIcon = QPixmap("theme:icons/player");
+    spectatorIcon = QPixmap("theme:icons/spectator");
+    lockIcon = QPixmap("theme:icons/lock");
     
     if (tabSupervisor) {
         itemDelegate = new PlayerListItemDelegate(this);

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:icons/lock.svg");
+    lockIcon = QPixmap("theme:icons/lock");
 
     refreshTree();
 }

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("theme:icons/clearsearch.svg"));
-    defaultButton->setIcon(QIcon("theme:icons/update.png"));
+    clearButton->setIcon(QPixmap("theme:icons/clearsearch"));
+    defaultButton->setIcon(QPixmap("theme:icons/update"));
 
     clearButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
     defaultButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);

cockatrice/src/tab_deck_editor.cpp

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

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:icons/pencil.svg"));
+    aOpenLocalDeck->setIcon(QPixmap("theme:icons/pencil"));
     connect(aOpenLocalDeck, SIGNAL(triggered()), this, SLOT(actOpenLocalDeck()));
     aUpload = new QAction(this);
-    aUpload->setIcon(QIcon("theme:icons/arrow_right_green.svg"));
+    aUpload->setIcon(QPixmap("theme:icons/arrow_right_green"));
     connect(aUpload, SIGNAL(triggered()), this, SLOT(actUpload()));
     aDeleteLocalDeck = new QAction(this);
-    aDeleteLocalDeck->setIcon(QIcon("theme:icons/remove_row.svg"));
+    aDeleteLocalDeck->setIcon(QPixmap("theme:icons/remove_row"));
     connect(aDeleteLocalDeck, SIGNAL(triggered()), this, SLOT(actDeleteLocalDeck()));
     aOpenRemoteDeck = new QAction(this);
-    aOpenRemoteDeck->setIcon(QIcon("theme:icons/pencil.svg"));
+    aOpenRemoteDeck->setIcon(QPixmap("theme:icons/pencil"));
     connect(aOpenRemoteDeck, SIGNAL(triggered()), this, SLOT(actOpenRemoteDeck()));
     aDownload = new QAction(this);
-    aDownload->setIcon(QIcon("theme:icons/arrow_left_green.svg"));
+    aDownload->setIcon(QPixmap("theme:icons/arrow_left_green"));
     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:icons/remove_row.svg"));
+    aDeleteRemoteDeck->setIcon(QPixmap("theme:icons/remove_row"));
     connect(aDeleteRemoteDeck, SIGNAL(triggered()), this, SLOT(actDeleteRemoteDeck()));
     
     leftToolBar->addAction(aOpenLocalDeck);

cockatrice/src/tab_game.cpp

@@ -363,17 +363,17 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
     
     replayStartButton = new QToolButton;
     replayStartButton->setIconSize(QSize(32, 32));
-    replayStartButton->setIcon(QIcon("theme:replay/start.svg"));
+    replayStartButton->setIcon(QPixmap("theme:replay/start"));
     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(QPixmap("theme:replay/pause"));
     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(QPixmap("theme:replay/fastforward"));
     replayFastForwardButton->setCheckable(true);
     connect(replayFastForwardButton, SIGNAL(toggled(bool)), this, SLOT(replayFastForwardButtonToggled(bool)));
     

cockatrice/src/tab_replays.cpp

@@ -78,24 +78,24 @@ TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client)
     hbox->addWidget(rightGroupBox);
     
     aOpenLocalReplay = new QAction(this);
-    aOpenLocalReplay->setIcon(QIcon("theme:icons/view.svg"));
+    aOpenLocalReplay->setIcon(QPixmap("theme:icons/view"));
     connect(aOpenLocalReplay, SIGNAL(triggered()), this, SLOT(actOpenLocalReplay()));
     connect(localDirView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(actOpenLocalReplay()));
     aDeleteLocalReplay = new QAction(this);
-    aDeleteLocalReplay->setIcon(QIcon("theme:icons/remove_row.svg"));
+    aDeleteLocalReplay->setIcon(QPixmap("theme:icons/remove_row"));
     connect(aDeleteLocalReplay, SIGNAL(triggered()), this, SLOT(actDeleteLocalReplay()));
     aOpenRemoteReplay = new QAction(this);
-    aOpenRemoteReplay->setIcon(QIcon("theme:icons/view.svg"));
+    aOpenRemoteReplay->setIcon(QPixmap("theme:icons/view"));
     connect(aOpenRemoteReplay, SIGNAL(triggered()), this, SLOT(actOpenRemoteReplay()));
     connect(serverDirView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(actOpenRemoteReplay()));
     aDownload = new QAction(this);
-    aDownload->setIcon(QIcon("theme:icons/arrow_left_green.svg"));
+    aDownload->setIcon(QPixmap("theme:icons/arrow_left_green"));
     connect(aDownload, SIGNAL(triggered()), this, SLOT(actDownload()));
     aKeep = new QAction(this);
-    aKeep->setIcon(QIcon("theme:icons/lock.svg"));
+    aKeep->setIcon(QPixmap("theme:icons/lock"));
     connect(aKeep, SIGNAL(triggered()), this, SLOT(actKeepRemoteReplay()));
     aDeleteRemoteReplay = new QAction(this);
-    aDeleteRemoteReplay->setIcon(QIcon("theme:icons/remove_row.svg"));
+    aDeleteRemoteReplay->setIcon(QPixmap("theme:icons/remove_row"));
     connect(aDeleteRemoteReplay, SIGNAL(triggered()), this, SLOT(actDeleteRemoteReplay()));
     
     leftToolBar->addAction(aOpenLocalReplay);

cockatrice/src/tab_room.cpp

@@ -71,7 +71,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, ServerI
     connect(aOpenChatSettings, SIGNAL(triggered()), this, SLOT(actOpenChatSettings()));
 
     QToolButton *chatSettingsButton = new QToolButton;
-    chatSettingsButton->setIcon(QIcon("theme:icons/settings.svg"));
+    chatSettingsButton->setIcon(QPixmap("theme:icons/settings"));
     chatSettingsButton->setMenu(chatSettingsMenu);
     chatSettingsButton->setPopupMode(QToolButton::InstantPopup);