fixes #3493 (ICQ: перенести опцию про всплывающие окна об ошибках в "События")

4 files changed, 14 insertions, 11 deletions

diff --git a/protocols/ICQ-WIM/res/resources.rc b/protocols/ICQ-WIM/res/resources.rc
index 308e27c4ab..5fd755fdb6 100644
--- a/protocols/ICQ-WIM/res/resources.rc
+++ b/protocols/ICQ-WIM/res/resources.rc
@@ -92,7 +92,7 @@ BEGIN
     PUSHBUTTON      "Sign in/sign up using phone",IDC_REGISTER,42,34,142,14
 END
 
-IDD_OPTIONS_FULL DIALOGEX 0, 0, 310, 136
+IDD_OPTIONS_FULL DIALOGEX 0, 0, 310, 123
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -107,9 +107,8 @@ BEGIN
     CONTROL         "Use tray icon notifications",IDC_USETRAYICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,73,291,10
     CONTROL         "Launch mailbox in a browser on click",IDC_LAUNCH_MAILBOX,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,85,281,10
-    CONTROL         "Show error popups",IDC_SHOWERRORPOPUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,97,291,10
-    PUSHBUTTON      "Sign in/sign up using phone",IDC_REGISTER,165,117,142,14
-    GROUPBOX        "Notifications",IDC_STATIC,1,62,306,51
+    PUSHBUTTON      "Sign in/sign up using phone",IDC_REGISTER,165,104,142,14
+    GROUPBOX        "Notifications",IDC_STATIC,1,62,306,38
 END
 
 IDD_OPTIONS_ADV DIALOGEX 0, 0, 310, 86
@@ -201,7 +200,7 @@ BEGIN
 
     IDD_OPTIONS_FULL, DIALOG
     BEGIN
-        BOTTOMMARGIN, 131
+        BOTTOMMARGIN, 118
     END
 
     IDD_OPTIONS_ADV, DIALOG
diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp
index f96f388313..ce22e20bf1 100644
--- a/protocols/ICQ-WIM/src/proto.cpp
+++ b/protocols/ICQ-WIM/src/proto.cpp
@@ -62,6 +62,8 @@ CIcqProto::CIcqProto(const char *aProtoName, const wchar_t *aUserName) :
 

 	m_isMra = !stricmp(Proto_GetAccount(m_szModuleName)->szProtoName, "MRA");

 

+	g_plugin.addPopupOption(CMStringW(FORMAT, TranslateT("%s error notifications"), m_tszUserName), m_bErrorPopups);

+

 	// services

 	CreateProtoService(PS_GETAVATARCAPS, &CIcqProto::GetAvatarCaps);

 	CreateProtoService(PS_GETAVATARINFO, &CIcqProto::GetAvatarInfo);

diff --git a/protocols/ICQ-WIM/src/proto.h b/protocols/ICQ-WIM/src/proto.h
index 6da694e54b..307e3482cd 100644
--- a/protocols/ICQ-WIM/src/proto.h
+++ b/protocols/ICQ-WIM/src/proto.h
@@ -465,11 +465,13 @@ public:
 	CIcqProto(const char*, const wchar_t*);

 	~CIcqProto();

 

-	CMOption<wchar_t*> m_szOwnId;      // our own aim id

-	CMOption<uint8_t>  m_bHideGroupchats; // don't pop up group chat windows on startup

-	CMOption<uint8_t>  m_bUseTrayIcon;    // use tray icon notifications

-	CMOption<uint8_t>  m_bErrorPopups;    // display popups with errors

-	CMOption<uint8_t>  m_bLaunchMailbox;  // launch browser to view email

+	CMOption<wchar_t*> m_szOwnId;         // our own aim id

+

+	CMOption<bool>     m_bHideGroupchats; // don't pop up group chat windows on startup

+	CMOption<bool>     m_bUseTrayIcon;    // use tray icon notifications

+	CMOption<bool>     m_bErrorPopups;    // display popups with errors

+	CMOption<bool>     m_bLaunchMailbox;  // launch browser to view email

+

 	CMOption<uint32_t> m_iTimeDiff1;		  // set this status to m_iStatus1 after this interval of secs

 	CMOption<uint32_t> m_iStatus1;

 	CMOption<uint32_t> m_iTimeDiff2;		  // set this status to m_iStatus2 after this interval of secs

diff --git a/protocols/ICQ-WIM/src/version.h b/protocols/ICQ-WIM/src/version.h
index 054ddf673a..0ee16dc2df 100644
--- a/protocols/ICQ-WIM/src/version.h
+++ b/protocols/ICQ-WIM/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION          0

 #define __MINOR_VERSION          96

 #define __RELEASE_NUM            3

-#define __BUILD_NUM              1

+#define __BUILD_NUM              2

 

 #include <stdver.h>