You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against de66ea9df6746917cada71d2c27b5cc38cbdd2f0.
This commit is contained in:
Alistair Leslie-Hughes
@@ -1,4 +1,4 @@
|
||||
From 311a382432c4dd6a6d2ded5e6c10c6fe83767646 Mon Sep 17 00:00:00 2001
|
||||
From b97b584a775bf22c19c94064a7321770764cf25e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
|
||||
Date: Thu, 5 Jan 2023 21:16:38 +0100
|
||||
Subject: [PATCH] winecfg: Move input config options to a dedicated tab.
|
||||
@@ -12,16 +12,16 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605
|
||||
programs/winecfg/main.c | 12 +++-
|
||||
programs/winecfg/resource.h | 6 +-
|
||||
programs/winecfg/winecfg.h | 4 ++
|
||||
programs/winecfg/winecfg.rc | 36 +++++++-----
|
||||
programs/winecfg/winecfg.rc | 38 ++++++++-----
|
||||
programs/winecfg/x11drvdlg.c | 18 +-----
|
||||
8 files changed, 150 insertions(+), 33 deletions(-)
|
||||
8 files changed, 151 insertions(+), 34 deletions(-)
|
||||
create mode 100644 programs/winecfg/input.c
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index 9d60385414f..a88bff34a92 100644
|
||||
index dc5c85cc4ec..a5902235be8 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -181,6 +181,7 @@ F: dlls/user32/input.c
|
||||
@@ -182,6 +182,7 @@ F: dlls/user32/input.c
|
||||
F: dlls/win32u/input.c
|
||||
F: dlls/win32u/rawinput.c
|
||||
F: server/queue.c
|
||||
@@ -30,17 +30,17 @@ index 9d60385414f..a88bff34a92 100644
|
||||
Input methods
|
||||
M: Rémi Bernon <rbernon@codeweavers.com>
|
||||
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
|
||||
index 80d2f1991dc..5c46b935234 100644
|
||||
index 99c829a9468..1105a99e177 100644
|
||||
--- a/programs/winecfg/Makefile.in
|
||||
+++ b/programs/winecfg/Makefile.in
|
||||
@@ -9,6 +9,7 @@ C_SRCS = \
|
||||
@@ -9,6 +9,7 @@ SOURCES = \
|
||||
audio.c \
|
||||
drive.c \
|
||||
driveui.c \
|
||||
+ input.c \
|
||||
libraries.c \
|
||||
logo.svg \
|
||||
main.c \
|
||||
staging.c \
|
||||
diff --git a/programs/winecfg/input.c b/programs/winecfg/input.c
|
||||
new file mode 100644
|
||||
index 00000000000..115161b9040
|
||||
@@ -153,10 +153,10 @@ index 00000000000..115161b9040
|
||||
+ return FALSE;
|
||||
+}
|
||||
diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c
|
||||
index e2429c0c047..2ce3020db50 100644
|
||||
index de5340c721f..819aaaf61e1 100644
|
||||
--- a/programs/winecfg/main.c
|
||||
+++ b/programs/winecfg/main.c
|
||||
@@ -58,7 +58,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
|
||||
@@ -57,7 +57,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -165,7 +165,7 @@ index e2429c0c047..2ce3020db50 100644
|
||||
|
||||
static INT_PTR
|
||||
doPropertySheet (HINSTANCE hInstance, HWND hOwner)
|
||||
@@ -149,6 +149,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
|
||||
@@ -148,6 +148,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
|
||||
psp[pg].lParam = 0;
|
||||
pg++;
|
||||
|
||||
@@ -183,7 +183,7 @@ index e2429c0c047..2ce3020db50 100644
|
||||
* Fill out the (General) PROPSHEETPAGE data structure
|
||||
* for the property sheet
|
||||
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
|
||||
index d77f6a23a5a..78deb1a23a2 100644
|
||||
index c0d7adadcc1..6e2953c0d70 100644
|
||||
--- a/programs/winecfg/resource.h
|
||||
+++ b/programs/winecfg/resource.h
|
||||
@@ -46,6 +46,7 @@
|
||||
@@ -210,7 +210,7 @@ index d77f6a23a5a..78deb1a23a2 100644
|
||||
|
||||
#define IDC_RES_TRACKBAR 1107
|
||||
#define IDC_RES_DPIEDIT 1108
|
||||
@@ -227,3 +228,6 @@
|
||||
@@ -230,3 +231,6 @@
|
||||
#define IDC_ABT_TITLE_TEXT 8436
|
||||
#define IDC_ABT_WEB_LINK 8437
|
||||
#define IDC_ABT_LICENSE_TEXT 8438
|
||||
@@ -240,7 +240,7 @@ index d4fedff5afb..b83234470c1 100644
|
||||
/* Windows version management */
|
||||
BOOL set_winver_from_string(const WCHAR *version);
|
||||
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
|
||||
index 9041a8fa2d1..605ec54632c 100644
|
||||
index 428c477413c..1231e5319c5 100644
|
||||
--- a/programs/winecfg/winecfg.rc
|
||||
+++ b/programs/winecfg/winecfg.rc
|
||||
@@ -40,6 +40,7 @@ BEGIN
|
||||
@@ -251,7 +251,7 @@ index 9041a8fa2d1..605ec54632c 100644
|
||||
IDS_WINECFG_TITLE "Wine configuration"
|
||||
IDS_WINECFG_TITLE_APP "Wine configuration for %s"
|
||||
IDS_THEMEFILE "Theme files (*.msstyles; *.theme)"
|
||||
@@ -165,22 +166,21 @@ IDD_GRAPHCFG DIALOG 0, 0, 260, 220
|
||||
@@ -171,22 +172,21 @@ IDD_GRAPHCFG DIALOG 0, 0, 260, 220
|
||||
STYLE WS_CHILD | WS_DISABLED
|
||||
FONT 8, "MS Shell Dlg"
|
||||
BEGIN
|
||||
@@ -268,17 +268,18 @@ index 9041a8fa2d1..605ec54632c 100644
|
||||
- LTEXT "#msgctxt#do not translate#X",IDC_DESKTOP_BY,129,70,8,8,WS_DISABLED
|
||||
- EDITTEXT IDC_DESKTOP_WIDTH,84,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
|
||||
- EDITTEXT IDC_DESKTOP_HEIGHT,137,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
|
||||
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,10
|
||||
+ LTEXT "Desktop &size:",IDC_DESKTOP_SIZE,15,58,64,16,WS_DISABLED
|
||||
+ LTEXT "#msgctxt#do not translate#X",IDC_DESKTOP_BY,129,58,8,8,WS_DISABLED
|
||||
+ EDITTEXT IDC_DESKTOP_WIDTH,84,56,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
|
||||
+ EDITTEXT IDC_DESKTOP_HEIGHT,137,56,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
|
||||
|
||||
-
|
||||
- GROUPBOX "Screen resolution",IDC_STATIC,8,95,244,84
|
||||
- CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,105,171,15
|
||||
- EDITTEXT IDC_RES_DPIEDIT,188,105,23,13,ES_NUMBER|WS_TABSTOP
|
||||
- LTEXT "#msgctxt#unit: dots/inch#dpi",IDC_STATIC,215,107,30,8
|
||||
- LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,124,230,49
|
||||
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,10
|
||||
+ LTEXT "Desktop &size:",IDC_DESKTOP_SIZE,15,58,64,16,WS_DISABLED
|
||||
+ LTEXT "#msgctxt#do not translate#X",IDC_DESKTOP_BY,129,58,8,8,WS_DISABLED
|
||||
+ EDITTEXT IDC_DESKTOP_WIDTH,84,56,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
|
||||
+ EDITTEXT IDC_DESKTOP_HEIGHT,137,56,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
|
||||
+
|
||||
+ GROUPBOX "Screen resolution",IDC_STATIC,8,83,244,84
|
||||
+ CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,93,171,15
|
||||
+ EDITTEXT IDC_RES_DPIEDIT,188,93,23,13,ES_NUMBER|WS_TABSTOP
|
||||
@@ -287,7 +288,7 @@ index 9041a8fa2d1..605ec54632c 100644
|
||||
END
|
||||
|
||||
IDD_DLLCFG DIALOG 0, 0, 260, 220
|
||||
@@ -324,6 +324,14 @@ BEGIN
|
||||
@@ -332,6 +332,14 @@ BEGIN
|
||||
CONTROL "Enable >K3 Theming",IDC_ENABLE_GTK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,100,230,8
|
||||
END
|
||||
|
||||
@@ -353,5 +354,5 @@ index 215cd6534a2..cd7b7552a1e 100644
|
||||
break;
|
||||
}
|
||||
--
|
||||
2.39.2
|
||||
2.42.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user