[PATCH] comdlg32: update the print dialog resources

[Vijay Kiran Kamuju]

This is based on prnsetup.dlg from psdk.
Further changes will be done for all the common dialogs,
 based on the dlg files in the psdk.

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
---
 dlls/comdlg32/comdlg32.rc | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc
index a1689f4abea8..b0f651ffaab0 100644
--- a/dlls/comdlg32/comdlg32.rc
+++ b/dlls/comdlg32/comdlg32.rc
@@ -351,7 +351,7 @@ FONT 8, "MS Shell Dlg"
 }
 
 
-PRINT32 DIALOG  32, 32, 288, 186
+PRINTDLGORD DIALOG  32, 32, 288, 186
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
       DS_CONTEXTHELP | DS_3DLOOK
 CAPTION "Print"
@@ -359,7 +359,7 @@ FONT 8, "MS Shell Dlg"
 {
     GROUPBOX        "Printer",        grp4,   8,  4, 272,84, WS_GROUP
     COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Properties",    psh2, 212, 17,  60,14, WS_GROUP
+    PUSHBUTTON      "&Properties...", psh2, 212, 17,  60,14, WS_GROUP
     CONTROL         "Print to fi&le", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16
     LTEXT           "&Name:",         stc6,  16, 20,  36,8
     LTEXT           "Status:",        stc8,  16, 36,  47,10, SS_NOPREFIX
@@ -372,7 +372,7 @@ FONT 8, "MS Shell Dlg"
     LTEXT           "",               stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
 
     GROUPBOX        "Print range",    grp1,   8,92,  144,64, WS_GROUP
-    CONTROL         "&All",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+    CONTROL         "&All",           rad1,"Button",BS_AUTORADIOBUTTON,16,106,64,12
     CONTROL         "Pa&ges",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
     CONTROL         "&Selection",     rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
     EDITTEXT                          edt1,  73,122,  26,12, WS_GROUP | ES_NUMBER
@@ -391,7 +391,7 @@ FONT 8, "MS Shell Dlg"
     PUSHBUTTON      "&Help",  pshHelp,  50, 164, 50,14, WS_GROUP
 }
 
-PRINT32_SETUP DIALOG  32, 32, 288, 178
+PRNSETUPDLGORD DIALOG  32, 32, 288, 178
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK
 CAPTION "Print Setup"
 FONT 8, "MS Shell Dlg"
@@ -399,7 +399,7 @@ BEGIN
     GROUPBOX        "Printer",        grp4,   8,  4, 272,84, WS_GROUP
     LTEXT           "&Name:",         stc6,  16, 20,  36,8
     COMBOBOX                          cmb1,  60, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Properties",    psh2, 212, 17,  60,14, WS_GROUP
+    PUSHBUTTON      "&Properties...", psh2, 212, 17,  60,14, WS_GROUP
     LTEXT           "Status:",        stc8,  16, 36,  47,10, SS_NOPREFIX
     LTEXT           "",               stc12, 60, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
     LTEXT           "Type:",          stc7,  16, 48,  47,10, SS_NOPREFIX
@@ -428,32 +428,33 @@ END
 
 PAGESETUPDLGORD DIALOG 32, 32, 240, 240
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Setup Page"
+CAPTION "Page Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
-  CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
-  CONTROL "", rct3, "Static", SS_GRAYRECT,  84, 88, 80, 4
-  GROUPBOX "Paper", grp2, 8, 96, 224, 56, BS_GROUPBOX
-  LTEXT "&Size:", stc2, 16, 112, 36, 8
+  CONTROL "", rct1, "Static", SS_WHITERECT | WS_GROUP, 80, 8, 80, 80
+  CONTROL "", rct2, "Static", SS_GRAYRECT | WS_GROUP, 160, 12, 4, 80
+  CONTROL "", rct3, "Static", SS_GRAYRECT | WS_GROUP,  84, 88, 80, 4
+  GROUPBOX "Paper", grp2, 8, 96, 224, 56, BS_GROUPBOX | WS_GROUP
+  LTEXT "Si&ze:", stc2, 16, 112, 36, 8
   COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
-  LTEXT "&Tray:", stc3, 16, 132, 36, 8
+  LTEXT "&Source:", stc3, 16, 132, 36, 8
   COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX
-  AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
-  AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
-  GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX
-  LTEXT "L&eft:", stc15, 88, 172, 30, 8
+  GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX | WS_GROUP
+  AUTORADIOBUTTON "P&ortrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP
+  AUTORADIOBUTTON "L&andscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
+  GROUPBOX "Margins", grp4, 80, 156, 152, 56, BS_GROUPBOX | WS_GROUP
+  LTEXT "&Left:", stc15, 88, 172, 30, 8
   EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
   LTEXT "&Right:", stc16, 159, 172, 30, 8
   EDITTEXT edt6, 190, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
-  LTEXT "T&op:", stc17, 88, 192, 30, 8
+  LTEXT "&Top:", stc17, 88, 192, 30, 8
   EDITTEXT edt5, 119, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
   LTEXT "&Bottom:", stc18, 159, 192, 30, 8
   EDITTEXT edt7, 190, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
   DEFPUSHBUTTON "OK", IDOK, 70, 220, 50, 14, BS_PUSHBUTTON
   PUSHBUTTON "Cancel", IDCANCEL, 126, 220, 50, 14
-  PUSHBUTTON "P&rinter...", psh3, 182, 220, 50, 14
+  PUSHBUTTON "&Help",pshHelp, 8, 220, 50, 14
+  /* PUSHBUTTON "P&rinter...", psh3, 182, 220, 50, 14 */
 END
 
 NEWFILEOPENORD DIALOG 0, 0, 280, 164
-- 
2.21.0

[Alistair Leslie-Hughes]

Hi Vijay,

On 21/11/19 9:26 am, Vijay Kiran Kamuju wrote:
> This is based on prnsetup.dlg from psdk.
> -PRINT32 DIALOG  32, 32, 288, 186
> +PRINTDLGORD DIALOG  32, 32, 288, 186
> ...
> -PRINT32_SETUP DIALOG  32, 32, 288, 178
> +PRNSETUPDLGORD DIALOG  32, 32, 288, 178

Without changing printdlg.c as well, the dialog's would never appear.

Best Regards
Alistair.