diff options
| author | Adam Tkac <atkac@redhat.com> | 2010-12-08 13:49:50 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2010-12-08 13:49:50 +0000 |
| commit | 09651ae649dfe30249c8045887d2fef2b3565003 (patch) | |
| tree | ce9b76aede5be611fb1417163d8cd498bde73181 | |
| parent | 3fed5a4ab8e36bf537b32e6680d3a86cbf0f8917 (diff) | |
| download | tigervnc-09651ae649dfe30249c8045887d2fef2b3565003.tar.gz tigervnc-09651ae649dfe30249c8045887d2fef2b3565003.zip | |
[Development] Remove the "Encryption" combo box from the Windows viewer.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4218 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | win/vncviewer/ConnectionDialog.cxx | 7 | ||||
| -rw-r--r-- | win/vncviewer/resource.h | 1 | ||||
| -rw-r--r-- | win/vncviewer/vncviewer.rc | 7 |
3 files changed, 2 insertions, 13 deletions
diff --git a/win/vncviewer/ConnectionDialog.cxx b/win/vncviewer/ConnectionDialog.cxx index 29fd1bc9..e73e8ec1 100644 --- a/win/vncviewer/ConnectionDialog.cxx +++ b/win/vncviewer/ConnectionDialog.cxx @@ -49,13 +49,6 @@ void ConnectionDialog::initDialog() { // Select the first item in the list SendMessage(box, CB_SETCURSEL, 0, 0); - - // Fill out the Security: drop-down and select the preferred option - HWND security = GetDlgItem(handle, IDC_SECURITY_LEVEL); - LRESULT n = SendMessage(security, CB_ADDSTRING, 0, (LPARAM)_T("Always Off")); - if (n != CB_ERR) - SendMessage(security, CB_SETCURSEL, n, 0); - enableItem(IDC_SECURITY_LEVEL, false); } diff --git a/win/vncviewer/resource.h b/win/vncviewer/resource.h index 0487c5e8..03d9d766 100644 --- a/win/vncviewer/resource.h +++ b/win/vncviewer/resource.h @@ -68,7 +68,6 @@ #define IDC_MENU_KEY 1051 #define IDC_REQUESTED_ENCODING 1052 #define IDC_LAST_ENCODING 1053 -#define IDC_SECURITY_LEVEL 1054 #define IDC_INFO_ENCRYPTION 1055 #define IDC_AUTO_RECONNECT 1056 #define IDC_DISABLE_WINKEYS 1057 diff --git a/win/vncviewer/vncviewer.rc b/win/vncviewer/vncviewer.rc index ed89a4ea..c2c98252 100644 --- a/win/vncviewer/vncviewer.rc +++ b/win/vncviewer/vncviewer.rc @@ -148,7 +148,7 @@ STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | CAPTION "VNC Viewer : Connection Details" FONT 8, "MS Sans Serif" BEGIN - COMBOBOX IDC_SERVER_EDIT,85,6,105,234,CBS_DROPDOWN | + COMBOBOX IDC_SERVER_EDIT,85,15,105,234,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&About...",IDC_ABOUT,5,45,50,14 PUSHBUTTON "&Options...",IDC_OPTIONS,60,45,50,14 @@ -156,10 +156,7 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,170,45,48,14 CONTROL 120,IDI_ICON,"Static",SS_BITMAP | SS_REALSIZEIMAGE,5,6, 20,20 - RTEXT "Server:",IDC_STATIC,43,6,37,13,SS_CENTERIMAGE - RTEXT "Encryption:",IDC_STATIC,43,24,37,12,SS_CENTERIMAGE - COMBOBOX IDC_SECURITY_LEVEL,85,24,105,76,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP + RTEXT "Server:",IDC_STATIC,43,15,37,13,SS_CENTERIMAGE END IDD_ABOUT DIALOG DISCARDABLE 0, 0, 249, 92 |