[Freeciv-Dev] (PR#12134) fullscreen and save-options-on-exit options

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12134 >

It's good to put these options into menus but they should stay in the 
dialog too.  There shouldn't be any special handling.

All options should be listed in the dialog, even ones that are in menus 
too.  This goes for all the view-menu options (which I'll deal with in a 
separate patch, after which we may rethink the option categories).

-jason

? blend.png
? fog
? fog.c
? fog.png
? foo
? terrain1.png
? po/en.po
Index: client/options.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/options.c,v
retrieving revision 1.118
diff -u -r1.118 options.c
--- client/options.c    5 Feb 2005 19:46:32 -0000       1.118
+++ client/options.c    5 Feb 2005 21:22:10 -0000
@@ -50,11 +50,9 @@
 char default_sound_set_name[512] = "stdsounds";
 char default_sound_plugin_name[512] = "\0";
 
-bool save_options_on_exit = TRUE;
-bool fullscreen_mode = TRUE;
-
 /** Local Options: **/
 
+bool save_options_on_exit = TRUE;
 bool solid_color_behind_units = FALSE;
 bool sound_bell_at_new_turn = FALSE;
 int  smooth_move_unit_msec = 30;
@@ -86,6 +84,11 @@
 };
 
 static client_option common_options[] = {
+  GEN_BOOL_OPTION(save_options_on_exit,
+                 N_("Save the options when exiting the game"),
+                 N_("If this option is selected, options will be saved "
+                    "automatically when you exit Freeciv."),
+                 COC_NETWORK),
   GEN_STR_OPTION(default_user_name,
                 N_("Login name"),
                 N_("This is the default login username that will be used "
@@ -536,13 +539,6 @@
   sz_strlcpy(password, 
              secfile_lookup_str_default(&sf, "", "%s.password", prefix));
 
-  save_options_on_exit =
-    secfile_lookup_bool_default(&sf, save_options_on_exit,
-                               "%s.save_options_on_exit", prefix);
-  fullscreen_mode =
-    secfile_lookup_bool_default(&sf, fullscreen_mode,
-                               "%s.fullscreen_mode", prefix);
-
   for (i = 0; i < num_options; i++) {
     client_option *o = options + i;
 
@@ -656,9 +652,6 @@
   section_file_init(&sf);
   secfile_insert_str(&sf, VERSION_STRING, "client.version");
 
-  secfile_insert_bool(&sf, save_options_on_exit, 
"client.save_options_on_exit");
-  secfile_insert_bool(&sf, fullscreen_mode, "client.fullscreen_mode");
-
   for (i = 0; i < num_options; i++) {
     client_option *o = options + i;
 
Index: client/options.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/options.h,v
retrieving revision 1.47
diff -u -r1.47 options.h
--- client/options.h    5 Feb 2005 19:46:32 -0000       1.47
+++ client/options.h    5 Feb 2005 21:22:10 -0000
@@ -25,7 +25,6 @@
 extern char default_sound_plugin_name[512];
 
 extern bool save_options_on_exit;
-extern bool fullscreen_mode;
 
 /** Local Options: **/
 
Index: client/gui-gtk-2.0/gui_main.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/gui_main.c,v
retrieving revision 1.107
diff -u -r1.107 gui_main.c
--- client/gui-gtk-2.0/gui_main.c       5 Feb 2005 19:46:32 -0000       1.107
+++ client/gui-gtk-2.0/gui_main.c       5 Feb 2005 21:22:11 -0000
@@ -89,6 +89,7 @@
 
 bool enable_tabs = TRUE;
 bool better_fog = TRUE;
+bool fullscreen_mode = TRUE;
 
 GtkWidget *toplevel;
 GdkWindow *root_window;
@@ -161,6 +162,12 @@
                     "icons in the worklist dialog and the production "
                     "tab of the city dialog."),
                  COC_GRAPHICS),
+  GEN_BOOL_OPTION(fullscreen_mode, N_("Fullscreen Mode"),
+                 N_("If this option is set then the game will be played in "
+                    "fullscreen mode. There are some known bugs with "
+                    "fullscreen mode so if you run into problems simply "
+                    "disable it."),
+                 COC_INTERFACE),
   GEN_BOOL_OPTION(enable_tabs, N_("Enable status report tabs"),
                  N_("If this option is enabled then report dialogs will "
                     "be shown as separate tabs rather than in popup "
Index: client/gui-gtk-2.0/gui_main.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/gui_main.h,v
retrieving revision 1.21
diff -u -r1.21 gui_main.h
--- client/gui-gtk-2.0/gui_main.h       5 Feb 2005 19:46:32 -0000       1.21
+++ client/gui-gtk-2.0/gui_main.h       5 Feb 2005 21:22:11 -0000
@@ -43,6 +43,7 @@
 
 extern bool enable_tabs;
 extern bool better_fog;
+extern bool fullscreen_mode;
 
 extern GdkGC *          civ_gc;
 extern GdkGC *          mask_fg_gc;