[ros-diffs] [ekohl] 25970: - Let the user edit the font size directly. - Remove the useless "NOT CBS_SIMPLE" window style from the font size combobox.

3 Mar 2007

Author: ekohl
Date: Sat Mar  3 15:44:09 2007
New Revision: 25970

URL: http://svn.reactos.org/svn/reactos?rev=25970&view=rev
Log:
- Let the user edit the font size directly.
- Remove the useless "NOT CBS_SIMPLE" window style from the font size combobox.

Modified:
    trunk/reactos/dll/cpl/desk/Fr.rc
    trunk/reactos/dll/cpl/desk/It.rc
    trunk/reactos/dll/cpl/desk/Ja.rc
    trunk/reactos/dll/cpl/desk/Uk.rc
    trunk/reactos/dll/cpl/desk/advappdlg.c
    trunk/reactos/dll/cpl/desk/cz.rc
    trunk/reactos/dll/cpl/desk/de.rc
    trunk/reactos/dll/cpl/desk/en.rc
    trunk/reactos/dll/cpl/desk/es.rc
    trunk/reactos/dll/cpl/desk/gr.rc
    trunk/reactos/dll/cpl/desk/hu.rc
    trunk/reactos/dll/cpl/desk/id-ID.rc
    trunk/reactos/dll/cpl/desk/nl.rc
    trunk/reactos/dll/cpl/desk/pl.rc
    trunk/reactos/dll/cpl/desk/ru-RU.rc

Modified: trunk/reactos/dll/cpl/desk/Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Fr.rc?rev=259…
==============================================================================

--- trunk/reactos/dll/cpl/desk/Fr.rc (original)
+++ trunk/reactos/dll/cpl/desk/Fr.rc Sat Mar  3 15:44:09 2007
@@ -95,15 +95,15 @@
     COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
     LTEXT   "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE |
CBS_DROPDOWN | WS_VSCROLL
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
 
     LTEXT   "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9
     CHECKBOX   "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE
| BS_BITMAP
 
     AUTOCHECKBOX   "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13,
BS_PUSHLIKE
-    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE 
-
-    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 
+    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE
+
+    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
 END
 
@@ -196,7 +196,7 @@
     IDS_ELEMENT_9 "Scrollbars"
     IDS_ELEMENT_10 "3D objects"
     IDS_ELEMENT_11 "Palette title"
-	IDS_ELEMENT_12 "Symbol title"
+    IDS_ELEMENT_12 "Symbol title"
     IDS_ELEMENT_13 "Captionbar"
     IDS_ELEMENT_14 "Deactivated menu elements"
     IDS_ELEMENT_15 "Dialog"

Modified: trunk/reactos/dll/cpl/desk/It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/It.rc?rev=259…
==============================================================================
--- trunk/reactos/dll/cpl/desk/It.rc (original)
+++ trunk/reactos/dll/cpl/desk/It.rc Sat Mar  3 15:44:09 2007
@@ -92,15 +92,15 @@
     COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
     LTEXT   "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE |
CBS_DROPDOWN | WS_VSCROLL
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
 
     LTEXT   "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9
     CHECKBOX   "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE
| BS_BITMAP
 
     AUTOCHECKBOX   "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13,
BS_PUSHLIKE
-    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE 
-
-    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 
+    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE
+
+    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
 END
 
@@ -193,7 +193,7 @@
     IDS_ELEMENT_9 "Scrollbars"
     IDS_ELEMENT_10 "3D objects"
     IDS_ELEMENT_11 "Palette title"
-	IDS_ELEMENT_12 "Symbol title"
+    IDS_ELEMENT_12 "Symbol title"
     IDS_ELEMENT_13 "Captionbar"
     IDS_ELEMENT_14 "Deactivated menu elements"
     IDS_ELEMENT_15 "Dialog"

Modified: trunk/reactos/dll/cpl/desk/Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ja.rc?rev=259…
==============================================================================
--- trunk/reactos/dll/cpl/desk/Ja.rc (original)
+++ trunk/reactos/dll/cpl/desk/Ja.rc Sat Mar  3 15:44:09 2007
@@ -92,15 +92,15 @@
     COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
     LTEXT   "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE |
