Fingerprint: mobile platform overlay added

website platform overlay changed
removed separate icon from Fb with mobile overlay

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

6 files changed, 23 insertions, 23 deletions

diff --git a/plugins/FingerprintNG/iconpacks/res/Facebook/facebook_mobile.ico b/plugins/FingerprintNG/iconpacks/res/Facebook/facebook_mobile.ico
deleted file mode 100644
index 3581306ddf..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Facebook/facebook_mobile.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_mobile.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_mobile.ico
new file mode 100644
index 0000000000..deb30dd7eb
--- /dev/null
+++ b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_mobile.ico
diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_website.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_website.ico
index 4719a4e1ea..43260865f9 100644
--- a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_website.ico
+++ b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_platform_website.ico
diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
index 1ba6ab54a5..0be1cf283c 100644
--- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
+++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
@@ -539,7 +539,6 @@ IDI_YWEATHER            ICON                    "Weather\\yweather.ico"
 IDI_FACEBOOK            ICON                    "Facebook\\Facebook.ico"

 IDI_FACEBOOK_APP        ICON                    "Facebook\\facebook_app.ico"

 IDI_FACEBOOK_MESSENGER  ICON                    "Facebook\\facebook_messenger.ico"

-IDI_FACEBOOK_MOBILE     ICON                    "Facebook\\facebook_mobile.ico"

 IDI_FACEBOOK_OTHER      ICON                    "Facebook\\facebook_other.ico"

 IDI_VK                  ICON                    "VKontakte\\VK.ico"

 IDI_SKYPE               ICON                    "others\\Skype.ico"

@@ -577,6 +576,7 @@ IDI_PLATFORM_WIN        ICON                    "overlays\\overlay_platform_Wind
 IDI_PLATFORM_IOS        ICON                    "overlays\\overlay_platform_iOS.ico"

 IDI_PLATFORM_WEBSITE    ICON                    "overlays\\overlay_platform_website.ico"

 IDI_PLATFORM_WINPHONE   ICON                    "overlays\\overlay_platform_Windows_Phone.ico"

+IDI_PLATFORM_MOBILE     ICON                    "overlays\\overlay_platform_mobile.ico"

 IDI_PLATFORM_X32        ICON                    "overlays\\overlay_platform_x32.ico"

 IDI_PLATFORM_X64        ICON                    "overlays\\overlay_platform_x64.ico"

 IDI_SECUREIM_OVERLAY    ICON                    "overlays\\overlay_security_SecureIM.ico"

diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index dade750d0c..d734db7356 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -590,7 +590,6 @@ KN_FP_MASK def_kn_fp_mask[] =
 //#########################################################################################################################################################################

 //#################################   Facebook   ##########################################################################################################################

 //#########################################################################################################################################################################

-	{"client_Facebook_mobile",  _T("*Facebook*mobile*"),                        _T("Facebook (mobile)"),             IDI_FACEBOOK_MOBILE,     FACEBOOK_CASE               },

 	{"client_Facebook_other",   _T("*Facebook*other*"),                         _T("Facebook (other)"),              IDI_FACEBOOK_OTHER,      FACEBOOK_CASE               },

 	{"client_Facebook_app",     _T("*Facebook*App*"),                           _T("Facebook App"),                  IDI_FACEBOOK_APP,        FACEBOOK_CASE               },

 	{"client_Facebook_mess",    _T("*Facebook*Messenger*"),                     _T("Facebook Messenger"),            IDI_FACEBOOK_MESSENGER,  FACEBOOK_CASE               },

@@ -757,6 +756,7 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
 	{"client_on_Android",       _T("|*Android*|*(android)*"),               LPGENT("Android overlay"),               IDI_PLATFORM_ANDROID,    OVERLAYS_PLATFORM_CASE      },

 	{"client_on_Website",       _T("*(website)*"),                          LPGENT("Website overlay"),               IDI_PLATFORM_WEBSITE,    OVERLAYS_PLATFORM_CASE      },

 	{"client_on_WinPhone",      _T("*(wphone)*"),                           LPGENT("Windows Phone overlay"),         IDI_PLATFORM_WINPHONE,   OVERLAYS_PLATFORM_CASE      },

+	{"client_on_mobile",        _T("*(mobile)*"),                           LPGENT("Mobile overlay"),                IDI_PLATFORM_MOBILE,     OVERLAYS_PLATFORM_CASE      },

 };

 

 int DEFAULT_KN_FP_OVERLAYS_COUNT = SIZEOF(def_kn_fp_overlays_mask);

diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index 02f17f80aa..b9d1e65e23 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -54,25 +54,26 @@
 #define IDI_PLATFORM_WIN                69

 #define IDI_PLATFORM_WEBSITE            70

 #define IDI_PLATFORM_WINPHONE           71

-#define IDI_UNICODE_CLIENT              72

-#define IDI_PLATFORM_X32                73

-#define IDI_PLATFORM_X64                74

-#define IDI_AIM_OVERLAY                 75

-#define IDI_GMAIL_OVERLAY               76

-#define IDI_ICQJ_OVERLAY                77

-#define IDI_ICQJ_PLUS_OVERLAY           78

-#define IDI_IRC_OVERLAY                 79

-#define IDI_JABBER_OVERLAY              80

-#define IDI_JGTALK_OVERLAY              81

-#define IDI_MAILRU_OVERLAY              82

-#define IDI_MSN_OVERLAY                 83

-#define IDI_QQ_OVERLAY                  84

-#define IDI_TLEN_OVERLAY                85

-#define IDI_YAHOO_OVERLAY               86

-#define IDI_VK_OVERLAY                  87

-#define IDI_SECUREIM_OVERLAY            91

-#define IDI_NEWGPG_OVERLAY              92

-#define IDI_MIROTR_OVERLAY              93

+#define IDI_PLATFORM_MOBILE             72

+#define IDI_UNICODE_CLIENT              75

+#define IDI_PLATFORM_X32                76

+#define IDI_PLATFORM_X64                77

+#define IDI_AIM_OVERLAY                 78

+#define IDI_GMAIL_OVERLAY               79

+#define IDI_ICQJ_OVERLAY                80

+#define IDI_ICQJ_PLUS_OVERLAY           81

+#define IDI_IRC_OVERLAY                 82

+#define IDI_JABBER_OVERLAY              83

+#define IDI_JGTALK_OVERLAY              84

+#define IDI_MAILRU_OVERLAY              85

+#define IDI_MSN_OVERLAY                 86

+#define IDI_QQ_OVERLAY                  87

+#define IDI_TLEN_OVERLAY                88

+#define IDI_YAHOO_OVERLAY               89

+#define IDI_VK_OVERLAY                  90

+#define IDI_SECUREIM_OVERLAY            95

+#define IDI_NEWGPG_OVERLAY              96

+#define IDI_MIROTR_OVERLAY              97

 #define IDI_MIRANDA_A0X                 101

 #define IDI_MIRANDA_AF                  102

 #define IDI_MIRANDA_ALFAMAR             103

@@ -577,8 +578,7 @@
 #define IDI_FACEBOOK                    2001

 #define IDI_FACEBOOK_APP                2002

 #define IDI_FACEBOOK_MESSENGER          2003

-#define IDI_FACEBOOK_MOBILE             2004

-#define IDI_FACEBOOK_OTHER              2005

+#define IDI_FACEBOOK_OTHER              2004

 #define IDC_STATUSBAR                   7001

 #define IDI_SKYPE                       9002

 #define IDI_TWITTER                     9003