diff options
Diffstat (limited to 'plugins/RecentContacts')
| -rw-r--r-- | plugins/RecentContacts/RecentContacts.cpp | 23 | ||||
| -rw-r--r-- | plugins/RecentContacts/RecentContacts.ico | bin | 23542 -> 2550 bytes | |||
| -rw-r--r-- | plugins/RecentContacts/resource.h | 6 | ||||
| -rw-r--r-- | plugins/RecentContacts/resource.rc | 24 |
4 files changed, 18 insertions, 35 deletions
diff --git a/plugins/RecentContacts/RecentContacts.cpp b/plugins/RecentContacts/RecentContacts.cpp index af3a21f501..cbb77d8491 100644 --- a/plugins/RecentContacts/RecentContacts.cpp +++ b/plugins/RecentContacts/RecentContacts.cpp @@ -14,16 +14,11 @@ int hLangpack = 0; MM_INTERFACE mmi;
LIST_INTERFACE li;
-HANDLE hMenu = NULL;
-HANDLE hPrebuildMenu = NULL;
-HANDLE hSystemModulesLoaded = NULL;
-HANDLE hTopToolbarLoaded = NULL;
-HANDLE hTopToolbarButtonShowList = NULL;
-HANDLE hMsgWndEvent = NULL;
-HANDLE hWindowList = NULL;
-HANDLE hMenuItemRemove = NULL;
-HANDLE hOptInitialise = NULL;
-HANDLE hContactSetting = NULL;
+HANDLE hTopToolbarButtonShowList;
+HANDLE hMsgWndEvent;
+HANDLE hWindowList;
+HANDLE hMenuItemRemove;
+HANDLE hIcon;
const INT_PTR boo = 0;
LIST<void> ServiceList(10,boo), HookList(10,boo);
@@ -466,10 +461,8 @@ int Create_TopToolbarShowList(WPARAM wParam, LPARAM lParam) if (ServiceExists(MS_TTB_ADDBUTTON)) {
TTBButton ttbb = { 0 };
ttbb.cbSize = sizeof(ttbb);
- ttbb.hbBitmapUp =
- ttbb.hbBitmapDown = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_CMD_SHOWLASTUSED));
- ttbb.pszServiceUp =
- ttbb.pszServiceDown = msLastUC_ShowList;
+ ttbb.hIconHandleDn = ttbb.hIconHandleDn = hIcon;
+ ttbb.pszServiceUp = ttbb.pszServiceDown = msLastUC_ShowList;
ttbb.dwFlags = TTBBF_VISIBLE|TTBBF_SHOWTOOLTIP|TTBBF_DRAWBORDER;
ttbb.name = Translate(msLastUC_ShowListName);
@@ -540,7 +533,7 @@ static void iconsInit(void) sid.pszDescription = LPGEN("Main icon");
sid.pszName = "recent_main";
sid.iDefaultIndex = -IDI_SHOWRECENT;
- CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);
+ hIcon = Skin_AddIcon(&sid);
}
static int OnPrebuildContactMenu (WPARAM wParam, LPARAM lParam)
diff --git a/plugins/RecentContacts/RecentContacts.ico b/plugins/RecentContacts/RecentContacts.ico Binary files differindex 765c18bb73..25efdf36ab 100644 --- a/plugins/RecentContacts/RecentContacts.ico +++ b/plugins/RecentContacts/RecentContacts.ico diff --git a/plugins/RecentContacts/resource.h b/plugins/RecentContacts/resource.h index 93dc6a4a6f..59e47a934a 100644 --- a/plugins/RecentContacts/resource.h +++ b/plugins/RecentContacts/resource.h @@ -4,10 +4,8 @@ //
#define IDD_LASTUC_OPT 9
#define IDI_FOLDER 101
-#define IDB_FOLDER 102
-#define IDI_CMD_BROWSE 103
+#define IDI_CMD_BROWSE 102
#define IDI_SHOWRECENT 103
-#define IDB_CMD_SHOWLASTUSED 104
#define IDD_LASTUC_DIALOG 105
#define IDC_LIST1 1000
#define IDC_CONTACTS_LIST 1000
@@ -16,7 +14,7 @@ #define IDC_DATETIME 1005
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 106
diff --git a/plugins/RecentContacts/resource.rc b/plugins/RecentContacts/resource.rc index 7656a189e4..463d9f0a76 100644 --- a/plugins/RecentContacts/resource.rc +++ b/plugins/RecentContacts/resource.rc @@ -23,26 +23,19 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /////////////////////////////////////////////////////////////////////////////
//
-// Bitmap
-//
-
-IDB_CMD_SHOWLASTUSED BITMAP "RecentContacts.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
// Dialog
//
IDD_LASTUC_DIALOG DIALOGEX 0, 0, 150, 200
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU |
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
EXSTYLE WS_EX_TOOLWINDOW
CAPTION "Recent Contacts"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- CONTROL "",IDC_CONTACTS_LIST,"SysListView32",LVS_REPORT |
- LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS |
- LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER |
+ CONTROL "",IDC_CONTACTS_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS |
+ LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER |
WS_TABSTOP,0,0,150,200
END
@@ -65,18 +58,18 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN // 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"
@@ -133,7 +126,7 @@ IDI_SHOWRECENT ICON "RecentContacts.ico" //
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
IDD_LASTUC_OPT, DIALOG
BEGIN
@@ -161,4 +154,3 @@ END /////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
|