CBS_DROPDOWN | WS_VSCROLL
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
 
     LTEXT   "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9
     CHECKBOX   "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE
| BS_BITMAP
 
     AUTOCHECKBOX   "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13,
BS_PUSHLIKE
-    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE 
-
-    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 
+    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE
+
+    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
 END
 
@@ -193,7 +193,7 @@
     IDS_ELEMENT_9 "Scrollbars"
     IDS_ELEMENT_10 "3D objects"
     IDS_ELEMENT_11 "Palette title"
-	IDS_ELEMENT_12 "Symbol title"
+    IDS_ELEMENT_12 "Symbol title"
     IDS_ELEMENT_13 "Captionbar"
     IDS_ELEMENT_14 "Deactivated menu elements"
     IDS_ELEMENT_15 "Dialog"

Modified: trunk/reactos/dll/cpl/desk/Uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Uk.rc?rev=259…
==============================================================================
--- trunk/reactos/dll/cpl/desk/Uk.rc (original)
+++ trunk/reactos/dll/cpl/desk/Uk.rc Sat Mar  3 15:44:09 2007
@@ -100,15 +100,15 @@
     COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
     LTEXT   "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE |
CBS_DROPDOWN | WS_VSCROLL
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
 
     LTEXT   "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9
     CHECKBOX   "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE
| BS_BITMAP
 
     AUTOCHECKBOX   "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13,
BS_PUSHLIKE
-    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE 
-
-    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 
+    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE
+
+    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
 END
 
@@ -201,7 +201,7 @@
     IDS_ELEMENT_9 "Scrollbars"
     IDS_ELEMENT_10 "3D objects"
     IDS_ELEMENT_11 "Palette title"
-	IDS_ELEMENT_12 "Symbol title"
+    IDS_ELEMENT_12 "Symbol title"
     IDS_ELEMENT_13 "Captionbar"
     IDS_ELEMENT_14 "Deactivated menu elements"
     IDS_ELEMENT_15 "Dialog"

Modified: trunk/reactos/dll/cpl/desk/advappdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r…
==============================================================================
--- trunk/reactos/dll/cpl/desk/advappdlg.c (original)
+++ trunk/reactos/dll/cpl/desk/advappdlg.c Sat Mar  3 15:44:09 2007
@@ -468,6 +468,20 @@
 }
 
 
+static INT
+GetEditedComboInt(HWND hwnd, INT id)
+{
+    INT nCount;
+    BOOL bTranslated;
+
+    nCount = GetDlgItemInt(hwnd, id, &bTranslated, FALSE);
+    if (bTranslated == FALSE)
+        return 12;
+
+    return nCount;
+}
+
+
 
 INT_PTR CALLBACK
 AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -614,6 +628,41 @@
 
 						ReleaseDC(hwndDlg, hdcDlg);
 					}
+					else if (g && HIWORD(wParam) == CBN_EDITCHANGE)
+					{
+						HDC hdcDlg = GetDC(hwndDlg);
+						INT i;
+
+						switch (g->CurrentElement)
+						{
+							case IDX_INACTIVE_CAPTION:
+							case IDX_ACTIVE_CAPTION:
+								i = GetEditedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E);
+								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight =
+									-MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72);
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCAPTIONFONT, 0,
+									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
+								break;
+
+							case IDX_MENU:
+								i = GetEditedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E);
+								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight =
+									-MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72);
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETMENUFONT, 0,
+									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
+								break;
+
+							case IDX_DIALOG:
+								i = GetEditedComboInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E);
+								g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight =
+									-MulDiv(i , GetDeviceCaps(hdcDlg, LOGPIXELSY), 72);
+								SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETDIALOGFONT, 0,
+									(LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
+								break;
+						}
+
+						ReleaseDC(hwndDlg, hdcDlg);
+					}
 					break;
 
 				case IDC_ADVAPPEARANCE_COLOR1_B:

Modified: trunk/reactos/dll/cpl/desk/cz.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/cz.rc?rev=259…
==============================================================================
--- trunk/reactos/dll/cpl/desk/cz.rc (original)
+++ trunk/reactos/dll/cpl/desk/cz.rc Sat Mar  3 15:44:09 2007
@@ -92,15 +92,15 @@
     COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
     LTEXT   "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE |
