summaryrefslogtreecommitdiff
path: root/protocols/YAMN/src
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2012-10-16 18:51:52 +0000
committerKirill Volinsky <mataes2007@gmail.com>2012-10-16 18:51:52 +0000
commit425a2a9cc185edbbf88b6347c84fbc895e52b761 (patch)
treec74d89ba45cde8d0c5eedcb305163011524ec00f /protocols/YAMN/src
parent6a1e41df84ea8a76894f263c2c4032273343d3cd (diff)
YAMN:
icons changes git-svn-id: http://svn.miranda-ng.org/main/trunk@1962 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/YAMN/src')
-rw-r--r--protocols/YAMN/src/main.cpp19
-rw-r--r--protocols/YAMN/src/resource.h8
-rw-r--r--protocols/YAMN/src/services.cpp3
3 files changed, 13 insertions, 17 deletions
diff --git a/protocols/YAMN/src/main.cpp b/protocols/YAMN/src/main.cpp
index 3bd2392936..916c80cc32 100644
--- a/protocols/YAMN/src/main.cpp
+++ b/protocols/YAMN/src/main.cpp
@@ -213,7 +213,7 @@ int SystemModulesLoaded(WPARAM, LPARAM)
mi.cbSize = sizeof(mi);
mi.position = 0xb0000000;
mi.flags = CMIF_ICONFROMICOLIB;
- mi.icolibItem = g_GetIconHandle(5);
+ mi.icolibItem = g_GetIconHandle(0);
mi.pszName = "Check &mail (All Account)";
mi.pszPopupName = NULL;//YAMN_DBMODULE;
mi.pszService = MS_YAMN_FORCECHECK;
@@ -224,7 +224,7 @@ int SystemModulesLoaded(WPARAM, LPARAM)
mi.pszService = MS_YAMN_CLISTCONTEXT;
hMenuItemCont = Menu_AddContactMenuItem(&mi);
- mi.icolibItem = g_GetIconHandle(4);
+ mi.icolibItem = g_GetIconHandle(1);
mi.pszName = "Launch application";
mi.pszContactOwner = YAMN_DBMODULE;
mi.pszService = MS_YAMN_CLISTCONTEXTAPP;
@@ -253,14 +253,11 @@ struct TIconListItem
static TIconListItem iconList[] =
{
- { LPGENT("Neutral"), "YAMN_Neutral", IDI_ONLINE, 0 },
- { LPGENT("YAMN"), "YAMN", IDI_ICOYAMN1, 0 },
- { LPGENT("New Mail"), "YAMN_NewMail", IDI_ICOYAMN2, 0 },
- { LPGENT("Connect Fail"), "YAMN_ConnectFail", IDI_NA, 0 },
- { LPGENT("Launch Application"), "YAMN_ApplExec", IDI_OCCUPIED, 0 },
- { LPGENT("TopToolBar UP"), "YAMN_TopToolBarUp", IDI_ICOTTBUP, 0 },
- { LPGENT("TopToolBar Down"), "YAMN_TopToolBarDown", IDI_OCCUPIED, 0 },
- { LPGENT("Offline"), "YAMN_Offline", IDI_OFFLINE, 0 }
+
+ {LPGENT("Check mail"), "YAMN_Check", IDI_CHECKMAIL, 0},
+ {LPGENT("Launch application"), "YAMN_Launch", IDI_LAUNCHAPP, 0},
+ {LPGENT("New Mail"), "YAMN_NewMail", IDI_NEWMAIL, 0},
+ {LPGENT("Connect Fail"), "YAMN_ConnectFail", IDI_BADCONNECT, 0},
};
static void LoadIcons()
@@ -277,7 +274,7 @@ static void LoadIcons()
for (int i = 0, k = 0; i < SIZEOF(iconList); i++)
{
sid.pszName = iconList[i].szName;
- sid.pszDescription = iconList[i].szDescr;
+ sid.ptszDescription = iconList[i].szDescr;
sid.iDefaultIndex = -iconList[i].defIconID;
iconList[i].hIcon = Skin_AddIcon(&sid);
}
diff --git a/protocols/YAMN/src/resource.h b/protocols/YAMN/src/resource.h
index 87b4b07da2..62720a471e 100644
--- a/protocols/YAMN/src/resource.h
+++ b/protocols/YAMN/src/resource.h
@@ -2,8 +2,8 @@
// Microsoft Developer Studio generated include file.
// Used by YAMN.rc
//
-#define IDI_ONLINE 104
-#define IDI_OFFLINE 105
+#define IDI_CHECKMAIL 104
+#define IDI_LAUNCHAPP 105
#define IDD_DLGVIEWMESSAGES 107
#define IDD_DLGSHOWMESSAGE 108
#define IDI_ICOYAMN2 112
@@ -11,10 +11,10 @@
#define IDD_DLGBADCONNECT 115
#define IDD_POP3ACCOUNTOPT 121
#define IDD_YAMNOPT 126
-#define IDI_NA 131
+#define IDI_BADCONNECT 131
#define IDI_ICOTTBUP 138
#define IDD_PLUGINOPT 141
-#define IDI_OCCUPIED 159
+#define IDI_NEWMAIL 159
#define IDD_CHOOSESTATUSMODES 310
#define IDD_OPTIONS 311
#define IDD_POP3ACCOUNTPOPUP 312
diff --git a/protocols/YAMN/src/services.cpp b/protocols/YAMN/src/services.cpp
index cd01722997..14f2d5b2c3 100644
--- a/protocols/YAMN/src/services.cpp
+++ b/protocols/YAMN/src/services.cpp
@@ -313,8 +313,7 @@ int AddTopToolbarIcon(WPARAM,LPARAM)
btn.cbSize = sizeof(btn);
btn.pszService = MS_YAMN_FORCECHECK;
btn.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP;
- btn.hIconHandleUp = g_GetIconHandle(5);
- btn.hIconHandleDn = g_GetIconHandle(6);
+ btn.hIconHandleUp = btn.hIconHandleDn = g_GetIconHandle(0);
btn.name = btn.pszTooltipUp = LPGEN("Check mail");
hTTButton = TopToolbar_AddButton(&btn);
}