Merge remote-tracking branch 'Cockatrice/master' into 1505_fix

.gitignore

@@ -4,5 +4,4 @@ build*
 .directory
 mysql.cnf
 .DS_Store
-.idea/
-.tx/
+.idea/
\ No newline at end of file

.tx/config

+[main]
+host = https://www.transifex.com
+
+[cockatrice.cockatrice]
+file_filter = cockatrice/translations/cockatrice_<lang>.ts
+source_file = cockatrice/translations/cockatrice_en.ts
+source_lang = en
+
+[cockatrice.oracle]
+file_filter = oracle/translations/oracle_<lang>.ts
+source_file = oracle/translations/oracle_en.ts
+source_lang = en
+

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()
 

README.md

@@ -63,9 +63,10 @@ To compile:
 
 The following flags can be passed to `cmake`:
 
-- `-DWITH_SERVER=1` Build the server
-- `-DWITH_CLIENT=0` Do not build the client
-- `-DWITH_ORACLE=0` Do not build Oracle
+- `-DWITH_SERVER=1` Build the server.
+- `-DWITH_CLIENT=0` Do not build the client.
+- `-DWITH_ORACLE=0` Do not build oracle.
+- `-DPORTABLE=1` Build portable versions of client & oracle.
 - `-DWITH_QT4=1` Force compilation to use Qt4 instead of Qt5.
 - `-DCMAKE_BUILD_TYPE=Debug` Compile in debug mode. Enables extra logging output, debug symbols, and much more verbose compiler warnings.
 - `-DUPDATE_TRANSLATIONS=1` Configure `make` to update the translation .ts files for new strings in the source code. Note: Running `make clean` will remove the .ts files.

cockatrice/CMakeLists.txt

@@ -6,8 +6,8 @@ PROJECT(cockatrice)
 
 SET(cockatrice_SOURCES
     src/abstractcounter.cpp 
-    src/counter_general.cpp 
-    src/dlg_creategame.cpp 
+    src/counter_general.cpp
+    src/dlg_creategame.cpp
     src/dlg_filter_games.cpp
     src/dlg_connect.cpp 
     src/dlg_create_token.cpp 
@@ -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 
@@ -98,6 +99,12 @@ SET(cockatrice_SOURCES
     src/sequenceEdit/sequenceedit.cpp
     src/sequenceEdit/shortcutstab.cpp
     src/lineeditcompleter.cpp
+    src/settings/settingsmanager.cpp
+    src/settings/carddatabasesettings.cpp
+    src/settings/serverssettings.cpp
+    src/settings/messagesettings.cpp
+    src/settings/gamefilterssettings.cpp
+    src/settings/layoutssettings.cpp
     ${VERSION_STRING_CPP}
 )
 
@@ -130,22 +137,14 @@ set(COCKATRICE_LIBS)
 
 # Qt4 stuff
 if(Qt4_FOUND)
-    if (NOT QT_QTMULTIMEDIA_FOUND)
-        FIND_PACKAGE(QtMobility REQUIRED)
-    endif()
-
     SET(QT_USE_QTNETWORK TRUE)
-    SET(QT_USE_QTMULTIMEDIA TRUE)
     SET(QT_USE_QTSVG TRUE)
 
     # Include directories
     INCLUDE(${QT_USE_FILE})
     INCLUDE_DIRECTORIES(${QT_INCLUDES})
-    INCLUDE_DIRECTORIES(${QT_MOBILITY_INCLUDE_DIR})
-    INCLUDE_DIRECTORIES(${QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR})
     LIST(APPEND COCKATRICE_LIBS ${QT_LIBRARIES})
     LIST(APPEND COCKATRICE_LIBS ${QT_QTMAIN_LIBRARY})
-    LIST(APPEND COCKATRICE_LIBS ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY})
 
     # Let cmake chew Qt4's translations and resource files
     # Note: header files are MOC-ed automatically by cmake
@@ -274,11 +273,11 @@ if(APPLE)
     set(plugin_dest_dir cockatrice.app/Contents/Plugins)
     set(qtconf_dest_dir cockatrice.app/Contents/Resources)
 
-    # qt4: codecs, iconengines, imageformats, phonon_backend
+    # qt4: codecs, iconengines, imageformats
     # qt5: audio, iconengines, imageformats, platforms, printsupport
 
     install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-        FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|phonon_backend|platforms|printsupport)/.*\\.dylib"
+        FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|platforms|printsupport)/.*\\.dylib"
         REGEX ".*_debug\\.dylib" EXCLUDE)
 
     install(CODE "
@@ -302,11 +301,11 @@ if(WIN32)
     set(plugin_dest_dir Plugins)
     set(qtconf_dest_dir .)
 
-    # qt4: codecs, iconengines, imageformats, phonon_backend
+    # qt4: codecs, iconengines, imageformats
     # qt5: audio, iconengines, imageformats, platforms, printsupport
 
     install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
-        FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|phonon_backend|platforms|printsupport)/.*[^d]\\.dll")
+        FILES_MATCHING REGEX "(audio|codecs|iconengines|imageformats|platforms|printsupport)/.*[^d]\\.dll")
 
     install(CODE "
         file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
@@ -327,3 +326,8 @@ Data = Resources\")
         install(FILES ${WIN32SSLRUNTIME_LIBRARIES} DESTINATION ./)
     endif()
 endif()
+#Compile a portable version, default off
+option(PORTABLE "portable build" OFF)
+IF(PORTABLE)
+add_definitions(-DPORTABLE_BUILD)
+endif()

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>