Skip to content

Commit

Permalink
UI changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@RudiDeVos
RudiDeVos committed Jul 4, 2024
1 parent a2529ec commit 4925a22
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 61 deletions.
12 changes: 6 additions & 6 deletions vncviewer/SessionDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ BOOL CALLBACK SessDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
helper::SafeSetWindowUserData(hwnd, lParam);
char version[50]{};
char title[256]{};
strcpy_s(title, "UltraVNC Viewer - ");
strcpy_s(title, "UltraVNC Viewer -");
strcat_s(title, GetVersionFromResource(version));
SetWindowText(hwnd, title);
}
Expand All @@ -233,7 +233,7 @@ BOOL CALLBACK SessDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)

_this->ExpandBox(hwnd, !_this->m_bExpanded);
//SendMessage(GetDlgItem(hwnd, IDC_BUTTON_EXPAND), BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)_this->hBmpExpand);
SetWindowText(GetDlgItem(hwnd, IDC_BUTTON_EXPAND), "Show Options");
//SetWindowText(GetDlgItem(hwnd, IDC_BUTTON_EXPAND), "Show Options");
return TRUE;
}

Expand Down Expand Up @@ -458,8 +458,8 @@ void SessionDialog::ExpandBox(HWND hDlg, BOOL fExpand)

wndDefaultBox = GetDlgItem(hDlg, IDC_DEFAULTBOX);
if (wndDefaultBox == NULL) return;
if (!fExpand) SetWindowText(GetDlgItem(hDlg, IDC_BUTTON_EXPAND), "Show Options");
else SetWindowText(GetDlgItem(hDlg, IDC_BUTTON_EXPAND), "Hide Options");
//if (!fExpand) SetWindowText(GetDlgItem(hDlg, IDC_BUTTON_EXPAND), "Show Options");
//else SetWindowText(GetDlgItem(hDlg, IDC_BUTTON_EXPAND), "Hide Options");
// retrieve coordinates for the default child window
GetWindowRect(wndDefaultBox, &rcDefaultBox);
rcDefaultBox.left += 2;
Expand Down Expand Up @@ -503,7 +503,7 @@ void SessionDialog::ExpandBox(HWND hDlg, BOOL fExpand)
rcDefaultBox.bottom - rcWnd.top,
SWP_NOZORDER | SWP_NOMOVE);

SetWindowText(pCtrl, "Show Options");
//SetWindowText(pCtrl, "Show Options");