CBS_DROPDOWN | WS_VSCROLL
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
 
     LTEXT   "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9
     CHECKBOX   "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE
| BS_BITMAP
 
     AUTOCHECKBOX   "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13,
BS_PUSHLIKE
-    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE 
-
-    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 
+    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE
+
+    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
 END
 
@@ -193,7 +193,7 @@
     IDS_ELEMENT_9 "Scrollbars"
     IDS_ELEMENT_10 "3D objects"
     IDS_ELEMENT_11 "Palette title"
-	IDS_ELEMENT_12 "Symbol title"
+    IDS_ELEMENT_12 "Symbol title"
     IDS_ELEMENT_13 "Captionbar"
     IDS_ELEMENT_14 "Deactivated menu elements"
     IDS_ELEMENT_15 "Dialog"

Modified: trunk/reactos/dll/cpl/desk/de.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=259…
==============================================================================
--- trunk/reactos/dll/cpl/desk/de.rc (original)
+++ trunk/reactos/dll/cpl/desk/de.rc Sat Mar  3 15:44:09 2007
@@ -89,18 +89,18 @@
     CHECKBOX   "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE |
BS_BITMAP
 
     LTEXT "Schriftart:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS
| CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
     LTEXT   "Schriftgra&d:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE |
CBS_DROPDOWN | WS_VSCROLL
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
 
     LTEXT   "Fa&rbe:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9
     CHECKBOX   "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE
| BS_BITMAP
 
     AUTOCHECKBOX   "F", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13,
BS_PUSHLIKE
-    AUTOCHECKBOX   "K ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE 
-
-    PUSHBUTTON "Abbrechen", IDCANCEL, 191, 220, 50, 14 
+    AUTOCHECKBOX   "K ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE
+
+    PUSHBUTTON "Abbrechen", IDCANCEL, 191, 220, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
 END
 
@@ -193,7 +193,7 @@
     IDS_ELEMENT_9 "Bildlaufleiste"
     IDS_ELEMENT_10 "3D-Objekte"
     IDS_ELEMENT_11 "Palettentitel"
-	IDS_ELEMENT_12 "Symboltitel"
+    IDS_ELEMENT_12 "Symboltitel"
     IDS_ELEMENT_13 "Titelleistenschaltfläche"
     IDS_ELEMENT_14 "Deaktiviertes Menüelement"
     IDS_ELEMENT_15 "Dialogfeld"

Modified: trunk/reactos/dll/cpl/desk/en.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/en.rc?rev=259…
==============================================================================
--- trunk/reactos/dll/cpl/desk/en.rc (original)
+++ trunk/reactos/dll/cpl/desk/en.rc Sat Mar  3 15:44:09 2007
@@ -92,15 +92,15 @@
     COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
     LTEXT   "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE |
CBS_DROPDOWN | WS_VSCROLL
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
 
     LTEXT   "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9
     CHECKBOX   "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE
| BS_BITMAP
 
     AUTOCHECKBOX   "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13,
BS_PUSHLIKE
-    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE 
-
-    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 
+    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE
+
+    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
 END
 
@@ -193,7 +193,7 @@
     IDS_ELEMENT_9 "Scrollbars"
     IDS_ELEMENT_10 "3D objects"
     IDS_ELEMENT_11 "Palette title"
-	IDS_ELEMENT_12 "Symbol title"
+    IDS_ELEMENT_12 "Symbol title"
     IDS_ELEMENT_13 "Captionbar"
     IDS_ELEMENT_14 "Deactivated menu elements"
     IDS_ELEMENT_15 "Dialog"

Modified: trunk/reactos/dll/cpl/desk/es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/es.rc?rev=259…
==============================================================================
--- trunk/reactos/dll/cpl/desk/es.rc (original)
+++ trunk/reactos/dll/cpl/desk/es.rc Sat Mar  3 15:44:09 2007
@@ -99,15 +99,15 @@
     COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
     LTEXT   "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE |
CBS_DROPDOWN | WS_VSCROLL
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
 
     LTEXT   "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9
     CHECKBOX   "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE
