From 3d8839702452c756f229544377efb346128752b6 Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Mon, 13 Nov 2017 12:59:34 -0800 Subject: [PATCH] Adjust width of extract dialog The last letter of "Auto-detect & convert files with text" was being cut off. --- app/CiderPress.rc | 53 +++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/app/CiderPress.rc b/app/CiderPress.rc index 8668553..ccf619f 100644 --- a/app/CiderPress.rc +++ b/app/CiderPress.rc @@ -470,47 +470,47 @@ BEGIN EDITTEXT IDC_PREF_EXTVIEWER_EXTS,7,68,197,14,ES_AUTOHSCROLL END -IDD_EXTRACT_FILES DIALOGEX 0, 0, 299, 242 +IDD_EXTRACT_FILES DIALOGEX 0, 0, 319, 242 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Extract Files" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - DEFPUSHBUTTON "Extract",IDOK,68,220,50,14 - PUSHBUTTON "Cancel",IDCANCEL,124,220,50,14 - PUSHBUTTON "Help",IDHELP,180,220,50,14 + DEFPUSHBUTTON "Extract",IDOK,78,220,50,14 + PUSHBUTTON "Cancel",IDCANCEL,134,220,50,14 + PUSHBUTTON "Help",IDHELP,190,220,50,14 LTEXT "Folder where files will be extracted:",IDC_STATIC,8,8,143,8 EDITTEXT IDC_EXT_PATH,8,18,263,14,ES_AUTOHSCROLL | WS_GROUP - PUSHBUTTON "",IDC_EXT_CHOOSE_FOLDER,276,18,16,14,BS_BITMAP | BS_CENTER | BS_VCENTER | WS_GROUP - GROUPBOX "Files to extract",IDC_STATIC,8,40,140,35 - CONTROL ">Extract 65536 selected files<",IDC_EXT_SELECTED,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,50,124,10 + PUSHBUTTON "",IDC_EXT_CHOOSE_FOLDER,296,18,16,14,BS_BITMAP | BS_CENTER | BS_VCENTER | WS_GROUP + GROUPBOX "Files to extract",IDC_STATIC,8,40,150,35 + CONTROL ">Extract 65536 selected files<",IDC_EXT_SELECTED,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,50,142,10 CONTROL "Extract &all files",IDC_EXT_ALL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,61,124,10 - GROUPBOX "Parts to extract",IDC_STATIC,152,40,140,47,WS_GROUP - CONTROL "&Data forks",IDC_EXT_DATAFORK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,160,50,128,10 - CONTROL "&Resource forks",IDC_EXT_RSRCFORK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,160,61,128,10 - CONTROL "Disk &images",IDC_EXT_DISKIMAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,72,128,10 - GROUPBOX "Format conversion",IDC_STATIC,8,77,140,37 + GROUPBOX "Parts to extract",IDC_STATIC,162,40,150,47,WS_GROUP + CONTROL "&Data forks",IDC_EXT_DATAFORK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,170,50,128,10 + CONTROL "&Resource forks",IDC_EXT_RSRCFORK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,170,61,128,10 + CONTROL "Disk &images",IDC_EXT_DISKIMAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,72,128,10 + GROUPBOX "Format conversion",IDC_STATIC,8,77,150,37 CONTROL "&Convert to non-Apple II formats",IDC_EXT_REFORMAT, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,16,88,124,10 CONTROL "Extract disks as .&2MG",IDC_EXT_DISK_2MG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,99,124,10 - GROUPBOX "Filenames",IDC_STATIC,152,98,140,40 + GROUPBOX "Filenames",IDC_STATIC,162,98,150,40 CONTROL "Add file attribute &preservation",IDC_EXT_ADD_PRESERVE, - "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,160,110,128,10 - CONTROL "Add type &extension",IDC_EXT_ADD_EXTEN,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,160,122,128,10 - GROUPBOX "Text conversion",IDC_STATIC,8,117,140,70,WS_GROUP + "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,170,110,128,10 + CONTROL "Add type &extension",IDC_EXT_ADD_EXTEN,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,170,122,128,10 + GROUPBOX "Text conversion",IDC_STATIC,8,117,150,70,WS_GROUP CONTROL "&Don't convert text files",IDC_EXT_CONVEOLNONE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,127,124,10 CONTROL "Convert text files by file type",IDC_EXT_CONVEOLTYPE, "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,138,126,10 CONTROL "Auto-detect && &convert files with text",IDC_EXT_CONVEOLTEXT, - "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,149,126,10 + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,149,135,10 CONTROL "Convert &ALL files",IDC_EXT_CONVEOLALL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,160,124,10 CONTROL "Strip ""&high ASCII"" files",IDC_EXT_CONVHIGHASCII, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,16,171,124,10 - GROUPBOX "Miscellaneous",IDC_STATIC,152,151,140,36,WS_GROUP - CONTROL "&Strip folder names",IDC_EXT_STRIP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,160,161,128,10 + GROUPBOX "Miscellaneous",IDC_STATIC,162,151,150,36,WS_GROUP + CONTROL "&Strip folder names",IDC_EXT_STRIP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,170,161,128,10 CONTROL "&Overwrite existing files",IDC_EXT_OVERWRITE_EXIST, - "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,160,172,128,10 - PUSHBUTTON "Configure to preserve Apple II formats",IDC_EXT_CONFIG_PRESERVE,8,196,140,16 - PUSHBUTTON "Configure for easy access in Windows",IDC_EXT_CONFIG_CONVERT,152,196,140,16 + "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,170,172,128,10 + PUSHBUTTON "Configure to preserve Apple II formats",IDC_EXT_CONFIG_PRESERVE,8,196,150,16 + PUSHBUTTON "Configure for easy access in Windows",IDC_EXT_CONFIG_CONVERT,162,196,150,16 END IDD_ACTION_PROGRESS DIALOGEX 0, 0, 276, 111 @@ -1416,8 +1416,10 @@ BEGIN IDD_EXTRACT_FILES, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 292 + RIGHTMARGIN, 312 VERTGUIDE, 16 + VERTGUIDE, 158 + VERTGUIDE, 170 TOPMARGIN, 7 BOTTOMMARGIN, 235 END @@ -1856,6 +1858,11 @@ BEGIN 0 END +IDD_EXTRACT_FILES AFX_DIALOG_LAYOUT +BEGIN + 0 +END + ///////////////////////////////////////////////////////////////////////////// //