// record that the dialog is contracted.
m_bExpanded = FALSE;
Expand All @@ -516,7 +516,7 @@ void SessionDialog::ExpandBox(HWND hDlg, BOOL fExpand)
// make sure that the entire dialog box is visible on the user's
// screen.
SendMessage(hDlg, DM_REPOSITION, 0, 0);
SetWindowText(pCtrl, "Hide Options");
//SetWindowText(pCtrl, "Hide Options");
m_bExpanded = TRUE;
}
}
Expand Down
4 changes: 2 additions & 2 deletions vncviewer/SessionDialogTabs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void SessionDialog::InitTab(HWND hwnd)
item.mask = TCIF_TEXT;
item.pszText = "Encoders";
TabCtrl_InsertItem(m_hTab, 0, &item);
item.pszText = "Mouse and keyboard";
item.pszText = "Input";
TabCtrl_InsertItem(m_hTab, 1, &item);
item.pszText = "Display";
TabCtrl_InsertItem(m_hTab, 2, &item);
Expand All @@ -67,7 +67,7 @@ void SessionDialog::InitTab(HWND hwnd)
TabCtrl_InsertItem(m_hTab, 4, &item);
item.pszText = "Quick encoder";
TabCtrl_InsertItem(m_hTab, 5, &item);
item.pszText = "Listen mode";
item.pszText = "Listen";
TabCtrl_InsertItem(m_hTab, 6, &item);
hTabEncoders = CreateDialogParam(pApp->m_instance,
MAKEINTRESOURCE(IDD_ENCODERS),
Expand Down
69 changes: 36 additions & 33 deletions vncviewer/res/vncviewer.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,27 +303,27 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER |
CAPTION "UltraVNC Viewer 1.4.4.0-dev - Connection"
FONT 11, "MS Shell Dlg", 400, 0, 0x0
BEGIN
COMBOBOX IDC_HOSTNAME_EDIT,61,21,128,66,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_PROXY_EDIT,61,36,128,12,ES_AUTOHSCROLL
PUSHBUTTON "Show Options",IDC_BUTTON_EXPAND,11,92,49,10,BS_ICON
DEFPUSHBUTTON "Connect",IDCONNECT,200,20,47,14
CONTROL "Direct",IDC_RADIODIRECT,"Button",BS_AUTORADIOBUTTON | BS_LEFT | BS_VCENTER,83,18,47,10
CONTROL "Repeater",IDC_RADIOREPEATER,"Button",BS_AUTORADIOBUTTON | BS_LEFT | BS_VCENTER,132,18,47,10
COMBOBOX IDC_HOSTNAME_EDIT,81,30,103,66,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_PROXY_EDIT,81,44,103,12,ES_AUTOHSCROLL
DEFPUSHBUTTON "Connect",IDCONNECT,200,29,47,14
PUSHBUTTON "Load ",IDC_LOADPROFILE_B,11,65,50,13
PUSHBUTTON "Save",IDC_SAVE,73,65,50,13
PUSHBUTTON "Save as",IDC_SAVEAS,135,65,50,13
PUSHBUTTON "Delete",IDC_HOSTNAME_DEL,197,65,50,13
CONTROL "",IDC_TAB,"SysTabControl32",TCS_MULTILINE | WS_TABSTOP,5,115,243,172
PUSHBUTTON "Options",IDC_BUTTON_EXPAND,11,84,50,13,BS_ICON
PUSHBUTTON "About",IDC_ABOUT,73,84,50,13
CONTROL "",IDC_TAB,"SysTabControl32",TCS_RAGGEDRIGHT | WS_TABSTOP,5,115,243,172
PUSHBUTTON "Restore defaults",IDC_DELETE,188,291,60,14
LTEXT "Computer",IDC_LINE1,13,23,46,8
CONTROL IDB_VNC32,IDC_STATIC,"Static",SS_BITMAP,11,5,13,12
LTEXT "UltraVNC Viewer",IDC_LOGO,77,7,150,8,SS_CENTERIMAGE
LTEXT "Computer",IDC_LINE2,13,38,47,8
CONTROL "Direct",IDC_RADIODIRECT,"Button",BS_AUTORADIOBUTTON,12,50,47,10
CONTROL "Repeater",IDC_RADIOREPEATER,"Button",BS_AUTORADIOBUTTON,64,50,47,10
CONTROL "",IDC_DEFAULTBOX,"Static",SS_BLACKFRAME | SS_REALSIZEIMAGE,4,0,255,109
CONTROL IDB_GREEN,IDC_GREEN,"Static",SS_BITMAP,117,52,6,6
CONTROL IDB_BITMAP1,IDC_YELLOW,"Static",SS_BITMAP,117,52,6,6
CONTROL IDB_RED,IDC_RED,"Static",SS_BITMAP,117,52,6,6
PUSHBUTTON "About",IDC_ABOUT,197,82,50,14
LTEXT "Computer",IDC_LINE1,33,32,46,8
CONTROL IDB_VNC64,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,7,5,26,23
CTEXT "UltraVNC Viewer",IDC_LOGO,46,7,156,8,SS_CENTERIMAGE
LTEXT "Computer",IDC_LINE2,33,46,47,8
CONTROL "",IDC_DEFAULTBOX,"Static",SS_BLACKFRAME | SS_REALSIZEIMAGE,4,0,255,104
CONTROL IDB_GREEN,IDC_GREEN,"Static",SS_BITMAP,192,52,6,6
CONTROL IDB_BITMAP1,IDC_YELLOW,"Static",SS_BITMAP,192,52,6,6
CONTROL IDB_RED,IDC_RED,"Static",SS_BITMAP,192,52,6,6
END

IDD_SERVINFO_DLG DIALOGEX 0, 0, 224, 170
Expand Down Expand Up @@ -618,34 +618,34 @@ IDD_DISPLAY DIALOGEX 0, 0, 240, 145
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 11, "MS Shell Dlg", 400, 0, 0x0
BEGIN
CONTROL "Change server resolution",IDC_CHANGESERVER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,1,100,10
LTEXT "Small",IDC_STATIC,19,12,19,8
CONTROL "",IDC_SLIDERRES,"msctls_trackbar32",TBS_AUTOTICKS | TBS_ENABLESELRANGE | WS_TABSTOP,43,12,133,11
CTEXT "",IDC_RES,181,12,47,8
CONTROL "Use all my monitors for the remote session",IDC_ALLMONS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,24,157,10
CONTROL "Fit to screen: no scrollbars",IDC_DIRECTX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,85,103,10
CONTROL "Auto scale by",IDC_SCALING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,107,64,10
COMBOBOX IDC_SCALE_CB,69,105,30,117,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_SERVER_SCALE,115,117,14,12,ES_AUTOHSCROLL
CONTROL "Start in full screen mode",IDC_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,96,90,10
CONTROL "Save size on exit",IDC_SAVESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,129,73,10
CONTROL "Show tool bar",IDC_SHOWTOOLBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,96,60,10
CONTROL "Save position on exit",IDC_SAVEPOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,129,97,10
LTEXT "Server Screen Scale by",IDC_STATIC,12,119,80,8
CONTROL "%",IDC_STATIC,"Static",SS_CENTER | WS_GROUP | 0x20,102,107,8,8
LTEXT "1 /",IDC_STATIC,99,119,12,8
CTEXT "",IDC_RES,181,12,47,8
CONTROL "Allow Full screen multi monitor spanning",IDC_ALLOWSPAN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,74,141,10
LTEXT "Small",IDC_STATIC,19,12,19,8
CONTROL "Change server resolution",IDC_CHANGESERVER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,1,100,10
CONTROL "Main screen resolution",IDC_RADIO_NOVIRT,"Button",BS_AUTORADIOBUTTON,22,35,90,10
CONTROL "Use only virtual displays (win 10 1903 >=)",IDC_RADIO_ONLY_VIRTUAL,
"Button",BS_AUTORADIOBUTTON,22,45,157,10
CONTROL "Extend main display (win 10 1903 >=)",IDC_RADIO_EXTEND,
"Button",BS_AUTORADIOBUTTON,22,55,143,10
CONTROL "Show only extend ( portable as extra display)",IDC_SHOW_EXTEND,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,33,65,164,10
CONTROL "Main screen resolution",IDC_RADIO_NOVIRT,"Button",BS_AUTORADIOBUTTON,22,35,90,10
CONTROL "Allow Full screen multi monitor spanning",IDC_ALLOWSPAN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,74,141,10
CONTROL "Fit to screen: no scrollbars",IDC_DIRECTX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,85,103,10
CONTROL "Show tool bar",IDC_SHOWTOOLBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,96,60,10
CONTROL "Auto scale by",IDC_SCALING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,107,64,10
COMBOBOX IDC_SCALE_CB,69,105,30,117,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
CONTROL "%",IDC_STATIC,"Static",SS_CENTER | WS_GROUP | 0x20,102,107,8,8
LTEXT "Server Screen Scale by",IDC_STATIC,12,119,80,8
LTEXT "1 /",IDC_STATIC,99,119,12,8
EDITTEXT IDC_SERVER_SCALE,115,117,14,12,ES_AUTOHSCROLL
CONTROL "Save position on exit",IDC_SAVEPOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,129,97,10
CONTROL "Start in full screen mode",IDC_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,96,90,10
CONTROL "Auto scale Even",IDC_SCALINGEVEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,107,65,10
CONTROL "GNOME R.D.",IDC_GNOME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,118,56,10
CONTROL "Save size on exit",IDC_SAVESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,139,129,73,10
END

IDD_MISC DIALOGEX 0, 0, 240, 145
Expand Down Expand Up @@ -770,6 +770,9 @@ BEGIN
RIGHTMARGIN, 259
VERTGUIDE, 4
VERTGUIDE, 11
VERTGUIDE, 46
VERTGUIDE, 130
VERTGUIDE, 202
VERTGUIDE, 213
VERTGUIDE, 247
VERTGUIDE, 248
Expand Down
10 changes: 1 addition & 9 deletions winvnc/winvnc/vncproperties.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,6 @@ vncProperties::DialogProc(HWND hwnd,
SetDlgItemText(hwnd, IDC_QUERYDISABLETIME, (const char*)disableTime);

_this->ExpandBox(hwnd, !_this->bExpanded);
SendMessage(GetDlgItem(hwnd, IDC_BUTTON_EXPAND), BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)_this->hBmpExpand);

SetForegroundWindow(hwnd);
return FALSE; // Because we've set the focus
Expand Down Expand Up @@ -1332,14 +1331,12 @@ void vncProperties::ExpandBox(HWND hDlg, BOOL fExpand)
HWND wndDefaultBox = NULL;

// get the window of the button
HWND pCtrl = GetDlgItem(hDlg, IDC_SHOWOPTIONS);
HWND pCtrl = GetDlgItem(hDlg, IDC_BUTTON_EXPAND);
if (pCtrl == NULL) return;

wndDefaultBox = GetDlgItem(hDlg, IDC_DEFAULTBOX);
if (wndDefaultBox == NULL) return;

if (!fExpand) SendMessage(GetDlgItem(hDlg, IDC_BUTTON_EXPAND), BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hBmpExpand);
else SendMessage(GetDlgItem(hDlg, IDC_BUTTON_EXPAND), BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hBmpCollaps);
// retrieve coordinates for the default child window
GetWindowRect(wndDefaultBox, &rcDefaultBox);

Expand Down Expand Up @@ -1385,10 +1382,6 @@ void vncProperties::ExpandBox(HWND hDlg, BOOL fExpand)
rcDefaultBox.bottom - rcWnd.top,
SWP_NOZORDER | SWP_NOMOVE);



