Alexander Nicolaysen Sørnes : regedit: Improve dialog layout.
Alexandre Julliard
julliard at winehq.org
Mon May 19 09:39:52 CDT 2008
Module: wine
Branch: master
Commit: 66b3d415c3e619bee182285baf3062079ab761e8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b3d415c3e619bee182285baf3062079ab761e8
Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date: Sun May 18 23:45:59 2008 +0200
regedit: Improve dialog layout.
---
programs/regedit/En.rc | 36 ++++++++++++++++++------------------
programs/regedit/No.rc | 36 ++++++++++++++++++------------------
2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc
index c11345b..4dc0ca4 100644
--- a/programs/regedit/En.rc
+++ b/programs/regedit/En.rc
@@ -198,7 +198,7 @@ BEGIN
EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12
END
-IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85
+IDD_FIND DIALOG DISCARDABLE 22, 17, 220, 85
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Find"
FONT 8, "MS Shell Dlg"
@@ -210,8 +210,8 @@ BEGIN
CHECKBOX "Value names", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX
CHECKBOX "Value content", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX
CHECKBOX "Whole string only", IDC_FIND_WHOLE, 5, 70, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX
- DEFPUSHBUTTON "Find",IDOK,175,5,30,11,WS_GROUP
- PUSHBUTTON "Close",IDCANCEL,175,22,30,11, WS_GROUP
+ DEFPUSHBUTTON "Find",IDOK,175,5,40,15,WS_GROUP
+ PUSHBUTTON "Close",IDCANCEL,175,24,40,15, WS_GROUP
END
IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55
@@ -221,8 +221,8 @@ FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Name:",IDC_STATIC,5,5,119,8
EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
- DEFPUSHBUTTON "OK",IDOK,140,40,30,11,WS_GROUP
- PUSHBUTTON "Cancel",IDCANCEL,175,40,30,11, WS_GROUP
+ DEFPUSHBUTTON "OK",IDOK,120,36,40,15,WS_GROUP
+ PUSHBUTTON "Cancel",IDCANCEL,165,36,40,15,WS_GROUP
END
IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90
@@ -232,8 +232,8 @@ FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Name:",IDC_STATIC,5,5,119,8
LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL
- DEFPUSHBUTTON "OK",IDOK,140,73,30,11,WS_GROUP
- PUSHBUTTON "Cancel",IDCANCEL,175,73,30,11, WS_GROUP
+ DEFPUSHBUTTON "OK",IDOK,120,72,40,15,WS_GROUP
+ PUSHBUTTON "Cancel",IDCANCEL,165,72,40,15,WS_GROUP
END
IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75
@@ -245,8 +245,8 @@ BEGIN
EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED
LTEXT "Value data:",IDC_STATIC,5,30,119,8
EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
- DEFPUSHBUTTON "OK",IDOK,140,60,30,11,WS_GROUP
- PUSHBUTTON "Cancel",IDCANCEL,175,60,30,11,WS_GROUP
+ DEFPUSHBUTTON "OK",IDOK,120,56,40,15,WS_GROUP
+ PUSHBUTTON "Cancel",IDCANCEL,165,56,40,15,WS_GROUP
END
IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100
@@ -261,21 +261,21 @@ BEGIN
GROUPBOX "Base", IDC_DWORD_BASE, 120, 30, 85, 37, BS_GROUPBOX
AUTORADIOBUTTON "Hexadecimal", IDC_DWORD_HEX, 130, 40, 60, 10, WS_TABSTOP
AUTORADIOBUTTON "Decimal", IDC_DWORD_DEC, 130, 52, 60, 10, WS_TABSTOP
- DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP
- PUSHBUTTON "Cancel",IDCANCEL,175,80,30,11,WS_GROUP
+ DEFPUSHBUTTON "OK",IDOK,120,78,40,15,WS_GROUP
+ PUSHBUTTON "Cancel",IDCANCEL,165,78,40,15,WS_GROUP
END
-IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 210, 100
+IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 170, 100
STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU
CAPTION "Edit Binary"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Value name:",IDC_STATIC,5,5,119,8
- EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED
+ EDITTEXT IDC_VALUE_NAME,5,15,160,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED
LTEXT "Value data:",IDC_STATIC,5,30,90,8
- CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,4,40,160,40
- DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP
- PUSHBUTTON "Cancel",IDCANCEL,175,80,30,11,WS_GROUP
+ CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,5,40,160,40
+ DEFPUSHBUTTON "OK",IDOK,80,83,40,15,WS_GROUP
+ PUSHBUTTON "Cancel",IDCANCEL,125,83,40,15,WS_GROUP
END
IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175
@@ -287,8 +287,8 @@ BEGIN
EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED
LTEXT "Value data:",IDC_STATIC,5,30,119,8
EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN
- DEFPUSHBUTTON "OK",IDOK,140,160,30,11,WS_GROUP
- PUSHBUTTON "Cancel",IDCANCEL,175,160,30,11,WS_GROUP
+ DEFPUSHBUTTON "OK",IDOK,120,156,40,15,WS_GROUP
+ PUSHBUTTON "Cancel",IDCANCEL,165,156,40,15,WS_GROUP
END
/*
diff --git a/programs/regedit/No.rc b/programs/regedit/No.rc
index e487ab4..c6bbc23 100644
--- a/programs/regedit/No.rc
+++ b/programs/regedit/No.rc
@@ -129,7 +129,7 @@ BEGIN
EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12
END
-IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85
+IDD_FIND DIALOG DISCARDABLE 22, 17, 220, 85
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Finn"
FONT 8, "MS Shell Dlg"
@@ -141,8 +141,8 @@ CHECKBOX "N
CHECKBOX "Verdinavn", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX
CHECKBOX "Verdiinnhold", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX
CHECKBOX "Kun hele strenger", IDC_FIND_WHOLE, 5, 70, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX
-DEFPUSHBUTTON "Finn",IDOK,175,5,30,11,WS_GROUP
-PUSHBUTTON "Lukk",IDCANCEL,175,22,30,11, WS_GROUP
+DEFPUSHBUTTON "Finn",IDOK,175,5,40,15,WS_GROUP
+PUSHBUTTON "Lukk",IDCANCEL,175,24,40,15, WS_GROUP
END
IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55
@@ -152,8 +152,8 @@ FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Navn:",IDC_STATIC,5,5,119,8
EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
-DEFPUSHBUTTON "OK",IDOK,140,40,30,11,WS_GROUP
-PUSHBUTTON "Avbryt",IDCANCEL,175,40,30,11, WS_GROUP
+DEFPUSHBUTTON "OK",IDOK,120,36,40,15,WS_GROUP
+PUSHBUTTON "Avbryt",IDCANCEL,165,36,40,15,WS_GROUP
END
IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90
@@ -163,8 +163,8 @@ FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Navn:",IDC_STATIC,5,5,119,8
LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL
-DEFPUSHBUTTON "OK",IDOK,140,73,30,11,WS_GROUP
-PUSHBUTTON "Avbryt",IDCANCEL,175,73,30,11, WS_GROUP
+DEFPUSHBUTTON "OK",IDOK,120,72,40,15,WS_GROUP
+PUSHBUTTON "Avbryt",IDCANCEL,165,72,40,15,WS_GROUP
END
IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75
@@ -176,8 +176,8 @@ BEGIN
EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED
LTEXT "Verdidata:",IDC_STATIC,5,30,119,8
EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL
- DEFPUSHBUTTON "OK",IDOK,140,60,30,11,WS_GROUP
- PUSHBUTTON "Avbryt",IDCANCEL,175,60,30,11,WS_GROUP
+ DEFPUSHBUTTON "OK",IDOK,120,56,40,15,WS_GROUP
+ PUSHBUTTON "Avbryt",IDCANCEL,165,56,40,15,WS_GROUP
END
IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100
@@ -192,21 +192,21 @@ BEGIN
GROUPBOX "Base", IDC_DWORD_BASE, 120, 30, 85, 37, BS_GROUPBOX
AUTORADIOBUTTON "Heksadesimal", IDC_DWORD_HEX, 130, 40, 60, 10, WS_TABSTOP
AUTORADIOBUTTON "Desimal", IDC_DWORD_DEC, 130, 52, 60, 10, WS_TABSTOP
- DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP
- PUSHBUTTON "Avbryt",IDCANCEL,175,80,30,11,WS_GROUP
+ DEFPUSHBUTTON "OK",IDOK,120,78,40,15,WS_GROUP
+ PUSHBUTTON "Avbryt",IDCANCEL,165,78,40,15,WS_GROUP
END
-IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 210, 100
+IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 170, 100
STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU
CAPTION "Rediger binær"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Verdinavn:",IDC_STATIC,5,5,119,8
- EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED
+ EDITTEXT IDC_VALUE_NAME,5,15,160,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED
LTEXT "Verdidata:",IDC_STATIC,5,30,90,8
- CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,4,40,160,40
- DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP
- PUSHBUTTON "Avbryt",IDCANCEL,175,80,30,11,WS_GROUP
+ CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,5,40,160,40
+ DEFPUSHBUTTON "OK",IDOK,80,83,40,15,WS_GROUP
+ PUSHBUTTON "Avbryt",IDCANCEL,125,83,40,15,WS_GROUP
END
IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175
@@ -218,8 +218,8 @@ BEGIN
EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED
LTEXT "Verdidata:",IDC_STATIC,5,30,119,8
EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN
- DEFPUSHBUTTON "OK",IDOK,140,160,30,11,WS_GROUP
- PUSHBUTTON "Avbryt",IDCANCEL,175,160,30,11,WS_GROUP
+ DEFPUSHBUTTON "OK",IDOK,120,156,40,15,WS_GROUP
+ PUSHBUTTON "Avbryt",IDCANCEL,165,156,40,15,WS_GROUP
END
/*
More information about the wine-cvs
mailing list