From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 5 Jul 2012 09:23:03 +0000 (+0000)
Subject: Move the fullscreen option to a separate tab, in preparation for more
X-Git-Tag: v1.2.90~158
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1c2189b084458ab80f8a93c9a99e5cfd5d2682aa;p=tigervnc.git

Move the fullscreen option to a separate tab, in preparation for more
screen related options.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4927 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx
index f77466ec..58f2fd7e 100644
--- a/vncviewer/OptionsDialog.cxx
+++ b/vncviewer/OptionsDialog.cxx
@@ -67,6 +67,7 @@ OptionsDialog::OptionsDialog()
     createCompressionPage(tx, ty, tw, th);
     createSecurityPage(tx, ty, tw, th);
     createInputPage(tx, ty, tw, th);
+    createScreenPage(tx, ty, tw, th);
     createMiscPage(tx, ty, tw, th);
   }
 
@@ -269,9 +270,11 @@ void OptionsDialog::loadOptions(void)
     if (!strcmp(getMenuKeySymbols()[i].name, menuKeyBuf))
       menuKeyChoice->value(i + 1);
 
+  /* Screen */
+  fullScreenCheckbox->value(fullScreen);
+
   /* Misc. */
   sharedCheckbox->value(shared);
-  fullScreenCheckbox->value(fullScreen);
   dotCursorCheckbox->value(dotWhenNoCursor);
 }
 
@@ -356,9 +359,11 @@ void OptionsDialog::storeOptions(void)
     menuKey.setParam(menuKeyChoice->text());
   }
 
+  /* Screen */
+  fullScreen.setParam(fullScreenCheckbox->value());
+
   /* Misc. */
   shared.setParam(sharedCheckbox->value());
-  fullScreen.setParam(fullScreenCheckbox->value());
   dotWhenNoCursor.setParam(dotCursorCheckbox->value());
 
   std::map<OptionsCallback*, void*>::const_iterator iter;
@@ -686,23 +691,34 @@ void OptionsDialog::createInputPage(int tx, int ty, int tw, int th)
 }
 
 
-void OptionsDialog::createMiscPage(int tx, int ty, int tw, int th)
+void OptionsDialog::createScreenPage(int tx, int ty, int tw, int th)
 {
-  Fl_Group *group = new Fl_Group(tx, ty, tw, th, _("Misc."));
+  Fl_Group *group = new Fl_Group(tx, ty, tw, th, _("Screen"));
 
   tx += OUTER_MARGIN;
   ty += OUTER_MARGIN;
 
-  sharedCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+  fullScreenCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
                                                   CHECK_MIN_WIDTH,
                                                   CHECK_HEIGHT,
-                                                  _("Shared (don't disconnect other viewers)")));
+                                                  _("Full-screen mode")));
   ty += CHECK_HEIGHT + TIGHT_MARGIN;
 
-  fullScreenCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+  group->end();
+}
+
+
+void OptionsDialog::createMiscPage(int tx, int ty, int tw, int th)
+{
+  Fl_Group *group = new Fl_Group(tx, ty, tw, th, _("Misc."));
+
+  tx += OUTER_MARGIN;
+  ty += OUTER_MARGIN;
+
+  sharedCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
                                                   CHECK_MIN_WIDTH,
                                                   CHECK_HEIGHT,
-                                                  _("Full-screen mode")));
+                                                  _("Shared (don't disconnect other viewers)")));
   ty += CHECK_HEIGHT + TIGHT_MARGIN;
 
   dotCursorCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
diff --git a/vncviewer/OptionsDialog.h b/vncviewer/OptionsDialog.h
index 5c90749e..d33ecaad 100644
--- a/vncviewer/OptionsDialog.h
+++ b/vncviewer/OptionsDialog.h
@@ -50,6 +50,7 @@ protected:
   void createCompressionPage(int tx, int ty, int tw, int th);
   void createSecurityPage(int tx, int ty, int tw, int th);
   void createInputPage(int tx, int ty, int tw, int th);
+  void createScreenPage(int tx, int ty, int tw, int th);
   void createMiscPage(int tx, int ty, int tw, int th);
 
   static void handleAutoselect(Fl_Widget *widget, void *data);
@@ -105,9 +106,11 @@ protected:
   Fl_Check_Button *systemKeysCheckbox;
   Fl_Choice *menuKeyChoice;
 
+  /* Screen */
+  Fl_Check_Button *fullScreenCheckbox;
+
   /* Misc. */
   Fl_Check_Button *sharedCheckbox;
-  Fl_Check_Button *fullScreenCheckbox;
   Fl_Check_Button *dotCursorCheckbox;
 };