Simplify color level descriptions

The number of colors used isn't something the end-users should have to
concern themselves with. I intentionally left the information in the
man-pages.

diff --git a/java/com/tigervnc/vncviewer/OptionsDialog.java b/java/com/tigervnc/vncviewer/OptionsDialog.java
index 9893fa1a22c51775a884c07e6b61716f53cb11ed..6b1dc8c4b3935e0bd1706380f85823b63d148ba5 100644 (file)
--- a/java/com/tigervnc/vncviewer/OptionsDialog.java
+++ b/java/com/tigervnc/vncviewer/OptionsDialog.java
@@ -668,14 +668,10 @@ class OptionsDialog extends Dialog {
 
     JPanel colorPanel = new JPanel(new GridLayout(4, 1));
     colorPanel.setBorder(BorderFactory.createTitledBorder("Color level"));
-    fullcolorButton = new GroupedJRadioButton("Full (all available colors)",
-                                              colorlevelGroup, colorPanel);
-    mediumcolorButton = new GroupedJRadioButton("Medium (256 colors)",
-                                                colorlevelGroup, colorPanel);
-    lowcolorButton = new GroupedJRadioButton("Low (64 colors)",
-                                             colorlevelGroup, colorPanel);
-    verylowcolorButton = new GroupedJRadioButton("Very low (8 colors)",
-                                                 colorlevelGroup, colorPanel);
+    fullcolorButton = new GroupedJRadioButton("Full", colorlevelGroup, colorPanel);
+    mediumcolorButton = new GroupedJRadioButton("Medium", colorlevelGroup, colorPanel);
+    lowcolorButton = new GroupedJRadioButton("Low", colorlevelGroup, colorPanel);
+    verylowcolorButton = new GroupedJRadioButton("Very low", colorlevelGroup, colorPanel);
 
     JPanel encodingPane = new JPanel(new GridLayout(1, 2, 5, 0));
     encodingPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0));

diff --git a/java/com/tigervnc/vncviewer/Parameters.java b/java/com/tigervnc/vncviewer/Parameters.java
index 1a5a5ce52d2d0b6ebe065088237ba5d6f68f621b..88d68e14b9eeadec3c7c7866e190822d04fba831 100644 (file)
--- a/java/com/tigervnc/vncviewer/Parameters.java
+++ b/java/com/tigervnc/vncviewer/Parameters.java
@@ -78,8 +78,7 @@ public class Parameters {
   public static IntParameter lowColorLevel
   = new IntParameter("LowColorLevel",
     "Color level to use on slow connections. "+
-    "0 = Very Low (8 colors), 1 = Low (64 colors), "+
-    "2 = Medium (256 colors)",
+    "0 = Very Low, 1 = Low, 2 = Medium",
     2);
 
   public static AliasParameter lowColorLevelAlias

diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx
index 62b5d9c5a0b972b39230164ce619021d3d87d9df..314ad6860b880a1e5822a51ba5eff867824450d0 100644 (file)
--- a/vncviewer/OptionsDialog.cxx
+++ b/vncviewer/OptionsDialog.cxx
@@ -507,28 +507,28 @@ void OptionsDialog::createCompressionPage(int tx, int ty, int tw, int th)
     fullcolorCheckbox = new Fl_Round_Button(LBLRIGHT(tx, ty,
                                                      RADIO_MIN_WIDTH,
                                                      RADIO_HEIGHT,
-                                                     _("Full (all available colors)")));
+                                                     _("Full")));
     fullcolorCheckbox->type(FL_RADIO_BUTTON);
     ty += RADIO_HEIGHT + TIGHT_MARGIN;
 
     mediumcolorCheckbox = new Fl_Round_Button(LBLRIGHT(tx, ty,
                                                        RADIO_MIN_WIDTH,
                                                        RADIO_HEIGHT,
-                                                       _("Medium (256 colors)")));
+                                                       _("Medium")));
     mediumcolorCheckbox->type(FL_RADIO_BUTTON);
     ty += RADIO_HEIGHT + TIGHT_MARGIN;
 
     lowcolorCheckbox = new Fl_Round_Button(LBLRIGHT(tx, ty,
                                                     RADIO_MIN_WIDTH,
                                                     RADIO_HEIGHT,
-                                                    _("Low (64 colors)")));
+                                                    _("Low")));
     lowcolorCheckbox->type(FL_RADIO_BUTTON);
     ty += RADIO_HEIGHT + TIGHT_MARGIN;
 
     verylowcolorCheckbox = new Fl_Round_Button(LBLRIGHT(tx, ty,
                                                         RADIO_MIN_WIDTH,
                                                         RADIO_HEIGHT,
-                                                        _("Very low (8 colors)")));
+                                                        _("Very low")));
     verylowcolorCheckbox->type(FL_RADIO_BUTTON);
     ty += RADIO_HEIGHT + TIGHT_MARGIN;
   }

diff --git a/vncviewer/parameters.cxx b/vncviewer/parameters.cxx
index 05abd704f529edfc7ff7ca52d83f81d1ddae387c..f0121e3e589d452e7fa267b64cb648a9e55840b7 100644 (file)
--- a/vncviewer/parameters.cxx
+++ b/vncviewer/parameters.cxx
@@ -76,8 +76,7 @@ BoolParameter fullColour("FullColor",
 AliasParameter fullColourAlias("FullColour", "Alias for FullColor", &fullColour);
 IntParameter lowColourLevel("LowColorLevel",
                             "Color level to use on slow connections. "
-                            "0 = Very Low (8 colors), 1 = Low (64 colors), "
-                            "2 = Medium (256 colors)", 2);
+                            "0 = Very Low, 1 = Low, 2 = Medium", 2);
 AliasParameter lowColourLevelAlias("LowColourLevel", "Alias for LowColorLevel", &lowColourLevel);
 StringParameter preferredEncoding("PreferredEncoding",
                                   "Preferred encoding to use (Tight, ZRLE, Hextile or"