summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--protocols/YAMN/YAMN_10.vcxproj.filters10
-rw-r--r--protocols/YAMN/res/YAMN.rc9
-rw-r--r--protocols/YAMN/res/badconnect.ico (renamed from protocols/YAMN/res/icooffline.ico)bin2038 -> 2038 bytes
-rw-r--r--protocols/YAMN/res/checkmail.icobin0 -> 2038 bytes
-rw-r--r--protocols/YAMN/res/icoyamn3.icobin2038 -> 0 bytes
-rw-r--r--protocols/YAMN/res/launchapp.ico (renamed from protocols/YAMN/res/iconttbdown.ico)bin2038 -> 2038 bytes
-rw-r--r--protocols/YAMN/res/newmail.ico (renamed from protocols/YAMN/res/iconeutral.ico)bin2038 -> 2038 bytes
-rw-r--r--protocols/YAMN/src/main.cpp19
-rw-r--r--protocols/YAMN/src/resource.h8
-rw-r--r--protocols/YAMN/src/services.cpp3
10 files changed, 24 insertions, 25 deletions
diff --git a/protocols/YAMN/YAMN_10.vcxproj.filters b/protocols/YAMN/YAMN_10.vcxproj.filters
index 9b91a6595f..5a21b2d9db 100644
--- a/protocols/YAMN/YAMN_10.vcxproj.filters
+++ b/protocols/YAMN/YAMN_10.vcxproj.filters
@@ -79,9 +79,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="src\resource.h">
- <Filter>Resource Files</Filter>
- </ClInclude>
<ClInclude Include="src\debug.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -100,7 +97,12 @@
<ClInclude Include="src\yamn.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="src\version.h" />
+ <ClInclude Include="src\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="src\resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\YAMN.rc">
diff --git a/protocols/YAMN/res/YAMN.rc b/protocols/YAMN/res/YAMN.rc
index a002fe7ef8..70f5976d15 100644
--- a/protocols/YAMN/res/YAMN.rc
+++ b/protocols/YAMN/res/YAMN.rc
@@ -317,10 +317,11 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_ONLINE ICON "iconeutral.ico"
-IDI_OFFLINE ICON "icooffline.ico"
-IDI_NA ICON "icoyamn3.ico"
-IDI_OCCUPIED ICON "iconttbdown.ico"
+IDI_CHECKMAIL ICON "checkmail.ico"
+IDI_LAUNCHAPP ICON "launchapp.ico"
+IDI_BADCONNECT ICON "badconnect.ico"
+IDI_NEWMAIL ICON "newmail.ico"
+
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/YAMN/res/icooffline.ico b/protocols/YAMN/res/badconnect.ico
index 78f925ede7..78f925ede7 100644
--- a/protocols/YAMN/res/icooffline.ico
+++ b/protocols/YAMN/res/badconnect.ico
Binary files differ
diff --git a/protocols/YAMN/res/checkmail.ico b/protocols/YAMN/res/checkmail.ico
new file mode 100644
index 0000000000..b2605bb9d4
--- /dev/null
+++ b/protocols/YAMN/res/checkmail.ico
Binary files differ
diff --git a/protocols/YAMN/res/icoyamn3.ico b/protocols/YAMN/res/icoyamn3.ico
deleted file mode 100644
index 78f925ede7..0000000000
--- a/protocols/YAMN/res/icoyamn3.ico
+++ /dev/null
Binary files differ
diff --git a/protocols/YAMN/res/iconttbdown.ico b/protocols/YAMN/res/launchapp.ico
index 81dd9fe467..81dd9fe467 100644
--- a/protocols/YAMN/res/iconttbdown.ico
+++ b/protocols/YAMN/res/launchapp.ico
Binary files differ
diff --git a/protocols/YAMN/res/iconeutral.ico b/protocols/YAMN/res/newmail.ico
index a99cbe0a60..a99cbe0a60 100644
--- a/protocols/YAMN/res/iconeutral.ico
+++ b/protocols/YAMN/res/newmail.ico
Binary files differ
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);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 15:42:50 +0000