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

5 files changed, 2 insertions, 22 deletions

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;

 }