diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-10 14:46:58 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-10 14:46:58 +0000 |
| commit | 101ca36412b3e7b8851b6b48a4f6cbc17d9f9eff (patch) | |
| tree | a846c60f7c2a7df17b694deba92e7f6df3bbb882 /plugins/WhenWasIt | |
| parent | a3fdadd09f12f6b246b11a5156bf6f0358e9a5f8 (diff) | |
bitmap operations were removed from TopToolBar and replaced with IcoLib
git-svn-id: http://svn.miranda-ng.org/main/trunk@379 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/WhenWasIt')
| -rw-r--r-- | plugins/WhenWasIt/WhenWasIt.rc | 24 | ||||
| -rw-r--r-- | plugins/WhenWasIt/hooked_events.cpp | 12 | ||||
| -rw-r--r-- | plugins/WhenWasIt/icons/check.bmp | bin | 726 -> 0 bytes | |||
| -rw-r--r-- | plugins/WhenWasIt/resource.h | 6 |
4 files changed, 13 insertions, 29 deletions
diff --git a/plugins/WhenWasIt/WhenWasIt.rc b/plugins/WhenWasIt/WhenWasIt.rc index afe6a7cb4a..97acb82865 100644 --- a/plugins/WhenWasIt/WhenWasIt.rc +++ b/plugins/WhenWasIt/WhenWasIt.rc @@ -27,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -159,7 +159,7 @@ END //
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
IDD_OPT_WWI, DIALOG
BEGIN
@@ -243,25 +243,18 @@ IDI_EXPORT_BIRTHDAYS ICON "icons\\export.ico" /////////////////////////////////////////////////////////////////////////////
//
-// Bitmap
-//
-
-IDB_TTB_CHECK BITMAP "icons\\check.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
// Dialog Info
//
IDD_ADD_BIRTHDAY DLGINIT
BEGIN
IDC_COMPATIBILITY, 0x403, 16, 0
-0x7250, 0x746f, 0x636f, 0x6c6f, 0x6d20, 0x646f, 0x6c75, 0x0065,
+0x7250, 0x746f, 0x636f, 0x6c6f, 0x6d20, 0x646f, 0x6c75, 0x0065,
IDC_COMPATIBILITY, 0x403, 19, 0
-0x7355, 0x7265, 0x6544, 0x6174, 0x6c69, 0x2073, 0x6f6d, 0x7564, 0x656c,
-"\000"
+0x7355, 0x7265, 0x6544, 0x6174, 0x6c69, 0x2073, 0x6f6d, 0x7564, 0x656c,
+"\000"
IDC_COMPATIBILITY, 0x403, 17, 0
-0x426d, 0x7269, 0x6874, 0x6164, 0x2079, 0x6f6d, 0x7564, 0x656c, "\000"
+0x426d, 0x7269, 0x6874, 0x6164, 0x2079, 0x6f6d, 0x7564, 0x656c, "\000"
0
END
@@ -279,4 +272,3 @@ END /////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/plugins/WhenWasIt/hooked_events.cpp b/plugins/WhenWasIt/hooked_events.cpp index 20e9bfc86d..e24e642612 100644 --- a/plugins/WhenWasIt/hooked_events.cpp +++ b/plugins/WhenWasIt/hooked_events.cpp @@ -84,7 +84,6 @@ int UnhookEvents() UnhookEvent(hExtraImageApply);
UnhookEvent(hContactSettingChanged);
UnhookEvent(hTopToolBarModuleLoaded);
- //UnhookEvent(hContactSendMessage);
KillTimers();
@@ -158,8 +157,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) cl.pszName = "Add/change user &birthday";
hmAddChangeBirthday = (HANDLE) CallService(MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM) &cl);
- if(ServiceExists(MS_HOTKEY_REGISTER))
- {
+ if(ServiceExists(MS_HOTKEY_REGISTER)) {
HOTKEYDESC hotkey = {0};
hotkey.cbSize = sizeof(hotkey);
hotkey.dwFlags = HKD_TCHAR;
@@ -185,13 +183,9 @@ int OnTopToolBarModuleLoaded(WPARAM wParam, LPARAM lParam) ttb.cbSize = sizeof(TTBButton);
ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP;
ttb.pszServiceDown = MS_WWI_CHECK_BIRTHDAYS;
- HBITMAP bitmap = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TTB_CHECK));
- ttb.hbBitmapUp = (HBITMAP) bitmap;
- ttb.hbBitmapDown = (HBITMAP) bitmap;
- ttb.name = Translate("Check for birthdays");
+ ttb.hIconUp = ttb.hIconDn = hiCheckMenu;
+ ttb.name = "Check for birthdays";
CallService(MS_TTB_ADDBUTTON, (WPARAM) &ttb, 0);
- //DeleteObject(icon);
-
return 0;
}
diff --git a/plugins/WhenWasIt/icons/check.bmp b/plugins/WhenWasIt/icons/check.bmp Binary files differdeleted file mode 100644 index cf430c8c6d..0000000000 --- a/plugins/WhenWasIt/icons/check.bmp +++ /dev/null diff --git a/plugins/WhenWasIt/resource.h b/plugins/WhenWasIt/resource.h index d04aaf378f..e43831ac79 100644 --- a/plugins/WhenWasIt/resource.h +++ b/plugins/WhenWasIt/resource.h @@ -20,9 +20,7 @@ #define IDI_DTB0 117
#define IDI_DTBMORE 118
#define IDD_ADD_BIRTHDAY 119
-#define IDI_ICON1 120
-#define IDI_ADD 120
-#define IDB_TTB_CHECK 122
+#define IDI_ADD 121
#define IDI_REFRESH_USERDETAILS 123
#define IDI_IMPORT 125
#define IDI_IMPORT_BIRTHDAYS 125
@@ -70,7 +68,7 @@ #define IDC_OPENINBACKGROUND 1047
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 129
|
