25 Feb
2007
25 Feb
'07
9:58 p.m.
Author: ekohl
Date: Mon Feb 26 00:58:20 2007
New Revision: 25905
URL: http://svn.reactos.org/svn/reactos?rev=25905&view=rev
Log:
- Sort font names alphabetically.
- Enable the user to choose fonts.
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/Ru.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/nl.rc
trunk/reactos/dll/cpl/desk/pl.rc
trunk/reactos/dll/cpl/desk/preview.c
trunk/reactos/dll/cpl/desk/preview.h
trunk/reactos/dll/cpl/desk/sv.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 Mon Feb 26 00:58:20 2007
@@ -92,7 +92,7 @@
CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE |
BS_BITMAP
LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8
- COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
+ 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
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 Mon Feb 26 00:58:20 2007
@@ -89,7 +89,7 @@
CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE |
BS_BITMAP
LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8
- COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
+ 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
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 Mon Feb 26 00:58:20 2007
@@ -89,7 +89,7 @@
CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE |
BS_BITMAP
LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8
- COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
+ 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
Modified: trunk/reactos/dll/cpl/desk/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Ru.rc?rev=259…
==============================================================================
--- trunk/reactos/dll/cpl/desk/Ru.rc (original)
+++ trunk/reactos/dll/cpl/desk/Ru.rc Mon Feb 26 00:58:20 2007
@@ -89,7 +89,7 @@
CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE |
BS_BITMAP
LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8
- COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
+ 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
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 Mon Feb 26 00:58:20 2007
@@ -97,7 +97,7 @@
CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE |
BS_BITMAP
LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8
- COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
+ 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
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 Mon Feb 26 00:58:20 2007
@@ -431,6 +431,28 @@
}
+static VOID
+GetSelectedComboText(HWND hwnd, INT id, LPWSTR lpStr)
+{
+ INT nCount;
+// INT i;
+
+ nCount = SendDlgItemMessage(hwnd, id, CB_GETCURSEL, 0, 0);
+ if (nCount == CB_ERR)
+ {
+ *lpStr = 0;
+ return;
+ }
+
+ nCount = SendDlgItemMessage(hwnd, id, CB_GETLBTEXT, (WPARAM)nCount, (LPARAM)lpStr);
+ if (nCount == CB_ERR)
+ {
+ *lpStr = 0;
+ }
+}
+
+
+
INT_PTR CALLBACK
AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
@@ -510,6 +532,39 @@
}
break;
+ case IDC_ADVAPPEARANCE_FONT_C:
+ if (g && HIWORD(wParam) == CBN_SELCHANGE)
+ {
+// MessageBeep(-1);
+
+ switch (g->CurrentElement)
+ {
+ case IDX_INACTIVE_CAPTION:
+ case IDX_ACTIVE_CAPTION:
+ GetSelectedComboText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C,
+ g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfFaceName);
+ SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCAPTIONFONT, 0,
+ (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
+ break;
+
+ case IDX_MENU:
+ GetSelectedComboText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C,
+ g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfFaceName);
+ SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETMENUFONT, 0,
+ (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
+ break;
+
+ case IDX_DIALOG:
+ GetSelectedComboText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C,
+ g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfFaceName);
+ SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETDIALOGFONT, 0,
+ (LPARAM)&g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font]);
+ break;
+
+ }
+ }
+ break;
+
case IDC_ADVAPPEARANCE_COLOR1_B:
GetColor(hwndDlg, g, 0);
break;
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 Mon Feb 26 00:58:20 2007
@@ -89,7 +89,7 @@
CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE |
BS_BITMAP
LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8
- COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
+ 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
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 Mon Feb 26 00:58:20 2007
@@ -89,7 +89,7 @@
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 |
WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | 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
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 Mon Feb 26 00:58:20 2007
@@ -89,7 +89,7 @@
CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE |
BS_BITMAP
LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8
- COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
+ 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
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 Mon Feb 26 00:58:20 2007
@@ -96,7 +96,7 @@
CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE |
BS_BITMAP
LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8
- COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
+ 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
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 Mon Feb 26 00:58:20 2007
@@ -89,7 +89,7 @@
CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE |
BS_BITMAP
LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8
- COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
+ 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
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 Mon Feb 26 00:58:20 2007
@@ -90,7 +90,7 @@
CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE |
BS_BITMAP
LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8
- COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
+ 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
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 Mon Feb 26 00:58:20 2007
@@ -89,7 +89,7 @@
CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE |
BS_BITMAP
LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8
- COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
+ 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
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 Mon Feb 26 00:58:20 2007
@@ -90,7 +90,7 @@
CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE |
BS_BITMAP
LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8
- COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
+ 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
Modified: trunk/reactos/dll/cpl/desk/preview.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev…
==============================================================================
--- trunk/reactos/dll/cpl/desk/preview.c (original)
+++ trunk/reactos/dll/cpl/desk/preview.c Mon Feb 26 00:58:20 2007
@@ -343,7 +343,7 @@
/* Draw the menu bar */
DrawMenuBarTemp(hwnd, hdc, &pPreviewData->rcActiveMenuBar,
pPreviewData->hMenu,
- pPreviewData->hMessageFont);
+ pPreviewData->hMenuFont);
/* Draw the client area */
CopyRect(&rc, &pPreviewData->rcActiveClient);
@@ -558,6 +558,30 @@
}
break;
+ case PVM_SETCAPTIONFONT:
+ CopyMemory(&pPreviewData->lfCaptionFont, (LOGFONT*)lParam,
sizeof(LOGFONT));
+ DeleteObject(pPreviewData->hCaptionFont);
+ pPreviewData->hCaptionFont =
CreateFontIndirect(&pPreviewData->lfCaptionFont);
+ CalculateItemSize(pPreviewData);
+ InvalidateRect(hwnd, NULL, FALSE);
+ break;
+
+ case PVM_SETMENUFONT:
+ CopyMemory(&pPreviewData->lfMenuFont, (LOGFONT*)lParam,
sizeof(LOGFONT));
+ DeleteObject(pPreviewData->hMenuFont);
+ pPreviewData->hMenuFont =
CreateFontIndirect(&pPreviewData->lfMenuFont);
+ CalculateItemSize(pPreviewData);
+ InvalidateRect(hwnd, NULL, FALSE);
+ break;
+
+ case PVM_SETDIALOGFONT:
+ CopyMemory(&pPreviewData->lfMessageFont, (LOGFONT*)lParam,
sizeof(LOGFONT));
+ DeleteObject(pPreviewData->hMessageFont);
+ pPreviewData->hMessageFont =
CreateFontIndirect(&pPreviewData->lfMessageFont);
+ CalculateItemSize(pPreviewData);
+ InvalidateRect(hwnd, NULL, FALSE);
+ break;
+
default:
DefWindowProc(hwnd,
uMsg,
Modified: trunk/reactos/dll/cpl/desk/preview.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.h?rev…
==============================================================================
--- trunk/reactos/dll/cpl/desk/preview.h (original)
+++ trunk/reactos/dll/cpl/desk/preview.h Mon Feb 26 00:58:20 2007
@@ -35,5 +35,9 @@
#define PVM_GETCYSIZEFRAME (WM_USER+7)
#define PVM_SETCYSIZEFRAME (WM_USER+8)
+#define PVM_SETCAPTIONFONT (WM_USER+9)
+#define PVM_SETMENUFONT (WM_USER+10)
+#define PVM_SETDIALOGFONT (WM_USER+11)
+
BOOL RegisterPreviewControl(IN HINSTANCE hInstance);
VOID UnregisterPreviewControl(IN HINSTANCE hInstance);
Modified: trunk/reactos/dll/cpl/desk/sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/sv.rc?rev=259…
==============================================================================
--- trunk/reactos/dll/cpl/desk/sv.rc (original)
+++ trunk/reactos/dll/cpl/desk/sv.rc Mon Feb 26 00:58:20 2007
@@ -92,7 +92,7 @@
CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE |
BS_BITMAP
LTEXT "Font:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8
- COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS |
WS_VSCROLL | WS_TABSTOP
+ 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