fixes #4129 (Страница настроек записи истории чатов в файл)

3 files changed, 30 insertions, 39 deletions

diff --git a/plugins/TabSRMM/res/chat.rc b/plugins/TabSRMM/res/chat.rc
index 83368eeed1..0431c30814 100644
--- a/plugins/TabSRMM/res/chat.rc
+++ b/plugins/TabSRMM/res/chat.rc
@@ -36,8 +36,8 @@ BEGIN
     CONTROL         "",IDC_SRMM_LOG,"RichEdit50W",WS_VSCROLL | 0x944,8,23,164,72,WS_EX_STATICEDGE

     LISTBOX         IDC_SRMM_NICKLIST,182,98,69,42,LBS_MULTIPLESEL | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | NOT WS_BORDER | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE

     CONTROL         "",IDC_PANELSPLITTER,"Static",SS_ENHMETAFILE,0,32,252,1,WS_EX_TRANSPARENT

-    CONTROL         "",IDC_SRMM_QUOTE,"RichEdit50W",ES_AUTOHSCROLL | WS_DISABLED | WS_BORDER | WS_TABSTOP,0,95,235,16

-    CONTROL         "",IDC_SRMM_CLOSEQUOTE,"MButtonClass", WS_TABSTOP,237,97,16,16

+    CONTROL         "",IDC_SRMM_QUOTE,"RichEdit50W",WS_DISABLED | WS_BORDER | WS_TABSTOP | 0x80,0,95,235,16

+    CONTROL         "",IDC_SRMM_CLOSEQUOTE,"MButtonClass",WS_TABSTOP,237,97,16,16

 END

 

 IDD_FILTER DIALOG 0, 0, 201, 126

@@ -96,7 +96,7 @@ BEGIN
     EDITTEXT        IDC_AUTOCOMPLETE,191,208,102,14,ES_AUTOHSCROLL

 END

 

-IDD_OPTIONS2 DIALOGEX 0, 0, 306, 209

+IDD_OPTIONS2 DIALOGEX 0, 0, 306, 214

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

@@ -121,12 +121,27 @@ BEGIN
     LTEXT           "Maximum number of events in the message window",IDC_STATIC,10,142,225,11

     EDITTEXT        IDC_LOGLIMIT,247,139,29,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

     CONTROL         "Spin1",IDC_CHAT_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,276,139,11,14

-    LTEXT           "Group chat nick list row height (pixels)",IDC_STATIC_ULIST,10,161,221,8

-    EDITTEXT        IDC_NICKROW2,247,158,29,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "",IDC_CHAT_SPIN3,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,275,158,11,14

+    LTEXT           "Group chat nick list row height (pixels)",IDC_STATIC_ULIST,10,166,221,8

+    EDITTEXT        IDC_NICKROW2,247,165,29,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

+    CONTROL         "",IDC_CHAT_SPIN3,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,275,165,11,14

     PUSHBUTTON      "Open log file base folder",IDC_MUC_OPENLOGBASEDIR,16,76,155,14

-    COMBOBOX        IDC_LOGICONTYPE,12,189,171,38,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-    LTEXT           "Line markers in the message log",IDC_STATIC,10,178,276,10

+    COMBOBOX        IDC_LOGICONTYPE,35,195,171,38,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+    LTEXT           "Line markers in the message log",IDC_STATIC,10,182,276,8

+END

+

+IDD_OPTIONS3 DIALOGEX 0, 0, 306, 209

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+EXSTYLE WS_EX_CONTROLPARENT

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

+BEGIN

+    GROUPBOX        "Log files",IDC_STATIC,1,2,299,95

+    CONTROL         "Enable logging to disk",IDC_LOGGING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,14,277,10

+    LTEXT           "Log directory",IDC_STATIC110,17,27,211,8

+    EDITTEXT        IDC_LOGDIRECTORY,15,38,211,14,ES_AUTOHSCROLL

+    PUSHBUTTON      "...",IDC_FONTCHOOSE,230,39,19,14

