Merge branch 'master' into Refactor-settings

Conflicts:
	oracle/CMakeLists.txt

CMakeLists.txt

@@ -221,7 +221,7 @@ option(WITH_CLIENT "build cockatrice" ON)
 if(WITH_CLIENT)
     add_subdirectory(cockatrice)
     add_subdirectory(sounds)
-    add_subdirectory(zonebg)
+    add_subdirectory(themes)
     SET(CPACK_INSTALL_CMAKE_PROJECTS "cockatrice;cockatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
 endif()
 

cockatrice/CMakeLists.txt

@@ -87,6 +87,7 @@ SET(cockatrice_SOURCES
     src/playerlistwidget.cpp 
     src/pixmapgenerator.cpp 
     src/settingscache.cpp 
+    src/thememanager.cpp 
     src/localserver.cpp 
     src/localserverinterface.cpp 
     src/localclient.cpp 

cockatrice/cockatrice.qrc

 <RCC>
-    <qresource prefix="/">
-        <file alias="back.svg">resources/back.svg</file>
-        <file>resources/lock.svg</file>
-        <file>resources/icon_delete.svg</file>
-        <file>resources/icon_tab_changed.svg</file>
-        <file>resources/icon_config_general.svg</file>
-        <file>resources/icon_config_appearance.svg</file>
-        <file>resources/icon_config_interface.svg</file>
-        <file>resources/icon_config_messages.svg</file>
-        <file>resources/icon_config_deckeditor.svg</file>
-        <file>resources/icon_config_sound.svg</file>
-        <file>resources/phases/icon_phase_untap.svg</file>
-        <file>resources/phases/icon_phase_upkeep.svg</file>
-        <file>resources/phases/icon_phase_draw.svg</file>
-        <file>resources/phases/icon_phase_main1.svg</file>
-        <file>resources/phases/icon_phase_combat_start.svg</file>
-        <file>resources/phases/icon_phase_combat_attackers.svg</file>
-        <file>resources/phases/icon_phase_combat_blockers.svg</file>
-        <file>resources/phases/icon_phase_combat_damage.svg</file>
-        <file>resources/phases/icon_phase_combat_end.svg</file>
-        <file>resources/phases/icon_phase_main2.svg</file>
-        <file>resources/phases/icon_phase_cleanup.svg</file>
-        <file>resources/phases/icon_phase_nextturn.svg</file>
-        <file>resources/icon_settings.svg</file>
+    <qresource prefix="/" >
+        <file>resources/back.svg</file>
+        <file>resources/cockatrice.svg</file>
         <file>resources/hand.svg</file>
-        <file>resources/pencil.svg</file>
-        <file>resources/icon_search_black.svg</file>
-        <file>resources/icon_clearsearch.svg</file>
-        <file>resources/icon_update.png</file>
-        <file>resources/icon_view.svg</file>
         <file>resources/hr.jpg</file>
-        <file alias="resources/appicon.svg">resources/cockatrice.svg</file>
-        <file>resources/add_to_sideboard.svg</file>
-        <file>resources/decrement.svg</file>
-        <file>resources/increment.svg</file>
-        <file>resources/remove_row.svg</file>
-        <file>resources/arrow_left_green.svg</file>
-        <file>resources/arrow_right_green.svg</file>
-        <file>resources/arrow_top_green.svg</file>
-        <file>resources/arrow_up_green.svg</file>
-        <file>resources/arrow_down_green.svg</file>
-        <file>resources/arrow_bottom_green.svg</file>
-        <file>resources/icon_ready_start.svg</file>
-        <file>resources/icon_not_ready_start.svg</file>
-        <file>resources/icon_conceded.svg</file>
-        <file>resources/icon_player.svg</file>
-        <file>resources/icon_spectator.svg</file>
-        <file>resources/replay_start.svg</file>
-        <file>resources/replay_fastforward.svg</file>
-        <file>resources/replay_pause.svg</file>
-        <file>resources/genders/male.svg</file>
-        <file>resources/genders/female.svg</file>
-        <file>resources/genders/unknown.svg</file>
+
+        <file>resources/icons/arrow_bottom_green.svg</file>
+        <file>resources/icons/arrow_down_green.svg</file>
+        <file>resources/icons/arrow_left_green.svg</file>
+        <file>resources/icons/arrow_right_blue.svg</file>
+        <file>resources/icons/arrow_right_green.svg</file>
+        <file>resources/icons/arrow_top_green.svg</file>
+        <file>resources/icons/arrow_up_green.svg</file>
+        <file>resources/icons/clearsearch.svg</file>
+        <file>resources/icons/conceded.svg</file>
+        <file>resources/icons/decrement.svg</file>
+        <file>resources/icons/delete.svg</file>
+        <file>resources/icons/increment.svg</file>
+        <file>resources/icons/lock.svg</file>
+        <file>resources/icons/not_ready_start.svg</file>
+        <file>resources/icons/pencil.svg</file>
+        <file>resources/icons/player.svg</file>
+        <file>resources/icons/ready_start.svg</file>
+        <file>resources/icons/remove_row.svg</file>
+        <file>resources/icons/search.svg</file>
+        <file>resources/icons/settings.svg</file>
+        <file>resources/icons/spectator.svg</file>
+        <file>resources/icons/tab_changed.svg</file>
+        <file>resources/icons/update.png</file>
+        <file>resources/icons/view.svg</file>
+
+        <file>resources/config/general.svg</file>
+        <file>resources/config/appearance.svg</file>
+        <file>resources/config/interface.svg</file>
+        <file>resources/config/messages.svg</file>
+        <file>resources/config/deckeditor.svg</file>
+        <file>resources/config/shorcuts.svg</file>
+        <file>resources/config/sound.svg</file>
+
+        <file>resources/counters/w.svg</file>
+        <file>resources/counters/w_highlight.svg</file>
+        <file>resources/counters/u.svg</file>
+        <file>resources/counters/u_highlight.svg</file>
+        <file>resources/counters/b.svg</file>
+        <file>resources/counters/b_highlight.svg</file>
+        <file>resources/counters/r.svg</file>
+        <file>resources/counters/r_highlight.svg</file>
+        <file>resources/counters/g.svg</file>
+        <file>resources/counters/g_highlight.svg</file>
+        <file>resources/counters/storm.svg</file>
+        <file>resources/counters/storm_highlight.svg</file>
+        <file>resources/counters/general.svg</file>
+        <file>resources/counters/general_highlight.svg</file>
+
         <file>resources/countries/ad.svg</file>
         <file>resources/countries/ae.svg</file>
         <file>resources/countries/af.svg</file>
@@ -301,20 +302,28 @@
         <file>resources/countries/za.svg</file>
         <file>resources/countries/zm.svg</file>
         <file>resources/countries/zw.svg</file>
-        <file>resources/counters/w.svg</file>
-        <file>resources/counters/w_highlight.svg</file>
-        <file>resources/counters/u.svg</file>
-        <file>resources/counters/u_highlight.svg</file>
-        <file>resources/counters/b.svg</file>
-        <file>resources/counters/b_highlight.svg</file>
-        <file>resources/counters/r.svg</file>
-        <file>resources/counters/r_highlight.svg</file>
-        <file>resources/counters/g.svg</file>
-        <file>resources/counters/g_highlight.svg</file>
-        <file>resources/counters/storm.svg</file>
-        <file>resources/counters/storm_highlight.svg</file>
-        <file>resources/counters/general.svg</file>
-        <file>resources/counters/general_highlight.svg</file>
+
+        <file>resources/genders/male.svg</file>
+        <file>resources/genders/female.svg</file>
+        <file>resources/genders/unknown.svg</file>
+
+        <file>resources/phases/untap.svg</file>
+        <file>resources/phases/upkeep.svg</file>
+        <file>resources/phases/draw.svg</file>
+        <file>resources/phases/main1.svg</file>
+        <file>resources/phases/combat_start.svg</file>
+        <file>resources/phases/combat_attackers.svg</file>
+        <file>resources/phases/combat_blockers.svg</file>
+        <file>resources/phases/combat_damage.svg</file>
+        <file>resources/phases/combat_end.svg</file>
+        <file>resources/phases/main2.svg</file>
+        <file>resources/phases/cleanup.svg</file>
+        <file>resources/phases/nextturn.svg</file>
+
+        <file>resources/replay/start.svg</file>
+        <file>resources/replay/fastforward.svg</file>
+        <file>resources/replay/pause.svg</file>
+
         <file>resources/userlevels/normal.svg</file>
         <file>resources/userlevels/registered.svg</file>
         <file>resources/userlevels/registered_buddy.svg</file>
@@ -322,8 +331,5 @@
         <file>resources/userlevels/moderator_buddy.svg</file>
         <file>resources/userlevels/admin.svg</file>
         <file>resources/userlevels/admin_buddy.svg</file>
-        <file>resources/news/exclamation_mark.svg</file>
-        <file>resources/news/question_mark.svg</file>
-        <file>resources/icon_config_shorcuts.svg</file>
     </qresource>
 </RCC>