From 502dd9bb0fb526ceb0a7068a2cb2e693f8fd2b76 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Wed, 2 Jan 2013 11:03:07 +0000 Subject: same as PluginUpdater git-svn-id: http://svn.miranda-ng.org/main/trunk@2901 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/PackUpdater/Src/Options.cpp | 34 ++++------------------------------ plugins/PackUpdater/Src/Version.h | 2 +- 2 files changed, 5 insertions(+), 31 deletions(-) (limited to 'plugins') diff --git a/plugins/PackUpdater/Src/Options.cpp b/plugins/PackUpdater/Src/Options.cpp index 66556c2d4b..d0a2b416d6 100644 --- a/plugins/PackUpdater/Src/Options.cpp +++ b/plugins/PackUpdater/Src/Options.cpp @@ -200,9 +200,7 @@ INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) CheckDlgButton(hdlg, IDC_USEPOPUPCOLORS, BST_CHECKED); CheckDlgButton(hdlg, IDC_USEWINCOLORS, BST_UNCHECKED); } - SendDlgItemMessage(hdlg, (42071), CPM_SETCOLOUR, 0, PopupsList[0].colorBack); - SendDlgItemMessage(hdlg, (41071), CPM_SETCOLOUR, 0, PopupsList[0].colorText); - for (i = 1; i < POPUPS; i++) + for (i = 0; i < POPUPS; i++) { SendDlgItemMessage(hdlg, (i+42071), CPM_SETCOLOUR, 0, PopupsList[i].colorBack); SendDlgItemMessage(hdlg, (i+41071), CPM_SETCOLOUR, 0, PopupsList[i].colorText); @@ -234,32 +232,18 @@ INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) EnableWindow(GetDlgItem(hdlg, (i+1024)), TRUE); } if (!(DBGetContactSettingDword(NULL, "PopUp", "Actions", 0) & 1) || !ServiceExists(MS_POPUP_REGISTERACTIONS)) - { EnableWindow(GetDlgItem(hdlg, (40071)), FALSE); - EnableWindow(GetDlgItem(hdlg, (41071)), FALSE); - EnableWindow(GetDlgItem(hdlg, (42071)), FALSE); - } else - { EnableWindow(GetDlgItem(hdlg, (40071)), TRUE); - EnableWindow(GetDlgItem(hdlg, (41071)), (MyOptions.DefColors == byCOLOR_OWN)); - EnableWindow(GetDlgItem(hdlg, (42071)), (MyOptions.DefColors == byCOLOR_OWN)); - } + return TRUE; } case WM_SHOWWINDOW: if (!(DBGetContactSettingDword(NULL, "PopUp", "Actions", 0) & 1) || !ServiceExists(MS_POPUP_REGISTERACTIONS)) - { EnableWindow(GetDlgItem(hdlg, (40071)), FALSE); - EnableWindow(GetDlgItem(hdlg, (41071)), FALSE); - EnableWindow(GetDlgItem(hdlg, (42071)), FALSE); - } else - { EnableWindow(GetDlgItem(hdlg, (40071)), TRUE); - EnableWindow(GetDlgItem(hdlg, (41071)), (MyOptions.DefColors == byCOLOR_OWN)); - EnableWindow(GetDlgItem(hdlg, (42071)), (MyOptions.DefColors == byCOLOR_OWN)); - } + return TRUE; case WM_COMMAND: { @@ -301,17 +285,7 @@ INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) break; MyOptions.DefColors = byCOLOR_OWN; bEnableOthers = TRUE; - if (!(DBGetContactSettingDword(NULL, "PopUp", "Actions", 0) & 1) || !ServiceExists(MS_POPUP_REGISTERACTIONS)) - { - EnableWindow(GetDlgItem(hdlg, (41071)), FALSE); - EnableWindow(GetDlgItem(hdlg, (42071)), FALSE); - } - else - { - EnableWindow(GetDlgItem(hdlg, (41071)), bEnableOthers); - EnableWindow(GetDlgItem(hdlg, (42071)), bEnableOthers); - } - for (i = 1; i < POPUPS; i++) + for (i = 0; i < POPUPS; i++) { EnableWindow(GetDlgItem(hdlg, (i+42071)), bEnableOthers); //Background EnableWindow(GetDlgItem(hdlg, (i+41071)), bEnableOthers); //Text diff --git a/plugins/PackUpdater/Src/Version.h b/plugins/PackUpdater/Src/Version.h index e16ce1f9ef..5fa646e5eb 100644 --- a/plugins/PackUpdater/Src/Version.h +++ b/plugins/PackUpdater/Src/Version.h @@ -10,7 +10,7 @@ #define __STRINGIFY(x) __STRINGIFY_IMPL(x) #define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) -#define __PLUGIN_NAME "PackUpdater" +#define __PLUGIN_NAME "Pack Updater" #define __INTERNAL_NAME "PackUpdater" #define __FILENAME "PackUpdater.dll" #define __DESCRIPTION "Simple updater for Miranda IM premodified packs." -- cgit v1.2.3