summaryrefslogtreecommitdiff
path: root/plugins/SecureIM
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/SecureIM')
-rw-r--r--plugins/SecureIM/res/resource.rc184
-rw-r--r--plugins/SecureIM/secureim_10.vcxproj8
-rw-r--r--plugins/SecureIM/secureim_11.vcxproj8
-rw-r--r--plugins/SecureIM/src/commonheaders.h1
-rw-r--r--plugins/SecureIM/src/options.cpp11
-rw-r--r--plugins/SecureIM/src/resource.h34
6 files changed, 125 insertions, 121 deletions
diff --git a/plugins/SecureIM/res/resource.rc b/plugins/SecureIM/res/resource.rc
index 546e489903..fba8ff3d04 100644
--- a/plugins/SecureIM/res/resource.rc
+++ b/plugins/SecureIM/res/resource.rc
@@ -1,26 +1,23 @@
// Microsoft Visual C++ generated resource script.
//
#include "..\src\resource.h"
+
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#define APSTUDIO_HIDDEN_SYMBOLS
#include "afxres.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Russian resources
+// Russian (Russia) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
-#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
@@ -30,12 +27,12 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
IDD_OPTIONSTAB DIALOGEX 0, 0, 312, 247
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "",IDC_OPTIONSTAB,"SysTabControl32",0x0,1,1,310,245,WS_EX_ACCEPTFILES
+ CONTROL "",IDC_OPTIONSTAB,"SysTabControl32",0x0,0,0,312,247
END
-IDD_TAB_GENERAL DIALOGEX 0, 0, 303, 226
+IDD_TAB_GENERAL DIALOGEX 1, 15, 303, 226
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
@@ -45,7 +42,8 @@ BEGIN
CONTROL "Enable Secure File Transfer",IDC_SFT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,152,145,10
CONTROL "Always show status icons in contact list",IDC_ASI,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,162,145,10
- CONTROL "Context Menu only for ""Miranda"" clients",IDC_MCD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,172,145,10
+ CONTROL "Context Menu only for ""Miranda"" clients",IDC_MCD,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,172,145,10
CONTROL "Status in Context Menu",IDC_SCM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,182,145,10
CONTROL "Disable encryption for game plugins",IDC_DGP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,192,145,10
CONTROL "Always secured if possible",IDC_AIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,202,145,10
@@ -65,7 +63,7 @@ BEGIN
PUSHBUTTON "Reset All",IDC_RESET,253,210,46,12
END
-IDD_TAB_PROTO DIALOGEX 0, 0, 303, 226
+IDD_TAB_PROTO DIALOGEX 1, 15, 303, 226
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
@@ -87,19 +85,9 @@ BEGIN
PUSHBUTTON "&Import",IDC_RSA_IMPPRIV,221,193,54,12
END
-/*
-IDD_TAB_MESSAGES DIALOGEX 0, 0, 303, 226
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
- GROUPBOX "Protocols",IDC_STATIC,82,25,129,168
- EDITTEXT IDC_STATIC,221,71,69,77,ES_MULTILINE | ES_AUTOVSCROLL |
- ES_AUTOHSCROLL | ES_WANTRETURN
-END
-*/
-IDD_TAB_PGP DIALOGEX 0, 0, 303, 226
+IDD_TAB_PGP DIALOGEX 1, 15, 303, 226
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "",IDC_STATIC,5,5,292,30
CTEXT "",IDC_PGP_SDK,13,15,101,15,SS_CENTERIMAGE | SS_SUNKEN
@@ -113,9 +101,9 @@ BEGIN
PUSHBUTTON "Load &Private key",IDC_LOAD_PRIVKEY,225,200,65,15
END
-IDD_TAB_GPG DIALOG DISCARDABLE 0, 0, 303, 226
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
-FONT 8, "MS Shell Dlg"
+IDD_TAB_GPG DIALOGEX 1, 15, 303, 226
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Basic",IDC_STATIC,0,0,302,52
LTEXT "Executable:",IDC_STATIC,5,11,58,8
@@ -123,24 +111,19 @@ BEGIN
PUSHBUTTON "...",IDC_BROWSEEXECUTABLE_BTN,281,8,14,12
LTEXT "Home Directory:",IDC_STATIC,5,24,58,8
EDITTEXT IDC_GPGHOME_EDIT,65,22,232,12,ES_AUTOHSCROLL
- CONTROL "Temp Dir:",IDC_TMPPATHON_CBOX,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,8,37,46,10
+ CONTROL "Temp Dir:",IDC_TMPPATHON_CBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,37,46,10
EDITTEXT IDC_GPGTMPPATH_EDIT,65,36,232,12,ES_AUTOHSCROLL
GROUPBOX "Key Assignment",IDC_STATIC,0,53,302,142
- CONTROL "",IDC_GPG_USERLIST,"SysListView32",LVS_REPORT |
- LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,4,63,294,128
+ CONTROL "",IDC_GPG_USERLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,4,63,294,128
GROUPBOX "Debug",IDC_STATIC,0,196,302,28
- CONTROL "Log to File",IDC_LOGGINGON_CBOX,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,5,208,46,10
+ CONTROL "Log to File",IDC_LOGGINGON_CBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,208,46,10
EDITTEXT IDC_GPGLOGFILE_EDIT,56,207,187,12,ES_AUTOHSCROLL
- CONTROL "Save Pass",IDC_SAVEPASS_CBOX,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,249,208,48,10
+ CONTROL "Save Pass",IDC_SAVEPASS_CBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,249,208,48,10
END
-
IDD_POPUP DIALOGEX 0, 0, 303, 226
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "",IDC_BACKKEY,"ColourPicker",WS_TABSTOP,14,36,28,14
CONTROL "",IDC_TEXTKEY,"ColourPicker",WS_TABSTOP,50,36,28,14
@@ -170,7 +153,6 @@ BEGIN
CONTROL "Show a popup on each secure receive",IDC_SR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,204,168,10
END
-
IDD_PSK DIALOGEX 0, 0, 166, 73
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Please type in your password"
@@ -184,7 +166,6 @@ BEGIN
PUSHBUTTON "Cancel",IDCANCEL,92,54,33,12
END
-
IDD_PASSPHRASE DIALOGEX 0, 0, 238, 46
STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "SecureIM plugin Passphrase of private key"
@@ -202,111 +183,102 @@ END
// Menu
//
-IDM_CLIST0 MENU
+IDM_CLIST0 MENU
BEGIN
POPUP ""
BEGIN
POPUP "Mode"
BEGIN
- MENUITEM "Native SecureIM", ID_SIM_NATIVE
- MENUITEM "PGP SecureIM", ID_SIM_PGP
- MENUITEM "GPG SecureIM", ID_SIM_GPG
- MENUITEM "RSA/AES SecureIM", ID_SIM_RSAAES
-// MENUITEM "RSA SecureIM", ID_SIM_RSA
+ MENUITEM "Native SecureIM", ID_SIM_NATIVE
+ MENUITEM "PGP SecureIM", ID_SIM_PGP
+ MENUITEM "GPG SecureIM", ID_SIM_GPG
+ MENUITEM "RSA/AES SecureIM", ID_SIM_RSAAES
END
POPUP "Status"
BEGIN
MENUITEM "Always Try to Establish Secure IM", ID_ALWAYS
- MENUITEM "Secure IM Enabled", ID_ENABLED
- MENUITEM "Secure IM Disabled", ID_DISABLED
+ MENUITEM "Secure IM Enabled", ID_ENABLED
+ MENUITEM "Secure IM Disabled", ID_DISABLED
END
POPUP "Pre-shared key"
BEGIN
- MENUITEM "Set key", ID_SETPSK
- MENUITEM "Delete key", ID_DELPSK
+ MENUITEM "Set key", ID_SETPSK
+ MENUITEM "Delete key", ID_DELPSK
END
END
END
-
-IDM_CLIST01 MENU
+IDM_CLIST01 MENU
BEGIN
POPUP ""
BEGIN
- MENUITEM "Always Try to Establish Secure IM", ID_ALWAYS
- MENUITEM "Secure IM Enabled", ID_ENABLED
- MENUITEM "Secure IM Disabled", ID_DISABLED
+ MENUITEM "Always Try to Establish Secure IM", ID_ALWAYS
+ MENUITEM "Secure IM Enabled", ID_ENABLED
+ MENUITEM "Secure IM Disabled", ID_DISABLED
END
END
-
-IDM_CLIST02 MENU
+IDM_CLIST02 MENU
BEGIN
POPUP ""
BEGIN
- MENUITEM "Set pre-shared key", ID_SETPSK
- MENUITEM "Delete pre-shared key", ID_DELPSK
+ MENUITEM "Set pre-shared key", ID_SETPSK
+ MENUITEM "Delete pre-shared key", ID_DELPSK
END
END
-
-IDM_CLIST1 MENU
+IDM_CLIST1 MENU
BEGIN
POPUP ""
BEGIN
POPUP "Mode"
BEGIN
- MENUITEM "Native SecureIM", ID_SIM_NATIVE
- MENUITEM "PGP SecureIM", ID_SIM_PGP
- MENUITEM "GPG SecureIM", ID_SIM_GPG
- MENUITEM "RSA/AES SecureIM", ID_SIM_RSAAES
-// MENUITEM "RSA SecureIM", ID_SIM_RSA
+ MENUITEM "Native SecureIM", ID_SIM_NATIVE
+ MENUITEM "PGP SecureIM", ID_SIM_PGP
+ MENUITEM "GPG SecureIM", ID_SIM_GPG
+ MENUITEM "RSA/AES SecureIM", ID_SIM_RSAAES
END
POPUP "Status"
BEGIN
- MENUITEM "Secure IM Enabled", ID_ENABLED
- MENUITEM "Secure IM Disabled", ID_DISABLED
+ MENUITEM "Secure IM Enabled", ID_ENABLED
+ MENUITEM "Secure IM Disabled", ID_DISABLED
END
POPUP "Public key"
BEGIN
- MENUITEM "Export key", ID_EXPPUBL
- MENUITEM "Import key", ID_IMPPUBL
- MENUITEM "Delete key", ID_DELPUBL
+ MENUITEM "Export key", ID_EXPPUBL
+ MENUITEM "Import key", ID_IMPPUBL
+ MENUITEM "Delete key", ID_DELPUBL
END
END
END
-
-IDM_CLIST11 MENU
+IDM_CLIST11 MENU
BEGIN
POPUP ""
BEGIN
- MENUITEM "Secure IM Enabled", ID_ENABLED
- MENUITEM "Secure IM Disabled", ID_DISABLED
+ MENUITEM "Secure IM Enabled", ID_ENABLED
+ MENUITEM "Secure IM Disabled", ID_DISABLED
END
END
-
-IDM_CLIST12 MENU
+IDM_CLIST12 MENU
BEGIN
POPUP ""
BEGIN
- MENUITEM "Export public key", ID_EXPPUBL
- MENUITEM "Import public key", ID_IMPPUBL
- MENUITEM "Delete public key", ID_DELPUBL
+ MENUITEM "Export public key", ID_EXPPUBL
+ MENUITEM "Import public key", ID_IMPPUBL
+ MENUITEM "Delete public key", ID_DELPUBL
END
END
-
-IDM_CLIST2 MENU
+IDM_CLIST2 MENU
BEGIN
POPUP ""
BEGIN
- MENUITEM "Native SecureIM", ID_SIM_NATIVE
- MENUITEM "PGP SecureIM", ID_SIM_PGP
- MENUITEM "GPG SecureIM", ID_SIM_GPG
- MENUITEM "RSA/AES SecureIM", ID_SIM_RSAAES
-// MENUITEM "RSA SecureIM", ID_SIM_RSA
+ MENUITEM "Native SecureIM", ID_SIM_NATIVE
+ MENUITEM "PGP SecureIM", ID_SIM_PGP
+ MENUITEM "GPG SecureIM", ID_SIM_GPG
+ MENUITEM "RSA/AES SecureIM", ID_SIM_RSAAES
END
END
@@ -323,7 +295,49 @@ BEGIN
"afxres.h\0"
END
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
#endif // APSTUDIO_INVOKED
-#endif // Russian resources
+
/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+ IDD_TAB_GENERAL, DIALOG
+ BEGIN
+ RIGHTMARGIN, 300
+ BOTTOMMARGIN, 225
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+#endif // Russian (Russia) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
diff --git a/plugins/SecureIM/secureim_10.vcxproj b/plugins/SecureIM/secureim_10.vcxproj
index 48b06cfd3c..f45148df7c 100644
--- a/plugins/SecureIM/secureim_10.vcxproj
+++ b/plugins/SecureIM/secureim_10.vcxproj
@@ -86,7 +86,7 @@
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>comctl32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>comctl32.lib;msimg32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x45000000</BaseAddress>
@@ -111,7 +111,7 @@
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>comctl32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>comctl32.lib;msimg32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x45000000</BaseAddress>
@@ -139,7 +139,7 @@
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>comctl32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>comctl32.lib;msimg32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x45000000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -170,7 +170,7 @@
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>comctl32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>comctl32.lib;msimg32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x45000000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
diff --git a/plugins/SecureIM/secureim_11.vcxproj b/plugins/SecureIM/secureim_11.vcxproj
index 2666875054..3119734d03 100644
--- a/plugins/SecureIM/secureim_11.vcxproj
+++ b/plugins/SecureIM/secureim_11.vcxproj
@@ -90,7 +90,7 @@
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>comctl32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>comctl32.lib;msimg32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x45000000</BaseAddress>
@@ -116,7 +116,7 @@
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>comctl32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>comctl32.lib;msimg32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x45000000</BaseAddress>
@@ -144,7 +144,7 @@
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>comctl32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>comctl32.lib;msimg32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x45000000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -174,7 +174,7 @@
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>comctl32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>comctl32.lib;msimg32.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x45000000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
diff --git a/plugins/SecureIM/src/commonheaders.h b/plugins/SecureIM/src/commonheaders.h
index e335fddb9b..dc4797b7ce 100644
--- a/plugins/SecureIM/src/commonheaders.h
+++ b/plugins/SecureIM/src/commonheaders.h
@@ -25,6 +25,7 @@
#include <commdlg.h>
#include <commctrl.h>
#include <shlwapi.h>
+#include <Uxtheme.h>
#include <malloc.h>
#include <process.h>
diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp
index 8c5aa20bbb..7e7d7aece5 100644
--- a/plugins/SecureIM/src/options.cpp
+++ b/plugins/SecureIM/src/options.cpp
@@ -91,28 +91,25 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
switch(msg) {
case WM_INITDIALOG:
{
- RECT rcClient;
- GetClientRect(hwnd, &rcClient);
-
iInit = TRUE;
tci.mask = TCIF_PARAM|TCIF_TEXT;
tci.lParam = (LPARAM)CreateDialog(g_hInst,MAKEINTRESOURCE(IDD_TAB_GENERAL),hwnd,DlgProcOptionsGeneral);
tci.pszText = (LPSTR)sim201;
TC_InsertItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 0, &tci);
- MoveWindow((HWND)tci.lParam,5,26,rcClient.right-8,rcClient.bottom-29,1);
+ EnableThemeDialogTexture((HWND)tci.lParam, ETDT_ENABLETAB);
tci.lParam = (LPARAM)CreateDialog(g_hInst,MAKEINTRESOURCE(IDD_TAB_PROTO),hwnd,DlgProcOptionsProto);
tci.pszText = (LPSTR)sim202;
TC_InsertItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 2, &tci);
- MoveWindow((HWND)tci.lParam,5,26,rcClient.right-8,rcClient.bottom-29,1);
+ EnableThemeDialogTexture((HWND)tci.lParam, ETDT_ENABLETAB);
ShowWindow((HWND)tci.lParam, SW_HIDE);
if (bPGP && bPGPloaded) {
tci.lParam = (LPARAM)CreateDialog(g_hInst,MAKEINTRESOURCE(IDD_TAB_PGP),hwnd,DlgProcOptionsPGP);
tci.pszText = (LPSTR)sim214;
TC_InsertItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 3, &tci);
- MoveWindow((HWND)tci.lParam,5,26,rcClient.right-8,rcClient.bottom-29,1);
+ EnableThemeDialogTexture((HWND)tci.lParam, ETDT_ENABLETAB);
ShowWindow((HWND)tci.lParam, SW_HIDE);
}
@@ -120,7 +117,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
tci.lParam = (LPARAM)CreateDialog(g_hInst,MAKEINTRESOURCE(IDD_TAB_GPG),hwnd,DlgProcOptionsGPG);
tci.pszText = (LPSTR)sim226;
TC_InsertItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), 4, &tci);
- MoveWindow((HWND)tci.lParam,5,26,rcClient.right-8,rcClient.bottom-29,1);
+ EnableThemeDialogTexture((HWND)tci.lParam, ETDT_ENABLETAB);
ShowWindow((HWND)tci.lParam, SW_HIDE);
}
diff --git a/plugins/SecureIM/src/resource.h b/plugins/SecureIM/src/resource.h
index 8a24991218..79f9a8ed5b 100644
--- a/plugins/SecureIM/src/resource.h
+++ b/plugins/SecureIM/src/resource.h
@@ -2,8 +2,8 @@
// Microsoft Visual C++ generated include file.
// Used by resource.rc
//
-#define ID_FIRSTICON 1
-#define ID_LASTICON 17
+#define ID_FIRSTICON 1
+#define ID_LASTICON 17
#define ID_DISABLED 111
#define ID_ENABLED 112
#define ID_ALWAYS 113
@@ -17,21 +17,18 @@
#define ID_DELPUBL 121
#define ID_EXPPUBL 122
#define ID_IMPPUBL 123
-
-#define ID_SIM_NATIVE 130
+#define ID_SIM_NATIVE 130
#define ID_SIM_PGP 131
#define ID_SIM_GPG 132
#define ID_SIM_RSAAES 133
#define ID_SIM_RSA 134
-
-#define IDM_CLIST0 150
-#define IDM_CLIST1 151
-#define IDM_CLIST2 152
-#define IDM_CLIST01 153
-#define IDM_CLIST02 154
-#define IDM_CLIST11 155
-#define IDM_CLIST12 156
-
+#define IDM_CLIST0 150
+#define IDM_CLIST1 151
+#define IDM_CLIST2 152
+#define IDM_CLIST01 153
+#define IDM_CLIST02 154
+#define IDM_CLIST11 155
+#define IDM_CLIST12 156
#define IDD_OPTIONSTAB 501
#define IDD_TAB_GENERAL 502
#define IDD_TAB_PROTO 503
@@ -39,9 +36,8 @@
#define IDD_TAB_GPG 505
#define IDD_TAB_MESSAGES 506
#define IDD_POPUP 507
-#define IDD_PSK 508
-#define IDD_PASSPHRASE 509
-
+#define IDD_PSK 508
+#define IDD_PASSPHRASE 509
#define IDC_STD_USERLIST 1001
#define IDC_TIMEOUT 1002
#define IDC_BACKKEY 1003
@@ -98,12 +94,10 @@
#define IDC_RSA_EXP 1055
#define IDC_RSA_EXPPRIV 1056
#define IDC_RSA_IMPPRIV 1057
-#define IDC_PASSPHRASE 1058
-
+#define IDC_PASSPHRASE 1058
#define IDC_NO_PGP 1100
#define IDC_PGP 1101
#define IDC_GPG 1102
-
#define IDC_PGP_SDK 1200
#define IDC_PGP_USERLIST 1201
#define IDC_SET_KEYRINGS 1202
@@ -111,7 +105,6 @@
#define IDC_PGP_PRIVKEY 1204
#define IDC_LOAD_PRIVKEY 1205
#define IDC_NO_KEYRINGS 1206
-
#define IDC_GPGEXECUTABLE_EDIT 1300
#define IDC_BROWSEEXECUTABLE_BTN 1301
#define IDC_GPGHOME_EDIT 1302
@@ -125,7 +118,6 @@
#define IDC_SAVEPASS_CBOX 1310
#define IDC_TMPPATHON_CBOX 1311
#define IDC_GPGTMPPATH_EDIT 1312
-
#define ID_ENCRYPTION 40001
// Next default values for new objects
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 03:58:33 +0000