From 12b2c06aeee26b552d40b7fe56a385a4eeca1d2c Mon Sep 17 00:00:00 2001 From: Saveliy Tretiakov Date: Sat, 22 Apr 2006 11:55:09 +0000 Subject: [PATCH] Andrey Korotaev (unC0Rr@inbox.ru): Ru.rc: Reflect latest changes. Improved elements layout. settings.c: Sort by width, not only height. svn path=/trunk/; revision=21701 --- reactos/dll/cpl/desk/Ru.rc | 54 ++++++++++++++++----------------- reactos/dll/cpl/desk/settings.c | 5 ++- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/reactos/dll/cpl/desk/Ru.rc b/reactos/dll/cpl/desk/Ru.rc index 7c116449336..848b5b0e4f5 100644 --- a/reactos/dll/cpl/desk/Ru.rc +++ b/reactos/dll/cpl/desk/Ru.rc @@ -5,17 +5,17 @@ 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, 80, 10, + 83, 57, 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, 8, 114, 174, 68 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 | + IDC_STATIC, 8, 103, 180, 9 + PUSHBUTTON "&Обзор...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 + PUSHBUTTON "&Цвет...", IDC_COLOR_BUTTON, 188, 167, 50, 15 + LTEXT "Расположение:", IDC_STATIC, 188, 138, 50, 9 + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -24,32 +24,32 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Заставка" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Заставка",IDC_SCREENS_DUMMY, 5, 7, 238, 136 + GROUPBOX "&Заставка",IDC_SCREENS_DUMMY, 5, 7, 238, 137 LTEXT "Список заставок:",IDC_STATIC,13, 24, 71, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&Удалить",IDC_SCREENS_DELETE, 190,47,39,10 - PUSHBUTTON "&Добавить",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 + PUSHBUTTON "&Удалить",IDC_SCREENS_DELETE, 190, 52, 39, 15 + PUSHBUTTON "&Добавить",IDC_SCREENS_ADD_BUTTON, 190, 34, 39, 15 - PUSHBUTTON "&Настройка...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP - PUSHBUTTON "Про&смотр",IDC_SCREENS_TESTSC,192, 124, 43, 12 + PUSHBUTTON "&Настройка...",IDC_SCREENS_SETTINGS,140, 124, 48, 15, WS_GROUP + PUSHBUTTON "Про&смотр",IDC_SCREENS_TESTSC,192, 124, 43, 15 CONTROL "&Защита паролем.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 + BS_AUTOCHECKBOX | WS_TABSTOP, 16, 121, 119, 18 - LTEXT "&Интервал:",IDC_STATIC,13, 110, 17, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP + LTEXT "&Интервал:",IDC_STATIC, 13, 110, 32, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 48, 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 "Минут до отображения заставки.",IDC_STATIC,70, 111, 147, 9 + WS_BORDER | WS_GROUP, 77, 109, 12, 12 + LTEXT "минут до отображения заставки.",IDC_STATIC, 80, 111, 147, 9 - GROUPBOX "&Энергосберегающие функции монитора",IDC_SCREENS_DUMMY2,5, 146, 238, 35 + GROUPBOX "&Энергосберегающие функции монитора",IDC_SCREENS_DUMMY2, 5, 144, 238, 42 LTEXT "Для изменения параметров питания монитора нажмите кнопку Параметры Питания.", - IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "Параметры &Питания",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 + IDC_STATIC, 16, 156, 155, 24 + PUSHBUTTON "Параметры &Питания",IDC_SCREENS_POWER_BUTTON, 160, 162, 77, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -68,14 +68,14 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Дисплей:",1820,3,100,30,8 LTEXT "<нет>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Область экрана",1818,3,120,115,43 + GROUPBOX "&Область экрана",1818,3,120,119,43 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 + 33,130,58,17 + LTEXT "Меньше",1815,7,130,27,8,NOT WS_GROUP + LTEXT "Больше",1816,91,130,27,8,NOT WS_GROUP 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 | + COMBOBOX IDC_SETTINGS_BPP,133,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 diff --git a/reactos/dll/cpl/desk/settings.c b/reactos/dll/cpl/desk/settings.c index 15847b2f7a1..7750af3f82a 100644 --- a/reactos/dll/cpl/desk/settings.c +++ b/reactos/dll/cpl/desk/settings.c @@ -122,7 +122,10 @@ GetPossibleSettings(IN LPTSTR DeviceName, OUT DWORD* pSettingsCount, OUT PSETTIN Current->dmBitsPerPel = devmode.dmBitsPerPel; while (Next != NULL && ( Next->dmPelsHeight < Current->dmPelsHeight || - (Next->dmPelsHeight == Current->dmPelsHeight && Next->dmBitsPerPel < Current->dmBitsPerPel))) + (Next->dmPelsHeight == Current->dmPelsHeight && Next->dmBitsPerPel < Current->dmBitsPerPel) || + (Next->dmPelsHeight == Current->dmPelsHeight && + Next->dmBitsPerPel == Current->dmBitsPerPel && + Next->dmPelsWidth < Current->dmPelsWidth))) { Previous = Next; Next = Next->Flink;