[ros-diffs] [cfinck] 27760: - Fix the WineMine Icon in the Main window and About window (parts of the patch in bug #2397 by Mario Kacmar (kario AT szm DOT sk) applied) - Make the dialogs of all languages consistent See issue #2397 for more details.

20 Jul 2007

Author: cfinck
Date: Fri Jul 20 23:18:35 2007
New Revision: 27760

URL: http://svn.reactos.org/svn/reactos?rev=27760&view=rev
Log:
- Fix the WineMine Icon in the Main window and About window (parts of the patch in bug
#2397 by Mario Kacmar (kario AT szm DOT sk) applied)
- Make the dialogs of all languages consistent
See issue #2397 for more details.

Modified:
    trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc
    trunk/reactos/base/applications/games/winemine/lang/de-DE.rc
    trunk/reactos/base/applications/games/winemine/lang/el-GR.rc
    trunk/reactos/base/applications/games/winemine/lang/en-US.rc
    trunk/reactos/base/applications/games/winemine/lang/es-ES.rc
    trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc
    trunk/reactos/base/applications/games/winemine/lang/id-ID.rc
    trunk/reactos/base/applications/games/winemine/lang/it-IT.rc
    trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc
    trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc
    trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc
    trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc
    trunk/reactos/base/applications/games/winemine/lang/th-TH.rc
    trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc
    trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc
    trunk/reactos/base/applications/games/winemine/main.c

Modified: trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================

--- trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc Fri Jul 20 23:18:35 2007
@@ -76,8 +76,8 @@
 FONT 8, "MS Shell Dlg"
 {
     LTEXT                               "Winemine", IDNONE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                 "under the Wine license", IDNONE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDNONE,  10,  25,  20,  20
+    ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                             "Äîáðå", IDOK,      50,  60,  55,
 15
 }

Modified: trunk/reactos/base/applications/games/winemine/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/lang/de-DE.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/de-DE.rc Fri Jul 20 23:18:35 2007
@@ -75,8 +75,8 @@
 FONT 8, "MS Shell Dlg"
 {
     LTEXT                               "Winemine", IDNONE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                 "Unter der Wine Lizenz", IDNONE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDNONE,  10,  25,  20,  20
+    ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                             "OK", IDOK,      50,  60,  55, 
15
 }

Modified: trunk/reactos/base/applications/games/winemine/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/lang/el-GR.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/el-GR.rc Fri Jul 20 23:18:35 2007
@@ -76,8 +76,8 @@
 FONT 8, "MS Shell Dlg"
 {
     LTEXT                               "Winemine", IDNONE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                 "under the Wine license", IDNONE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDNONE,  10,  25,  20,  20
+    ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                             "Ok", IDOK,      50,  60,  55, 
15
 }

Modified: trunk/reactos/base/applications/games/winemine/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/lang/en-US.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/en-US.rc Fri Jul 20 23:18:35 2007
@@ -76,8 +76,8 @@
 FONT 8, "MS Shell Dlg"
 {
     LTEXT                               "Winemine", IDNONE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                 "under the Wine license", IDNONE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDNONE,  10,  25,  20,  20
+    ICON                              IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                             "Ok", IDOK,      50,  60,  55, 
15
 }

Modified: trunk/reactos/base/applications/games/winemine/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/lang/es-ES.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/es-ES.rc Fri Jul 20 23:18:35 2007
@@ -76,8 +76,8 @@
 FONT 8, "MS Shell Dlg"
 {
     LTEXT                               "Winemine", IDNONE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                 "under the Wine license", IDNONE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDNONE,  10,  25,  20,  20
+    ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                             "Aceptar", IDOK,      50,  60, 
55,  15
 }

Modified: trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc Fri Jul 20 23:18:35 2007
@@ -76,15 +76,15 @@
     PUSHBUTTON      "Annuler", IDCANCEL,  40,  50,  50,  15
 }
 
-DLG_ABOUT DIALOG DISCARDABLE  0, 0, 145, 80
+DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 145, 80
 STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
 CAPTION "À propos"
 FONT 8, "MS Shell Dlg"
 {
     LTEXT                               "Winemine", IDNONE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                 "Sous licence Wine", IDNONE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDNONE,  10,  25,  20,  20
+    ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                             "Ok", IDOK,      50,  60,  55, 
15
 }
 

Modified: trunk/reactos/base/applications/games/winemine/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/lang/id-ID.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/id-ID.rc Fri Jul 20 23:18:35 2007
@@ -75,8 +75,8 @@
 FONT 8, "MS Shell Dlg"
 {
     LTEXT                               "Winemine", IDNONE,  10,  10,  35,  10
-    LTEXT         "Hak Cipta 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
+    LTEXT         "Hak Cipta 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                  "di bawah lisensi Wine", IDNONE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDNONE,  10,  25,  20,  20
+    ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                             "Ok", IDOK,    50,  60,  55,  15
 }

Modified: trunk/reactos/base/applications/games/winemine/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/lang/it-IT.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/it-IT.rc Fri Jul 20 23:18:35 2007
@@ -3,7 +3,7 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE {
-     IDS_APPNAME, "Prato fiorito"
+     IDS_APPNAME, "Campo minato"
 
 }
 
@@ -23,7 +23,7 @@
     }
     POPUP "&Info" {
         MENUITEM "&Tempi migliori",    				IDM_TIMES
-        MENUITEM "&Informazioni su prato fiorito",         	IDM_ABOUT
+        MENUITEM "&Informazioni su Campo minato",          IDM_ABOUT
     }
 }
 
