From 4ca096262dfc106d1a2207145544cbd3e84e67cb Mon Sep 17 00:00:00 2001 From: Szymon Tokarz Date: Thu, 13 Nov 2014 00:05:26 +0000 Subject: Sametime protocol: - Support the Sametime 'in meeting' status (linked with Miranda 'Occupied' status) - New protocol icons from oryginal client Patch by pepinlebref git-svn-id: http://svn.miranda-ng.org/main/trunk@10976 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Sametime/proto_sametime/res/Away.ico | Bin 318 -> 3446 bytes protocols/Sametime/proto_sametime/res/DND.ico | Bin 318 -> 3446 bytes protocols/Sametime/proto_sametime/res/Occupied.ico | Bin 0 -> 3446 bytes protocols/Sametime/proto_sametime/res/Offline.ico | Bin 318 -> 5238 bytes protocols/Sametime/proto_sametime/res/Online.ico | Bin 318 -> 3446 bytes .../Sametime/proto_sametime/res/Proto_Sametime.rc | 18 ++++++++++-------- protocols/Sametime/proto_sametime/src/resource.h | 9 +++++---- 7 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 protocols/Sametime/proto_sametime/res/Occupied.ico (limited to 'protocols/Sametime/proto_sametime') diff --git a/protocols/Sametime/proto_sametime/res/Away.ico b/protocols/Sametime/proto_sametime/res/Away.ico index 6204baa145..9f89cc0175 100644 Binary files a/protocols/Sametime/proto_sametime/res/Away.ico and b/protocols/Sametime/proto_sametime/res/Away.ico differ diff --git a/protocols/Sametime/proto_sametime/res/DND.ico b/protocols/Sametime/proto_sametime/res/DND.ico index f198b121f5..57c5aa3221 100644 Binary files a/protocols/Sametime/proto_sametime/res/DND.ico and b/protocols/Sametime/proto_sametime/res/DND.ico differ diff --git a/protocols/Sametime/proto_sametime/res/Occupied.ico b/protocols/Sametime/proto_sametime/res/Occupied.ico new file mode 100644 index 0000000000..4a09a93cfb Binary files /dev/null and b/protocols/Sametime/proto_sametime/res/Occupied.ico differ diff --git a/protocols/Sametime/proto_sametime/res/Offline.ico b/protocols/Sametime/proto_sametime/res/Offline.ico index 323f880ce5..e2912b633e 100644 Binary files a/protocols/Sametime/proto_sametime/res/Offline.ico and b/protocols/Sametime/proto_sametime/res/Offline.ico differ diff --git a/protocols/Sametime/proto_sametime/res/Online.ico b/protocols/Sametime/proto_sametime/res/Online.ico index 839e79c9f7..18e6e820c2 100644 Binary files a/protocols/Sametime/proto_sametime/res/Online.ico and b/protocols/Sametime/proto_sametime/res/Online.ico differ diff --git a/protocols/Sametime/proto_sametime/res/Proto_Sametime.rc b/protocols/Sametime/proto_sametime/res/Proto_Sametime.rc index 2553b55145..f2aa97435a 100644 --- a/protocols/Sametime/proto_sametime/res/Proto_Sametime.rc +++ b/protocols/Sametime/proto_sametime/res/Proto_Sametime.rc @@ -13,10 +13,11 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Russian (Russia) resources +// Neutral resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#pragma code_page(1252) #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -51,11 +52,12 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_ICON1 ICON "Offline.ico" -IDI_ICON2 ICON "Online.ico" -IDI_ICON3 ICON "Away.ico" -IDI_ICON4 ICON "DND.ico" -#endif // Russian (Russia) resources +IDI_ONLINE ICON "Online.ico" +IDI_AWAY ICON "Away.ico" +IDI_DND ICON "DND.ico" +IDI_OFFLINE ICON "Offline.ico" +IDI_OCCUPIED ICON "Occupied.ico" +#endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// diff --git a/protocols/Sametime/proto_sametime/src/resource.h b/protocols/Sametime/proto_sametime/src/resource.h index 3decee6cf7..e4fb5b5339 100644 --- a/protocols/Sametime/proto_sametime/src/resource.h +++ b/protocols/Sametime/proto_sametime/src/resource.h @@ -2,10 +2,11 @@ // Microsoft Visual C++ generated include file. // Used by Proto_Sametime.rc // -#define IDI_ICON1 105 -#define IDI_ICON2 104 -#define IDI_ICON3 128 -#define IDI_ICON4 158 +#define IDI_ONLINE 104 +#define IDI_OFFLINE 105 +#define IDI_AWAY 128 +#define IDI_DND 158 +#define IDI_OCCUPIED 159 // Next default values for new objects // -- cgit v1.2.3