| BS_BITMAP
 
     AUTOCHECKBOX   "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13,
BS_PUSHLIKE
-    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE 
-
-    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 
+    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE
+
+    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
 END
 
@@ -200,7 +200,7 @@
     IDS_ELEMENT_9 "Scrollbars"
     IDS_ELEMENT_10 "3D objects"
     IDS_ELEMENT_11 "Palette title"
-	IDS_ELEMENT_12 "Symbol title"
+    IDS_ELEMENT_12 "Symbol title"
     IDS_ELEMENT_13 "Captionbar"
     IDS_ELEMENT_14 "Deactivated menu elements"
     IDS_ELEMENT_15 "Dialog"

Modified: trunk/reactos/dll/cpl/desk/gr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/gr.rc?rev=259…
==============================================================================
--- trunk/reactos/dll/cpl/desk/gr.rc (original)
+++ trunk/reactos/dll/cpl/desk/gr.rc Sat Mar  3 15:44:09 2007
@@ -92,15 +92,15 @@
     COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
     LTEXT   "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE |
CBS_DROPDOWN | WS_VSCROLL
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
 
     LTEXT   "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9
     CHECKBOX   "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE
| BS_BITMAP
 
     AUTOCHECKBOX   "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13,
BS_PUSHLIKE
-    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE 
-
-    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 
+    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE
+
+    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
 END
 
@@ -193,7 +193,7 @@
     IDS_ELEMENT_9 "Scrollbars"
     IDS_ELEMENT_10 "3D objects"
     IDS_ELEMENT_11 "Palette title"
-	IDS_ELEMENT_12 "Symbol title"
+    IDS_ELEMENT_12 "Symbol title"
     IDS_ELEMENT_13 "Captionbar"
     IDS_ELEMENT_14 "Deactivated menu elements"
     IDS_ELEMENT_15 "Dialog"

Modified: trunk/reactos/dll/cpl/desk/hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/hu.rc?rev=259…
==============================================================================
--- trunk/reactos/dll/cpl/desk/hu.rc (original)
+++ trunk/reactos/dll/cpl/desk/hu.rc Sat Mar  3 15:44:09 2007
@@ -93,15 +93,15 @@
     COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
     LTEXT   "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE |
CBS_DROPDOWN | WS_VSCROLL
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
 
     LTEXT   "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9
     CHECKBOX   "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE
| BS_BITMAP
 
     AUTOCHECKBOX   "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13,
BS_PUSHLIKE
-    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE 
-
-    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 
+    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE
+
+    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
 END
 
@@ -194,7 +194,7 @@
     IDS_ELEMENT_9 "Scrollbars"
     IDS_ELEMENT_10 "3D objects"
     IDS_ELEMENT_11 "Palette title"
-	IDS_ELEMENT_12 "Symbol title"
+    IDS_ELEMENT_12 "Symbol title"
     IDS_ELEMENT_13 "Captionbar"
     IDS_ELEMENT_14 "Deactivated menu elements"
     IDS_ELEMENT_15 "Dialog"

Modified: trunk/reactos/dll/cpl/desk/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/id-ID.rc?rev=…
==============================================================================
--- trunk/reactos/dll/cpl/desk/id-ID.rc (original)
+++ trunk/reactos/dll/cpl/desk/id-ID.rc Sat Mar  3 15:44:09 2007
@@ -92,15 +92,15 @@
     COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
     LTEXT   "Besar Font:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE |
CBS_DROPDOWN | WS_VSCROLL
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
 
     LTEXT   "Warna:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9
     CHECKBOX   "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE
| BS_BITMAP
 
     AUTOCHECKBOX   "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13,
BS_PUSHLIKE
-    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE 
-
-    PUSHBUTTON "Batal", IDCANCEL, 191, 220, 50, 14 
+    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE
+
+    PUSHBUTTON "Batal", IDCANCEL, 191, 220, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
 END
 
@@ -193,7 +193,7 @@
     IDS_ELEMENT_9 "Scrollbars"
     IDS_ELEMENT_10 "Obyek 3D"
     IDS_ELEMENT_11 "Judul Palet"