@@ -62,7 +62,7 @@
 {
     LTEXT           "Righe",      IDNONE,   5,   5,  30,  10
     LTEXT           "Colonne",    IDNONE,   5,  35,  30,  10
-    LTEXT           "Fiori",      IDNONE,   5,  65,  30,  10
+    LTEXT           "Mine",       IDNONE,   5,  65,  30,  10
     EDITTEXT                IDC_EDITROWS,   5,  15,  20,  12, ES_NUMBER
     EDITTEXT                IDC_EDITCOLS,   5,  45,  20,  12, ES_NUMBER
     EDITTEXT               IDC_EDITMINES,   5,  75,  20,  12, ES_NUMBER
@@ -72,12 +72,12 @@
 
 DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 145, 80
 STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
-CAPTION "Informazioni su Prato fiorito"
+CAPTION "Informazioni su Campo minato"
 FONT 8, "MS Shell Dlg"
 {
-    LTEXT                               "Campo fiorito", IDNONE,  10,  10,  35,
 10
-    LTEXT         "Copyright 2000, Joshua Thielen",      IDNONE,  35,  25, 100,
 10
-    LTEXT                 "Sotto licenza Wine",          IDNONE,  35,  35, 100,
 10
-    ICON                                "WINEMINE",      IDNONE,  10,  25,  20,
 20
-    DEFPUSHBUTTON                             "Ok",    IDOK,      50,  60,  55,
 15
+    LTEXT                           "Campo minato", IDNONE,  10,  10,  55,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
+    LTEXT                     "Sotto licenza Wine", IDNONE,  35,  35, 100,  10
+    ICON                              IDI_WINEMINE, IDNONE,  10,  25,  20,  20
+    DEFPUSHBUTTON                             "Ok", IDOK,    50,  60,  55,  15
 }

Modified: trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc Fri Jul 20 23:18:35 2007
@@ -27,10 +27,10 @@
     }
 }
 
-DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
 CAPTION "Beste tider"
+FONT 8, "MS Shell Dlg"
 {
     GROUPBOX        "Beste tider",  IDNONE,     10,  10, 140,  45
     LTEXT           "Nybegynner",   IDNONE,     20,  20,  40,   8
@@ -45,20 +45,20 @@
     DEFPUSHBUTTON   "OK",           IDOK,  55,  60,  50,  15
 }
 
-DLG_CONGRATS DIALOG DISCARDABLE  0, 0, 160, 60
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+DLG_CONGRATS DIALOGEX DISCARDABLE  0, 0, 160, 60
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
 CAPTION "gratulerer!"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT           "Skriv inn navnet ditt", IDIGNORE,  10,  10, 150,  10
     EDITTEXT                             IDC_EDITNAME,  25,  20, 110,  12
     DEFPUSHBUTTON   "Ok",                        IDOK,  60,  40,  40,  15
 }
 
-DLG_CUSTOM DIALOG DISCARDABLE  0, 0, 100, 100
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+DLG_CUSTOM DIALOGEX DISCARDABLE  0, 0, 100, 100
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
 CAPTION "Egendefinert spill"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT           "Høyde",    IDNONE,   5,   5,  30,  10
     LTEXT           "Bredde",   IDNONE,   5,  35,  30,  10
