22 Apr
2006
22 Apr
'06
11:55 a.m.
Author: tretiakov
Date: Sat Apr 22 15:55:09 2006
New Revision: 21701
URL: http://svn.reactos.ru/svn/reactos?rev=21701&view=rev
Log:
Andrey Korotaev (unC0Rr(a)inbox.ru):
Ru.rc: Reflect latest changes. Improved elements layout.
settings.c: Sort by width, not only height.
Modified:
trunk/reactos/dll/cpl/desk/Ru.rc
trunk/reactos/dll/cpl/desk/settings.c
Modified: trunk/reactos/dll/cpl/desk/Ru.rc
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/Ru.rc?rev=2170…
==============================================================================
--- trunk/reactos/dll/cpl/desk/Ru.rc (original)
+++ trunk/reactos/dll/cpl/desk/Ru.rc Sat Apr 22 15:55:09 2006
@@ -5,17 +5,17 @@
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 @@
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 @@
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
Modified: trunk/reactos/dll/cpl/desk/settings.c
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?rev…
==============================================================================
--- trunk/reactos/dll/cpl/desk/settings.c (original)
+++ trunk/reactos/dll/cpl/desk/settings.c Sat Apr 22 15:55:09 2006
@@ -122,7 +122,10 @@
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;