Skip to content

Commit

Permalink
Merge pull request #697 from reupen/dark-mode-dialogs-tidy
Browse files Browse the repository at this point in the history 
Tweak layout of various dialogues
  • Loading branch information
@reupen
reupen authored Apr 17, 2023
2 parents cb2321d + b6b8c20 commit c611ac6
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 41 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Change log

## Development version
## 2.0.0-rc.1

### Features

Expand All @@ -16,7 +16,8 @@
[@marc2k3](https://github.com/marc2k3)),
[#689](https://github.com/reupen/columns_ui/pull/689),
[#692](https://github.com/reupen/columns_ui/pull/692),
[#695](https://github.com/reupen/columns_ui/pull/695)]
[#695](https://github.com/reupen/columns_ui/pull/695),
[#697](https://github.com/reupen/columns_ui/pull/697)]

- Dark menus were enabled on Windows 11 build 22624.
[[#680](https://github.com/reupen/columns_ui/pull/680), contributed by
Expand Down
78 changes: 39 additions & 39 deletions foo_ui_columns/foo_ui_columns.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,11 @@ BEGIN
LTEXT "Spectrum analyser colours are now configured from the Colours and fonts page in preferences.",IDC_STATIC,14,89,174,20
CONTROL "Bars mode",IDC_BARS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,7,49,10
COMBOBOX IDC_FRAME_COMBO,14,66,174,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Window frame style:",IDC_STATIC,14,56,97,8
LTEXT "Window frame style",IDC_STATIC,14,56,97,8
COMBOBOX IDC_SCALE,14,35,79,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Horizontal scale:",IDC_STATIC,14,25,54,8
LTEXT "Horizontal scale",IDC_STATIC,14,25,65,8
COMBOBOX IDC_VERTICAL_SCALE,109,35,79,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Vertical scale:",IDC_STATIC,109,25,66,8
LTEXT "Vertical scale",IDC_STATIC,109,25,66,8
END

IDD_BUTTON_COMMAND_PICKER DIALOGEX 0, 0, 326, 364
Expand Down Expand Up @@ -303,29 +303,29 @@ BEGIN
LTEXT "",IDC_MENU_DESC,7,254,313,10
END

IDD_QUICK_SETUP DIALOGEX 0, 0, 268, 228
IDD_QUICK_SETUP DIALOGEX 0, 0, 268, 234
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Quick Setup - Columns UI"
FONT 8, "Segoe UI", 400, 0, 0x0
BEGIN
LTEXT "Layout",IDC_STATIC,14,7,60,8
LTEXT "Light or dark mode",IDC_STATIC,14,96,59,8
LTEXT "Light or dark mode",IDC_STATIC,14,96,75,8
COMBOBOX IDC_DARK_MODE,14,106,240,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Theming",IDC_STATIC,14,126,30,8
COMBOBOX IDC_THEMING,14,136,240,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Playlist grouping and artwork",IDC_STATIC,14,156,152,8
COMBOBOX IDC_GROUPING,14,166,240,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "You can later re-run this setup from preferences.",IDC_STATIC,14,186,240,10
DEFPUSHBUTTON "OK",IDOK,149,207,50,14,WS_GROUP
PUSHBUTTON "Cancel",IDCANCEL,204,207,50,14
LTEXT "You can later re-run this setup from preferences.",IDC_STATIC,14,189,240,10
DEFPUSHBUTTON "OK",IDOK,149,213,50,14,WS_GROUP
PUSHBUTTON "Cancel",IDCANCEL,204,213,50,14
END

IDD_FCL_IMPORT DIALOGEX 0, 0, 242, 172
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Import settings"
FONT 8, "Segoe UI", 400, 0, 0x0
BEGIN
LTEXT "Which settings should be imported?",IDC_STATIC,7,7,115,8
LTEXT "Which settings should be imported?",IDC_STATIC,7,7,134,8
CONTROL "",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_FULLROWSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,19,228,116
PUSHBUTTON "OK",IDOK,131,151,50,14
PUSHBUTTON "Cancel",IDCANCEL,185,151,50,14
Expand All @@ -340,31 +340,31 @@ BEGIN
LTEXT "Static",IDC_CAPTION,7,7,443,10
END

IDD_FCL_EXPORT DIALOGEX 0, 0, 242, 200
IDD_FCL_EXPORT DIALOGEX 0, 0, 242, 206
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Export settings"
FONT 8, "Segoe UI", 400, 0, 0x0
BEGIN
LTEXT "Which settings should be exported?",IDC_STATIC,7,7,115,8
LTEXT "Which settings should be exported?",IDC_STATIC,7,7,134,8
CONTROL "",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_FULLROWSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,19,228,116
LTEXT "Target",IDC_STATIC,7,142,25,8
COMBOBOX IDC_DEST,7,153,228,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "OK",IDOK,131,179,50,14
PUSHBUTTON "Cancel",IDCANCEL,185,179,50,14
PUSHBUTTON "OK",IDOK,131,185,50,14
PUSHBUTTON "Cancel",IDCANCEL,185,185,50,14
END

IDD_EDIT_GROUP DIALOGEX 0, 0, 320, 154
IDD_EDIT_GROUP DIALOGEX 0, 0, 320, 157
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Add New Group"
FONT 8, "Segoe UI", 400, 0, 0x0
BEGIN
EDITTEXT IDC_VALUE,7,18,306,68,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
DEFPUSHBUTTON "OK",IDOK,209,133,50,14
PUSHBUTTON "Cancel",IDCANCEL,263,133,50,14
LTEXT "Title formatting script",IDC_STATIC,7,7,71,8
DEFPUSHBUTTON "OK",IDOK,209,136,50,14
PUSHBUTTON "Cancel",IDCANCEL,263,136,50,14
LTEXT "Title formatting script",IDC_STATIC,7,7,75,8
COMBOBOX IDC_PLAYLIST_FILTER_TYPE,7,106,113,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_PLAYLIST_FILTER_STRING,123,106,190,12,ES_AUTOHSCROLL
LTEXT "Playlist filters",IDC_STATIC,7,96,44,8
LTEXT "Playlist filters",IDC_STATIC,7,96,46,8
END

IDD_PREFS_PVIEW_GROUPS DIALOGEX 0, 0, 327, 272
Expand Down Expand Up @@ -503,7 +503,7 @@ BEGIN
PUSHBUTTON "Go to Display preferences",IDC_PREVIOUS_OPEN_DISPLAY_PREFERENCES,7,181,179,14
END

IDD_ITEM_PROPS_OPTIONS DIALOGEX 0, 0, 268, 378
IDD_ITEM_PROPS_OPTIONS DIALOGEX 0, 0, 268, 385
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Options - Item Properties"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
Expand All @@ -519,29 +519,29 @@ BEGIN
CONTROL "Show group titles",IDC_SHOWGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,300,71,10
LTEXT "Panel edge style",IDC_STATIC,14,318,55,8
COMBOBOX IDC_EDGESTYLE,14,329,71,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,150,357,50,14
PUSHBUTTON "Cancel",IDCANCEL,204,357,50,14
DEFPUSHBUTTON "OK",IDOK,150,364,50,14
PUSHBUTTON "Cancel",IDCANCEL,204,364,50,14
END

IDD_ITEM_DETAILS_OPTIONS DIALOGEX 0, 0, 284, 342
IDD_ITEM_DETAILS_OPTIONS DIALOGEX 0, 0, 284, 347
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Options - Item Details"
FONT 8, "Segoe UI", 400, 0, 0x0
BEGIN
LTEXT "Title format",IDC_STATIC,14,7,40,8
EDITTEXT IDC_SCRIPT,14,17,256,172,ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL
PUSHBUTTON "Generate colour code...",IDC_GEN_COLOUR,14,197,88,13
EDITTEXT IDC_COLOUR_CODE,108,197,162,13,ES_AUTOHSCROLL | ES_READONLY
PUSHBUTTON "Generate font code...",IDC_GEN_FONT,14,218,88,13
EDITTEXT IDC_FONT_CODE,108,218,162,13,ES_AUTOHSCROLL | ES_READONLY
LTEXT "Horizontal alignment",IDC_STATIC,14,245,75,8
COMBOBOX IDC_HALIGN,14,255,82,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Vertical alignment",IDC_STATIC,108,245,67,8
COMBOBOX IDC_VALIGN,108,255,82,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Panel edge style",IDC_STATIC,14,279,56,8
COMBOBOX IDC_EDGESTYLE,14,289,82,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,167,321,50,14
PUSHBUTTON "Cancel",IDCANCEL,220,321,50,14
PUSHBUTTON "Generate colour code...",IDC_GEN_COLOUR,14,198,88,13
EDITTEXT IDC_COLOUR_CODE,108,198,162,13,ES_AUTOHSCROLL | ES_READONLY
PUSHBUTTON "Generate font code...",IDC_GEN_FONT,14,220,88,13
EDITTEXT IDC_FONT_CODE,108,220,162,13,ES_AUTOHSCROLL | ES_READONLY
LTEXT "Horizontal alignment",IDC_STATIC,14,246,75,8
COMBOBOX IDC_HALIGN,14,257,82,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Vertical alignment",IDC_STATIC,108,246,67,8
COMBOBOX IDC_VALIGN,108,257,82,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Panel edge style",IDC_STATIC,14,281,56,8
COMBOBOX IDC_EDGESTYLE,14,292,82,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,167,326,50,14
PUSHBUTTON "Cancel",IDCANCEL,220,326,50,14
END

IDD_PREFS_FILTER_APPEARANCE DIALOGEX 0, 0, 327, 268
Expand Down Expand Up @@ -809,7 +809,7 @@ BEGIN
LEFTMARGIN, 14
RIGHTMARGIN, 254
TOPMARGIN, 7
BOTTOMMARGIN, 221
BOTTOMMARGIN, 227
END

IDD_FCL_IMPORT, DIALOG
Expand All @@ -833,15 +833,15 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 235
TOPMARGIN, 7
BOTTOMMARGIN, 193
BOTTOMMARGIN, 199
END

IDD_EDIT_GROUP, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 313
TOPMARGIN, 7
BOTTOMMARGIN, 147
BOTTOMMARGIN, 150
END

IDD_PREFS_PVIEW_GROUPS, DIALOG
Expand Down Expand Up @@ -913,15 +913,15 @@ BEGIN
LEFTMARGIN, 14
RIGHTMARGIN, 254
TOPMARGIN, 7
BOTTOMMARGIN, 371
BOTTOMMARGIN, 378
END

IDD_ITEM_DETAILS_OPTIONS, DIALOG
BEGIN
LEFTMARGIN, 14
RIGHTMARGIN, 270
TOPMARGIN, 7
BOTTOMMARGIN, 335
BOTTOMMARGIN, 340
END

IDD_PREFS_FILTER_APPEARANCE, DIALOG
Expand Down

0 comments on commit c611ac6

Please sign in to comment.