+    LTEXT           "Split into files (in KB)",IDC_STATIC112,17,62,159,11

+    EDITTEXT        IDC_LIMIT,230,59,38,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

+    CONTROL         "",IDC_CHAT_SPIN4,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,261,57,11,14

 END

 

 IDD_OPTIONS4 DIALOGEX 0, 0, 306, 230

@@ -180,15 +195,8 @@ BEGIN
     BEGIN

         LEFTMARGIN, 1

         RIGHTMARGIN, 295

-        VERTGUIDE, 10

-        VERTGUIDE, 60

-        VERTGUIDE, 286

         TOPMARGIN, 1

-        BOTTOMMARGIN, 189

-        HORZGUIDE, 107

-        HORZGUIDE, 126

-        HORZGUIDE, 146

-        HORZGUIDE, 150

+        BOTTOMMARGIN, 207

     END

 END

 #endif    // APSTUDIO_INVOKED

@@ -226,26 +234,11 @@ END
 // AFX_DIALOG_LAYOUT

 //

 

-IDD_OPTIONS3 AFX_DIALOG_LAYOUT

-BEGIN

-    0

-END

-

 IDD_OPTIONS2 AFX_DIALOG_LAYOUT

 BEGIN

     0

 END

 

-IDD_OPTIONS1 AFX_DIALOG_LAYOUT

-BEGIN

-    0

-END

-

-IDD_CHANNEL AFX_DIALOG_LAYOUT

-BEGIN

-    0

-END

-

 #endif    // Neutral resources

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

 

diff --git a/plugins/TabSRMM/src/chat_options.cpp b/plugins/TabSRMM/src/chat_options.cpp
index 26ef4e6dad..4ceec3b968 100644
--- a/plugins/TabSRMM/src/chat_options.cpp
+++ b/plugins/TabSRMM/src/chat_options.cpp
@@ -570,7 +570,7 @@ class CChatLogOptionDlg : public CChatBaseOptionDlg
 

 public:

 	CChatLogOptionDlg() :

-		CChatBaseOptionDlg(IDD_OPTIONS2),

+		CChatBaseOptionDlg(Srmm_IsCustomLogUsed(true) ? IDD_OPTIONS3 : IDD_OPTIONS2),

 		m_timer(this, 1),

 		btnBaseDir(this, IDC_MUC_OPENLOGBASEDIR),

 		chkLogging(this, IDC_LOGGING),

@@ -895,11 +895,9 @@ void Chat_Options(WPARAM wParam)
 	odp.pDialog = new CChatSettingsDlg();

 	g_plugin.addOptions(wParam, &odp);

 

-	if (!Srmm_IsCustomLogUsed(true)) {

-		odp.szTab.a = LPGEN("Log formatting");

-		odp.pDialog = new CChatLogOptionDlg();

-		g_plugin.addOptions(wParam, &odp);

-	}

+	odp.szTab.a = LPGEN("Log formatting");

+	odp.pDialog = new CChatLogOptionDlg();

+	g_plugin.addOptions(wParam, &odp);

 

 	odp.szTab.a = LPGEN("Highlighting");

 	odp.pDialog = new CHighlighOptionDlg();

diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h
index 36d480b7a9..f19e263635 100644
--- a/plugins/TabSRMM/src/resource.h
+++ b/plugins/TabSRMM/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Visual C++ generated include file.

-// Used by W:\miranda-ng\plugins\TabSRMM\res\resource.rc

+// Used by W:\miranda-ng\plugins\TabSRMM\res\chat.rc

 //

 #define VS_VERSION_INFO                 1

 #define IDD_TEMPLATEEDIT                1

@@ -697,7 +697,7 @@
 // 

 #ifdef APSTUDIO_INVOKED

 #ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        108

+#define _APS_NEXT_RESOURCE_VALUE        109

 #define _APS_NEXT_COMMAND_VALUE         40001

 #define _APS_NEXT_CONTROL_VALUE         1000

 #define _APS_NEXT_SYMED_VALUE           101