From 28193e6b7e7392255750e36a82554c4648da4bd3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 10 Apr 2020 14:09:31 +0300 Subject: StdClist options code cleaning --- src/core/stdclist/res/resource.rc | 148 +++++++++++++++++++----------------- src/core/stdclist/src/clcopts.cpp | 14 ++-- src/core/stdclist/src/clistopts.cpp | 2 +- src/core/stdclist/src/cluiopts.cpp | 14 ++-- src/core/stdclist/src/init.cpp | 2 +- 5 files changed, 95 insertions(+), 85 deletions(-) (limited to 'src') diff --git a/src/core/stdclist/res/resource.rc b/src/core/stdclist/res/resource.rc index c040eff77e..6682b85efb 100644 --- a/src/core/stdclist/res/resource.rc +++ b/src/core/stdclist/res/resource.rc @@ -68,100 +68,100 @@ BEGIN GROUPBOX "Contact list sorting",IDC_STATIC,2,2,310,54,WS_GROUP END -IDD_OPT_CLUI DIALOGEX 0, 0, 313, 245 +IDD_OPT_CLUI DIALOGEX 0, 0, 313, 233 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Window",IDC_STWINDOWGROUP,4,4,305,154 + GROUPBOX "Window",IDC_STWINDOWGROUP,4,4,305,142 CONTROL "Always on top",IDC_ONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,18,128,10 - CONTROL "Tool style main window",IDC_TOOLWND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,32,128,10 - CONTROL "Minimize to tray",IDC_MIN2TRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,46,128,10 - CONTROL "Show menu bar",IDC_SHOWMAINMENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,60,128,10 - CONTROL "Easy move",IDC_CLIENTDRAG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,74,128,10 - CONTROL "Show title bar",IDC_SHOWCAPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,88,128,10 - LTEXT "Title bar text:",IDC_STATIC,12,106,51,8 - EDITTEXT IDC_TITLETEXT,63,104,72,12,ES_AUTOHSCROLL + CONTROL "Tool style main window",IDC_TOOLWND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,31,128,10 + CONTROL "Minimize to tray",IDC_MIN2TRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,44,128,10 + CONTROL "Show menu bar",IDC_SHOWMAINMENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,57,128,10 + CONTROL "Easy move",IDC_CLIENTDRAG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,70,128,10 + CONTROL "Show title bar",IDC_SHOWCAPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,85,128,10 + LTEXT "Title bar text:",IDC_STATIC,12,102,51,8 + EDITTEXT IDC_TITLETEXT,63,100,72,12,ES_AUTOHSCROLL CONTROL "Show drop shadow (restart required)",IDC_DROPSHADOW, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,122,138,10 - CONTROL "Pin to desktop",IDC_ONDESKTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,137,128,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,117,138,10 + CONTROL "Pin to desktop",IDC_ONDESKTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,131,128,10 CONTROL "Hide contact list after it has been idle for",IDC_AUTOHIDE, "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,141,18,162,10 - EDITTEXT IDC_HIDETIME,151,33,30,12,ES_RIGHT | ES_NUMBER + EDITTEXT IDC_HIDETIME,151,32,30,12,ES_RIGHT | ES_NUMBER CONTROL "Spin1",IDC_HIDETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,172,32,10,14 - LTEXT "seconds",IDC_STATIC01,186,35,56,8 + LTEXT "seconds",IDC_STATIC01,186,34,56,8 CONTROL "Automatically resize window to height of list",IDC_AUTOSIZE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,141,55,162,10 - LTEXT "maximum",IDC_STATIC21,151,71,45,8 - EDITTEXT IDC_MAXSIZEHEIGHT,197,69,31,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER - CONTROL "Spin1",IDC_MAXSIZESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_HOTTRACK,218,68,10,14 - LTEXT "% of screen",IDC_STATIC22,230,71,69,8 - CONTROL "Size upwards",IDC_AUTOSIZEUPWARD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,86,147,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,141,53,162,10 + LTEXT "maximum",IDC_STATIC21,151,68,45,8 + EDITTEXT IDC_MAXSIZEHEIGHT,197,66,31,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER + CONTROL "Spin1",IDC_MAXSIZESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_HOTTRACK,221,65,10,14 + LTEXT "% of screen",IDC_STATIC22,230,68,69,8 + CONTROL "Size upwards",IDC_AUTOSIZEUPWARD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,83,147,10 CONTROL "If window is partially covered, bring to front instead of hiding",IDC_BRINGTOFRONT, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,141,102,162,16 - CONTROL "Enable docking",IDC_DISABLEDOCKING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,141,135,136,10 - GROUPBOX "Translucency options",IDC_STATIC,4,161,305,80 - CONTROL "Fade contact list in/out",IDC_FADEINOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,174,163,10 - CONTROL "Transparent contact list",IDC_TRANSPARENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,191,151,9 - LTEXT "Inactive opacity:",IDC_STATIC11,23,206,89,8 - CONTROL "Slider2",IDC_TRANSINACTIVE,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS | WS_TABSTOP,112,205,130,11 - LTEXT "000%",IDC_INACTIVEPERC,246,206,29,8,SS_NOPREFIX - LTEXT "Active opacity:",IDC_STATIC12,23,221,89,8 - CONTROL "Slider2",IDC_TRANSACTIVE,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS | WS_TABSTOP,112,221,130,11 - LTEXT "000%",IDC_ACTIVEPERC,246,222,29,8,SS_NOPREFIX + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,141,98,162,16 + CONTROL "Enable docking",IDC_DISABLEDOCKING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,141,130,136,10 + GROUPBOX "Translucency options",IDC_STATIC,4,149,305,80 + CONTROL "Fade contact list in/out",IDC_FADEINOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,162,163,10 + CONTROL "Transparent contact list",IDC_TRANSPARENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,179,151,9 + LTEXT "Inactive opacity:",IDC_STATIC11,23,194,89,8 + CONTROL "Slider2",IDC_TRANSINACTIVE,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS | WS_TABSTOP,112,193,130,11 + LTEXT "000%",IDC_INACTIVEPERC,246,194,29,8,SS_NOPREFIX + LTEXT "Active opacity:",IDC_STATIC12,23,209,89,8 + CONTROL "Slider2",IDC_TRANSACTIVE,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS | WS_TABSTOP,112,209,130,11 + LTEXT "000%",IDC_ACTIVEPERC,246,210,29,8,SS_NOPREFIX END -IDD_OPT_CLC DIALOGEX 0, 0, 314, 251 +IDD_OPT_CLC DIALOGEX 0, 0, 314, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Items",IDC_STATIC,2,2,310,108 + GROUPBOX "Items",IDC_STATIC,2,2,310,96 CONTROL "Show divider between online and offline contacts",IDC_DIVIDERONOFF, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,13,179,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,13,179,10 CONTROL "Hot track items as mouse passes over",IDC_TRACKSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,27,179,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,24,179,10 CONTROL "Disable drag and drop of items",IDC_DISABLEDRAGDROP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,41,179,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,35,179,10 CONTROL "Disable rename of items by clicking twice",IDC_NOTEDITLABELS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,55,179,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,47,179,10 CONTROL "Show selection even when list is not focused",IDC_SHOWSELALWAYS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,69,179,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,59,179,10 CONTROL "Make selection highlight translucent",IDC_NOTNOTRANSLUCENTSEL, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,83,179,10 - CONTROL "Dim idle contacts",IDC_IDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,96,153,10 - GROUPBOX "Groups",IDC_STATIC,2,112,148,136 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,71,179,10 + CONTROL "Dim idle contacts",IDC_IDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,83,155,10 + GROUPBOX "Groups",IDC_STATIC,2,99,148,117 CONTROL "Draw a line alongside group names",IDC_LINEWITHGROUPS, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,129,131,16 + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,9,109,131,16 CONTROL "Show counts of number of contacts in a group",IDC_SHOWGROUPCOUNTS, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,147,131,16 + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,9,127,131,16 CONTROL "Hide group counts when there are none online",IDC_HIDECOUNTSWHENEMPTY, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,165,131,16 - CONTROL "Sort groups alphabetically",IDC_SORTGROUPSALPHA,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,183,131,16 + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,9,145,131,16 + CONTROL "Sort groups alphabetically",IDC_SORTGROUPSALPHA,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,9,163,131,16 CONTROL "Quick search in open groups only",IDC_QUICKSEARCHVISONLY, - "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,11,201,131,16 - LTEXT "Indent groups by:",IDC_STATIC,11,221,67,8 - EDITTEXT IDC_GROUPINDENT,78,219,31,12,ES_RIGHT | ES_NUMBER - CONTROL "Spin1",IDC_GROUPINDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,95,215,10,14 - LTEXT "pixels",IDC_STATIC,112,221,36,8 - GROUPBOX "Visual",IDC_STATIC,156,112,156,136 - CONTROL "Scroll list smoothly",IDC_NOTNOSMOOTHSCROLLING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,123,139,10 - LTEXT "Time:",IDC_STATIC11,174,137,42,8 - EDITTEXT IDC_SMOOTHTIME,216,135,31,12,ES_RIGHT | ES_NUMBER - CONTROL "Spin1",IDC_SMOOTHTIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,239,134,10,14 - LTEXT "milliseconds",IDC_STATIC12,250,137,56,8,SS_CENTERIMAGE - LTEXT "Left margin:",IDC_STATIC,164,163,51,8 - EDITTEXT IDC_LEFTMARGIN,215,161,31,12,ES_RIGHT | ES_NUMBER - CONTROL "Spin1",IDC_LEFTMARGINSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,161,10,14 + "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,9,181,131,16 + LTEXT "Indent groups by:",IDC_STATIC,9,201,67,8 + EDITTEXT IDC_GROUPINDENT,78,199,31,12,ES_RIGHT | ES_NUMBER + CONTROL "Spin1",IDC_GROUPINDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,103,204,10,14 + LTEXT "pixels",IDC_STATIC,112,201,36,8 + GROUPBOX "Visual",IDC_STATIC,156,99,156,131 + CONTROL "Scroll list smoothly",IDC_NOTNOSMOOTHSCROLLING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,110,139,10 + LTEXT "Time:",IDC_STATIC11,174,122,42,8 + EDITTEXT IDC_SMOOTHTIME,216,120,31,12,ES_RIGHT | ES_NUMBER + CONTROL "Spin1",IDC_SMOOTHTIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,126,10,14 + LTEXT "milliseconds",IDC_STATIC12,250,122,56,8,SS_CENTERIMAGE + CONTROL "Hide vertical scroll bar",IDC_NOSCROLLBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,135,140,10 + LTEXT "Left margin:",IDC_STATIC,164,148,51,8 + EDITTEXT IDC_LEFTMARGIN,215,146,31,12,ES_RIGHT | ES_NUMBER + CONTROL "Spin1",IDC_LEFTMARGINSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,152,10,14 + LTEXT "pixels",IDC_STATIC,250,148,54,8 + LTEXT "Row height:",IDC_STATIC,164,163,51,8 + EDITTEXT IDC_ROWHEIGHT,215,161,31,12,ES_RIGHT | ES_NUMBER + CONTROL "Spin1",IDC_ROWHEIGHTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,167,10,14 LTEXT "pixels",IDC_STATIC,250,163,54,8 - CONTROL "Hide vertical scroll bar",IDC_NOSCROLLBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,150,140,10 - LTEXT "Row height:",IDC_STATIC,164,178,51,8 - EDITTEXT IDC_ROWHEIGHT,215,176,31,12,ES_RIGHT | ES_NUMBER - CONTROL "Spin1",IDC_ROWHEIGHTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,176,10,14 - LTEXT "pixels",IDC_STATIC,250,178,54,8 - CONTROL "Gamma correction",IDC_GAMMACORRECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,190,140,10 - CONTROL "Gray out entire list when:",IDC_GREYOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,202,139,10 - CONTROL "Tree1",IDC_GREYOUTOPTS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,164,212,141,32 + CONTROL "Gamma correction",IDC_GAMMACORRECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,174,140,10 + CONTROL "Gray out entire list when:",IDC_GREYOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,185,139,10 + CONTROL "Tree1",IDC_GREYOUTOPTS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,164,195,141,32 END IDD_OPT_CLCBKG DIALOGEX 0, 0, 235, 154 @@ -246,7 +246,7 @@ BEGIN VERTGUIDE, 242 VERTGUIDE, 246 TOPMARGIN, 4 - BOTTOMMARGIN, 241 + BOTTOMMARGIN, 229 HORZGUIDE, 18 HORZGUIDE, 39 HORZGUIDE, 75 @@ -258,11 +258,11 @@ BEGIN BEGIN LEFTMARGIN, 2 RIGHTMARGIN, 312 - VERTGUIDE, 11 + VERTGUIDE, 9 VERTGUIDE, 164 VERTGUIDE, 216 TOPMARGIN, 2 - BOTTOMMARGIN, 249 + BOTTOMMARGIN, 232 HORZGUIDE, 145 HORZGUIDE, 163 HORZGUIDE, 222 @@ -348,6 +348,16 @@ BEGIN 0 END +IDD_OPT_CLC AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPT_CLUI AFX_DIALOG_LAYOUT +BEGIN + 0 +END + #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index 7f0507eb15..b96d2465e5 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.cpp @@ -401,17 +401,17 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, int ClcOptInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = {}; - odp.szGroup.a = LPGEN("Contact list"); - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC); - odp.szTitle.a = LPGEN("List"); - odp.pfnDlgProc = DlgProcClcMainOpts; + odp.szTitle.a = LPGEN("Contact list"); odp.flags = ODPF_BOLDGROUPS; + + odp.szTab.a = LPGEN("List"); + odp.pfnDlgProc = DlgProcClcMainOpts; + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC); g_plugin.addOptions(wParam, &odp); - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLCBKG); - odp.szTitle.a = LPGEN("List background"); + odp.szTab.a = LPGEN("List background"); odp.pfnDlgProc = DlgProcClcBkgOpts; - odp.flags = ODPF_BOLDGROUPS; + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLCBKG); g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp index f0cd516923..59a31eaeac 100644 --- a/src/core/stdclist/src/clistopts.cpp +++ b/src/core/stdclist/src/clistopts.cpp @@ -133,8 +133,8 @@ public: int CListOptInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = {}; - odp.position = -1000000000; odp.szTitle.a = LPGEN("Contact list"); + odp.szTab.a = LPGEN("General"); odp.pDialog = new ClistOptsDlg(); odp.flags = ODPF_BOLDGROUPS; g_plugin.addOptions(wParam, &odp); diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp index 0593e2f771..c6730a8ff3 100644 --- a/src/core/stdclist/src/cluiopts.cpp +++ b/src/core/stdclist/src/cluiopts.cpp @@ -311,17 +311,17 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L int CluiOptInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = {}; - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLUI); - odp.szTitle.a = LPGEN("Window"); - odp.szGroup.a = LPGEN("Contact list"); - odp.pfnDlgProc = DlgProcCluiOpts; + odp.szTitle.a = LPGEN("Contact list"); odp.flags = ODPF_BOLDGROUPS; + + odp.szTab.a = LPGEN("Window"); + odp.pfnDlgProc = DlgProcCluiOpts; + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLUI); g_plugin.addOptions(wParam, &odp); - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SBAR); - odp.szTitle.a = LPGEN("Status bar"); + odp.szTab.a = LPGEN("Status bar"); odp.pfnDlgProc = DlgProcSBarOpts; - odp.flags = ODPF_BOLDGROUPS; + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SBAR); g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/src/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp index 9f73b2a6dd..1aec9c59de 100644 --- a/src/core/stdclist/src/init.cpp +++ b/src/core/stdclist/src/init.cpp @@ -88,9 +88,9 @@ static int OnModulesLoaded(WPARAM, LPARAM) static int OnOptsInit(WPARAM wParam, LPARAM lParam) { + CListOptInit(wParam, lParam); ClcOptInit(wParam, lParam); CluiOptInit(wParam, lParam); - CListOptInit(wParam, lParam); return 0; } -- cgit v1.2.3