patch for eliminating expert mode in options (to replace the simple mode with ModernOpts)

git-svn-id: http://svn.miranda-ng.org/main/trunk@2025 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 2 insertions, 13 deletions

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;

 }