fixes #3694 (tabSRMM: при выборе стороннего журнала пропадает вкладка "Журнал")

3 files changed, 39 insertions, 7 deletions

diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc
index 8574810ef4..3a8cbeb984 100644
--- a/plugins/TabSRMM/res/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -219,6 +219,25 @@ BEGIN
     PUSHBUTTON      "Reset all hidden warnings",IDC_RESETWARNINGS,144,206,153,15

 END

 

+IDD_OPT_MSGHIST DIALOGEX 0, 0, 303, 75

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+EXSTYLE WS_EX_CONTROLPARENT

+FONT 8, "MS Shell Dlg", 0, 0, 0x1

+BEGIN

+    CONTROL         "Load unread events only",IDC_LOADUNREAD,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,10,135,10

+    CONTROL         "Load number of previous events",IDC_LOADCOUNT,"Button",BS_AUTORADIOBUTTON,10,24,138,10

+    CONTROL         "Load previous events less than",IDC_LOADTIME,"Button",BS_AUTORADIOBUTTON,10,38,138,10

+    CONTROL         "Always trim message log to",IDC_ALWAYSTRIM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,52,146,10

+    EDITTEXT        IDC_LOADCOUNTN,164,21,39,12,ES_RIGHT | ES_NUMBER | WS_DISABLED

+    CONTROL         "Spin1",IDC_LOADCOUNTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,203,20,10,14

+    EDITTEXT        IDC_LOADTIMEN,164,36,39,12,ES_RIGHT | ES_NUMBER | WS_DISABLED

+    CONTROL         "Spin1",IDC_LOADTIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,201,34,11,14

+    EDITTEXT        IDC_TRIM,164,51,39,12,ES_RIGHT | ES_NUMBER | WS_DISABLED

+    CONTROL         "",IDC_TRIMSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,200,49,10,14

+    LTEXT           "events",IDC_STATIC,210,52,82,8

+    LTEXT           "minutes old",IDC_STMINSOLD,210,38,83,8,WS_DISABLED

+END

+

 IDD_OPT_MSGLOG DIALOGEX 0, 0, 303, 226

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

@@ -755,6 +774,7 @@ END
 // remains consistent on all systems.

 IDI_FEATURE_DISABLED    ICON                    "overlay_disabled.ico"

 

+

 /////////////////////////////////////////////////////////////////////////////

 //

 // DESIGNINFO

@@ -773,6 +793,10 @@ BEGIN
         HORZGUIDE, 163

     END

 

+    IDD_OPT_MSGHIST, DIALOG

+    BEGIN

+    END

+

     IDD_OPT_TYPINGNOTIFYPOPUP, DIALOG

     BEGIN

     END

@@ -865,6 +889,11 @@ BEGIN
     0

 END

 

+IDD_OPT_MSGHIST AFX_DIALOG_LAYOUT

+BEGIN

+    0

+END

+

 #endif    // Neutral resources

 /////////////////////////////////////////////////////////////////////////////

 

diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index 2d22090b74..52b53456e9 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -742,8 +742,8 @@ class COptLogDlg : public CDlgBase
 	// party plugin.

 

 public:

-	COptLogDlg() :

-		CDlgBase(g_plugin, IDD_OPT_MSGLOG),

+	COptLogDlg(int iDlgId) :

+		CDlgBase(g_plugin, iDlgId),

 		logOpts(this, IDC_LOGOPTIONS),

 		btnModify(this, IDC_MODIFY),

 		btnRtlModify(this, IDC_RTLMODIFY),

@@ -888,6 +888,10 @@ public:
 	}

 };

 

+class COptHistDlg : public CDlgBase

+{

+};

+

 /////////////////////////////////////////////////////////////////////////////////////////

 // typing notify options

 

@@ -1480,11 +1484,9 @@ int OptInitialise(WPARAM wParam, LPARAM lParam)
 	odp.pDialog = new COptContainersDlg();

 	g_plugin.addOptions(wParam, &odp);

 

-	if (!Srmm_IsCustomLogUsed()) {

-		odp.szTab.a = LPGEN("Message log");

-		odp.pDialog = new COptLogDlg();

-		g_plugin.addOptions(wParam, &odp);

-	}

+	odp.szTab.a = LPGEN("Message log");

+	odp.pDialog = new COptLogDlg(Srmm_IsCustomLogUsed() ? IDD_OPT_MSGHIST : IDD_OPT_MSGLOG);

+	g_plugin.addOptions(wParam, &odp);

 

 	odp.szTab.a = LPGEN("Advanced tweaks");

 	odp.pDialog = new COptAdvancedDlg();

diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h
index 87036e4cc9..ef89b80bd7 100644
--- a/plugins/TabSRMM/src/resource.h
+++ b/plugins/TabSRMM/src/resource.h
@@ -53,6 +53,7 @@
 #define IDD_CHOOSESTATUSMODES           310

 #define IDD_SKINTABDIALOG               312

 #define IDD_OPT_SKIN                    313

+#define IDD_OPT_MSGHIST                 314

 #define IDD_OPTIONS_PLUS                333

 #define IDD_CHANNEL                     401

 #define IDD_OPTIONS1                    402