Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-08 21:55:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Draw color quality indicator in Display Properties -> Settings

Browse source 
- patch by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us

See issue #2762 for more details.

svn path=/trunk/; revision=29883
This commit is contained in:
Johannes Anderwald 2007-10-25 19:40:27 +00:00
parent ff318ae339
commit 73960e0ad5
21 changed files with 58 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/cpl/desk/desk.rc
View file

@ -15,5 +15,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDC_DESK_ICON ICON "resources/applet.ico"
IDC_DESK_ICON2 ICON "resources/applet.ico"
IDC_MONITOR BITMAP "resources/monitor.bmp"
IDB_SPECTRUM BITMAP "resources/spectrum.bmp"
#include "rsrc.rc"

3
reactos/dll/cpl/desk/lang/bg-BG.rc
View file

@ -116,8 +116,7 @@ BEGIN
GROUPBOX "&Öâåòîâå",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "Ðàç&øèðåíè...",IDC_SETTINGS_ADVANCED,306,165,56,14
END

3
reactos/dll/cpl/desk/lang/cs-CZ.rc
View file

@ -113,8 +113,7 @@ BEGIN
GROUPBOX "&Poèet barev",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "R&ozšíøené nastavení...",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/lang/de-DE.rc
View file

@ -112,8 +112,7 @@ BEGIN
GROUPBOX "&Farbqualität",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/lang/el-GR.rc
View file

@ -112,8 +112,7 @@ BEGIN
GROUPBOX "&×ñþìáôá",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "Ãéá &ðñï÷ùñçìÝíïõò...",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/lang/en-US.rc
View file

@ -114,8 +114,7 @@ BEGIN
GROUPBOX "&Colors",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/lang/es-ES.rc
View file

@ -119,8 +119,7 @@ BEGIN
GROUPBOX "&Calidad de color",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/lang/fr-FR.rc
View file

@ -115,8 +115,7 @@ BEGIN
GROUPBOX "&Couleurs",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "A&vancé...",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/lang/hu-HU.rc
View file

@ -113,8 +113,7 @@ BEGIN
GROUPBOX "&Színek",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "&Haladóknak...",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/lang/id-ID.rc
View file

@ -112,8 +112,7 @@ BEGIN
GROUPBOX "&Warna",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "&Lanjutan...",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/lang/it-IT.rc
View file

@ -112,8 +112,7 @@ BEGIN
GROUPBOX "&Colori",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "A&vanzate...",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/lang/ja-JP.rc
View file

@ -112,8 +112,7 @@ BEGIN
GROUPBOX "<22>F(&C)",1817,125,160,115,43
COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL |
WS_VSCROLL | WS_TABSTOP
CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN,
131,188,103,9
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "<22>Ú<EFBFBD>×<EFBFBD>Ý’è(&V)...",IDC_SETTINGS_ADVANCED,170,205,70,14
END

3
reactos/dll/cpl/desk/lang/nl-NL.rc
View file

@ -114,8 +114,7 @@ BEGIN
GROUPBOX "&Kleuren",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "&Geavanceerd...",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/lang/pl-PL.rc
View file

@ -118,8 +118,7 @@ BEGIN
GROUPBOX "&Jakoœæ kolorów",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/lang/ru-RU.rc
View file

@ -112,8 +112,7 @@ BEGIN
GROUPBOX "&Качество цветопередачи",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "До&полнительно",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/lang/sk-SK.rc
View file

@ -121,8 +121,7 @@ BEGIN
GROUPBOX "&Farby",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "&Spresni<6E>...",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/lang/sv-SE.rc
View file

@ -115,8 +115,7 @@ BEGIN
GROUPBOX "&Färger",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,138,103,9
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "&Avancerat...",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/lang/uk-UA.rc
View file

@ -120,8 +120,7 @@ BEGIN
GROUPBOX "&ßê³ñòü êîëüîðîïåðåäà÷³",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
CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9
PUSHBUTTON "Äîä&àòêîâî...",IDC_SETTINGS_ADVANCED,170,165,70,14
END

3
reactos/dll/cpl/desk/resource.h
View file

@ -65,6 +65,8 @@
#define IDC_SETTINGS_RESOLUTION_TEXT 204
#define IDC_SETTINGS_ADVANCED 205
#define IDC_SETTINGS_MONSEL 206
#define IDC_SETTINGS_SPECTRUM 207
#define IDB_SPECTRUM 208
#define IDR_PREVIEW_MENU 2100
#define ID_MENU_NORMAL 2101
@ -159,3 +161,4 @@
#endif /* __CPL_DESK_RESOURCE_H__ */

BIN
reactos/dll/cpl/desk/resources/spectrum.bmp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.4 KiB

37
reactos/dll/cpl/desk/settings.c
View file

@ -17,6 +17,9 @@ typedef struct _GLOBAL_DATA
PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice;
} GLOBAL_DATA, *PGLOBAL_DATA;
static HBITMAP hBitmap = NULL;
static int cxSource, cySource;
static VOID
UpdateDisplay(IN HWND hwndDlg, PGLOBAL_DATA pGlobalData, IN BOOL bUpdateThumb)
{
@ -558,11 +561,43 @@ SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lPar
pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
BITMAP bitmap;
switch(uMsg)
{
case WM_INITDIALOG:
{
OnInitDialog(hwndDlg);
hBitmap = LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_SPECTRUM), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
if (hBitmap != NULL)
{
GetObjectW(hBitmap, sizeof(BITMAP), &bitmap);
cxSource = bitmap.bmWidth;
cySource = bitmap.bmHeight;
}
break;
}
case WM_DRAWITEM:
{
LPDRAWITEMSTRUCT lpDrawItem;
lpDrawItem = (LPDRAWITEMSTRUCT) lParam;
if(lpDrawItem->CtlID == IDC_SETTINGS_SPECTRUM)
{
HDC hdcMem;
hdcMem = CreateCompatibleDC(lpDrawItem->hDC);
if (hdcMem != NULL)
{
SelectObject(hdcMem, hBitmap);
StretchBlt(lpDrawItem->hDC, lpDrawItem->rcItem.left, lpDrawItem->rcItem.top,
lpDrawItem->rcItem.right - lpDrawItem->rcItem.left,
lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top,
hdcMem, 0, 0, cxSource, cySource, SRCCOPY);
DeleteDC(hdcMem);
}
}
}
case WM_COMMAND:
{
DWORD controlId = LOWORD(wParam);
@ -762,6 +797,8 @@ SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lPar
}
HeapFree(GetProcessHeap(), 0, pGlobalData);
DeleteObject(hBitmap);
}
}
return FALSE;