some minor fixes

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

3 files changed, 13 insertions, 21 deletions

diff --git a/plugins/Msg_Export/res/resource.rc b/plugins/Msg_Export/res/resource.rc
index 4434bd7e57..ffdae4a7e8 100755
--- a/plugins/Msg_Export/res/resource.rc
+++ b/plugins/Msg_Export/res/resource.rc
@@ -212,16 +212,6 @@ BEGIN
 END

 

 

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

-//

-// String Table

-//

-

-STRINGTABLE

-BEGIN

-    ID_EDIT_COPY            "Copies the selection and puts it on the Clipboard\nCopy"

-END

-

 #endif    // Russian (Russia) resources

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

 

diff --git a/plugins/Msg_Export/src/Glob.h b/plugins/Msg_Export/src/Glob.h
index f1d9747893..66d97c6f94 100755
--- a/plugins/Msg_Export/src/Glob.h
+++ b/plugins/Msg_Export/src/Glob.h
@@ -37,6 +37,7 @@ using namespace std;
 #include <m_userinfo.h>

 #include <m_protosvc.h>

 #include <m_icq.h>

+#include <win2k.h>

 

 #include "utils.h"

 #include "options.h"

diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp
index be86c3c82e..655b49d0a2 100755
--- a/plugins/Msg_Export/src/options.cpp
+++ b/plugins/Msg_Export/src/options.cpp
@@ -939,7 +939,9 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 					ofn.hwndOwner = hwndDlg;

 					ofn.lpstrFile = szFile;

 					ofn.nMaxFile = sizeof(szFile);

-					ofn.lpstrFilter = LPGENT("Executable files (*.exe;*.com;*.bat;*.cmd)\0*.exe;*.com;*.bat;*.cmd\0All files(*.*)\0*.*\0");

+					TCHAR buf[MAX_PATH];

+					mir_sntprintf(buf, SIZEOF(buf), _T("%s (*.exe;*.com;*.bat;*.cmd)%c*.exe;*.com;*.bat;*.cmd%c%s (*.*)%c*.*%c%c"), TranslateT("Executable files"), 0, 0, TranslateT("All files"), 0, 0, 0);

+					ofn.lpstrFilter = buf;

 					ofn.nFilterIndex = 1;

 					//ofn.lpstrFileTitle = NULL;

 					//ofn.nMaxFileTitle = 0;

@@ -966,7 +968,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 					// Get the shells allocator

 					if (FAILED(SHGetMalloc(&pMalloc))) // we need to use this to support old Windows versions 

 					{

-						MessageBox(hwndDlg, _T("Failed to get the shells allocator!"), MSG_BOX_TITEL, MB_OK);

+						MessageBox(hwndDlg, TranslateT("Failed to get the shells allocator!"), MSG_BOX_TITEL, MB_OK);

 						return TRUE; // TRUE because we have handled the message , sort of *S*

 					}

 

@@ -975,7 +977,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 					if ( ! lpDestDir )

 					{

 						pMalloc->Release();

-						MessageBox(hwndDlg , _T("Failed to Allocate buffer space"), MSG_BOX_TITEL, MB_OK);

+						MessageBox(hwndDlg , TranslateT("Failed to Allocate buffer space"), MSG_BOX_TITEL, MB_OK);

 						return TRUE;

 					}

 

@@ -1310,7 +1312,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts2(HWND hwndDlg, UINT msg, WPARAM wPa
 				LVCOLUMN cCol = { 0 };

 				cCol.mask = LVCF_TEXT | LVCF_WIDTH;

 				cCol.cx = nColumnWidth;

-				cCol.pszText = LPGENT("Export Protocols");

+				cCol.pszText = TranslateT("Export Protocols");

 				ListView_InsertColumn( hMapUser , 0 , &cCol );

 			}

 

@@ -1333,7 +1335,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts2(HWND hwndDlg, UINT msg, WPARAM wPa
 

 				for( int i=0 ; i < nCount ; i++) 

 				{

-					_snprintf(szTemp , sizeof( szTemp ) , "DisableProt_%s" , proto[i]->szModuleName);

+					mir_snprintf(szTemp, SIZEOF(szTemp), "DisableProt_%s", proto[i]->szModuleName);

 					sItem.pszText = proto[i]->szModuleName;

 					sItem.iImage = db_get_b(NULL,MODULE,szTemp,1);

 					::SendMessage( hMapUser , LVM_INSERTITEMA , 0 ,(LPARAM)&sItem );

@@ -1439,11 +1441,10 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts2(HWND hwndDlg, UINT msg, WPARAM wPa
 

 int OptionsInitialize(WPARAM wParam,LPARAM /*lParam*/)

 {

-	OPTIONSDIALOGPAGE odp;

+	OPTIONSDIALOGPAGE odp = {0};

 

 	bUnaplyedChanges = FALSE;

 

-	ZeroMemory(&odp,sizeof(odp));

 	odp.cbSize = sizeof(odp);

 	odp.position = 100000000;

 	odp.hInstance = hInstance;

@@ -1451,15 +1452,15 @@ int OptionsInitialize(WPARAM wParam,LPARAM /*lParam*/)
 	odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR;

 	odp.ptszTitle = LPGENT("Message export");

 	odp.ptszGroup = LPGENT("History");

+	odp.ptszTab = LPGENT("General");

 	odp.groupPosition = 100000000;

 	odp.pfnDlgProc = DlgProcMsgExportOpts;

-	Options_AddPage(wParam,&odp);

-

+	Options_AddPage(wParam, &odp);

 	

 	odp.position = 100000001;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGEXPORT2);

-	odp.ptszTitle = LPGENT("Message export2");

+	odp.ptszTab = LPGENT("Additional");

 	odp.pfnDlgProc = DlgProcMsgExportOpts2;

-	Options_AddPage(wParam,&odp);

+	Options_AddPage(wParam, &odp);

 	return 0;

 }