From e946994785cb7b0159a7408ab6eb18ee68e41c0c Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 26 Jun 2010 19:55:05 +0000 Subject: [PATCH] [EVENTVWR] - Replace hard-coded column names by string resources. svn path=/trunk/; revision=47856 --- .../applications/mscutils/eventvwr/eventvwr.c | 55 ++++++++++++++++--- .../mscutils/eventvwr/lang/bg-BG.rc | 15 ++++- .../mscutils/eventvwr/lang/de-DE.rc | 13 +++++ .../mscutils/eventvwr/lang/el-GR.rc | 13 +++++ .../mscutils/eventvwr/lang/en-US.rc | 13 +++++ .../mscutils/eventvwr/lang/es-ES.rc | 13 +++++ .../mscutils/eventvwr/lang/fr-FR.rc | 13 +++++ .../mscutils/eventvwr/lang/it-IT.rc | 13 +++++ .../mscutils/eventvwr/lang/ja-JP.rc | 13 +++++ .../mscutils/eventvwr/lang/ko-KR.rc | 13 +++++ .../mscutils/eventvwr/lang/no-NO.rc | 13 +++++ .../mscutils/eventvwr/lang/pl-PL.rc | 13 +++++ .../mscutils/eventvwr/lang/ro-RO.rc | 13 +++++ .../mscutils/eventvwr/lang/ru-RU.rc | 13 +++++ .../mscutils/eventvwr/lang/sk-SK.rc | 13 +++++ .../mscutils/eventvwr/lang/uk-UA.rc | 13 +++++ .../applications/mscutils/eventvwr/resource.h | 25 ++++----- 17 files changed, 252 insertions(+), 25 deletions(-) diff --git a/reactos/base/applications/mscutils/eventvwr/eventvwr.c b/reactos/base/applications/mscutils/eventvwr/eventvwr.c index 011c0ec5da6..69086b132a9 100644 --- a/reactos/base/applications/mscutils/eventvwr/eventvwr.c +++ b/reactos/base/applications/mscutils/eventvwr/eventvwr.c @@ -757,6 +757,7 @@ InitInstance(HINSTANCE hInstance, { HIMAGELIST hSmall; LVCOLUMNW lvc = {0}; + WCHAR szTemp[256]; hInst = hInstance; // Store instance handle in our global variable @@ -820,39 +821,75 @@ InitInstance(HINSTANCE hInstance, // Now set up the listview with its columns. lvc.mask = LVCF_TEXT | LVCF_WIDTH; lvc.cx = 90; - lvc.pszText = L"Type"; + LoadStringW(hInstance, + IDS_COLUMNTYPE, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 0, &lvc); lvc.cx = 70; - lvc.pszText = L"Date"; + LoadStringW(hInstance, + IDS_COLUMNDATE, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 1, &lvc); lvc.cx = 70; - lvc.pszText = L"Time"; + LoadStringW(hInstance, + IDS_COLUMNTIME, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 2, &lvc); lvc.cx = 150; - lvc.pszText = L"Source"; + LoadStringW(hInstance, + IDS_COLUMNSOURCE, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 3, &lvc); lvc.cx = 100; - lvc.pszText = L"Category"; + LoadStringW(hInstance, + IDS_COLUMNCATEGORY, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 4, &lvc); lvc.cx = 60; - lvc.pszText = L"Event"; + LoadStringW(hInstance, + IDS_COLUMNEVENT, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 5, &lvc); lvc.cx = 120; - lvc.pszText = L"User"; + LoadStringW(hInstance, + IDS_COLUMNUSER, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 6, &lvc); lvc.cx = 100; - lvc.pszText = L"Computer"; + LoadStringW(hInstance, + IDS_COLUMNCOMPUTER, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 7, &lvc); lvc.cx = 0; - lvc.pszText = L"Event Data"; + LoadStringW(hInstance, + IDS_COLUMNEVENTDATA, + szTemp, + sizeof(szTemp) / sizeof(WCHAR)); + lvc.pszText = szTemp; (void)ListView_InsertColumn(hwndListView, 8, &lvc); ShowWindow(hwndMainWindow, nCmdShow); diff --git a/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc b/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc index c7ba4882b94..e861fac3785 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc @@ -83,8 +83,21 @@ BEGIN CONTROL "&Äóìè",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,85,194,33,10 END -STRINGTABLE +STRINGTABLE BEGIN IDS_APP_TITLE "Ïðåãëåä íà ñúáèòèÿ" IDC_EVENTSTRINGIDNOTFOUND "Íå å íàìåðåíî îïèñàíèåòî íà ñúáèòèå ( %lu ) â èçòî÷íèê ( %s ). Âúçìîæíî å ìåñòèÿò êîìïþòúð äà íÿìà íóæíèòå ñâåäåíèÿ â ðåãèñòúðà èëè DLL ôàéëîâåò, íóæíè çà ïîêàçâàíå íà ñúîáùåíèÿ îò îòäàëå÷åí êîìïþòúð." END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END diff --git a/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc b/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc index 19ed0b3fee9..f94062b474f 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc @@ -102,3 +102,16 @@ BEGIN IDC_EVENTLOG_SUCCESS "Erfolgreich" IDC_EVENTLOG_UNKNOWN_TYPE "Unbekanntes Ereignis" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Typ" + IDS_COLUMNDATE "Datum" + IDS_COLUMNTIME "Zeit" + IDS_COLUMNSOURCE "Quelle" + IDS_COLUMNCATEGORY "Kategorie" + IDS_COLUMNEVENT "Ereignis" + IDS_COLUMNUSER "Benutzer" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Ereignisdaten" +END diff --git a/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc b/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc index 614ae023717..8a2df37476b 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc @@ -102,3 +102,16 @@ BEGIN IDC_EVENTLOG_SUCCESS "Åðéôõ÷ßá" IDC_EVENTLOG_UNKNOWN_TYPE "¢ãíùóôï óõìâÜí" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END diff --git a/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc b/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc index 3264949b450..74a6c9f7730 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc @@ -102,3 +102,16 @@ BEGIN IDC_EVENTLOG_SUCCESS "Success" IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END \ No newline at end of file diff --git a/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc b/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc index 252fe201ed1..472a84337b3 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc @@ -102,3 +102,16 @@ BEGIN IDC_EVENTLOG_SUCCESS "Acierto" IDC_EVENTLOG_UNKNOWN_TYPE "Evento Desconocido" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END diff --git a/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc b/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc index 1ed8d0ffe4d..f26d5c509e3 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc @@ -102,3 +102,16 @@ BEGIN IDC_EVENTLOG_SUCCESS "Succès" IDC_EVENTLOG_UNKNOWN_TYPE "Événement Inconnu" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END diff --git a/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc b/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc index 06522bf71cb..06f79e19a81 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc @@ -102,3 +102,16 @@ BEGIN IDC_EVENTLOG_SUCCESS "Successo" IDC_EVENTLOG_UNKNOWN_TYPE "Evento sconosciuto" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END diff --git a/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc b/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc index 7835f19989b..8c250a3c686 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc @@ -102,3 +102,16 @@ BEGIN IDC_EVENTLOG_SUCCESS "¬Œ÷" IDC_EVENTLOG_UNKNOWN_TYPE "•s–¾‚ȃCƒxƒ“ƒg" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END diff --git a/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc b/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc index c5b9ee65369..682e625d421 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc @@ -98,3 +98,16 @@ BEGIN IDC_EVENTLOG_SUCCESS "¼º°ø" IDC_EVENTLOG_UNKNOWN_TYPE "¾Ë·ÁÁöÁö ¾ÊÀº À̺¥Æ®" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END diff --git a/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc b/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc index 7458ee7fa71..acc715446e2 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc @@ -102,3 +102,16 @@ BEGIN IDC_EVENTLOG_SUCCESS "Suksess" IDC_EVENTLOG_UNKNOWN_TYPE "Ukjent hendelse" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END diff --git a/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc b/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc index 08cf90b56b0..6ad26c24f47 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc @@ -106,3 +106,16 @@ BEGIN IDC_EVENTLOG_SUCCESS "Sukces" IDC_EVENTLOG_UNKNOWN_TYPE "Zdarzenie nieznane" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END diff --git a/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc b/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc index 22b4656a101..90779956fdf 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc @@ -102,3 +102,16 @@ BEGIN IDC_EVENTLOG_SUCCESS "Succes" IDC_EVENTLOG_UNKNOWN_TYPE "Eveniment necunoscut" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END diff --git a/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc b/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc index 4c78a796050..a215c1579f6 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc @@ -102,3 +102,16 @@ BEGIN IDC_EVENTLOG_SUCCESS "Óñïåõ" IDC_EVENTLOG_UNKNOWN_TYPE "Íåèçâåñòíîå ñîáûòèå" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END diff --git a/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc b/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc index c4bc5c278d2..71d5da8ed93 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc @@ -99,3 +99,16 @@ BEGIN IDC_EVENTLOG_SUCCESS "Úspech" //Success IDC_EVENTLOG_UNKNOWN_TYPE "Neznáma udalos" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END diff --git a/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc b/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc index 1ae8ca5c876..e087615ca8e 100644 --- a/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc +++ b/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc @@ -102,3 +102,16 @@ BEGIN IDC_EVENTLOG_SUCCESS "Óñï³õ" IDC_EVENTLOG_UNKNOWN_TYPE "Íåâ³äîìà ïîä³ÿ" END + +STRINGTABLE +BEGIN + IDS_COLUMNTYPE "Type" + IDS_COLUMNDATE "Date" + IDS_COLUMNTIME "Time" + IDS_COLUMNSOURCE "Source" + IDS_COLUMNCATEGORY "Category" + IDS_COLUMNEVENT "Event" + IDS_COLUMNUSER "User" + IDS_COLUMNCOMPUTER "Computer" + IDS_COLUMNEVENTDATA "Event Data" +END diff --git a/reactos/base/applications/mscutils/eventvwr/resource.h b/reactos/base/applications/mscutils/eventvwr/resource.h index 2ef55b469ce..5ed5016949b 100644 --- a/reactos/base/applications/mscutils/eventvwr/resource.h +++ b/reactos/base/applications/mscutils/eventvwr/resource.h @@ -1,7 +1,3 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by eventvwr.rc -// #define IDC_MYICON 2 #define IDNEXT 3 #define IDD_EVENTVWR_DIALOG 102 @@ -54,14 +50,13 @@ #define IDM_REFRESH 32782 #define IDC_STATIC -1 -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 133 -#define _APS_NEXT_COMMAND_VALUE 32783 -#define _APS_NEXT_CONTROL_VALUE 1012 -#define _APS_NEXT_SYMED_VALUE 110 -#endif -#endif + +#define IDS_COLUMNTYPE 300 +#define IDS_COLUMNDATE 301 +#define IDS_COLUMNTIME 302 +#define IDS_COLUMNSOURCE 303 +#define IDS_COLUMNCATEGORY 304 +#define IDS_COLUMNEVENT 305 +#define IDS_COLUMNUSER 306 +#define IDS_COLUMNCOMPUTER 307 +#define IDS_COLUMNEVENTDATA 308 -- 2.17.1