SetWindowText(pCtrl, "Advanced options");

// record that the dialog is contracted.
bExpanded = FALSE;
}
Expand All @@ -1402,7 +1395,6 @@ void vncProperties::ExpandBox(HWND hDlg, BOOL fExpand)
// make sure that the entire dialog box is visible on the user's
// screen.
SendMessage(hDlg, DM_REPOSITION, 0, 0);
SetWindowText(pCtrl, "Hide");
bExpanded = TRUE;
}
SD_OnInitDialog(hDlg);
Expand Down
22 changes: 11 additions & 11 deletions winvnc/winvnc/winvnc.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,19 @@ BEGIN
LTEXT "",IDC_STATIC_SPLIT,5,127,298,8,SS_NOTIFY
END

IDD_LIST_DLG DIALOGEX 0, 0, 288, 123
IDD_LIST_DLG DIALOGEX 0, 0, 298, 123
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "UltraVNC Server - List of VNC Clients"
FONT 11, "MS Shell Dlg", 400, 0, 0x0
BEGIN
DEFPUSHBUTTON "Close",IDOK,118,94,50,14
PUSHBUTTON "Cancel",IDCANCEL,118,78,50,14,NOT WS_VISIBLE
DEFPUSHBUTTON "Close",IDOK,118,94,62,14
PUSHBUTTON "Cancel",IDCANCEL,118,78,62,14,NOT WS_VISIBLE
LTEXT "Currently Connected Clients",IDC_STATIC,5,4,105,8
LISTBOX IDC_VIEWERS_LISTBOX,7,16,103,93,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
PUSHBUTTON "Kill Client",IDC_KILL_B,118,17,50,14
PUSHBUTTON "Chat with Client",IDC_TEXTCHAT_B,118,35,50,22,BS_MULTILINE
LTEXT "Pending Clients",IDC_STATIC,173,4,105,8
LISTBOX IDC_PENDING_LISTBOX,175,16,103,93,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
PUSHBUTTON "Kill Client",IDC_KILL_B,118,17,62,14
PUSHBUTTON "Chat with Client",IDC_TEXTCHAT_B,118,35,62,14,BS_MULTILINE
LTEXT "Pending Clients",IDC_STATIC,185,4,105,8
LISTBOX IDC_PENDING_LISTBOX,187,16,103,93,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
END

