- Use resource ids IDM_*, IDS_* instead of numbers.

- Move ... from toplevel "Info..." onto sub items (eg "About").
This commit is contained in:
Richard Cohen 2003-12-03 03:58:29 +00:00 committed by Alexandre Julliard
parent 6dece12fde
commit 260b6149f2
22 changed files with 245 additions and 281 deletions

View File

@ -22,25 +22,25 @@
MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
{ {
POPUP "&Instillinger" { POPUP "&Instillinger" {
MENUITEM "&Analog", 0x100 MENUITEM "&Analog", IDM_ANALOG
MENUITEM "&Digital", 0x101 MENUITEM "&Digital", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Skrifttype...", 0x103 MENUITEM "&Skrifttype...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Skjul Titel&linje", 0x105 MENUITEM "Skjul Titel&linje", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Se&kunder", 0x107 MENUITEM "Se&kunder", IDM_SECONDS
MENUITEM "Da&to", 0x108 MENUITEM "Da&to", IDM_DATE
} }
POPUP "Inf&o..." { POPUP "Inf&o" {
MENUITEM "&Licens", 0x109 MENUITEM "&Licens...", IDM_LICENSE
MENUITEM "&NO WARRANTY", 0x10A MENUITEM "&NO WARRANTY...", IDM_NOWARRANTY
MENUITEM "&Om Ur...", 0x10B MENUITEM "&Om Ur...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
{ {
CLOCK, "Ur" IDS_CLOCK, "Ur"
MENU_ON_TOP, "&Altid øverst" IDS_ONTOP, "&Altid øverst"
} }

View File

@ -22,25 +22,25 @@
MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
{ {
POPUP "&Einstellungen" { POPUP "&Einstellungen" {
MENUITEM "Ana&log", 0x100 MENUITEM "Ana&log", IDM_ANALOG
MENUITEM "Digi&tal", 0x101 MENUITEM "Digi&tal", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Schrift&art...", 0x103 MENUITEM "Schrift&art...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Ohne Titelleiste", 0x105 MENUITEM "&Ohne Titelleiste", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Sekunden", 0x107 MENUITEM "&Sekunden", IDM_SECONDS
MENUITEM "&Datum", 0x108 MENUITEM "&Datum", IDM_DATE
} }
POPUP "Inf&o..." { POPUP "Inf&o" {
MENUITEM "&Lizenz", 0x109 MENUITEM "&Lizenz...", IDM_LICENSE
MENUITEM "&KEINE GARANTIE", 0x10A MENUITEM "&KEINE GARANTIE...", IDM_NOWARRANTY
MENUITEM "&Über Uhr", 0x10B MENUITEM "&Über Uhr...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
{ {
CLOCK, "Uhr" IDS_CLOCK, "Uhr"
MENU_ON_TOP, "&Immer im Vordergrund" IDS_ONTOP, "&Immer im Vordergrund"
} }

View File

@ -24,25 +24,25 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
MAIN_MENU MENU MAIN_MENU MENU
{ {
POPUP "&Properties" { POPUP "&Properties" {
MENUITEM "Ana&log", 0x100 MENUITEM "Ana&log", IDM_ANALOG
MENUITEM "Digi&tal", 0x101 MENUITEM "Digi&tal", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Font...", 0x103 MENUITEM "&Font...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Without Titlebar", 0x105 MENUITEM "&Without Titlebar", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Seconds", 0x107 MENUITEM "&Seconds", IDM_SECONDS
MENUITEM "&Date", 0x108 MENUITEM "&Date", IDM_DATE
} }
POPUP "Inf&o..." { POPUP "Inf&o" {
MENUITEM "&License", 0x109 MENUITEM "&License...", IDM_LICENSE
MENUITEM "&NO WARRANTY", 0x10A MENUITEM "&NO WARRANTY...", IDM_NOWARRANTY
MENUITEM "&About Clock... ", 0x10B MENUITEM "&About Clock...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
{ {
CLOCK, "Clock" IDS_CLOCK, "Clock"
MENU_ON_TOP, "&Always on Top" IDS_ONTOP, "&Always on Top"
} }

View File

@ -24,25 +24,25 @@
MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
{ {
POPUP "&Propiedades" { POPUP "&Propiedades" {
MENUITEM "Ana&lógico", 0x100 MENUITEM "Ana&lógico", IDM_ANALOG
MENUITEM "Digi&tal", 0x101 MENUITEM "Digi&tal", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Fuente...", 0x103 MENUITEM "&Fuente...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Sin barra de &título", 0x105 MENUITEM "Sin barra de &título", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Segundos", 0x107 MENUITEM "&Segundos", IDM_SECONDS
MENUITEM "Fe&cha", 0x108 MENUITEM "Fe&cha", IDM_DATE
} }
POPUP "Inf&o..." { POPUP "Inf&o" {
MENUITEM "&Licencia", 0x109 MENUITEM "&Licencia...", IDM_LICENSE
MENUITEM "&SIN &GARANTÍA", 0x10A MENUITEM "&SIN &GARANTÍA...", IDM_NOWARRANTY
MENUITEM "&Acerca del Reloj...", 0x10B MENUITEM "&Acerca del Reloj...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
{ {
CLOCK, "Reloj" IDS_CLOCK, "Reloj"
MENU_ON_TOP, "Siempre &visible" IDS_ONTOP, "Siempre &visible"
} }

View File

@ -22,25 +22,25 @@
MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
{ {
POPUP "&Ominaisuudet" { POPUP "&Ominaisuudet" {
MENUITEM "&Analoginen", 0x100 MENUITEM "&Analoginen", IDM_ANALOG
MENUITEM "Di&gitaalinen", 0x101 MENUITEM "Di&gitaalinen", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Fontti...", 0x103 MENUITEM "&Fontti...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Ilman otsikkopalkkia", 0x105 MENUITEM "&Ilman otsikkopalkkia", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Sekunnit", 0x107 MENUITEM "&Sekunnit", IDM_SECONDS
MENUITEM "&Päivämäärä", 0x108 MENUITEM "&Päivämäärä", IDM_DATE
} }
POPUP "Inf&o..." { POPUP "Inf&o" {
MENUITEM "&Lisenssi", 0x109 MENUITEM "&Lisenssi...", IDM_LICENSE
MENUITEM "&EI TAKUUTA", 0x10A MENUITEM "&EI TAKUUTA...", IDM_NOWARRANTY
MENUITEM "&Kellosta...", 0x10B MENUITEM "&Kellosta...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
{ {
CLOCK, "Kello" IDS_CLOCK, "Kello"
MENU_ON_TOP, "&Aina päällimmäisenä" IDS_ONTOP, "&Aina päällimmäisenä"
} }

View File

@ -24,25 +24,25 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
MAIN_MENU MENU MAIN_MENU MENU
{ {
POPUP "&Propriétés" { POPUP "&Propriétés" {
MENUITEM "Ana&logique", 0x100 MENUITEM "Ana&logique", IDM_ANALOG
MENUITEM "&Numérique", 0x101 MENUITEM "&Numérique", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Police...", 0x103 MENUITEM "&Police...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Sans &barre de titre", 0x105 MENUITEM "Sans &barre de titre", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Secondes", 0x107 MENUITEM "&Secondes", IDM_SECONDS
MENUITEM "&Date", 0x108 MENUITEM "&Date", IDM_DATE
} }
POPUP "Inf&o..." { POPUP "Inf&o" {
MENUITEM "&Licence", 0x109 MENUITEM "&Licence...", IDM_LICENSE
MENUITEM "AUCUNE &GARANTIE", 0x10A MENUITEM "AUCUNE &GARANTIE...", IDM_NOWARRANTY
MENUITEM "&A propos de Horloge", 0x10B MENUITEM "&A propos de Horloge...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
{ {
CLOCK, "Horloge" IDS_CLOCK, "Horloge"
MENU_ON_TOP, "&Toujours visible" IDS_ONTOP, "&Toujours visible"
} }

View File

@ -23,25 +23,25 @@
MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
{ {
POPUP "&Beállítások" { POPUP "&Beállítások" {
MENUITEM "Ana&lóg", 0x100 MENUITEM "Ana&lóg", IDM_ANALOG
MENUITEM "Digi&tális", 0x101 MENUITEM "Digi&tális", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Betűtípus...", 0x103 MENUITEM "&Betûtípus...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Címsor nélkül", 0x105 MENUITEM "&Címsor nélkül", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Másodperc", 0x107 MENUITEM "&Másodperc", IDM_SECONDS
MENUITEM "&Dátum", 0x108 MENUITEM "&Dátum", IDM_DATE
} }
POPUP "Inf&ormáció..." { POPUP "Inf&ormáció" {
MENUITEM "&Licenc", 0x109 MENUITEM "&Licenc...", IDM_LICENSE
MENUITEM "&SEMMI GARANCIA", 0x10A MENUITEM "&SEMMI GARANCIA...", IDM_NOWARRANTY
MENUITEM "&Óra névjegy... ", 0x10B MENUITEM "&Óra névjegy...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
{ {
CLOCK, "Óra" IDS_CLOCK, "Óra"
MENU_ON_TOP, "&Mindig legfelül" IDS_ONTOP, "&Mindig legfelül"
} }

View File

@ -25,25 +25,25 @@ LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
MAIN_MENU MENU MAIN_MENU MENU
{ {
POPUP "&Properietà" { POPUP "&Properietà" {
MENUITEM "Ana&logico", 0x100 MENUITEM "Ana&logico", IDM_ANALOG
MENUITEM "Digi&tale", 0x101 MENUITEM "Digi&tale", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Font...", 0x103 MENUITEM "&Font...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Nascondi la barra del titolo", 0x105 MENUITEM "&Nascondi la barra del titolo", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Secondi", 0x107 MENUITEM "&Secondi", IDM_SECONDS
MENUITEM "&Data", 0x108 MENUITEM "&Data", IDM_DATE
} }
POPUP "Inf&o..." { POPUP "Inf&o" {
MENUITEM "&Licenza", 0x109 MENUITEM "&Licenza...", IDM_LICENSE
MENUITEM "&Garanzia", 0x10A MENUITEM "&Garanzia...", IDM_NOWARRANTY
MENUITEM "&Informazioni sull'orologio", 0x10B MENUITEM "&Informazioni sull'orologio...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
{ {
CLOCK, "Orologio" IDS_CLOCK, "Orologio"
MENU_ON_TOP, "&Sempre in primo piano" IDS_ONTOP, "&Sempre in primo piano"
} }

View File

@ -23,25 +23,25 @@ LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
MAIN_MENU MENU MAIN_MENU MENU
{ {
POPUP "&Eigenschappen" { POPUP "&Eigenschappen" {
MENUITEM "&Analoog", 0x100 MENUITEM "&Analoog", IDM_ANALOG
MENUITEM "&Digitaal", 0x101 MENUITEM "&Digitaal", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Lettertype...", 0x103 MENUITEM "&Lettertype...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Zonder titelbalk", 0x105 MENUITEM "&Zonder titelbalk", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Seconden", 0x107 MENUITEM "&Seconden", IDM_SECONDS
MENUITEM "Da&tum", 0x108 MENUITEM "Da&tum", IDM_DATE
} }
POPUP "Inf&o..." { POPUP "Inf&o" {
MENUITEM "&Licentie", 0x109 MENUITEM "&Licentie...", IDM_LICENSE
MENUITEM "&GEEN GARANTIE", 0x10A MENUITEM "&GEEN GARANTIE...", IDM_NOWARRANTY
MENUITEM "&Over Klok... ", 0x10B MENUITEM "&Over Klok...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
{ {
CLOCK, "Klok" IDS_CLOCK, "Klok"
MENU_ON_TOP, "&Altijd op de voorgrond" IDS_ONTOP, "&Altijd op de voorgrond"
} }

View File

@ -26,25 +26,25 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
MAIN_MENU MENU MAIN_MENU MENU
{ {
POPUP "&Propriedades" { POPUP "&Propriedades" {
MENUITEM "&Analógico", 0x100 MENUITEM "&Analógico", IDM_ANALOG
MENUITEM "Digi&tal", 0x101 MENUITEM "Digi&tal", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Fonte...", 0x103 MENUITEM "&Fonte...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Sem barra de título", 0x105 MENUITEM "&Sem barra de título", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Segundos", 0x107 MENUITEM "&Segundos", IDM_SECONDS
MENUITEM "&Data", 0x108 MENUITEM "&Data", IDM_DATE
} }
POPUP "&Informações..." { POPUP "&Informações" {
MENUITEM "&Licença", 0x109 MENUITEM "&Licença...", IDM_LICENSE
MENUITEM "&SEM GARANTIA", 0x10A MENUITEM "&SEM GARANTIA...", IDM_NOWARRANTY
MENUITEM "&Sobre Clock...", 0x10B MENUITEM "&Sobre Clock...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
{ {
CLOCK, "Relógio" IDS_CLOCK, "Relógio"
MENU_ON_TOP, "&Sempre visível" IDS_ONTOP, "&Sempre visível"
} }

View File

@ -21,25 +21,25 @@
MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
{ {
POPUP "&Ñâîéñòâà" { POPUP "&Ñâîéñòâà" {
MENUITEM "&Àíàëîâûå", 0x100 MENUITEM "&Àíàëîâûå", IDM_ANALOG
MENUITEM "&Öèôðîâûå", 0x101 MENUITEM "&Öèôðîâûå", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Øðèôò...", 0x103 MENUITEM "&Øðèôò...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Áåç çàãîëîâêà", 0x105 MENUITEM "&Áåç çàãîëîâêà", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Ñåêóíäû", 0x107 MENUITEM "&Ñåêóíäû", IDM_SECONDS
MENUITEM "&Äàòà", 0x108 MENUITEM "&Äàòà", IDM_DATE
} }
POPUP "&Ñâåäåíèÿ..." { POPUP "&Ñâåäåíèÿ" {
MENUITEM "&Ëèöåíçèÿ", 0x109 MENUITEM "&Ëèöåíçèÿ...", IDM_LICENSE
MENUITEM "&ÁÅÇ ÃÀÐÀÍÒÈÉ", 0x10A MENUITEM "&ÁÅÇ ÃÀÐÀÍÒÈÉ...", IDM_NOWARRANTY
MENUITEM "&Î ïðîãðàììå", 0x10B MENUITEM "&Î ïðîãðàììå...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
{ {
CLOCK, "×àñû" IDS_CLOCK, "×àñû"
MENU_ON_TOP, "&Ïîâåðõ âñåõ" IDS_ONTOP, "&Ïîâåðõ âñåõ"
} }

View File

@ -21,25 +21,25 @@
MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
{ {
POPUP "&Lastnosti" { POPUP "&Lastnosti" {
MENUITEM "Ana&logna ura", 0x100 MENUITEM "Ana&logna ura", IDM_ANALOG
MENUITEM "Digi&talna ura", 0x101 MENUITEM "Digi&talna ura", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Pisava ...", 0x103 MENUITEM "&Pisava ...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Brez naslovne vrstice", 0x105 MENUITEM "&Brez naslovne vrstice", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Sekunde", 0x107 MENUITEM "&Sekunde", IDM_SECONDS
MENUITEM "&Datum", 0x108 MENUITEM "&Datum", IDM_DATE
} }
POPUP "Inf&ormacije ..." { POPUP "Inf&ormacije " {
MENUITEM "&Licenèna pogodba", 0x109 MENUITEM "&Licenèna pogodba...", IDM_LICENSE
MENUITEM "&BREZ GARANCIJE", 0x10A MENUITEM "&BREZ GARANCIJE...", IDM_NOWARRANTY
MENUITEM "&O Uri", 0x10B MENUITEM "&O Uri...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
{ {
CLOCK, "Ura" IDS_CLOCK, "Ura"
MENU_ON_TOP, "&Vedno na vrhu" IDS_ONTOP, "&Vedno na vrhu"
} }

View File

@ -23,25 +23,25 @@
MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
{ {
POPUP "&Vlastnosti" { POPUP "&Vlastnosti" {
MENUITEM "Ana&lógové", 0x100 MENUITEM "Ana&lógové", IDM_ANALOG
MENUITEM "Digi&tálne", 0x101 MENUITEM "Digi&tálne", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Font...", 0x103 MENUITEM "&Font...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Bez titulkového pruhu", 0x105 MENUITEM "&Bez titulkového pruhu", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Sekundy", 0x107 MENUITEM "&Sekundy", IDM_SECONDS
MENUITEM "&Dátum", 0x108 MENUITEM "&Dátum", IDM_DATE
} }
POPUP "Inf&o..." { POPUP "Inf&o" {
MENUITEM "&Licencia", 0x109 MENUITEM "&Licencia...", IDM_LICENSE
MENUITEM "&BEZ ZÁRUKY", 0x10A MENUITEM "&BEZ ZÁRUKY...", IDM_NOWARRANTY
MENUITEM "&O hodinách...", 0x10B MENUITEM "&O hodinách...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
{ {
CLOCK, "Hodiny" IDS_CLOCK, "Hodiny"
MENU_ON_TOP, "&Vždy na vrchu" IDS_ONTOP, "&Vždy na vrchu"
} }

View File

@ -23,25 +23,25 @@
MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
{ {
POPUP "&Egenskaper" { POPUP "&Egenskaper" {
MENUITEM "Ana&log", 0x100 MENUITEM "Ana&log", IDM_ANALOG
MENUITEM "Digi&tal", 0x101 MENUITEM "Digi&tal", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Font...", 0x103 MENUITEM "&Font...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Utan Titlebar", 0x105 MENUITEM "&Utan Titlebar", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Sekunder", 0x107 MENUITEM "&Sekunder", IDM_SECONDS
MENUITEM "&Datum", 0x108 MENUITEM "&Datum", IDM_DATE
} }
POPUP "Inf&o..." { POPUP "Inf&o" {
MENUITEM "&Licens", 0x109 MENUITEM "&Licens...", IDM_LICENSE
MENUITEM "&INGEN GARANTI", 0x10A MENUITEM "&INGEN GARANTI...", IDM_NOWARRANTY
MENUITEM "&Om Klockan...", 0x10B MENUITEM "&Om Klockan...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
{ {
CLOCK, "Klockan" IDS_CLOCK, "Klockan"
MENU_ON_TOP, "&Alltid överst" IDS_ONTOP, "&Alltid överst"
} }

View File

@ -23,25 +23,25 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT
MAIN_MENU MENU MAIN_MENU MENU
{ {
POPUP "»ÃѺáµè§¹ÒÌÔ¡Ò" { POPUP "»ÃѺáµè§¹ÒÌÔ¡Ò" {
MENUITEM "¸ÃÃÁ´Ò", 0x100 MENUITEM "¸ÃÃÁ´Ò", IDM_ANALOG
MENUITEM "´Ô¨ÔµÑÅ", 0x101 MENUITEM "´Ô¨ÔµÑÅ", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "ÃٻẺµéÇÍÑ¡ÉÃ...", 0x103 MENUITEM "ÃٻẺµéÇÍÑ¡ÉÃ...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "áÊ´§á·ºàÁ¹Ù", 0x105 MENUITEM "áÊ´§á·ºàÁ¹Ù", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "ÇÔ¹Ò·Õ", 0x107 MENUITEM "ÇÔ¹Ò·Õ", IDM_SECONDS
MENUITEM "Çѹ·Õè", 0x108 MENUITEM "Çѹ·Õè", IDM_DATE
} }
POPUP "ÃÒÂÅÐàÍÕ´..." { POPUP "ÃÒÂÅÐàÍÕ´" {
MENUITEM "ãºÍ¹Ø­Òµ", 0x109 MENUITEM "ãºÍ¹Ø­Òµ...", IDM_LICENSE
MENUITEM "äÁèÁÕ WARRANTY", 0x10A MENUITEM "äÁèÁÕ WARRANTY...", IDM_NOWARRANTY
MENUITEM "à¡ÕèÂǡѺ¹ÒÌÔ¡Ò... ", 0x10B MENUITEM "à¡ÕèÂǡѺ¹ÒÌÔ¡Ò...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
{ {
CLOCK, "¹ÒÌÔ¡Ò" IDS_CLOCK, "¹ÒÌÔ¡Ò"
MENU_ON_TOP, "ÂÙº¹ÊØ´àÊÁÍ" IDS_ONTOP, "ÂÙº¹ÊØ´àÊÁÍ"
} }

View File

@ -28,27 +28,27 @@
MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT
{ {
POPUP "&Propietés" { POPUP "&Propietés" {
MENUITEM "&Analodjike", 0x100 MENUITEM "&Analodjike", IDM_ANALOG
MENUITEM "&Limerike", 0x101 MENUITEM "&Limerike", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Fonte...", 0x103 MENUITEM "&Fonte...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Sin bår di &Tite", 0x105 MENUITEM "Sin bår di &Tite", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Segondes", 0x107 MENUITEM "&Segondes", IDM_SECONDS
MENUITEM "&Date", 0x108 MENUITEM "&Date", IDM_DATE
} }
POPUP "&Informåcion..." { POPUP "&Informåcion" {
MENUITEM "&Licinse", 0x109 MENUITEM "&Licinse...", IDM_LICENSE
MENUITEM "&NOLE WARANTEYE", 0x10A MENUITEM "&NOLE WARANTEYE...", IDM_NOWARRANTY
MENUITEM "Å &dfait di l' ôrlodje...", 0x10B MENUITEM "Å &dfait di l' ôrlodje...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT
{ {
CLOCK, "Ôrlodje" IDS_CLOCK, "Ôrlodje"
MENU_ON_TOP, "Todi &Visibe" IDS_ONTOP, "Todi &Visibe"
} }
#endif /* LANG_WALON */ #endif /* LANG_WALON */

View File

@ -21,25 +21,25 @@
MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
{ {
POPUP "属性(&P" { POPUP "属性(&P" {
MENUITEM "模拟时钟(&L", 0x100 MENUITEM "模拟时钟(&L", IDM_ANALOG
MENUITEM "数组时钟(&T", 0x101 MENUITEM "数组时钟(&T", IDM_DIGITAL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "字体(&F...", 0x103 MENUITEM "字体(&F...", IDM_FONT
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "无标题栏(&W", 0x105 MENUITEM "无标题栏(&W", IDM_NOTITLE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "秒(&", 0x107 MENUITEM "秒(&", IDM_SECONDS
MENUITEM "日期(&D", 0x108 MENUITEM "日期(&D", IDM_DATE
} }
POPUP "资料信息(&O..." { POPUP "资料信息(&O" {
MENUITEM "用户许可协议(&L", 0x109 MENUITEM "用户许可协议(&L...", IDM_LICENSE
MENUITEM "责任无关(&N", 0x10A MENUITEM "责任无关(&N...", IDM_NOWARRANTY
MENUITEM "关于 Wine&A... ", 0x10B MENUITEM "关于 Wine&A...", IDM_ABOUT
} }
} }
STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
{ {
CLOCK, "时钟" IDS_CLOCK, "时钟"
MENU_ON_TOP, "总是在最前面(&A" IDS_ONTOP, "总是在最前面(&A"
} }

View File

@ -16,6 +16,19 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define CLOCK 0x10C #define MAIN_MENU 0x100
#define MENU_ON_TOP 0x10D #define IDM_ANALOG 0x101
#define MAIN_MENU 0x10E #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

View File

@ -31,32 +31,26 @@ VOID LANGUAGE_UpdateMenuCheckmarks(VOID)
/* analog clock */ /* analog clock */
CheckMenuItem(Globals.hPropertiesMenu, 0x100, CheckMenuItem(Globals.hPropertiesMenu, IDM_ANALOG, MF_BYCOMMAND | MF_CHECKED);
MF_BYCOMMAND | MF_CHECKED); CheckMenuItem(Globals.hPropertiesMenu, IDM_DIGITAL, MF_BYCOMMAND | MF_UNCHECKED);
CheckMenuItem(Globals.hPropertiesMenu, 0x101, EnableMenuItem(Globals.hPropertiesMenu, IDM_FONT, MF_BYCOMMAND | MF_GRAYED);
MF_BYCOMMAND | MF_UNCHECKED);
EnableMenuItem(Globals.hPropertiesMenu, 0x103,
MF_BYCOMMAND | MF_GRAYED);
} }
else else
{ {
/* digital clock */ /* digital clock */
CheckMenuItem(Globals.hPropertiesMenu, 0x100, CheckMenuItem(Globals.hPropertiesMenu, IDM_ANALOG, MF_BYCOMMAND | MF_UNCHECKED);
MF_BYCOMMAND | MF_UNCHECKED); CheckMenuItem(Globals.hPropertiesMenu, IDM_DIGITAL, MF_BYCOMMAND | MF_CHECKED);
CheckMenuItem(Globals.hPropertiesMenu, 0x101, EnableMenuItem(Globals.hPropertiesMenu, IDM_FONT, MF_BYCOMMAND);
MF_BYCOMMAND | MF_CHECKED);
EnableMenuItem(Globals.hPropertiesMenu, 0x103,
MF_BYCOMMAND);
} }
CheckMenuItem(Globals.hPropertiesMenu, 0x105, MF_BYCOMMAND | CheckMenuItem(Globals.hPropertiesMenu, IDM_NOTITLE, MF_BYCOMMAND |
(Globals.bWithoutTitle ? MF_CHECKED : MF_UNCHECKED)); (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)); (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)); (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)); (Globals.bDate ? MF_CHECKED : MF_UNCHECKED));
} }
@ -71,7 +65,7 @@ VOID LANGUAGE_UpdateWindowCaption(VOID)
GetDateFormat(LOCALE_USER_DEFAULT, LOCALE_SLONGDATE, &st, NULL, szDate, sizeof(szDate)); GetDateFormat(LOCALE_USER_DEFAULT, LOCALE_SLONGDATE, &st, NULL, szDate, sizeof(szDate));
/* Set frame caption */ /* Set frame caption */
LoadString(Globals.hInstance, 0x10C, szCaption, sizeof(szCaption)); LoadString(Globals.hInstance, IDS_CLOCK, szCaption, sizeof(szCaption));
if (Globals.bDate) { if (Globals.bDate) {
lstrcat(szCaption, " - "); lstrcat(szCaption, " - ");
lstrcat(szCaption, szDate); lstrcat(szCaption, szDate);
@ -105,8 +99,8 @@ VOID LANGUAGE_LoadMenus(VOID)
/* FIXME: Append a SEPARATOR to Globals.hSystemMenu here */ /* FIXME: Append a SEPARATOR to Globals.hSystemMenu here */
LoadString(Globals.hInstance, 0x10D, szItem, sizeof(szItem)); LoadString(Globals.hInstance, IDS_ONTOP, szItem, sizeof(szItem));
AppendMenu(Globals.hSystemMenu, MF_STRING | MF_BYCOMMAND, 1000, szItem); AppendMenu(Globals.hSystemMenu, MF_STRING | MF_BYCOMMAND, IDM_ONTOP, szItem);
} }
/* Local Variables: */ /* Local Variables: */

View File

@ -54,64 +54,64 @@ int CLOCK_MenuCommand (WPARAM wParam)
CHAR szAppRelease[MAX_STRING_LEN]; CHAR szAppRelease[MAX_STRING_LEN];
switch (wParam) { switch (wParam) {
/* switch to analog */ /* switch to analog */
case 0x100: { case IDM_ANALOG: {
Globals.bAnalog = TRUE; Globals.bAnalog = TRUE;
LANGUAGE_UpdateMenuCheckmarks(); LANGUAGE_UpdateMenuCheckmarks();
SendMessage(Globals.hMainWnd, WM_PAINT, 0, 0); SendMessage(Globals.hMainWnd, WM_PAINT, 0, 0);
break; break;
} }
/* switch to digital */ /* switch to digital */
case 0x101: { case IDM_DIGITAL: {
Globals.bAnalog = FALSE; Globals.bAnalog = FALSE;
LANGUAGE_UpdateMenuCheckmarks(); LANGUAGE_UpdateMenuCheckmarks();
SendMessage(Globals.hMainWnd, WM_PAINT, 0, 0); SendMessage(Globals.hMainWnd, WM_PAINT, 0, 0);
break; break;
} }
/* change font */ /* change font */
case 0x103: { case IDM_FONT: {
MAIN_FileChooseFont(); MAIN_FileChooseFont();
break; break;
} }
/* hide title bar */ /* hide title bar */
case 0x105: { case IDM_NOTITLE: {
Globals.bWithoutTitle = !Globals.bWithoutTitle; Globals.bWithoutTitle = !Globals.bWithoutTitle;
LANGUAGE_UpdateWindowCaption(); LANGUAGE_UpdateWindowCaption();
LANGUAGE_UpdateMenuCheckmarks(); LANGUAGE_UpdateMenuCheckmarks();
break; break;
} }
/* always on top */ /* always on top */
case 0x10D: { case IDM_ONTOP: {
Globals.bAlwaysOnTop = !Globals.bAlwaysOnTop; Globals.bAlwaysOnTop = !Globals.bAlwaysOnTop;
LANGUAGE_UpdateMenuCheckmarks(); LANGUAGE_UpdateMenuCheckmarks();
break; break;
} }
/* show or hide seconds */ /* show or hide seconds */
case 0x107: { case IDM_SECONDS: {
Globals.bSeconds = !Globals.bSeconds; Globals.bSeconds = !Globals.bSeconds;
LANGUAGE_UpdateMenuCheckmarks(); LANGUAGE_UpdateMenuCheckmarks();
SendMessage(Globals.hMainWnd, WM_PAINT, 0, 0); SendMessage(Globals.hMainWnd, WM_PAINT, 0, 0);
break; break;
} }
/* show or hide date */ /* show or hide date */
case 0x108: { case IDM_DATE: {
Globals.bDate = !Globals.bDate; Globals.bDate = !Globals.bDate;
LANGUAGE_UpdateMenuCheckmarks(); LANGUAGE_UpdateMenuCheckmarks();
LANGUAGE_UpdateWindowCaption(); LANGUAGE_UpdateWindowCaption();
break; break;
} }
/* show license */ /* show license */
case 0x109: { case IDM_LICENSE: {
WineLicense(Globals.hMainWnd); WineLicense(Globals.hMainWnd);
break; break;
} }
/* show warranties */ /* show warranties */
case 0x10A: { case IDM_NOWARRANTY: {
WineWarranty(Globals.hMainWnd); WineWarranty(Globals.hMainWnd);
break; break;
} }
/* show "about" box */ /* show "about" box */
case 0x10B: { case IDM_ABOUT: {
LoadString(Globals.hInstance, 0x10C, szApp, sizeof(szApp)); LoadString(Globals.hInstance, IDS_CLOCK, szApp, sizeof(szApp));
lstrcpy(szAppRelease,szApp); lstrcpy(szAppRelease,szApp);
lstrcat(szAppRelease,"\n" PACKAGE_STRING); lstrcat(szAppRelease,"\n" PACKAGE_STRING);
ShellAbout(Globals.hMainWnd, szApp, szAppRelease, 0); ShellAbout(Globals.hMainWnd, szApp, szAppRelease, 0);

View File

@ -23,9 +23,6 @@
#define MAX_STRING_LEN 255 #define MAX_STRING_LEN 255
#define DEFAULTICON OIC_WINLOGO #define DEFAULTICON OIC_WINLOGO
/* hide the following from winerc */
#ifndef RC_INVOKED
typedef struct typedef struct
{ {
HANDLE hInstance; HANDLE hInstance;
@ -55,43 +52,3 @@ extern CLOCK_GLOBALS Globals;
/* function prototypes */ /* function prototypes */
VOID MAIN_FileChooseFont(VOID); 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

View File

@ -19,9 +19,9 @@
*/ */
#include <windows.h> #include <windows.h>
#include "main.h"
#include "clock_res.h" #include "clock_res.h"
#include "Da.rc" #include "Da.rc"
#include "De.rc" #include "De.rc"
#include "En.rc" #include "En.rc"