@@ -70,14 +70,14 @@
     PUSHBUTTON      "Avbryt", IDCANCEL,  40,  50,  50,  15
 }
 
-DLG_ABOUT DIALOG DISCARDABLE  0, 0, 145, 80
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 145, 80
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
 CAPTION "Om"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT                         "Minesveiper", IDNONE,  10,  10,  35,  10
-    LTEXT      "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
+    LTEXT      "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                 "under Wine lisensen", IDNONE,  35,  35, 100,  10
-    ICON                          "Minesveiper", IDNONE,  10,  25,  20,  20
+    ICON                          IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                          "Ok",   IDOK,  50,  60,  55,  15
 }

Modified: trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc Fri Jul 20 23:18:35 2007
@@ -76,8 +76,8 @@
 FONT 8, "MS Shell Dlg"
 {
     LTEXT                               "WineMine", IDNONE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                 "onder de Wine licentie", IDNONE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDNONE,  10,  25,  20,  20
+    ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                             "OK", IDOK,      50,  60,  55, 
15
 }

Modified: trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc Fri Jul 20 23:18:35 2007
@@ -34,10 +34,10 @@
     }
 }
 
-DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
 CAPTION "Najlepsze czasy"
+FONT 8, "MS Shell Dlg"
 {
     GROUPBOX        "Najlepsze czasy", IDNONE,  10,  10, 140,  45
     LTEXT           "Pocz¹tkuj¹cy",      IDNONE,  20,  20,  40,   8
@@ -52,20 +52,20 @@
     DEFPUSHBUTTON   "OK",                IDOK,  55,  60,  50,  15
 }
 
-DLG_CONGRATS DIALOG DISCARDABLE  0, 0, 160, 60
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+DLG_CONGRATS DIALOGEX DISCARDABLE  0, 0, 160, 60
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
 CAPTION "Gratulacje!"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT           "Wpisz swoje imiê", IDNONE,  10,  10, 150,  10
     EDITTEXT                              IDC_EDITNAME,  25,  20, 110,  12
     DEFPUSHBUTTON   "Ok",                         IDOK,  60,  40,  40,  15
 }
 
-DLG_CUSTOM DIALOG DISCARDABLE  0, 0, 100, 100
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+DLG_CUSTOM DIALOGEX DISCARDABLE  0, 0, 100, 100
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
 CAPTION "Ustawienia gry"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT           "Iloæ rzêdów",   IDNONE,   5,   5,  30,  10
     LTEXT           "Iloæ kolumn",   IDNONE,   5,  35,  30,  10
@@ -77,14 +77,14 @@
     PUSHBUTTON      "Wycofaj", IDCANCEL,  40,  50,  50,  15
 }
 
-DLG_ABOUT DIALOG DISCARDABLE  0, 0, 145, 80
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 145, 80
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
 CAPTION "Winemine - informacje"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT                               "Winemine", IDNONE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                 "Na licencji Wine", IDNONE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDNONE,  10,  25,  20,  20
+    ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                             "Ok", IDOK,      50,  60,  55, 
15
 }

Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc Fri Jul 20 23:18:35 2007
@@ -78,8 +78,8 @@
 FONT 8, "MS Shell Dlg"
 {
     LTEXT                               "Ñàïåð", IDNONE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                 "ïîä ëèöåíçèåé Wine", IDNONE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDNONE,  10,  25,  20,  20
+    ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                             "Ok", IDOK,      50,  60,  55, 
15
 }

Modified: trunk/reactos/base/applications/games/winemine/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/lang/th-TH.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/th-TH.rc Fri Jul 20 23:18:35 2007
@@ -76,8 +76,8 @@
 FONT 8, "MS Shell Dlg"
 {
     LTEXT                               "Winemine", IDNONE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                "ÀÒÂãµéÅÔ¢ÊÔ·¸Ôì¢Í§ WINE", IDNONE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDNONE,  10,  25,  20,  20
+    ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                           "µ¡Å§",   IDOK,  50,  60,  55,  15
 }

