diff options
| author | George Hazan <ghazan@miranda.im> | 2018-12-28 15:10:49 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-12-28 15:10:57 +0300 |
| commit | bf902e3aa18387158d0593ae2ae57eaf0f35b8be (patch) | |
| tree | fc6a9c479bd1915118f80a14ca02412b53fe9ee3 | |
| parent | 6e0d3b81517f36725d2edbffcadd3e5e1ad92438 (diff) | |
IEView:
- fixes #1679 (IEView: account's duplicates)
- code cleaning
- version bump
| -rw-r--r-- | plugins/IEView/src/Options.cpp | 34 | ||||
| -rw-r--r-- | plugins/IEView/src/version.h | 2 |
2 files changed, 15 insertions, 21 deletions
diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp index 874438be12..b4dc6a1f85 100644 --- a/plugins/IEView/src/Options.cpp +++ b/plugins/IEView/src/Options.cpp @@ -388,7 +388,6 @@ static void MarkInitialized(int i) static void ApplyChanges(int i)
{
changed &= ~i;
- initialized &= ~i;
if (changed == 0) {
Options::saveProtocolSettings();
NotifyEventHooks(hHookOptionsChanged, 0, 0);
@@ -915,19 +914,6 @@ static INT_PTR CALLBACK IEViewGroupChatsOptDlgProc(HWND hwndDlg, UINT msg, WPARA /////////////////////////////////////////////////////////////////////////////////////////
-struct
-{
- DLGPROC dlgProc;
- DWORD dlgId;
- wchar_t *tabName;
-}
-static tabPages[] =
-{
- { IEViewSRMMOptDlgProc, IDD_SRMM_OPTIONS, LPGENW("Message Log") },
- { IEViewGroupChatsOptDlgProc, IDD_SRMM_OPTIONS, LPGENW("Group chats") },
- { IEViewHistoryOptDlgProc, IDD_SRMM_OPTIONS, LPGENW("History") }
-};
-
int IEViewOptInit(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = {};
@@ -941,12 +927,20 @@ int IEViewOptInit(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Skins");
odp.szTitle.w = LPGENW("IEView");
- for (auto &it : tabPages) {
- odp.pszTemplate = MAKEINTRESOURCEA(it.dlgId);
- odp.pfnDlgProc = it.dlgProc;
- odp.szTab.w = it.tabName;
- g_plugin.addOptions(wParam, &odp);
- }
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_SRMM_OPTIONS);
+ odp.pfnDlgProc = IEViewSRMMOptDlgProc;
+ odp.szTab.w = LPGENW("Message Log");
+ g_plugin.addOptions(wParam, &odp);
+
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_SRMM_OPTIONS);
+ odp.pfnDlgProc = IEViewGroupChatsOptDlgProc;
+ odp.szTab.w = LPGENW("Group chats");
+ g_plugin.addOptions(wParam, &odp);
+
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_SRMM_OPTIONS);
+ odp.pfnDlgProc = IEViewHistoryOptDlgProc;
+ odp.szTab.w = LPGENW("History");
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/IEView/src/version.h b/plugins/IEView/src/version.h index a677900d4f..a50cad8dad 100644 --- a/plugins/IEView/src/version.h +++ b/plugins/IEView/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 1 #define __MINOR_VERSION 6 #define __RELEASE_NUM 0 -#define __BUILD_NUM 1 +#define __BUILD_NUM 2 #include <stdver.h> |