IDD_ABOUT DIALOGEX 0, 0, 328, 139
Expand Down Expand Up @@ -228,7 +228,7 @@ BEGIN
CONTROL "none portable password",IDC_SAVEPASSWORDSECURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,47,100,10
CONTROL "International keys",IDC_UNICODE_INPUTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,113,295,74,10
CONTROL "Prevent screensaver",IDC_NOSCREENSAVER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,237,435,84,10
PUSHBUTTON "Show Options",IDC_BUTTON_EXPAND,6,218,73,10,BS_ICON
PUSHBUTTON "Options",IDC_BUTTON_EXPAND,6,218,36,10,BS_ICON
CONTROL "",IDC_DEFAULTBOX,"Static",SS_BLACKFRAME,-1,0,426,237
EDITTEXT IDC_SERVICE_COMMANDLINE,239,97,166,14,ES_AUTOHSCROLL
PUSHBUTTON "Start",IDC_STARTREP,345,71,29,12
Expand Down Expand Up @@ -257,8 +257,8 @@ BEGIN
CONTROL "Show notification as OSD",IDC_OSD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,427,120,10
GROUPBOX "File Transfer",IDC_STATIC,231,236,187,36
GROUPBOX "VNC authentication",IDC_STATIC,7,4,212,61
GROUPBOX "Network",IDC_STATIC,14,69,205,89
GROUPBOX "Encryption",IDC_STATIC,14,162,205,33
GROUPBOX "Network",IDC_STATIC,7,69,212,89
GROUPBOX "Encryption",IDC_STATIC,7,162,212,33
GROUPBOX "Windows authentication",IDC_STATIC,227,4,187,54
GROUPBOX "Logging",IDC_STATIC,227,152,187,54
END
Expand Down Expand Up @@ -350,7 +350,7 @@ BEGIN
IDD_LIST_DLG, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 281
RIGHTMARGIN, 291
TOPMARGIN, 7
BOTTOMMARGIN, 116
END
Expand Down

0 comments on commit 4925a22

Please sign in to comment.