-	IDS_ELEMENT_12 "Judul Simbol"
+    IDS_ELEMENT_12 "Judul Simbol"
     IDS_ELEMENT_13 "Bar judul"
     IDS_ELEMENT_14 "Elemen menu Deaktivasi"
     IDS_ELEMENT_15 "Dialog"

Modified: trunk/reactos/dll/cpl/desk/nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/nl.rc?rev=259…
==============================================================================
--- trunk/reactos/dll/cpl/desk/nl.rc (original)
+++ trunk/reactos/dll/cpl/desk/nl.rc Sat Mar  3 15:44:09 2007
@@ -92,7 +92,7 @@
     COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
     LTEXT   "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE |
CBS_DROPDOWN | WS_VSCROLL
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
 
     LTEXT   "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9
     CHECKBOX   "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE
| BS_BITMAP
@@ -100,7 +100,7 @@
     AUTOCHECKBOX   "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13,
BS_PUSHLIKE
     AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE 
 
-    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 
+    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
 END
 
@@ -193,7 +193,7 @@
     IDS_ELEMENT_9 "Scrollbars"
     IDS_ELEMENT_10 "3D objects"
     IDS_ELEMENT_11 "Palette title"
-	IDS_ELEMENT_12 "Symbol title"
+    IDS_ELEMENT_12 "Symbol title"
     IDS_ELEMENT_13 "Captionbar"
     IDS_ELEMENT_14 "Deactivated menu elements"
     IDS_ELEMENT_15 "Dialog"

Modified: trunk/reactos/dll/cpl/desk/pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/pl.rc?rev=259…
==============================================================================
--- trunk/reactos/dll/cpl/desk/pl.rc (original)
+++ trunk/reactos/dll/cpl/desk/pl.rc Sat Mar  3 15:44:09 2007
@@ -93,15 +93,15 @@
     COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
     LTEXT   "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE |
CBS_DROPDOWN | WS_VSCROLL
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
 
     LTEXT   "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9
     CHECKBOX   "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE
| BS_BITMAP
 
     AUTOCHECKBOX   "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13,
BS_PUSHLIKE
-    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE 
-
-    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 
+    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE
+
+    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
 END
 
@@ -194,7 +194,7 @@
     IDS_ELEMENT_9 "Scrollbars"
     IDS_ELEMENT_10 "3D objects"
     IDS_ELEMENT_11 "Palette title"
-	IDS_ELEMENT_12 "Symbol title"
+    IDS_ELEMENT_12 "Symbol title"
     IDS_ELEMENT_13 "Captionbar"
     IDS_ELEMENT_14 "Deactivated menu elements"
     IDS_ELEMENT_15 "Dialog"

Modified: trunk/reactos/dll/cpl/desk/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/ru-RU.rc?rev=…
==============================================================================
--- trunk/reactos/dll/cpl/desk/ru-RU.rc (original)
+++ trunk/reactos/dll/cpl/desk/ru-RU.rc Sat Mar  3 15:44:09 2007
@@ -92,15 +92,15 @@
     COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
 
     LTEXT   "Fontsize:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8
-    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, NOT CBS_SIMPLE |
CBS_DROPDOWN | WS_VSCROLL
+    COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
 
     LTEXT   "Color:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9
     CHECKBOX   "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE
| BS_BITMAP
 
     AUTOCHECKBOX   "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13,
BS_PUSHLIKE
-    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE 
-
-    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 
+    AUTOCHECKBOX   "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13,
BS_PUSHLIKE
+
+    PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14
     DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14
 END
 
@@ -193,7 +193,7 @@
     IDS_ELEMENT_9 "Scrollbars"
     IDS_ELEMENT_10 "3D objects"
     IDS_ELEMENT_11 "Palette title"
-	IDS_ELEMENT_12 "Symbol title"
+    IDS_ELEMENT_12 "Symbol title"
     IDS_ELEMENT_13 "Captionbar"
     IDS_ELEMENT_14 "Deactivated menu elements"
     IDS_ELEMENT_15 "Dialog"



    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

[ros-diffs] [ekohl] 25970: - Let the user edit the font size directly. - Remove the useless "NOT CBS_SIMPLE" window style from the font size combobox.