Commit 1bac61f8 authored by Frank Richter's avatar Frank Richter Committed by Alexandre Julliard

Add an "Appearance" tab to control the currently active theme.

parent fba5a59c
...@@ -176,4 +176,5 @@ BEGIN ...@@ -176,4 +176,5 @@ BEGIN
IDS_CHOOSE_PATH "Bitte whlen Sie ein Unix-Verzeichnis fr das Laufwerk." IDS_CHOOSE_PATH "Bitte whlen Sie ein Unix-Verzeichnis fr das Laufwerk."
IDS_HIDE_ADVANCED "Verstecke Erweitert" IDS_HIDE_ADVANCED "Verstecke Erweitert"
IDS_SHOW_ADVANCED "Zeige Erweitert" IDS_SHOW_ADVANCED "Zeige Erweitert"
IDS_NOTHEME "(Kein Motiv)"
END END
...@@ -169,6 +169,19 @@ BEGIN ...@@ -169,6 +169,19 @@ BEGIN
END END
IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250
STYLE WS_CHILD | WS_DISABLED
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX " Theming ",IDC_STATIC,8,10,244,94
LTEXT "Theme:",IDC_STATIC,15,22,228,8
COMBOBOX IDC_THEME_THEMECOMBO,15,30,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Color:",IDC_THEME_COLORTEXT,15,48,228,8
COMBOBOX IDC_THEME_COLORCOMBO,15,56,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Size:",IDC_THEME_SIZETEXT,15,74,228,8
COMBOBOX IDC_THEME_SIZECOMBO,15,82,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_WINE_VERSION "CVS" IDS_WINE_VERSION "CVS"
...@@ -178,6 +191,7 @@ BEGIN ...@@ -178,6 +191,7 @@ BEGIN
IDS_CHOOSE_PATH "Select the unix directory to be mapped, please." IDS_CHOOSE_PATH "Select the unix directory to be mapped, please."
IDS_HIDE_ADVANCED "Hide Advanced" IDS_HIDE_ADVANCED "Hide Advanced"
IDS_SHOW_ADVANCED "Show Advanced" IDS_SHOW_ADVANCED "Show Advanced"
IDS_NOTHEME "(No Theme)"
END END
......
...@@ -4,7 +4,7 @@ SRCDIR = @srcdir@ ...@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = winecfg.exe MODULE = winecfg.exe
APPMODE = -mwindows APPMODE = -mwindows
IMPORTS = comdlg32 comctl32 shell32 ole32 winmm shlwapi user32 advapi32 kernel32 IMPORTS = comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 advapi32 kernel32
C_SRCS = \ C_SRCS = \
appdefaults.c \ appdefaults.c \
...@@ -15,6 +15,7 @@ C_SRCS = \ ...@@ -15,6 +15,7 @@ C_SRCS = \
libraries.c \ libraries.c \
main.c \ main.c \
properties.c \ properties.c \
theme.c \
winecfg.c \ winecfg.c \
x11drvdlg.c x11drvdlg.c
......
...@@ -86,7 +86,7 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -86,7 +86,7 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
return FALSE; return FALSE;
} }
#define NUM_PROPERTY_PAGES 6 #define NUM_PROPERTY_PAGES 7
static INT_PTR static INT_PTR
doPropertySheet (HINSTANCE hInstance, HWND hOwner) doPropertySheet (HINSTANCE hInstance, HWND hOwner)
...@@ -140,6 +140,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) ...@@ -140,6 +140,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
psp[pg].dwSize = sizeof (PROPSHEETPAGE); psp[pg].dwSize = sizeof (PROPSHEETPAGE);
psp[pg].dwFlags = PSP_USETITLE; psp[pg].dwFlags = PSP_USETITLE;
psp[pg].hInstance = hInstance; psp[pg].hInstance = hInstance;
psp[pg].u.pszTemplate = MAKEINTRESOURCE (IDD_APPEARANCE);
psp[pg].u2.pszIcon = NULL;
psp[pg].pfnDlgProc = ThemeDlgProc;
psp[pg].pszTitle = "Appearance";
psp[pg].lParam = 0;
pg++;
psp[pg].dwSize = sizeof (PROPSHEETPAGE);
psp[pg].dwFlags = PSP_USETITLE;
psp[pg].hInstance = hInstance;
psp[pg].u.pszTemplate = MAKEINTRESOURCE (IDD_DRIVECFG); psp[pg].u.pszTemplate = MAKEINTRESOURCE (IDD_DRIVECFG);
psp[pg].u2.pszIcon = NULL; psp[pg].u2.pszIcon = NULL;
psp[pg].pfnDlgProc = DriveDlgProc; psp[pg].pfnDlgProc = DriveDlgProc;
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#define IDS_CHOOSE_PATH 5 #define IDS_CHOOSE_PATH 5
#define IDS_SHOW_ADVANCED 6 #define IDS_SHOW_ADVANCED 6
#define IDS_HIDE_ADVANCED 7 #define IDS_HIDE_ADVANCED 7
#define IDS_NOTHEME 8
#define IDD_MAINDLG 101 #define IDD_MAINDLG 101
#define IDB_WINE 104 #define IDB_WINE 104
#define IDD_ABOUTCFG 107 #define IDD_ABOUTCFG 107
...@@ -40,6 +41,7 @@ ...@@ -40,6 +41,7 @@
#define IDD_DLLCFG 111 #define IDD_DLLCFG 111
#define IDD_DRIVECFG 112 #define IDD_DRIVECFG 112
#define IDD_DRIVE_EDIT 114 #define IDD_DRIVE_EDIT 114
#define IDD_APPEARANCE 115
#define IDB_WINE_LOGO 200 #define IDB_WINE_LOGO 200
#define IDC_TABABOUT 1001 #define IDC_TABABOUT 1001
#define IDC_APPLYBTN 1002 #define IDC_APPLYBTN 1002
...@@ -132,3 +134,10 @@ ...@@ -132,3 +134,10 @@
#define IDC_AUDIO_CONTROL_PANEL 1303 #define IDC_AUDIO_CONTROL_PANEL 1303
#define IDC_DSOUND_HW_ACCEL 1304 #define IDC_DSOUND_HW_ACCEL 1304
#define IDC_DSOUND_DRV_EMUL 1305 #define IDC_DSOUND_DRV_EMUL 1305
/* appearance tab */
#define IDC_THEME_COLORCOMBO 1401
#define IDC_THEME_COLORTEXT 1402
#define IDC_THEME_SIZECOMBO 1403
#define IDC_THEME_SIZETEXT 1404
#define IDC_THEME_THEMECOMBO 1405
...@@ -78,6 +78,7 @@ INT_PTR CALLBACK DriveEditDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l ...@@ -78,6 +78,7 @@ INT_PTR CALLBACK DriveEditDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l
INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
/* Drive management */ /* Drive management */
void load_drives(void); void load_drives(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment