Now possible to select tight encoding in win32 vncviewer GUI
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@46 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx
index ab45f8c..93e7f0c 100644
--- a/vncviewer/OptionsDialog.cxx
+++ b/vncviewer/OptionsDialog.cxx
@@ -88,6 +88,7 @@
}
}
switch (dlg->options.preferredEncoding) {
+ case encodingTight: setItemChecked(IDC_ENCODING_TIGHT, true); break;
case encodingZRLE: setItemChecked(IDC_ENCODING_ZRLE, true); break;
case encodingHextile: setItemChecked(IDC_ENCODING_HEXTILE, true); break;
case encodingRaw: setItemChecked(IDC_ENCODING_RAW, true); break;
@@ -103,7 +104,9 @@
dlg->options.lowColourLevel = 1;
if (isItemChecked(IDC_FORMAT_MEDIUMCOLOUR))
dlg->options.lowColourLevel = 2;
- dlg->options.preferredEncoding = encodingZRLE;
+ dlg->options.preferredEncoding = encodingTight;
+ if (isItemChecked(IDC_ENCODING_ZRLE))
+ dlg->options.preferredEncoding = encodingZRLE;
if (isItemChecked(IDC_ENCODING_HEXTILE))
dlg->options.preferredEncoding = encodingHextile;
if (isItemChecked(IDC_ENCODING_RAW))
@@ -114,6 +117,7 @@
virtual bool onCommand(int id, int cmd) {
if (id == IDC_ENCODING_AUTO) {
bool ok = !isItemChecked(IDC_ENCODING_AUTO);
+ enableItem(IDC_ENCODING_TIGHT, ok);
enableItem(IDC_ENCODING_ZRLE, ok);
enableItem(IDC_ENCODING_HEXTILE, ok);
enableItem(IDC_ENCODING_RAW, ok);
diff --git a/vncviewer/resource.h b/vncviewer/resource.h
index 351a2b0..587462e 100644
--- a/vncviewer/resource.h
+++ b/vncviewer/resource.h
@@ -63,6 +63,7 @@
#define IDC_MENU_KEY 1051
#define IDC_REQUESTED_ENCODING 1052
#define IDC_LAST_ENCODING 1053
+#define IDC_ENCODING_TIGHT 1054
#define ID_CLOSE 40002
#define ID_OPTIONS 40003
#define ID_NEW_CONNECTION 40004
diff --git a/vncviewer/vncviewer.rc b/vncviewer/vncviewer.rc
index bd9ab6d..e931a2a 100644
--- a/vncviewer/vncviewer.rc
+++ b/vncviewer/vncviewer.rc
@@ -171,12 +171,13 @@
BEGIN
CONTROL "&Auto select",IDC_ENCODING_AUTO,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,7,88,13
- GROUPBOX "Preferred encoding",IDC_STATIC,7,25,83,60
- CONTROL "ZRLE",IDC_ENCODING_ZRLE,"Button",BS_AUTORADIOBUTTON |
+ GROUPBOX "Preferred encoding",IDC_STATIC,7,25,83,75
+ CONTROL "Tight",IDC_ENCODING_TIGHT,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,10,35,75,14
+ CONTROL "ZRLE",IDC_ENCODING_ZRLE,"Button",BS_AUTORADIOBUTTON,10,50,75,14
CONTROL "Hextile",IDC_ENCODING_HEXTILE,"Button",
- BS_AUTORADIOBUTTON,10,49,75,16
- CONTROL "Raw",IDC_ENCODING_RAW,"Button",BS_AUTORADIOBUTTON,10,65,
+ BS_AUTORADIOBUTTON,10,65,75,16
+ CONTROL "Raw",IDC_ENCODING_RAW,"Button",BS_AUTORADIOBUTTON,10,80,
75,15
GROUPBOX "Colour level",IDC_STATIC,95,10,99,75
CONTROL "&Full (all available colours)",IDC_FORMAT_FULLCOLOUR,