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

2 files changed, 0 insertions, 27 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__