[PATCH 2/3] wineconsole: Re-organize the Options dialog to make room for InsertMode checkbox

Hugh McMaster hugh.mcmaster at outlook.com
Mon May 11 04:01:28 CDT 2015


This patch re-organizes the user backend dialog (specifically, the Options dialog).
There is currently no easy way to add the Insert Mode checkbox, so I had
to make room for it with this patch.

I have also improved the grammar and semantics of some of the dialog strings.

Note that the Insert Mode string is added in the next patch, so hold off
on regenerating the po files until that patch is committed.
---
 programs/wineconsole/wineconsole.rc | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/programs/wineconsole/wineconsole.rc b/programs/wineconsole/wineconsole.rc
index e4e0624..e0f5983 100644
--- a/programs/wineconsole/wineconsole.rc
+++ b/programs/wineconsole/wineconsole.rc
@@ -54,31 +54,31 @@ IDS_USAGE_FOOTER           "\nExample:\n  wineconsole cmd\nStarts the Wine comma
 
 END
 
-IDD_OPTION DIALOG 36, 24, 140, 105
+IDD_OPTION DIALOG 36, 24, 210, 105
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
 {
-	GROUPBOX "Cursor size", -1, 5, 5, 65, 56, BS_GROUPBOX
+	GROUPBOX "Cursor Size", -1, 5, 5, 60, 52, BS_GROUPBOX
 	AUTORADIOBUTTON "&Small", IDC_OPT_CURSOR_SMALL, 9, 18, 50, 10, WS_TABSTOP
 	AUTORADIOBUTTON "&Medium", IDC_OPT_CURSOR_MEDIUM, 9, 30, 50, 10, WS_TABSTOP
 	AUTORADIOBUTTON "&Large", IDC_OPT_CURSOR_LARGE, 9, 42, 50, 10, WS_TABSTOP
 
-	GROUPBOX "Control", -1, 75, 5, 125, 56, BS_GROUPBOX
-	LTEXT "Popup menu", -1, 79, 18, 50, 18
-	AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 138, 18, 60, 10, WS_TABSTOP
-	AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 138, 30, 60, 10, WS_TABSTOP
-	LTEXT "Quick edit", -1, 79, 42, 50, 18
-	AUTOCHECKBOX "&enable", IDC_OPT_QUICK_EDIT, 138, 42, 60, 10, WS_TABSTOP
+	GROUPBOX "Console", -1, 70, 5, 70, 52, BS_GROUPBOX
+	AUTOCHECKBOX "&Quick Edit", IDC_OPT_QUICK_EDIT, 74, 18, 60, 10, WS_TABSTOP
 
-	GROUPBOX "Command history", -1, 5, 63, 195, 40, BS_GROUPBOX
-	LTEXT "&Number of recalled commands:", -1, 9, 75, 78, 18
-	EDITTEXT IDC_OPT_HIST_SIZE, 87, 77, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER
+	GROUPBOX "Popup Menu", -1, 145, 5, 60, 52, BS_GROUPBOX
+	AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 149, 18, 50, 10, WS_TABSTOP
+	AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 149, 30, 50, 10, WS_TABSTOP
+
+	GROUPBOX "Command History", -1, 5, 60, 200, 40, BS_GROUPBOX
+	LTEXT "&Number of commands to store in memory:", -1, 9, 73, 80, 18
+	EDITTEXT IDC_OPT_HIST_SIZE, 95, 75, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER
 	CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0
-	AUTOCHECKBOX "&Remove doubles", IDC_OPT_HIST_NODOUBLE, 125, 75, 60, 18, WS_TABSTOP|BS_MULTILINE
+	AUTOCHECKBOX "&Remove duplicates", IDC_OPT_HIST_NODOUBLE, 135, 73, 60, 18, WS_TABSTOP|BS_MULTILINE
 }
 
-IDD_FONT DIALOG 36, 24, 140, 105
+IDD_FONT DIALOG 36, 24, 210, 105
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Font"
 FONT 8, "MS Shell Dlg"
@@ -94,7 +94,7 @@ FONT 8, "MS Shell Dlg"
 	LTEXT "", IDC_FNT_FONT_INFO, 128, 73, 80, 27
 }
 
-IDD_CONFIG DIALOG 36, 24, 140, 105
+IDD_CONFIG DIALOG 36, 24, 210, 105
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Configuration"
 FONT 8, "MS Shell Dlg"
-- 
1.9.1




More information about the wine-patches mailing list