Skip to content

Commit 3aa5e8b

Browse files
binarymasterbinarymaster
committed
[DESK] Show monitor on "Settings" page when only one monitor detected
Hide multiple monitor selection controls in this case. Otherwise, show them when multiple monitors are detected and hide the monitor preview bitmap. This fixes the focus on the resolution slider when tested in Windows XP. Also use the monitor bitmap globally, because it's used on multiple pages. CORE-17939 CORE-10606
1 parent 311fcc6 commit 3aa5e8b

34 files changed

+152
-66
lines changed

‎dll/cpl/desk/background.c

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,6 @@ typedef enum
3737
PLACEMENT_VALUE_FILL = 10
3838
} PLACEMENT_VALUE;
3939

40-
/* The values in these macros are dependent on the
41-
* layout of the monitor image and they must be adjusted
42-
* if that image will be changed.
43-
*/
44-
#define MONITOR_LEFT 20
45-
#define MONITOR_TOP 8
46-
#define MONITOR_RIGHT 140
47-
#define MONITOR_BOTTOM 92
48-
49-
#define MONITOR_WIDTH (MONITOR_RIGHT-MONITOR_LEFT)
50-
#define MONITOR_HEIGHT (MONITOR_BOTTOM-MONITOR_TOP)
51-
5240
typedef struct
5341
{
5442
BOOL bWallpaper; /* Is this background a wallpaper */
@@ -74,10 +62,6 @@ typedef struct _BACKGROUND_DATA
7462

7563
int listViewItemCount;
7664

77-
HBITMAP hBitmap;
78-
int cxSource;
79-
int cySource;
80-
8165
ULONG_PTR gdipToken;
8266
} BACKGROUND_DATA, *PBACKGROUND_DATA;
8367

@@ -468,7 +452,6 @@ InitBackgroundDialog(HWND hwndDlg, PBACKGROUND_DATA pData)
468452
HKEY regKey;
469453
TCHAR szBuffer[3];
470454
DWORD bufferSize = sizeof(szBuffer);
471-
BITMAP bitmap;
472455

473456
AddListViewItems(hwndDlg, pData);
474457

@@ -490,15 +473,6 @@ InitBackgroundDialog(HWND hwndDlg, PBACKGROUND_DATA pData)
490473
SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_CENTER, 0);
491474
pData->placementSelection = PLACEMENT_CENTER;
492475

493-
pData->hBitmap = (HBITMAP) LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
494-
if (pData->hBitmap != NULL)
495-
{
496-
GetObject(pData->hBitmap, sizeof(BITMAP), &bitmap);
497-
498-
pData->cxSource = bitmap.bmWidth;
499-
pData->cySource = bitmap.bmHeight;
500-
}
501-
502476
/* Load the default settings from the registry */
503477
if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_QUERY_VALUE, &regKey) != ERROR_SUCCESS)
504478
{
@@ -822,7 +796,7 @@ DrawBackgroundPreview(LPDRAWITEMSTRUCT draw, PBACKGROUND_DATA pData)
822796
};
823797

824798
hDC = CreateCompatibleDC(draw->hDC);
825-
hOldObj = SelectObject(hDC, pData->hBitmap);
799+
hOldObj = SelectObject(hDC, g_GlobalData.hMonitorBitmap);
826800

827801
if (pData->backgroundItems[pData->backgroundSelection].bWallpaper == FALSE)
828802
{
@@ -997,12 +971,12 @@ DrawBackgroundPreview(LPDRAWITEMSTRUCT draw, PBACKGROUND_DATA pData)
997971

998972
GdiTransparentBlt(draw->hDC,
999973
draw->rcItem.left, draw->rcItem.top,
1000-
draw->rcItem.right-draw->rcItem.left+1,
1001-
draw->rcItem.bottom-draw->rcItem.top+1,
974+
draw->rcItem.right - draw->rcItem.left + 1,
975+
draw->rcItem.bottom - draw->rcItem.top + 1,
1002976
hDC,
1003977
0, 0,
1004-
pData->cxSource, pData->cySource,
1005-
0xFF00FF);
978+
g_GlobalData.bmMonWidth, g_GlobalData.bmMonHeight,
979+
MONITOR_ALPHA);
1006980

