diff options
Diffstat (limited to 'plugins')
36 files changed, 28 insertions, 122 deletions
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';
|