SkypeWeb: SyncHistory icon changed (thx dracosha).

git-svn-id: http://svn.miranda-ng.org/main/trunk@13092 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 16 insertions, 13 deletions

diff --git a/protocols/SkypeWeb/SkypeWeb_10.vcxproj b/protocols/SkypeWeb/SkypeWeb_10.vcxproj
index 6906ab6274..c08b0721ed 100644
--- a/protocols/SkypeWeb/SkypeWeb_10.vcxproj
+++ b/protocols/SkypeWeb/SkypeWeb_10.vcxproj
@@ -256,6 +256,9 @@
   <ItemGroup>

     <Image Include="res\Icons\conference.ico" />

   </ItemGroup>

+  <ItemGroup>

+    <None Include="..\sync_history.ico" />

+  </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/protocols/SkypeWeb/SkypeWeb_10.vcxproj.filters b/protocols/SkypeWeb/SkypeWeb_10.vcxproj.filters
index 0947b77cc2..46327b5f51 100644
--- a/protocols/SkypeWeb/SkypeWeb_10.vcxproj.filters
+++ b/protocols/SkypeWeb/SkypeWeb_10.vcxproj.filters
@@ -168,4 +168,9 @@
       <Filter>Resource Files\Icons</Filter>

     </Image>

   </ItemGroup>

+  <ItemGroup>

+    <None Include="..\sync_history.ico">

+      <Filter>Resource Files\Icons</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/SkypeWeb/res/Icons/sync_history.ico b/protocols/SkypeWeb/res/Icons/sync_history.ico
new file mode 100644
index 0000000000..6c50f8e285
--- /dev/null
+++ b/protocols/SkypeWeb/res/Icons/sync_history.ico
diff --git a/protocols/SkypeWeb/res/resource.rc b/protocols/SkypeWeb/res/resource.rc
index 955a4076ab..caa92a47f0 100644
--- a/protocols/SkypeWeb/res/resource.rc
+++ b/protocols/SkypeWeb/res/resource.rc
@@ -27,6 +27,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

 IDI_SKYPE               ICON                    "icons\\skype.ico"

+IDI_CONFERENCE          ICON                    "Icons\\conference.ico"

+IDI_SYNCHISTORY         ICON                    "Icons\\sync_history.ico"

 #endif    // Нейтральный (по умолчанию) resources

 /////////////////////////////////////////////////////////////////////////////

 

@@ -38,15 +40,6 @@ IDI_SKYPE               ICON                    "icons\\skype.ico"
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

 #pragma code_page(1251)

 

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_CONFERENCE          ICON                    "Icons\\conference.ico"

-

 #ifdef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

 //

diff --git a/protocols/SkypeWeb/src/resource.h b/protocols/SkypeWeb/src/resource.h
index 9712713f87..db55d16082 100644
--- a/protocols/SkypeWeb/src/resource.h
+++ b/protocols/SkypeWeb/src/resource.h
@@ -13,6 +13,7 @@
 #define IDD_GC_CREATE                   111

 #define IDD_GC_INVITE                   112

 #define IDI_CONFERENCE                  114

+#define IDI_SYNCHISTORY                 117

 #define IDC_AUTOSYNC                    1028

 #define IDC_LOCALTIME                   1029

 #define IDC_RADIO1                      1030

@@ -29,7 +30,7 @@
 // 

 #ifdef APSTUDIO_INVOKED

 #ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        115

+#define _APS_NEXT_RESOURCE_VALUE        119

 #define _APS_NEXT_COMMAND_VALUE         40001

 #define _APS_NEXT_CONTROL_VALUE         1042

 #define _APS_NEXT_SYMED_VALUE           101

diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp
index a067fb3bd6..9e101fa6e3 100644
--- a/protocols/SkypeWeb/src/skype_chatrooms.cpp
+++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp
@@ -224,7 +224,7 @@ int CSkypeProto::OnGroupChatMenuHook(WPARAM, LPARAM lParam)
 			static const struct gc_item Items[] =

 			{

 				{ LPGENT("Kick &user"), 10, MENU_ITEM		},

-				{ NULL,					 0, MENU_ITEM		},

+				{ NULL,					 0, MENU_SEPARATOR	},

 				{ LPGENT("Set &role"),	20, MENU_NEWPOPUP	},

 				{ LPGENT("&Admin"),		30, MENU_POPUPITEM	},

 				{ LPGENT("&User"),		40, MENU_POPUPITEM	}

diff --git a/protocols/SkypeWeb/src/skype_icons.cpp b/protocols/SkypeWeb/src/skype_icons.cpp
index 75865a8794..6027b6d3bc 100644
--- a/protocols/SkypeWeb/src/skype_icons.cpp
+++ b/protocols/SkypeWeb/src/skype_icons.cpp
@@ -20,7 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 IconInfo CSkypeProto::Icons[] =

 {

 	{ LPGENT("Protocol icon"),			"main",				IDI_SKYPE },

-	{ LPGENT("Create new chat icon"),	"conference",  IDI_CONFERENCE }

+	{ LPGENT("Create new chat icon"),	"conference",  IDI_CONFERENCE },

+	{ LPGENT("Sync history icon"),		"synchistory", IDI_SYNCHISTORY}

 };

 void CSkypeProto::InitIcons()

 {

diff --git a/protocols/SkypeWeb/src/skype_menus.cpp b/protocols/SkypeWeb/src/skype_menus.cpp
index 29eccfacf7..ec2710f29a 100644
--- a/protocols/SkypeWeb/src/skype_menus.cpp
+++ b/protocols/SkypeWeb/src/skype_menus.cpp
@@ -77,7 +77,7 @@ void CSkypeProto::InitMenus()
 	mi.pszService = MODULE"/GetHistory";

 	mi.ptszName = LPGENT("Get server history");

 	mi.position = CMI_POSITION + CMI_GETSERVERHISTORY;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_HISTORY);

+	mi.icolibItem = GetIconHandle("synchistory");

 	ContactMenuItems[CMI_GETSERVERHISTORY] = Menu_AddContactMenuItem(&mi);

 	CreateServiceFunction(mi.pszService, GlobalService<&CSkypeProto::GetContactHistory>);

 }