diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-02-21 13:40:59 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-02-21 13:40:59 +0300 |
| commit | 713042d5e93f1a19c26480e41d4d6df629f853a3 (patch) | |
| tree | e6046c131aa349d17c4125d8f98f1c1873f668dc /src | |
| parent | 605e2d465d21cfb1379d528a1ef07606335ca4de (diff) | |
Icons' options went under Customize branch
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/res/resource.rc | 23 | ||||
| -rw-r--r-- | src/mir_app/src/skin2opts.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/skinicons.cpp | 2 |
3 files changed, 20 insertions, 9 deletions
diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc index 528a2df3b2..76b7ea66a7 100644 --- a/src/mir_app/res/resource.rc +++ b/src/mir_app/res/resource.rc @@ -432,17 +432,17 @@ BEGIN LTEXT "Choose font",IDC_STATIC,231,231,79,14,SS_CENTERIMAGE
END
-IDD_OPT_ICOLIB DIALOGEX 0, 0, 316, 251
+IDD_OPT_ICOLIB DIALOGEX 0, 0, 316, 237
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Icons",IDC_STICONSGROUP,0,0,315,250
- CONTROL "List1",IDC_PREVIEW,"SysListView32",LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,107,10,203,207
- PUSHBUTTON "&Load icon set...",IDC_LOADICONS,116,220,94,13
- PUSHBUTTON "&Import icons >>",IDC_IMPORT,215,220,89,13
- CONTROL "Download more icons",IDC_GETMORE,"Hyperlink",WS_TABSTOP | 0x1,109,237,201,8
- CONTROL "Tree1",IDC_CATEGORYLIST,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | TVS_NOHSCROLL | WS_BORDER | WS_TABSTOP,4,10,100,235
+ GROUPBOX "Icons",IDC_STICONSGROUP,0,0,315,236
+ CONTROL "List1",IDC_PREVIEW,"SysListView32",LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,107,10,203,192
+ PUSHBUTTON "&Load icon set...",IDC_LOADICONS,116,205,94,13
+ PUSHBUTTON "&Import icons >>",IDC_IMPORT,215,205,89,13
+ CONTROL "Download more icons",IDC_GETMORE,"Hyperlink",WS_TABSTOP | 0x1,109,222,201,8
+ CONTROL "Tree1",IDC_CATEGORYLIST,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | TVS_NOHSCROLL | WS_BORDER | WS_TABSTOP,4,10,100,221
END
IDD_ICOLIB_IMPORT DIALOGEX 0, 0, 217, 194
@@ -1315,6 +1315,10 @@ BEGIN TOPMARGIN, 4
END
+ IDD_OPT_ICOLIB, DIALOG
+ BEGIN
+ END
+
IDD_OPT_GENMENU, DIALOG
BEGIN
END
@@ -1785,6 +1789,11 @@ BEGIN 0
END
+IDD_OPT_ICOLIB AFX_DIALOG_LAYOUT
+BEGIN
+ 0
+END
+
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/mir_app/src/skin2opts.cpp b/src/mir_app/src/skin2opts.cpp index 6586e4d3e6..288ef2a5da 100644 --- a/src/mir_app/src/skin2opts.cpp +++ b/src/mir_app/src/skin2opts.cpp @@ -926,8 +926,10 @@ int SkinOptionsInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = {};
odp.flags = ODPF_BOLDGROUPS;
odp.position = -180000000;
- odp.pDialog = new CIcoLibOptsDlg();
+ odp.szGroup.a = LPGEN("Customize");
odp.szTitle.a = LPGEN("Icons");
+ odp.szTab.a = LPGEN("Icons");
+ odp.pDialog = new CIcoLibOptsDlg();
g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/mir_app/src/skinicons.cpp b/src/mir_app/src/skinicons.cpp index ff07e277c0..ed74917d67 100644 --- a/src/mir_app/src/skinicons.cpp +++ b/src/mir_app/src/skinicons.cpp @@ -390,7 +390,7 @@ int LoadSkinIcons(void) continue;
mir_snprintf(iconName, "%s%d", mainIconsFmt, i);
- sid.section.a = mainIcons[i].section == nullptr ? (char*)LPGEN("Main icons") : (char*)mainIcons[i].section;
+ sid.section.a = mainIcons[i].section == nullptr ? LPGEN("Main icons") : mainIcons[i].section;
sid.description.a = (char*)mainIcons[i].description;
sid.iDefaultIndex = mainIcons[i].resource_id;
mainIcons[i].hIcolib = IcoLib_AddIcon(&sid, 0);
|