ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-30 19:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

-redesigned the screensaver dialog

Browse Source 
-removed add and delete buttons (these function should be placed in a context menu instead)

other rc files than english and german have to be updated accordingly

svn path=/trunk/; revision=21749
This commit is contained in:
Christoph von Wittich
2006-04-28 05:46:44 +00:00
parent f7fc8841b0
commit cdac01f6e6
3 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/cpl/desk/de.rc
+14 -16
View File
@@ -8,10 +8,10 @@ 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 "Wählen SIe ein Bild aus welches Sie als Desktop Hintergrund verwenden wollen:", IDC_STATIC, 8, 103, 180, 9
PUSHBUTTON "&Durchsuchen...", IDC_BROWSE_BUTTON, 188, 114, 50, 15
PUSHBUTTON "&Farbe...", IDC_COLOR_BUTTON, 188, 177, 50, 15
LTEXT "&Ausrichtung:", IDC_STATIC, 188, 138, 36, 9
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
END
@@ -22,30 +22,28 @@ FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "&Bildschrimschoner",IDC_SCREENS_DUMMY, 5, 7, 238, 136
LTEXT "Liste der Bildschrimschoner:",IDC_STATIC,13, 24, 71, 9
LTEXT "Installierte Bildschrimschoner:",IDC_STATIC,13, 24, 150, 9
CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS |
WS_BORDER | WS_TABSTOP,13, 34, 171, 69
PUSHBUTTON "&Löschen",IDC_SCREENS_DELETE, 190,47,39,10
PUSHBUTTON "&Hinzufügen",IDC_SCREENS_ADD_BUTTON, 190,34,39,10
WS_BORDER | WS_TABSTOP,13, 34, 170, 69
PUSHBUTTON "&Einstellungen...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP
PUSHBUTTON "&Vorschau",IDC_SCREENS_TESTSC,192, 124, 43, 12
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",
BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18
LTEXT "&Warte:",IDC_STATIC,13, 110, 17, 9
EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP
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
GROUPBOX "&Energiesparfunktion des Bildschirms",IDC_SCREENS_DUMMY2,5, 146, 238, 35
LTEXT "Um die Energiesparfunktion des Bildschrims einzustellen, klicken Sie auf Energiesparfunktion.",
IDC_STATIC,16, 159, 155, 19
PUSHBUTTON "Energ&iesparfunk.",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12
GROUPBOX "&Energiesparfunktion des Bildschirms",IDC_SCREENS_DUMMY2,5, 146, 238, 50
LTEXT "Hier können Sie Energiesparfunktionen Ihres Computers konfigurieren.",
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, 188
reactos/dll/cpl/desk/en.rc
+12 -14
View File
@@ -17,35 +17,33 @@ END
IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188
STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Screen Saver"
CAPTION "Screensaver"
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "&Screen Saver",IDC_SCREENS_DUMMY, 5, 7, 238, 136
GROUPBOX "&Screensaver",IDC_SCREENS_DUMMY, 5, 7, 238, 136
LTEXT "List of Screensavers:",IDC_STATIC,13, 24, 71, 9
LTEXT "Installed screensavers:",IDC_STATIC,13, 24, 150, 9
CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS |
WS_BORDER | WS_TABSTOP,13, 34, 171, 69
PUSHBUTTON "&Delete",IDC_SCREENS_DELETE, 190,47,39,10
PUSHBUTTON "&Add",IDC_SCREENS_ADD_BUTTON, 190,34,39,10
WS_BORDER | WS_TABSTOP,13, 34, 170, 69
PUSHBUTTON "Se&ttings...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP
PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC,192, 124, 43, 12
PUSHBUTTON "Se&ttings",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP
PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC,188, 52, 50, 15
CONTROL "On Resume, &Password Protect.",IDC_SCREENS_USEPASSCHK,"button",
CONTROL "Ask for &password on resume.",IDC_SCREENS_USEPASSCHK,"button",
BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18
LTEXT "&Wait:",IDC_STATIC,13, 110, 17, 9
LTEXT "&Wait",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 "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, 35
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, 155, 19
PUSHBUTTON "P&ower Settings",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12
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, 188
reactos/dll/cpl/desk/screensaver.c
+2 -2
View File
@@ -93,14 +93,14 @@ ScreenSaverPageProc(HWND hwndDlg,
}
} break;
case IDC_SCREENS_DELETE: // Delete Screensaver
/* case IDC_SCREENS_DELETE: // Delete Screensaver
{
if(command == BN_CLICKED) {
if (ImageListSelection == 0) // Can NOT delete None sry:-)
return FALSE;
DeleteFileW(g_ScreenSaverItems[ImageListSelection].szFilename);
}
} break;
} break; */
case IDC_SCREENS_SETTINGS: // Screensaver Settings
{
if(command == BN_CLICKED)