1007981
SelectObject(hDC, hOldObj);
1008982
DeleteDC(hDC);
@@ -1265,7 +1239,6 @@ BackgroundPageProc(HWND hwndDlg,
12651239
if (pData->pWallpaperBitmap != NULL)
12661240
DibFreeImage(pData->pWallpaperBitmap);
12671241

1268-
DeleteObject(pData->hBitmap);
12691242
GdiplusShutdown(pData->gdipToken);
12701243
HeapFree(GetProcessHeap(), 0, pData);
12711244
break;

‎dll/cpl/desk/desk.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
150150
LPCWSTR pwszFile = NULL;
151151
LPCWSTR pwszAction = NULL;
152152
INT nPage = 0;
153+
BITMAP bitmap;
153154

154155
UNREFERENCED_PARAMETER(wParam);
155156

@@ -197,6 +198,16 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
197198
g_GlobalData.pwszAction = pwszAction;
198199
g_GlobalData.desktop_color = GetSysColor(COLOR_DESKTOP);
199200

201+
/* Initialize the monitor preview bitmap, used on multiple pages */
202+
g_GlobalData.hMonitorBitmap = LoadBitmapW(hApplet, MAKEINTRESOURCEW(IDC_MONITOR));
203+
if (g_GlobalData.hMonitorBitmap != NULL)
204+
{
205+
GetObjectW(g_GlobalData.hMonitorBitmap, sizeof(bitmap), &bitmap);
206+
207+
g_GlobalData.bmMonWidth = bitmap.bmWidth;
208+
g_GlobalData.bmMonHeight = bitmap.bmHeight;
209+
}
210+
200211
ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
201212
psh.dwSize = sizeof(PROPSHEETHEADER);
202213
psh.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE | PSH_USEICONID;
@@ -238,6 +249,8 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
238249
PropertySheet(&psh);
239250

240251
cleanup:
252+
DeleteObject(g_GlobalData.hMonitorBitmap);
253+
241254
if (hpsxa != NULL)
242255
SHDestroyPropSheetExtArray(hpsxa);
243256

‎dll/cpl/desk/desk.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,21 @@ INT AllocAndLoadString(LPTSTR *lpTarget,
6363

6464
ULONG __cdecl DbgPrint(PCCH Format,...);
6565

66+
/*
67+
* The values in these macros are dependent on the
68+
* layout of the monitor image and they must be adjusted
69+
* if that image is changed.
70+
*/
71+
#define MONITOR_LEFT 20
72+
#define MONITOR_TOP 8
73+
#define MONITOR_RIGHT 140
74+
#define MONITOR_BOTTOM 92
75+
76+
#define MONITOR_WIDTH (MONITOR_RIGHT-MONITOR_LEFT)
77+
#define MONITOR_HEIGHT (MONITOR_BOTTOM-MONITOR_TOP)
78+
79+
#define MONITOR_ALPHA 0xFF00FF
80+
6681
#define MAX_DESK_PAGES 32
6782
#define NUM_SPECTRUM_BITMAPS 3
6883

@@ -106,6 +121,9 @@ typedef struct _GLOBAL_DATA
106121
COLORREF desktop_color;
107122
LPCWSTR pwszFile;
108123
LPCWSTR pwszAction;
124+
HBITMAP hMonitorBitmap;
125+
LONG bmMonWidth;
126+
LONG bmMonHeight;
109127
} GLOBAL_DATA, *PGLOBAL_DATA;
110128

111129
extern GLOBAL_DATA g_GlobalData;

‎dll/cpl/desk/lang/bg-BG.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
134134
CAPTION "Настройки"
135135
FONT 8, "MS Shell Dlg"
136136
BEGIN
137-
LTEXT "Завлачете значетата на мониторите така, че да отговарят на действителното разположение на мониторите ви.", -1, 3, 3, 240, 20
137+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
138+
LTEXT "Завлачете значетата на мониторите така, че да отговарят на действителното разположение на мониторите ви.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
138139
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
139140
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
140141
LTEXT "&Екран:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/cs-CZ.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
140140
CAPTION "Nastavení"
141141
FONT 8, "MS Shell Dlg"
142142
BEGIN
143-
LTEXT "Tažením nastavte ikony monitorů, aby odpovídaly fyzickému uspořádání vašich monitorů.", -1, 3, 3, 240, 20
143+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
144+
LTEXT "Tažením nastavte ikony monitorů, aby odpovídaly fyzickému uspořádání vašich monitorů.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
144145
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
145146
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
146147
LTEXT "&Obrazovka:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/de-DE.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
134134
CAPTION "Einstellungen"
135135
FONT 8, "MS Shell Dlg"
136136
BEGIN
137-
LTEXT "Verschieben Sie die Monitor-Symbole, sodass sie der physischen Anordnung Ihrer Monitore entsprechen.", -1, 3, 3, 240, 20
137+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
138+
LTEXT "Verschieben Sie die Monitor-Symbole, sodass sie der physischen Anordnung Ihrer Monitore entsprechen.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
138139
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
139140
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
140141
LTEXT "&Anzeige:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/el-GR.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
134134
CAPTION "Ρυθμίσεις"
135135
FONT 8, "MS Shell Dlg"
136136
BEGIN
137-
LTEXT "Σύρετε τα εικονίδια της οθόνης, ώστε να ταιριάξουν με τη φυσική διάταξη των οθονών σας.", -1, 3, 3, 240, 20
137+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
138+
LTEXT "Σύρετε τα εικονίδια της οθόνης, ώστε να ταιριάξουν με τη φυσική διάταξη των οθονών σας.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
138139
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
139140
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
140141
LTEXT "&Εμφάνιση:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/en-GB.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
134134
CAPTION "Settings"
135135
FONT 8, "MS Shell Dlg"
136136
BEGIN
137-
LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", -1, 3, 3, 240, 20
137+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
138+
LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
138139
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
139140
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
140141
LTEXT "&Display:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/en-US.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
134134
CAPTION "Settings"
135135
FONT 8, "MS Shell Dlg"
136136
BEGIN
137-
LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", -1, 3, 3, 240, 20
137+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
138+
LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
138139
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
139140
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
140141
LTEXT "&Display:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/es-ES.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
144144
CAPTION "Configuración"
145145
FONT 8, "MS Shell Dlg"
146146
BEGIN
147-
LTEXT "Arrastre los iconos para ajustar el orden físico de sus monitores.", -1, 3, 3, 240, 20
147+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
148+
LTEXT "Arrastre los iconos para ajustar el orden físico de sus monitores.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
148149
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
149150
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
150151
LTEXT "Mostrar:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/et-EE.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
141141
CAPTION "Sätted"
142142
FONT 8, "MS Shell Dlg"
143143
BEGIN
144-
LTEXT "Lohista monitori ikoone kuni see kattub teie füüsilise monitoride järjekorraga.", -1, 3, 3, 240, 20
144+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
145+
LTEXT "Lohista monitori ikoone kuni see kattub teie füüsilise monitoride järjekorraga.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
145146
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
146147
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
147148
LTEXT "&Kuva:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/fr-FR.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
136136
CAPTION "Paramètres"
137137
FONT 8, "MS Shell Dlg"
138138
BEGIN
139-
LTEXT "Déplacez les icônes de moniteur pour qu'elles correspondent à l'arrangement physique de vos moniteurs.", -1, 3, 3, 240, 20
139+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
140+
LTEXT "Déplacez les icônes de moniteur pour qu'elles correspondent à l'arrangement physique de vos moniteurs.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
140141
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
141142
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
142143
LTEXT "&Affichage :", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/he-IL.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
134134
CAPTION "הגדרות"
135135
FONT 8, "MS Shell Dlg"
136136
BEGIN
137-
LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", -1, 3, 3, 240, 20
137+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
138+
LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
138139
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
139140
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
140141
LTEXT "תצוגה:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/hu-HU.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
136136
CAPTION "Beállítások"
137137
FONT 8, "MS Shell Dlg"
138138
BEGIN
139-
LTEXT "Mozgassa a monitor ikonokat úgy, hogy megegyezzen a monitorjai fizikai elrendezésével.", -1, 3, 3, 240, 20
139+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
140+
LTEXT "Mozgassa a monitor ikonokat úgy, hogy megegyezzen a monitorjai fizikai elrendezésével.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
140141
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
141142
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
142143
LTEXT "&Képernyő:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/id-ID.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
134134
CAPTION "Setelan"
135135
FONT 8, "MS Shell Dlg"
136136
BEGIN
137-
LTEXT "Geser ikon monitor untuk mencocokkan penyesuaian fisik monitor.", -1, 3, 3, 240, 20
137+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
138+
LTEXT "Geser ikon monitor untuk mencocokkan penyesuaian fisik monitor.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
138139
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
139140
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
140141
LTEXT "&Tampilan:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/it-IT.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
134134
CAPTION "Impostazioni"
135135
FONT 8, "MS Shell Dlg"
136136
BEGIN
137-
LTEXT "Trascinare le icone dei monitor in modo corrispondente alla disposizione fisica dei vostri monitor.", -1, 3, 3, 240, 20
137+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
138+
LTEXT "Trascinare le icone dei monitor in modo corrispondente alla disposizione fisica dei vostri monitor.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
138139
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
139140
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
140141
LTEXT "&Schermo:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/ja-JP.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
134134
CAPTION "設定"
135135
FONT 9, "MS UI Gothic"
136136
BEGIN
137-
LTEXT "モニタのアイコンを実際のモニタの配列と一致するように移動してください。", -1, 3, 3, 240, 20
137+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
138+
LTEXT "モニタのアイコンを実際のモニタの配列と一致するように移動してください。", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
138139
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
139140
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
140141
LTEXT "ディスプレイ(&D):", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/nl-NL.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
134134
CAPTION "Instellingen"
135135
FONT 8, "MS Shell Dlg"
136136
BEGIN
137-
LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", -1, 3, 3, 240, 20
137+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
138+
LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
138139
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
139140
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
140141
LTEXT "&Scherm:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/no-NO.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
134134
CAPTION "Innstillinger"
135135
FONT 8, "MS Shell Dlg"
136136
BEGIN
137-
LTEXT "Dra skjermikonene for å tilpasse fysisk til din skjerm.", -1, 3, 3, 240, 20
137+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
138+
LTEXT "Dra skjermikonene for å tilpasse fysisk til din skjerm.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
138139
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
139140
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
140141
LTEXT "&Skjerm:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/pl-PL.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
144144
CAPTION "Ustawienia"
145145
FONT 8, "MS Shell Dlg"
146146
BEGIN
147-
LTEXT "Przeciągnij ikony monitorów tak, by przedstawiały fizyczne rozmieszczenie twoich monitorów.", -1, 3, 3, 240, 20
147+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
148+
LTEXT "Przeciągnij ikony monitorów tak, by przedstawiały fizyczne rozmieszczenie twoich monitorów.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
148149
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
149150
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
150151
LTEXT "&Ekran:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/pt-BR.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
134134
CAPTION "Configurações"
135135
FONT 8, "MS Shell Dlg"
136136
BEGIN
137-
LTEXT "Arraste os ícones de monitor para que corresponda à disposição física de seus monitores.", -1, 3, 3, 240, 20
137+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
138+
LTEXT "Arraste os ícones de monitor para que corresponda à disposição física de seus monitores.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
138139
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
139140
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
140141
LTEXT "Vídeo:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/pt-PT.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
139139
CAPTION "Definições"
140140
FONT 8, "MS Shell Dlg"
141141
BEGIN
142-
LTEXT "Arraste os ícones dos monitores, para que correspondam à disposição física dos seus monitores.", -1, 3, 3, 240, 20
142+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
143+
LTEXT "Arraste os ícones dos monitores, para que correspondam à disposição física dos seus monitores.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
143144
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
144145
WS_TABSTOP, 3, 23, 250, 82, WS_EX_CLIENTEDGE
145146
LTEXT "Monitor:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/ro-RO.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
139139
CAPTION "Configurare"
140140
FONT 8, "MS Shell Dlg"
141141
BEGIN
142-
LTEXT "Mișcați miniaturile ecranelor până vor corespunde cu amplasamentul fizic al ecranelor (opțiune pentru ecrane multiple).", -1, 3, 3, 240, 20
142+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
143+
LTEXT "Mișcați miniaturile ecranelor până vor corespunde cu amplasamentul fizic al ecranelor (opțiune pentru ecrane multiple).", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
143144
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
144145
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
145146
LTEXT "&Dispozitive de afișare:", 1820, 3, 107, 75, 9

‎dll/cpl/desk/lang/ru-RU.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
134134
CAPTION "Параметры"
135135
FONT 8, "MS Shell Dlg"
136136
BEGIN
137-
LTEXT "Разместите значки мониторов в соответствии с их расположением.", -1, 3, 3, 240, 20
137+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
138+
LTEXT "Разместите значки мониторов в соответствии с их расположением.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
138139
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
139140
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
140141
LTEXT "&Дисплей:", 1820, 3, 107, 70, 9

‎dll/cpl/desk/lang/sk-SK.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
136136
CAPTION "Nastavenie"
137137
FONT 8, "MS Shell Dlg"
138138
BEGIN
139-
LTEXT "Ťahaním zoraďte ikony podľa fyzického rozmiestnenia monitorov.", -1, 3, 3, 240, 20
139+
CONTROL "", IDC_RESOLUTION_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0
140+
LTEXT "Ťahaním zoraďte ikony podľa fyzického rozmiestnenia monitorov.", IDC_SETTINGS_MONTEXT, 3, 3, 240, 20
140141
CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE |
141142
WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE
142143
LTEXT "&Monitor:", 1820, 3, 107, 70, 9

0 commit comments

Comments
 (0)