Modified: trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc Fri Jul 20 23:18:35 2007
@@ -84,8 +84,8 @@
 FONT 8, "MS Shell Dlg"
 {
     LTEXT                                  "Ñàïåð", IDNONE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                       "ïî ë³öåíç³¿ Wine", IDNONE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDNONE,  10,  25,  20,  20
+    ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                             "OK", IDOK,      50,  60,  55, 
15
 }

Modified: trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc (original)
+++ trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc Fri Jul 20 23:18:35 2007
@@ -48,9 +48,9 @@
     }
 }
 
-DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80
+DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80
 STYLE  DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP |
DS_SHELLFONT
-FONT 9, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg"
 CAPTION "É¨À×Ó¢ÐÛ°ñ"
 {
     GROUPBOX        "×î¸ß¼ÍÂ¼",        IDNONE,  10,  10, 140,  45
@@ -66,10 +66,9 @@
     DEFPUSHBUTTON   "È·¶¨",              IDOK,  55,  60,  50,  15
 }
 
-DLG_CONGRATS DIALOG DISCARDABLE  0, 0, 160, 60
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
-FONT 9, "MS Shell Dlg"
+DLG_CONGRATS DIALOGEX DISCARDABLE  0, 0, 160, 60
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+FONT 8, "MS Shell Dlg"
 CAPTION "Ë¢ÐÂ¼ÍÂ¼!"
 {
     LTEXT          "ÒÑÆÆ¼ÍÂ¼,ÇëÊäÈëÄãµÄÃû×Ö",    IDIGNORE, 10, 10, 150, 10
@@ -77,10 +76,9 @@
     DEFPUSHBUTTON   "È·¶¨",                          IDOK, 60, 40,  40, 15
 }
 
-DLG_CUSTOM DIALOG DISCARDABLE  0, 0, 100, 100
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
-FONT 9, "MS Shell Dlg"
+DLG_CUSTOM DIALOGEX DISCARDABLE  0, 0, 100, 100
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+FONT 8, "MS Shell Dlg"
 CAPTION "×Ô¶¨ÒåÀ×Çø"
 {
     LTEXT           "¸ß¶È",   IDNONE,   5,   5,  30,  10
@@ -93,16 +91,14 @@
     PUSHBUTTON      "È¡Ïû", IDCANCEL,  40,  50,  50,  15
 }
 
-DLG_ABOUT DIALOG DISCARDABLE  0, 0, 145, 80
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
-FONT 9, "MS Shell Dlg"
+DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 145, 80
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
+FONT 8, "MS Shell Dlg"
 CAPTION "¹ØÓÚÉ¨À×"
 {
     LTEXT                            "Winemine", IDNONE,  10,  10,  35,  10
-    LTEXT           "°æÈ¨ 2000, Joshua Thielen", IDNONE,  35,  20, 100,  10
-    LTEXT              "under the Wine license", IDNONE,  35,  30, 100,  10
-    //LTEXT "ÖÐÎÄ·Òë:ÕÅ±ù\n(ezb@mail.gywb.cn)", IDNONE,  35,  39, 100,  25
-    ICON                             "WINEMINE", IDNONE,  10,  25,  20,  20
+    LTEXT           "°æÈ¨ 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
+    LTEXT              "under the Wine license", IDNONE,  35,  35, 100,  10
+    ICON                             IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                        "È·¶¨", IDOK,    50,  60,  55,  15
 }

Modified: trunk/reactos/base/applications/games/winemine/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…
==============================================================================
--- trunk/reactos/base/applications/games/winemine/main.c (original)
+++ trunk/reactos/base/applications/games/winemine/main.c Fri Jul 20 23:18:35 2007
@@ -56,7 +56,7 @@
     wc.cbClsExtra = 0;
     wc.cbWndExtra = 0;
     wc.hInstance = hInst;
-    wc.hIcon = LoadIcon( hInst, appname );
+    wc.hIcon = LoadIcon( hInst, MAKEINTRESOURCE(IDI_WINEMINE) );
     wc.hCursor = LoadCursor( NULL_HANDLE, (LPCTSTR)IDI_APPLICATION );
     wc.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH	 );
     wc.lpszMenuName = "MENU_WINEMINE";



    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

[ros-diffs] [cfinck] 27760: - Fix the WineMine Icon in the Main window and About window (parts of the patch in bug #2397 by Mario Kacmar (kario AT szm DOT sk) applied) - Make the dialogs of all languages consistent See issue #2397 for more details.