diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-19 14:52:53 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-19 14:52:53 +0000 |
| commit | 54dec7a74c313ee61437386bd667f9a7653351fd (patch) | |
| tree | 81aaf9bf469838735392a81ed3edfc3b3bd7481f /src | |
| parent | 03dd87df0b288fd0f0f512fb0bbff29e8c00f366 (diff) | |
fixes for the options page translation
git-svn-id: http://svn.miranda-ng.org/main/trunk@479 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/contacts/contacts.cpp | 22 | ||||
| -rw-r--r-- | src/modules/icolib/skin2icons.cpp | 1 | ||||
| -rw-r--r-- | src/modules/netlib/netlibopts.cpp | 6 | ||||
| -rw-r--r-- | src/modules/options/filter.cpp | 9 | ||||
| -rw-r--r-- | src/modules/skin/hotkeys.cpp | 6 | ||||
| -rw-r--r-- | src/modules/srfile/fileopts.cpp | 2 | ||||
| -rw-r--r-- | src/modules/updatenotify/updatenotify.cpp | 7 |
7 files changed, 24 insertions, 29 deletions
diff --git a/src/modules/contacts/contacts.cpp b/src/modules/contacts/contacts.cpp index 11180fb52c..a2959909a4 100644 --- a/src/modules/contacts/contacts.cpp +++ b/src/modules/contacts/contacts.cpp @@ -492,21 +492,17 @@ static int ContactOptInit(WPARAM wParam, LPARAM) return 0;
}
-int LoadContactsModule(void) {
- {
- // Load the name order
- BYTE i;
- DBVARIANT dbv;
-
- for (i=0; i<NAMEORDERCOUNT; i++)
- nameOrder[i]=i;
+int LoadContactsModule(void)
+{
+ for (BYTE i=0; i < NAMEORDERCOUNT; i++)
+ nameOrder[i]=i;
- if ( !DBGetContactSetting(NULL, "Contact", "NameOrder", &dbv))
- {
- CopyMemory(nameOrder, dbv.pbVal, dbv.cpbVal);
- DBFreeVariant(&dbv);
- }
+ DBVARIANT dbv;
+ if ( !DBGetContactSetting(NULL, "Contact", "NameOrder", &dbv)) {
+ CopyMemory(nameOrder, dbv.pbVal, dbv.cpbVal);
+ DBFreeVariant(&dbv);
}
+
CreateServiceFunction(MS_CONTACT_GETCONTACTINFO, GetContactInfo);
HookEvent(ME_OPT_INITIALISE, ContactOptInit);
return 0;
diff --git a/src/modules/icolib/skin2icons.cpp b/src/modules/icolib/skin2icons.cpp index e02fcf579a..810c15d741 100644 --- a/src/modules/icolib/skin2icons.cpp +++ b/src/modules/icolib/skin2icons.cpp @@ -1833,7 +1833,6 @@ static UINT iconsExpertOnlyControls[]={IDC_IMPORT}; static int SkinOptionsInit(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = {0};
-
odp.cbSize = sizeof(odp);
odp.hInstance = hMirandaInst;
odp.flags = ODPF_BOLDGROUPS;
diff --git a/src/modules/netlib/netlibopts.cpp b/src/modules/netlib/netlibopts.cpp index 2ce5282f2b..20e90d9932 100644 --- a/src/modules/netlib/netlibopts.cpp +++ b/src/modules/netlib/netlibopts.cpp @@ -536,9 +536,11 @@ int NetlibOptInitialise(WPARAM wParam, LPARAM) int optionsCount = 0;
EnterCriticalSection(&csNetlibUser);
for (int i = 0; i < netlibUser.getCount(); ++i)
- if ( !(netlibUser[i]->user.flags & NUF_NOOPTIONS)) ++optionsCount;
+ if ( !(netlibUser[i]->user.flags & NUF_NOOPTIONS))
+ ++optionsCount;
LeaveCriticalSection(&csNetlibUser);
- if (optionsCount == 0) return 0;
+ if (optionsCount == 0)
+ return 0;
OPTIONSDIALOGPAGE odp = { 0 };
diff --git a/src/modules/options/filter.cpp b/src/modules/options/filter.cpp index b68efeda9c..2ea0aa4752 100644 --- a/src/modules/options/filter.cpp +++ b/src/modules/options/filter.cpp @@ -189,18 +189,17 @@ static INT_PTR CALLBACK DlgProcOptSearch(HWND hWnd, UINT msg, WPARAM wParam, LPA static int OnOptionsInitialise(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = {0};
-
+
odp.cbSize = sizeof(odp);
odp.position = -190000000;
odp.hInstance = hMirandaInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_KEYWORDFILTER);
- odp.ptszTitle = TranslateT("Options search");
- odp.ptszGroup = TranslateT("Customize");
+ odp.pszTitle = LPGEN("Options search");
+ odp.pszGroup = LPGEN("Customize");
odp.groupPosition = 810000000;
- odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
+ odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOptSearch;
Options_AddPage(wParam, &odp);
-
return 0;
}
diff --git a/src/modules/skin/hotkeys.cpp b/src/modules/skin/hotkeys.cpp index e9588c30ad..7d01f93a01 100644 --- a/src/modules/skin/hotkeys.cpp +++ b/src/modules/skin/hotkeys.cpp @@ -1367,11 +1367,11 @@ static int sttOptionsInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = {0};
odp.cbSize = sizeof(odp);
odp.hInstance = hMirandaInst;
- odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
+ odp.flags = ODPF_BOLDGROUPS;
odp.position = -180000000;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_HOTKEYS);
- odp.ptszTitle = TranslateT("Hotkeys");
- odp.ptszGroup = TranslateT("Customize");
+ odp.pszTitle = LPGEN("Hotkeys");
+ odp.pszGroup = LPGEN("Customize");
odp.pfnDlgProc = sttOptionsDlgProc;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/src/modules/srfile/fileopts.cpp b/src/modules/srfile/fileopts.cpp index bc6bafc3b5..aa4c78543b 100644 --- a/src/modules/srfile/fileopts.cpp +++ b/src/modules/srfile/fileopts.cpp @@ -231,7 +231,7 @@ static INT_PTR CALLBACK DlgProcFileOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L int FileOptInitialise(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp={0};
+ OPTIONSDIALOGPAGE odp = {0};
odp.cbSize = sizeof(odp);
odp.position = 900000000;
odp.hInstance = hMirandaInst;
diff --git a/src/modules/updatenotify/updatenotify.cpp b/src/modules/updatenotify/updatenotify.cpp index 6732fe777b..50129c960a 100644 --- a/src/modules/updatenotify/updatenotify.cpp +++ b/src/modules/updatenotify/updatenotify.cpp @@ -133,10 +133,9 @@ void UnloadUpdateNotifyModule() UnhookEvent(hHookPreShutdown);
}
-static int UpdateNotifyOptInit(WPARAM wParam, LPARAM) {
- OPTIONSDIALOGPAGE odp;
-
- ZeroMemory(&odp, sizeof(odp));
+static int UpdateNotifyOptInit(WPARAM wParam, LPARAM)
+{
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.cbSize = sizeof(odp);
odp.position = 100000000;
odp.hInstance = hMirandaInst;
|