Added the new buttons to the vncviewer toolbar:

zoom in, zoom out, actual size, auto size.

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

diff --git a/win/vncviewer/ViewerToolBar.cxx b/win/vncviewer/ViewerToolBar.cxx
index 8ed795ee67886462ac0ad59b700c9d33b115e1ca..adc6f07e96ba053a15836557adc7432cc2d1f6df 100644 (file)
--- a/win/vncviewer/ViewerToolBar.cxx
+++ b/win/vncviewer/ViewerToolBar.cxx
@@ -34,16 +34,21 @@ void ViewerToolBar::create(HWND parentHwnd) {
   addButton(2, ID_FULLSCREEN);
   addButton(3, ID_REQUEST_REFRESH);
   addButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP);
-  addButton(4, ID_SEND_CAD);
-  addButton(5, ID_SEND_CTLESC);
-  addButton(6, ID_CTRL_KEY);
-  addButton(7, ID_ALT_KEY);
+  addButton(4, ID_ZOOM_IN);
+  addButton(5, ID_ZOOM_OUT);
+  addButton(6, ID_ACTUAL_SIZE);
+  addButton(7, ID_AUTO_SIZE);
   addButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP);
-  addButton(8, ID_FILE_TRANSFER);
+  addButton(8, ID_SEND_CAD);
+  addButton(9, ID_SEND_CTLESC);
+  addButton(10, ID_CTRL_KEY);
+  addButton(11, ID_ALT_KEY);
   addButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP);
-  addButton(9, ID_NEW_CONNECTION);
-  addButton(10, ID_CONN_SAVE_AS);
-  addButton(11, ID_CLOSE);
+  addButton(12, ID_FILE_TRANSFER);
+  addButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP);
+  addButton(13, ID_NEW_CONNECTION);
+  addButton(14, ID_CONN_SAVE_AS);
+  addButton(15, ID_CLOSE);
 
   // Resize the toolbar window
   autoSize();

diff --git a/win/vncviewer/resource.h b/win/vncviewer/resource.h
index 7fb32fe3d1aec5d0ed7a4b27f17c9dade8d79f26..0016b74d86eefd88e761caa8d9e55f7c8f412cd1 100644 (file)
--- a/win/vncviewer/resource.h
+++ b/win/vncviewer/resource.h
@@ -138,6 +138,10 @@
 #define ID_SEND_CTLESC                  40014
 #define ID_CONN_SAVE_AS                 40015
 #define ID_FILE_TRANSFER                40016
+#define ID_ZOOM_IN                      40017
+#define ID_ZOOM_OUT                     40018
+#define ID_ACTUAL_SIZE                  40019
+#define ID_AUTO_SIZE                    40020
 #define IDM_FTCOPY                      40022
 #define IDM_FTRENAME                    40023
 #define IDM_FTDELETE                    40024

diff --git a/win/vncviewer/toolbar.bmp b/win/vncviewer/toolbar.bmp
index 0a14636197b3311dc45205a987eff7a9a959fbbd..1473fa3733a4566771d1d82ff99b2dba107fe9c0 100644 (file)
Binary files a/win/vncviewer/toolbar.bmp and b/win/vncviewer/toolbar.bmp differ