Makes it a bit tidier
Changelog
+ Use resource ids IDM_*, IDS_* instead of numbers
+ Move ... from toplevel "Info..." onto sub items (eg "About")
diff -u -r programs/clock/clock_res.h programs/clock/clock_res.h
--- programs/clock/clock_res.h 2002-03-27 21:17:01.000000000 +0000
+++ programs/clock/clock_res.h 2003-11-28 14:57:57.000000000 +0000
@@ -16,6 +16,19 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#define CLOCK 0x10C
-#define MENU_ON_TOP 0x10D
-#define MAIN_MENU 0x10E
+#define MAIN_MENU 0x100
+#define IDM_ANALOG 0x101
+#define IDM_DIGITAL 0x102
+#define IDM_FONT 0x103
+#define IDM_NOTITLE 0x104
+#define IDM_SECONDS 0x105
+#define IDM_DATE 0x106
+
+#define IDM_LICENSE 0x110
+#define IDM_NOWARRANTY 0x111
+#define IDM_ABOUT 0x112
+
+#define IDM_ONTOP 0x113
+
+#define IDS_CLOCK 0x10C
+#define IDS_ONTOP 0x10D
diff -u -r programs/clock/Da.rc programs/clock/Da.rc
--- programs/clock/Da.rc 2003-01-05 01:08:14.000000000 +0000
+++ programs/clock/Da.rc 2003-11-28 15:38:30.000000000 +0000
@@ -22,25 +22,25 @@
MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
{
POPUP "&Instillinger" {
- MENUITEM "&Analog", 0x100
- MENUITEM "&Digital", 0x101
+ MENUITEM "&Analog", IDM_ANALOG
+ MENUITEM "&Digital", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "&Skrifttype...", 0x103
+ MENUITEM "&Skrifttype...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "Skjul Titel&linje", 0x105
+ MENUITEM "Skjul Titel&linje", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "Se&kunder", 0x107
- MENUITEM "Da&to", 0x108
+ MENUITEM "Se&kunder", IDM_SECONDS
+ MENUITEM "Da&to", IDM_DATE
}
- POPUP "Inf&o..." {
- MENUITEM "&Licens", 0x109
- MENUITEM "&NO WARRANTY", 0x10A
- MENUITEM "&Om Ur...", 0x10B
+ POPUP "Inf&o" {
+ MENUITEM "&Licens...", IDM_LICENSE
+ MENUITEM "&NO WARRANTY...", IDM_NOWARRANTY
+ MENUITEM "&Om Ur...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
{
-CLOCK, "Ur"
-MENU_ON_TOP, "&Altid øverst"
+IDS_CLOCK, "Ur"
+IDS_ONTOP, "&Altid øverst"
}
diff -u -r programs/clock/De.rc programs/clock/De.rc
--- programs/clock/De.rc 2003-01-05 01:08:14.000000000 +0000
+++ programs/clock/De.rc 2003-11-28 15:23:51.000000000 +0000
@@ -22,25 +22,25 @@
MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
{
POPUP "&Einstellungen" {
- MENUITEM "Ana&log", 0x100
- MENUITEM "Digi&tal", 0x101
+ MENUITEM "Ana&log", IDM_ANALOG
+ MENUITEM "Digi&tal", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "Schrift&art...", 0x103
+ MENUITEM "Schrift&art...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "&Ohne Titelleiste", 0x105
+ MENUITEM "&Ohne Titelleiste", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "&Sekunden", 0x107
- MENUITEM "&Datum", 0x108
+ MENUITEM "&Sekunden", IDM_SECONDS
+ MENUITEM "&Datum", IDM_DATE
}
- POPUP "Inf&o..." {
- MENUITEM "&Lizenz", 0x109
- MENUITEM "&KEINE GARANTIE", 0x10A
- MENUITEM "&Über Uhr", 0x10B
+ POPUP "Inf&o" {
+ MENUITEM "&Lizenz...", IDM_LICENSE
+ MENUITEM "&KEINE GARANTIE...", IDM_NOWARRANTY
+ MENUITEM "&Über Uhr...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
{
-CLOCK, "Uhr"
-MENU_ON_TOP, "&Immer im Vordergrund"
+IDS_CLOCK, "Uhr"
+IDS_ONTOP, "&Immer im Vordergrund"
}
diff -u -r programs/clock/En.rc programs/clock/En.rc
--- programs/clock/En.rc 2003-06-23 19:15:15.000000000 +0100
+++ programs/clock/En.rc 2003-11-28 15:20:45.000000000 +0000
@@ -24,25 +24,25 @@
MAIN_MENU MENU
{
POPUP "&Properties" {
- MENUITEM "Ana&log", 0x100
- MENUITEM "Digi&tal", 0x101
+ MENUITEM "Ana&log", IDM_ANALOG
+ MENUITEM "Digi&tal", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "&Font...", 0x103
+ MENUITEM "&Font...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "&Without Titlebar", 0x105
+ MENUITEM "&Without Titlebar", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "&Seconds", 0x107
- MENUITEM "&Date", 0x108
+ MENUITEM "&Seconds", IDM_SECONDS
+ MENUITEM "&Date", IDM_DATE
}
- POPUP "Inf&o..." {
- MENUITEM "&License", 0x109
- MENUITEM "&NO WARRANTY", 0x10A
- MENUITEM "&About Clock... ", 0x10B
+ POPUP "Inf&o" {
+ MENUITEM "&License...", IDM_LICENSE
+ MENUITEM "&NO WARRANTY...", IDM_NOWARRANTY
+ MENUITEM "&About Clock...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE
{
-CLOCK, "Clock"
-MENU_ON_TOP, "&Always on Top"
+IDS_CLOCK, "Clock"
+IDS_ONTOP, "&Always on Top"
}
diff -u -r programs/clock/Es.rc programs/clock/Es.rc
--- programs/clock/Es.rc 2003-08-24 10:44:55.000000000 +0100
+++ programs/clock/Es.rc 2003-11-28 15:20:45.000000000 +0000
@@ -24,25 +24,25 @@
MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
{
POPUP "&Propiedades" {
- MENUITEM "Ana&lógico", 0x100
- MENUITEM "Digi&tal", 0x101
+ MENUITEM "Ana&lógico", IDM_ANALOG
+ MENUITEM "Digi&tal", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "&Fuente...", 0x103
+ MENUITEM "&Fuente...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "Sin barra de &título", 0x105
+ MENUITEM "Sin barra de &título", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "&Segundos", 0x107
- MENUITEM "Fe&cha", 0x108
+ MENUITEM "&Segundos", IDM_SECONDS
+ MENUITEM "Fe&cha", IDM_DATE
}
- POPUP "Inf&o..." {
- MENUITEM "&Licencia", 0x109
- MENUITEM "&SIN &GARANTÍA", 0x10A
- MENUITEM "&Acerca del Reloj...", 0x10B
+ POPUP "Inf&o" {
+ MENUITEM "&Licencia...", IDM_LICENSE
+ MENUITEM "&SIN &GARANTÍA...", IDM_NOWARRANTY
+ MENUITEM "&Acerca del Reloj...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
{
-CLOCK, "Reloj"
-MENU_ON_TOP, "Siempre &visible"
+IDS_CLOCK, "Reloj"
+IDS_ONTOP, "Siempre &visible"
}
diff -u -r programs/clock/Fi.rc programs/clock/Fi.rc
--- programs/clock/Fi.rc 2003-01-05 01:08:14.000000000 +0000
+++ programs/clock/Fi.rc 2003-11-28 15:20:45.000000000 +0000
@@ -22,25 +22,25 @@
MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
{
POPUP "&Ominaisuudet" {
- MENUITEM "&Analoginen", 0x100
- MENUITEM "Di&gitaalinen", 0x101
+ MENUITEM "&Analoginen", IDM_ANALOG
+ MENUITEM "Di&gitaalinen", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "&Fontti...", 0x103
+ MENUITEM "&Fontti...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "&Ilman otsikkopalkkia", 0x105
+ MENUITEM "&Ilman otsikkopalkkia", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "&Sekunnit", 0x107
- MENUITEM "&Päivämäärä", 0x108
+ MENUITEM "&Sekunnit", IDM_SECONDS
+ MENUITEM "&Päivämäärä", IDM_DATE
}
- POPUP "Inf&o..." {
- MENUITEM "&Lisenssi", 0x109
- MENUITEM "&EI TAKUUTA", 0x10A
- MENUITEM "&Kellosta...", 0x10B
+ POPUP "Inf&o" {
+ MENUITEM "&Lisenssi...", IDM_LICENSE
+ MENUITEM "&EI TAKUUTA...", IDM_NOWARRANTY
+ MENUITEM "&Kellosta...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
{
-CLOCK, "Kello"
-MENU_ON_TOP, "&Aina päällimmäisenä"
+IDS_CLOCK, "Kello"
+IDS_ONTOP, "&Aina päällimmäisenä"
}
Only in programs/clock/: fixup.sed
diff -u -r programs/clock/Fr.rc programs/clock/Fr.rc
--- programs/clock/Fr.rc 2003-09-16 08:07:45.000000000 +0100
+++ programs/clock/Fr.rc 2003-11-28 15:23:51.000000000 +0000
@@ -24,25 +24,25 @@
MAIN_MENU MENU
{
POPUP "&Propriétés" {
- MENUITEM "Ana&logique", 0x100
- MENUITEM "&Numérique", 0x101
+ MENUITEM "Ana&logique", IDM_ANALOG
+ MENUITEM "&Numérique", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "&Police...", 0x103
+ MENUITEM "&Police...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "Sans &barre de titre", 0x105
+ MENUITEM "Sans &barre de titre", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "&Secondes", 0x107
- MENUITEM "&Date", 0x108
+ MENUITEM "&Secondes", IDM_SECONDS
+ MENUITEM "&Date", IDM_DATE
}
- POPUP "Inf&o..." {
- MENUITEM "&Licence", 0x109
- MENUITEM "AUCUNE &GARANTIE", 0x10A
- MENUITEM "&A propos de Horloge", 0x10B
+ POPUP "Inf&o" {
+ MENUITEM "&Licence...", IDM_LICENSE
+ MENUITEM "AUCUNE &GARANTIE...", IDM_NOWARRANTY
+ MENUITEM "&A propos de Horloge...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE
{
-CLOCK, "Horloge"
-MENU_ON_TOP, "&Toujours visible"
+IDS_CLOCK, "Horloge"
+IDS_ONTOP, "&Toujours visible"
}
diff -u -r programs/clock/Hu.rc programs/clock/Hu.rc
--- programs/clock/Hu.rc 2002-11-04 22:45:23.000000000 +0000
+++ programs/clock/Hu.rc 2003-11-28 15:20:45.000000000 +0000
@@ -23,25 +23,25 @@
MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
{
POPUP "&Beállítások" {
- MENUITEM "Ana&lóg", 0x100
- MENUITEM "Digi&tális", 0x101
+ MENUITEM "Ana&lóg", IDM_ANALOG
+ MENUITEM "Digi&tális", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "&Betûtípus...", 0x103
+ MENUITEM "&Betûtípus...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "&Címsor nélkül", 0x105
+ MENUITEM "&Címsor nélkül", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "&Másodperc", 0x107
- MENUITEM "&Dátum", 0x108
+ MENUITEM "&Másodperc", IDM_SECONDS
+ MENUITEM "&Dátum", IDM_DATE
}
- POPUP "Inf&ormáció..." {
- MENUITEM "&Licenc", 0x109
- MENUITEM "&SEMMI GARANCIA", 0x10A
- MENUITEM "&Óra névjegy... ", 0x10B
+ POPUP "Inf&ormáció" {
+ MENUITEM "&Licenc...", IDM_LICENSE
+ MENUITEM "&SEMMI GARANCIA...", IDM_NOWARRANTY
+ MENUITEM "&Óra névjegy...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
{
-CLOCK, "Óra"
-MENU_ON_TOP, "&Mindig legfelül"
+IDS_CLOCK, "Óra"
+IDS_ONTOP, "&Mindig legfelül"
}
diff -u -r programs/clock/It.rc programs/clock/It.rc
--- programs/clock/It.rc 2003-11-18 10:54:55.000000000 +0000
+++ programs/clock/It.rc 2003-11-28 15:23:51.000000000 +0000
@@ -25,25 +25,25 @@
MAIN_MENU MENU
{
POPUP "&Properietà" {
- MENUITEM "Ana&logico", 0x100
- MENUITEM "Digi&tale", 0x101
+ MENUITEM "Ana&logico", IDM_ANALOG
+ MENUITEM "Digi&tale", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "&Font...", 0x103
+ MENUITEM "&Font...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "&Nascondi la barra del titolo", 0x105
+ MENUITEM "&Nascondi la barra del titolo", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "&Secondi", 0x107
- MENUITEM "&Data", 0x108
+ MENUITEM "&Secondi", IDM_SECONDS
+ MENUITEM "&Data", IDM_DATE
}
- POPUP "Inf&o..." {
- MENUITEM "&Licenza", 0x109
- MENUITEM "&Garanzia", 0x10A
- MENUITEM "&Informazioni sull'orologio", 0x10B
+ POPUP "Inf&o" {
+ MENUITEM "&Licenza...", IDM_LICENSE
+ MENUITEM "&Garanzia...", IDM_NOWARRANTY
+ MENUITEM "&Informazioni sull'orologio...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE
{
-CLOCK, "Orologio"
-MENU_ON_TOP, "&Sempre in primo piano"
+IDS_CLOCK, "Orologio"
+IDS_ONTOP, "&Sempre in primo piano"
}
diff -u -r programs/clock/language.c programs/clock/language.c
--- programs/clock/language.c 2003-07-11 22:53:07.000000000 +0100
+++ programs/clock/language.c 2003-11-28 15:34:35.000000000 +0000
@@ -33,32 +33,26 @@
/* analog clock */
- CheckMenuItem(Globals.hPropertiesMenu, 0x100,
- MF_BYCOMMAND | MF_CHECKED);
- CheckMenuItem(Globals.hPropertiesMenu, 0x101,
- MF_BYCOMMAND | MF_UNCHECKED);
- EnableMenuItem(Globals.hPropertiesMenu, 0x103,
- MF_BYCOMMAND | MF_GRAYED);
+ CheckMenuItem(Globals.hPropertiesMenu, IDM_ANALOG, MF_BYCOMMAND | MF_CHECKED);
+ CheckMenuItem(Globals.hPropertiesMenu, IDM_DIGITAL, MF_BYCOMMAND | MF_UNCHECKED);
+ EnableMenuItem(Globals.hPropertiesMenu, IDM_FONT, MF_BYCOMMAND | MF_GRAYED);
}
else
{
/* digital clock */
- CheckMenuItem(Globals.hPropertiesMenu, 0x100,
- MF_BYCOMMAND | MF_UNCHECKED);
- CheckMenuItem(Globals.hPropertiesMenu, 0x101,
- MF_BYCOMMAND | MF_CHECKED);
- EnableMenuItem(Globals.hPropertiesMenu, 0x103,
- MF_BYCOMMAND);
+ CheckMenuItem(Globals.hPropertiesMenu, IDM_ANALOG, MF_BYCOMMAND | MF_UNCHECKED);
+ CheckMenuItem(Globals.hPropertiesMenu, IDM_DIGITAL, MF_BYCOMMAND | MF_CHECKED);
+ EnableMenuItem(Globals.hPropertiesMenu, IDM_FONT, MF_BYCOMMAND);
}
- CheckMenuItem(Globals.hPropertiesMenu, 0x105, MF_BYCOMMAND |
+ CheckMenuItem(Globals.hPropertiesMenu, IDM_NOTITLE, MF_BYCOMMAND |
(Globals.bWithoutTitle ? MF_CHECKED : MF_UNCHECKED));
- CheckMenuItem(Globals.hSystemMenu, 0x10D, MF_BYCOMMAND |
+ CheckMenuItem(Globals.hSystemMenu, IDM_ONTOP, MF_BYCOMMAND |
(Globals.bAlwaysOnTop ? MF_CHECKED : MF_UNCHECKED));
- CheckMenuItem(Globals.hPropertiesMenu, 0x107, MF_BYCOMMAND |
+ CheckMenuItem(Globals.hPropertiesMenu, IDM_SECONDS, MF_BYCOMMAND |
(Globals.bSeconds ? MF_CHECKED : MF_UNCHECKED));
- CheckMenuItem(Globals.hPropertiesMenu, 0x108, MF_BYCOMMAND |
+ CheckMenuItem(Globals.hPropertiesMenu, IDM_DATE, MF_BYCOMMAND |
(Globals.bDate ? MF_CHECKED : MF_UNCHECKED));
}
@@ -77,7 +71,7 @@
MAX_STRING_LEN);
/* Set frame caption */
- LoadString(Globals.hInstance, 0x10C, szCaption, sizeof(szCaption));
+ LoadString(Globals.hInstance, IDS_CLOCK, szCaption, sizeof(szCaption));
if (Globals.bDate) {
lstrcat(szCaption, " - ");
lstrcat(szCaption, szDate);
@@ -111,8 +105,8 @@
/* FIXME: Append a SEPARATOR to Globals.hSystemMenu here */
- LoadString(Globals.hInstance, 0x10D, szItem, sizeof(szItem));
- AppendMenu(Globals.hSystemMenu, MF_STRING | MF_BYCOMMAND, 1000, szItem);
+ LoadString(Globals.hInstance, IDS_ONTOP, szItem, sizeof(szItem));
+ AppendMenu(Globals.hSystemMenu, MF_STRING | MF_BYCOMMAND, IDM_ONTOP, szItem);
}
/*
diff -u -r programs/clock/main.c programs/clock/main.c
--- programs/clock/main.c 2003-07-17 08:49:17.000000000 +0100
+++ programs/clock/main.c 2003-11-28 15:37:06.000000000 +0000
@@ -54,64 +54,64 @@
CHAR szAppRelease[MAX_STRING_LEN];
switch (wParam) {
/* switch to analog */
- case 0x100: {
+ case IDM_ANALOG: {
Globals.bAnalog = TRUE;
LANGUAGE_UpdateMenuCheckmarks();
SendMessage(Globals.hMainWnd, WM_PAINT, 0, 0);
break;
}
/* switch to digital */
- case 0x101: {
+ case IDM_DIGITAL: {
Globals.bAnalog = FALSE;
LANGUAGE_UpdateMenuCheckmarks();
SendMessage(Globals.hMainWnd, WM_PAINT, 0, 0);
break;
}
/* change font */
- case 0x103: {
+ case IDM_FONT: {
MAIN_FileChooseFont();
break;
}
/* hide title bar */
- case 0x105: {
+ case IDM_NOTITLE: {
Globals.bWithoutTitle = !Globals.bWithoutTitle;
LANGUAGE_UpdateWindowCaption();
LANGUAGE_UpdateMenuCheckmarks();
break;
}
/* always on top */
- case 0x10D: {
+ case IDM_ONTOP: {
Globals.bAlwaysOnTop = !Globals.bAlwaysOnTop;
LANGUAGE_UpdateMenuCheckmarks();
break;
}
/* show or hide seconds */
- case 0x107: {
+ case IDM_SECONDS: {
Globals.bSeconds = !Globals.bSeconds;
LANGUAGE_UpdateMenuCheckmarks();
SendMessage(Globals.hMainWnd, WM_PAINT, 0, 0);
break;
}
/* show or hide date */
- case 0x108: {
+ case IDM_DATE: {
Globals.bDate = !Globals.bDate;
LANGUAGE_UpdateMenuCheckmarks();
LANGUAGE_UpdateWindowCaption();
break;
}
/* show license */
- case 0x109: {
+ case IDM_LICENSE: {
WineLicense(Globals.hMainWnd);
break;
}
/* show warranties */
- case 0x10A: {
+ case IDM_NOWARRANTY: {
WineWarranty(Globals.hMainWnd);
break;
}
/* show "about" box */
- case 0x10B: {
- LoadString(Globals.hInstance, 0x10C, szApp, sizeof(szApp));
+ case IDM_ABOUT: {
+ LoadString(Globals.hInstance, IDS_CLOCK, szApp, sizeof(szApp));
lstrcpy(szAppRelease,szApp);
lstrcat(szAppRelease,"\n" PACKAGE_STRING);
ShellAbout(Globals.hMainWnd, szApp, szAppRelease, 0);
diff -u -r programs/clock/main.h programs/clock/main.h
--- programs/clock/main.h 2002-06-01 00:40:58.000000000 +0100
+++ programs/clock/main.h 2003-11-28 15:40:48.000000000 +0000
@@ -27,9 +27,6 @@
#define HELPFILE "clock.hlp"
#define DEFAULTICON OIC_WINLOGO
-/* hide the following from winerc */
-#ifndef RC_INVOKED
-
typedef struct
{
HANDLE hInstance;
@@ -61,42 +58,4 @@
/* function prototypes */
VOID MAIN_FileChooseFont(VOID);
-/* class names */
-
-/* Resource names */
-extern CHAR STRING_MENU_Xx[];
-
- #define STRINGID(id) (0x##id + Globals.wStringTableOffset)
-
-#else /* RC_INVOKED */
-
- #define STRINGID(id) id
-
-#endif
-
-/* string table index */
-#define IDS_LANGUAGE_ID STRINGID(00)
-#define IDS_LANGUAGE_MENU_ITEM STRINGID(01)
-#define IDS_CLOCK STRINGID(02)
-#define IDS_MENU_ON_TOP STRINGID(03)
-
-/* main menu */
-
-#define CL_ON_TOP 99
-
-#define CL_ANALOG 100
-#define CL_DIGITAL 101
-#define CL_FONT 102
-#define CL_WITHOUT_TITLE 103
-#define CL_SECONDS 104
-#define CL_DATE 105
-
-#define CL_LANGUAGE 200
-
-#define CL_INFO 301
-#define CL_INFO_LICENSE 302
-#define CL_INFO_NO_WARRANTY 303
-#define CL_INFO_ABOUT_WINE 304
-#define CL_FIRST_LANGUAGE 200
-#define CL_LAST_LANGUAGE 220
diff -u -r programs/clock/Nl.rc programs/clock/Nl.rc
--- programs/clock/Nl.rc 2003-10-01 04:04:33.000000000 +0100
+++ programs/clock/Nl.rc 2003-11-28 15:20:45.000000000 +0000
@@ -23,25 +23,25 @@
MAIN_MENU MENU
{
POPUP "&Eigenschappen" {
- MENUITEM "&Analoog", 0x100
- MENUITEM "&Digitaal", 0x101
+ MENUITEM "&Analoog", IDM_ANALOG
+ MENUITEM "&Digitaal", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "&Lettertype...", 0x103
+ MENUITEM "&Lettertype...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "&Zonder titelbalk", 0x105
+ MENUITEM "&Zonder titelbalk", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "&Seconden", 0x107
- MENUITEM "Da&tum", 0x108
+ MENUITEM "&Seconden", IDM_SECONDS
+ MENUITEM "Da&tum", IDM_DATE
}
- POPUP "Inf&o..." {
- MENUITEM "&Licentie", 0x109
- MENUITEM "&GEEN GARANTIE", 0x10A
- MENUITEM "&Over Klok... ", 0x10B
+ POPUP "Inf&o" {
+ MENUITEM "&Licentie...", IDM_LICENSE
+ MENUITEM "&GEEN GARANTIE...", IDM_NOWARRANTY
+ MENUITEM "&Over Klok...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE
{
-CLOCK, "Klok"
-MENU_ON_TOP, "&Altijd op de voorgrond"
+IDS_CLOCK, "Klok"
+IDS_ONTOP, "&Altijd op de voorgrond"
}
diff -u -r programs/clock/Pt.rc programs/clock/Pt.rc
--- programs/clock/Pt.rc 2003-06-23 19:15:15.000000000 +0100
+++ programs/clock/Pt.rc 2003-11-28 15:20:45.000000000 +0000
@@ -26,25 +26,25 @@
MAIN_MENU MENU
{
POPUP "&Propriedades" {
- MENUITEM "&Analógico", 0x100
- MENUITEM "Digi&tal", 0x101
+ MENUITEM "&Analógico", IDM_ANALOG
+ MENUITEM "Digi&tal", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "&Fonte...", 0x103
+ MENUITEM "&Fonte...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "&Sem barra de título", 0x105
+ MENUITEM "&Sem barra de título", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "&Segundos", 0x107
- MENUITEM "&Data", 0x108
+ MENUITEM "&Segundos", IDM_SECONDS
+ MENUITEM "&Data", IDM_DATE
}
- POPUP "&Informações..." {
- MENUITEM "&Licença", 0x109
- MENUITEM "&SEM GARANTIA", 0x10A
- MENUITEM "&Sobre Clock...", 0x10B
+ POPUP "&Informações" {
+ MENUITEM "&Licença...", IDM_LICENSE
+ MENUITEM "&SEM GARANTIA...", IDM_NOWARRANTY
+ MENUITEM "&Sobre Clock...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE
{
-CLOCK, "Relógio"
-MENU_ON_TOP, "&Sempre visível"
+IDS_CLOCK, "Relógio"
+IDS_ONTOP, "&Sempre visível"
}
diff -u -r programs/clock/rsrc.rc programs/clock/rsrc.rc
--- programs/clock/rsrc.rc 2003-11-25 11:20:54.000000000 +0000
+++ programs/clock/rsrc.rc 2003-11-28 16:01:27.000000000 +0000
@@ -19,9 +19,9 @@
*/
#include <windows.h>
-#include "main.h"
#include "clock_res.h"
+
#include "Da.rc"
#include "De.rc"
#include "En.rc"
diff -u -r programs/clock/Ru.rc programs/clock/Ru.rc
--- programs/clock/Ru.rc 2003-05-04 03:33:08.000000000 +0100
+++ programs/clock/Ru.rc 2003-11-28 15:23:51.000000000 +0000
@@ -21,25 +21,25 @@
MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
{
POPUP "&Ñâîéñòâà" {
- MENUITEM "&Àíàëîâûå", 0x100
- MENUITEM "&Öèôðîâûå", 0x101
+ MENUITEM "&Àíàëîâûå", IDM_ANALOG
+ MENUITEM "&Öèôðîâûå", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "&Øðèôò...", 0x103
+ MENUITEM "&Øðèôò...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "&Áåç çàãîëîâêà", 0x105
+ MENUITEM "&Áåç çàãîëîâêà", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "&Ñåêóíäû", 0x107
- MENUITEM "&Äàòà", 0x108
+ MENUITEM "&Ñåêóíäû", IDM_SECONDS
+ MENUITEM "&Äàòà", IDM_DATE
}
- POPUP "&Ñâåäåíèÿ..." {
- MENUITEM "&Ëèöåíçèÿ", 0x109
- MENUITEM "&ÁÅÇ ÃÀÐÀÍÒÈÉ", 0x10A
- MENUITEM "&Î ïðîãðàììå", 0x10B
+ POPUP "&Ñâåäåíèÿ" {
+ MENUITEM "&Ëèöåíçèÿ...", IDM_LICENSE
+ MENUITEM "&ÁÅÇ ÃÀÐÀÍÒÈÉ...", IDM_NOWARRANTY
+ MENUITEM "&Î ïðîãðàììå...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
{
-CLOCK, "×àñû"
-MENU_ON_TOP, "&Ïîâåðõ âñåõ"
+IDS_CLOCK, "×àñû"
+IDS_ONTOP, "&Ïîâåðõ âñåõ"
}
diff -u -r programs/clock/Si.rc programs/clock/Si.rc
--- programs/clock/Si.rc 2003-09-01 08:16:43.000000000 +0100
+++ programs/clock/Si.rc 2003-11-28 15:23:51.000000000 +0000
@@ -21,25 +21,25 @@
MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
{
POPUP "&Lastnosti" {
- MENUITEM "Ana&logna ura", 0x100
- MENUITEM "Digi&talna ura", 0x101
+ MENUITEM "Ana&logna ura", IDM_ANALOG
+ MENUITEM "Digi&talna ura", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "&Pisava ...", 0x103
+ MENUITEM "&Pisava ...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "&Brez naslovne vrstice", 0x105
+ MENUITEM "&Brez naslovne vrstice", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "&Sekunde", 0x107
- MENUITEM "&Datum", 0x108
+ MENUITEM "&Sekunde", IDM_SECONDS
+ MENUITEM "&Datum", IDM_DATE
}
- POPUP "Inf&ormacije ..." {
- MENUITEM "&Licenèna pogodba", 0x109
- MENUITEM "&BREZ GARANCIJE", 0x10A
- MENUITEM "&O Uri", 0x10B
+ POPUP "Inf&ormacije " {
+ MENUITEM "&Licenèna pogodba...", IDM_LICENSE
+ MENUITEM "&BREZ GARANCIJE...", IDM_NOWARRANTY
+ MENUITEM "&O Uri...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
{
-CLOCK, "Ura"
-MENU_ON_TOP, "&Vedno na vrhu"
+IDS_CLOCK, "Ura"
+IDS_ONTOP, "&Vedno na vrhu"
}
diff -u -r programs/clock/Sk.rc programs/clock/Sk.rc
--- programs/clock/Sk.rc 2003-01-05 01:08:14.000000000 +0000
+++ programs/clock/Sk.rc 2003-11-28 15:20:45.000000000 +0000
@@ -23,25 +23,25 @@
MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
{
POPUP "&Vlastnosti" {
- MENUITEM "Ana&lógové", 0x100
- MENUITEM "Digi&tálne", 0x101
+ MENUITEM "Ana&lógové", IDM_ANALOG
+ MENUITEM "Digi&tálne", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "&Font...", 0x103
+ MENUITEM "&Font...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "&Bez titulkového pruhu", 0x105
+ MENUITEM "&Bez titulkového pruhu", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "&Sekundy", 0x107
- MENUITEM "&Dátum", 0x108
+ MENUITEM "&Sekundy", IDM_SECONDS
+ MENUITEM "&Dátum", IDM_DATE
}
- POPUP "Inf&o..." {
- MENUITEM "&Licencia", 0x109
- MENUITEM "&BEZ ZÁRUKY", 0x10A
- MENUITEM "&O hodinách...", 0x10B
+ POPUP "Inf&o" {
+ MENUITEM "&Licencia...", IDM_LICENSE
+ MENUITEM "&BEZ ZÁRUKY...", IDM_NOWARRANTY
+ MENUITEM "&O hodinách...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
{
-CLOCK, "Hodiny"
-MENU_ON_TOP, "&V?dy na vrchu"
+IDS_CLOCK, "Hodiny"
+IDS_ONTOP, "&V?dy na vrchu"
}
diff -u -r programs/clock/Sw.rc programs/clock/Sw.rc
--- programs/clock/Sw.rc 2003-01-05 01:08:14.000000000 +0000
+++ programs/clock/Sw.rc 2003-11-28 15:20:45.000000000 +0000
@@ -23,25 +23,25 @@
MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
{
POPUP "&Egenskaper" {
- MENUITEM "Ana&log", 0x100
- MENUITEM "Digi&tal", 0x101
+ MENUITEM "Ana&log", IDM_ANALOG
+ MENUITEM "Digi&tal", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "&Font...", 0x103
+ MENUITEM "&Font...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "&Utan Titlebar", 0x105
+ MENUITEM "&Utan Titlebar", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "&Sekunder", 0x107
- MENUITEM "&Datum", 0x108
+ MENUITEM "&Sekunder", IDM_SECONDS
+ MENUITEM "&Datum", IDM_DATE
}
- POPUP "Inf&o..." {
- MENUITEM "&Licens", 0x109
- MENUITEM "&INGEN GARANTI", 0x10A
- MENUITEM "&Om Klockan...", 0x10B
+ POPUP "Inf&o" {
+ MENUITEM "&Licens...", IDM_LICENSE
+ MENUITEM "&INGEN GARANTI...", IDM_NOWARRANTY
+ MENUITEM "&Om Klockan...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
{
-CLOCK, "Klockan"
-MENU_ON_TOP, "&Alltid överst"
+IDS_CLOCK, "Klockan"
+IDS_ONTOP, "&Alltid överst"
}
diff -u -r programs/clock/Th.rc programs/clock/Th.rc
--- programs/clock/Th.rc 2003-11-25 00:08:18.000000000 +0000
+++ programs/clock/Th.rc 2003-11-28 15:38:56.000000000 +0000
@@ -23,25 +23,25 @@
MAIN_MENU MENU
{
POPUP "»ÃѺá´è§¹ÒÌÔ¡Ò" {
- MENUITEM "¸ÃÃÁ´Ò", 0x100
- MENUITEM "Digi&tal", 0x101
+ MENUITEM "¸ÃÃÁ´Ò", IDM_ANALOG
+ MENUITEM "Digi&tal", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "ÃٻẺ´ÇÂÍÑ¡ÉÃ...", 0x103
+ MENUITEM "ÃٻẺ´ÇÂÍÑ¡ÉÃ...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "áÊ´§á·ºàÁ¹Ù", 0x105
+ MENUITEM "áÊ´§á·ºàÁ¹Ù", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "ÇÔ¹Ò·Õ", 0x107
- MENUITEM "Çѹ·Õè", 0x108
+ MENUITEM "ÇÔ¹Ò·Õ", IDM_SECONDS
+ MENUITEM "Çѹ·Õè", IDM_DATE
}
- POPUP "ÃÒÂÅÐàÍÕ´..." {
- MENUITEM "ãºÍ¹ØÒµ", 0x109
- MENUITEM "äÁèÁÕ WARRANTY", 0x10A
- MENUITEM "à¡ÕèÂǡѺ¹ÒÌÔ¡Ò... ", 0x10B
+ POPUP "ÃÒÂÅÐàÍÕ´" {
+ MENUITEM "ãºÍ¹ØÒµ...", IDM_LICENSE
+ MENUITEM "äÁèÁÕ WARRANTY...", IDM_NOWARRANTY
+ MENUITEM "à¡ÕèÂǡѺ¹ÒÌÔ¡Ò...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE
{
- CLOCK, "¹ÒÌÔ¡Ò"
- MENU_ON_TOP, "ÂÙèÊÙ¡¢èÒ§àÊÁÍ"
+ IDS_CLOCK, "¹ÒÌÔ¡Ò"
+ IDS_ONTOP, "ÂÙèÊÙ¡¢èÒ§àÊÁÍ"
}
diff -u -r programs/clock/Wa.rc programs/clock/Wa.rc
--- programs/clock/Wa.rc 2003-09-10 09:38:48.000000000 +0100
+++ programs/clock/Wa.rc 2003-11-28 15:20:45.000000000 +0000
@@ -28,27 +28,27 @@
MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT
{
POPUP "&Propietés" {
- MENUITEM "&Analodjike", 0x100
- MENUITEM "&Limerike", 0x101
+ MENUITEM "&Analodjike", IDM_ANALOG
+ MENUITEM "&Limerike", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "&Fonte...", 0x103
+ MENUITEM "&Fonte...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "Sin bår di &Tite", 0x105
+ MENUITEM "Sin bår di &Tite", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "&Segondes", 0x107
- MENUITEM "&Date", 0x108
+ MENUITEM "&Segondes", IDM_SECONDS
+ MENUITEM "&Date", IDM_DATE
}
- POPUP "&Informåcion..." {
- MENUITEM "&Licinse", 0x109
- MENUITEM "&NOLE WARANTEYE", 0x10A
- MENUITEM "Å &dfait di l' ôrlodje...", 0x10B
+ POPUP "&Informåcion" {
+ MENUITEM "&Licinse...", IDM_LICENSE
+ MENUITEM "&NOLE WARANTEYE...", IDM_NOWARRANTY
+ MENUITEM "Å &dfait di l' ôrlodje...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT
{
-CLOCK, "Ôrlodje"
-MENU_ON_TOP, "Todi &Visibe"
+IDS_CLOCK, "Ôrlodje"
+IDS_ONTOP, "Todi &Visibe"
}
#endif /* LANG_WALON */
diff -u -r programs/clock/Zh.rc programs/clock/Zh.rc
--- programs/clock/Zh.rc 2003-01-09 00:51:09.000000000 +0000
+++ programs/clock/Zh.rc 2003-11-28 15:20:45.000000000 +0000
@@ -21,25 +21,25 @@
MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
{
POPUP "ÊôÐÔ£¨&P£©" {
- MENUITEM "Ä£ÄâʱÖÓ£¨&L£©", 0x100
- MENUITEM "Êý×éʱÖÓ£¨&T£©", 0x101
+ MENUITEM "Ä£ÄâʱÖÓ£¨&L£©", IDM_ANALOG
+ MENUITEM "Êý×éʱÖÓ£¨&T£©", IDM_DIGITAL
MENUITEM SEPARATOR
- MENUITEM "×ÖÌ壨&F£©...", 0x103
+ MENUITEM "×ÖÌ壨&F£©...", IDM_FONT
MENUITEM SEPARATOR
- MENUITEM "ÎÞ±êÌâÀ¸£¨&W£©", 0x105
+ MENUITEM "ÎÞ±êÌâÀ¸£¨&W£©", IDM_NOTITLE
MENUITEM SEPARATOR
- MENUITEM "Ã루&£©", 0x107
- MENUITEM "ÈÕÆÚ£¨&D£©", 0x108
+ MENUITEM "Ã루&£©", IDM_SECONDS
+ MENUITEM "ÈÕÆÚ£¨&D£©", IDM_DATE
}
- POPUP "×ÊÁÏÐÅÏ¢£¨&O£©..." {
- MENUITEM "Óû§Ðí¿ÉÐÒ飨&L£©", 0x109
- MENUITEM "ÔðÈÎÎ޹أ¨&N£©", 0x10A
- MENUITEM "¹ØÓÚ Wine£¨&A£©... ", 0x10B
+ POPUP "×ÊÁÏÐÅÏ¢£¨&O£©" {
+ MENUITEM "Óû§Ðí¿ÉÐÒ飨&L£©...", IDM_LICENSE
+ MENUITEM "ÔðÈÎÎ޹أ¨&N£©...", IDM_NOWARRANTY
+ MENUITEM "¹ØÓÚ Wine£¨&A£©...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
{
-CLOCK, "ʱÖÓ"
-MENU_ON_TOP, "×ÜÊÇÔÚ×îÇ°Ã棨&A£©"
+IDS_CLOCK, "ʱÖÓ"
+IDS_ONTOP, "×ÜÊÇÔÚ×îÇ°Ã棨&A£©"
}
