Commit 260b6149 authored by Richard Cohen's avatar Richard Cohen Committed by Alexandre Julliard

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

- Move ... from toplevel "Info..." onto sub items (eg "About").
parent 6dece12f
......@@ -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"
}
......@@ -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"
}
......@@ -24,25 +24,25 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
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"
}
......@@ -24,25 +24,25 @@
MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
{
POPUP "&Propiedades" {
MENUITEM "Ana&lgico", 0x100
MENUITEM "Digi&tal", 0x101
MENUITEM "Ana&lgico", IDM_ANALOG
MENUITEM "Digi&tal", IDM_DIGITAL
MENUITEM SEPARATOR
MENUITEM "&Fuente...", 0x103
MENUITEM "&Fuente...", IDM_FONT
MENUITEM SEPARATOR
MENUITEM "Sin barra de &ttulo", 0x105
MENUITEM "Sin barra de &ttulo", 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 &GARANTA", 0x10A
MENUITEM "&Acerca del Reloj...", 0x10B
POPUP "Inf&o" {
MENUITEM "&Licencia...", IDM_LICENSE
MENUITEM "&SIN &GARANTA...", 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"
}
......@@ -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 "&Pivmr", 0x108
MENUITEM "&Sekunnit", IDM_SECONDS
MENUITEM "&Pivmr", 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 pllimmisen"
IDS_CLOCK, "Kello"
IDS_ONTOP, "&Aina pllimmisen"
}
......@@ -24,25 +24,25 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
MAIN_MENU MENU
{
POPUP "&Proprits" {
MENUITEM "Ana&logique", 0x100
MENUITEM "&Numrique", 0x101
MENUITEM "Ana&logique", IDM_ANALOG
MENUITEM "&Numrique", 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"
}
......@@ -23,25 +23,25 @@
MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
{
POPUP "&Belltsok" {
MENUITEM "Ana&lg", 0x100
MENUITEM "Digi&tlis", 0x101
MENUITEM "Ana&lg", IDM_ANALOG
MENUITEM "Digi&tlis", IDM_DIGITAL
MENUITEM SEPARATOR
MENUITEM "&Bettpus...", 0x103
MENUITEM "&Bettpus...", IDM_FONT
MENUITEM SEPARATOR
MENUITEM "&Cmsor nlkl", 0x105
MENUITEM "&Cmsor nlkl", IDM_NOTITLE
MENUITEM SEPARATOR
MENUITEM "&Msodperc", 0x107
MENUITEM "&Dtum", 0x108
MENUITEM "&Msodperc", IDM_SECONDS
MENUITEM "&Dtum", IDM_DATE
}
POPUP "Inf&ormci..." {
MENUITEM "&Licenc", 0x109
MENUITEM "&SEMMI GARANCIA", 0x10A
MENUITEM "&ra nvjegy... ", 0x10B
POPUP "Inf&ormci" {
MENUITEM "&Licenc...", IDM_LICENSE
MENUITEM "&SEMMI GARANCIA...", IDM_NOWARRANTY
MENUITEM "&ra nvjegy...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
{
CLOCK, "ra"
MENU_ON_TOP, "&Mindig legfell"
IDS_CLOCK, "ra"
IDS_ONTOP, "&Mindig legfell"
}
......@@ -25,25 +25,25 @@ LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
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"
}
......@@ -23,25 +23,25 @@ LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
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"
}
......@@ -26,25 +26,25 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
MAIN_MENU MENU
{
POPUP "&Propriedades" {
MENUITEM "&Analgico", 0x100
MENUITEM "Digi&tal", 0x101
MENUITEM "&Analgico", IDM_ANALOG
MENUITEM "Digi&tal", IDM_DIGITAL
MENUITEM SEPARATOR
MENUITEM "&Fonte...", 0x103
MENUITEM "&Fonte...", IDM_FONT
MENUITEM SEPARATOR
MENUITEM "&Sem barra de ttulo", 0x105
MENUITEM "&Sem barra de ttulo", IDM_NOTITLE
MENUITEM SEPARATOR
MENUITEM "&Segundos", 0x107
MENUITEM "&Data", 0x108
MENUITEM "&Segundos", IDM_SECONDS
MENUITEM "&Data", IDM_DATE
}
POPUP "&Informaes..." {
MENUITEM "&Licena", 0x109
MENUITEM "&SEM GARANTIA", 0x10A
MENUITEM "&Sobre Clock...", 0x10B
POPUP "&Informaes" {
MENUITEM "&Licena...", IDM_LICENSE
MENUITEM "&SEM GARANTIA...", IDM_NOWARRANTY
MENUITEM "&Sobre Clock...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE
{
CLOCK, "Relgio"
MENU_ON_TOP, "&Sempre visvel"
IDS_CLOCK, "Relgio"
IDS_ONTOP, "&Sempre visvel"
}
......@@ -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, "& "
}
......@@ -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 "&Licenna pogodba", 0x109
MENUITEM "&BREZ GARANCIJE", 0x10A
MENUITEM "&O Uri", 0x10B
POPUP "Inf&ormacije " {
MENUITEM "&Licenna 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"
}
......@@ -23,25 +23,25 @@
MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
{
POPUP "&Vlastnosti" {
MENUITEM "Ana&lgov", 0x100
MENUITEM "Digi&tlne", 0x101
MENUITEM "Ana&lgov", IDM_ANALOG
MENUITEM "Digi&tlne", IDM_DIGITAL
MENUITEM SEPARATOR
MENUITEM "&Font...", 0x103
MENUITEM "&Font...", IDM_FONT
MENUITEM SEPARATOR
MENUITEM "&Bez titulkovho pruhu", 0x105
MENUITEM "&Bez titulkovho pruhu", IDM_NOTITLE
MENUITEM SEPARATOR
MENUITEM "&Sekundy", 0x107
MENUITEM "&Dtum", 0x108
MENUITEM "&Sekundy", IDM_SECONDS
MENUITEM "&Dtum", IDM_DATE
}
POPUP "Inf&o..." {
MENUITEM "&Licencia", 0x109
MENUITEM "&BEZ ZRUKY", 0x10A
MENUITEM "&O hodinch...", 0x10B
POPUP "Inf&o" {
MENUITEM "&Licencia...", IDM_LICENSE
MENUITEM "&BEZ ZRUKY...", IDM_NOWARRANTY
MENUITEM "&O hodinch...", IDM_ABOUT
}
}
STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
{
CLOCK, "Hodiny"
MENU_ON_TOP, "&Vdy na vrchu"
IDS_CLOCK, "Hodiny"
IDS_ONTOP, "&Vdy na vrchu"
}
......@@ -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"
}
......@@ -23,25 +23,25 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT
MAIN_MENU MENU
{
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 " 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, "ٺش"
}
......@@ -28,27 +28,27 @@
MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT
{
POPUP "&Propiets" {
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 br di &Tite", 0x105
MENUITEM "Sin br di &Tite", IDM_NOTITLE
MENUITEM SEPARATOR
MENUITEM "&Segondes", 0x107
MENUITEM "&Date", 0x108
MENUITEM "&Segondes", IDM_SECONDS
MENUITEM "&Date", IDM_DATE
}
POPUP "&Informcion..." {
MENUITEM "&Licinse", 0x109
MENUITEM "&NOLE WARANTEYE", 0x10A
MENUITEM " &dfait di l' rlodje...", 0x10B
POPUP "&Informcion" {
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 */
......@@ -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)"
}
......@@ -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
......@@ -31,32 +31,26 @@ VOID LANGUAGE_UpdateMenuCheckmarks(VOID)
/* 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));
}
......@@ -71,7 +65,7 @@ VOID LANGUAGE_UpdateWindowCaption(VOID)
GetDateFormat(LOCALE_USER_DEFAULT, LOCALE_SLONGDATE, &st, NULL, szDate, sizeof(szDate));
/* 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);
......@@ -105,8 +99,8 @@ VOID LANGUAGE_LoadMenus(VOID)
/* 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);
}
/* Local Variables: */
......
......@@ -54,64 +54,64 @@ int CLOCK_MenuCommand (WPARAM wParam)
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);
......
......@@ -23,9 +23,6 @@
#define MAX_STRING_LEN 255
#define DEFAULTICON OIC_WINLOGO
/* hide the following from winerc */
#ifndef RC_INVOKED
typedef struct
{
HANDLE hInstance;
......@@ -55,43 +52,3 @@ extern CLOCK_GLOBALS Globals;
/* 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
......@@ -19,9 +19,9 @@
*/
#include <windows.h>
#include "main.h"
#include "clock_res.h"
#include "Da.rc"
#include "De.rc"
#include "En.rc"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment