Author: cazfi
Date: Sun Nov 15 19:05:31 2015
New Revision: 30621

URL: http://svn.gna.org/viewcvs/freeciv?rev=30621&view=rev
Log:
Removed all information about sdl-client options not necessary for migrating 
them
to sdl2-client options.

See patch #6578

Modified:
    trunk/client/options.c
    trunk/client/options.h
    trunk/client/tilespec.c

Modified: trunk/client/options.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=30621&r1=30620&r2=30621&view=diff
==============================================================================
--- trunk/client/options.c      (original)
+++ trunk/client/options.c      Sun Nov 15 19:05:31 2015
@@ -251,7 +251,6 @@
   .gui_gtk4_default_theme_name = FC_GTK4_DEFAULT_THEME_NAME,
 
 /* gui-sdl client specific options. */
-  .gui_sdl_default_theme_name = FC_SDL_DEFAULT_THEME_NAME,
   .gui_sdl_fullscreen = FALSE,
   .gui_sdl_screen = VIDEO_MODE(640, 480),
   .gui_sdl_do_cursor_animation = TRUE,
@@ -1823,11 +1822,6 @@
                       N_("By changing this option you change the "
                          "active theme."),
                       COC_GRAPHICS, GUI_GTK3, FC_GTK3_DEFAULT_THEME_NAME,
-                      get_themes_list, theme_reread_callback),
-  GEN_STR_LIST_OPTION(gui_sdl_default_theme_name, N_("Theme"),
-                      N_("By changing this option you change the "
-                         "active theme."),
-                      COC_GRAPHICS, GUI_SDL, FC_SDL_DEFAULT_THEME_NAME,
                       get_themes_list, theme_reread_callback),
   GEN_STR_LIST_OPTION(gui_sdl2_default_theme_name, N_("Theme"),
                       N_("By changing this option you change the "
@@ -2688,22 +2682,15 @@
                   COC_FONT, GUI_GTK3,
                   "Serif 10", NULL),
 
-  /* gui-sdl client specific options. */
-  GEN_BOOL_OPTION(gui_sdl_fullscreen, N_("Fullscreen"),
-                  N_("If this option is set the client will use the "
-                     "whole screen area for drawing."),
+  /* gui-sdl client specific options.
+   * These are still kept just so users can migrate them to sdl2-client */
+  GEN_BOOL_OPTION(gui_sdl_fullscreen, NULL, NULL,
                   COC_INTERFACE, GUI_SDL, FALSE, NULL),
-  GEN_VIDEO_OPTION(gui_sdl_screen, N_("Screen resolution"),
-                   N_("This option controls the resolution of the "
-                      "selected screen."),
+  GEN_VIDEO_OPTION(gui_sdl_screen, NULL, NULL,
                    COC_INTERFACE, GUI_SDL, 640, 480, NULL),
-  GEN_BOOL_OPTION(gui_sdl_do_cursor_animation, N_("Do cursor animation"),
-                  N_("If this option is disabled, the cursor will "
-                     "always be displayed as static."),
+  GEN_BOOL_OPTION(gui_sdl_do_cursor_animation, NULL, NULL,
                   COC_INTERFACE, GUI_SDL, TRUE, NULL),
-  GEN_BOOL_OPTION(gui_sdl_use_color_cursors, N_("Use color cursors"),
-                  N_("If this option is disabled, the cursor will "
-                     "always be displayed in black and white."),
+  GEN_BOOL_OPTION(gui_sdl_use_color_cursors, NULL, NULL,
                   COC_INTERFACE, GUI_SDL, TRUE, NULL),
 
   /* gui-sdl2 client specific options. */

Modified: trunk/client/options.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.h?rev=30621&r1=30620&r2=30621&view=diff
==============================================================================
--- trunk/client/options.h      (original)
+++ trunk/client/options.h      Sun Nov 15 19:05:31 2015
@@ -265,9 +265,8 @@
 #define FC_GTK4_DEFAULT_THEME_NAME "Freeciv"
   char gui_gtk4_default_theme_name[512];
 
-/* gui-sdl client specific options. */
-#define FC_SDL_DEFAULT_THEME_NAME "human"
-  char gui_sdl_default_theme_name[512];
+/* gui-sdl client specific options.
+ * These are still kept just so users can migrate them to sdl2-client */
   bool gui_sdl_fullscreen;
   struct video_mode gui_sdl_screen;
   bool gui_sdl_do_cursor_animation;

Modified: trunk/client/tilespec.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=30621&r1=30620&r2=30621&view=diff
==============================================================================
--- trunk/client/tilespec.c     (original)
+++ trunk/client/tilespec.c     Sun Nov 15 19:05:31 2015
@@ -6113,16 +6113,13 @@
   case GUI_GTK3x:
     default_theme_name = gui_options.gui_gtk4_default_theme_name;
     default_theme_name_sz = sizeof(gui_options.gui_gtk4_default_theme_name);
-  case GUI_SDL:
-    default_theme_name = gui_options.gui_sdl_default_theme_name;
-    default_theme_name_sz = sizeof(gui_options.gui_sdl_default_theme_name);
-    break;
   case GUI_SDL2:
     default_theme_name = gui_options.gui_sdl2_default_theme_name;
     default_theme_name_sz = sizeof(gui_options.gui_sdl2_default_theme_name);
     break;
   case GUI_STUB:
   case GUI_QT:
+  case GUI_SDL:
   case GUI_WEB:
     break;
   }


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to