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

6 files changed, 73 insertions, 15 deletions

diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc
index 05ae67321d..bf7dfc57b8 100644
--- a/plugins/Scriver/res/resource.rc
+++ b/plugins/Scriver/res/resource.rc
@@ -105,6 +105,23 @@ BEGIN
     LTEXT           "You can use embedded variables here: %name% for contact's name, %status% for its status, %statusmsg% for its status message and %account% for its account's name",IDC_STATIC,17,38,279,25

 END

 

+IDD_OPT_MSGHIST DIALOGEX 2, 0, 304, 221

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+EXSTYLE WS_EX_CONTROLPARENT

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

+BEGIN

+    GROUPBOX        "Preload",IDC_STATIC,0,3,304,50

+    CONTROL         "Unread events only",IDC_LOADUNREAD,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,14,138,10

+    CONTROL         "Last",IDC_LOADCOUNT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,26,138,10

+    CONTROL         "Events in the last",IDC_LOADTIME,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,39,138,8

+    EDITTEXT        IDC_LOADCOUNTN,150,24,33,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 | WS_DISABLED,176,23,10,14

+    LTEXT           "events",IDC_LOADCOUNTTEXT2,185,26,90,10,WS_DISABLED

+    EDITTEXT        IDC_LOADTIMEN,150,37,33,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,175,35,11,14

+    LTEXT           "minutes",IDC_STMINSOLD,185,39,90,8,WS_DISABLED

+END

+

 IDD_OPT_MSGLOG DIALOGEX 2, 0, 304, 221

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

@@ -125,6 +142,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,45,140,10

     CONTROL         "Show lines between messages",IDC_DRAWLINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,56,120,10

     CONTROL         "Indent text",IDC_INDENTTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,67,102,10

+    CONTROL         "Automatically copy selected text",IDC_AUTOCOPY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,79,140,10

     EDITTEXT        IDC_INDENTSIZE,262,66,33,12,ES_RIGHT | ES_NUMBER | WS_DISABLED

     CONTROL         "Spin1",IDC_INDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,290,66,10,12

     CONTROL         "Customize fonts and colors",IDC_FONTSCOLORS,"Hyperlink",0x0,8,78,142,8

@@ -139,7 +157,6 @@ BEGIN
     EDITTEXT        IDC_LOADTIMEN,150,200,33,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,175,200,11,14

     LTEXT           "minutes",IDC_STMINSOLD,185,202,90,8,WS_DISABLED

-    CONTROL         "Automatically copy selected text",IDC_AUTOCOPY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,79,140,10

 END

 

 IDD_OPT_MSGTYPE DIALOGEX 0, 0, 283, 252

@@ -312,6 +329,10 @@ BEGIN
     BEGIN

     END

 

+    IDD_OPT_MSGHIST, DIALOG

+    BEGIN

+    END

+

     IDD_OPT_MSGLOG, DIALOG

     BEGIN

         BOTTOMMARGIN, 218

@@ -490,6 +511,7 @@ IDI_SECURE              ICON                    "unverified.ico"
 

 IDI_STRONG              ICON                    "private.ico"

 

+

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

 //

 // Cursor

@@ -550,6 +572,11 @@ BEGIN
     0

 END

 

+IDD_OPT_MSGHIST AFX_DIALOG_LAYOUT

+BEGIN

+    0

+END

+

 #endif    // Neutral resources

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

 

diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index 2a1975e5e6..9e60d96540 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -532,8 +532,8 @@ class CLogOptionsDlg : public CBaseOptionDlg
 	}

 

 public:

-	CLogOptionsDlg() :

-		CBaseOptionDlg(IDD_OPT_MSGLOG),

+	CLogOptionsDlg(int iDlgId) :

+		CBaseOptionDlg(iDlgId),

 		m_rtf(this, IDC_SRMM_LOG),

 		m_fonts(this, IDC_FONTSCOLORS),

 		chkLoadTime(this, IDC_LOADTIME),

@@ -805,11 +805,9 @@ int OptInitialise(WPARAM wParam, LPARAM)
 	odp.szTab.a = LPGEN("Layout");

 	g_plugin.addOptions(wParam, &odp);

 

-	if (!Srmm_IsCustomLogUsed()) {

-		odp.pDialog = new CLogOptionsDlg();

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

-		g_plugin.addOptions(wParam, &odp);

-	}

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

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

+	g_plugin.addOptions(wParam, &odp);

 

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

 	odp.szGroup.a = LPGEN("Message sessions");

diff --git a/plugins/Scriver/src/resource.h b/plugins/Scriver/src/resource.h
index fc0864d5c6..997cb99440 100644
--- a/plugins/Scriver/src/resource.h
+++ b/plugins/Scriver/src/resource.h
@@ -10,6 +10,7 @@
 #define IDD_INFOBAR                     104

 #define IDD_OPT_MSGDLG                  111

 #define IDD_OPT_MSGLOG                  112

+#define IDD_OPT_MSGHIST                 113

 #define IDD_OPT_MSGTYPE                 114

 #define IDD_OPT_MSGTABS                 115

 #define IDD_OPT_LAYOUT                  116

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