diff --git a/reactos/dll/cpl/desk/Fr.rc b/reactos/dll/cpl/desk/Fr.rc index f81081fff5c..53196da600c 100644 --- a/reactos/dll/cpl/desk/Fr.rc +++ b/reactos/dll/cpl/desk/Fr.rc @@ -59,8 +59,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Vide pour l'instant....",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -139,3 +139,25 @@ BEGIN IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END diff --git a/reactos/dll/cpl/desk/It.rc b/reactos/dll/cpl/desk/It.rc index c0e5f7c6116..d1c3134c885 100644 --- a/reactos/dll/cpl/desk/It.rc +++ b/reactos/dll/cpl/desk/It.rc @@ -53,8 +53,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Questo spazio stato intenzionalmente lasciato in bianco.",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -133,3 +133,25 @@ BEGIN IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END diff --git a/reactos/dll/cpl/desk/Ja.rc b/reactos/dll/cpl/desk/Ja.rc index ceed69362cc..23e7aba13dc 100644 --- a/reactos/dll/cpl/desk/Ja.rc +++ b/reactos/dll/cpl/desk/Ja.rc @@ -57,8 +57,8 @@ FONT 9, "MS UI Gothic" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "͈Ӑ}Iɋ󂯂܂܂ɂĂ܂",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -137,3 +137,25 @@ BEGIN IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END diff --git a/reactos/dll/cpl/desk/Ru.rc b/reactos/dll/cpl/desk/Ru.rc index 977e0c12017..4ba9a73a728 100644 --- a/reactos/dll/cpl/desk/Ru.rc +++ b/reactos/dll/cpl/desk/Ru.rc @@ -56,7 +56,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT " ",IDC_STATIC,65,150,114,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX 0, 0, 246, 188 @@ -147,3 +148,25 @@ BEGIN IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END diff --git a/reactos/dll/cpl/desk/Uk.rc b/reactos/dll/cpl/desk/Uk.rc index 672c8b05787..55549e325c9 100644 --- a/reactos/dll/cpl/desk/Uk.rc +++ b/reactos/dll/cpl/desk/Uk.rc @@ -61,8 +61,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT " ",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -141,3 +141,25 @@ BEGIN IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END diff --git a/reactos/dll/cpl/desk/appearance.c b/reactos/dll/cpl/desk/appearance.c index 7b2fcad930c..18a4a63e98c 100644 --- a/reactos/dll/cpl/desk/appearance.c +++ b/reactos/dll/cpl/desk/appearance.c @@ -10,6 +10,23 @@ #include "desk.h" + +static VOID +OnInitDialog(HWND hwndDlg) +{ + TCHAR szBuffer[256]; + UINT i; + + for (i = IDS_ITEM_FIRST; i < IDS_ITEM_LAST; i++) + { + LoadString(hApplet, i, szBuffer, 256); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_ADDSTRING, 0, (LPARAM)szBuffer); + } + + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_SETCURSEL, 2, 0); +} + + INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, @@ -23,10 +40,15 @@ AppearancePageProc(HWND hwndDlg, switch (uMsg) { case WM_INITDIALOG: + OnInitDialog(hwndDlg); break; case WM_COMMAND: break; + + case WM_USER: + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_SETCURSEL, lParam, 0); + break; } return FALSE; diff --git a/reactos/dll/cpl/desk/cz.rc b/reactos/dll/cpl/desk/cz.rc index 40199b3cd70..5acbe8c54c2 100644 --- a/reactos/dll/cpl/desk/cz.rc +++ b/reactos/dll/cpl/desk/cz.rc @@ -57,8 +57,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -131,3 +131,25 @@ BEGIN IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END diff --git a/reactos/dll/cpl/desk/de.rc b/reactos/dll/cpl/desk/de.rc index 186a3c44668..f2ae1edebbb 100644 --- a/reactos/dll/cpl/desk/de.rc +++ b/reactos/dll/cpl/desk/de.rc @@ -55,9 +55,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -135,3 +134,25 @@ BEGIN IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D-Objekte" + IDS_ITEM_SCROLLBAR "Bildlaufleiste" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Dialogfeld" + IDS_ITEM_WINDOW "Fenster" + IDS_ITEM_APP_BACKGROUND "Hintergrund der Anwendung" + IDS_ITEM_SELECTED_ITEMS "Markierte Elemente" + IDS_ITEM_MENU "Men" + IDS_ITEM_PALETTE_TITLE "Palettentitel" + IDS_ITEM_TOOLTIP "Quickinfo" + IDS_ITEM_INACTIVE_WINDOW "Rahmen der inaktiven Fenster" + IDS_ITEM_ACTIVE_WINDOW "Rahmen der aktiven Fenster" + IDS_ITEM_ICON "Symbol" + IDS_ITEM_ICON_SPACE_HORZ "Symbolabstand (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Symbolabstand (Vertikal)" + IDS_ITEM_INACTIVE_TITLE "Titelleiste des inaktiven Fensters" + IDS_ITEM_ACTIVE_TITLE "Titelleiste des aktiven Fensters" + IDS_ITEM_CAPTION_BUTTONS "Titelleistenschaltflche" +END diff --git a/reactos/dll/cpl/desk/en.rc b/reactos/dll/cpl/desk/en.rc index 6c5585fe3b4..4b1c0ccbb33 100644 --- a/reactos/dll/cpl/desk/en.rc +++ b/reactos/dll/cpl/desk/en.rc @@ -53,8 +53,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -133,3 +133,25 @@ BEGIN IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END diff --git a/reactos/dll/cpl/desk/es.rc b/reactos/dll/cpl/desk/es.rc index 3d0a6ee0860..9961962dfbf 100644 --- a/reactos/dll/cpl/desk/es.rc +++ b/reactos/dll/cpl/desk/es.rc @@ -64,8 +64,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Este espacio se ha dejado en blanco intencionadamente",IDC_STATIC,33, - 150,181,10 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -138,3 +138,25 @@ BEGIN IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END diff --git a/reactos/dll/cpl/desk/gr.rc b/reactos/dll/cpl/desk/gr.rc index db6eb7f8d8f..b9db77127dd 100644 --- a/reactos/dll/cpl/desk/gr.rc +++ b/reactos/dll/cpl/desk/gr.rc @@ -57,8 +57,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -137,3 +137,25 @@ BEGIN IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END diff --git a/reactos/dll/cpl/desk/hu.rc b/reactos/dll/cpl/desk/hu.rc index 98e7167c029..476b50d5638 100644 --- a/reactos/dll/cpl/desk/hu.rc +++ b/reactos/dll/cpl/desk/hu.rc @@ -49,7 +49,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Ez a terlet szndkosan lett resen hagyva",IDC_STATIC,66,150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -125,3 +126,25 @@ BEGIN IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END diff --git a/reactos/dll/cpl/desk/nl.rc b/reactos/dll/cpl/desk/nl.rc index fe5d808381e..cd5cdb6d0c1 100644 --- a/reactos/dll/cpl/desk/nl.rc +++ b/reactos/dll/cpl/desk/nl.rc @@ -57,8 +57,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -131,3 +131,25 @@ BEGIN IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END diff --git a/reactos/dll/cpl/desk/pl.rc b/reactos/dll/cpl/desk/pl.rc index 629d932090e..c77aba79219 100644 --- a/reactos/dll/cpl/desk/pl.rc +++ b/reactos/dll/cpl/desk/pl.rc @@ -58,8 +58,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "To miejsce pozostao celowo puste",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -132,3 +132,25 @@ BEGIN IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END diff --git a/reactos/dll/cpl/desk/preview.c b/reactos/dll/cpl/desk/preview.c index 467e923c320..ae83c1b06b9 100644 --- a/reactos/dll/cpl/desk/preview.c +++ b/reactos/dll/cpl/desk/preview.c @@ -13,6 +13,8 @@ static const TCHAR szPreviewWndClass[] = TEXT("PreviewWndClass"); typedef struct _PREVIEW_DATA { + HWND hwndParent; + DWORD clrDesktop; HBRUSH hbrDesktop; @@ -39,6 +41,7 @@ typedef struct _PREVIEW_DATA RECT rcActiveFrame; RECT rcActiveCaption; RECT rcActiveMenuBar; + RECT rcSelectedMenuItem; RECT rcActiveClient; RECT rcActiveScroll; @@ -176,6 +179,9 @@ OnCreate(HWND hwnd, PPREVIEW_DATA pPreviewData) HiliteMenuItem(hwnd, pPreviewData->hMenu, ID_MENU_SELECTED, MF_BYCOMMAND | MF_HILITE); +// GetMenuItemRect(hwnd, pPreviewData->hMenu, +// ID_MENU_SELECTED, &pPreviewData->rcSelectedMenuItem); + AllocAndLoadString(&pPreviewData->lpInAct, hApplet, IDS_INACTWIN); AllocAndLoadString(&pPreviewData->lpAct, hApplet, IDS_ACTWIN); @@ -347,6 +353,54 @@ OnPaint(HWND hwnd, PPREVIEW_DATA pPreviewData) } +static VOID +OnLButtonDown(HWND hwnd, int xPos, int yPos, PPREVIEW_DATA pPreviewData) +{ + UINT type = IDX_DESKTOP; + POINT pt; + + pt.x = xPos; + pt.y = yPos; + + if (PtInRect(&pPreviewData->rcInactiveFrame, pt)) + type = IDX_INACTIVE_BORDER; + + if (PtInRect(&pPreviewData->rcInactiveCaption, pt)) + type = IDX_INACTIVE_CAPTION; + + + if (PtInRect(&pPreviewData->rcActiveFrame, pt)) + type = IDX_ACTIVE_BORDER; + + if (PtInRect(&pPreviewData->rcActiveCaption, pt)) + type = IDX_ACTIVE_CAPTION; + + if (PtInRect(&pPreviewData->rcActiveMenuBar, pt)) + type = IDX_MENU; + +// if (PtInRect(&pPreviewData->rcSelectedMenuItem, pt)) +// type = IDX_SELECTION; + + if (PtInRect(&pPreviewData->rcActiveClient, pt)) + type = IDX_WINDOW; + + if (PtInRect(&pPreviewData->rcActiveScroll, pt)) + type = IDX_SCROLLBAR; + + + if (PtInRect(&pPreviewData->rcDialogFrame, pt)) + type = IDX_DIALOG; + + if (PtInRect(&pPreviewData->rcDialogCaption, pt)) + type = IDX_ACTIVE_CAPTION; + + if (PtInRect(&pPreviewData->rcDialogButton, pt)) + type = IDX_3D_OBJECTS; + + SendMessage(GetParent(hwnd), WM_USER, 0, type); +} + + static VOID OnDestroy(PPREVIEW_DATA pPreviewData) { @@ -400,6 +454,10 @@ PreviewWndProc(HWND hwnd, OnPaint(hwnd, pPreviewData); break; + case WM_LBUTTONDOWN: + OnLButtonDown(hwnd, LOWORD(lParam), HIWORD(lParam), pPreviewData); + break; + case WM_DESTROY: OnDestroy(pPreviewData); HeapFree(GetProcessHeap(), 0, pPreviewData); diff --git a/reactos/dll/cpl/desk/preview.h b/reactos/dll/cpl/desk/preview.h index 5d4cbeef6f2..8b5852cad53 100644 --- a/reactos/dll/cpl/desk/preview.h +++ b/reactos/dll/cpl/desk/preview.h @@ -1,4 +1,21 @@ +#define IDX_3D_OBJECTS 0 +#define IDX_SCROLLBAR 1 +#define IDX_DESKTOP 2 +#define IDX_DIALOG 3 +#define IDX_WINDOW 4 +#define IDX_APPSPACE 5 +#define IDX_SELECTION 6 +#define IDX_MENU 7 + +#define IDX_QUICKINFO 9 +#define IDX_INACTIVE_BORDER 10 +#define IDX_ACTIVE_BORDER 11 + +#define IDX_INACTIVE_CAPTION 15 +#define IDX_ACTIVE_CAPTION 16 +#define IDX_CAPTION_BUTTON 17 + BOOL RegisterPreviewControl(IN HINSTANCE hInstance); VOID UnregisterPreviewControl(IN HINSTANCE hInstance); diff --git a/reactos/dll/cpl/desk/resource.h b/reactos/dll/cpl/desk/resource.h index f362b8895bf..f83d9cbd49f 100644 --- a/reactos/dll/cpl/desk/resource.h +++ b/reactos/dll/cpl/desk/resource.h @@ -84,7 +84,8 @@ /* Appearance Page */ -#define IDC_APPEARANCE_PREVIEW 1500 +#define IDC_APPEARANCE_PREVIEW 1500 +#define IDC_APPEARANCE_UI_ITEM 1501 #define IDS_INACTWIN 1510 #define IDS_ACTWIN 1511 @@ -93,6 +94,29 @@ #define IDS_MESSTEXT 1514 #define IDS_BUTTEXT 1515 +#define IDS_ITEM_3D_OBJECTS 1601 +#define IDS_ITEM_SCROLLBAR 1602 +#define IDS_ITEM_DESKTOP 1603 +#define IDS_ITEM_MESSAGE_BOX 1604 +#define IDS_ITEM_WINDOW 1605 +#define IDS_ITEM_APP_BACKGROUND 1606 +#define IDS_ITEM_SELECTED_ITEMS 1607 +#define IDS_ITEM_MENU 1608 +#define IDS_ITEM_PALETTE_TITLE 1609 +#define IDS_ITEM_TOOLTIP 1610 +#define IDS_ITEM_INACTIVE_WINDOW 1611 +#define IDS_ITEM_ACTIVE_WINDOW 1612 +#define IDS_ITEM_ICON 1613 +#define IDS_ITEM_ICON_SPACE_HORZ 1614 +#define IDS_ITEM_ICON_SPACE_VERT 1615 +#define IDS_ITEM_INACTIVE_TITLE 1616 +#define IDS_ITEM_ACTIVE_TITLE 1617 +#define IDS_ITEM_CAPTION_BUTTONS 1618 + +/* Update these IDs when you change the string id list */ +#define IDS_ITEM_FIRST (IDS_ITEM_3D_OBJECTS) +#define IDS_ITEM_LAST (IDS_ITEM_CAPTION_BUTTONS + 1) + #endif /* __CPL_DESK_RESOURCE_H__ */ diff --git a/reactos/dll/cpl/desk/sv.rc b/reactos/dll/cpl/desk/sv.rc index 96cd72d5216..a2b443ca3db 100644 --- a/reactos/dll/cpl/desk/sv.rc +++ b/reactos/dll/cpl/desk/sv.rc @@ -60,8 +60,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Det hr utrymmet har avsiktligt\nlmnats tomt",IDC_STATIC,66, - 150,112,20 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -134,3 +134,25 @@ BEGIN IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END