Author: cazfi
Date: Mon Sep 14 05:41:25 2015
New Revision: 29879
URL: http://svn.gna.org/viewcvs/freeciv?rev=29879&view=rev
Log:
Added gui type definition for gtk3x-client
See patch #6335
Modified:
trunk/client/options.c
trunk/client/options.h
trunk/client/tilespec.c
trunk/common/fc_types.h
trunk/fc_version
Modified: trunk/client/options.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=29879&r1=29878&r2=29879&view=diff
==============================================================================
--- trunk/client/options.c (original)
+++ trunk/client/options.c Mon Sep 14 05:41:25 2015
@@ -244,6 +244,9 @@
.gui_gtk3_font_city_names = "Sans Bold 10",
.gui_gtk3_font_city_productions = "Serif 10",
.gui_gtk3_font_reqtree_text = "Serif 10",
+
+/* gui-gtk-3.x client specific options. */
+ .gui_gtk3x_default_theme_name = FC_GTK3x_DEFAULT_THEME_NAME,
/* gui-sdl client specific options. */
.gui_sdl_default_theme_name = FC_SDL_DEFAULT_THEME_NAME,
Modified: trunk/client/options.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.h?rev=29879&r1=29878&r2=29879&view=diff
==============================================================================
--- trunk/client/options.h (original)
+++ trunk/client/options.h Mon Sep 14 05:41:25 2015
@@ -256,6 +256,10 @@
char gui_gtk3_font_city_productions[512];
char gui_gtk3_font_reqtree_text[512];
+/* gui-gtk-3-x client specific options. */
+#define FC_GTK3x_DEFAULT_THEME_NAME "Freeciv"
+ char gui_gtk3x_default_theme_name[512];
+
/* gui-sdl client specific options. */
#define FC_SDL_DEFAULT_THEME_NAME "human"
char gui_sdl_default_theme_name[512];
Modified: trunk/client/tilespec.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=29879&r1=29878&r2=29879&view=diff
==============================================================================
--- trunk/client/tilespec.c (original)
+++ trunk/client/tilespec.c Mon Sep 14 05:41:25 2015
@@ -5985,6 +5985,9 @@
default_theme_name = options.gui_gtk3_default_theme_name;
default_theme_name_sz = sizeof(options.gui_gtk3_default_theme_name);
break;
+ case GUI_GTK3x:
+ default_theme_name = options.gui_gtk3x_default_theme_name;
+ default_theme_name_sz = sizeof(options.gui_gtk3x_default_theme_name);
case GUI_SDL:
case GUI_SDL2:
default_theme_name = options.gui_sdl_default_theme_name;
Modified: trunk/common/fc_types.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/fc_types.h?rev=29879&r1=29878&r2=29879&view=diff
==============================================================================
--- trunk/common/fc_types.h (original)
+++ trunk/common/fc_types.h Mon Sep 14 05:41:25 2015
@@ -500,6 +500,8 @@
#define SPECENUM_VALUE5NAME "sdl2"
#define SPECENUM_VALUE6 GUI_WEB
#define SPECENUM_VALUE6NAME "web"
+#define SPECENUM_VALUE7 GUI_GTK3x
+#define SPECENUM_VALUE7NAME "gtk3x"
#include "specenum_gen.h"
/* Used in the network protocol. */
Modified: trunk/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=29879&r1=29878&r2=29879&view=diff
==============================================================================
--- trunk/fc_version (original)
+++ trunk/fc_version Mon Sep 14 05:41:25 2015
@@ -54,7 +54,7 @@
# - Avoid adding a new mandatory capability to the development branch for
# as long as possible. We want to maintain network compatibility with
# the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2015.Sep.13b"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2015.Sep.14"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
