From 3f2bbb2b1f230f599b196e7014a40685b2507a73 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 19 Apr 2023 17:31:57 +0300 Subject: =?UTF-8?q?fixes=20#3493=20(ICQ:=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=B8=20=D0=BE=D0=BF=D1=86=D0=B8=D1=8E=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=20=D0=B2=D1=81=D0=BF=D0=BB=D1=8B=D0=B2=D0=B0?= =?UTF-8?q?=D1=8E=D1=89=D0=B8=D0=B5=20=D0=BE=D0=BA=D0=BD=D0=B0=20=D0=BE?= =?UTF-8?q?=D0=B1=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=D1=85=20=D0=B2=20?= =?UTF-8?q?"=D0=A1=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protocols/ICQ-WIM/res/resources.rc | 9 ++++----- protocols/ICQ-WIM/src/proto.cpp | 2 ++ protocols/ICQ-WIM/src/proto.h | 12 +++++++----- protocols/ICQ-WIM/src/version.h | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) (limited to 'protocols/ICQ-WIM') 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 m_szOwnId; // our own aim id - CMOption m_bHideGroupchats; // don't pop up group chat windows on startup - CMOption m_bUseTrayIcon; // use tray icon notifications - CMOption m_bErrorPopups; // display popups with errors - CMOption m_bLaunchMailbox; // launch browser to view email + CMOption m_szOwnId; // our own aim id + + CMOption m_bHideGroupchats; // don't pop up group chat windows on startup + CMOption m_bUseTrayIcon; // use tray icon notifications + CMOption m_bErrorPopups; // display popups with errors + CMOption m_bLaunchMailbox; // launch browser to view email + CMOption m_iTimeDiff1; // set this status to m_iStatus1 after this interval of secs CMOption m_iStatus1; CMOption 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 -- cgit v1.2.3