diff options
57 files changed, 51 insertions, 377 deletions
diff --git a/include/delphi/m_options.inc b/include/delphi/m_options.inc index e4440cd2e4..129979bb70 100644 --- a/include/delphi/m_options.inc +++ b/include/delphi/m_options.inc @@ -63,16 +63,6 @@ type groupPosition :int; // v0.1.0.1+
hGroupIcon :HICON; // v0.1.0.1+
flags :dword; // v0.1.2.1+
- nIDBottomSimpleControl:int; // v0.1.2.1+
- // if in simple mode the dlg will be cut off after this control,
- // 0 to disable
- nIDRightSimpleControl :int; // v0.1.2.1+
- // if in simple mode the dlg will be cut off after this control,
- // 0 to disable
- expertOnlyControls :^uint;
- nExpertOnlyControls :int; // v0.1.2.1+
- // these controls will be hidden in simple mode. Array must remain valid
- // for duration of dlg.
szTab :TChar; // v0.6.0.0+ [TRANSLATED-BY-CORE]
dwInitParam :LPARAM; // v0.8.0.0+ a value to pass to lParam of WM_INITDIALOG message
hLangpack :int;
@@ -90,17 +80,12 @@ const {$ENDIF}
const
- ODPF_SIMPLEONLY = 1; // page is only shown when in simple mode
- ODPF_EXPERTONLY = 2; // " expert mode
ODPF_BOLDGROUPS = 4; // give group box titles a bold font
ODPF_UNICODE = 8; // string fields in OPTIONSDIALOGPAGE are WCHAR*
ODPF_USERINFOTAB = 16; // options page is tabbed
ODPF_DONTTRANSLATE = 32; // do not translate option page title
const
- PSN_EXPERTCHANGED = 2; //sent to pages via WM_NOTIFY when the expert checkbox is clicked. lParam=new state
-
- PSM_ISEXPERT = WM_USER+101; //returns true/false
PSM_GETBOLDFONT = WM_USER+102; //returns HFONT used for group box titles
MS_OPT_ADDPAGE:PAnsiChar = 'Opt/AddPage';
@@ -126,6 +111,4 @@ const //Opens the options dialog, with only specified page v0.8.0.x+
MS_OPT_OPENOPTIONSPAGE = 'Opt/OpenOptionsPage';
- SETTING_SHOWEXPERT_DEFAULT = 1;
-
{$ENDIF}
diff --git a/include/m_options.h b/include/m_options.h index b2e01e957e..a0d3692945 100644 --- a/include/m_options.h +++ b/include/m_options.h @@ -73,10 +73,6 @@ typedef struct { int groupPosition; //v0.1.0.1+
HICON hGroupIcon; //v0.1.0.1+
DWORD flags; //v0.1.2.1+
- int nIDBottomSimpleControl; //v0.1.2.1+ if in simple mode the dlg will be cut off after this control, 0 to disable
- int nIDRightSimpleControl; //v0.1.2.1+ if in simple mode the dlg will be cut off after this control, 0 to disable
- UINT *expertOnlyControls;
- int nExpertOnlyControls; //v0.1.2.1+ these controls will be hidden in simple mode. Array must remain valid for duration of dlg.
union {
char* pszTab; //v0.6.0.0+ [TRANSLATED-BY-CORE]
@@ -88,8 +84,6 @@ typedef struct { }
OPTIONSDIALOGPAGE;
-#define ODPF_SIMPLEONLY 1 // page is only shown when in simple mode
-#define ODPF_EXPERTONLY 2 // " expert mode
#define ODPF_BOLDGROUPS 4 // give group box titles a bold font
#define ODPF_UNICODE 8 // string fields in OPTIONSDIALOGPAGE are WCHAR*
#define ODPF_USERINFOTAB 16 // options page is tabbed
@@ -101,8 +95,6 @@ typedef struct { #define ODPF_TCHAR 0
#endif
-#define PSN_EXPERTCHANGED 2 //sent to pages via WM_NOTIFY when the expert checkbox is clicked. lParam = new state
-#define PSM_ISEXPERT (WM_USER+101) //returns true/false
#define PSM_GETBOLDFONT (WM_USER+102) //returns HFONT used for group box titles
__forceinline INT_PTR Options_AddPage(WPARAM wParam, OPTIONSDIALOGPAGE* odp)
@@ -138,6 +130,4 @@ __forceinline HWND Options_OpenPage(OPENOPTIONSDIALOG *ood) return (HWND)CallService("Opt/OpenOptionsPage", hLangpack, (LPARAM)ood);
}
-#define SETTING_SHOWEXPERT_DEFAULT 1
-
#endif //M_OPTIONS_H__
diff --git a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_options.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_options.inc index 23d891a81c..8e52002177 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_options.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_options.inc @@ -64,10 +64,6 @@ const OPTIONSDIALOGPAGE_V0100_SIZE = $18;
OPTIONSDIALOGPAGE_V0120_SIZE = $28;
- { page is only shown when in 'simple' mode }
- ODPF_SIMPLEONLY = 1;
- { page is only shown when in 'expert' mode }
- ODPF_EXPERTONLY = 2;
{ give group box titles a bold font }
ODPF_BOLDGROUPS = 4;
@@ -86,24 +82,10 @@ type groupPosition: int; // v0.1.0.1+
hGroupIcon: THandle; // v0.1.0.1+
flags: DWORD; // v0.1.2.1+
- { if in simple mode the dialog will be cut off AFTER this control ID, 0
- for disable }
- nIDBottomSimpleControl: int; // v0.1.2.1+
- { if in simple mode the dialog will cut off AFTER this control ID, 0 to disable }
- nIDRightSimpleControl: int; // v0.1.2.1+
- { these controls will be hidden in simple mode, pointer to an array of ID's
- must remain valid for the duration of the dialog }
- expertOnlyControls: ^int;
- nExpertOnlyControls: int; // v0.1.2.1+
end;
const
- { sent to pages via WM_NOTIFY when the expert checkbox is clicked, lParam = new state }
- PSN_EXPERTCHANGED = 2;
- { returns true/false }
- PSM_ISEXPERT = ($0400 + 101);
- { returns HFONT used for group box titles }
PSM_GETBOLDFONT = ($0400 + 102);
{$ENDIF}
diff --git a/plugins/!NotAdopted/SmartAutoReplier/SAR.cpp b/plugins/!NotAdopted/SmartAutoReplier/SAR.cpp index a2617b496b..e7a3ec73c9 100644 --- a/plugins/!NotAdopted/SmartAutoReplier/SAR.cpp +++ b/plugins/!NotAdopted/SmartAutoReplier/SAR.cpp @@ -130,7 +130,7 @@ BEGIN_PROTECT_AND_LOG_CODE optsDialog.pszGroup = lpszGroup;
#endif
optsDialog.pfnDlgProc = (DLGPROC)&CSettingsDlgHolder::FakeDlgProc;
- optsDialog.flags = ODPF_BOLDGROUPS/*|ODPF_EXPERTONLY*/; /// some lames are scaring that option...
+ optsDialog.flags = ODPF_BOLDGROUPS;
#ifdef _UNICODE
optsDialog.flags |= ODPF_UNICODE;
#endif
diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index 1324392ec6..8a7e5d75ea 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -2165,7 +2165,7 @@ static int OptInit(WPARAM wParam, LPARAM lParam) OPTIONSDIALOGPAGE odp = { 0 };
odp.cbSize = sizeof(odp);
odp.hInstance = g_hInst;
- odp.flags = ODPF_BOLDGROUPS | ODPF_EXPERTONLY;
+ odp.flags = ODPF_BOLDGROUPS;
odp.pszGroup = LPGEN("Customize");
odp.pszTitle = LPGEN("Avatars");
diff --git a/plugins/Actman/i_opt_dlg.inc b/plugins/Actman/i_opt_dlg.inc index 8b9e3fb32b..2823b03d79 100644 --- a/plugins/Actman/i_opt_dlg.inc +++ b/plugins/Actman/i_opt_dlg.inc @@ -188,7 +188,7 @@ begin FillChar(odp,SizeOf(odp),0);
odp.cbSize :=SizeOf(odp);
- odp.flags :=ODPF_BOLDGROUPS or ODPF_EXPERTONLY;
+ odp.flags :=ODPF_BOLDGROUPS;
odp.Position :=900003000;
odp.hInstance :=hInstance;
odp.szGroup.a :='Services';
diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp index dfb5efb8fa..77c2df020f 100644 --- a/plugins/AssocMgr/src/assoclist.cpp +++ b/plugins/AssocMgr/src/assoclist.cpp @@ -978,7 +978,7 @@ static int AssocListOptInit(WPARAM wParam, LPARAM lParam) odp.position = 900000100; /* network opts = 900000000 */
odp.pszGroup = LPGEN("Services"); /* autotranslated */
odp.pszTitle = LPGEN("Associations"); /* autotranslated */
- odp.flags = ODPF_BOLDGROUPS | ODPF_EXPERTONLY;
+ odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = AssocListOptDlgProc;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/AutoShutdown/src/options.cpp b/plugins/AutoShutdown/src/options.cpp index c173a169a9..007b7668b6 100644 --- a/plugins/AutoShutdown/src/options.cpp +++ b/plugins/AutoShutdown/src/options.cpp @@ -114,7 +114,7 @@ static int ShutdownOptInit(WPARAM wParam,LPARAM lParam) odp.ptszGroup=_T("Events"); /* autotranslated */
odp.ptszTitle=_T("Automatic Shutdown"); /* autotranslated */
odp.ptszTab=_T("Automatic Shutdown"); /* autotranslated, can be made a tab */
- odp.flags=ODPF_BOLDGROUPS|ODPF_EXPERTONLY|ODPF_TCHAR;
+ odp.flags=ODPF_BOLDGROUPS|ODPF_TCHAR;
odp.pfnDlgProc = ShutdownOptDlgProc;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/AvatarHistory/src/options.cpp b/plugins/AvatarHistory/src/options.cpp index fbf7f8312f..316493b341 100644 --- a/plugins/AvatarHistory/src/options.cpp +++ b/plugins/AvatarHistory/src/options.cpp @@ -55,13 +55,6 @@ static OptPageControl popupsControls[] = { { &opts.popup_removed, CONTROL_TEXT, IDC_REMOVED, "PopupsTextRemoved", (ULONG_PTR) DEFAULT_TEMPLATE_REMOVED }
};
-static UINT popupsExpertControls[] = {
- IDC_COLOURS_G, IDC_BGCOLOR, IDC_BGCOLOR_L, IDC_TEXTCOLOR, IDC_TEXTCOLOR_L, IDC_WINCOLORS, IDC_DEFAULTCOLORS,
- IDC_DELAY_G, IDC_DELAYFROMPU, IDC_DELAYCUSTOM, IDC_DELAYPERMANENT, IDC_DELAY, IDC_DELAY_SPIN,
- IDC_ACTIONS_G, IDC_RIGHT_ACTION_L, IDC_RIGHT_ACTION, IDC_LEFT_ACTION_L, IDC_LEFT_ACTION,
- IDC_PREV
-};
-
// Functions //////////////////////////////////////////////////////////////////////////////////////
@@ -78,7 +71,7 @@ int OptInit(WPARAM wParam,LPARAM lParam) odp.ptszTitle = LPGENT("Avatar"); // name of the item
odp.pfnDlgProc = OptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_EXPERTONLY;
+ odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
Options_AddPage(wParam, &odp);
if(ServiceExists(MS_POPUP_ADDPOPUPT))
@@ -92,10 +85,6 @@ int OptInit(WPARAM wParam,LPARAM lParam) odp.pfnDlgProc = PopupsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPS);
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
- odp.expertOnlyControls = popupsExpertControls;
- odp.nExpertOnlyControls = MAX_REGS(popupsExpertControls);
- odp.nIDBottomSimpleControl = IDC_POPUPS;
- odp.nIDRightSimpleControl = IDC_POPUPS;
Options_AddPage(wParam, &odp);
}
diff --git a/plugins/BossKeyPlus/src/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp index bc5765d6d5..9947eb3073 100644 --- a/plugins/BossKeyPlus/src/Options.cpp +++ b/plugins/BossKeyPlus/src/Options.cpp @@ -407,7 +407,6 @@ int OptsDlgInit(WPARAM wParam,LPARAM lParam) Options_AddPage(wParam, &optDi);
- optDi.flags |= ODPF_EXPERTONLY;
optDi.pfnDlgProc = AdvOptDlg;
optDi.pszTemplate = MAKEINTRESOURCEA(IDD_OPTDIALOGADV);
optDi.pszTab = LPGEN("Advanced");
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index 54ac3a4923..5bbc96b38d 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -243,26 +243,22 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP static INT_PTR CALLBACK DlgProcClistBehaviourOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-static UINT StatusBarExpertControls[] = {IDC_STATUSBAR_PER_PROTO, IDC_STATUSBAR_PROTO_LIST, IDC_SBAR_USE_ACCOUNT_SETTINGS, IDC_SBAR_HIDE_ACCOUNT_COMPLETELY};
-
struct
{
char *name; // Tab name
int id; // Dialog id
DLGPROC wnd_proc; // Dialog function
- UINT* expertControls; // Expert Controls
- int nExpertControls;
DWORD flag; // Expertonly
}
static clist_opt_items[] =
{
- { LPGEN("General"), IDD_OPT_CLIST, DlgProcClistOpts, NULL, 0, 0},
- { LPGEN("Tray"), IDD_OPT_TRAY, DlgProcTrayOpts, NULL, 0, 0 },
- { LPGEN("List"), IDD_OPT_CLC, DlgProcClistListOpts, NULL, 0, 0 },
- { LPGEN("Window"), IDD_OPT_CLUI, DlgProcClistWindowOpts, NULL, 0, 0 },
- { LPGEN("Behaviour"), IDD_OPT_CLUI_2, DlgProcClistBehaviourOpts, NULL, 0, 0 },
- { LPGEN("Status Bar"), IDD_OPT_SBAR, DlgProcSBarOpts, StatusBarExpertControls, SIZEOF(StatusBarExpertControls), 0},
- { LPGEN("Additional stuff"), IDD_OPT_META_CLC, DlgProcClistAdditionalOpts, NULL, 0, 0 }
+ { LPGEN("General"), IDD_OPT_CLIST, DlgProcClistOpts, 0},
+ { LPGEN("Tray"), IDD_OPT_TRAY, DlgProcTrayOpts, 0 },
+ { LPGEN("List"), IDD_OPT_CLC, DlgProcClistListOpts, 0 },
+ { LPGEN("Window"), IDD_OPT_CLUI, DlgProcClistWindowOpts, 0 },
+ { LPGEN("Behaviour"), IDD_OPT_CLUI_2, DlgProcClistBehaviourOpts, 0 },
+ { LPGEN("Status Bar"), IDD_OPT_SBAR, DlgProcSBarOpts, 0},
+ { LPGEN("Additional stuff"), IDD_OPT_META_CLC, DlgProcClistAdditionalOpts, 0 }
};
int ClcOptInit(WPARAM wParam,LPARAM lParam)
@@ -283,8 +279,6 @@ int ClcOptInit(WPARAM wParam,LPARAM lParam) odp.pszTab = clist_opt_items[i].name;
odp.pfnDlgProc = clist_opt_items[i].wnd_proc;
odp.flags = ODPF_BOLDGROUPS | clist_opt_items[i].flag;
- odp.expertOnlyControls = clist_opt_items[i].expertControls;
- odp.nExpertOnlyControls = clist_opt_items[i].nExpertControls;
Options_AddPage(wParam, &odp);
}
diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp index d5d46dc1cb..de26c3b2be 100644 --- a/plugins/Clist_modern/src/modern_clistopts.cpp +++ b/plugins/Clist_modern/src/modern_clistopts.cpp @@ -26,8 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "m_clc.h"
#include "hdr/modern_commonprototypes.h"
-static UINT expertOnlyControls[] = {IDC_ALWAYSSTATUS};
-
static INT_PTR CALLBACK DlgProcItemRowOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg) {
diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp index 1ffb72804c..7bfea762c1 100644 --- a/plugins/Clist_modern/src/modern_skinopt.cpp +++ b/plugins/Clist_modern/src/modern_skinopt.cpp @@ -68,7 +68,6 @@ int SkinOptInit( WPARAM wParam, LPARAM lParam ) Options_AddPage(wParam, &odp);
if ( db_get_b( NULL, "ModernData", "EnableSkinEditor", SETTING_ENABLESKINEDITOR_DEFAULT )) {
- odp.flags |= ODPF_EXPERTONLY;
odp.pfnDlgProc = DlgSkinEditorOpts;
odp.pszTemplate = MAKEINTRESOURCEA( IDD_OPT_SKINEDITOR );
odp.pszTab = LPGEN( "Object Editor" );
diff --git a/plugins/Clist_mw/src/clcopts.cpp b/plugins/Clist_mw/src/clcopts.cpp index 43634f6fad..4bd5d53b1b 100644 --- a/plugins/Clist_mw/src/clcopts.cpp +++ b/plugins/Clist_mw/src/clcopts.cpp @@ -57,7 +57,7 @@ int ClcOptInit(WPARAM wParam,LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);
odp.pszTitle = LPGEN("List");
odp.pfnDlgProc = DlgProcClcMainOpts;
- odp.flags = ODPF_BOLDGROUPS|ODPF_EXPERTONLY;
+ odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
if (!ServiceExists(MS_BACKGROUNDCONFIG_REGISTER)) {
diff --git a/plugins/Clist_mw/src/clistopts.cpp b/plugins/Clist_mw/src/clistopts.cpp index dfca53a5cd..2d9e657fb6 100644 --- a/plugins/Clist_mw/src/clistopts.cpp +++ b/plugins/Clist_mw/src/clistopts.cpp @@ -32,7 +32,6 @@ void SortContacts(void); static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-static UINT expertOnlyControls[] = {IDC_ALWAYSSTATUS};
int CListOptInit(WPARAM wParam,LPARAM lParam)
{
OPTIONSDIALOGPAGE odp;
@@ -45,9 +44,6 @@ int CListOptInit(WPARAM wParam,LPARAM lParam) odp.pszTitle = LPGEN("Contact List");
odp.pfnDlgProc = DlgProcGenOpts;
odp.flags = ODPF_BOLDGROUPS;
- odp.nIDBottomSimpleControl = IDC_STCLISTGROUP;
- odp.expertOnlyControls = expertOnlyControls;
- odp.nExpertOnlyControls = sizeof(expertOnlyControls)/sizeof(expertOnlyControls[0]);
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/plugins/Clist_mw/src/cluiopts.cpp b/plugins/Clist_mw/src/cluiopts.cpp index 8fd1c1651e..37433ce481 100644 --- a/plugins/Clist_mw/src/cluiopts.cpp +++ b/plugins/Clist_mw/src/cluiopts.cpp @@ -33,7 +33,6 @@ void ReAssignExtraIcons(); void CluiProtocolStatusChanged(int parStatus, const char* szProto);
int OnStatusBarBackgroundChange();
-static UINT expertOnlyControls[] = {IDC_BRINGTOFRONT, IDC_AUTOSIZE,IDC_STATIC21,IDC_MAXSIZEHEIGHT,IDC_MAXSIZESPIN,IDC_STATIC22,IDC_AUTOSIZEUPWARD,IDC_SHOWMAINMENU,IDC_SHOWCAPTION,IDC_CLIENTDRAG};
int CluiOptInit(WPARAM wParam,LPARAM lParam)
{
OPTIONSDIALOGPAGE odp = { 0 };
@@ -44,18 +43,12 @@ int CluiOptInit(WPARAM wParam,LPARAM lParam) odp.pszGroup = LPGEN("Contact List");
odp.pfnDlgProc = DlgProcCluiOpts;
odp.flags = ODPF_BOLDGROUPS;
- odp.nIDBottomSimpleControl = IDC_STWINDOWGROUP;
- odp.expertOnlyControls = expertOnlyControls;
- odp.nExpertOnlyControls = SIZEOF(expertOnlyControls);
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SBAR);
odp.pszTitle = LPGEN("Status Bar");
odp.pfnDlgProc = DlgProcSBarOpts;
- odp.flags = ODPF_BOLDGROUPS | ODPF_EXPERTONLY;
- odp.nIDBottomSimpleControl = 0;
- odp.nExpertOnlyControls = 0;
- odp.expertOnlyControls = NULL;
+ odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp index cb778098cd..0ab595a853 100644 --- a/plugins/Clist_nicer/src/clcopts.cpp +++ b/plugins/Clist_nicer/src/clcopts.cpp @@ -1378,13 +1378,13 @@ int ClcOptInit(WPARAM wParam, LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_DSPPROFILES);
odp.pszTitle = LPGEN("Contact rows");
odp.pfnDlgProc = DlgProcDspProfiles;
- odp.flags = ODPF_BOLDGROUPS | ODPF_EXPERTONLY;
+ odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FLOATING);
odp.pszTitle = LPGEN("Floating contacts");
odp.pfnDlgProc = DlgProcFloatingContacts;
- odp.flags = ODPF_BOLDGROUPS | ODPF_EXPERTONLY;
+ odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
@@ -1400,7 +1400,6 @@ int ClcOptInit(WPARAM wParam, LPARAM lParam) odp.pszTitle = LPGEN("Contact List");
odp.pfnDlgProc = TabOptionsDlgProc;
odp.flags = ODPF_BOLDGROUPS;
- odp.nIDBottomSimpleControl = 0;
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp index 895ab604b4..c52b574648 100644 --- a/plugins/Console/src/Console.cpp +++ b/plugins/Console/src/Console.cpp @@ -1171,7 +1171,6 @@ static int OptInit(WPARAM wParam,LPARAM lParam) odp.pszTitle = LPGEN("Console");
odp.pfnDlgProc = OptDlgProc;
odp.flags = ODPF_BOLDGROUPS;
- odp.expertOnlyControls = NULL;
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/plugins/CountryFlags/src/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp index 7a31ae8175..9cf8c4c28a 100644 --- a/plugins/CountryFlags/src/extraimg.cpp +++ b/plugins/CountryFlags/src/extraimg.cpp @@ -358,7 +358,6 @@ static INT_PTR CALLBACK ExtraImgOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,L return FALSE;
}
-static UINT expertOnlyControls[]={IDC_CHECK_USEIPTOCOUNTRY};
static int ExtraImgOptInit(WPARAM wParam,LPARAM lParam)
{
OPTIONSDIALOGPAGE odp = { 0 };
@@ -371,8 +370,6 @@ static int ExtraImgOptInit(WPARAM wParam,LPARAM lParam) odp.pszTab = LPGEN("Country Flags"); /* autotranslated, can be made a tab */
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = ExtraImgOptDlgProc;
- odp.expertOnlyControls = expertOnlyControls;
- odp.nExpertOnlyControls = SIZEOF(expertOnlyControls);
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/plugins/ExtraIcons/src/options.cpp b/plugins/ExtraIcons/src/options.cpp index 18d7b361a6..d033e56b51 100644 --- a/plugins/ExtraIcons/src/options.cpp +++ b/plugins/ExtraIcons/src/options.cpp @@ -848,7 +848,7 @@ int InitOptionsCallback(WPARAM wParam, LPARAM lParam) odp.pszTab = LPGEN("General");
odp.pfnDlgProc = OptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.flags = ODPF_BOLDGROUPS | ODPF_EXPERTONLY;
+ odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/KeyboardNotify/src/options.cpp b/plugins/KeyboardNotify/src/options.cpp index 239defa1cf..7ef9db3380 100644 --- a/plugins/KeyboardNotify/src/options.cpp +++ b/plugins/KeyboardNotify/src/options.cpp @@ -148,7 +148,6 @@ int InitializeOptions(WPARAM wParam,LPARAM lParam) odp.groupPosition = 910000000;
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOptions;
- odp.nIDBottomSimpleControl = 0;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/LangMan/src/options.cpp b/plugins/LangMan/src/options.cpp index 258669ec58..c06572e201 100644 --- a/plugins/LangMan/src/options.cpp +++ b/plugins/LangMan/src/options.cpp @@ -396,7 +396,6 @@ static INT_PTR CALLBACK LangOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP CorrectPacks(_T("langpack_*.txt"), FALSE);
CheckDlgButton(hwndDlg, IDC_ENABLEAUTOUPDATES, DBGetContactSettingByte(NULL, "LangMan", "EnableAutoUpdates", SETTING_ENABLEAUTOUPDATES_DEFAULT)!=0);
SendMessage(hwndDlg, M_RELOADLIST, 0, 0);
- SendMessage(hwndDlg, M_SHOWFILECOL, 0, SendMessage(GetParent(hwndDlg), PSM_ISEXPERT, 0, 0));
return TRUE;
}
case M_RELOADLIST:
@@ -621,9 +620,6 @@ static INT_PTR CALLBACK LangOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP DBWriteContactSettingByte(NULL, "LangMan", "EnableAutoUpdates", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_ENABLEAUTOUPDATES)!=0));
return TRUE;
}
- case PSN_EXPERTCHANGED:
- SendMessage(hwndDlg, M_SHOWFILECOL, 0, ((PSHNOTIFY*)lParam)->lParam);
- return TRUE;
} /* switch nmhdr->code */
break;
} /* switch nmhdr->idFrom */
@@ -637,7 +633,6 @@ void ReloadLangOptList(void) {
if (hwndLangOpt!=NULL) {
SendMessage(hwndLangOpt, M_RELOADLIST, 0, 0);
- SendMessage(hwndLangOpt, M_SHOWFILECOL, 0, SendMessage(GetParent(hwndLangOpt), PSM_ISEXPERT, 0, 0));
}
}
diff --git a/plugins/ListeningTo/src/options.cpp b/plugins/ListeningTo/src/options.cpp index 4e62e271e9..f0f739edd2 100644 --- a/plugins/ListeningTo/src/options.cpp +++ b/plugins/ListeningTo/src/options.cpp @@ -51,11 +51,6 @@ static OptPageControl optionsControls[] = { { &opts.adv_icon_slot, CONTROL_COMBO, IDC_ADV_ICON, "AdvancedIconSlot", 1}
};
-static UINT optionsExpertControls[] = {
- IDC_XSTATUS_G, IDC_XSTATUS_L, IDC_SET_XSTATUS, IDC_CHECK_XSTATUS, IDC_CHECK_XSTATUS_MUSIC, IDC_IGNORE_XSTATUS,
- IDC_CONTACTS_G, IDC_SHOW_ADV_ICON, IDC_ADV_ICON
-};
-
static OptPageControl formatControls[] = {
{ &opts.templ, CONTROL_TEXT, IDC_TEMPLATE, "Template", (DWORD) _T("%artist% - %title%") },
{ &opts.unknown, CONTROL_TEXT, IDC_UNKNOWN, "Unknown", (DWORD) _T("<Unknown>"), 0, 0, 128 },
@@ -90,15 +85,12 @@ int InitOptionsCallback(WPARAM wParam,LPARAM lParam) odp.pszTab = LPGEN("General");
odp.pfnDlgProc = OptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.expertOnlyControls = optionsExpertControls;
- odp.nExpertOnlyControls = MAX_REGS(optionsExpertControls);
- odp.nIDBottomSimpleControl = IDC_LISTENING_G;
Options_AddPage(wParam, &odp);
odp.pszTab = LPGEN("Format");
odp.pfnDlgProc = FormatDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_FORMAT);
- odp.flags = ODPF_BOLDGROUPS | ODPF_EXPERTONLY;
+ odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
odp.pszTab = LPGEN("Players");
diff --git a/plugins/ModernOpt/src/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp index 670324c6a0..51a66fdac4 100644 --- a/plugins/ModernOpt/src/modernopt.cpp +++ b/plugins/ModernOpt/src/modernopt.cpp @@ -247,7 +247,7 @@ static INT_PTR CALLBACK ModernOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, case IDC_BTN_CLASSICOPT:
PostMessage(hwndDlg, WM_CLOSE, 0, 0);
- // TODO: Set advanced options as default (add db key + check that for opening new options)
+ DBWriteContactSettingByte(NULL, "Options", "Expert", 1);
{
OPENOPTIONSDIALOG ood = {0};
ood.cbSize = sizeof(ood);
diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp index e6e194c864..add9e9566c 100755 --- a/plugins/New_GPG/src/options.cpp +++ b/plugins/New_GPG/src/options.cpp @@ -1,4 +1,4 @@ -// Copyright © 2010-2012 sss +// Copyright � 2010-2012 sss // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -83,7 +83,7 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam) odp.ptszTitle = _T(szGPGModuleName); odp.ptszGroup = LPGENT("Services"); odp.ptszTab = LPGENT("Advanced"); - odp.flags=ODPF_BOLDGROUPS | ODPF_EXPERTONLY | ODPF_TCHAR; + odp.flags=ODPF_BOLDGROUPS | ODPF_TCHAR; odp.pfnDlgProc = DlgProcGpgAdvOpts; Options_AddPage(wParam, &odp); diff --git a/plugins/Nudge/src/options.cpp b/plugins/Nudge/src/options.cpp index b0369143dc..2d299f1290 100644 --- a/plugins/Nudge/src/options.cpp +++ b/plugins/Nudge/src/options.cpp @@ -24,7 +24,6 @@ int NudgeOptInit(WPARAM wParam,LPARAM lParam) odp.position = -790000001;
odp.pszTab = LPGEN("Window Shaking");
odp.pfnDlgProc = DlgProcShakeOpt;
- odp.flags |= ODPF_EXPERTONLY;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SHAKE);
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index 1c4e90b13c..67c805844c 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -159,7 +159,6 @@ static int OptionsInitialize(WPARAM wParam,LPARAM lParam) odp.pszTab = LPGEN("Advanced");
odp.pfnDlgProc = DlgProcPopUpAdvOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP_ADVANCED);
- odp.flags |= ODPF_EXPERTONLY;
Options_AddPage(wParam, &odp);
odp.pszGroup = LPGEN("Skins");
diff --git a/plugins/QuickContacts/src/options.cpp b/plugins/QuickContacts/src/options.cpp index 6154a03ba5..c4be0083a7 100644 --- a/plugins/QuickContacts/src/options.cpp +++ b/plugins/QuickContacts/src/options.cpp @@ -62,7 +62,7 @@ int InitOptionsCallback(WPARAM wParam,LPARAM lParam) odp.ptszTitle = LPGENT("Quick Contacts");
odp.pfnDlgProc = OptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
- odp.flags = ODPF_BOLDGROUPS | ODPF_EXPERTONLY | ODPF_TCHAR;
+ odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
Options_AddPage(wParam,&odp);
return 0;
diff --git a/plugins/QuickReplies/src/options.cpp b/plugins/QuickReplies/src/options.cpp index 3c96f42e89..b39cc2caa5 100644 --- a/plugins/QuickReplies/src/options.cpp +++ b/plugins/QuickReplies/src/options.cpp @@ -184,8 +184,6 @@ INT_PTR CALLBACK DlgProcOptionsPage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR return FALSE;
}
-static UINT expertOnlyControls[] = { IDC_VARIABLES, IDC_VARIABLES_HINT };
-
int OnOptInitialized(WPARAM wParam, LPARAM lParam)
{
char tabName[32];
@@ -199,9 +197,6 @@ int OnOptInitialized(WPARAM wParam, LPARAM lParam) odp.position = iNumber;
odp.hInstance = hInstance;
- odp.expertOnlyControls = expertOnlyControls;
- odp.nExpertOnlyControls = SIZEOF(expertOnlyControls);
-
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_PAGE);
odp.pfnDlgProc = DlgProcOptionsPage;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index c323e6bb39..77c67ec4a0 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -1102,7 +1102,6 @@ int OptInitialise(WPARAM wParam, LPARAM lParam) odp.hInstance = g_hInst;
odp.pszTitle = LPGEN("Message Sessions");
odp.flags = ODPF_BOLDGROUPS;
- odp.nIDBottomSimpleControl = 0;
for (i = 0; i < SIZEOF(tabPages); i++) {
odp.pszTemplate = MAKEINTRESOURCEA(tabPages[i].dlgId);
odp.pfnDlgProc = tabPages[i].dlgProc;
diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp index cc450c12e4..26b2c22349 100644 --- a/plugins/SimpleStatusMsg/src/options.cpp +++ b/plugins/SimpleStatusMsg/src/options.cpp @@ -1743,7 +1743,6 @@ int InitOptions(WPARAM wParam, LPARAM lParam) odp.pszTab = LPGEN("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ADVANCED);
odp.pfnDlgProc = DlgAdvancedOptionsProc;
- odp.flags |= ODPF_EXPERTONLY;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/SpellChecker/src/options.cpp b/plugins/SpellChecker/src/options.cpp index ac2f236b5a..09157e2cb3 100644 --- a/plugins/SpellChecker/src/options.cpp +++ b/plugins/SpellChecker/src/options.cpp @@ -72,9 +72,6 @@ int InitOptionsCallback(WPARAM wParam,LPARAM lParam) odp.pfnDlgProc = OptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.flags = ODPF_BOLDGROUPS;
- odp.nIDBottomSimpleControl = IDC_SPELL_CHECKER;
- odp.expertOnlyControls = optionsExpertControls;
- odp.nExpertOnlyControls = SIZEOF(optionsExpertControls);
Options_AddPage(wParam, &odp);
ZeroMemory(&odp,sizeof(odp));
diff --git a/plugins/StopSpamMod/src/options.cpp b/plugins/StopSpamMod/src/options.cpp index 4bd0886a88..5757f06fe7 100755 --- a/plugins/StopSpamMod/src/options.cpp +++ b/plugins/StopSpamMod/src/options.cpp @@ -467,7 +467,6 @@ MIRANDA_HOOK_EVENT(ME_OPT_INITIALISE, w, l) odp.ptszTab = _T("Advanced"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_ADVANCED); odp.pfnDlgProc = AdvancedDlgProc; - odp.flags = odp.flags|ODPF_EXPERTONLY; Options_AddPage(w, &odp); return 0; diff --git a/plugins/TopToolBar/src/ttbopt.cpp b/plugins/TopToolBar/src/ttbopt.cpp index ea6e994cba..8ce57aea76 100644 --- a/plugins/TopToolBar/src/ttbopt.cpp +++ b/plugins/TopToolBar/src/ttbopt.cpp @@ -556,7 +556,7 @@ int TTBOptInit(WPARAM wParam, LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_BUTORDER);
odp.pszTitle = LPGEN("Toolbar");
odp.pfnDlgProc = ButOrderOpts;
- odp.flags = ODPF_BOLDGROUPS | ODPF_EXPERTONLY;
+ odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/plugins/TrafficCounter/src/TrafficCounter.c b/plugins/TrafficCounter/src/TrafficCounter.c index 4195d9e7f7..95f13e7f6c 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.c +++ b/plugins/TrafficCounter/src/TrafficCounter.c @@ -677,8 +677,6 @@ int TrafficCounterOptInitialise(WPARAM wParam,LPARAM lParam) odp.pszTitle = LPGEN("Traffic counter");
odp.pfnDlgProc=DlgProcTCOptions;
odp.flags=ODPF_BOLDGROUPS;
- odp.expertOnlyControls=0;
- odp.nExpertOnlyControls=0;
Options_AddPage(wParam, &odp);
// Statistics options page
diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index 9399e90f63..5fbb32f94c 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
-© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+� 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -100,12 +100,6 @@ static VOID SendNotify_InfoChanged(HWND hDlg) {
PSHNOTIFY pshn;
- // extended setting
- pshn.hdr.idFrom = 0;
- pshn.hdr.code = PSN_EXPERTCHANGED;
- pshn.lParam = SendMessage(GetParent(GetParent(hDlg)), PSM_ISEXPERT, NULL, NULL) ? TRUE : FALSE;
- SendMessage(hDlg, WM_NOTIFY, 0, (LPARAM)&pshn);
-
// send info changed message
pshn.hdr.code = PSN_INFOCHANGED;
SendMessage(hDlg, WM_NOTIFY, NULL, (LPARAM)&pshn);
@@ -1528,7 +1522,7 @@ static INT OnInitOptions(WPARAM wParam, LPARAM lParam) odp.pszTab = LPGEN("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ADVANCED);
odp.pfnDlgProc = DlgProc_AdvancedOpts;
- odp.flags = ODPF_BOLDGROUPS|ODPF_EXPERTONLY;
+ odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
// Details Dialog page
@@ -1551,7 +1545,7 @@ static INT OnInitOptions(WPARAM wParam, LPARAM lParam) odp.pszGroup = LPGEN("Popups");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP);
odp.pfnDlgProc = DlgProc_Popups;
- odp.flags = ODPF_BOLDGROUPS|ODPF_EXPERTONLY;
+ odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
}
return MIR_OK;
diff --git a/plugins/VersionInfo/src/hooked_events.cpp b/plugins/VersionInfo/src/hooked_events.cpp index 77d72e6a97..fb28978377 100644 --- a/plugins/VersionInfo/src/hooked_events.cpp +++ b/plugins/VersionInfo/src/hooked_events.cpp @@ -57,8 +57,6 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) return 0;
}
-static UINT uiExpertOnlyControls[] = { IDC_SHOWUUIDS, IDC_SHOWINSTALLEDLANGUAGES };
-
int OnOptionsInitialise(WPARAM wParam, LPARAM lParam)
{
OPTIONSDIALOGPAGE odp = { 0 };
@@ -71,8 +69,6 @@ int OnOptionsInitialise(WPARAM wParam, LPARAM lParam) odp.groupPosition = 910000000;
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOpts;
- odp.expertOnlyControls = uiExpertOnlyControls;
- odp.nExpertOnlyControls = SIZEOF(uiExpertOnlyControls);
Options_AddPage(wParam, &odp);
diff --git a/plugins/Watrack/i_opt_dlg.inc b/plugins/Watrack/i_opt_dlg.inc index e97a3df5f5..9a1e588173 100644 --- a/plugins/Watrack/i_opt_dlg.inc +++ b/plugins/Watrack/i_opt_dlg.inc @@ -26,7 +26,7 @@ begin odp.szTitle.a :=PluginName;
odp.szGroup.a :='Plugins';
- odp.flags :=ODPF_BOLDGROUPS or ODPF_EXPERTONLY;
+ odp.flags :=ODPF_BOLDGROUPS;
odp.pszTemplate:='PARTS';
odp.pfnDlgProc :=@DlgProcOptions0;
odp.szTab.a :='Modules';
diff --git a/protocols/AimOscar/src/ui.cpp b/protocols/AimOscar/src/ui.cpp index d4a8116ecd..76b50b9741 100644 --- a/protocols/AimOscar/src/ui.cpp +++ b/protocols/AimOscar/src/ui.cpp @@ -1158,13 +1158,11 @@ int CAimProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("Basic");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_AIM);
odp.pfnDlgProc = options_dialog;
- odp.nIDBottomSimpleControl = IDC_OPTIONS;
Options_AddPage(wParam, &odp);
odp.ptszTab = LPGENT("Privacy");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_PRIVACY);
odp.pfnDlgProc = privacy_dialog;
- odp.nIDBottomSimpleControl = 0;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp index 19478d165a..121476b7ca 100644 --- a/protocols/FacebookRM/src/communication.cpp +++ b/protocols/FacebookRM/src/communication.cpp @@ -1133,6 +1133,7 @@ bool facebook_client::send_message( std::string message_recipient, std::string m } break;
default: // Other error
+ parent->Log(" !!! Send message error #%d: %s", resp.error_number, resp.error_text);
return false;
}
diff --git a/protocols/Gadu-Gadu/src/dialogs.cpp b/protocols/Gadu-Gadu/src/dialogs.cpp index 345624715b..476907f2e8 100644 --- a/protocols/Gadu-Gadu/src/dialogs.cpp +++ b/protocols/Gadu-Gadu/src/dialogs.cpp @@ -148,7 +148,6 @@ int GGPROTO::options_init(WPARAM wParam, LPARAM lParam) odp.ptszTab = LPGENT("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GG_ADVANCED);
odp.pfnDlgProc = gg_advoptsdlgproc;
- odp.flags |= ODPF_EXPERTONLY;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index 69a991374b..4576574da4 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -1725,7 +1725,6 @@ int CIrcProto::OnInitOptionsPages(WPARAM wParam, LPARAM) OptCreateAccount.param = this;
Options_AddPage(wParam, &odp);
- odp.flags |= ODPF_EXPERTONLY;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_PREFS_CTCP);
odp.ptszTab = LPGENT("DCC'n CTCP");
odp.dwInitParam = (LPARAM)&OptCreateConn;
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index 1f1270a8a1..6817435d7f 100644 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -1622,8 +1622,6 @@ int CJabberProto::OnOptionsInit( WPARAM wParam, LPARAM ) OptCreateGc.param = this;
Options_AddPage(wParam, &odp);
- odp.flags |= ODPF_EXPERTONLY;
-
odp.ptszTab = LPGENT("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA( IDD_OPT_JABBER2 );
odp.pfnDlgProc = CDlgBase::DynamicDlgProc;
diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp index af399eee9e..3260bf4aea 100644 --- a/protocols/MRA/src/MraPopUp.cpp +++ b/protocols/MRA/src/MraPopUp.cpp @@ -138,7 +138,6 @@ int CMraProto::OnPopupOptInit(WPARAM wParam, LPARAM lParam) odp.pszGroup = LPGEN("Popups");
odp.groupPosition = 900000000;
odp.flags = ODPF_BOLDGROUPS;
- odp.nIDBottomSimpleControl = IDC_GROUPMAIN;
odp.pfnDlgProc = MraPopupDlgProcOpts;
Options_AddPage(wParam, &odp);
}
diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index 51f9c8a08b..4cbd20a0b7 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.cpp @@ -440,7 +440,7 @@ int ClcOptInit(WPARAM wParam, LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);
odp.pszTitle = LPGEN("List");
odp.pfnDlgProc = DlgProcClcMainOpts;
- odp.flags = ODPF_BOLDGROUPS | ODPF_EXPERTONLY;
+ odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLCBKG);
diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp index 83079d6d75..aced950d8e 100644 --- a/src/core/stdclist/src/clistopts.cpp +++ b/src/core/stdclist/src/clistopts.cpp @@ -232,8 +232,6 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP /****************************************************************************************/
-static UINT expertOnlyControls[] = { IDC_ALWAYSSTATUS };
-
int CListOptInit(WPARAM wParam, LPARAM lParam)
{
OPTIONSDIALOGPAGE odp = { 0 };
@@ -244,9 +242,6 @@ int CListOptInit(WPARAM wParam, LPARAM lParam) odp.pszTitle = LPGEN("Contact List");
odp.pfnDlgProc = DlgProcGenOpts;
odp.flags = ODPF_BOLDGROUPS;
- odp.nIDBottomSimpleControl = IDC_STCLISTGROUP;
- odp.expertOnlyControls = expertOnlyControls;
- odp.nExpertOnlyControls = SIZEOF(expertOnlyControls);
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp index e0b7bdbdee..539ed0e937 100644 --- a/src/core/stdclist/src/cluiopts.cpp +++ b/src/core/stdclist/src/cluiopts.cpp @@ -329,12 +329,6 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L /****************************************************************************************/
-static UINT expertOnlyControls[] =
-{
- IDC_BRINGTOFRONT, IDC_AUTOSIZE, IDC_STATIC21, IDC_MAXSIZEHEIGHT, IDC_MAXSIZESPIN,
- IDC_STATIC22, IDC_AUTOSIZEUPWARD, IDC_SHOWMAINMENU, IDC_SHOWCAPTION, IDC_CLIENTDRAG
-};
-
int CluiOptInit(WPARAM wParam, LPARAM lParam)
{
OPTIONSDIALOGPAGE odp = { 0 };
@@ -346,18 +340,12 @@ int CluiOptInit(WPARAM wParam, LPARAM lParam) odp.pszGroup = LPGEN("Contact List");
odp.pfnDlgProc = DlgProcCluiOpts;
odp.flags = ODPF_BOLDGROUPS;
- odp.nIDBottomSimpleControl = IDC_STWINDOWGROUP;
- odp.expertOnlyControls = expertOnlyControls;
- odp.nExpertOnlyControls = SIZEOF(expertOnlyControls);
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SBAR);
odp.pszTitle = LPGEN("Status Bar");
odp.pfnDlgProc = DlgProcSBarOpts;
- odp.flags = ODPF_BOLDGROUPS | ODPF_EXPERTONLY;
- odp.nIDBottomSimpleControl = 0;
- odp.nExpertOnlyControls = 0;
- odp.expertOnlyControls = NULL;
+ odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/src/core/stdfile/fileopts.cpp b/src/core/stdfile/fileopts.cpp index f24ce4af12..827257215e 100644 --- a/src/core/stdfile/fileopts.cpp +++ b/src/core/stdfile/fileopts.cpp @@ -240,7 +240,6 @@ int FileOptInitialise(WPARAM wParam, LPARAM) odp.pszGroup = LPGEN("Events");
odp.pfnDlgProc = DlgProcFileOpts;
odp.flags = ODPF_BOLDGROUPS;
- odp.nIDBottomSimpleControl = IDC_VIRUSSCANNERGROUP;
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 028e7983a2..a0bcb29172 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -595,13 +595,11 @@ static int OptInitialise(WPARAM wParam, LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGLOG);
odp.pszTab = LPGEN("Messaging Log");
odp.pfnDlgProc = DlgProcLogOptions;
- odp.nIDBottomSimpleControl = IDC_STMSGLOGGROUP;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGTYPE);
odp.pszTab = LPGEN("Typing Notify");
odp.pfnDlgProc = DlgProcTypeOptions;
- odp.nIDBottomSimpleControl = 0;
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/src/modules/clist/genmenuopt.cpp b/src/modules/clist/genmenuopt.cpp index 004939591c..40dc80a597 100644 --- a/src/modules/clist/genmenuopt.cpp +++ b/src/modules/clist/genmenuopt.cpp @@ -864,7 +864,7 @@ int GenMenuOptInit(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_PROTOCOLORDER);
odp.pszTitle = LPGEN("Accounts");
odp.pfnDlgProc = ProtocolOrderOpts;
- odp.flags = ODPF_BOLDGROUPS|ODPF_EXPERTONLY;
+ odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/src/modules/icolib/skin2opts.cpp b/src/modules/icolib/skin2opts.cpp index 7075cd439d..f5bb3ffa06 100644 --- a/src/modules/icolib/skin2opts.cpp +++ b/src/modules/icolib/skin2opts.cpp @@ -1019,8 +1019,6 @@ INT_PTR CALLBACK DlgProcIcoLibOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM return FALSE;
}
-static UINT iconsExpertOnlyControls[] = {IDC_IMPORT};
-
int SkinOptionsInit(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = {0};
@@ -1032,8 +1030,6 @@ int SkinOptionsInit(WPARAM wParam, LPARAM) odp.pszTitle = LPGEN("Icons");
odp.pszGroup = LPGEN("Customize");
odp.pfnDlgProc = DlgProcIcoLibOpts;
- odp.expertOnlyControls = iconsExpertOnlyControls;
- odp.nExpertOnlyControls = SIZEOF(iconsExpertOnlyControls);
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/src/modules/ignore/ignore.cpp b/src/modules/ignore/ignore.cpp index 715c7897da..2907833af5 100644 --- a/src/modules/ignore/ignore.cpp +++ b/src/modules/ignore/ignore.cpp @@ -221,11 +221,6 @@ static INT_PTR CALLBACK DlgProcIgnoreOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM SendDlgItemMessage(hwndDlg, IDC_ADDED, STM_SETICON, (WPARAM)hIcons[7], 0);
SendDlgItemMessage(hwndDlg, IDC_TYPINGICON, STM_SETICON, (WPARAM)hIcons[8], 0);
- if ( !SendMessage(GetParent(hwndDlg), PSM_ISEXPERT, 0, 0)) {
- SetWindowLongPtr( GetDlgItem(hwndDlg, IDC_LIST), GWL_STYLE, GetWindowLongPtr( GetDlgItem(hwndDlg, IDC_LIST), GWL_STYLE)&~(CLS_CHECKBOXES|CLS_GROUPCHECKBOXES|CLS_SHOWHIDDEN));
- SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_AUTOREBUILD, 0, 0);
- }
-
ResetListOptions( GetDlgItem(hwndDlg, IDC_LIST));
SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRACOLUMNS, IGNOREEVENT_MAX+2, 0);
{
@@ -317,17 +312,6 @@ static INT_PTR CALLBACK DlgProcIgnoreOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM }
return TRUE;
- case PSN_EXPERTCHANGED:
- {
- INT_PTR dwStyle = GetWindowLongPtr( GetDlgItem(hwndDlg, IDC_LIST), GWL_STYLE);
- if (((PSHNOTIFY*)lParam)->lParam)
- dwStyle |= CLS_CHECKBOXES | CLS_GROUPCHECKBOXES | CLS_SHOWHIDDEN;
- else
- dwStyle &= ~(CLS_CHECKBOXES|CLS_GROUPCHECKBOXES|CLS_SHOWHIDDEN);
- SetWindowLongPtr( GetDlgItem(hwndDlg, IDC_LIST), GWL_STYLE, dwStyle);
- SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_AUTOREBUILD, 0, 0);
- }
- break;
}
break;
}
@@ -345,7 +329,6 @@ static INT_PTR CALLBACK DlgProcIgnoreOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM return FALSE;
}
-static UINT expertOnlyControls[] = {IDC_STCHECKMARKS};
static int IgnoreOptInitialise(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = { 0 };
@@ -357,8 +340,6 @@ static int IgnoreOptInitialise(WPARAM wParam, LPARAM) odp.pszGroup = LPGEN("Events");
odp.pfnDlgProc = DlgProcIgnoreOpts;
odp.flags = ODPF_BOLDGROUPS;
- odp.expertOnlyControls = expertOnlyControls;
- odp.nExpertOnlyControls = SIZEOF(expertOnlyControls);
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/src/modules/netlib/netlibopts.cpp b/src/modules/netlib/netlibopts.cpp index 582669eb0d..386de096f2 100644 --- a/src/modules/netlib/netlibopts.cpp +++ b/src/modules/netlib/netlibopts.cpp @@ -498,7 +498,6 @@ static INT_PTR CALLBACK DlgProcNetlibOpts(HWND hwndDlg, UINT msg, WPARAM wParam, return FALSE;
}
-static UINT expertOnlyControls[] = {IDC_LOGOPTIONS};
int NetlibOptInitialise(WPARAM wParam, LPARAM)
{
int optionsCount = 0;
@@ -521,8 +520,6 @@ int NetlibOptInitialise(WPARAM wParam, LPARAM) odp.pszTitle = LPGEN("Network");
odp.pfnDlgProc = DlgProcNetlibOpts;
odp.flags = ODPF_BOLDGROUPS;
- odp.expertOnlyControls = expertOnlyControls;
- odp.nExpertOnlyControls = SIZEOF(expertOnlyControls);
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp index 8b4ee93f09..031691e5c2 100644 --- a/src/modules/options/options.cpp +++ b/src/modules/options/options.cpp @@ -68,11 +68,8 @@ struct OptionsPageData HTREEITEM hTreeItem;
HWND hwnd;
int changed;
- int simpleHeight, expertHeight;
- int simpleWidth, expertWidth;
- int simpleBottomControlId, simpleRightControlId;
- int nExpertOnlyControls;
- UINT *expertOnlyControls;
+ int height;
+ int width;
DWORD flags;
TCHAR *ptszTitle, *ptszGroup, *ptszTab;
int hLangpack;
@@ -359,8 +356,6 @@ static BOOL CheckPageShow(HWND hdlg, OptionsDlgData* dat, int i) OptionsPageData* opd = dat->arOpd[i];
if (dat->szFilterString && dat->szFilterString[0] && !MatchesFilter(opd, dat->szFilterString)) return FALSE;
- if ((opd->flags & ODPF_SIMPLEONLY) && IsDlgButtonChecked(hdlg, IDC_EXPERT)) return FALSE;
- if ((opd->flags & ODPF_EXPERTONLY) && !IsDlgButtonChecked(hdlg, IDC_EXPERT)) return FALSE;
return TRUE;
}
@@ -586,12 +581,8 @@ static bool LoadOptionsPage(OPTIONSDIALOGPAGE *src, OptionsPageData *dst) dst->hInst = src->hInstance;
dst->hwnd = NULL;
dst->changed = 0;
- dst->simpleHeight = dst->expertHeight = 0;
- dst->simpleBottomControlId = src->nIDBottomSimpleControl;
- dst->simpleWidth = dst->expertWidth = 0;
- dst->simpleRightControlId = src->nIDRightSimpleControl;
- dst->nExpertOnlyControls = src->nExpertOnlyControls;
- dst->expertOnlyControls = src->expertOnlyControls;
+ dst->height = 0;
+ dst->width = 0;
dst->flags = src->flags;
dst->hLangpack = src->hLangpack;
dst->dwInitParam = src->dwInitParam;
@@ -700,14 +691,13 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L Utils_RestoreWindowPositionNoSize(hdlg, NULL, "Options", "");
Window_SetIcon_IcoLib(hdlg, SKINICON_OTHER_OPTIONS);
- CheckDlgButton(hdlg, IDC_EXPERT, db_get_b(NULL, "Options", "Expert", SETTING_SHOWEXPERT_DEFAULT)?BST_CHECKED:BST_UNCHECKED);
EnableWindow( GetDlgItem(hdlg, IDC_APPLY), FALSE);
dat = new OptionsDlgData;
SetWindowLongPtr(hdlg, GWLP_USERDATA, (LONG_PTR)dat);
SetWindowText(hdlg, psh->pszCaption);
LOGFONT lf;
- dat->hBoldFont = (HFONT)SendDlgItemMessage(hdlg, IDC_EXPERT, WM_GETFONT, 0, 0);
+ dat->hBoldFont = (HFONT)SendDlgItemMessage(hdlg, IDC_APPLY, WM_GETFONT, 0, 0);
GetObject(dat->hBoldFont, sizeof(lf), &lf);
lf.lfWeight = FW_BOLD;
dat->hBoldFont = CreateFontIndirect(&lf);
@@ -974,10 +964,6 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L return TRUE;
- case PSM_ISEXPERT:
- SetWindowLongPtr(hdlg, DWLP_MSGRESULT, IsDlgButtonChecked(hdlg, IDC_EXPERT));
- return TRUE;
-
case PSM_GETBOLDFONT:
SetWindowLongPtr(hdlg, DWLP_MSGRESULT, (LONG_PTR)dat->hBoldFont);
return TRUE;
@@ -1052,32 +1038,15 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L if (p->flags & ODPF_BOLDGROUPS)
EnumChildWindows(p->hwnd, BoldGroupTitlesEnumChildren, (LPARAM)dat->hBoldFont);
GetClientRect(p->hwnd, &rcPage);
- p->expertWidth = rcPage.right;
- p->expertHeight = rcPage.bottom;
+ p->width = rcPage.right;
+ p->height = rcPage.bottom;
GetWindowRect(p->hwnd, &rc);
- if (p->simpleBottomControlId) {
- GetWindowRect( GetDlgItem(p->hwnd, p->simpleBottomControlId), &rcControl);
- p->simpleHeight = rcControl.bottom-rc.top;
- }
- else p->simpleHeight = p->expertHeight;
+ p->height = p->height;
+ p->width = p->width;
- if (p->simpleRightControlId) {
- GetWindowRect( GetDlgItem(p->hwnd, p->simpleRightControlId), &rcControl);
- p->simpleWidth = rcControl.right-rc.left;
- }
- else p->simpleWidth = p->expertWidth;
-
- if (IsDlgButtonChecked(hdlg, IDC_EXPERT)) {
- w = p->expertWidth;
- h = p->expertHeight;
- }
- else {
- for (int i=0; i < p->nExpertOnlyControls; i++)
- ShowWindow( GetDlgItem(p->hwnd, p->expertOnlyControls[i]), SW_HIDE);
- w = p->simpleWidth;
- h = p->simpleHeight;
- }
+ w = p->width;
+ h = p->height;
p->offsetX = 0;
p->offsetY = 0;
@@ -1128,47 +1097,6 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L ThemeDialogBackground(p->hwnd, FALSE);
}
- // Resizing
- if ( !p->simpleBottomControlId) {
- int pageWidth, pageHeight;
-
- if (IsDlgButtonChecked(hdlg, IDC_EXPERT)) {
- pageWidth = p->expertWidth;
- pageHeight = p->expertHeight;
- }
- else {
- pageWidth = p->simpleWidth;
- pageHeight = p->simpleHeight;
- }
-
- RECT* parentPageRect = &dat->rcDisplay;
- if (p->insideTab)
- parentPageRect = &dat->rcTab;
-
- pageHeight = min(pageHeight, parentPageRect->bottom - parentPageRect->top);
- pageWidth = min(pageWidth, parentPageRect->right - parentPageRect->left);
-
- int newOffsetX = (parentPageRect->right - parentPageRect->left - pageWidth) >> 1;
- int newOffsetY = p->insideTab ? 0 : (parentPageRect->bottom - parentPageRect->top - pageHeight) >> 1;
-
- struct MoveChildParam mcp;
- mcp.hDlg = p->hwnd;
- mcp.offset.x = newOffsetX - p->offsetX;
- mcp.offset.y = newOffsetY - p->offsetY;
-
- if (mcp.offset.x || mcp.offset.y) {
- EnumChildWindows(p->hwnd, MoveEnumChildren, (LPARAM)(&mcp));
-
- SetWindowPos(p->hwnd, NULL,
- parentPageRect->left, parentPageRect->top,
- parentPageRect->right - parentPageRect->left,
- parentPageRect->bottom - parentPageRect->top,
- SWP_NOZORDER | SWP_NOACTIVATE);
- p->offsetX = newOffsetX;
- p->offsetY = newOffsetY;
- }
- }
-
ShowWindow(p->hwnd, SW_SHOW);
if (((LPNMTREEVIEW)lParam)->action == TVC_BYMOUSE) PostMessage(hdlg, DM_FOCUSPAGE, 0, 0);
else SetFocus(hwndTree);
@@ -1201,91 +1129,12 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L break;
- case IDC_EXPERT:
+ case IDC_MODERN:
{
- int expert = IsDlgButtonChecked(hdlg, IDC_EXPERT);
- RECT rcPage;
- int neww, newh;
-
- DBWriteContactSettingByte(NULL, "Options", "Expert", (BYTE)expert);
-
- PSHNOTIFY pshn;
- pshn.hdr.idFrom = 0;
- pshn.lParam = expert;
- pshn.hdr.code = PSN_EXPERTCHANGED;
-
- for (int i=0; i <dat->arOpd.getCount(); i++) {
- opd = dat->arOpd[i];
- if (opd->hwnd == NULL)
- continue;
- if ( !CheckPageShow(hdlg, dat, i))
- continue;
-
- pshn.hdr.hwndFrom = opd->hwnd;
- SendMessage(opd->hwnd, WM_NOTIFY, 0, (LPARAM)&pshn);
-
- for (int j = 0; j < opd->nExpertOnlyControls; j++)
- ShowWindow( GetDlgItem(opd->hwnd, opd->expertOnlyControls[j]), expert ? SW_SHOW : SW_HIDE);
-
- opd->insideTab = IsInsideTab(hdlg, dat, i);
-
- GetWindowRect(opd->hwnd, &rcPage);
- if (opd->simpleBottomControlId)
- newh = expert ? opd->expertHeight : opd->simpleHeight;
- else
- newh = rcPage.bottom - rcPage.top;
- if (opd->simpleRightControlId)
- neww = expert ? opd->expertWidth : opd->simpleWidth;
- else
- neww = rcPage.right - rcPage.left;
-
- if (i == dat->currentPage) {
- POINT ptStart, ptEnd, ptNow;
- DWORD thisTick, startTick;
- RECT rc;
-
- ptNow.x = ptNow.y = 0;
- ClientToScreen(hdlg, &ptNow);
- GetWindowRect(opd->hwnd, &rc);
- ptStart.x = rc.left-ptNow.x;
- ptStart.y = rc.top-ptNow.y;
- if (opd->insideTab) {
- ptEnd.x = (dat->rcTab.left+dat->rcTab.right-neww)>>1;
- ptEnd.y = dat->rcTab.top;
- }
- else {
- ptEnd.x = (dat->rcDisplay.left+dat->rcDisplay.right-neww)>>1;
- ptEnd.y = (dat->rcDisplay.top+dat->rcDisplay.bottom-newh)>>1;
- }
- if (abs(ptEnd.x-ptStart.x)>5 || abs(ptEnd.y-ptStart.y)>5) {
- startTick = GetTickCount();
- SetWindowPos(opd->hwnd, HWND_TOP, 0, 0, min(neww, rcPage.right), min(newh, rcPage.bottom), SWP_NOMOVE);
- UpdateWindow(opd->hwnd);
- for (;;) {
- thisTick = GetTickCount();
- if (thisTick>startTick+100) break;
- ptNow.x = ptStart.x+(ptEnd.x-ptStart.x)*(int)(thisTick-startTick)/100;
- ptNow.y = ptStart.y+(ptEnd.y-ptStart.y)*(int)(thisTick-startTick)/100;
- SetWindowPos(opd->hwnd, 0, ptNow.x, ptNow.y, 0, 0, SWP_NOZORDER|SWP_NOSIZE);
- }
- }
- if (opd->insideTab)
- ShowWindow( GetDlgItem(hdlg, IDC_TAB), SW_SHOW);
- else
- ShowWindow( GetDlgItem(hdlg, IDC_TAB), SW_HIDE);
- }
-
- if (opd->insideTab) {
- SetWindowPos(opd->hwnd, HWND_TOP, (dat->rcTab.left+dat->rcTab.right-neww)>>1, dat->rcTab.top, neww, newh, 0);
- ThemeDialogBackground(opd->hwnd, TRUE);
- }
- else {
- SetWindowPos(opd->hwnd, HWND_TOP, (dat->rcDisplay.left+dat->rcDisplay.right-neww)>>1, (dat->rcDisplay.top+dat->rcDisplay.bottom-newh)>>1, neww, newh, 0);
- ThemeDialogBackground(opd->hwnd, FALSE);
- }
- }
+ DBWriteContactSettingByte(NULL, "Options", "Expert", 0);
SaveOptionsTreeState(hdlg);
- SendMessage(hdlg, DM_REBUILDPAGETREE, 0, 0);
+ PostMessage(hdlg, WM_CLOSE, 0, 0);
+ CallService(MS_MODERNOPT_SHOW, 0, 0);
break;
}
case IDCANCEL:
@@ -1388,7 +1237,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L delete dat;
hwndOptions = NULL;
- CallService(MS_MODERNOPT_RESTORE, 0, 0);
+ CallService(MS_MODERNOPT_RESTORE, 0, 0);
break;
}
return FALSE;
diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp index c79db357f1..104229ab7d 100644 --- a/src/modules/skin/sounds.cpp +++ b/src/modules/skin/sounds.cpp @@ -419,8 +419,6 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM return FALSE;
}
-static UINT iconsExpertOnlyControls[] = {IDC_IMPORT};
-
static int SkinOptionsInit(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = { 0 };
diff --git a/src/resource.h b/src/resource.h index 791f7570b6..87005ba04e 100644 --- a/src/resource.h +++ b/src/resource.h @@ -308,7 +308,7 @@ #define IDC_NEWNAME 1341
#define IDC_MOVE 1342
#define IDC_LEAVE 1343
-#define IDC_EXPERT 1346
+#define IDC_MODERN 1346
#define IDC_CATEGORYLIST 1366
#define IDC_LOADICONS 1369
#define IDC_STICONSGROUP 1371
diff --git a/src/resource.rc b/src/resource.rc index cef16ba39d..162d1f7454 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -147,7 +147,7 @@ BEGIN PUSHBUTTON "Apply",IDC_APPLY,374,283,50,14
CONTROL "Tree1",IDC_PAGETREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_NOHSCROLL | WS_BORDER | WS_TABSTOP,4,30,102,249
CONTROL "",IDC_TAB,"SysTabControl32",NOT WS_VISIBLE | WS_TABSTOP,111,30,313,249
- CONTROL "Show expert options",IDC_EXPERT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,284,102,10
+ CONTROL "Switch to simple options",IDC_MODERN,"Hyperlink",WS_TABSTOP,5,284,102,10
CTEXT "Please select a subentry from the list",IDC_STNOPAGE,111,30,313,251,SS_CENTERIMAGE
END
@@ -164,7 +164,7 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,212,283,50,14
PUSHBUTTON "Apply",IDC_APPLY,267,283,50,14
CONTROL "",IDC_TAB,"SysTabControl32",NOT WS_VISIBLE | WS_TABSTOP,4,32,313,249
- CONTROL "Show expert options",IDC_EXPERT,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,347,254,62,10
+ CONTROL "Switch to simple options",IDC_MODERN,"Hyperlink",WS_TABSTOP,347,254,62,10
CTEXT "Please select a subentry from the list",IDC_STNOPAGE,4,30,313,251,SS_CENTERIMAGE
CONTROL "",IDC_PAGETREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_NOHSCROLL | NOT WS_VISIBLE | WS_BORDER | WS_TABSTOP,347,86,52,137
END
|