Rename "Screen" tab to "Display"

This is what pretty much everyone else calls these kind of settings, so
let's change so users feel familiar.

diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx
index d7c545da6547c0a618b4960d4e5c88c767ae7c8a..b2eedc9414276b8a9ffe34ec99ae2efa087d1a4c 100644 (file)
--- a/vncviewer/OptionsDialog.cxx
+++ b/vncviewer/OptionsDialog.cxx
@@ -72,7 +72,7 @@ OptionsDialog::OptionsDialog()
     createCompressionPage(tx, ty, tw, th);
     createSecurityPage(tx, ty, tw, th);
     createInputPage(tx, ty, tw, th);
-    createScreenPage(tx, ty, tw, th);
+    createDisplayPage(tx, ty, tw, th);
     createMiscPage(tx, ty, tw, th);
   }
 
@@ -281,7 +281,7 @@ void OptionsDialog::loadOptions(void)
     if (!strcmp(getMenuKeySymbols()[i].name, menuKeyBuf))
       menuKeyChoice->value(i + 1);
 
-  /* Screen */
+  /* Display */
   if (!fullScreen) {
     windowedButton->setonly();
   } else {
@@ -391,7 +391,7 @@ void OptionsDialog::storeOptions(void)
     menuKey.setParam(menuKeyChoice->text());
   }
 
-  /* Screen */
+  /* Display */
   if (windowedButton->value()) {
     fullScreen.setParam(false);
   } else {
@@ -752,9 +752,9 @@ void OptionsDialog::createInputPage(int tx, int ty, int tw, int th)
 }
 
 
-void OptionsDialog::createScreenPage(int tx, int ty, int tw, int th)
+void OptionsDialog::createDisplayPage(int tx, int ty, int tw, int th)
 {
-  Fl_Group *group = new Fl_Group(tx, ty, tw, th, _("Screen"));
+  Fl_Group *group = new Fl_Group(tx, ty, tw, th, _("Display"));
 
   tx += OUTER_MARGIN;
   ty += OUTER_MARGIN;

diff --git a/vncviewer/OptionsDialog.h b/vncviewer/OptionsDialog.h
index b3375fba7a61b5aebc3747aa8c96efa04a1cdd88..de1e01738e08fa60d2f9603b429423a02c20b54b 100644 (file)
--- a/vncviewer/OptionsDialog.h
+++ b/vncviewer/OptionsDialog.h
@@ -54,7 +54,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 createDisplayPage(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);
@@ -120,7 +120,7 @@ protected:
   Fl_Check_Button *systemKeysCheckbox;
   Fl_Choice *menuKeyChoice;
 
-  /* Screen */
+  /* Display */
   Fl_Round_Button *windowedButton;
   Fl_Round_Button *currentMonitorButton;
   Fl_Round_Button *allMonitorsButton;

diff --git a/vncviewer/parameters.cxx b/vncviewer/parameters.cxx
index 7eb9cb152c976ce61eef7e5932a7c59c356f30b1..40c525f795570bed57be30b1ec44a53de467ddba 100644 (file)
--- a/vncviewer/parameters.cxx
+++ b/vncviewer/parameters.cxx
@@ -193,7 +193,7 @@ static VoidParameter* parameterArray[] = {
   &compressLevel,
   &noJpeg,
   &qualityLevel,
-  /* Screen */
+  /* Display */
   &fullScreen,
   &fullScreenMode,
   &fullScreenSelectedMonitors,