From 00e3e63f410fbf2a145c3f8dfc607416892751f7 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sun, 13 Sep 2015 00:14:36 +0200 Subject: [PATCH] Themes: remove all hardcoded extensions --- cockatrice/cockatrice.qrc | 2 +- .../resources/{back.svg => cardback.svg} | 0 cockatrice/src/carddatabase.cpp | 4 +- cockatrice/src/dlg_edit_tokens.cpp | 4 +- cockatrice/src/dlg_edit_user.cpp | 8 +- cockatrice/src/dlg_register.cpp | 506 +++++++++--------- cockatrice/src/dlg_settings.cpp | 22 +- cockatrice/src/filterbuilder.cpp | 2 +- cockatrice/src/gameselector.cpp | 4 +- cockatrice/src/handcounter.cpp | 7 +- cockatrice/src/main.cpp | 4 +- cockatrice/src/pixmapgenerator.cpp | 60 +-- cockatrice/src/playerlistwidget.cpp | 12 +- .../src/remotereplaylist_treewidget.cpp | 2 +- cockatrice/src/sequenceEdit/sequenceedit.cpp | 4 +- cockatrice/src/tab_deck_editor.cpp | 24 +- cockatrice/src/tab_deck_storage.cpp | 12 +- cockatrice/src/tab_game.cpp | 6 +- cockatrice/src/tab_replays.cpp | 12 +- cockatrice/src/tab_room.cpp | 2 +- cockatrice/src/tab_supervisor.cpp | 4 +- cockatrice/src/tab_supervisor.h | 1 - cockatrice/src/thememanager.cpp | 48 +- cockatrice/src/thememanager.h | 3 - cockatrice/src/window_main.cpp | 4 +- cockatrice/src/window_sets.cpp | 8 +- cockatrice/src/zoneviewwidget.cpp | 2 +- 27 files changed, 348 insertions(+), 419 deletions(-) rename cockatrice/resources/{back.svg => cardback.svg} (100%) diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc index 84a5e651..9e0c11c0 100644 --- a/cockatrice/cockatrice.qrc +++ b/cockatrice/cockatrice.qrc @@ -1,6 +1,6 @@ - resources/back.svg + resources/cardback.svg resources/cockatrice.svg resources/hand.svg resources/hr.jpg diff --git a/cockatrice/resources/back.svg b/cockatrice/resources/cardback.svg similarity index 100% rename from cockatrice/resources/back.svg rename to cockatrice/resources/cardback.svg diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp index 0a4cd876..3e5a1489 100644 --- a/cockatrice/src/carddatabase.cpp +++ b/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; diff --git a/cockatrice/src/dlg_edit_tokens.cpp b/cockatrice/src/dlg_edit_tokens.cpp index 9f024ed5..92725866 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: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; diff --git a/cockatrice/src/dlg_edit_user.cpp b/cockatrice/src/dlg_edit_user.cpp index 570a1058..57d51ef6 100644 --- a/cockatrice/src/dlg_edit_user.cpp +++ b/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); diff --git a/cockatrice/src/dlg_register.cpp b/cockatrice/src/dlg_register.cpp index f97a954d..2ccde232 100644 --- a/cockatrice/src/dlg_register.cpp +++ b/cockatrice/src/dlg_register.cpp @@ -46,268 +46,268 @@ DlgRegister::DlgRegister(QWidget *parent) 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(0); countryLabel = new QLabel(tr("Country:")); countryEdit = new QComboBox(); countryLabel->setBuddy(countryEdit); countryEdit->insertItem(0, tr("Undefined")); - countryEdit->addItem(QPixmap("theme:countries/ad.svg"), "ad"); - countryEdit->addItem(QIcon("theme:countries/ae.svg"), "ae"); - countryEdit->addItem(QIcon("theme:countries/af.svg"), "af"); - countryEdit->addItem(QIcon("theme:countries/ag.svg"), "ag"); - countryEdit->addItem(QIcon("theme:countries/ai.svg"), "ai"); - countryEdit->addItem(QIcon("theme:countries/al.svg"), "al"); - countryEdit->addItem(QIcon("theme:countries/am.svg"), "am"); - countryEdit->addItem(QIcon("theme:countries/ao.svg"), "ao"); - countryEdit->addItem(QIcon("theme:countries/aq.svg"), "aq"); - countryEdit->addItem(QIcon("theme:countries/ar.svg"), "ar"); - countryEdit->addItem(QIcon("theme:countries/as.svg"), "as"); - countryEdit->addItem(QIcon("theme:countries/at.svg"), "at"); - countryEdit->addItem(QIcon("theme:countries/au.svg"), "au"); - countryEdit->addItem(QIcon("theme:countries/aw.svg"), "aw"); - countryEdit->addItem(QIcon("theme:countries/ax.svg"), "ax"); - countryEdit->addItem(QIcon("theme:countries/az.svg"), "az"); - countryEdit->addItem(QIcon("theme:countries/ba.svg"), "ba"); - countryEdit->addItem(QIcon("theme:countries/bb.svg"), "bb"); - countryEdit->addItem(QIcon("theme:countries/bd.svg"), "bd"); - countryEdit->addItem(QIcon("theme:countries/be.svg"), "be"); - countryEdit->addItem(QIcon("theme:countries/bf.svg"), "bf"); - countryEdit->addItem(QIcon("theme:countries/bg.svg"), "bg"); - countryEdit->addItem(QIcon("theme:countries/bh.svg"), "bh"); - countryEdit->addItem(QIcon("theme:countries/bi.svg"), "bi"); - countryEdit->addItem(QIcon("theme:countries/bj.svg"), "bj"); - countryEdit->addItem(QIcon("theme:countries/bl.svg"), "bl"); - countryEdit->addItem(QIcon("theme:countries/bm.svg"), "bm"); - countryEdit->addItem(QIcon("theme:countries/bn.svg"), "bn"); - countryEdit->addItem(QIcon("theme:countries/bo.svg"), "bo"); - countryEdit->addItem(QIcon("theme:countries/bq.svg"), "bq"); - countryEdit->addItem(QIcon("theme:countries/br.svg"), "br"); - countryEdit->addItem(QIcon("theme:countries/bs.svg"), "bs"); - countryEdit->addItem(QIcon("theme:countries/bt.svg"), "bt"); - countryEdit->addItem(QIcon("theme:countries/bv.svg"), "bv"); - countryEdit->addItem(QIcon("theme:countries/bw.svg"), "bw"); - countryEdit->addItem(QIcon("theme:countries/by.svg"), "by"); - countryEdit->addItem(QIcon("theme:countries/bz.svg"), "bz"); - countryEdit->addItem(QIcon("theme:countries/ca.svg"), "ca"); - countryEdit->addItem(QIcon("theme:countries/cc.svg"), "cc"); - countryEdit->addItem(QIcon("theme:countries/cd.svg"), "cd"); - countryEdit->addItem(QIcon("theme:countries/cf.svg"), "cf"); - countryEdit->addItem(QIcon("theme:countries/cg.svg"), "cg"); - countryEdit->addItem(QIcon("theme:countries/ch.svg"), "ch"); - countryEdit->addItem(QIcon("theme:countries/ci.svg"), "ci"); - countryEdit->addItem(QIcon("theme:countries/ck.svg"), "ck"); - countryEdit->addItem(QIcon("theme:countries/cl.svg"), "cl"); - countryEdit->addItem(QIcon("theme:countries/cm.svg"), "cm"); - countryEdit->addItem(QIcon("theme:countries/cn.svg"), "cn"); - countryEdit->addItem(QIcon("theme:countries/co.svg"), "co"); - countryEdit->addItem(QIcon("theme:countries/cr.svg"), "cr"); - countryEdit->addItem(QIcon("theme:countries/cu.svg"), "cu"); - countryEdit->addItem(QIcon("theme:countries/cv.svg"), "cv"); - countryEdit->addItem(QIcon("theme:countries/cw.svg"), "cw"); - countryEdit->addItem(QIcon("theme:countries/cx.svg"), "cx"); - countryEdit->addItem(QIcon("theme:countries/cy.svg"), "cy"); - countryEdit->addItem(QIcon("theme:countries/cz.svg"), "cz"); - countryEdit->addItem(QIcon("theme:countries/de.svg"), "de"); - countryEdit->addItem(QIcon("theme:countries/dj.svg"), "dj"); - countryEdit->addItem(QIcon("theme:countries/dk.svg"), "dk"); - countryEdit->addItem(QIcon("theme:countries/dm.svg"), "dm"); - countryEdit->addItem(QIcon("theme:countries/do.svg"), "do"); - countryEdit->addItem(QIcon("theme:countries/dz.svg"), "dz"); - countryEdit->addItem(QIcon("theme:countries/ec.svg"), "ec"); - countryEdit->addItem(QIcon("theme:countries/ee.svg"), "ee"); - countryEdit->addItem(QIcon("theme:countries/eg.svg"), "eg"); - countryEdit->addItem(QIcon("theme:countries/eh.svg"), "eh"); - countryEdit->addItem(QIcon("theme:countries/er.svg"), "er"); - countryEdit->addItem(QIcon("theme:countries/es.svg"), "es"); - countryEdit->addItem(QIcon("theme:countries/et.svg"), "et"); - countryEdit->addItem(QIcon("theme:countries/fi.svg"), "fi"); - countryEdit->addItem(QIcon("theme:countries/fj.svg"), "fj"); - countryEdit->addItem(QIcon("theme:countries/fk.svg"), "fk"); - countryEdit->addItem(QIcon("theme:countries/fm.svg"), "fm"); - countryEdit->addItem(QIcon("theme:countries/fo.svg"), "fo"); - countryEdit->addItem(QIcon("theme:countries/fr.svg"), "fr"); - countryEdit->addItem(QIcon("theme:countries/ga.svg"), "ga"); - countryEdit->addItem(QIcon("theme:countries/gb.svg"), "gb"); - countryEdit->addItem(QIcon("theme:countries/gd.svg"), "gd"); - countryEdit->addItem(QIcon("theme:countries/ge.svg"), "ge"); - countryEdit->addItem(QIcon("theme:countries/gf.svg"), "gf"); - countryEdit->addItem(QIcon("theme:countries/gg.svg"), "gg"); - countryEdit->addItem(QIcon("theme:countries/gh.svg"), "gh"); - countryEdit->addItem(QIcon("theme:countries/gi.svg"), "gi"); - countryEdit->addItem(QIcon("theme:countries/gl.svg"), "gl"); - countryEdit->addItem(QIcon("theme:countries/gm.svg"), "gm"); - countryEdit->addItem(QIcon("theme:countries/gn.svg"), "gn"); - countryEdit->addItem(QIcon("theme:countries/gp.svg"), "gp"); - countryEdit->addItem(QIcon("theme:countries/gq.svg"), "gq"); - countryEdit->addItem(QIcon("theme:countries/gr.svg"), "gr"); - countryEdit->addItem(QIcon("theme:countries/gs.svg"), "gs"); - countryEdit->addItem(QIcon("theme:countries/gt.svg"), "gt"); - countryEdit->addItem(QIcon("theme:countries/gu.svg"), "gu"); - countryEdit->addItem(QIcon("theme:countries/gw.svg"), "gw"); - countryEdit->addItem(QIcon("theme:countries/gy.svg"), "gy"); - countryEdit->addItem(QIcon("theme:countries/hk.svg"), "hk"); - countryEdit->addItem(QIcon("theme:countries/hm.svg"), "hm"); - countryEdit->addItem(QIcon("theme:countries/hn.svg"), "hn"); - countryEdit->addItem(QIcon("theme:countries/hr.svg"), "hr"); - countryEdit->addItem(QIcon("theme:countries/ht.svg"), "ht"); - countryEdit->addItem(QIcon("theme:countries/hu.svg"), "hu"); - countryEdit->addItem(QIcon("theme:countries/id.svg"), "id"); - countryEdit->addItem(QIcon("theme:countries/ie.svg"), "ie"); - countryEdit->addItem(QIcon("theme:countries/il.svg"), "il"); - countryEdit->addItem(QIcon("theme:countries/im.svg"), "im"); - countryEdit->addItem(QIcon("theme:countries/in.svg"), "in"); - countryEdit->addItem(QIcon("theme:countries/io.svg"), "io"); - countryEdit->addItem(QIcon("theme:countries/iq.svg"), "iq"); - countryEdit->addItem(QIcon("theme:countries/ir.svg"), "ir"); - countryEdit->addItem(QIcon("theme:countries/is.svg"), "is"); - countryEdit->addItem(QIcon("theme:countries/it.svg"), "it"); - countryEdit->addItem(QIcon("theme:countries/je.svg"), "je"); - countryEdit->addItem(QIcon("theme:countries/jm.svg"), "jm"); - countryEdit->addItem(QIcon("theme:countries/jo.svg"), "jo"); - countryEdit->addItem(QIcon("theme:countries/jp.svg"), "jp"); - countryEdit->addItem(QIcon("theme:countries/ke.svg"), "ke"); - countryEdit->addItem(QIcon("theme:countries/kg.svg"), "kg"); - countryEdit->addItem(QIcon("theme:countries/kh.svg"), "kh"); - countryEdit->addItem(QIcon("theme:countries/ki.svg"), "ki"); - countryEdit->addItem(QIcon("theme:countries/km.svg"), "km"); - countryEdit->addItem(QIcon("theme:countries/kn.svg"), "kn"); - countryEdit->addItem(QIcon("theme:countries/kp.svg"), "kp"); - countryEdit->addItem(QIcon("theme:countries/kr.svg"), "kr"); - countryEdit->addItem(QIcon("theme:countries/kw.svg"), "kw"); - countryEdit->addItem(QIcon("theme:countries/ky.svg"), "ky"); - countryEdit->addItem(QIcon("theme:countries/kz.svg"), "kz"); - countryEdit->addItem(QIcon("theme:countries/la.svg"), "la"); - countryEdit->addItem(QIcon("theme:countries/lb.svg"), "lb"); - countryEdit->addItem(QIcon("theme:countries/lc.svg"), "lc"); - countryEdit->addItem(QIcon("theme:countries/li.svg"), "li"); - countryEdit->addItem(QIcon("theme:countries/lk.svg"), "lk"); - countryEdit->addItem(QIcon("theme:countries/lr.svg"), "lr"); - countryEdit->addItem(QIcon("theme:countries/ls.svg"), "ls"); - countryEdit->addItem(QIcon("theme:countries/lt.svg"), "lt"); - countryEdit->addItem(QIcon("theme:countries/lu.svg"), "lu"); - countryEdit->addItem(QIcon("theme:countries/lv.svg"), "lv"); - countryEdit->addItem(QIcon("theme:countries/ly.svg"), "ly"); - countryEdit->addItem(QIcon("theme:countries/ma.svg"), "ma"); - countryEdit->addItem(QIcon("theme:countries/mc.svg"), "mc"); - countryEdit->addItem(QIcon("theme:countries/md.svg"), "md"); - countryEdit->addItem(QIcon("theme:countries/me.svg"), "me"); - countryEdit->addItem(QIcon("theme:countries/mf.svg"), "mf"); - countryEdit->addItem(QIcon("theme:countries/mg.svg"), "mg"); - countryEdit->addItem(QIcon("theme:countries/mh.svg"), "mh"); - countryEdit->addItem(QIcon("theme:countries/mk.svg"), "mk"); - countryEdit->addItem(QIcon("theme:countries/ml.svg"), "ml"); - countryEdit->addItem(QIcon("theme:countries/mm.svg"), "mm"); - countryEdit->addItem(QIcon("theme:countries/mn.svg"), "mn"); - countryEdit->addItem(QIcon("theme:countries/mo.svg"), "mo"); - countryEdit->addItem(QIcon("theme:countries/mp.svg"), "mp"); - countryEdit->addItem(QIcon("theme:countries/mq.svg"), "mq"); - countryEdit->addItem(QIcon("theme:countries/mr.svg"), "mr"); - countryEdit->addItem(QIcon("theme:countries/ms.svg"), "ms"); - countryEdit->addItem(QIcon("theme:countries/mt.svg"), "mt"); - countryEdit->addItem(QIcon("theme:countries/mu.svg"), "mu"); - countryEdit->addItem(QIcon("theme:countries/mv.svg"), "mv"); - countryEdit->addItem(QIcon("theme:countries/mw.svg"), "mw"); - countryEdit->addItem(QIcon("theme:countries/mx.svg"), "mx"); - countryEdit->addItem(QIcon("theme:countries/my.svg"), "my"); - countryEdit->addItem(QIcon("theme:countries/mz.svg"), "mz"); - countryEdit->addItem(QIcon("theme:countries/na.svg"), "na"); - countryEdit->addItem(QIcon("theme:countries/nc.svg"), "nc"); - countryEdit->addItem(QIcon("theme:countries/ne.svg"), "ne"); - countryEdit->addItem(QIcon("theme:countries/nf.svg"), "nf"); - countryEdit->addItem(QIcon("theme:countries/ng.svg"), "ng"); - countryEdit->addItem(QIcon("theme:countries/ni.svg"), "ni"); - countryEdit->addItem(QIcon("theme:countries/nl.svg"), "nl"); - countryEdit->addItem(QIcon("theme:countries/no.svg"), "no"); - countryEdit->addItem(QIcon("theme:countries/np.svg"), "np"); - countryEdit->addItem(QIcon("theme:countries/nr.svg"), "nr"); - countryEdit->addItem(QIcon("theme:countries/nu.svg"), "nu"); - countryEdit->addItem(QIcon("theme:countries/nz.svg"), "nz"); - countryEdit->addItem(QIcon("theme:countries/om.svg"), "om"); - countryEdit->addItem(QIcon("theme:countries/pa.svg"), "pa"); - countryEdit->addItem(QIcon("theme:countries/pe.svg"), "pe"); - countryEdit->addItem(QIcon("theme:countries/pf.svg"), "pf"); - countryEdit->addItem(QIcon("theme:countries/pg.svg"), "pg"); - countryEdit->addItem(QIcon("theme:countries/ph.svg"), "ph"); - countryEdit->addItem(QIcon("theme:countries/pk.svg"), "pk"); - countryEdit->addItem(QIcon("theme:countries/pl.svg"), "pl"); - countryEdit->addItem(QIcon("theme:countries/pm.svg"), "pm"); - countryEdit->addItem(QIcon("theme:countries/pn.svg"), "pn"); - countryEdit->addItem(QIcon("theme:countries/pr.svg"), "pr"); - countryEdit->addItem(QIcon("theme:countries/ps.svg"), "ps"); - countryEdit->addItem(QIcon("theme:countries/pt.svg"), "pt"); - countryEdit->addItem(QIcon("theme:countries/pw.svg"), "pw"); - countryEdit->addItem(QIcon("theme:countries/py.svg"), "py"); - countryEdit->addItem(QIcon("theme:countries/qa.svg"), "qa"); - countryEdit->addItem(QIcon("theme:countries/re.svg"), "re"); - countryEdit->addItem(QIcon("theme:countries/ro.svg"), "ro"); - countryEdit->addItem(QIcon("theme:countries/rs.svg"), "rs"); - countryEdit->addItem(QIcon("theme:countries/ru.svg"), "ru"); - countryEdit->addItem(QIcon("theme:countries/rw.svg"), "rw"); - countryEdit->addItem(QIcon("theme:countries/sa.svg"), "sa"); - countryEdit->addItem(QIcon("theme:countries/sb.svg"), "sb"); - countryEdit->addItem(QIcon("theme:countries/sc.svg"), "sc"); - countryEdit->addItem(QIcon("theme:countries/sd.svg"), "sd"); - countryEdit->addItem(QIcon("theme:countries/se.svg"), "se"); - countryEdit->addItem(QIcon("theme:countries/sg.svg"), "sg"); - countryEdit->addItem(QIcon("theme:countries/sh.svg"), "sh"); - countryEdit->addItem(QIcon("theme:countries/si.svg"), "si"); - countryEdit->addItem(QIcon("theme:countries/sj.svg"), "sj"); - countryEdit->addItem(QIcon("theme:countries/sk.svg"), "sk"); - countryEdit->addItem(QIcon("theme:countries/sl.svg"), "sl"); - countryEdit->addItem(QIcon("theme:countries/sm.svg"), "sm"); - countryEdit->addItem(QIcon("theme:countries/sn.svg"), "sn"); - countryEdit->addItem(QIcon("theme:countries/so.svg"), "so"); - countryEdit->addItem(QIcon("theme:countries/sr.svg"), "sr"); - countryEdit->addItem(QIcon("theme:countries/ss.svg"), "ss"); - countryEdit->addItem(QIcon("theme:countries/st.svg"), "st"); - countryEdit->addItem(QIcon("theme:countries/sv.svg"), "sv"); - countryEdit->addItem(QIcon("theme:countries/sx.svg"), "sx"); - countryEdit->addItem(QIcon("theme:countries/sy.svg"), "sy"); - countryEdit->addItem(QIcon("theme:countries/sz.svg"), "sz"); - countryEdit->addItem(QIcon("theme:countries/tc.svg"), "tc"); - countryEdit->addItem(QIcon("theme:countries/td.svg"), "td"); - countryEdit->addItem(QIcon("theme:countries/tf.svg"), "tf"); - countryEdit->addItem(QIcon("theme:countries/tg.svg"), "tg"); - countryEdit->addItem(QIcon("theme:countries/th.svg"), "th"); - countryEdit->addItem(QIcon("theme:countries/tj.svg"), "tj"); - countryEdit->addItem(QIcon("theme:countries/tk.svg"), "tk"); - countryEdit->addItem(QIcon("theme:countries/tl.svg"), "tl"); - countryEdit->addItem(QIcon("theme:countries/tm.svg"), "tm"); - countryEdit->addItem(QIcon("theme:countries/tn.svg"), "tn"); - countryEdit->addItem(QIcon("theme:countries/to.svg"), "to"); - countryEdit->addItem(QIcon("theme:countries/tr.svg"), "tr"); - countryEdit->addItem(QIcon("theme:countries/tt.svg"), "tt"); - countryEdit->addItem(QIcon("theme:countries/tv.svg"), "tv"); - countryEdit->addItem(QIcon("theme:countries/tw.svg"), "tw"); - countryEdit->addItem(QIcon("theme:countries/tz.svg"), "tz"); - countryEdit->addItem(QIcon("theme:countries/ua.svg"), "ua"); - countryEdit->addItem(QIcon("theme:countries/ug.svg"), "ug"); - countryEdit->addItem(QIcon("theme:countries/um.svg"), "um"); - countryEdit->addItem(QIcon("theme:countries/us.svg"), "us"); - countryEdit->addItem(QIcon("theme:countries/uy.svg"), "uy"); - countryEdit->addItem(QIcon("theme:countries/uz.svg"), "uz"); - countryEdit->addItem(QIcon("theme:countries/va.svg"), "va"); - countryEdit->addItem(QIcon("theme:countries/vc.svg"), "vc"); - countryEdit->addItem(QIcon("theme:countries/ve.svg"), "ve"); - countryEdit->addItem(QIcon("theme:countries/vg.svg"), "vg"); - countryEdit->addItem(QIcon("theme:countries/vi.svg"), "vi"); - countryEdit->addItem(QIcon("theme:countries/vn.svg"), "vn"); - countryEdit->addItem(QIcon("theme:countries/vu.svg"), "vu"); - countryEdit->addItem(QIcon("theme:countries/wf.svg"), "wf"); - countryEdit->addItem(QIcon("theme:countries/ws.svg"), "ws"); - countryEdit->addItem(QIcon("theme:countries/ye.svg"), "ye"); - countryEdit->addItem(QIcon("theme:countries/yt.svg"), "yt"); - countryEdit->addItem(QIcon("theme:countries/za.svg"), "za"); - countryEdit->addItem(QIcon("theme:countries/zm.svg"), "zm"); - countryEdit->addItem(QIcon("theme:countries/zw.svg"), "zw"); + countryEdit->addItem(QPixmap("theme:countries/ad"), "ad"); + countryEdit->addItem(QPixmap("theme:countries/ae"), "ae"); + countryEdit->addItem(QPixmap("theme:countries/af"), "af"); + countryEdit->addItem(QPixmap("theme:countries/ag"), "ag"); + countryEdit->addItem(QPixmap("theme:countries/ai"), "ai"); + countryEdit->addItem(QPixmap("theme:countries/al"), "al"); + countryEdit->addItem(QPixmap("theme:countries/am"), "am"); + countryEdit->addItem(QPixmap("theme:countries/ao"), "ao"); + countryEdit->addItem(QPixmap("theme:countries/aq"), "aq"); + countryEdit->addItem(QPixmap("theme:countries/ar"), "ar"); + countryEdit->addItem(QPixmap("theme:countries/as"), "as"); + countryEdit->addItem(QPixmap("theme:countries/at"), "at"); + countryEdit->addItem(QPixmap("theme:countries/au"), "au"); + countryEdit->addItem(QPixmap("theme:countries/aw"), "aw"); + countryEdit->addItem(QPixmap("theme:countries/ax"), "ax"); + countryEdit->addItem(QPixmap("theme:countries/az"), "az"); + countryEdit->addItem(QPixmap("theme:countries/ba"), "ba"); + countryEdit->addItem(QPixmap("theme:countries/bb"), "bb"); + countryEdit->addItem(QPixmap("theme:countries/bd"), "bd"); + countryEdit->addItem(QPixmap("theme:countries/be"), "be"); + countryEdit->addItem(QPixmap("theme:countries/bf"), "bf"); + countryEdit->addItem(QPixmap("theme:countries/bg"), "bg"); + countryEdit->addItem(QPixmap("theme:countries/bh"), "bh"); + countryEdit->addItem(QPixmap("theme:countries/bi"), "bi"); + countryEdit->addItem(QPixmap("theme:countries/bj"), "bj"); + countryEdit->addItem(QPixmap("theme:countries/bl"), "bl"); + countryEdit->addItem(QPixmap("theme:countries/bm"), "bm"); + countryEdit->addItem(QPixmap("theme:countries/bn"), "bn"); + countryEdit->addItem(QPixmap("theme:countries/bo"), "bo"); + countryEdit->addItem(QPixmap("theme:countries/bq"), "bq"); + countryEdit->addItem(QPixmap("theme:countries/br"), "br"); + countryEdit->addItem(QPixmap("theme:countries/bs"), "bs"); + countryEdit->addItem(QPixmap("theme:countries/bt"), "bt"); + countryEdit->addItem(QPixmap("theme:countries/bv"), "bv"); + countryEdit->addItem(QPixmap("theme:countries/bw"), "bw"); + countryEdit->addItem(QPixmap("theme:countries/by"), "by"); + countryEdit->addItem(QPixmap("theme:countries/bz"), "bz"); + countryEdit->addItem(QPixmap("theme:countries/ca"), "ca"); + countryEdit->addItem(QPixmap("theme:countries/cc"), "cc"); + countryEdit->addItem(QPixmap("theme:countries/cd"), "cd"); + countryEdit->addItem(QPixmap("theme:countries/cf"), "cf"); + countryEdit->addItem(QPixmap("theme:countries/cg"), "cg"); + countryEdit->addItem(QPixmap("theme:countries/ch"), "ch"); + countryEdit->addItem(QPixmap("theme:countries/ci"), "ci"); + countryEdit->addItem(QPixmap("theme:countries/ck"), "ck"); + countryEdit->addItem(QPixmap("theme:countries/cl"), "cl"); + countryEdit->addItem(QPixmap("theme:countries/cm"), "cm"); + countryEdit->addItem(QPixmap("theme:countries/cn"), "cn"); + countryEdit->addItem(QPixmap("theme:countries/co"), "co"); + countryEdit->addItem(QPixmap("theme:countries/cr"), "cr"); + countryEdit->addItem(QPixmap("theme:countries/cu"), "cu"); + countryEdit->addItem(QPixmap("theme:countries/cv"), "cv"); + countryEdit->addItem(QPixmap("theme:countries/cw"), "cw"); + countryEdit->addItem(QPixmap("theme:countries/cx"), "cx"); + countryEdit->addItem(QPixmap("theme:countries/cy"), "cy"); + countryEdit->addItem(QPixmap("theme:countries/cz"), "cz"); + countryEdit->addItem(QPixmap("theme:countries/de"), "de"); + countryEdit->addItem(QPixmap("theme:countries/dj"), "dj"); + countryEdit->addItem(QPixmap("theme:countries/dk"), "dk"); + countryEdit->addItem(QPixmap("theme:countries/dm"), "dm"); + countryEdit->addItem(QPixmap("theme:countries/do"), "do"); + countryEdit->addItem(QPixmap("theme:countries/dz"), "dz"); + countryEdit->addItem(QPixmap("theme:countries/ec"), "ec"); + countryEdit->addItem(QPixmap("theme:countries/ee"), "ee"); + countryEdit->addItem(QPixmap("theme:countries/eg"), "eg"); + countryEdit->addItem(QPixmap("theme:countries/eh"), "eh"); + countryEdit->addItem(QPixmap("theme:countries/er"), "er"); + countryEdit->addItem(QPixmap("theme:countries/es"), "es"); + countryEdit->addItem(QPixmap("theme:countries/et"), "et"); + countryEdit->addItem(QPixmap("theme:countries/fi"), "fi"); + countryEdit->addItem(QPixmap("theme:countries/fj"), "fj"); + countryEdit->addItem(QPixmap("theme:countries/fk"), "fk"); + countryEdit->addItem(QPixmap("theme:countries/fm"), "fm"); + countryEdit->addItem(QPixmap("theme:countries/fo"), "fo"); + countryEdit->addItem(QPixmap("theme:countries/fr"), "fr"); + countryEdit->addItem(QPixmap("theme:countries/ga"), "ga"); + countryEdit->addItem(QPixmap("theme:countries/gb"), "gb"); + countryEdit->addItem(QPixmap("theme:countries/gd"), "gd"); + countryEdit->addItem(QPixmap("theme:countries/ge"), "ge"); + countryEdit->addItem(QPixmap("theme:countries/gf"), "gf"); + countryEdit->addItem(QPixmap("theme:countries/gg"), "gg"); + countryEdit->addItem(QPixmap("theme:countries/gh"), "gh"); + countryEdit->addItem(QPixmap("theme:countries/gi"), "gi"); + countryEdit->addItem(QPixmap("theme:countries/gl"), "gl"); + countryEdit->addItem(QPixmap("theme:countries/gm"), "gm"); + countryEdit->addItem(QPixmap("theme:countries/gn"), "gn"); + countryEdit->addItem(QPixmap("theme:countries/gp"), "gp"); + countryEdit->addItem(QPixmap("theme:countries/gq"), "gq"); + countryEdit->addItem(QPixmap("theme:countries/gr"), "gr"); + countryEdit->addItem(QPixmap("theme:countries/gs"), "gs"); + countryEdit->addItem(QPixmap("theme:countries/gt"), "gt"); + countryEdit->addItem(QPixmap("theme:countries/gu"), "gu"); + countryEdit->addItem(QPixmap("theme:countries/gw"), "gw"); + countryEdit->addItem(QPixmap("theme:countries/gy"), "gy"); + countryEdit->addItem(QPixmap("theme:countries/hk"), "hk"); + countryEdit->addItem(QPixmap("theme:countries/hm"), "hm"); + countryEdit->addItem(QPixmap("theme:countries/hn"), "hn"); + countryEdit->addItem(QPixmap("theme:countries/hr"), "hr"); + countryEdit->addItem(QPixmap("theme:countries/ht"), "ht"); + countryEdit->addItem(QPixmap("theme:countries/hu"), "hu"); + countryEdit->addItem(QPixmap("theme:countries/id"), "id"); + countryEdit->addItem(QPixmap("theme:countries/ie"), "ie"); + countryEdit->addItem(QPixmap("theme:countries/il"), "il"); + countryEdit->addItem(QPixmap("theme:countries/im"), "im"); + countryEdit->addItem(QPixmap("theme:countries/in"), "in"); + countryEdit->addItem(QPixmap("theme:countries/io"), "io"); + countryEdit->addItem(QPixmap("theme:countries/iq"), "iq"); + countryEdit->addItem(QPixmap("theme:countries/ir"), "ir"); + countryEdit->addItem(QPixmap("theme:countries/is"), "is"); + countryEdit->addItem(QPixmap("theme:countries/it"), "it"); + countryEdit->addItem(QPixmap("theme:countries/je"), "je"); + countryEdit->addItem(QPixmap("theme:countries/jm"), "jm"); + countryEdit->addItem(QPixmap("theme:countries/jo"), "jo"); + countryEdit->addItem(QPixmap("theme:countries/jp"), "jp"); + countryEdit->addItem(QPixmap("theme:countries/ke"), "ke"); + countryEdit->addItem(QPixmap("theme:countries/kg"), "kg"); + countryEdit->addItem(QPixmap("theme:countries/kh"), "kh"); + countryEdit->addItem(QPixmap("theme:countries/ki"), "ki"); + countryEdit->addItem(QPixmap("theme:countries/km"), "km"); + countryEdit->addItem(QPixmap("theme:countries/kn"), "kn"); + countryEdit->addItem(QPixmap("theme:countries/kp"), "kp"); + countryEdit->addItem(QPixmap("theme:countries/kr"), "kr"); + countryEdit->addItem(QPixmap("theme:countries/kw"), "kw"); + countryEdit->addItem(QPixmap("theme:countries/ky"), "ky"); + countryEdit->addItem(QPixmap("theme:countries/kz"), "kz"); + countryEdit->addItem(QPixmap("theme:countries/la"), "la"); + countryEdit->addItem(QPixmap("theme:countries/lb"), "lb"); + countryEdit->addItem(QPixmap("theme:countries/lc"), "lc"); + countryEdit->addItem(QPixmap("theme:countries/li"), "li"); + countryEdit->addItem(QPixmap("theme:countries/lk"), "lk"); + countryEdit->addItem(QPixmap("theme:countries/lr"), "lr"); + countryEdit->addItem(QPixmap("theme:countries/ls"), "ls"); + countryEdit->addItem(QPixmap("theme:countries/lt"), "lt"); + countryEdit->addItem(QPixmap("theme:countries/lu"), "lu"); + countryEdit->addItem(QPixmap("theme:countries/lv"), "lv"); + countryEdit->addItem(QPixmap("theme:countries/ly"), "ly"); + countryEdit->addItem(QPixmap("theme:countries/ma"), "ma"); + countryEdit->addItem(QPixmap("theme:countries/mc"), "mc"); + countryEdit->addItem(QPixmap("theme:countries/md"), "md"); + countryEdit->addItem(QPixmap("theme:countries/me"), "me"); + countryEdit->addItem(QPixmap("theme:countries/mf"), "mf"); + countryEdit->addItem(QPixmap("theme:countries/mg"), "mg"); + countryEdit->addItem(QPixmap("theme:countries/mh"), "mh"); + countryEdit->addItem(QPixmap("theme:countries/mk"), "mk"); + countryEdit->addItem(QPixmap("theme:countries/ml"), "ml"); + countryEdit->addItem(QPixmap("theme:countries/mm"), "mm"); + countryEdit->addItem(QPixmap("theme:countries/mn"), "mn"); + countryEdit->addItem(QPixmap("theme:countries/mo"), "mo"); + countryEdit->addItem(QPixmap("theme:countries/mp"), "mp"); + countryEdit->addItem(QPixmap("theme:countries/mq"), "mq"); + countryEdit->addItem(QPixmap("theme:countries/mr"), "mr"); + countryEdit->addItem(QPixmap("theme:countries/ms"), "ms"); + countryEdit->addItem(QPixmap("theme:countries/mt"), "mt"); + countryEdit->addItem(QPixmap("theme:countries/mu"), "mu"); + countryEdit->addItem(QPixmap("theme:countries/mv"), "mv"); + countryEdit->addItem(QPixmap("theme:countries/mw"), "mw"); + countryEdit->addItem(QPixmap("theme:countries/mx"), "mx"); + countryEdit->addItem(QPixmap("theme:countries/my"), "my"); + countryEdit->addItem(QPixmap("theme:countries/mz"), "mz"); + countryEdit->addItem(QPixmap("theme:countries/na"), "na"); + countryEdit->addItem(QPixmap("theme:countries/nc"), "nc"); + countryEdit->addItem(QPixmap("theme:countries/ne"), "ne"); + countryEdit->addItem(QPixmap("theme:countries/nf"), "nf"); + countryEdit->addItem(QPixmap("theme:countries/ng"), "ng"); + countryEdit->addItem(QPixmap("theme:countries/ni"), "ni"); + countryEdit->addItem(QPixmap("theme:countries/nl"), "nl"); + countryEdit->addItem(QPixmap("theme:countries/no"), "no"); + countryEdit->addItem(QPixmap("theme:countries/np"), "np"); + countryEdit->addItem(QPixmap("theme:countries/nr"), "nr"); + countryEdit->addItem(QPixmap("theme:countries/nu"), "nu"); + countryEdit->addItem(QPixmap("theme:countries/nz"), "nz"); + countryEdit->addItem(QPixmap("theme:countries/om"), "om"); + countryEdit->addItem(QPixmap("theme:countries/pa"), "pa"); + countryEdit->addItem(QPixmap("theme:countries/pe"), "pe"); + countryEdit->addItem(QPixmap("theme:countries/pf"), "pf"); + countryEdit->addItem(QPixmap("theme:countries/pg"), "pg"); + countryEdit->addItem(QPixmap("theme:countries/ph"), "ph"); + countryEdit->addItem(QPixmap("theme:countries/pk"), "pk"); + countryEdit->addItem(QPixmap("theme:countries/pl"), "pl"); + countryEdit->addItem(QPixmap("theme:countries/pm"), "pm"); + countryEdit->addItem(QPixmap("theme:countries/pn"), "pn"); + countryEdit->addItem(QPixmap("theme:countries/pr"), "pr"); + countryEdit->addItem(QPixmap("theme:countries/ps"), "ps"); + countryEdit->addItem(QPixmap("theme:countries/pt"), "pt"); + countryEdit->addItem(QPixmap("theme:countries/pw"), "pw"); + countryEdit->addItem(QPixmap("theme:countries/py"), "py"); + countryEdit->addItem(QPixmap("theme:countries/qa"), "qa"); + countryEdit->addItem(QPixmap("theme:countries/re"), "re"); + countryEdit->addItem(QPixmap("theme:countries/ro"), "ro"); + countryEdit->addItem(QPixmap("theme:countries/rs"), "rs"); + countryEdit->addItem(QPixmap("theme:countries/ru"), "ru"); + countryEdit->addItem(QPixmap("theme:countries/rw"), "rw"); + countryEdit->addItem(QPixmap("theme:countries/sa"), "sa"); + countryEdit->addItem(QPixmap("theme:countries/sb"), "sb"); + countryEdit->addItem(QPixmap("theme:countries/sc"), "sc"); + countryEdit->addItem(QPixmap("theme:countries/sd"), "sd"); + countryEdit->addItem(QPixmap("theme:countries/se"), "se"); + countryEdit->addItem(QPixmap("theme:countries/sg"), "sg"); + countryEdit->addItem(QPixmap("theme:countries/sh"), "sh"); + countryEdit->addItem(QPixmap("theme:countries/si"), "si"); + countryEdit->addItem(QPixmap("theme:countries/sj"), "sj"); + countryEdit->addItem(QPixmap("theme:countries/sk"), "sk"); + countryEdit->addItem(QPixmap("theme:countries/sl"), "sl"); + countryEdit->addItem(QPixmap("theme:countries/sm"), "sm"); + countryEdit->addItem(QPixmap("theme:countries/sn"), "sn"); + countryEdit->addItem(QPixmap("theme:countries/so"), "so"); + countryEdit->addItem(QPixmap("theme:countries/sr"), "sr"); + countryEdit->addItem(QPixmap("theme:countries/ss"), "ss"); + countryEdit->addItem(QPixmap("theme:countries/st"), "st"); + countryEdit->addItem(QPixmap("theme:countries/sv"), "sv"); + countryEdit->addItem(QPixmap("theme:countries/sx"), "sx"); + countryEdit->addItem(QPixmap("theme:countries/sy"), "sy"); + countryEdit->addItem(QPixmap("theme:countries/sz"), "sz"); + countryEdit->addItem(QPixmap("theme:countries/tc"), "tc"); + countryEdit->addItem(QPixmap("theme:countries/td"), "td"); + countryEdit->addItem(QPixmap("theme:countries/tf"), "tf"); + countryEdit->addItem(QPixmap("theme:countries/tg"), "tg"); + countryEdit->addItem(QPixmap("theme:countries/th"), "th"); + countryEdit->addItem(QPixmap("theme:countries/tj"), "tj"); + countryEdit->addItem(QPixmap("theme:countries/tk"), "tk"); + countryEdit->addItem(QPixmap("theme:countries/tl"), "tl"); + countryEdit->addItem(QPixmap("theme:countries/tm"), "tm"); + countryEdit->addItem(QPixmap("theme:countries/tn"), "tn"); + countryEdit->addItem(QPixmap("theme:countries/to"), "to"); + countryEdit->addItem(QPixmap("theme:countries/tr"), "tr"); + countryEdit->addItem(QPixmap("theme:countries/tt"), "tt"); + countryEdit->addItem(QPixmap("theme:countries/tv"), "tv"); + countryEdit->addItem(QPixmap("theme:countries/tw"), "tw"); + countryEdit->addItem(QPixmap("theme:countries/tz"), "tz"); + countryEdit->addItem(QPixmap("theme:countries/ua"), "ua"); + countryEdit->addItem(QPixmap("theme:countries/ug"), "ug"); + countryEdit->addItem(QPixmap("theme:countries/um"), "um"); + countryEdit->addItem(QPixmap("theme:countries/us"), "us"); + countryEdit->addItem(QPixmap("theme:countries/uy"), "uy"); + countryEdit->addItem(QPixmap("theme:countries/uz"), "uz"); + countryEdit->addItem(QPixmap("theme:countries/va"), "va"); + countryEdit->addItem(QPixmap("theme:countries/vc"), "vc"); + countryEdit->addItem(QPixmap("theme:countries/ve"), "ve"); + countryEdit->addItem(QPixmap("theme:countries/vg"), "vg"); + countryEdit->addItem(QPixmap("theme:countries/vi"), "vi"); + countryEdit->addItem(QPixmap("theme:countries/vn"), "vn"); + countryEdit->addItem(QPixmap("theme:countries/vu"), "vu"); + countryEdit->addItem(QPixmap("theme:countries/wf"), "wf"); + countryEdit->addItem(QPixmap("theme:countries/ws"), "ws"); + countryEdit->addItem(QPixmap("theme:countries/ye"), "ye"); + countryEdit->addItem(QPixmap("theme:countries/yt"), "yt"); + countryEdit->addItem(QPixmap("theme:countries/za"), "za"); + countryEdit->addItem(QPixmap("theme:countries/zm"), "zm"); + countryEdit->addItem(QPixmap("theme:countries/zw"), "zw"); countryEdit->setCurrentIndex(0); QStringList countries = settingsCache->getCountries(); foreach(QString c, countries) - countryEdit->addItem(QPixmap("theme:countries/" + c.toLower() + ".svg"), c); + countryEdit->addItem(QPixmap("theme:countries/" + c.toLower()), c); realnameLabel = new QLabel(tr("Real name:")); realnameEdit = new QLineEdit(); diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp index f75bc50c..f810c7d3 100644 --- a/cockatrice/src/dlg_settings.cpp +++ b/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 *))); } diff --git a/cockatrice/src/filterbuilder.cpp b/cockatrice/src/filterbuilder.cpp index a07e40c5..d9b281c4 100644 --- a/cockatrice/src/filterbuilder.cpp +++ b/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); diff --git a/cockatrice/src/gameselector.cpp b/cockatrice/src/gameselector.cpp index 6c58b842..b471317e 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: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())); diff --git a/cockatrice/src/handcounter.cpp b/cockatrice/src/handcounter.cpp index 3b7ba1d9..c2e4ad6f 100644 --- a/cockatrice/src/handcounter.cpp +++ b/cockatrice/src/handcounter.cpp @@ -1,5 +1,4 @@ #include -#include #include #include #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(); diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index f01e993e..7f1eb73e 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -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()); diff --git a/cockatrice/src/pixmapgenerator.cpp b/cockatrice/src/pixmapgenerator.cpp index dd324037..02ba7737 100644 --- a/cockatrice/src/pixmapgenerator.cpp +++ b/cockatrice/src/pixmapgenerator.cpp @@ -1,7 +1,6 @@ #include "pixmapgenerator.h" #include "pb/serverinfo_user.pb.h" #include -#include #include #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,11 @@ 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); + QPixmap pixmap = QPixmap("theme:countries/" + countryCode.toLower()).scaled(height, 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, height - 1, height - 1); pmCache.insert(key, pixmap); return pixmap; @@ -154,13 +136,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 +151,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; } diff --git a/cockatrice/src/playerlistwidget.cpp b/cockatrice/src/playerlistwidget.cpp index 1d780ce3..49b3b92c 100644 --- a/cockatrice/src/playerlistwidget.cpp +++ b/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); diff --git a/cockatrice/src/remotereplaylist_treewidget.cpp b/cockatrice/src/remotereplaylist_treewidget.cpp index fa6a2e98..680529dc 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:icons/lock.svg"); + lockIcon = QPixmap("theme:icons/lock"); refreshTree(); } diff --git a/cockatrice/src/sequenceEdit/sequenceedit.cpp b/cockatrice/src/sequenceEdit/sequenceedit.cpp index f3b5d0de..ed754211 100644 --- a/cockatrice/src/sequenceEdit/sequenceedit.cpp +++ b/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); diff --git a/cockatrice/src/tab_deck_editor.cpp b/cockatrice/src/tab_deck_editor.cpp index 67412a58..a13f59c6 100644 --- a/cockatrice/src/tab_deck_editor.cpp +++ b/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; diff --git a/cockatrice/src/tab_deck_storage.cpp b/cockatrice/src/tab_deck_storage.cpp index fa30ff0b..1c0d30d9 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: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); diff --git a/cockatrice/src/tab_game.cpp b/cockatrice/src/tab_game.cpp index fcf84195..5b5c3eda 100644 --- a/cockatrice/src/tab_game.cpp +++ b/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))); diff --git a/cockatrice/src/tab_replays.cpp b/cockatrice/src/tab_replays.cpp index 3947ca08..515b7d82 100644 --- a/cockatrice/src/tab_replays.cpp +++ b/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); diff --git a/cockatrice/src/tab_room.cpp b/cockatrice/src/tab_room.cpp index e7e37171..53aaf083 100644 --- a/cockatrice/src/tab_room.cpp +++ b/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); diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp index 5b095911..c9ef1577 100644 --- a/cockatrice/src/tab_supervisor.cpp +++ b/cockatrice/src/tab_supervisor.cpp @@ -80,7 +80,6 @@ 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:icons/tab_changed.svg"); setElideMode(Qt::ElideRight); setMovable(true); setIconSize(QSize(15, 15)); @@ -99,7 +98,6 @@ TabSupervisor::TabSupervisor(AbstractClient *_client, QWidget *parent) TabSupervisor::~TabSupervisor() { stop(); - delete tabChangedIcon; } void TabSupervisor::retranslateUi() @@ -471,7 +469,7 @@ void TabSupervisor::tabUserEvent(bool globalEvent) Tab *tab = static_cast(sender()); if (tab != currentWidget()) { tab->setContentsChanged(true); - setTabIcon(indexOf(tab), *tabChangedIcon); + setTabIcon(indexOf(tab), QPixmap("theme:icons/tab_changed")); } if (globalEvent && settingsCache->getNotificationsEnabled()) QApplication::alert(this); diff --git a/cockatrice/src/tab_supervisor.h b/cockatrice/src/tab_supervisor.h index 91fc14dd..d88dc62f 100644 --- a/cockatrice/src/tab_supervisor.h +++ b/cockatrice/src/tab_supervisor.h @@ -44,7 +44,6 @@ class TabSupervisor : public QTabWidget { Q_OBJECT private: ServerInfo_User *userInfo; - QIcon *tabChangedIcon; AbstractClient *client; QList localClients; TabServer *tabServer; diff --git a/cockatrice/src/thememanager.cpp b/cockatrice/src/thememanager.cpp index 97a7dd95..28ab9c3e 100644 --- a/cockatrice/src/thememanager.cpp +++ b/cockatrice/src/thememanager.cpp @@ -16,7 +16,6 @@ #define PLAYERZONE_BG_NAME "playerzone" #define STACKZONE_BG_NAME "stackzone" #define TABLEZONE_BG_NAME "tablezone" -#define CARD_BACK_NAME "cardback" ThemeManager::ThemeManager(QObject *parent) :QObject(parent) @@ -78,41 +77,18 @@ QStringMap & ThemeManager::getAvailableThemes() QBrush ThemeManager::loadBrush(QDir dir, QString fileName, QColor fallbackColor) { QBrush brush; - QPixmap tmp; - QStringList exts; - exts << ".png" << ".jpg" << ".jpeg" << ".gif" << ".bmp"; - - brush.setColor(fallbackColor); - brush.setStyle(Qt::SolidPattern); - - foreach (const QString &ext, exts) { - if (dir.exists(fileName + ext)) { - tmp.load(dir.absoluteFilePath(fileName + ext)); - if(!tmp.isNull()) - brush.setTexture(tmp); - break; - } + QPixmap tmp = QPixmap("theme:zones/" + fileName); + if(tmp.isNull()) + { + brush.setColor(fallbackColor); + brush.setStyle(Qt::SolidPattern); + } else { + brush.setTexture(tmp); } return brush; } -QPixmap ThemeManager::loadPixmap(QDir dir, QString fileName) -{ - QPixmap pix; - QStringList exts; - exts << ".png" << ".jpg" << ".jpeg" << ".gif" << ".bmp"; - - foreach (const QString &ext, exts) { - if (dir.exists(fileName + ext)) { - pix.load(dir.absoluteFilePath(fileName + ext)); - break; - } - } - - return pix; -} - void ThemeManager::themeChangedSlot() { QString themeName = settingsCache->getThemeName(); @@ -127,8 +103,10 @@ void ThemeManager::themeChangedSlot() else qApp->setStyleSheet(""); - // card background - cardBackPixmap = loadPixmap(dir, CARD_BACK_NAME); + // resources + QStringList resources; + resources << dir.absolutePath() << ":/resources"; + QDir::setSearchPaths("theme", resources); // zones bg dir.cd("zones"); @@ -137,10 +115,6 @@ void ThemeManager::themeChangedSlot() playerBgBrush = loadBrush(dir, PLAYERZONE_BG_NAME, QColor(200, 200, 200)); stackBgBrush = loadBrush(dir, STACKZONE_BG_NAME, QColor(113, 43, 43)); - // resources - QStringList resources; - resources << dir.absolutePath() << ":/resources"; - QDir::setSearchPaths("theme", resources); emit themeChanged(); } diff --git a/cockatrice/src/thememanager.h b/cockatrice/src/thememanager.h index 19cb19c5..26855236 100644 --- a/cockatrice/src/thememanager.h +++ b/cockatrice/src/thememanager.h @@ -18,18 +18,15 @@ public: ThemeManager(QObject *parent = 0); private: QBrush handBgBrush, stackBgBrush, tableBgBrush, playerBgBrush; - QPixmap cardBackPixmap; QStringMap availableThemes; protected: void ensureThemeDirectoryExists(); QBrush loadBrush(QDir dir, QString fileName, QColor fallbackColor); - QPixmap loadPixmap(QDir dir, QString fileName); public: QBrush &getHandBgBrush() { return handBgBrush; } QBrush &getStackBgBrush() { return stackBgBrush; } QBrush &getTableBgBrush() { return tableBgBrush; } QBrush &getPlayerBgBrush() { return playerBgBrush; } - QPixmap &getCardBackPixmap() { return cardBackPixmap; } QStringMap &getAvailableThemes(); protected slots: void themeChangedSlot(); diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp index c63731eb..5bc42118 100644 --- a/cockatrice/src/window_main.cpp +++ b/cockatrice/src/window_main.cpp @@ -101,7 +101,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("theme:appicon.svg").scaled(64, 64)); + serverShutdownMessageBox.setIconPixmap(QPixmap("theme:cockatrice").scaled(64, 64)); serverShutdownMessageBox.setText(tr("Scheduled server shutdown")); serverShutdownMessageBox.setWindowModality(Qt::ApplicationModal); serverShutdownMessageBox.setVisible(true); @@ -633,7 +633,7 @@ void MainWindow::createTrayIcon() { trayIcon = new QSystemTrayIcon(this); trayIcon->setContextMenu(trayIconMenu); - trayIcon->setIcon(QIcon("theme:cockatrice.svg")); + trayIcon->setIcon(QPixmap("theme:cockatrice")); trayIcon->show(); connect(trayIcon,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),this, diff --git a/cockatrice/src/window_sets.cpp b/cockatrice/src/window_sets.cpp index 4668c55d..b647e0a9 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:icons/arrow_top_green.svg")); + aTop->setIcon(QPixmap("theme:icons/arrow_top_green")); 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:icons/arrow_up_green.svg")); + aUp->setIcon(QPixmap("theme:icons/arrow_up_green")); 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:icons/arrow_down_green.svg")); + aDown->setIcon(QPixmap("theme:icons/arrow_down_green")); 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:icons/arrow_bottom_green.svg")); + aBottom->setIcon(QPixmap("theme:icons/arrow_bottom_green")); 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 57a438af..23bbef37 100644 --- a/cockatrice/src/zoneviewwidget.cpp +++ b/cockatrice/src/zoneviewwidget.cpp @@ -225,5 +225,5 @@ void ZoneViewWidget::zoneDeleted() void ZoneViewWidget::initStyleOption(QStyleOption *option) const { QStyleOptionTitleBar *titleBar = qstyleoption_cast(option); if (titleBar) - titleBar->icon = QIcon("theme:cockatrice.svg"); + titleBar->icon = QPixmap("theme:cockatrice"); }