Author: fireball Date: Tue Jan 16 20:46:06 2007 New Revision: 25487
URL: http://svn.reactos.org/svn/reactos?rev=25487&view=rev Log: - Sync desk.cpl with trunk
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Fr.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/It.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ja.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ru.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Uk.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/appearance.c branches/ros-branch-0_3_1/reactos/dll/cpl/desk/cz.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/de.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/en.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/es.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/gr.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/hu.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/nl.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/pl.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.c branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.h branches/ros-branch-0_3_1/reactos/dll/cpl/desk/resource.h branches/ros-branch-0_3_1/reactos/dll/cpl/desk/sv.rc
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Fr.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Fr.rc Tue Jan 16 20:46:06 2007 @@ -60,8 +60,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Vide pour l'instant....",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END
IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/It.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/It.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/It.rc Tue Jan 16 20:46:06 2007 @@ -53,8 +53,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Questo spazio è stato intenzionalmente lasciato in bianco.",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END
IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -133,3 +133,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ja.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ja.rc Tue Jan 16 20:46:06 2007 @@ -57,8 +57,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "±±ÍÓ}IÉó¯½ÜÜÉµÄ èÜ·",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END
IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -137,3 +137,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ru.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ru.rc Tue Jan 16 20:46:06 2007 @@ -56,7 +56,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Íàñòðîéêè âðåìåííî îòñóòñâóþò",IDC_STATIC,65,150,114,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END
IDD_SETTINGS DIALOGEX 0, 0, 246, 188 @@ -147,3 +148,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Uk.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Uk.rc Tue Jan 16 20:46:06 2007 @@ -61,8 +61,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Öå ì³ñöå íàâìèñíî çàëèøåíå ïóñòèì",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END
IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -141,3 +141,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/appearance.c (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/appearance.c Tue Jan 16 20:46:06 2007 @@ -9,6 +9,23 @@ */
#include "desk.h" + + +static VOID +OnInitDialog(HWND hwndDlg) +{ + TCHAR szBuffer[256]; + UINT i; + + for (i = IDS_ITEM_FIRST; i < IDS_ITEM_LAST; i++) + { + LoadString(hApplet, i, szBuffer, 256); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_ADDSTRING, 0, (LPARAM)szBuffer); + } + + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_SETCURSEL, 2, 0); +} +
INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, @@ -23,9 +40,14 @@ switch (uMsg) { case WM_INITDIALOG: + OnInitDialog(hwndDlg); break;
case WM_COMMAND: + break; + + case WM_USER: + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_SETCURSEL, lParam, 0); break; }
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/cz.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/cz.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/cz.rc Tue Jan 16 20:46:06 2007 @@ -57,8 +57,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END
IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -131,3 +131,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/de.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/de.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/de.rc Tue Jan 16 20:46:06 2007 @@ -55,9 +55,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END
IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -135,3 +134,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D-Objekte" + IDS_ITEM_SCROLLBAR "Bildlaufleiste" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Dialogfeld" + IDS_ITEM_WINDOW "Fenster" + IDS_ITEM_APP_BACKGROUND "Hintergrund der Anwendung" + IDS_ITEM_SELECTED_ITEMS "Markierte Elemente" + IDS_ITEM_MENU "Menü" + IDS_ITEM_PALETTE_TITLE "Palettentitel" + IDS_ITEM_TOOLTIP "Quickinfo" + IDS_ITEM_INACTIVE_WINDOW "Rahmen der inaktiven Fenster" + IDS_ITEM_ACTIVE_WINDOW "Rahmen der aktiven Fenster" + IDS_ITEM_ICON "Symbol" + IDS_ITEM_ICON_SPACE_HORZ "Symbolabstand (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Symbolabstand (Vertikal)" + IDS_ITEM_INACTIVE_TITLE "Titelleiste des inaktiven Fensters" + IDS_ITEM_ACTIVE_TITLE "Titelleiste des aktiven Fensters" + IDS_ITEM_CAPTION_BUTTONS "Titelleistenschaltfläche" +END
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/en.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/en.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/en.rc Tue Jan 16 20:46:06 2007 @@ -53,8 +53,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END
IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -133,3 +133,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/es.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/es.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/es.rc Tue Jan 16 20:46:06 2007 @@ -64,8 +64,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Este espacio se ha dejado en blanco intencionadamente",IDC_STATIC,33, - 150,181,10 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END
IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -138,3 +138,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/gr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/gr.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/gr.rc Tue Jan 16 20:46:06 2007 @@ -57,8 +57,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END
IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -137,3 +137,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/hu.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/hu.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/hu.rc Tue Jan 16 20:46:06 2007 @@ -49,7 +49,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Ez a terület szándékosan lett üresen hagyva",IDC_STATIC,66,150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END
IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -125,3 +126,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/nl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/nl.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/nl.rc Tue Jan 16 20:46:06 2007 @@ -57,8 +57,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END
IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -131,3 +131,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/pl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/pl.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/pl.rc Tue Jan 16 20:46:06 2007 @@ -58,8 +58,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "To miejsce pozosta³o celowo puste",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END
IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -132,3 +132,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.c (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.c Tue Jan 16 20:46:06 2007 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/desk/preview.c * PURPOSE: Draws the preview control - * COPYRIGHT: Copyright 2006 Eric Kohl + * COPYRIGHT: Copyright 2006, 2007 Eric Kohl */
#include "desk.h" @@ -13,6 +13,8 @@
typedef struct _PREVIEW_DATA { + HWND hwndParent; + DWORD clrDesktop; HBRUSH hbrDesktop;
@@ -35,15 +37,19 @@ RECT rcDesktop; RECT rcInactiveFrame; RECT rcInactiveCaption; + RECT rcInactiveCaptionButtons;
RECT rcActiveFrame; RECT rcActiveCaption; + RECT rcActiveCaptionButtons; RECT rcActiveMenuBar; + RECT rcSelectedMenuItem; RECT rcActiveClient; RECT rcActiveScroll;
RECT rcDialogFrame; RECT rcDialogCaption; + RECT rcDialogCaptionButtons; RECT rcDialogClient;
RECT rcDialogButton; @@ -176,6 +182,9 @@ HiliteMenuItem(hwnd, pPreviewData->hMenu, ID_MENU_SELECTED, MF_BYCOMMAND | MF_HILITE);
+// GetMenuItemRect(hwnd, pPreviewData->hMenu, +// ID_MENU_SELECTED, &pPreviewData->rcSelectedMenuItem); +
AllocAndLoadString(&pPreviewData->lpInAct, hApplet, IDS_INACTWIN); AllocAndLoadString(&pPreviewData->lpAct, hApplet, IDS_ACTWIN); @@ -209,6 +218,12 @@ pPreviewData->rcInactiveCaption.right = pPreviewData->rcInactiveFrame.right - pPreviewData->cxEdge - 1/*3*/ - 1; pPreviewData->rcInactiveCaption.bottom = pPreviewData->rcInactiveFrame.top + pPreviewData->cyCaption /*20*/ + 2;
+ /* Calculate the inactive caption buttons rectangle */ + pPreviewData->rcInactiveCaptionButtons.left = pPreviewData->rcInactiveCaption.right - 2 - 2 - 3 * 16; + pPreviewData->rcInactiveCaptionButtons.top = pPreviewData->rcInactiveCaption.top + 2; + pPreviewData->rcInactiveCaptionButtons.right = pPreviewData->rcInactiveCaption.right - 2; + pPreviewData->rcInactiveCaptionButtons.bottom = pPreviewData->rcInactiveCaption.bottom - 2; + /* Calculate the active window rectangle */ pPreviewData->rcActiveFrame.left = pPreviewData->rcInactiveFrame.left + 3 + 1; pPreviewData->rcActiveFrame.top = pPreviewData->rcInactiveCaption.bottom + 1; @@ -221,6 +236,12 @@ pPreviewData->rcActiveCaption.right = pPreviewData->rcActiveFrame.right - 3 - 1; pPreviewData->rcActiveCaption.bottom = pPreviewData->rcActiveFrame.top + pPreviewData->cyCaption/*20*/ + 2;
+ /* Calculate the active caption buttons rectangle */ + pPreviewData->rcActiveCaptionButtons.left = pPreviewData->rcActiveCaption.right - 2 - 2 - 3 * 16; + pPreviewData->rcActiveCaptionButtons.top = pPreviewData->rcActiveCaption.top + 2; + pPreviewData->rcActiveCaptionButtons.right = pPreviewData->rcActiveCaption.right - 2; + pPreviewData->rcActiveCaptionButtons.bottom = pPreviewData->rcActiveCaption.bottom - 2; + /* Calculate the active menu bar rectangle */ pPreviewData->rcActiveMenuBar.left = pPreviewData->rcActiveFrame.left + 3 + 1; pPreviewData->rcActiveMenuBar.top = pPreviewData->rcActiveCaption.bottom + 1; @@ -251,6 +272,12 @@ pPreviewData->rcDialogCaption.top = pPreviewData->rcDialogFrame.top + 3; pPreviewData->rcDialogCaption.right = pPreviewData->rcDialogFrame.right - 3; pPreviewData->rcDialogCaption.bottom = pPreviewData->rcDialogFrame.top + 20 + 1; + + /* Calculate the inactive caption buttons rectangle */ + pPreviewData->rcDialogCaptionButtons.left = pPreviewData->rcDialogCaption.right - 2 - 16; + pPreviewData->rcDialogCaptionButtons.top = pPreviewData->rcDialogCaption.top + 2; + pPreviewData->rcDialogCaptionButtons.right = pPreviewData->rcDialogCaption.right - 2; + pPreviewData->rcDialogCaptionButtons.bottom = pPreviewData->rcDialogCaption.bottom - 2;
/* Calculate the dialog client rectangle */ pPreviewData->rcDialogClient.left = pPreviewData->rcDialogFrame.left + 3; @@ -348,6 +375,61 @@
static VOID +OnLButtonDown(HWND hwnd, int xPos, int yPos, PPREVIEW_DATA pPreviewData) +{ + UINT type = IDX_DESKTOP; + POINT pt; + + pt.x = xPos; + pt.y = yPos; + + if (PtInRect(&pPreviewData->rcInactiveFrame, pt)) + type = IDX_INACTIVE_BORDER; + + if (PtInRect(&pPreviewData->rcInactiveCaption, pt)) + type = IDX_INACTIVE_CAPTION; + + if (PtInRect(&pPreviewData->rcInactiveCaptionButtons, pt)) + type = IDX_CAPTION_BUTTON; + + if (PtInRect(&pPreviewData->rcActiveFrame, pt)) + type = IDX_ACTIVE_BORDER; + + if (PtInRect(&pPreviewData->rcActiveCaption, pt)) + type = IDX_ACTIVE_CAPTION; + + if (PtInRect(&pPreviewData->rcActiveCaptionButtons, pt)) + type = IDX_CAPTION_BUTTON; + + if (PtInRect(&pPreviewData->rcActiveMenuBar, pt)) + type = IDX_MENU; + +// if (PtInRect(&pPreviewData->rcSelectedMenuItem, pt)) +// type = IDX_SELECTION; + + if (PtInRect(&pPreviewData->rcActiveClient, pt)) + type = IDX_WINDOW; + + if (PtInRect(&pPreviewData->rcActiveScroll, pt)) + type = IDX_SCROLLBAR; + + if (PtInRect(&pPreviewData->rcDialogFrame, pt)) + type = IDX_DIALOG; + + if (PtInRect(&pPreviewData->rcDialogCaption, pt)) + type = IDX_ACTIVE_CAPTION; + + if (PtInRect(&pPreviewData->rcDialogCaptionButtons, pt)) + type = IDX_CAPTION_BUTTON; + + if (PtInRect(&pPreviewData->rcDialogButton, pt)) + type = IDX_3D_OBJECTS; + + SendMessage(GetParent(hwnd), WM_USER, 0, type); +} + + +static VOID OnDestroy(PPREVIEW_DATA pPreviewData) { DeleteObject(pPreviewData->hbrScrollbar); @@ -400,6 +482,10 @@ OnPaint(hwnd, pPreviewData); break;
+ case WM_LBUTTONDOWN: + OnLButtonDown(hwnd, LOWORD(lParam), HIWORD(lParam), pPreviewData); + break; + case WM_DESTROY: OnDestroy(pPreviewData); HeapFree(GetProcessHeap(), 0, pPreviewData);
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.h (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.h Tue Jan 16 20:46:06 2007 @@ -1,3 +1,20 @@ + +#define IDX_3D_OBJECTS 0 +#define IDX_SCROLLBAR 1 +#define IDX_DESKTOP 2 +#define IDX_DIALOG 3 +#define IDX_WINDOW 4 +#define IDX_APPSPACE 5 +#define IDX_SELECTION 6 +#define IDX_MENU 7 + +#define IDX_QUICKINFO 9 +#define IDX_INACTIVE_BORDER 10 +#define IDX_ACTIVE_BORDER 11 + +#define IDX_INACTIVE_CAPTION 15 +#define IDX_ACTIVE_CAPTION 16 +#define IDX_CAPTION_BUTTON 17
BOOL RegisterPreviewControl(IN HINSTANCE hInstance);
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/resource.h (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/resource.h Tue Jan 16 20:46:06 2007 @@ -84,7 +84,8 @@
/* Appearance Page */ -#define IDC_APPEARANCE_PREVIEW 1500 +#define IDC_APPEARANCE_PREVIEW 1500 +#define IDC_APPEARANCE_UI_ITEM 1501
#define IDS_INACTWIN 1510 #define IDS_ACTWIN 1511 @@ -93,6 +94,29 @@ #define IDS_MESSTEXT 1514 #define IDS_BUTTEXT 1515
+#define IDS_ITEM_3D_OBJECTS 1601 +#define IDS_ITEM_SCROLLBAR 1602 +#define IDS_ITEM_DESKTOP 1603 +#define IDS_ITEM_MESSAGE_BOX 1604 +#define IDS_ITEM_WINDOW 1605 +#define IDS_ITEM_APP_BACKGROUND 1606 +#define IDS_ITEM_SELECTED_ITEMS 1607 +#define IDS_ITEM_MENU 1608 +#define IDS_ITEM_PALETTE_TITLE 1609 +#define IDS_ITEM_TOOLTIP 1610 +#define IDS_ITEM_INACTIVE_WINDOW 1611 +#define IDS_ITEM_ACTIVE_WINDOW 1612 +#define IDS_ITEM_ICON 1613 +#define IDS_ITEM_ICON_SPACE_HORZ 1614 +#define IDS_ITEM_ICON_SPACE_VERT 1615 +#define IDS_ITEM_INACTIVE_TITLE 1616 +#define IDS_ITEM_ACTIVE_TITLE 1617 +#define IDS_ITEM_CAPTION_BUTTONS 1618 + +/* Update these IDs when you change the string id list */ +#define IDS_ITEM_FIRST (IDS_ITEM_3D_OBJECTS) +#define IDS_ITEM_LAST (IDS_ITEM_CAPTION_BUTTONS + 1) +
#endif /* __CPL_DESK_RESOURCE_H__ */
Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/sv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cpl... ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/sv.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/sv.rc Tue Jan 16 20:46:06 2007 @@ -60,8 +60,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Det här utrymmet har avsiktligt\nlämnats tomt",IDC_STATIC,66, - 150,112,20 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END
IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -134,3 +134,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END
-
fireball＠svn.reactos.org