Skip to content

Commit 3806ff9

Browse files
CFrankCFrank
authored andcommitted
gui changes as discussed in bruderstein#84
1 parent b227cba commit 3806ff9

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

PythonScript/res/PythonScript.rc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
5757
BEGIN
5858
DEFPUSHBUTTON "OK",IDOK,143,168,50,14
5959
LTEXT "Python Script",IDC_STATIC,146,7,49,8
60-
LTEXT "(C) 2010, 2011, 2014 Dave Brotherstone",IDC_STATIC,105,30,133,8
60+
LTEXT "(C) 2010, 2011, 2014, 2018 Dave Brotherstone",IDC_STATIC,105,30,133,8
6161
CONTROL IDB_PYTHONPOWERED,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,118,42,93,34
6262
EDITTEXT IDC_COPYRIGHT,7,84,324,74,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
6363
CTEXT "1.0",IDC_VERSION,156,19,26,8
@@ -73,13 +73,13 @@ BEGIN
7373
LTEXT ">>>",IDC_PROMPT,7,161,17,8
7474
END
7575

76-
IDD_SCRIPTCONFIG DIALOGEX 0, 0, 377, 406
76+
IDD_SCRIPTCONFIG DIALOGEX 0, 0, 377, 404
7777
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
78-
CAPTION "Python Script Shortcut Configuration"
78+
CAPTION "Python Script Configuration"
7979
FONT 8, "MS Shell Dlg", 400, 0, 0x1
8080
BEGIN
8181
DEFPUSHBUTTON "OK",IDOK,265,383,50,14
82-
PUSHBUTTON "Cancel",IDCANCEL,320,383,50,14
82+
PUSHBUTTON "Cancel",IDCANCEL,320,382,50,14
8383
CONTROL "",IDC_FILETREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,14,31,343,105
8484
GROUPBOX "Scripts",IDC_STATIC,7,7,363,136
8585
CONTROL "Machine Scripts",IDC_RADMACHINE,"Button",BS_AUTORADIOBUTTON,19,18,65,10
@@ -91,7 +91,7 @@ BEGIN
9191
LTEXT "Menu items",IDC_STATIC,10,162,37,8
9292
LTEXT "Toolbar icons",IDC_STATIC,186,161,43,8
9393
CONTROL "",IDC_TOOLBARITEMLIST2,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,186,172,184,104
94-
PUSHBUTTON "Set Icon",IDC_TOOLBARSETICON,304,146,50,14
94+
PUSHBUTTON "Set Icon...",IDC_TOOLBARSETICON,304,146,50,14
9595
CONTROL "",IDC_MENUITEMLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,171,173,106
9696
COMBOBOX IDC_COMBOINITIALISATION,55,285,69,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
9797
LTEXT "Initialisation:",IDC_STATIC,9,287,44,12
@@ -100,12 +100,12 @@ BEGIN
100100
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,11,303,352,19
101101
LTEXT "This has the effect that the directories under Notepad++ that contain Python libraries are searched AFTER the standard Python directories. If in doubt, leave unchecked.",IDC_STATIC,22,321,348,19
102102
CONTROL "Add an additional end of line character for run statements and error messages to the console",IDC_CHECKADDEXTRALINETOOUTPUT,
103-
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,11,342,312,10
104-
CONTROL "Automatically open console on error",IDC_CHECKOPENCONSOLEONERROR,
105-
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,11,355,131,9
103+
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,11,356,310,10
104+
CONTROL "Automatically open console on error (no restart required)",IDC_CHECKOPENCONSOLEONERROR,
105+
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,11,342,197,10
106106
CONTROL "Color output from run statements differently",IDC_CHECKCOLORIZEOUTPUT,
107-
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | BS_NOTIFY | WS_TABSTOP,11,368,157,11
108-
PUSHBUTTON "Chose a color...",IDC_COLORCHOOSER,169,365,62,14
107+
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | BS_NOTIFY | WS_TABSTOP,11,370,157,10
108+
PUSHBUTTON "Chose a color...",IDC_COLORCHOOSER,169,367,62,14
109109
END
110110

111111
IDD_PROMPTDIALOG DIALOGEX 0, 0, 313, 105
@@ -149,7 +149,7 @@ BEGIN
149149
LEFTMARGIN, 7
150150
RIGHTMARGIN, 370
151151
TOPMARGIN, 7
152-
BOTTOMMARGIN, 399
152+
BOTTOMMARGIN, 397
153153
END
154154

155155
IDD_PROMPTDIALOG, DIALOG

PythonScript/res/resource.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,14 @@
4242
#define IDC_CHECKOPENCONSOLEONERROR 1022
4343
#define IDC_CHECKCOLORIZEOUTPUT 1023
4444
#define IDC_COLORCHOOSER 1024
45-
#define IDC_PICTUREBOX 1028
4645

4746
// Next default values for new objects
4847
//
4948
#ifdef APSTUDIO_INVOKED
5049
#ifndef APSTUDIO_READONLY_SYMBOLS
51-
#define _APS_NEXT_RESOURCE_VALUE 120
50+
#define _APS_NEXT_RESOURCE_VALUE 121
5251
#define _APS_NEXT_COMMAND_VALUE 40001
53-
#define _APS_NEXT_CONTROL_VALUE 1029
52+
#define _APS_NEXT_CONTROL_VALUE 1025
5453
#define _APS_NEXT_SYMED_VALUE 101
5554
#endif
5655
#endif

0 commit comments

Comments
 (0)