From 7f274205a8573a8211850efc75eff3272de5c15d Mon Sep 17 00:00:00 2001 From: James Hawkins Date: Fri, 30 Jul 2004 01:35:13 +0000 Subject: [PATCH] Rename X11 Driver tab of winecfg to Graphics. --- programs/winecfg/En.rc | 2 +- programs/winecfg/Es.rc | 2 +- programs/winecfg/It.rc | 2 +- programs/winecfg/Pt.rc | 2 +- programs/winecfg/Ru.rc | 2 +- programs/winecfg/Si.rc | 2 +- programs/winecfg/main.c | 6 +++--- programs/winecfg/resource.h | 4 ++-- programs/winecfg/winecfg.h | 8 ++++---- programs/winecfg/x11drvdlg.c | 10 +++++----- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 0e2e7454944..e843fef8e3d 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -53,7 +53,7 @@ BEGIN COMBOBOX IDC_DOSVER,83,208,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -IDD_X11DRVCFG DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Sans Serif" BEGIN diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index 78a48e56820..19160ef72c2 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -49,7 +49,7 @@ FONT 8, "MS Sans Serif" BEGIN END -IDD_X11DRVCFG DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Sans Serif" BEGIN diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 7404e6b73a1..2c0a5fe130d 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -52,7 +52,7 @@ BEGIN COMBOBOX IDC_DOSVER,83,208,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -IDD_X11DRVCFG DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Sans Serif" BEGIN diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index a150a399c12..ab7ae4c0587 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -52,7 +52,7 @@ BEGIN COMBOBOX IDC_DOSVER,108,208,138,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -IDD_X11DRVCFG DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Sans Serif" BEGIN diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index b07ed70c361..8a2cfee7806 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -62,7 +62,7 @@ FONT 8, "MS Sans Serif" BEGIN END -IDD_X11DRVCFG DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Sans Serif" BEGIN diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc index bd5d27db563..84da9bd7fd9 100644 --- a/programs/winecfg/Si.rc +++ b/programs/winecfg/Si.rc @@ -49,7 +49,7 @@ FONT 8, "MS Sans Serif" BEGIN END -IDD_X11DRVCFG DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Sans Serif" BEGIN diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 870c8e9f3a0..b3d1f823c09 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -129,10 +129,10 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGE); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCE (IDD_X11DRVCFG); + psp[pg].u.pszTemplate = MAKEINTRESOURCE (IDD_GRAPHCFG); psp[pg].u2.pszIcon = NULL; - psp[pg].pfnDlgProc = X11DrvDlgProc; - psp[pg].pszTitle = "X11 Driver"; + psp[pg].pfnDlgProc = GraphDlgProc; + psp[pg].pszTitle = "Graphics"; psp[pg].lParam = 0; pg++; diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 47c986b4851..57eb6c52b49 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -31,7 +31,7 @@ #define IDD_ABOUTCFG 107 #define IDD_APPCFG 108 #define IDD_AUDIOCFG 109 -#define IDD_X11DRVCFG 110 +#define IDD_GRAPHCFG 110 #define IDD_DLLCFG 111 #define IDD_DRIVECFG 112 #define IDD_SYSTEMCFG 113 @@ -111,7 +111,7 @@ #define IDC_BUTTON_SHOW_HIDE_ADVANCED 1076 #define IDC_STATIC_TYPE 1077 -/* x11drv */ +/* graphics */ #define IDC_ENABLE_MANAGED 1100 #define IDC_SCREEN_DEPTH 1101 #define IDC_DX_MOUSE_GRAB 1102 diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 1908e3e32ae..f7d11b66226 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -96,11 +96,11 @@ char *getConfigValue (const char *subkey, const char *valueName, const char *def HRESULT doesConfigValueExist (const char *subkey, const char *valueName); HRESULT removeConfigValue (const char *subkey, const char *valueName); -/* X11DRV */ +/* Graphics */ -void initX11DrvDlg (HWND hDlg); -void saveX11DrvDlgSettings (HWND hDlg); -INT_PTR CALLBACK X11DrvDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +void initGraphDlg (HWND hDlg); +void saveGraphDlgSettings (HWND hDlg); +INT_PTR CALLBACK GraphDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); /* Drive management */ void initDriveDlg (HWND hDlg); diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 53477802498..7119677f7a7 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -1,5 +1,5 @@ /* - * X11DRV configuration code + * Graphics configuration code * * Copyright 2003 Mark Westcott * Copyright 2003 Mike Hearn @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); #define RES_MAXLEN 5 /* the maximum number of characters in a screen dimension. 5 digits should be plenty, what kind of crazy person runs their screen >10,000 pixels across? */ -#define section (appSettings == EDITING_GLOBAL ? "x11drv" : (getSectionForApp("x11drv"))) +#define section (appSettings == EDITING_GLOBAL ? "graphics" : (getSectionForApp("graphics"))) int updatingUI; @@ -84,7 +84,7 @@ void updateGUIForDesktopMode(HWND dialog) { } /* pokes the win32 api to setup the dialog from the config struct */ -void initX11DrvDlg (HWND hDlg) +void initGraphDlg (HWND hDlg) { static const char default_desktop[] = "640x480"; char *buf; @@ -213,7 +213,7 @@ void onDoubleBufferClicked(HWND hDlg) { } INT_PTR CALLBACK -X11DrvDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +GraphDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { case WM_INITDIALOG: @@ -258,7 +258,7 @@ X11DrvDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) break; } case PSN_SETACTIVE: { - initX11DrvDlg (hDlg); + initGraphDlg (hDlg); break; } }