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, 7 insertions, 16 deletions

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" );