From 6d7baec37b1ceaee388615fd24a11ce19505d794 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 31 Aug 2015 22:55:46 +0200 Subject: [PATCH] Merge with master --- cockatrice/cockatrice.qrc | 477 +++--------------- .../shorcuts.svg} | 0 cockatrice/src/dlg_edit_user.cpp | 8 +- cockatrice/src/dlg_register.cpp | 2 +- cockatrice/src/dlg_settings.cpp | 2 +- cockatrice/src/sequenceEdit/sequenceedit.cpp | 4 +- cockatrice/src/tab_deck_editor.cpp | 6 +- cockatrice/src/window_main.cpp | 2 +- oracle/src/main.cpp | 2 +- 9 files changed, 87 insertions(+), 416 deletions(-) rename cockatrice/resources/{icon_config_shorcuts.svg => config/shorcuts.svg} (100%) diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc index 100047fe..84a5e651 100644 --- a/cockatrice/cockatrice.qrc +++ b/cockatrice/cockatrice.qrc @@ -1,391 +1,58 @@ -<<<<<<< HEAD - - resources/back.svg - resources/cockatrice.svg - resources/hand.svg - resources/hr.jpg - - resources/icons/arrow_bottom_green.svg - resources/icons/arrow_down_green.svg - resources/icons/arrow_left_green.svg - resources/icons/arrow_right_blue.svg - resources/icons/arrow_right_green.svg - resources/icons/arrow_top_green.svg - resources/icons/arrow_up_green.svg - resources/icons/clearsearch.svg - resources/icons/conceded.svg - resources/icons/decrement.svg - resources/icons/delete.svg - resources/icons/increment.svg - resources/icons/lock.svg - resources/icons/not_ready_start.svg - resources/icons/pencil.svg - resources/icons/player.svg - resources/icons/ready_start.svg - resources/icons/remove_row.svg - resources/icons/search.svg - resources/icons/settings.svg - resources/icons/spectator.svg - resources/icons/tab_changed.svg - resources/icons/update.png - resources/icons/view.svg - - resources/config/general.svg - resources/config/appearance.svg - resources/config/interface.svg - resources/config/messages.svg - resources/config/deckeditor.svg - resources/config/sound.svg - - resources/counters/w.svg - resources/counters/w_highlight.svg - resources/counters/u.svg - resources/counters/u_highlight.svg - resources/counters/b.svg - resources/counters/b_highlight.svg - resources/counters/r.svg - resources/counters/r_highlight.svg - resources/counters/g.svg - resources/counters/g_highlight.svg - resources/counters/storm.svg - resources/counters/storm_highlight.svg - resources/counters/general.svg - resources/counters/general_highlight.svg - - resources/countries/ad.svg - resources/countries/ae.svg - resources/countries/af.svg - resources/countries/ag.svg - resources/countries/ai.svg - resources/countries/al.svg - resources/countries/am.svg - resources/countries/ao.svg - resources/countries/aq.svg - resources/countries/ar.svg - resources/countries/as.svg - resources/countries/at.svg - resources/countries/au.svg - resources/countries/aw.svg - resources/countries/ax.svg - resources/countries/az.svg - resources/countries/ba.svg - resources/countries/bb.svg - resources/countries/bd.svg - resources/countries/be.svg - resources/countries/bf.svg - resources/countries/bg.svg - resources/countries/bh.svg - resources/countries/bi.svg - resources/countries/bj.svg - resources/countries/bl.svg - resources/countries/bm.svg - resources/countries/bn.svg - resources/countries/bo.svg - resources/countries/bq.svg - resources/countries/br.svg - resources/countries/bs.svg - resources/countries/bt.svg - resources/countries/bv.svg - resources/countries/bw.svg - resources/countries/by.svg - resources/countries/bz.svg - resources/countries/ca.svg - resources/countries/cc.svg - resources/countries/cd.svg - resources/countries/cf.svg - resources/countries/cg.svg - resources/countries/ch.svg - resources/countries/ci.svg - resources/countries/ck.svg - resources/countries/cl.svg - resources/countries/cm.svg - resources/countries/cn.svg - resources/countries/co.svg - resources/countries/cr.svg - resources/countries/cu.svg - resources/countries/cv.svg - resources/countries/cw.svg - resources/countries/cx.svg - resources/countries/cy.svg - resources/countries/cz.svg - resources/countries/de.svg - resources/countries/dj.svg - resources/countries/dk.svg - resources/countries/dm.svg - resources/countries/do.svg - resources/countries/dz.svg - resources/countries/ec.svg - resources/countries/ee.svg - resources/countries/eg.svg - resources/countries/eh.svg - resources/countries/er.svg - resources/countries/es.svg - resources/countries/et.svg - resources/countries/fi.svg - resources/countries/fj.svg - resources/countries/fk.svg - resources/countries/fm.svg - resources/countries/fo.svg - resources/countries/fr.svg - resources/countries/ga.svg - resources/countries/gb.svg - resources/countries/gd.svg - resources/countries/ge.svg - resources/countries/gf.svg - resources/countries/gg.svg - resources/countries/gh.svg - resources/countries/gi.svg - resources/countries/gl.svg - resources/countries/gm.svg - resources/countries/gn.svg - resources/countries/gp.svg - resources/countries/gq.svg - resources/countries/gr.svg - resources/countries/gs.svg - resources/countries/gt.svg - resources/countries/gu.svg - resources/countries/gw.svg - resources/countries/gy.svg - resources/countries/hk.svg - resources/countries/hm.svg - resources/countries/hn.svg - resources/countries/hr.svg - resources/countries/ht.svg - resources/countries/hu.svg - resources/countries/id.svg - resources/countries/ie.svg - resources/countries/il.svg - resources/countries/im.svg - resources/countries/in.svg - resources/countries/io.svg - resources/countries/iq.svg - resources/countries/ir.svg - resources/countries/is.svg - resources/countries/it.svg - resources/countries/je.svg - resources/countries/jm.svg - resources/countries/jo.svg - resources/countries/jp.svg - resources/countries/ke.svg - resources/countries/kg.svg - resources/countries/kh.svg - resources/countries/ki.svg - resources/countries/km.svg - resources/countries/kn.svg - resources/countries/kp.svg - resources/countries/kr.svg - resources/countries/kw.svg - resources/countries/ky.svg - resources/countries/kz.svg - resources/countries/la.svg - resources/countries/lb.svg - resources/countries/lc.svg - resources/countries/li.svg - resources/countries/lk.svg - resources/countries/lr.svg - resources/countries/ls.svg - resources/countries/lt.svg - resources/countries/lu.svg - resources/countries/lv.svg - resources/countries/ly.svg - resources/countries/ma.svg - resources/countries/mc.svg - resources/countries/md.svg - resources/countries/me.svg - resources/countries/mf.svg - resources/countries/mg.svg - resources/countries/mh.svg - resources/countries/mk.svg - resources/countries/ml.svg - resources/countries/mm.svg - resources/countries/mn.svg - resources/countries/mo.svg - resources/countries/mp.svg - resources/countries/mq.svg - resources/countries/mr.svg - resources/countries/ms.svg - resources/countries/mt.svg - resources/countries/mu.svg - resources/countries/mv.svg - resources/countries/mw.svg - resources/countries/mx.svg - resources/countries/my.svg - resources/countries/mz.svg - resources/countries/na.svg - resources/countries/nc.svg - resources/countries/ne.svg - resources/countries/nf.svg - resources/countries/ng.svg - resources/countries/ni.svg - resources/countries/nl.svg - resources/countries/no.svg - resources/countries/np.svg - resources/countries/nr.svg - resources/countries/nu.svg - resources/countries/nz.svg - resources/countries/om.svg - resources/countries/pa.svg - resources/countries/pe.svg - resources/countries/pf.svg - resources/countries/pg.svg - resources/countries/ph.svg - resources/countries/pk.svg - resources/countries/pl.svg - resources/countries/pm.svg - resources/countries/pn.svg - resources/countries/pr.svg - resources/countries/ps.svg - resources/countries/pt.svg - resources/countries/pw.svg - resources/countries/py.svg - resources/countries/qa.svg - resources/countries/re.svg - resources/countries/ro.svg - resources/countries/rs.svg - resources/countries/ru.svg - resources/countries/rw.svg - resources/countries/sa.svg - resources/countries/sb.svg - resources/countries/sc.svg - resources/countries/sd.svg - resources/countries/se.svg - resources/countries/sg.svg - resources/countries/sh.svg - resources/countries/si.svg - resources/countries/sj.svg - resources/countries/sk.svg - resources/countries/sl.svg - resources/countries/sm.svg - resources/countries/sn.svg - resources/countries/so.svg - resources/countries/sr.svg - resources/countries/ss.svg - resources/countries/st.svg - resources/countries/sv.svg - resources/countries/sx.svg - resources/countries/sy.svg - resources/countries/sz.svg - resources/countries/tc.svg - resources/countries/td.svg - resources/countries/tf.svg - resources/countries/tg.svg - resources/countries/th.svg - resources/countries/tj.svg - resources/countries/tk.svg - resources/countries/tl.svg - resources/countries/tm.svg - resources/countries/tn.svg - resources/countries/to.svg - resources/countries/tr.svg - resources/countries/tt.svg - resources/countries/tv.svg - resources/countries/tw.svg - resources/countries/tz.svg - resources/countries/ua.svg - resources/countries/ug.svg - resources/countries/um.svg - resources/countries/us.svg - resources/countries/uy.svg - resources/countries/uz.svg - resources/countries/va.svg - resources/countries/vc.svg - resources/countries/ve.svg - resources/countries/vg.svg - resources/countries/vi.svg - resources/countries/vn.svg - resources/countries/vu.svg - resources/countries/wf.svg - resources/countries/ws.svg - resources/countries/ye.svg - resources/countries/yt.svg - resources/countries/za.svg - resources/countries/zm.svg - resources/countries/zw.svg - - resources/genders/male.svg - resources/genders/female.svg - resources/genders/unknown.svg - - resources/phases/untap.svg - resources/phases/upkeep.svg - resources/phases/draw.svg - resources/phases/main1.svg - resources/phases/combat_start.svg - resources/phases/combat_attackers.svg - resources/phases/combat_blockers.svg - resources/phases/combat_damage.svg - resources/phases/combat_end.svg - resources/phases/main2.svg - resources/phases/cleanup.svg - resources/phases/nextturn.svg - - resources/replay/start.svg - resources/replay/fastforward.svg - resources/replay/pause.svg - - resources/userlevels/normal.svg - resources/userlevels/registered.svg - resources/userlevels/registered_buddy.svg - resources/userlevels/moderator.svg - resources/userlevels/moderator_buddy.svg - resources/userlevels/admin.svg - resources/userlevels/admin_buddy.svg - -======= - - resources/back.svg - resources/lock.svg - resources/icon_delete.svg - resources/icon_tab_changed.svg - resources/icon_config_general.svg - resources/icon_config_appearance.svg - resources/icon_config_interface.svg - resources/icon_config_messages.svg - resources/icon_config_deckeditor.svg - resources/icon_config_sound.svg - resources/phases/icon_phase_untap.svg - resources/phases/icon_phase_upkeep.svg - resources/phases/icon_phase_draw.svg - resources/phases/icon_phase_main1.svg - resources/phases/icon_phase_combat_start.svg - resources/phases/icon_phase_combat_attackers.svg - resources/phases/icon_phase_combat_blockers.svg - resources/phases/icon_phase_combat_damage.svg - resources/phases/icon_phase_combat_end.svg - resources/phases/icon_phase_main2.svg - resources/phases/icon_phase_cleanup.svg - resources/phases/icon_phase_nextturn.svg - resources/icon_settings.svg + + resources/back.svg + resources/cockatrice.svg resources/hand.svg - resources/pencil.svg - resources/icon_search_black.svg - resources/icon_clearsearch.svg - resources/icon_update.png - resources/icon_view.svg resources/hr.jpg - resources/cockatrice.svg - resources/add_to_sideboard.svg - resources/decrement.svg - resources/increment.svg - resources/remove_row.svg - resources/arrow_left_green.svg - resources/arrow_right_green.svg - resources/arrow_top_green.svg - resources/arrow_up_green.svg - resources/arrow_down_green.svg - resources/arrow_bottom_green.svg - resources/icon_ready_start.svg - resources/icon_not_ready_start.svg - resources/icon_conceded.svg - resources/icon_player.svg - resources/icon_spectator.svg - resources/replay_start.svg - resources/replay_fastforward.svg - resources/replay_pause.svg - resources/genders/male.svg - resources/genders/female.svg - resources/genders/unknown.svg + + resources/icons/arrow_bottom_green.svg + resources/icons/arrow_down_green.svg + resources/icons/arrow_left_green.svg + resources/icons/arrow_right_blue.svg + resources/icons/arrow_right_green.svg + resources/icons/arrow_top_green.svg + resources/icons/arrow_up_green.svg + resources/icons/clearsearch.svg + resources/icons/conceded.svg + resources/icons/decrement.svg + resources/icons/delete.svg + resources/icons/increment.svg + resources/icons/lock.svg + resources/icons/not_ready_start.svg + resources/icons/pencil.svg + resources/icons/player.svg + resources/icons/ready_start.svg + resources/icons/remove_row.svg + resources/icons/search.svg + resources/icons/settings.svg + resources/icons/spectator.svg + resources/icons/tab_changed.svg + resources/icons/update.png + resources/icons/view.svg + + resources/config/general.svg + resources/config/appearance.svg + resources/config/interface.svg + resources/config/messages.svg + resources/config/deckeditor.svg + resources/config/shorcuts.svg + resources/config/sound.svg + + resources/counters/w.svg + resources/counters/w_highlight.svg + resources/counters/u.svg + resources/counters/u_highlight.svg + resources/counters/b.svg + resources/counters/b_highlight.svg + resources/counters/r.svg + resources/counters/r_highlight.svg + resources/counters/g.svg + resources/counters/g_highlight.svg + resources/counters/storm.svg + resources/counters/storm_highlight.svg + resources/counters/general.svg + resources/counters/general_highlight.svg + resources/countries/ad.svg resources/countries/ae.svg resources/countries/af.svg @@ -635,20 +302,28 @@ resources/countries/za.svg resources/countries/zm.svg resources/countries/zw.svg - resources/counters/w.svg - resources/counters/w_highlight.svg - resources/counters/u.svg - resources/counters/u_highlight.svg - resources/counters/b.svg - resources/counters/b_highlight.svg - resources/counters/r.svg - resources/counters/r_highlight.svg - resources/counters/g.svg - resources/counters/g_highlight.svg - resources/counters/storm.svg - resources/counters/storm_highlight.svg - resources/counters/general.svg - resources/counters/general_highlight.svg + + resources/genders/male.svg + resources/genders/female.svg + resources/genders/unknown.svg + + resources/phases/untap.svg + resources/phases/upkeep.svg + resources/phases/draw.svg + resources/phases/main1.svg + resources/phases/combat_start.svg + resources/phases/combat_attackers.svg + resources/phases/combat_blockers.svg + resources/phases/combat_damage.svg + resources/phases/combat_end.svg + resources/phases/main2.svg + resources/phases/cleanup.svg + resources/phases/nextturn.svg + + resources/replay/start.svg + resources/replay/fastforward.svg + resources/replay/pause.svg + resources/userlevels/normal.svg resources/userlevels/registered.svg resources/userlevels/registered_buddy.svg @@ -656,9 +331,5 @@ resources/userlevels/moderator_buddy.svg resources/userlevels/admin.svg resources/userlevels/admin_buddy.svg - resources/news/exclamation_mark.svg - resources/news/question_mark.svg - resources/icon_config_shorcuts.svg ->>>>>>> master diff --git a/cockatrice/resources/icon_config_shorcuts.svg b/cockatrice/resources/config/shorcuts.svg similarity index 100% rename from cockatrice/resources/icon_config_shorcuts.svg rename to cockatrice/resources/config/shorcuts.svg diff --git a/cockatrice/src/dlg_edit_user.cpp b/cockatrice/src/dlg_edit_user.cpp index 932dfa12..fd5df607 100644 --- a/cockatrice/src/dlg_edit_user.cpp +++ b/cockatrice/src/dlg_edit_user.cpp @@ -19,9 +19,9 @@ DlgEditUser::DlgEditUser(QWidget *parent, QString email, int gender, QString cou genderLabel = new QLabel(tr("Pronouns:")); genderEdit = new QComboBox(); genderLabel->setBuddy(genderEdit); - genderEdit->insertItem(0, QIcon(":/resources/genders/unknown.svg"), tr("Neutral")); - genderEdit->insertItem(1, QIcon(":/resources/genders/male.svg"), tr("Masculine")); - genderEdit->insertItem(2, QIcon(":/resources/genders/female.svg"), tr("Feminine")); + genderEdit->insertItem(0, QIcon("theme:genders/unknown.svg"), tr("Neutral")); + genderEdit->insertItem(1, QIcon("theme:genders/male.svg"), tr("Masculine")); + genderEdit->insertItem(2, QIcon("theme:genders/female.svg"), tr("Feminine")); genderEdit->setCurrentIndex(gender + 1); countryLabel = new QLabel(tr("Country:")); @@ -34,7 +34,7 @@ DlgEditUser::DlgEditUser(QWidget *parent, QString email, int gender, QString cou int i = 1; foreach(QString c, countries) { - countryEdit->addItem(QPixmap(":/resources/countries/" + c + ".svg"), c); + countryEdit->addItem(QPixmap("theme:countries/" + c.toLower() + ".svg"), c); if (c == country) countryEdit->setCurrentIndex(i); diff --git a/cockatrice/src/dlg_register.cpp b/cockatrice/src/dlg_register.cpp index 5c48e460..97f47c9d 100644 --- a/cockatrice/src/dlg_register.cpp +++ b/cockatrice/src/dlg_register.cpp @@ -311,7 +311,7 @@ DlgRegister::DlgRegister(QWidget *parent) countryEdit->setCurrentIndex(0); QStringList countries = settingsCache->getCountries(); foreach(QString c, countries) - countryEdit->addItem(QPixmap(":/resources/countries/" + c + ".svg"), c); + countryEdit->addItem(QPixmap("theme:countries/" + c.toLower() + ".svg"), c); realnameLabel = new QLabel(tr("Real name:")); realnameEdit = new QLineEdit(); diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp index 837946dc..5b18f7ed 100644 --- a/cockatrice/src/dlg_settings.cpp +++ b/cockatrice/src/dlg_settings.cpp @@ -802,7 +802,7 @@ void DlgSettings::createIcons() shortcutsButton = new QListWidgetItem(contentsWidget); shortcutsButton->setTextAlignment(Qt::AlignHCenter); shortcutsButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); - shortcutsButton->setIcon(QIcon(":/resources/icon_config_shorcuts.svg")); + shortcutsButton->setIcon(QIcon("theme:config/shorcuts.svg")); connect(contentsWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(changePage(QListWidgetItem *, QListWidgetItem *))); } diff --git a/cockatrice/src/sequenceEdit/sequenceedit.cpp b/cockatrice/src/sequenceEdit/sequenceedit.cpp index 1056b576..f3b5d0de 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(":/resources/icon_clearsearch.svg")); - defaultButton->setIcon(QIcon(":/resources/icon_update.png")); + clearButton->setIcon(QIcon("theme:icons/clearsearch.svg")); + defaultButton->setIcon(QIcon("theme:icons/update.png")); clearButton->setAttribute(Qt::WA_LayoutUsesWidgetRect); defaultButton->setAttribute(Qt::WA_LayoutUsesWidgetRect); diff --git a/cockatrice/src/tab_deck_editor.cpp b/cockatrice/src/tab_deck_editor.cpp index f3117c9c..0bef8e7a 100644 --- a/cockatrice/src/tab_deck_editor.cpp +++ b/cockatrice/src/tab_deck_editor.cpp @@ -316,11 +316,11 @@ void TabDeckEditor::createMenus() addTabMenu(deckMenu); aClearFilterAll = new QAction(QString(), this); - aClearFilterAll->setIcon(QIcon(":/resources/icon_clearsearch.svg")); + aClearFilterAll->setIcon(QIcon("theme:icons/clearsearch.svg")); connect(aClearFilterAll, SIGNAL(triggered()), this, SLOT(actClearFilterAll())); aClearFilterOne = new QAction(QString(), this); - aClearFilterOne->setIcon(QIcon(":/resources/decrement.svg")); + aClearFilterOne->setIcon(QIcon("theme:icons/decrement.svg")); connect(aClearFilterOne, SIGNAL(triggered()), this, SLOT(actClearFilterOne())); dbMenu = new QMenu(this); @@ -342,7 +342,7 @@ void TabDeckEditor::createCentralFrame() searchEdit = new SearchLineEdit; searchEdit->setObjectName("searchEdit"); #if QT_VERSION >= 0x050300 - searchEdit->addAction(QIcon(":/resources/icon_search_black.svg"), QLineEdit::LeadingPosition); + searchEdit->addAction(QIcon("theme:icons/search.svg"), QLineEdit::LeadingPosition); #endif setFocusProxy(searchEdit); diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp index e405a720..812fc1df 100644 --- a/cockatrice/src/window_main.cpp +++ b/cockatrice/src/window_main.cpp @@ -100,7 +100,7 @@ void MainWindow::processConnectionClosedEvent(const Event_ConnectionClosed &even void MainWindow::processServerShutdownEvent(const Event_ServerShutdown &event) { serverShutdownMessageBox.setInformativeText(tr("The server is going to be restarted in %n minute(s).\nAll running games will be lost.\nReason for shutdown: %1", "", event.minutes()).arg(QString::fromStdString(event.reason()))); - serverShutdownMessageBox.setIconPixmap(QPixmap(":/resources/appicon.svg").scaled(64, 64)); + serverShutdownMessageBox.setIconPixmap(QPixmap("theme:appicon.svg").scaled(64, 64)); serverShutdownMessageBox.setText(tr("Scheduled server shutdown")); serverShutdownMessageBox.setWindowModality(Qt::ApplicationModal); serverShutdownMessageBox.setVisible(true); diff --git a/oracle/src/main.cpp b/oracle/src/main.cpp index c946aa4b..60e5e8d9 100644 --- a/oracle/src/main.cpp +++ b/oracle/src/main.cpp @@ -61,7 +61,7 @@ int main(int argc, char *argv[]) OracleWizard wizard; - QIcon icon(":/resources/appicon.svg"); + QIcon icon("theme:appicon.svg"); wizard.setWindowIcon(icon); wizard.show();