summaryrefslogtreecommitdiff
path: root/plugins/FingerprintNG
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/FingerprintNG')
-rw-r--r--plugins/FingerprintNG/iconpacks/res/fp_icons.rc37
-rw-r--r--plugins/FingerprintNG/res/resource.rc12
-rw-r--r--plugins/FingerprintNG/src/finger_groups.h5
-rw-r--r--plugins/FingerprintNG/src/global.h2
-rw-r--r--plugins/FingerprintNG/src/masks.cpp2
-rw-r--r--plugins/FingerprintNG/src/options.cpp5
-rw-r--r--plugins/FingerprintNG/src/resource.h4
-rw-r--r--plugins/FingerprintNG/src/version.h6
8 files changed, 10 insertions, 63 deletions
diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
index f1f1a418b4..3fd9b43bbf 100644
--- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
+++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
@@ -12,28 +12,6 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Russian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#endif // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
@@ -691,21 +669,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
IDI_UNICODE_CLIENT ICON "overlays\\overlay_Unicode.ico"
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE
-BEGIN
- IDS_IDENTIFY "# Finger Icons #"
-END
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/plugins/FingerprintNG/res/resource.rc b/plugins/FingerprintNG/res/resource.rc
index 553c5bf0ae..0674778240 100644
--- a/plugins/FingerprintNG/res/resource.rc
+++ b/plugins/FingerprintNG/res/resource.rc
@@ -26,16 +26,6 @@
IDI_UNDETECTED ICON "undetected.ico"
IDI_UNKNOWN ICON "unknown.ico"
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE
-BEGIN
- IDS_IDENTIFY "# Finger Icons #"
-END
-
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
@@ -84,7 +74,7 @@ BEGIN
CONTROL "Platform overlays", IDC_GROUP_OVERLAYS_PLATFORM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,40,120,10
CONTROL "Protocols overlays", IDC_GROUP_OVERLAYS_PROTO, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,50,120,10
CONTROL "Unicode overlay", IDC_GROUP_OVERLAYS_UNICODE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,60,120,10
-// CONTROL "Secure overlays", IDC_GROUP_OVERLAYS_SECURITY, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,70,120,10
+ CONTROL "Secure overlays", IDC_GROUP_OVERLAYS_SECURITY, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,50,140,10
GROUPBOX "Select protocols", IDC_STATIC,15,75,290,140
diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h
index e760bc8d31..9bb796e8ca 100644
--- a/plugins/FingerprintNG/src/finger_groups.h
+++ b/plugins/FingerprintNG/src/finger_groups.h
@@ -103,6 +103,11 @@ case OVERLAYS_UNICODE_CASE:
return _T("Client icons/Overlays/Platform");
break;
+case OVERLAYS_SECURITY_CASE:
+ if ( db_get_b(NULL, "Finger", "GroupOverlaysSecurity", 1))
+ return _T("Client icons/Overlays/Security");
+ break;
+
case OVERLAYS_PROTO_CASE:
if ( db_get_b(NULL, "Finger", "GroupOverlaysProtos", 1))
return _T("Client icons/Overlays/Protocol");
diff --git a/plugins/FingerprintNG/src/global.h b/plugins/FingerprintNG/src/global.h
index ccd1bf8782..d6f860bed8 100644
--- a/plugins/FingerprintNG/src/global.h
+++ b/plugins/FingerprintNG/src/global.h
@@ -120,7 +120,7 @@ typedef struct _foundInfo
#define OVERLAYS_PLATFORM_CASE 3021 // platforms overlays
#define OVERLAYS_PROTO_CASE 3022 // protocols overlays
#define OVERLAYS_UNICODE_CASE 3023 // unicode overlay
-//#define OVERLAYS_SECURITY_CASE 3023 // security overlays
+#define OVERLAYS_SECURITY_CASE 3024 // security overlays
/*
#define OVERLAYS_RESOURCE_ALT_CASE 24 // alternative (old style) overlays
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index e7a09036e7..4879b8183f 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -807,7 +807,7 @@ int DEFAULT_KN_FP_OVERLAYS3_COUNT = SIZEOF(def_kn_fp_overlays3_mask);
//#############################################################################################################################################################################
KN_FP_MASK def_kn_fp_overlays4_mask[] =
{// {"Client_IconName", _T("|^*Mask*|*names*"), _T("Icon caption"), IDI_RESOURCE_ID, CLIENT_CASE, OVERLAY? },
- {"client_SecureIM_over", _T("*Secure*IM*"), _T("SecureIM overlay"), IDI_SECUREIM_OVERLAY, OVERLAYS_PLATFORM_CASE },
+ {"client_SecureIM_over", _T("*Secure*IM*"), _T("SecureIM overlay"), IDI_SECUREIM_OVERLAY, OVERLAYS_SECURITY_CASE },
};
int DEFAULT_KN_FP_OVERLAYS4_COUNT = SIZEOF(def_kn_fp_overlays4_mask); \ No newline at end of file
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp
index 704627d9b8..82caec4b3e 100644
--- a/plugins/FingerprintNG/src/options.cpp
+++ b/plugins/FingerprintNG/src/options.cpp
@@ -53,7 +53,7 @@ static settings[] =
{IDC_GROUP_OVERLAYS_PLATFORM, "GroupOverlaysPlatform"},
{IDC_GROUP_OVERLAYS_UNICODE, "GroupOverlaysUnicode"},
{IDC_GROUP_OVERLAYS_PROTO, "GroupOverlaysProtos"},
-// {IDC_GROUP_OVERLAYS_SECURITY, "GroupOtherProtos"}
+ {IDC_GROUP_OVERLAYS_SECURITY, "GroupOverlaysSecurity"}
};
/*static void OptDlgChanged(HWND hwndDlg, BOOL show)
@@ -117,8 +117,7 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP
case IDC_GROUP_OVERLAYS_PLATFORM:
case IDC_GROUP_OVERLAYS_PROTO:
case IDC_GROUP_OVERLAYS_UNICODE:
-// case IDC_GROUP_OVERLAYS_SECURITY:
- //OptDlgChanged(hwndDlg, false);
+ case IDC_GROUP_OVERLAYS_SECURITY:
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
break;
diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index 1b0e6e4cc8..bfdc167fe6 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -686,10 +686,6 @@
//#define IDC_GROUP_OVERLAYS_RESOURCE_ALT 10048
-
-#define IDS_IDENTIFY 11001
-//#define IDC_OPTCHANGENOTE 11002
-
//###############################################
// Next default values for new objects
diff --git a/plugins/FingerprintNG/src/version.h b/plugins/FingerprintNG/src/version.h
index 62eb7a3135..71fa0676f1 100644
--- a/plugins/FingerprintNG/src/version.h
+++ b/plugins/FingerprintNG/src/version.h
@@ -23,14 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define __BUILD_NUM 0
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
-
-#define __STRINGIFY_IMPL(x) #x
-#define __STRINGIFY(x) __STRINGIFY_IMPL(x)
-#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS)
#define __PLUGIN_NAME "Fingerprint NG"
-#define __INTERNAL_NAME "Fingerprint NG"
#define __FILENAME "Fingerprint.dll"
#define __DESCRIPTION "Fingerprint NG (client version) icons module for Miranda NG."
#define __AUTHOR "faith_healer, ghazan, mataes"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 18:38:44 +0000