From 9ae5b19fde2c865057f3e10110836341c8c6daeb Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Mon, 12 Feb 2007 03:32:40 +0000 Subject: [PATCH] - Implement appearance page of desk.cpl - update and cleanup resources See issue #1732 for more details. svn path=/trunk/; revision=25791 --- reactos/dll/cpl/desk/Fr.rc | 135 ++++--- reactos/dll/cpl/desk/It.rc | 125 ++++-- reactos/dll/cpl/desk/Ja.rc | 125 ++++-- reactos/dll/cpl/desk/Ru.rc | 170 ++++---- reactos/dll/cpl/desk/Uk.rc | 117 ++++-- reactos/dll/cpl/desk/advappdlg.c | 463 ++++++++++++++++++++++ reactos/dll/cpl/desk/appearance.c | 635 ++++++++++++++++++++++-------- reactos/dll/cpl/desk/appearance.h | 103 +++++ reactos/dll/cpl/desk/cz.rc | 101 +++-- reactos/dll/cpl/desk/de.rc | 158 +++++--- reactos/dll/cpl/desk/desk.rbuild | 3 +- reactos/dll/cpl/desk/en.rc | 121 ++++-- reactos/dll/cpl/desk/es.rc | 129 ++++-- reactos/dll/cpl/desk/gr.rc | 125 ++++-- reactos/dll/cpl/desk/hu.rc | 137 +++++-- reactos/dll/cpl/desk/nl.rc | 131 ++++-- reactos/dll/cpl/desk/pl.rc | 131 ++++-- reactos/dll/cpl/desk/resource.h | 82 ++-- reactos/dll/cpl/desk/sv.rc | 101 +++-- 19 files changed, 2320 insertions(+), 772 deletions(-) create mode 100644 reactos/dll/cpl/desk/advappdlg.c create mode 100644 reactos/dll/cpl/desk/appearance.h diff --git a/reactos/dll/cpl/desk/Fr.rc b/reactos/dll/cpl/desk/Fr.rc index 42ab064e83a..f36f0ba3236 100644 --- a/reactos/dll/cpl/desk/Fr.rc +++ b/reactos/dll/cpl/desk/Fr.rc @@ -8,18 +8,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Fond d'cran" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, - 90,65,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + CONTROL "", IDC_BACKGROUND_PREVIEW,"Static", SS_OWNERDRAW, + 78, 10, 90, 65, WS_EX_STATICEDGE + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,99,173,71 + WS_BORDER | WS_TABSTOP, 7, 99, 173, 71 LTEXT "Slectionnez une image utiliser comme fond d'cran:", - IDC_STATIC,8,87,180,8 - PUSHBUTTON "&Parcourir...",IDC_BROWSE_BUTTON,187,135,50,14 - PUSHBUTTON "&Couleur...",IDC_COLOR_BUTTON,187,155,50,14 - LTEXT "Position:",IDC_STATIC,187,98,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP + IDC_STATIC, 8, 87, 180, 8 + PUSHBUTTON "&Parcourir...",IDC_BROWSE_BUTTON, 187, 135, 50, 14 + PUSHBUTTON "&Couleur...",IDC_COLOR_BUTTON, 187, 155, 50, 14 + LTEXT "Position:",IDC_STATIC, 187, 98, 36, 8 + COMBOBOX IDC_PLACEMENT_COMBO, 187, 108, 50, 90, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -27,6 +27,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "cran de veille" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE GROUPBOX "&cran de veille",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Liste des crans de veille:",IDC_STATIC,13, 24, 150, 9 @@ -45,12 +47,14 @@ BEGIN CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "Minutes avant d'afficher l'cran de veille.",IDC_STATIC,70, 111, 147, 9 + LTEXT "Minutes avant d'afficher l'cran de veille.", + IDC_STATIC,70, 111, 147, 9 - GROUPBOX "Gestion de l'alimentation du moniteur",IDC_SCREENS_DUMMY2,5, 146, 238, 50 + GROUPBOX "Gestion de l'alimentation du moniteur", + IDC_SCREENS_DUMMY2, 5, 146, 238, 50 LTEXT "Pour modifier les paramtres de l'alimentation du moniteur et conomiser de l'nergie, cliquez sur Gestion de l'alimentation.", - IDC_STATIC,16, 159, 145, 35 - PUSHBUTTON "&Gestion de l'alimentation",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 + IDC_STATIC, 16, 159, 145, 35 + PUSHBUTTON "&Gestion de l'alimentation", IDC_SCREENS_POWER_BUTTON, 165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -60,13 +64,49 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 142, 159, 16, 9 - EDITTEXT IDC_APPEAR_SIZE, 142, 169, 38, 13, ES_RIGHT | WS_GROUP - CONTROL "", IDC_APPEAR_SIZE_UPDOWN, UPDOWN_CLASS, WS_BORDER | WS_GROUP | - UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT, - 172, 169, 10, 13 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + 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 + + 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 + + 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 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + + EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -77,8 +117,8 @@ BEGIN LTEXT "&Affichage:",1820,3,100,30,8 LTEXT "",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Rgion de l'affichage",1818,3,120,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,130,58,17 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 LTEXT "Moins",1815,9,130,15,8,NOT WS_GROUP LTEXT "Plus",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER @@ -94,11 +134,11 @@ IDR_POPUP_MENU MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Configurer", ID_MENU_CONFIG - MENUITEM "A&peru", ID_MENU_PREVIEW + MENUITEM "&Configurer", ID_MENU_CONFIG + MENUITEM "A&peru", ID_MENU_PREVIEW MENUITEM SEPARATOR - MENUITEM "&Ajouer", ID_MENU_ADD - MENUITEM "Supprimer\tSuppr", ID_MENU_DELETE + MENUITEM "&Ajouer", ID_MENU_ADD + MENUITEM "Supprimer\tSuppr", ID_MENU_DELETE END END @@ -112,8 +152,7 @@ END STRINGTABLE BEGIN IDS_CPLNAME "Affichage" - IDS_CPLDESCRIPTION "Personalise l'affichage du bureau et de l'cran de veille." - + IDS_CPLDESCRIPTION "Personalise l'affichage du bureau et de l'cran de veille." IDS_NONE "(Aucun)" IDS_CENTER "Centre" IDS_STRETCH "tirer" @@ -148,22 +187,26 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_ITEM_3D_OBJECTS "Objets 3D" - IDS_ITEM_SCROLLBAR "Barre de dfilement" - IDS_ITEM_DESKTOP "Bureau" - IDS_ITEM_MESSAGE_BOX "Bote de message" - IDS_ITEM_WINDOW "Fentre" - IDS_ITEM_APP_BACKGROUND "Espace de travail de l'application" - IDS_ITEM_SELECTED_ITEMS "lments slectionns" - IDS_ITEM_MENU "Menu" - IDS_ITEM_PALETTE_TITLE "Tite de palette" - IDS_ITEM_TOOLTIP "Info-bulle" - IDS_ITEM_INACTIVE_WINDOW "Bordure de fentre inactive" - IDS_ITEM_ACTIVE_WINDOW "Bordure de fentre active" - IDS_ITEM_ICON "Icne" - IDS_ITEM_ICON_SPACE_HORZ "Espacement des icnes (horizontal)" - IDS_ITEM_ICON_SPACE_VERT "Espacement des icnes (vertical)" - IDS_ITEM_INACTIVE_TITLE "Barre de titre inactive" - IDS_ITEM_ACTIVE_TITLE "Barre de titre active" - IDS_ITEM_CAPTION_BUTTONS "Boutons de barre de titre" + IDS_ELEMENT_1 "Desktop" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" END diff --git a/reactos/dll/cpl/desk/It.rc b/reactos/dll/cpl/desk/It.rc index 4c36465f430..d2b699ab0ae 100644 --- a/reactos/dll/cpl/desk/It.rc +++ b/reactos/dll/cpl/desk/It.rc @@ -5,14 +5,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sfondo" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 80, 10, 83, 57, WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER - | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 - LTEXT "Seleziona un immagina da usare come sfondo per il tuo desktop:", IDC_STATIC, 8, 103, 180, 9 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT "Seleziona un immagina da usare come sfondo per il tuo desktop:", + IDC_STATIC, 8, 103, 180, 9 PUSHBUTTON "&Esplora...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 PUSHBUTTON "&Colore...", IDC_COLOR_BUTTON, 188, 177, 50, 15 LTEXT "Posizione:", IDC_STATIC, 188, 138, 36, 9 - COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -20,6 +24,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Screensaver" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE GROUPBOX "&Screen saver",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Screen saver installati:",IDC_STATIC,13, 24, 150, 9 @@ -38,12 +44,14 @@ BEGIN CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "minuti prima di mostrare lo screen saver.",IDC_STATIC,70, 111, 147, 9 + LTEXT "minuti prima di mostrare lo screen saver.", + IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Impostazioni del monitore per il risparmio energetico",IDC_SCREENS_DUMMY2,5, 146, 238, 50 + GROUPBOX "&Impostazioni del monitore per il risparmio energetico", + IDC_SCREENS_DUMMY2, 5, 146, 238, 50 LTEXT "Per regolare l'alimentazione di risparmio energia, scegliere Alimentazione.", - IDC_STATIC,16, 159, 145, 35 - PUSHBUTTON "&Alimentazione",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 + IDC_STATIC, 16, 159, 145, 35 + PUSHBUTTON "&Alimentazione", IDC_SCREENS_POWER_BUTTON, 165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -53,13 +61,49 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 142, 159, 16, 9 - EDITTEXT IDC_APPEAR_SIZE, 142, 169, 38, 13, ES_RIGHT | WS_GROUP - CONTROL "", IDC_APPEAR_SIZE_UPDOWN, UPDOWN_CLASS, WS_BORDER | WS_GROUP | - UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT, - 172, 169, 10, 13 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + 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 + + 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 + + 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 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + + EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -70,8 +114,8 @@ BEGIN LTEXT "&Schermo:",1820,3,100,30,8 LTEXT "",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Risoluzione dello schermo",1818,3,120,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,130,58,17 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 LTEXT "Min",1815,9,130,15,8,NOT WS_GROUP LTEXT "Max",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER @@ -88,10 +132,10 @@ BEGIN POPUP "" BEGIN MENUITEM "&Configura", ID_MENU_CONFIG - MENUITEM "Ante&prima", ID_MENU_PREVIEW + MENUITEM "Ante&prima", ID_MENU_PREVIEW MENUITEM SEPARATOR - MENUITEM "&Aggiungi", ID_MENU_ADD - MENUITEM "&Cancella\tCanc", ID_MENU_DELETE + MENUITEM "&Aggiungi", ID_MENU_ADD + MENUITEM "&Cancella\tCanc",ID_MENU_DELETE END END @@ -106,7 +150,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Visualizzazione" IDS_CPLDESCRIPTION "Adatta la visualizzazione del desktop e dello screen saver." - IDS_NONE "(Niente)" IDS_CENTER "Al centro" IDS_STRETCH "Affiancata" @@ -141,22 +184,26 @@ 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" + IDS_ELEMENT_1 "Desktop" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" END diff --git a/reactos/dll/cpl/desk/Ja.rc b/reactos/dll/cpl/desk/Ja.rc index c7329ee03ed..1e656714a7b 100644 --- a/reactos/dll/cpl/desk/Ja.rc +++ b/reactos/dll/cpl/desk/Ja.rc @@ -5,18 +5,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "wi" FONT 9, "MS UI Gothic" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, - 150,105,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, + 48, 10, 150,105,WS_EX_STATICEDGE + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 + WS_BORDER | WS_TABSTOP, 7, 139, 173, 71 LTEXT "fXNgbv̕ǎƂĎg摜IĂ:", - IDC_STATIC,8,127,180,8 - PUSHBUTTON "Q(&B)...",IDC_BROWSE_BUTTON,187,175,50,14 - PUSHBUTTON "F(&C)...",IDC_COLOR_BUTTON,187,195,50,14 - LTEXT "\\ʒu:",IDC_STATIC,187,138,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP + IDC_STATIC, 8, 127, 180, 8 + PUSHBUTTON "Q(&B)...", IDC_BROWSE_BUTTON, 187, 175, 50, 14 + PUSHBUTTON "F(&C)...", IDC_COLOR_BUTTON, 187, 195, 50, 14 + LTEXT "\\ʒu:", IDC_STATIC, 187, 138, 36, 8 + COMBOBOX IDC_PLACEMENT_COMBO, 187, 148, 50, 90, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -24,6 +24,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "XN[ Z[o[" FONT 9, "MS UI Gothic" BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE GROUPBOX "XN[ Z[o[(&S)",IDC_SCREENS_DUMMY, 5, 7, 238, 176 LTEXT "XN[ Z[o[̈ꗗ:",IDC_STATIC,13, 24, 150, 9 @@ -42,12 +44,14 @@ BEGIN CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "o߂XN[ Z[o[\\B",IDC_STATIC,70, 151, 147, 9 + LTEXT "o߂XN[ Z[o[\\B", + IDC_STATIC,70, 151, 147, 9 - GROUPBOX "j^[̏ȓd͋@\\(&E)",IDC_SCREENS_DUMMY2,5, 146, 238, 50 + GROUPBOX "j^[̏ȓd͋@\\(&E)", + IDC_SCREENS_DUMMY2, 5, 146, 238, 50 LTEXT "j^̓dݒ𒲐ɂ́A[dݒ] NbNĂB", - IDC_STATIC,16, 159, 145, 35 - PUSHBUTTON "dݒ(&O)",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 + IDC_STATIC, 16, 159, 145, 35 + PUSHBUTTON "dݒ(&O)", IDC_SCREENS_POWER_BUTTON, 165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -57,13 +61,49 @@ FONT 9, "MS UI Gothic" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 142, 159, 16, 9 - EDITTEXT IDC_APPEAR_SIZE, 142, 169, 38, 13, ES_RIGHT | WS_GROUP - CONTROL "", IDC_APPEAR_SIZE_UPDOWN, UPDOWN_CLASS, WS_BORDER | WS_GROUP | - UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT, - 172, 169, 10, 13 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + 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 + + 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 + + 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 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + + EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -74,8 +114,8 @@ BEGIN LTEXT "fBXvC(&D):",1820,3,140,30,8 LTEXT "",IDC_SETTINGS_DEVICE,9,149,224,8 GROUPBOX "ʂ̉𑜓x(&S)",1818,3,160,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,170,58,17 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 170, 58, 17 LTEXT "",1815,9,170,15,8,NOT WS_GROUP LTEXT "L",1816,93,170,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER @@ -110,7 +150,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "" IDS_CPLDESCRIPTION "fXNgbvʂXN[ Z[o[JX^}CY܂B" - IDS_NONE "(Ȃ)" IDS_CENTER "ɕ\\" IDS_STRETCH "g債ĕ\\" @@ -145,22 +184,26 @@ 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" + IDS_ELEMENT_1 "Desktop" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" END diff --git a/reactos/dll/cpl/desk/Ru.rc b/reactos/dll/cpl/desk/Ru.rc index b4735f2bdd3..d29bd906016 100644 --- a/reactos/dll/cpl/desk/Ru.rc +++ b/reactos/dll/cpl/desk/Ru.rc @@ -5,18 +5,18 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,80,10,83, - 57,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | - WS_BORDER | WS_TABSTOP,8,114,174,68 - LTEXT " :",IDC_STATIC,8, - 103,180,9 - PUSHBUTTON "&...",IDC_BROWSE_BUTTON,188,114,55,15 - PUSHBUTTON "&...",IDC_COLOR_BUTTON,188,167,55,15 - LTEXT ":",IDC_STATIC,188,138,55,9 - COMBOBOX IDC_PLACEMENT_COMBO,188,149,55,54,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP, 8, 114, 174, 68 + LTEXT " :", + IDC_STATIC, 8, 103, 180, 9 + PUSHBUTTON "&...", IDC_BROWSE_BUTTON, 188, 114, 55, 15 + PUSHBUTTON "&...", IDC_COLOR_BUTTON, 188, 167, 55, 15 + LTEXT ":", IDC_STATIC, 188, 138, 55, 9 + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 55, 54, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 188 @@ -24,29 +24,34 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE GROUPBOX "&",IDC_SCREENS_DUMMY,5,7,238,137 + LTEXT " :",IDC_STATIC,13,24,150,9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13,34,170,69 - PUSHBUTTON "&...",IDC_SCREENS_SETTINGS,188,34,50,15, - WS_GROUP + + PUSHBUTTON "&...",IDC_SCREENS_SETTINGS,188,34,50,15, WS_GROUP PUSHBUTTON "&",IDC_SCREENS_TESTSC,188,52,50,15 + CONTROL "& .",IDC_SCREENS_USEPASSCHK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,121,119,18 + LTEXT "&:",IDC_STATIC,13,110,35,9 EDITTEXT IDC_SCREENS_TIMEDELAY,53,109,31,12,ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,87,108,13,12 - LTEXT " .",IDC_STATIC,109,110,118, - 9 - GROUPBOX "& ",IDC_SCREENS_DUMMY2, - 5,146,238,50 + LTEXT " .", + IDC_STATIC, 109, 110, 118, 9 + + GROUPBOX "& ", + IDC_SCREENS_DUMMY2, 5, 146, 238, 50 LTEXT " .", - IDC_STATIC,16,159,145,35 - PUSHBUTTON " &",IDC_SCREENS_POWER_BUTTON,157,162,81, - 15 + IDC_STATIC, 16, 159, 145, 35 + PUSHBUTTON " &", IDC_SCREENS_POWER_BUTTON, 157, 162, 81, 15 END IDD_APPEARANCE DIALOGEX 0, 0, 246, 228 @@ -56,13 +61,49 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 142, 159, 16, 9 - EDITTEXT IDC_APPEAR_SIZE, 142, 169, 38, 13, ES_RIGHT | WS_GROUP - CONTROL "", IDC_APPEAR_SIZE_UPDOWN, UPDOWN_CLASS, WS_BORDER | WS_GROUP | - UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT, - 172, 169, 10, 13 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + 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 + + 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 + + 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 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + + EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX 0, 0, 246, 188 @@ -77,8 +118,7 @@ BEGIN TBS_AUTOTICKS | WS_TABSTOP,33,130,58,17 LTEXT "",1815,7,130,27,8,NOT WS_GROUP LTEXT "",1816,91,130,27,8,NOT WS_GROUP - CTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT - WS_GROUP + CTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10, NOT WS_GROUP GROUPBOX "&",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,133,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -89,14 +129,14 @@ END IDR_POPUP_MENU MENU BEGIN - POPUP "" - BEGIN - MENUITEM "&", ID_MENU_CONFIG - MENUITEM "&", ID_MENU_PREVIEW - MENUITEM SEPARATOR - MENUITEM "&", ID_MENU_ADD - MENUITEM "&\tDel", ID_MENU_DELETE - END + POPUP "" + BEGIN + MENUITEM "&", ID_MENU_CONFIG + MENUITEM "&", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&", ID_MENU_ADD + MENUITEM "&\tDel", ID_MENU_DELETE + END END IDR_PREVIEW_MENU MENU @@ -116,29 +156,17 @@ BEGIN IDS_TILE "" END -STRINGTABLE +STRINGTABLE DISCARDABLE BEGIN IDS_COLOR_4BIT "16 " IDS_COLOR_8BIT "256 " -END - -STRINGTABLE -BEGIN IDS_COLOR_16BIT "High Color (16 )" IDS_COLOR_24BIT "True Color (24 )" -END - -STRINGTABLE -BEGIN IDS_COLOR_32BIT "True Color (32 )" -END - -STRINGTABLE -BEGIN IDS_PIXEL "%lux%lu " END -STRINGTABLE +STRINGTABLE DISCARDABLE BEGIN IDS_BACKGROUND_COMDLG_FILTER " (*.bmp;*.dib)\000*.bmp;*.dib" IDS_SUPPORTED_EXT "*.bmp;*.dib" @@ -156,22 +184,26 @@ 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" + IDS_ELEMENT_1 "Desktop" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" END diff --git a/reactos/dll/cpl/desk/Uk.rc b/reactos/dll/cpl/desk/Uk.rc index d1899a97be5..29b6c6f00aa 100644 --- a/reactos/dll/cpl/desk/Uk.rc +++ b/reactos/dll/cpl/desk/Uk.rc @@ -13,14 +13,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 80, 10, 83, 57, WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER - | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 - LTEXT " :", IDC_STATIC, 8, 103, 180, 9 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT " :", + IDC_STATIC, 8, 103, 180, 9 PUSHBUTTON "&...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 PUSHBUTTON "&...", IDC_COLOR_BUTTON, 188, 177, 50, 15 LTEXT ":", IDC_STATIC, 188, 138, 36, 9 - COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -28,6 +32,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION " " FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE GROUPBOX "& ",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT " :",IDC_STATIC,13, 24, 150, 9 @@ -46,12 +52,14 @@ BEGIN CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT " .",IDC_STATIC,70, 111, 147, 9 + LTEXT " .", + IDC_STATIC, 70, 111, 147, 9 - GROUPBOX "& ",IDC_SCREENS_DUMMY2,5, 146, 238, 50 + GROUPBOX "& ", + IDC_SCREENS_DUMMY2, 5, 146, 238, 50 LTEXT " .", - IDC_STATIC,16, 159, 145, 35 - PUSHBUTTON " &",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 + IDC_STATIC, 16, 159, 145, 35 + PUSHBUTTON " &",IDC_SCREENS_POWER_BUTTON, 165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -61,13 +69,49 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 142, 159, 16, 9 - EDITTEXT IDC_APPEAR_SIZE, 142, 169, 38, 13, ES_RIGHT | WS_GROUP - CONTROL "", IDC_APPEAR_SIZE_UPDOWN, UPDOWN_CLASS, WS_BORDER | WS_GROUP | - UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT, - 172, 169, 10, 13 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + 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 + + 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 + + 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 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + + EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -82,7 +126,7 @@ BEGIN 30,130,58,17 LTEXT "",1815,9,130,15,8,NOT WS_GROUP LTEXT "",1816,93,130,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10, NOT WS_GROUP | SS_CENTER GROUPBOX "&",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -114,7 +158,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "" IDS_CPLDESCRIPTION " ." - IDS_NONE "()" IDS_CENTER " " IDS_STRETCH "" @@ -149,22 +192,26 @@ 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" + IDS_ELEMENT_1 "Desktop" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" END diff --git a/reactos/dll/cpl/desk/advappdlg.c b/reactos/dll/cpl/desk/advappdlg.c new file mode 100644 index 00000000000..713cad241d7 --- /dev/null +++ b/reactos/dll/cpl/desk/advappdlg.c @@ -0,0 +1,463 @@ +/* $Id: advappdlg.c 24836 2007-02-12 03:12:56Z tkreuzer $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Display Control Panel + * FILE: dll/cpl/desk/advappdlg.c + * PURPOSE: Advanced appearance dialog + * + * PROGRAMMER: Timo Kreuzer (timo[dot]kreuzer[at]web[dot]de) + * + */ + +#include "desk.h" +#include "appearance.h" + +INT_PTR CALLBACK +AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + int iListIndex; + GLOBALS* g; + + switch(uMsg) + { + case WM_INITDIALOG: + { + g = (GLOBALS*)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)g); + AdvAppearanceDlg_Init(hwndDlg); + break; + } + case WM_DESTROY: + { + AdvAppearanceDlg_CleanUp(hwndDlg); + break; + } + case WM_COMMAND: + { + g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch(LOWORD(wParam)) + { + case IDOK: + { + SaveCurrentValues(hwndDlg); + EndDialog(hwndDlg, 0); + break; + } + case IDCANCEL: + { + g->ThemeAdv = g->Theme; + EndDialog(hwndDlg, 0); + break; + } + case IDC_ADVAPPEARANCE_ELEMENT: + { + if(HIWORD(wParam) == CBN_SELCHANGE) + { + SaveCurrentValues(hwndDlg); + iListIndex = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETCURSEL, 0, 0); + g->CurrentElement = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETITEMDATA, (WPARAM)iListIndex, 0); + UpdateControls(hwndDlg, g->CurrentElement); + break; + } + break; + } + case IDC_ADVAPPEARANCE_COLOR1_B: + { + GetColor(hwndDlg, g->CurrentElement, 0); + break; + } + case IDC_ADVAPPEARANCE_COLOR2_B: + { + GetColor(hwndDlg, g->CurrentElement, 1); + break; + } + case IDC_ADVAPPEARANCE_FONTCOLOR_B: + { + GetColor(hwndDlg, g->CurrentElement, 2); + break; + } + default: + { + return FALSE; + } + } + break; + } + default: + { + return FALSE; + } + } + return TRUE; +} + + +/* Initialize the advanced appearance dialog */ +void +AdvAppearanceDlg_Init(HWND hwndDlg) +{ + GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + int i, iElement, iListIndex, iDeskIndex = 0; + TCHAR tstrText[80]; + LOGFONT lfFont; + LOGFONT lfButtonFont; + HFONT hMyFont; + HDC hScreenDC; + + /* Copy the current theme values */ + g->ThemeAdv = g->Theme; + + /* Add the elements to the combo */ + for(iElement = 0; iElement < NUM_ELEMENTS; iElement++) + { + LoadString(hApplet, IDS_ELEMENT_1 + iElement, (LPTSTR)&tstrText, 79); + iListIndex = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_ADDSTRING, 0, (LPARAM)&tstrText); + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_SETITEMDATA, (WPARAM)iListIndex, (LPARAM)iElement); + } + + /* Get the list index of the desktop element */ + for(iListIndex = 0; iListIndex < NUM_ELEMENTS; iListIndex++) + { + iElement = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETITEMDATA, (WPARAM)iListIndex, 0); + if (iElement == 0) + { + iDeskIndex = iListIndex; + break; + } + } + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_SETCURSEL, iDeskIndex, 0); + + /* Set colors for the color buttons */ + g->crCOLOR_BTNFACE = g->Theme.crColor[COLOR_BTNFACE]; + g->crCOLOR_BTNTEXT = g->Theme.crColor[COLOR_BTNTEXT]; + g->crCOLOR_BTNSHADOW = g->Theme.crColor[COLOR_BTNSHADOW]; + g->crCOLOR_BTNHIGHLIGHT = g->Theme.crColor[COLOR_BTNHIGHLIGHT]; + + /* Create font for bold button */ + lfButtonFont = g->Theme.lfFont[FONT_DIALOG]; + lfButtonFont.lfWeight = FW_BOLD; + lfButtonFont.lfItalic = FALSE; + hMyFont = CreateFontIndirect(&lfButtonFont); + if (hMyFont) + { + if (g->hBoldFont) + { + DeleteObject(g->hBoldFont); + } + g->hBoldFont = hMyFont; + } + + /* Create font for italic button */ + lfButtonFont.lfWeight = FW_REGULAR; + lfButtonFont.lfItalic = TRUE; + hMyFont = CreateFontIndirect(&lfButtonFont); + if (hMyFont) + { + if (g->hItalicFont) + { + DeleteObject(g->hItalicFont); + } + g->hItalicFont = hMyFont; + } + + /* Set the fonts for the font style buttons */ + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, WM_SETFONT, (WPARAM)g->hBoldFont, (LPARAM)TRUE); + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, WM_SETFONT, (WPARAM)g->hItalicFont, (LPARAM)TRUE); + + /* Draw Bitmaps for the colorbuttons */ + InitColorButtons(hwndDlg); + + /* Make the UpDown control count correctly */ + SendMessage (GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_UD), UDM_SETRANGE, 0L, MAKELONG (200, 1)); + + /* Fill font selection combo */ + lfFont.lfCharSet = DEFAULT_CHARSET; + lfFont.lfFaceName[0] = (TCHAR)0; + lfFont.lfPitchAndFamily = 0; + hScreenDC = GetDC(0); + EnumFontFamiliesEx(hScreenDC, &lfFont, (FONTENUMPROC)EnumFontFamExProc, (LPARAM)GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_FONT_C), 0); + ReleaseDC(0, hScreenDC); + + /* Fill font size combo */ + TCHAR Size[4]; + for (i = 6; i <= 24; i++) + { + SetDlgItemInt(hwndDlg, IDC_CONVERT, i, FALSE); + GetDlgItemText(hwndDlg, IDC_CONVERT, (LPTSTR)&Size, 3); + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E, CB_ADDSTRING, 0, (LPARAM)&Size); + } + + /* Update the controls */ + iListIndex = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETCURSEL, 0, 0); + g->CurrentElement = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETITEMDATA, (WPARAM)iListIndex, 0); + UpdateControls(hwndDlg, g->CurrentElement); + return; +} + +/* Create the basic bitmaps for the color picker buttons */ +void +InitColorButtons(HWND hwndDlg) +{ + GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + INT i; + HDC hdcColorButton, hdcCompat; + RECT rect; + HBRUSH hbrush; + HPEN hPen; + HWND hwndColorButton; + HGDIOBJ hgdiTemp; + + const POINT Points[3] = {{29,6},{33,6},{31,8}}; + + hwndColorButton = GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_B); + hdcColorButton = GetDC(hwndColorButton); + for (i = 0; i <= 2; i++) + { + /* Create a DC to draw on */ + hdcCompat = CreateCompatibleDC(hdcColorButton); + + /* Create the button image */ + g->hbmpColor[i] = CreateCompatibleBitmap(hdcColorButton, 36, 15); + + /* Select the button image to the DC */ + hgdiTemp = SelectObject(hdcCompat, g->hbmpColor[i]); + + /* Draw the buttons background color */ + rect.left = 0; rect.top = 0; rect.right = 36; rect.bottom = 15; + hbrush = CreateSolidBrush(g->crCOLOR_BTNFACE); + FillRect(hdcCompat, &rect, hbrush); + DeleteObject(hbrush); + + /* Draw the rectangle */ + rect.left = 1; rect.top = 1; rect.right = 23; rect.bottom = 14; + hbrush = CreateSolidBrush(g->crCOLOR_BTNTEXT); + FillRect(hdcCompat, &rect, hbrush); + DeleteObject(hbrush); + + /* Draw left side of line */ + hPen = CreatePen(PS_SOLID, 1, g->crCOLOR_BTNSHADOW); + SelectObject(hdcCompat, hPen); + MoveToEx(hdcCompat, 26, 1, NULL); + LineTo(hdcCompat, 26, 14); + SelectObject(hdcCompat, GetStockObject(BLACK_PEN)); + DeleteObject(hPen); + + /* Draw right side of line */ + hPen = CreatePen(PS_SOLID, 1, g->crCOLOR_BTNHIGHLIGHT); + SelectObject(hdcCompat,hPen); + MoveToEx(hdcCompat, 27, 1, NULL); + LineTo(hdcCompat, 27, 14); + SelectObject(hdcCompat, GetStockObject(BLACK_PEN)); + DeleteObject(hPen); + + /* Draw triangle */ + hPen = CreatePen(PS_SOLID, 1, g->crCOLOR_BTNTEXT); + hbrush = CreateSolidBrush(g->crCOLOR_BTNTEXT); + SelectObject(hdcCompat, hPen); + SelectObject(hdcCompat, hbrush); + SetPolyFillMode(hdcCompat, WINDING); + + /* FIXME: HACK, see Points definition */ + Polygon(hdcCompat, Points, 3); + + /* Cleanup */ + SelectObject(hdcCompat,hgdiTemp); + DeleteDC(hdcCompat); + DeleteObject(hPen); + DeleteObject(hbrush); + } + ReleaseDC(hwndColorButton, hdcColorButton); + + /* Set the images of the buttons */ + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_B, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)g->hbmpColor[0]); + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_COLOR2_B, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)g->hbmpColor[1]); + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTCOLOR_B, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)g->hbmpColor[2]); + return; +} + +void +AdvAppearanceDlg_CleanUp(HWND hwndDlg) +{ + GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + DeleteObject(g->hBoldFont); + DeleteObject(g->hItalicFont); + return; +} + +/* This is the callback function to add the installed fonts to the font combo */ +int CALLBACK +EnumFontFamExProc( + ENUMLOGFONTEX *lpelfe, + NEWTEXTMETRICEX *lpntme, + DWORD dwFontType, + LPARAM lParam) +{ + /* Don't enumerate more than 100 fonts */ + if (SendMessage((HWND)lParam, CB_GETCOUNT, 0, 0) >= 100) return(0); + + /* Only add the string once */ + if (SendMessage((HWND)lParam, CB_FINDSTRINGEXACT, -1, (WPARAM)&(lpelfe->elfLogFont.lfFaceName)) != CB_ERR) return(2); + SendMessage((HWND)lParam, CB_ADDSTRING, 0, (WPARAM)&(lpelfe->elfLogFont.lfFaceName)); + return(1); +} + +/* Update all the controls with the current values for the selected screen element */ +void +UpdateControls(HWND hwndDlg, int iElement) +{ + GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + + /* First enable / disable the controls */ + EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E), (g_Assignment[iElement].Size != -1)); + EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_T), (g_Assignment[iElement].Size != -1)); + EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_T), (g_Assignment[iElement].Color1 != -1)); + EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR2_T), (g_Assignment[iElement].Color2 != -1)); + EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_FONT_T), (g_Assignment[iElement].Font != -1)); + EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_FONT_C), (g_Assignment[iElement].Font != -1)); + EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_T), (g_Assignment[iElement].Font != -1)); + EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E), (g_Assignment[iElement].Font != -1)); + EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_FONTCOLOR_T), (g_Assignment[iElement].FontColor != -1)); + EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD), (g_Assignment[iElement].Font != -1)); + EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC), (g_Assignment[iElement].Font != -1)); + + /* Update the colors of the color buttons */ + UpdateButtonColor(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_B, 0, g_Assignment[iElement].Color1); + UpdateButtonColor(hwndDlg, IDC_ADVAPPEARANCE_COLOR2_B, 1, g_Assignment[iElement].Color2); + UpdateButtonColor(hwndDlg, IDC_ADVAPPEARANCE_FONTCOLOR_B, 2, g_Assignment[iElement].FontColor); + + SetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, g_Assignment[iElement].Size == -1 ? 0 : g->ThemeAdv.Size[g_Assignment[iElement].Size], FALSE); + + HDC hdcDlg = GetDC(hwndDlg); + if (g_Assignment[iElement].Font != -1) + { + LOGFONT lfFont = g->ThemeAdv.lfFont[g_Assignment[iElement].Font]; + + SetDlgItemText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C, lfFont.lfFaceName); + SetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E, -MulDiv(g->ThemeAdv.lfFont[g_Assignment[iElement].Font].lfHeight, 72, GetDeviceCaps(hdcDlg, LOGPIXELSY)),FALSE); + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONT_C, CB_FINDSTRINGEXACT, -1, (WPARAM)lfFont.lfFaceName); + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, BM_SETCHECK, g->ThemeAdv.lfFont[g_Assignment[iElement].Font].lfWeight == FW_BOLD?1:0, 0); + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_SETCHECK, g->ThemeAdv.lfFont[g_Assignment[iElement].Font].lfItalic, 0); + } else { + SetDlgItemText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C, NULL); + SetDlgItemText(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E, NULL); + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, BM_SETCHECK, 0, 0); + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_SETCHECK, 0, 0); + } + ReleaseDC(hwndDlg, hdcDlg); + return; +} + +void +SaveCurrentValues(HWND hwndDlg) +{ + GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + BOOL bTranslated; + HDC hdcDlg = GetDC(hwndDlg); + if (g_Assignment[g->CurrentElement].Size != -1) + { + g->ThemeAdv.Size[g_Assignment[g->CurrentElement].Size] = GetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, &bTranslated, FALSE); + } + if (g_Assignment[g->CurrentElement].Font != -1) + { + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight = -MulDiv(GetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E, &bTranslated, FALSE), GetDeviceCaps(hdcDlg, LOGPIXELSY), 72); + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfWeight = (SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, BM_GETCHECK, 0, 0) == 1)?FW_BOLD:FW_NORMAL; + g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfItalic = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_GETCHECK, 0, 0); + GetDlgItemText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C, g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfFaceName, LF_FACESIZE * sizeof(TCHAR)); + } + ReleaseDC(hwndDlg, hdcDlg); + return; +} + +/* Draw the current color on the color picker buttons */ +void +UpdateButtonColor(HWND hwndDlg, int ID, int nButton, int nColor) +{ + GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + HDC hdcColorButton, hdcCompat; + RECT rect; + HBRUSH hbrush; + HWND hwndColorButton; + COLORREF crColor = g->ThemeAdv.crColor[nColor]; + + if(nColor != -1) + { + /* Create a DC to draw on */ + hwndColorButton = GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_B); + hdcColorButton = GetDC(hwndColorButton); + hdcCompat = CreateCompatibleDC(hdcColorButton); + ReleaseDC(hwndColorButton, hdcColorButton); + + /* Select the button image to it */ + HGDIOBJ hgdiTmp = SelectObject(hdcCompat, g->hbmpColor[nButton]); + + /* Create a brush and draw the rectangle */ + rect.left = 2; rect.top = 2; rect.right = 22; rect.bottom = 13; + hbrush = CreateSolidBrush(crColor); + FillRect(hdcCompat, &rect, hbrush); + DeleteObject(hbrush); + + /* hdcCompat is not needed anymore */ + SelectObject(hdcCompat,hgdiTmp); + DeleteDC(hdcCompat); + + SendDlgItemMessage(hwndDlg, ID, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)g->hbmpColor[nButton]); + EnableWindow(GetDlgItem(hwndDlg, ID), TRUE); + } else { + SendDlgItemMessage(hwndDlg, ID, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)NULL); + EnableWindow(GetDlgItem(hwndDlg, ID), FALSE); + } + return; +} + +/* Select a color using a color picker */ +BOOL +GetColor(HWND hwndDlg, int iElement, int nButton) +{ + GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + CHOOSECOLOR cc; + COLORREF crCustom[16] = { 0 }; + COLORREF crColor; + int ID = 0; + int ColorIndex = 0; + + /* Get the color index from the element index and button number */ + if (nButton == 0) + { + ColorIndex = g_Assignment[iElement].Color1; + ID = IDC_ADVAPPEARANCE_COLOR1_B; + } + if (nButton == 1) + { + ColorIndex = g_Assignment[iElement].Color2; + ID = IDC_ADVAPPEARANCE_COLOR2_B; + } + if (nButton == 2) + { + ColorIndex = g_Assignment[iElement].FontColor; + ID = IDC_ADVAPPEARANCE_FONTCOLOR_B; + } + crColor = g->ThemeAdv.crColor[ColorIndex]; + + /* Prepare cc structure */ + cc.lStructSize = sizeof(CHOOSECOLOR); + cc.hwndOwner = hwndDlg; + cc.hInstance = NULL; + cc.rgbResult = crColor; + cc.lpCustColors = crCustom; + cc.Flags = CC_ANYCOLOR | CC_FULLOPEN | CC_RGBINIT; + cc.lCustData = 0; + cc.lpfnHook = NULL; + cc.lpTemplateName = NULL; + + /* Create the colorpicker */ + if (ChooseColor(&cc)) + { + g->ThemeAdv.crColor[ColorIndex] = cc.rgbResult; + if (crColor != cc.rgbResult) + { + UpdateButtonColor(hwndDlg, ID, nButton, ColorIndex); + return(TRUE); + } + } + return(FALSE); +} diff --git a/reactos/dll/cpl/desk/appearance.c b/reactos/dll/cpl/desk/appearance.c index 4fe469083e6..730856661aa 100644 --- a/reactos/dll/cpl/desk/appearance.c +++ b/reactos/dll/cpl/desk/appearance.c @@ -6,181 +6,488 @@ * PURPOSE: Appearance property page * * PROGRAMMERS: Trevor McCort (lycan359@gmail.com) - * Eric Kohl (email?) + * Timo Kreuzer (timo[dot]kreuzer[at]web[dot]de */ #include "desk.h" -#include "preview.h" +#include "appearance.h" -typedef struct _GLOBAL_DATA +/******************************************************************************/ + +/* This const assigns the color and metric numbers to the elements from the elements list */ + +/* Size 1 (width) Size 2 (height) Color 1 Color 2 Font Fontcolor */ +const ASSIGNMENT g_Assignment[NUM_ELEMENTS] = +{ {-1, -1, COLOR_DESKTOP, -1, -1, -1}, /* -Desktop */ + {SIZE_CAPTION_Y, -1, COLOR_INACTIVECAPTION, COLOR_GRADIENTINACTIVECAPTION, FONT_CAPTION, -1}, /* inactive window caption */ + {SIZE_BORDER_X, SIZE_BORDER_Y, COLOR_INACTIVEBORDER, -1, -1, -1}, /* inactive window border */ + {SIZE_CAPTION_Y, -1, COLOR_ACTIVECAPTION, COLOR_GRADIENTACTIVECAPTION, FONT_CAPTION, COLOR_CAPTIONTEXT}, /* -active window caption */ + {SIZE_BORDER_X, SIZE_BORDER_Y, COLOR_ACTIVEBORDER, -1, -1, -1}, /* active window border */ + {SIZE_MENU_X, SIZE_MENU_Y, COLOR_MENU, -1, FONT_MENU, COLOR_MENUTEXT}, /* menu */ + {SIZE_MENU_X, SIZE_MENU_Y, COLOR_HIGHLIGHT, -1, FONT_HILIGHT, COLOR_HIGHLIGHTTEXT},/* marked element */ + {-1, -1, COLOR_WINDOW, COLOR_WINDOWFRAME, -1, COLOR_WINDOWTEXT}, /* window */ + {SIZE_SCROLL_X, SIZE_SCROLL_Y, COLOR_SCROLLBAR, -1, -1, -1}, /* scroll bar */ + {-1, -1, COLOR_3DFACE, -1, -1, COLOR_BTNTEXT}, /* 3d objects */ + {SIZE_SMCAPTION_Y,-1, -1, -1, FONT_SMCAPTION, -1}, /* palette window caption */ + {-1, -1, -1, -1, -1, -1}, /* symbol caption FIXME: Access? */ + {SIZE_CAPTION_Y, -1, -1, -1, -1, -1}, /* caption bar */ + {-1, -1, -1, -1, -1, COLOR_GRAYTEXT}, /* inactive menu item FIXME: Access? */ + {-1, -1, -1, -1, FONT_DIALOG, COLOR_WINDOWTEXT}, /* dialog */ + {-1, -1, -1, -1, -1, -1}, /* scrollbar controls FIXME: Access? */ + {-1, -1, COLOR_APPWORKSPACE, -1, -1, -1}, /* application background */ + {-1, -1, -1, -1, -1, -1}, /* small caption bar FIXME: Access? */ + {SIZE_ICON_SPC_X, -1, -1, -1, -1, -1}, /* symbol distance horiz. */ + {SIZE_ICON_SPC_Y, -1, -1, -1, -1, -1}, /* symbol distance vert. */ + {-1, -1, COLOR_INFOBK, -1, FONT_INFO, COLOR_INFOTEXT}, /* quickinfo */ + {SIZE_ICON_X, SIZE_ICON_Y, -1, -1, FONT_ICON, -1}}; /* symbol */ + +/* This is the list of names for the colors stored in the registry */ +const TCHAR g_RegColorNames[NUM_COLORS][MAX_COLORNAMELENGTH] = + {TEXT("Scrollbar"), /* 00 = COLOR_SCROLLBAR */ + TEXT("Background"), /* 01 = COLOR_DESKTOP */ + TEXT("ActiveTitle"), /* 02 = COLOR_ACTIVECAPTION */ + TEXT("InactiveTitle"), /* 03 = COLOR_INACTIVECAPTION */ + TEXT("Menu"), /* 04 = COLOR_MENU */ + TEXT("Window"), /* 05 = COLOR_WINDOW */ + TEXT("WindowFrame"), /* 06 = COLOR_WINDOWFRAME */ + TEXT("MenuText"), /* 07 = COLOR_MENUTEXT */ + TEXT("WindowText"), /* 08 = COLOR_WINDOWTEXT */ + TEXT("TitleText"), /* 09 = COLOR_CAPTIONTEXT */ + TEXT("ActiveBorder"), /* 10 = COLOR_ACTIVEBORDER */ + TEXT("InactiveBorder"), /* 11 = COLOR_INACTIVEBORDER */ + TEXT("AppWorkSpace"), /* 12 = COLOR_APPWORKSPACE */ + TEXT("Hilight"), /* 13 = COLOR_HIGHLIGHT */ + TEXT("HilightText"), /* 14 = COLOR_HIGHLIGHTTEXT */ + TEXT("ButtonFace"), /* 15 = COLOR_BTNFACE */ + TEXT("ButtonShadow"), /* 16 = COLOR_BTNSHADOW */ + TEXT("GrayText"), /* 17 = COLOR_GRAYTEXT */ + TEXT("ButtonText"), /* 18 = COLOR_BTNTEXT */ + TEXT("InactiveTitleText"), /* 19 = COLOR_INACTIVECAPTIONTEXT */ + TEXT("ButtonHilight"), /* 20 = COLOR_BTNHIGHLIGHT */ + TEXT("ButtonDkShadow"), /* 21 = COLOR_3DDKSHADOW */ + TEXT("ButtonLight"), /* 22 = COLOR_3DLIGHT */ + TEXT("InfoText"), /* 23 = COLOR_INFOTEXT */ + TEXT("InfoWindow"), /* 24 = COLOR_INFOBK */ + TEXT("ButtonAlternateFace"), /* 25 = COLOR_ALTERNATEBTNFACE */ + TEXT("HotTrackingColor"), /* 26 = COLOR_HOTLIGHT */ + TEXT("GradientActiveTitle"), /* 27 = COLOR_GRADIENTACTIVECAPTION */ + TEXT("GradientInactiveTitle"), /* 28 = COLOR_GRADIENTINACTIVECAPTION */ + TEXT("MenuHilight"), /* 29 = COLOR_MENUHILIGHT */ + TEXT("MenuBar"), /* 30 = COLOR_MENUBAR */ +}; + +/* This is the list of used metrics and their numbers */ +const int g_SizeMetric[NUM_SIZES] = { - INT nItem; -} GLOBAL_DATA, *PGLOBAL_DATA; - - -static VOID -OnInitDialog(HWND hwndDlg, PGLOBAL_DATA pGlobalData) -{ - TCHAR szBuffer[256]; - UINT i, idx; - - /* Set the item names */ - for (i = IDS_ITEM_FIRST; i < IDS_ITEM_LAST; i++) - { - LoadString(hApplet, i, szBuffer, 256); - idx = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_ADDSTRING, 0, (LPARAM)szBuffer); - if (idx != CB_ERR) - { - SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_SETITEMDATA, (WPARAM)idx, (LPARAM)i - IDS_ITEM_FIRST); - } - } - - pGlobalData->nItem = IDX_DESKTOP; - SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_SETCURSEL, pGlobalData->nItem, 0); -} - - -static VOID -OnItemChange(HWND hwndDlg, PGLOBAL_DATA pGlobalData) -{ - INT nSelection, nIdx; - - nIdx = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_GETCURSEL, 0, 0); - if (nIdx == CB_ERR) - return; - - nSelection = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_GETITEMDATA, (WPARAM)nIdx, 0); - if (nSelection == CB_ERR) - return; - - pGlobalData->nItem = nSelection; - - switch (nSelection) - { - case IDX_SCROLLBAR: - EnableWindow(GetDlgItem(hwndDlg, IDC_APPEAR_SIZE), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_APPEAR_SIZE_UPDOWN), TRUE); - SendDlgItemMessage(hwndDlg, IDC_APPEAR_SIZE_UPDOWN, UDM_SETPOS, 0, - (LPARAM)MAKELONG((short)SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_GETCXSCROLLBAR, 0, 0), 0)); - break; - - case IDX_MENU: - EnableWindow(GetDlgItem(hwndDlg, IDC_APPEAR_SIZE), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_APPEAR_SIZE_UPDOWN), TRUE); - SendDlgItemMessage(hwndDlg, IDC_APPEAR_SIZE_UPDOWN, UDM_SETPOS, 0, - (LPARAM)MAKELONG((short)SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_GETCYMENU, 0, 0), 0)); - break; - - case IDX_INACTIVE_BORDER: - case IDX_ACTIVE_BORDER: - EnableWindow(GetDlgItem(hwndDlg, IDC_APPEAR_SIZE), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_APPEAR_SIZE_UPDOWN), TRUE); - SendDlgItemMessage(hwndDlg, IDC_APPEAR_SIZE_UPDOWN, UDM_SETPOS, 0, - (LPARAM)MAKELONG((short)SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_GETCYSIZEFRAME, 0, 0), 0)); - break; - - case IDX_INACTIVE_CAPTION: - case IDX_ACTIVE_CAPTION: - EnableWindow(GetDlgItem(hwndDlg, IDC_APPEAR_SIZE), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_APPEAR_SIZE_UPDOWN), TRUE); - SendDlgItemMessage(hwndDlg, IDC_APPEAR_SIZE_UPDOWN, UDM_SETPOS, 0, - (LPARAM)MAKELONG((short)SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_GETCYCAPTION, 0, 0), 0)); - break; - - case IDX_CAPTION_BUTTON: - EnableWindow(GetDlgItem(hwndDlg, IDC_APPEAR_SIZE), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_APPEAR_SIZE_UPDOWN), TRUE); - SendDlgItemMessage(hwndDlg, IDC_APPEAR_SIZE_UPDOWN, UDM_SETPOS, 0, - (LPARAM)MAKELONG((short)SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_GETCYCAPTION, 0, 0), 0)); - break; - - default: - SetDlgItemText(hwndDlg, IDC_APPEAR_SIZE, _T("")); - EnableWindow(GetDlgItem(hwndDlg, IDC_APPEAR_SIZE), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_APPEAR_SIZE_UPDOWN), FALSE); - - break; - } - -} + SM_CXBORDER, + SM_CYBORDER, + SM_CYCAPTION, + SM_CXICON, + SM_CYICON, + SM_CXICONSPACING, + SM_CYICONSPACING, + SM_CXMENUSIZE, + SM_CYMENU, + SM_CXVSCROLL, + SM_CYHSCROLL, + SM_CYSMCAPTION +}; +/******************************************************************************/ INT_PTR CALLBACK -AppearancePageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - PGLOBAL_DATA pGlobalData; + INT i, index; + GLOBALS* g = NULL; - pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch(uMsg) + { + case WM_INITDIALOG: + { + AppearancePage_Init(hwndDlg); + break; + } + case WM_DESTROY: + { + AppearancePage_CleanUp(hwndDlg); + break; + } + case WM_COMMAND: + { + g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch(LOWORD(wParam)) + { + case IDC_APPEARANCE_ADVANCED: + { + DialogBoxParam(hApplet, (LPCTSTR)IDD_ADVAPPEARANCE, + hwndDlg, AdvAppearanceDlgProc, (LPARAM)g); - switch (uMsg) - { - case WM_INITDIALOG: - pGlobalData = (PGLOBAL_DATA)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(GLOBAL_DATA)); - if (!pGlobalData) - return -1; - - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); - OnInitDialog(hwndDlg, pGlobalData); - OnItemChange(hwndDlg, pGlobalData); - break; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_APPEARANCE_UI_ITEM: - if (HIWORD(wParam) == CBN_SELCHANGE) - { - OnItemChange(hwndDlg, pGlobalData); - } - break; - - case IDC_APPEAR_SIZE: - if (pGlobalData && HIWORD(wParam) == EN_CHANGE) - { - int i = (int)LOWORD(SendDlgItemMessage(hwndDlg, IDC_APPEAR_SIZE_UPDOWN, UDM_GETPOS,0,0L)); - - switch (pGlobalData->nItem) - { - case IDX_INACTIVE_CAPTION: - case IDX_ACTIVE_CAPTION: - case IDX_CAPTION_BUTTON: - SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCYCAPTION, 0, i); - break; - - case IDX_MENU: - SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCYMENU, 0, i); - break; - - case IDX_SCROLLBAR: - SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCXSCROLLBAR, 0, i); - break; - - case IDX_INACTIVE_BORDER: - case IDX_ACTIVE_BORDER: - SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETCYSIZEFRAME, 0, i); - break; - } - } - break; - } - break; - - case WM_DESTROY: - HeapFree(GetProcessHeap(), 0, pGlobalData); - break; - - case WM_USER: - SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_SETCURSEL, lParam, 0); - OnItemChange(hwndDlg, pGlobalData); - break; - } - - return FALSE; + /* Was anything changed in the advanced appearance dialog? */ + if (memcmp(&g->Theme, &g->ThemeAdv, sizeof(THEME)) != 0) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + g->Theme = g->ThemeAdv; + g->Theme.bHasChanged = TRUE; + } + break; + } + case IDC_APPEARANCE_COLORSCHEME: + { + if(HIWORD(wParam) == CBN_SELCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + g->Theme.bHasChanged = TRUE; + i = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_GETCURSEL, 0, 0); + index = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_GETITEMDATA, (WPARAM)i, 0); + LoadThemeFromReg(g, index); + break; + } + break; + } + default: + { + return FALSE; + } + } + return TRUE; + } + case WM_NOTIFY: + { + g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + LPNMHDR lpnm = (LPNMHDR)lParam; + switch(lpnm->code) + { + case PSN_APPLY: + { + if (g->Theme.bHasChanged) + { + ApplyTheme(g); + } + return(TRUE); + break; + } + default: + { + return FALSE; + } + } + return TRUE; + } + default: + { + return FALSE; + } + } + return TRUE; } +void +AppearancePage_Init(HWND hwndDlg) +{ + GLOBALS* g; + HKEY hkNewSchemes, hkScheme, hkSizes, hkSize; + FILETIME ftLastWriteTime; + TCHAR strSelectedStyle[4]; + DWORD dwLength, dwType; + DWORD dwDisposition = 0; + int iStyle, iSize, iTemplateIndex, iListIndex = 0; + int Result; + + g = (GLOBALS*)malloc(sizeof(GLOBALS)); + // FIXME: correct handling of error (g == NULL) + + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)g); + LoadCurrentTheme(g); + + /* Fill color schemes combo */ + Result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance\\New Schemes"), + 0, KEY_READ, &hkNewSchemes); + if (Result != ERROR_SUCCESS) + { + /* Could not open the key, try to create it */ + Result = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance\\New Schemes"), 0, NULL, 0, KEY_ALL_ACCESS, NULL,&hkNewSchemes, &dwDisposition); + if (Result == ERROR_SUCCESS) + { + /* FIXME: We have created it new, so let's put somethig there */ + } + } + if (Result == ERROR_SUCCESS) + { + /* First find out the currently selected template */ + dwLength = 8; + RegQueryValueEx(hkNewSchemes, TEXT("SelectedStyle"), NULL, &dwType, (LPBYTE)&strSelectedStyle, &dwLength); + iTemplateIndex = 0; + iStyle = 0; + dwLength = MAX_TEMPLATENAMELENTGH; + while((RegEnumKeyEx(hkNewSchemes, iStyle, g->ThemeTemplates[iTemplateIndex].strKeyName, &dwLength, + NULL, NULL, NULL, &ftLastWriteTime) == ERROR_SUCCESS) && (iTemplateIndex < MAX_TEMPLATES)) + { + /* is it really a template or one of the other entries */ + if (dwLength < 5) + { + if (RegOpenKeyEx(hkNewSchemes, g->ThemeTemplates[iTemplateIndex].strKeyName, 0, KEY_READ, &hkScheme) == ERROR_SUCCESS) + { + if(RegOpenKeyEx(hkScheme, TEXT("Sizes"), 0, KEY_READ, &hkSizes) == ERROR_SUCCESS) + { + iSize = 0; + dwLength = 3; + while((RegEnumKeyEx(hkSizes, iSize, g->ThemeTemplates[iTemplateIndex].strSizeName, &dwLength, + NULL, NULL, NULL, &ftLastWriteTime) == ERROR_SUCCESS) && (iSize <= 4)) + { + if(RegOpenKeyEx(hkSizes, g->ThemeTemplates[iTemplateIndex].strSizeName, 0, KEY_READ, &hkSize) == ERROR_SUCCESS) + { + dwLength = MAX_TEMPLATENAMELENTGH; + RegQueryValueEx(hkSize, TEXT("DisplayName"), NULL, &dwType, (LPBYTE)&g->ThemeTemplates[iTemplateIndex].strDisplayName, &dwLength); + dwLength = MAX_TEMPLATENAMELENTGH; + RegQueryValueEx(hkSize, TEXT("LegacyName"), NULL, &dwType, (LPBYTE)&g->ThemeTemplates[iTemplateIndex].strLegacyName, &dwLength); + RegCloseKey(hkSize); + } + iListIndex = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_ADDSTRING, 0, (LPARAM)g->ThemeTemplates[iTemplateIndex].strLegacyName); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_SETITEMDATA, iListIndex, iTemplateIndex); + if (lstrcmp(g->ThemeTemplates[iTemplateIndex].strKeyName, strSelectedStyle) == 0) + { + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_SETCURSEL, (WPARAM)iListIndex, 0); + } + iSize++; + iTemplateIndex++; + dwLength = 3; + } + RegCloseKey(hkSizes); + } + RegCloseKey(hkScheme); + } + } + iStyle++; + dwLength = MAX_TEMPLATENAMELENTGH; + } + RegCloseKey(hkNewSchemes); + } + SendMessage(GetDlgItem(hwndDlg, IDC_APPEARANCE_COLORSCHEME), LB_SETCURSEL, 0, 0); + return; +} + +void +AppearancePage_CleanUp(HWND hwndDlg) +{ + GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + free(g); + return; +} + +void +LoadCurrentTheme(GLOBALS* g) +{ + int i; + NONCLIENTMETRICS NonClientMetrics; + + g->Theme.bHasChanged = FALSE; + /* FIXME: it may be custom! */ + g->Theme.bIsCustom = FALSE; + + /* Load colors */ + for(i = 0; i <= 30; i++) + { + g->ColorList[i] = i; + g->Theme.crColor[i] = (COLORREF)GetSysColor(i); + } + + /* Load sizes */ + for(i = 0; i <= 11; i++) + { + g->Theme.Size[i] = GetSystemMetrics(g_SizeMetric[i]); + } + + /* Load fonts */ + NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); + g->Theme.lfFont[FONT_CAPTION] = NonClientMetrics.lfCaptionFont; + g->Theme.lfFont[FONT_SMCAPTION] = NonClientMetrics.lfSmCaptionFont; + g->Theme.lfFont[FONT_MENU] = NonClientMetrics.lfMenuFont; + g->Theme.lfFont[FONT_INFO] = NonClientMetrics.lfStatusFont; + g->Theme.lfFont[FONT_DIALOG] = NonClientMetrics.lfMessageFont; + SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(LOGFONT), &g->Theme.lfFont[FONT_ICON], 0); + + return; +} + +void +LoadThemeFromReg(GLOBALS* g, INT iPreset) +{ + int i; + TCHAR strSizeName[20] = {TEXT("Sizes\\0")}; + TCHAR strValueName[10]; + HKEY hkNewSchemes, hkScheme, hkSize; + DWORD dwType, dwLength; + + if(RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance\\New Schemes"), + 0, KEY_READ, &hkNewSchemes) == ERROR_SUCCESS) + { + if(RegOpenKeyEx(hkNewSchemes, g->ThemeTemplates[iPreset].strKeyName, 0, KEY_READ, &hkScheme) == ERROR_SUCCESS) + { + lstrcpyn(&strSizeName[6],g->ThemeTemplates[iPreset].strSizeName, 3); + if(RegOpenKeyEx(hkScheme, strSizeName, 0, KEY_READ, &hkSize) == ERROR_SUCCESS) + { + dwLength = sizeof(BOOL); + RegQueryValueEx(hkSize, TEXT("FlatMenus"), NULL, &dwType, (LPBYTE)&g->Theme.bFlatMenus, &dwLength); + + for (i = 0; i <= 30; i++) + { + wsprintf(strValueName, TEXT("Color #%d"), i); + dwLength = sizeof(COLORREF); + RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.crColor[i], &dwLength); + } + for (i = 0; i <= 5; i++) + { + wsprintf(strValueName, TEXT("Font #%d"), i); + dwLength = sizeof(LOGFONT); + g->Theme.lfFont[i].lfFaceName[0] = 'x'; + RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.lfFont[i], &dwLength); + } + for (i = 0; i <= 8; i++) + { + wsprintf(strValueName, TEXT("Size #%d"), i); + dwLength = sizeof(DWORD); + RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.Size[i], &dwLength); + } + RegCloseKey(hkScheme); + } + RegCloseKey(hkScheme); + } + RegCloseKey(hkNewSchemes); + } + return; +} + +void +ApplyTheme(GLOBALS* g) +{ + int i, Result; + HKEY hKey; + DWORD dwDisposition = 0; + TCHAR clText[16] = {0}; + NONCLIENTMETRICS NonClientMetrics; + HFONT hMyFont; + LOGFONT lfButtonFont; + + if (!g->Theme.bHasChanged) return; + + g->Theme.bHasChanged = FALSE; + + /* Update some globals */ + g->crCOLOR_BTNFACE = g->Theme.crColor[COLOR_BTNFACE]; + g->crCOLOR_BTNTEXT = g->Theme.crColor[COLOR_BTNTEXT]; + g->crCOLOR_BTNSHADOW = g->Theme.crColor[COLOR_BTNSHADOW]; + g->crCOLOR_BTNHIGHLIGHT = g->Theme.crColor[COLOR_BTNHIGHLIGHT]; + lfButtonFont = g->Theme.lfFont[FONT_DIALOG]; + + /* Create new font for bold button */ + lfButtonFont.lfWeight = FW_BOLD; + lfButtonFont.lfItalic = FALSE; + hMyFont = CreateFontIndirect(&lfButtonFont); + if (hMyFont) + { + if (g->hBoldFont) DeleteObject(g->hBoldFont); + g->hBoldFont = hMyFont; + } + + /* Create new font for italic button */ + lfButtonFont.lfWeight = FW_REGULAR; + lfButtonFont.lfItalic = TRUE; + hMyFont = CreateFontIndirect(&lfButtonFont); + if (hMyFont) + { + if (g->hItalicFont) DeleteObject(g->hItalicFont); + g->hItalicFont = hMyFont; + } + + /* Apply Colors from global variable */ + SetSysColors(30, &g->ColorList[0], &g->Theme.crColor[0]); + + /* Save colors to registry */ + Result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, KEY_ALL_ACCESS, &hKey); + if (Result != ERROR_SUCCESS) + { + /* Could not open the key, try to create it */ + Result = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, NULL, 0, KEY_ALL_ACCESS, NULL,&hKey, &dwDisposition); + } + if (Result == ERROR_SUCCESS) + { + for(i = 0; i <= 30; i++) + { + DWORD red = GetRValue(g->Theme.crColor[i]); + DWORD green = GetGValue(g->Theme.crColor[i]); + DWORD blue = GetBValue(g->Theme.crColor[i]); + wsprintf(clText, TEXT("%d %d %d"), red, green, blue); + RegSetValueEx(hKey, g_RegColorNames[i], 0, REG_SZ, (BYTE *)clText, lstrlen( clText )*sizeof(TCHAR) + sizeof(TCHAR)); + } + RegCloseKey(hKey); + } + + /* Apply the fonts */ + NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); + NonClientMetrics.lfCaptionFont = g->Theme.lfFont[FONT_CAPTION]; + NonClientMetrics.lfSmCaptionFont = g->Theme.lfFont[FONT_SMCAPTION]; + NonClientMetrics.lfMenuFont = g->Theme.lfFont[FONT_MENU]; + NonClientMetrics.lfStatusFont = g->Theme.lfFont[FONT_INFO]; + NonClientMetrics.lfMessageFont = g->Theme.lfFont[FONT_DIALOG]; + SystemParametersInfo(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); + SystemParametersInfo(SPI_SETICONTITLELOGFONT, sizeof(LOGFONT), &g->Theme.lfFont[FONT_ICON], 0); + + /* FIXME: Apply size metrics */ + + /* Save fonts and size metrics to registry */ + Result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, KEY_ALL_ACCESS, &hKey); + if (Result != ERROR_SUCCESS) + { + /* Could not open the key, try to create it */ + Result = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, NULL, 0, KEY_ALL_ACCESS, NULL,&hKey, &dwDisposition); + } + if (Result == ERROR_SUCCESS) + { + RegSetValueEx(hKey, TEXT("CaptionFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_CAPTION], sizeof(LOGFONT)); + RegSetValueEx(hKey, TEXT("SmCaptionFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_SMCAPTION], sizeof(LOGFONT)); + RegSetValueEx(hKey, TEXT("IconFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_ICON], sizeof(LOGFONT)); + RegSetValueEx(hKey, TEXT("MenuFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_MENU], sizeof(LOGFONT)); + RegSetValueEx(hKey, TEXT("StatusFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_INFO], sizeof(LOGFONT)); + RegSetValueEx(hKey, TEXT("MessageFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_DIALOG], sizeof(LOGFONT)); + + /* Save size metrics to registry */ + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_BORDER_X]); + RegSetValueEx(hKey, TEXT("BorderWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_CAPTION_Y]); + RegSetValueEx(hKey, TEXT("CaptionWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_CAPTION_Y]); + RegSetValueEx(hKey, TEXT("CaptionHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SMCAPTION_Y]); + RegSetValueEx(hKey, TEXT("SmCaptionWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SMCAPTION_Y]); + RegSetValueEx(hKey, TEXT("SmCaptionHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_ICON_SPC_X]); + RegSetValueEx(hKey, TEXT("IconSpacing"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_ICON_SPC_Y]); + RegSetValueEx(hKey, TEXT("IconVerticalSpacing"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_MENU_X]); + RegSetValueEx(hKey, TEXT("MenuWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_MENU_Y]); + RegSetValueEx(hKey, TEXT("MenuHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SCROLL_X]); + RegSetValueEx(hKey, TEXT("ScrollWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SCROLL_Y]); + RegSetValueEx(hKey, TEXT("ScrollHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), g->Theme.Size[SIZE_ICON_X]); + RegSetValueEx(hKey, TEXT("Shell Icon Sizet"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + + RegCloseKey(hKey); + } + return; +} + +/* Draw the preview window, unimplemented */ +void +DrawPreview(HWND hwndPreview, THEME* pTheme) +{ + return; +} diff --git a/reactos/dll/cpl/desk/appearance.h b/reactos/dll/cpl/desk/appearance.h new file mode 100644 index 00000000000..5fb0c2d7ec5 --- /dev/null +++ b/reactos/dll/cpl/desk/appearance.h @@ -0,0 +1,103 @@ + +/* Some definitions for appearance page */ +#define SIZE_BORDER_X 0 +#define SIZE_BORDER_Y 1 +#define SIZE_CAPTION_Y 2 +#define SIZE_ICON_X 3 +#define SIZE_ICON_Y 4 +#define SIZE_ICON_SPC_X 5 +#define SIZE_ICON_SPC_Y 6 +#define SIZE_MENU_X 7 +#define SIZE_MENU_Y 8 +#define SIZE_SCROLL_X 9 +#define SIZE_SCROLL_Y 10 +#define SIZE_SMCAPTION_Y 11 + +#define FONT_CAPTION 0 +#define FONT_SMCAPTION 1 +#define FONT_HILIGHT 2 +#define FONT_MENU 2 +#define FONT_ICON 3 +#define FONT_INFO 4 +#define FONT_DIALOG 5 + +#define NUM_ELEMENTS 22 +#define NUM_FONTS 6 +#define NUM_SIZES 13 +#define NUM_COLORS 31 +#define MAX_TEMPLATES 50 +#define MAX_COLORNAMELENGTH 30 +#define MAX_TEMPLATENAMELENTGH 80 + +/* Some typedefs for appearance */ +typedef struct +{ + COLORREF crColor[NUM_COLORS]; + LOGFONT lfFont[NUM_FONTS]; + DWORD Size[NUM_SIZES]; + BOOL bFlatMenus; + BOOL bHasChanged; + BOOL bIsCustom; +} THEME; + +typedef struct +{ + TCHAR strKeyName[4]; + TCHAR strSizeName[4]; + TCHAR strDisplayName[MAX_TEMPLATENAMELENTGH]; + TCHAR strLegacyName[MAX_TEMPLATENAMELENTGH]; + INT NumSizes; +} THEME_PRESET; + +typedef struct +{ + int Size; + int Size2; + int Color1; + int Color2; + int Font; + int FontColor; +} ASSIGNMENT; + +/* This is the global structure used to store the current values. + A pointer of this get's passed to the functions either directly + or by passing hwnd and getting the pointer by GetWindowLongPtr */ +typedef struct tagGLOBALS +{ + THEME_PRESET ThemeTemplates[MAX_TEMPLATES]; + THEME Theme; + THEME ThemeAdv; + int ColorList[NUM_COLORS]; + HBITMAP hbmpColor[3]; + int CurrentElement; + COLORREF crCOLOR_BTNFACE; + COLORREF crCOLOR_BTNSHADOW; + COLORREF crCOLOR_BTNTEXT; + COLORREF crCOLOR_BTNHIGHLIGHT; + HFONT hBoldFont; + HFONT hItalicFont; +} GLOBALS; + + +extern const ASSIGNMENT g_Assignment[NUM_ELEMENTS]; +extern const TCHAR g_RegColorNames[NUM_COLORS][MAX_COLORNAMELENGTH]; +extern const int g_SizeMetric[NUM_SIZES]; + +/* prototypes for appearance.c */ +INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +void AppearancePage_Init(HWND hwndDlg); +void AppearancePage_CleanUp(HWND hwndDlg); +void LoadCurrentTheme(GLOBALS* g); +void LoadThemeFromReg(GLOBALS* g, INT iPreset); +void ApplyTheme(GLOBALS* g); + +/* prototypes for advappearancedlg.c */ +INT_PTR CALLBACK AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +void AdvAppearanceDlg_Init(HWND hwndDlg); +void AdvAppearanceDlg_CleanUp(HWND hwndDlg); +void UpdateControls(HWND hwndDlg, int iElement); +void SaveCurrentValues(HWND hwndDlg); +void InitColorButtons(HWND hwndDlg); +void UpdateButtonColor(HWND hwndDlg, int ID, int nButton, int nColor); +BOOL GetColor(HWND hwndDlg, int iElement, int nButton); +int CALLBACK EnumFontFamExProc(ENUMLOGFONTEX*, NEWTEXTMETRICEX*, DWORD, LPARAM); diff --git a/reactos/dll/cpl/desk/cz.rc b/reactos/dll/cpl/desk/cz.rc index 8a0796cb5ed..022bf7c7756 100644 --- a/reactos/dll/cpl/desk/cz.rc +++ b/reactos/dll/cpl/desk/cz.rc @@ -24,6 +24,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Spoi obrazovky" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE GROUPBOX "&Spoi obrazovky",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Seznam spoi:",IDC_STATIC,13, 24, 150, 9 @@ -42,9 +44,11 @@ BEGIN CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "Minut ne se spust spoi obrazovky.",IDC_STATIC,70, 111, 147, 9 + LTEXT "Minut ne se spust spoi obrazovky.", + IDC_STATIC,70, 111, 147, 9 - GROUPBOX "eten &energie monitoru",IDC_SCREENS_DUMMY2,5, 146, 238, 50 + GROUPBOX "eten &energie monitoru", + IDC_SCREENS_DUMMY2,5, 146, 238, 50 LTEXT "Pro monosti napjen monitoru klepnta na tlatko Monosti napjen.", IDC_STATIC,16, 159, 145, 35 PUSHBUTTON "M&onosti napjen",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 @@ -59,11 +63,47 @@ BEGIN WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 142, 159, 16, 9 - EDITTEXT IDC_APPEAR_SIZE, 142, 169, 38, 13, ES_RIGHT | WS_GROUP - CONTROL "", IDC_APPEAR_SIZE_UPDOWN, UPDOWN_CLASS, WS_BORDER | WS_GROUP | - UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT, - 172, 169, 10, 13 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + 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 + + 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 + + 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 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + + EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -110,7 +150,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Obrazovka" IDS_CPLDESCRIPTION "Nastaven obrazovky, spoie, vzhledu a rozlien." - IDS_NONE "(Nic)" IDS_CENTER "Vycentrovat" IDS_STRETCH "Rozthnout" @@ -127,6 +166,12 @@ BEGIN IDS_PIXEL "%lux%lu bod" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" +END + STRINGTABLE DISCARDABLE BEGIN IDS_INACTWIN "Inactive Window" @@ -139,22 +184,26 @@ 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" + IDS_ELEMENT_1 "Desktop" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" END diff --git a/reactos/dll/cpl/desk/de.rc b/reactos/dll/cpl/desk/de.rc index da1c20cba7f..5b55fbe57db 100644 --- a/reactos/dll/cpl/desk/de.rc +++ b/reactos/dll/cpl/desk/de.rc @@ -5,14 +5,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hintergrund" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 80, 10, 83, 57, WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER - | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 - LTEXT "Hintergrundbild:", IDC_STATIC, 8, 103, 180, 9 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT "Hintergrundbild:", + IDC_STATIC, 8, 103, 180, 9 PUSHBUTTON "&Durchsuchen...", IDC_BROWSE_BUTTON, 188, 114, 55, 15 PUSHBUTTON "&Farbe...", IDC_COLOR_BUTTON, 188, 177, 55, 15 LTEXT "&Ausrichtung:", IDC_STATIC, 188, 140, 50, 9 - COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -20,32 +24,34 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Bildschirmschoner" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 80, 10, 83, 57, WS_EX_STATICEDGE - + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE GROUPBOX "&Bildschrimschoner",IDC_STATIC, 5, 7, 238, 136 - LTEXT "Installierte Bildschrimschoner:",IDC_STATIC,13, 24, 150, 9 - CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | + LTEXT "Installierte Bildschrimschoner:", IDC_STATIC, 13, 24, 150, 9 + CONTROL "", IDC_SCREENS_CHOICES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 13, 34, 170, 69 - PUSHBUTTON "&Einstellungen",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP - PUSHBUTTON "&Vorschau",IDC_SCREENS_TESTSC,188, 52, 50, 15 + PUSHBUTTON "&Einstellungen", IDC_SCREENS_SETTINGS, 188, 34, 50, 15,WS_GROUP + PUSHBUTTON "&Vorschau", IDC_SCREENS_TESTSC, 188, 52, 50, 15 - CONTROL "&Passwortschutz bei Reaktivierung.",IDC_SCREENS_USEPASSCHK,"button", + CONTROL "&Passwortschutz bei Reaktivierung.", IDC_SCREENS_USEPASSCHK, "button", BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "&Warte",IDC_STATIC,13, 110, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,35, 109, 31, 12,ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + LTEXT "&Warte", IDC_STATIC, 13, 110, 20, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 35, 109, 31, 12, ES_RIGHT | WS_GROUP + CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "Minuten, bis der Bildschirmschoner angezeigt wird.",IDC_STATIC,70, 111, 147, 9 + WS_BORDER | WS_GROUP, 52, 109, 12, 12 + LTEXT "Minuten, bis der Bildschirmschoner angezeigt wird.", + IDC_STATIC, 70, 111, 147, 9 - GROUPBOX "&Energiesparfunktion des Bildschirms",IDC_SCREENS_DUMMY2,5, 146, 238, 50 + GROUPBOX "&Energiesparfunktion des Bildschirms", + IDC_SCREENS_DUMMY2, 5, 146, 238, 50 LTEXT "Hier knnen Sie Energiesparfunktionen Ihres Computers konfigurieren.", - IDC_STATIC,16, 159, 145, 35 - PUSHBUTTON "Energ&ieeinstellungen",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 + IDC_STATIC, 16, 159, 145, 35 + PUSHBUTTON "Energ&ieeinstellungen", IDC_SCREENS_POWER_BUTTON, 165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -55,13 +61,49 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 142, 159, 16, 9 - EDITTEXT IDC_APPEAR_SIZE, 142, 169, 38, 13, ES_RIGHT | WS_GROUP - CONTROL "", IDC_APPEAR_SIZE_UPDOWN, UPDOWN_CLASS, WS_BORDER | WS_GROUP | - UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT, - 172, 169, 10, 13 + LTEXT "Farbschema:", IDC_STATIC, 7, 140, 64, 7 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Erweitert", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Erweiterte Darstellung" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Gre", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&1. Farbe:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 30, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&2. Farbe:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 30, 9 + 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 + + 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 + + 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 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + + EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -72,8 +114,8 @@ BEGIN LTEXT "&Anzeige:",1820,3,100,30,8 LTEXT "",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "Bi&ldschirmauflsung",1818,3,120,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,130,58,17 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 LTEXT "Niedrig",1815,9,130,15,8,NOT WS_GROUP LTEXT "Hoch",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER @@ -87,14 +129,14 @@ END IDR_POPUP_MENU MENU DISCARDABLE BEGIN - POPUP "" - BEGIN - MENUITEM "&Konfigurieren", ID_MENU_CONFIG - MENUITEM "&Vorschau", ID_MENU_PREVIEW - MENUITEM SEPARATOR - MENUITEM "&Hinzufgen", ID_MENU_ADD - MENUITEM "&Lschen\tDel", ID_MENU_DELETE - END + POPUP "" + BEGIN + MENUITEM "&Konfigurieren", ID_MENU_CONFIG + MENUITEM "&Vorschau", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Hinzufgen", ID_MENU_ADD + MENUITEM "&Lschen\tDel", ID_MENU_DELETE + END END IDR_PREVIEW_MENU MENU @@ -142,22 +184,26 @@ 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" + IDS_ELEMENT_1 "Desktop" + IDS_ELEMENT_2 "Titelleiste der inaktiven Fenster" + IDS_ELEMENT_3 "Rahmen der inaktiven Fenster" + IDS_ELEMENT_4 "Titelleiste der aktiven Fenster" + IDS_ELEMENT_5 "Rahmen der Aktiven Fenster" + IDS_ELEMENT_6 "Men" + IDS_ELEMENT_7 "Markierte Elemente" + IDS_ELEMENT_8 "Fenster" + IDS_ELEMENT_9 "Bildlaufleiste" + IDS_ELEMENT_10 "3D-Objekte" + IDS_ELEMENT_11 "Palettentitel" + IDS_ELEMENT_12 "Symboltitel" + IDS_ELEMENT_13 "Titelleistenschaltflche" + IDS_ELEMENT_14 "Deaktiviertes Menelement" + IDS_ELEMENT_15 "Dialogfeld" + IDS_ELEMENT_16 "Bildlaufleisten-Schaltflchen" + IDS_ELEMENT_17 "Hintergrund der Anwendung" + IDS_ELEMENT_18 "Kleine Titelleistenschaltflche" + IDS_ELEMENT_19 "Symbolabstand (Horizontal)" + IDS_ELEMENT_20 "Symbolabstand (Vertikal)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" END diff --git a/reactos/dll/cpl/desk/desk.rbuild b/reactos/dll/cpl/desk/desk.rbuild index 2df1e749cda..698d7076e31 100644 --- a/reactos/dll/cpl/desk/desk.rbuild +++ b/reactos/dll/cpl/desk/desk.rbuild @@ -26,8 +26,9 @@ desk.c dibitmap.c misc.c - preview.c + preview.c screensaver.c + advappdlg.c settings.c desk.rc diff --git a/reactos/dll/cpl/desk/en.rc b/reactos/dll/cpl/desk/en.rc index 75e1493eca0..81096dbc7db 100644 --- a/reactos/dll/cpl/desk/en.rc +++ b/reactos/dll/cpl/desk/en.rc @@ -5,14 +5,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Background" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 80, 10, 83, 57, WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER - | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 - LTEXT "Select an image to use as your desktop wallpaper:", IDC_STATIC, 8, 103, 180, 9 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT "Select an image to use as your desktop wallpaper:", + IDC_STATIC, 8, 103, 180, 9 PUSHBUTTON "&Browse...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 PUSHBUTTON "&Color...", IDC_COLOR_BUTTON, 188, 177, 50, 15 LTEXT "Placement:", IDC_STATIC, 188, 138, 36, 9 - COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -20,6 +24,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Screensaver" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE GROUPBOX "&Screensaver",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Installed screensavers:",IDC_STATIC,13, 24, 150, 9 @@ -38,12 +44,14 @@ BEGIN CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "minutes before showing Screensaver.",IDC_STATIC,70, 111, 147, 9 + LTEXT "minutes before showing Screensaver.", + IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Energy Saving features of monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 50 + GROUPBOX "&Energy Saving features of monitor", + IDC_SCREENS_DUMMY2, 5, 146, 238, 50 LTEXT "To adjust the power settings for your monitor, click on Power Settings.", - IDC_STATIC,16, 159, 145, 35 - PUSHBUTTON "P&ower Settings",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 + IDC_STATIC, 16, 159, 145, 35 + PUSHBUTTON "P&ower Settings", IDC_SCREENS_POWER_BUTTON, 165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -53,13 +61,49 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 142, 159, 16, 9 - EDITTEXT IDC_APPEAR_SIZE, 142, 169, 38, 13, ES_RIGHT | WS_GROUP - CONTROL "", IDC_APPEAR_SIZE_UPDOWN, UPDOWN_CLASS, WS_BORDER | WS_GROUP | - UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT, - 172, 169, 10, 13 + LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + 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 + + 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 + + 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 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + + EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -70,8 +114,8 @@ BEGIN LTEXT "&Display:",1820,3,100,30,8 LTEXT "",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Screen area",1818,3,120,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,130,58,17 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 LTEXT "Less",1815,9,130,15,8,NOT WS_GROUP LTEXT "More",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER @@ -106,7 +150,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Display" IDS_CPLDESCRIPTION "Customizes the desktop display and screen saver." - IDS_NONE "(None)" IDS_CENTER "Center" IDS_STRETCH "Stretch" @@ -141,22 +184,26 @@ 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" + IDS_ELEMENT_1 "Desktop" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" END diff --git a/reactos/dll/cpl/desk/es.rc b/reactos/dll/cpl/desk/es.rc index 2a6abe07ed2..647f1c32a3b 100644 --- a/reactos/dll/cpl/desk/es.rc +++ b/reactos/dll/cpl/desk/es.rc @@ -12,18 +12,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Escritorio" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, - 90,65,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW, + 78,10,90,65,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,99,173,71 + WS_BORDER | WS_TABSTOP, 7, 99, 173, 71 LTEXT "Fondo:", - IDC_STATIC,8,87,180,8 - PUSHBUTTON "&Examinar...",IDC_BROWSE_BUTTON,187,135,50,14 - PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,155,50,14 - LTEXT "Posicin",IDC_STATIC,187,98,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP + IDC_STATIC, 8, 87, 180, 8 + PUSHBUTTON "&Examinar...",IDC_BROWSE_BUTTON, 187, 135, 50, 14 + PUSHBUTTON "&Color...",IDC_COLOR_BUTTON, 187, 155, 50, 14 + LTEXT "Posicin",IDC_STATIC, 187, 98, 36, 8 + COMBOBOX IDC_PLACEMENT_COMBO, 187, 108, 50, 90, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -31,6 +31,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Protector de pantalla" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE GROUPBOX "&Protector de pantalla",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Lista de protectores de pantalla:",IDC_STATIC,13, 24, 150, 9 @@ -49,12 +51,14 @@ BEGIN CONTROL "",IDC_SCREENS_TIME ,"UPDOWN_CLASS",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "Minutos antes de mostrar el protector de pantalla.",IDC_STATIC,70, 111, 147, 9 + LTEXT "Minutos antes de mostrar el protector de pantalla.", + IDC_STATIC,70, 111, 147, 9 - GROUPBOX "Ahorro de energa del monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + GROUPBOX "Ahorro de energa del monitor", + IDC_SCREENS_DUMMY2, 5, 146, 238, 35 LTEXT "Para ajustar la configuracin de energa del monitor, haga click en Energa.", - IDC_STATIC,16, 159, 145, 35 - PUSHBUTTON "Energa...",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 + IDC_STATIC, 16, 159, 145, 35 + PUSHBUTTON "Energa...", IDC_SCREENS_POWER_BUTTON, 165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -64,13 +68,49 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 142, 159, 16, 9 - EDITTEXT IDC_APPEAR_SIZE, 142, 169, 38, 13, ES_RIGHT | WS_GROUP - CONTROL "", IDC_APPEAR_SIZE_UPDOWN, UPDOWN_CLASS, WS_BORDER | WS_GROUP | - UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT, - 172, 169, 10, 13 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + 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 + + 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 + + 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 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + + EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -81,8 +121,8 @@ BEGIN LTEXT "Monitor",1820,3,100,30,8 LTEXT "",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "Resolucin de &pantalla",1818,3,120,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,130,58,17 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 LTEXT "Menos",1815,8,130,21,8,NOT WS_GROUP LTEXT "Ms",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER @@ -117,7 +157,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Pantalla" IDS_CPLDESCRIPTION "Personaliza el fondo de escritorio y el protector de pantalla." - IDS_NONE "(Ninguno)" IDS_CENTER "Centrada" IDS_STRETCH "Expandida" @@ -134,6 +173,12 @@ BEGIN IDS_PIXEL "%lu por %lu pxeles" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" +END + STRINGTABLE DISCARDABLE BEGIN IDS_INACTWIN "Inactive Window" @@ -146,22 +191,26 @@ 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" + IDS_ELEMENT_1 "Desktop" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" END diff --git a/reactos/dll/cpl/desk/gr.rc b/reactos/dll/cpl/desk/gr.rc index c4d863c8856..243f1945f17 100644 --- a/reactos/dll/cpl/desk/gr.rc +++ b/reactos/dll/cpl/desk/gr.rc @@ -5,18 +5,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, - 90,65,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, + 78, 10, 90, 65, WS_EX_STATICEDGE + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,99,173,71 + WS_BORDER | WS_TABSTOP, 7, 99, 173, 71 LTEXT " :", - IDC_STATIC,8,87,180,8 - PUSHBUTTON "&...",IDC_BROWSE_BUTTON,187,135,50,14 - PUSHBUTTON "&...",IDC_COLOR_BUTTON,187,155,50,14 - LTEXT ":",IDC_STATIC,187,98,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP + IDC_STATIC, 8, 87, 180, 8 + PUSHBUTTON "&...", IDC_BROWSE_BUTTON, 187, 135, 50, 14 + PUSHBUTTON "&...", IDC_COLOR_BUTTON, 187, 155, 50, 14 + LTEXT ":", IDC_STATIC, 187, 98, 36, 8 + COMBOBOX IDC_PLACEMENT_COMBO, 187, 108, 50, 90, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -24,6 +24,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION " " FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE GROUPBOX "& ",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT " :",IDC_STATIC,13, 24, 150, 9 @@ -42,12 +44,14 @@ BEGIN CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT " .",IDC_STATIC,70, 111, 147, 9 + LTEXT " .", + IDC_STATIC,70, 111, 147, 9 - GROUPBOX "& ",IDC_SCREENS_DUMMY2,5, 146, 238, 50 + GROUPBOX "& ", + IDC_SCREENS_DUMMY2, 5, 146, 238, 50 LTEXT " , ' '.", - IDC_STATIC,16, 159, 145, 35 - PUSHBUTTON "& ",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 + IDC_STATIC, 16, 159, 145, 35 + PUSHBUTTON "& ", IDC_SCREENS_POWER_BUTTON, 165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -57,13 +61,49 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 142, 159, 16, 9 - EDITTEXT IDC_APPEAR_SIZE, 142, 169, 38, 13, ES_RIGHT | WS_GROUP - CONTROL "", IDC_APPEAR_SIZE_UPDOWN, UPDOWN_CLASS, WS_BORDER | WS_GROUP | - UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT, - 172, 169, 10, 13 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + 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 + + 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 + + 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 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + + EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -74,8 +114,8 @@ BEGIN LTEXT "&:",1820,3,100,30,8 LTEXT "",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "& ",1818,3,120,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,130,58,17 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 LTEXT "",1815,9,130,15,8,NOT WS_GROUP LTEXT "",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER @@ -110,7 +150,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Display" IDS_CPLDESCRIPTION " ." - IDS_NONE "()" IDS_CENTER "" IDS_STRETCH "" @@ -145,22 +184,26 @@ 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" + IDS_ELEMENT_1 "Desktop" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" END diff --git a/reactos/dll/cpl/desk/hu.rc b/reactos/dll/cpl/desk/hu.rc index bbc96073505..aebb5230c6c 100644 --- a/reactos/dll/cpl/desk/hu.rc +++ b/reactos/dll/cpl/desk/hu.rc @@ -6,13 +6,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Httr" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10,90,65,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,7,99,173,71 - LTEXT "Vlasszon ki egy kpet az asztala htternek:", IDC_STATIC,8,87,180,8 - PUSHBUTTON "&Kivlaszts...",IDC_BROWSE_BUTTON,187,135,50,14 - PUSHBUTTON "&Sznek...",IDC_COLOR_BUTTON,187,155,50,14 - LTEXT "Elrendezs:",IDC_STATIC,187,98,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, + 78, 10, 90, 65, WS_EX_STATICEDGE + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP, 7, 99, 173, 71 + LTEXT "Vlasszon ki egy kpet az asztala htternek:", + IDC_STATIC, 8, 87, 180, 8 + PUSHBUTTON "&Kivlaszts...", IDC_BROWSE_BUTTON, 187, 135, 50, 14 + PUSHBUTTON "&Sznek...", IDC_COLOR_BUTTON, 187, 155, 50, 14 + LTEXT "Elrendezs:", IDC_STATIC, 187, 98, 36, 8 + COMBOBOX IDC_PLACEMENT_COMBO, 187, 148, 50, 90, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -20,6 +25,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Kpernyvd" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE GROUPBOX "&Kpernyvd",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Kpernyvdk listja:",IDC_STATIC,13, 24, 150, 9 @@ -30,16 +37,22 @@ BEGIN PUSHBUTTON "&Belltsok...",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP PUSHBUTTON "E&lzetes nzet",IDC_SCREENS_TESTSC,188, 52, 50, 15 - CONTROL "&Megszaktskor jelszval vdve.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 + CONTROL "&Megszaktskor jelszval vdve.",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 LTEXT "&Vrakozsi id:",IDC_STATIC,13, 110, 20, 9 EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "A kpernyvd elindtsa ennyi perc mlva.",IDC_STATIC,70, 111, 147, 9 + CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "A kpernyvd elindtsa ennyi perc mlva.", + IDC_STATIC,70, 111, 147, 9 - GROUPBOX "A kperny energiaelltsi lehetsgei",IDC_SCREENS_DUMMY2,5, 146, 238, 50 - LTEXT "Az energiaelltsi belltsok ellenrzshez kattintson az Energiaellts gombra.", IDC_STATIC,16, 159, 145, 35 - PUSHBUTTON "E&nergiaellts",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 + GROUPBOX "A kperny energiaelltsi lehetsgei", + IDC_SCREENS_DUMMY2, 5, 146, 238, 50 + LTEXT "Az energiaelltsi belltsok ellenrzshez kattintson az Energiaellts gombra.", + IDC_STATIC, 16, 159, 145, 35 + PUSHBUTTON "E&nergiaellts", IDC_SCREENS_POWER_BUTTON, 165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -49,13 +62,49 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 142, 159, 16, 9 - EDITTEXT IDC_APPEAR_SIZE, 142, 169, 38, 13, ES_RIGHT | WS_GROUP - CONTROL "", IDC_APPEAR_SIZE_UPDOWN, UPDOWN_CLASS, WS_BORDER | WS_GROUP | - UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT, - 172, 169, 10, 13 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + 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 + + 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 + + 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 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + + EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -66,13 +115,16 @@ BEGIN LTEXT "&Kperny:",1820,3,100,30,8 LTEXT "",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "K&pmret",1818,3,120,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,30,130,58,17 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 LTEXT "Kisebb",1815,9,130,15,8,NOT WS_GROUP LTEXT "Nagyobb",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "&Sznek",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN,131,148,103,9 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,148,103,9 PUSHBUTTON "&Haladknak...",IDC_SETTINGS_ADVANCED,306,165,56,14 END @@ -99,7 +151,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Kperny" IDS_CPLDESCRIPTION "A kperny s a kpernyvd tulajdonsgainak testreszabsa." - IDS_NONE "(Nincs)" IDS_CENTER "Kzpen" IDS_STRETCH "Szthzva" @@ -134,22 +185,26 @@ 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" + IDS_ELEMENT_1 "Desktop" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" END diff --git a/reactos/dll/cpl/desk/nl.rc b/reactos/dll/cpl/desk/nl.rc index 9c2f3f215f2..d57be3abfe4 100644 --- a/reactos/dll/cpl/desk/nl.rc +++ b/reactos/dll/cpl/desk/nl.rc @@ -5,18 +5,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Achtergrond" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, - 90,65,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static",SS_OWNERDRAW, + 78, 10, 90, 65, WS_EX_STATICEDGE + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,99,173,71 + WS_BORDER | WS_TABSTOP, 7, 99, 173, 71 LTEXT "Select an image to use as your desktop wallpaper:", - IDC_STATIC,8,87,180,8 - PUSHBUTTON "&Bladeren...",IDC_BROWSE_BUTTON,187,135,50,14 - PUSHBUTTON "&Kleur...",IDC_COLOR_BUTTON,187,155,50,14 - LTEXT "&Weergave:",IDC_STATIC,187,98,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP + IDC_STATIC, 8, 87, 180, 8 + PUSHBUTTON "&Bladeren...", IDC_BROWSE_BUTTON, 187, 135, 50, 14 + PUSHBUTTON "&Kleur...", IDC_COLOR_BUTTON, 187, 155, 50, 14 + LTEXT "&Weergave:", IDC_STATIC, 187, 98, 36, 8 + COMBOBOX IDC_PLACEMENT_COMBO, 187, 108, 50, 90, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -24,6 +24,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Schermbeveiliging" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE GROUPBOX "&Schermbeveiliging",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Lijst van de schermbeveiligingen:",IDC_STATIC,13, 24, 150, 9 @@ -42,12 +44,14 @@ BEGIN CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "minuten.",IDC_STATIC,70, 111, 147, 9 + LTEXT "minuten.", + IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Energiebesparende functies van de monitor",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + GROUPBOX "&Energiebesparende functies van de monitor", + IDC_SCREENS_DUMMY2, 5, 146, 238, 35 LTEXT "Klik op Instellingen om de energiebesparende mogelijkheden van de monitor in te stellen.", - IDC_STATIC,16, 159, 145, 19 - PUSHBUTTON "Inst&ellingen",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 + IDC_STATIC, 16, 159, 145, 19 + PUSHBUTTON "Inst&ellingen", IDC_SCREENS_POWER_BUTTON, 165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -57,13 +61,49 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 142, 159, 16, 9 - EDITTEXT IDC_APPEAR_SIZE, 142, 169, 38, 13, ES_RIGHT | WS_GROUP - CONTROL "", IDC_APPEAR_SIZE_UPDOWN, UPDOWN_CLASS, WS_BORDER | WS_GROUP | - UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT, - 172, 169, 10, 13 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + 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 + + 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 + + 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 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + + EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -74,8 +114,8 @@ BEGIN LTEXT "&Scherm:",1820,3,100,30,8 LTEXT "",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Screen area",1818,3,120,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,130,58,17 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 LTEXT "Minder",1815,9,130,15,8,NOT WS_GROUP LTEXT "Meer",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER @@ -110,7 +150,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Display" IDS_CPLDESCRIPTION "Customizes the desktop display and screen saver." - IDS_NONE "(None)" IDS_CENTER "Center" IDS_STRETCH "Stretch" @@ -127,6 +166,12 @@ BEGIN IDS_PIXEL "%lux%lu Pixel" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" +END + STRINGTABLE DISCARDABLE BEGIN IDS_INACTWIN "Inactive Window" @@ -139,22 +184,26 @@ 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" + IDS_ELEMENT_1 "Desktop" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" END diff --git a/reactos/dll/cpl/desk/pl.rc b/reactos/dll/cpl/desk/pl.rc index b2018cff36e..7f2855b6bf0 100644 --- a/reactos/dll/cpl/desk/pl.rc +++ b/reactos/dll/cpl/desk/pl.rc @@ -6,18 +6,18 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Pulpit" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, - 90,65,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, + 78, 10, 90, 65, WS_EX_STATICEDGE + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,99,173,71 + WS_BORDER | WS_TABSTOP, 7, 99, 173, 71 LTEXT "Wybierz obraz do uycia jako tapeta pulpitu:", - IDC_STATIC,8,87,180,8 - PUSHBUTTON "&Przegldaj...",IDC_BROWSE_BUTTON,187,135,50,14 - PUSHBUTTON "&Kolor...",IDC_COLOR_BUTTON,187,155,50,14 - LTEXT "Pooenie:",IDC_STATIC,187,98,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP + IDC_STATIC, 8, 87, 180, 8 + PUSHBUTTON "&Przegldaj...", IDC_BROWSE_BUTTON, 187, 135, 50, 14 + PUSHBUTTON "&Kolor...", IDC_COLOR_BUTTON, 187, 155, 50, 14 + LTEXT "Pooenie:", IDC_STATIC, 187, 98, 36, 8 + COMBOBOX IDC_PLACEMENT_COMBO, 187, 108, 50, 90, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -25,8 +25,10 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Wygaszacz ekranu" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE GROUPBOX "&Wygaszacz ekranu",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - + LTEXT "Lista wygaszaczy ekranu:",IDC_STATIC,13, 24, 150, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | @@ -43,12 +45,14 @@ BEGIN CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "minut przed pokazaniem wygaszacza ekranu.",IDC_STATIC,70, 111, 147, 9 + LTEXT "minut przed pokazaniem wygaszacza ekranu.", + IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Zasilanie monitora",IDC_SCREENS_DUMMY2,5, 146, 238, 50 + GROUPBOX "&Zasilanie monitora", + IDC_SCREENS_DUMMY2, 5, 146, 238, 50 LTEXT "Kliknij przycisk Zasilanie, aby dopasowa ustawienia zasilania dla monitora.", IDC_STATIC,16, 159, 145, 35 - PUSHBUTTON "Z&asilanie",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 + PUSHBUTTON "Z&asilanie", IDC_SCREENS_POWER_BUTTON, 165, 162, 73, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -58,13 +62,49 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 142, 159, 16, 9 - EDITTEXT IDC_APPEAR_SIZE, 142, 169, 38, 13, ES_RIGHT | WS_GROUP - CONTROL "", IDC_APPEAR_SIZE_UPDOWN, UPDOWN_CLASS, WS_BORDER | WS_GROUP | - UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT, - 172, 169, 10, 13 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + 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 + + 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 + + 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 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + + EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -75,8 +115,8 @@ BEGIN LTEXT "&Ekran:",1820,3,100,30,8 LTEXT "",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Rozdzielczo ekranu",1818,3,120,115,43 - CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 30,130,58,17 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 LTEXT "Mniej",1815,9,130,15,8,NOT WS_GROUP LTEXT "Wicej",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER @@ -111,7 +151,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Ekran" IDS_CPLDESCRIPTION "Dostosowuje wygld pulpitu oraz wygaszacze." - IDS_NONE "(Brak)" IDS_CENTER "Do rodka" IDS_STRETCH "Rozcignicie" @@ -128,6 +167,12 @@ BEGIN IDS_PIXEL "%lux%lu pikseli" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" +END + STRINGTABLE DISCARDABLE BEGIN IDS_INACTWIN "Inactive Window" @@ -140,22 +185,26 @@ 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" + IDS_ELEMENT_1 "Desktop" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" END diff --git a/reactos/dll/cpl/desk/resource.h b/reactos/dll/cpl/desk/resource.h index 940b390aaf2..ae407c670a6 100644 --- a/reactos/dll/cpl/desk/resource.h +++ b/reactos/dll/cpl/desk/resource.h @@ -23,6 +23,7 @@ #define IDD_SCREENSAVER 101 #define IDD_APPEARANCE 102 #define IDD_SETTINGS 103 +#define IDD_ADVAPPEARANCE 104 /* Background Page */ #define IDC_BACKGROUND_LIST 1000 @@ -84,14 +85,12 @@ /* Appearance Page */ -#define IDC_APPEARANCE_PREVIEW 1500 -#define IDC_APPEARANCE_UI_ITEM 1501 - -#define IDC_APPEAR_SIZE 1502 -#define IDC_APPEAR_SIZE_UPDOWN 1503 - -#define IDC_APPEAR_FONT_NAME 1510 - +#define IDC_APPEARANCE_PREVIEW 1500 +#define IDC_APPEARANCE_UI_ITEM 1501 +#define IDC_APPEARANCE_COLORSCHEME 1502 +#define IDC_APPEARANCE_FONTSIZE 1503 +#define IDC_APPEARANCE_EFFECTS 1504 +#define IDC_APPEARANCE_ADVANCED 1505 #define IDS_INACTWIN 1510 #define IDS_ACTWIN 1511 @@ -100,30 +99,57 @@ #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) +/* Advanced Appearance Dialog */# + +#define IDC_ADVAPPEARANCE_PREVIEW 3101 +#define IDC_ADVAPPEARANCE_ELEMENT 3102 +#define IDC_ADVAPPEARANCE_SIZE_T 3103 +#define IDC_ADVAPPEARANCE_SIZE_E 3104 +#define IDC_ADVAPPEARANCE_SIZE_UD 3105 +#define IDC_ADVAPPEARANCE_COLOR1_T 3106 +#define IDC_ADVAPPEARANCE_COLOR1_B 3107 +#define IDC_ADVAPPEARANCE_COLOR2_T 3108 +#define IDC_ADVAPPEARANCE_COLOR2_B 3109 +#define IDC_ADVAPPEARANCE_FONT_T 3110 +#define IDC_ADVAPPEARANCE_FONT_C 3111 +#define IDC_ADVAPPEARANCE_FONTSIZE_T 3112 +#define IDC_ADVAPPEARANCE_FONTSIZE_E 3113 +#define IDC_ADVAPPEARANCE_FONTCOLOR_T 3114 +#define IDC_ADVAPPEARANCE_FONTCOLOR_B 3115 +#define IDC_ADVAPPEARANCE_FONTBOLD 3116 +#define IDC_ADVAPPEARANCE_FONTITALIC 3117 +#define IDC_CONVERT 3199 + +#define IDS_ELEMENT_0 3200 +#define IDS_ELEMENT_1 3201 +#define IDS_ELEMENT_2 3202 +#define IDS_ELEMENT_3 3203 +#define IDS_ELEMENT_4 3204 +#define IDS_ELEMENT_5 3205 +#define IDS_ELEMENT_6 3206 +#define IDS_ELEMENT_7 3207 +#define IDS_ELEMENT_8 3208 +#define IDS_ELEMENT_9 3209 +#define IDS_ELEMENT_10 3210 +#define IDS_ELEMENT_11 3211 +#define IDS_ELEMENT_12 3212 +#define IDS_ELEMENT_13 3213 +#define IDS_ELEMENT_14 3214 +#define IDS_ELEMENT_15 3215 +#define IDS_ELEMENT_16 3216 +#define IDS_ELEMENT_17 3217 +#define IDS_ELEMENT_18 3218 +#define IDS_ELEMENT_19 3219 +#define IDS_ELEMENT_20 3220 +#define IDS_ELEMENT_21 3221 +#define IDS_ELEMENT_22 3222 +#define IDS_ELEMENT_23 3223 + + #endif /* __CPL_DESK_RESOURCE_H__ */ - diff --git a/reactos/dll/cpl/desk/sv.rc b/reactos/dll/cpl/desk/sv.rc index a2999c94a19..0b9b4c7907b 100644 --- a/reactos/dll/cpl/desk/sv.rc +++ b/reactos/dll/cpl/desk/sv.rc @@ -27,6 +27,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Skrmslckare" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 80, 10, 83, 57, WS_EX_STATICEDGE GROUPBOX "&Skrmslckare",IDC_SCREENS_DUMMY, 5, 7, 238, 136 LTEXT "Skrmslckare:",IDC_STATIC,13, 24, 150, 9 @@ -45,9 +47,11 @@ BEGIN CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "minuter innan skrmslckaren visas.",IDC_STATIC,70, 111, 147, 9 + LTEXT "minuter innan skrmslckaren visas.", + IDC_STATIC,70, 111, 147, 9 - GROUPBOX "&Energisparfunktioner fr din bildskrm",IDC_SCREENS_DUMMY2,5, 146, 238, 50 + GROUPBOX "&Energisparfunktioner fr din bildskrm", + IDC_SCREENS_DUMMY2,5, 146, 238, 50 LTEXT "Fr att ndra energisparfunktionerna fr din bildskrm,\nklicka p Instllningar.", IDC_STATIC,16, 159, 145, 35 PUSHBUTTON "Ins&tllningar",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 @@ -62,11 +66,47 @@ BEGIN WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 142, 159, 16, 9 - EDITTEXT IDC_APPEAR_SIZE, 142, 169, 38, 13, ES_RIGHT | WS_GROUP - CONTROL "", IDC_APPEAR_SIZE_UPDOWN, UPDOWN_CLASS, WS_BORDER | WS_GROUP | - UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT, - 172, 169, 10, 13 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "Element:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&1st Color:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&2nd Color:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + 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 + + 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 + + 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 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 + + EDITTEXT IDC_CONVERT, -1, -1, 0, 0, ES_LEFT END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -113,7 +153,6 @@ STRINGTABLE BEGIN IDS_CPLNAME "Bildskrm" IDS_CPLDESCRIPTION "ndrar skrivbordsunderlgg och skrmslckare." - IDS_NONE "(Ingen)" IDS_CENTER "Centrera" IDS_STRETCH "Strck ut" @@ -130,6 +169,12 @@ BEGIN IDS_PIXEL "%lux%lu Pixlar" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Pictures (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" +END + STRINGTABLE DISCARDABLE BEGIN IDS_INACTWIN "Inactive Window" @@ -142,22 +187,26 @@ 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" + IDS_ELEMENT_1 "Desktop" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" END