From a52607e346cecc8ab35a50613a4224acf1371940 Mon Sep 17 00:00:00 2001 From: lightningterror <18107717+lightningterror@users.noreply.github.com> Date: Fri, 6 Nov 2020 23:09:32 +0100 Subject: [PATCH] dev9-gui-win: Cleanup DEV9 gui a bit. Rename window title: HDD Configure -> Network and HDD Settings Remove about dialog code. Move around button positions. --- common/include/PluginCallbacks.h | 1 - common/include/api/Dev9Api.h | 2 -- pcsx2/DEV9/Win32/DEV9ghzdrk.rc | 43 +++++++++----------------------- pcsx2/DEV9/Win32/Win32.cpp | 27 -------------------- pcsx2/DEV9/Win32/resource.h | 1 - 5 files changed, 12 insertions(+), 62 deletions(-) diff --git a/common/include/PluginCallbacks.h b/common/include/PluginCallbacks.h index cb8c8ac6d7..b1384dfc42 100644 --- a/common/include/PluginCallbacks.h +++ b/common/include/PluginCallbacks.h @@ -1371,7 +1371,6 @@ typedef void (CALLBACK* _DEV9keyEvent)(keyEvent* ev); typedef s32 (CALLBACK* _DEV9freeze)(int mode, freezeData *data); typedef void (CALLBACK* _DEV9configure)(); typedef s32 (CALLBACK* _DEV9test)(); -typedef void (CALLBACK* _DEV9about)(); // USB // NOTE: The read/write functions CANNOT use XMM/MMX regs diff --git a/common/include/api/Dev9Api.h b/common/include/api/Dev9Api.h index e264adbd46..a3bd190538 100644 --- a/common/include/api/Dev9Api.h +++ b/common/include/api/Dev9Api.h @@ -79,8 +79,6 @@ EXPORT_C_(s32) DEV9freeze(u8 mode, freezeData *data); EXPORT_C_(void) DEV9configure(); -EXPORT_C_(void) -DEV9about(); EXPORT_C_(s32) DEV9test(); diff --git a/pcsx2/DEV9/Win32/DEV9ghzdrk.rc b/pcsx2/DEV9/Win32/DEV9ghzdrk.rc index 3308816e16..9a2b35a974 100644 --- a/pcsx2/DEV9/Win32/DEV9ghzdrk.rc +++ b/pcsx2/DEV9/Win32/DEV9ghzdrk.rc @@ -57,32 +57,21 @@ END IDD_CONFIG DIALOGEX 0, 0, 290, 170 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "HDD Configure" -FONT 8, "MS Sans Serif", 0, 0, 0x0 +CAPTION "Network and HDD Settings" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,115,150,50,14 - PUSHBUTTON "Cancel",IDCANCEL,233,150,50,14 - COMBOBOX IDC_BAYTYPE,60,10,223,47,CBS_DROPDOWNLIST | CBS_SORT | WS_DISABLED - LTEXT "DEV9 Type",IDC_STATIC,15,10,41,11,SS_CENTERIMAGE - LTEXT "Ethernet Device",IDC_STATIC,15,60,60,10,SS_CENTERIMAGE - COMBOBOX IDC_ETHDEV,83,60,193,82,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,92,150,50,14 + PUSHBUTTON "Cancel",IDCANCEL,148,150,50,14 + LTEXT "DEV9 Type:",IDC_STATIC,15,10,41,11,SS_CENTERIMAGE + COMBOBOX IDC_BAYTYPE,60,8,223,47,CBS_DROPDOWNLIST | CBS_SORT | WS_DISABLED GROUPBOX "Ethernet",IDC_STATIC,7,30,276,50 - CONTROL "Enabled",IDC_ETHENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,42,10 - LTEXT "HDD File",IDC_STATIC,15,115,60,10,SS_CENTERIMAGE | WS_DISABLED + CONTROL "Enabled",IDC_ETHENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,42,8 + LTEXT "Ethernet Device:",IDC_STATIC,26,60,60,8,SS_CENTERIMAGE + COMBOBOX IDC_ETHDEV,94,58,182,82,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Hard Disk Drive (not yet properly implemented)",IDC_STATIC,7,90,276,50 - CONTROL "Enabled",IDC_HDDENABLED,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,15,100,42,10 - EDITTEXT IDC_HDDFILE,85,115,191,12,ES_AUTOHSCROLL | WS_DISABLED -END - -IDD_ABOUT DIALOGEX 0, 0, 177, 106 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "DEV9 About" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,65,85,50,14 - LTEXT "DEV9 Driver",IDC_NAME,59,7,42,8 - LTEXT "Original Authors:\n\tlinuzappz \n\tShadow ",IDC_STATIC,7,18,141,30 - LTEXT "Fixed and improved by:\n\tgigahez \n\tdrk||Raziel",IDC_STATIC,7,49,155,27 + CONTROL "Enabled",IDC_HDDENABLED,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,15,105,42,8 + LTEXT "HDD File:",IDC_STATIC,26,120,60,8,SS_CENTERIMAGE | WS_DISABLED + EDITTEXT IDC_HDDFILE,94,118,182,13,ES_AUTOHSCROLL | WS_DISABLED END @@ -101,14 +90,6 @@ BEGIN TOPMARGIN, 7 BOTTOMMARGIN, 164 END - - IDD_ABOUT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 170 - TOPMARGIN, 7 - BOTTOMMARGIN, 99 - END END #endif // APSTUDIO_INVOKED diff --git a/pcsx2/DEV9/Win32/Win32.cpp b/pcsx2/DEV9/Win32/Win32.cpp index 10ef4ac92d..dbc683f8ef 100644 --- a/pcsx2/DEV9/Win32/Win32.cpp +++ b/pcsx2/DEV9/Win32/Win32.cpp @@ -139,24 +139,6 @@ BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) return FALSE; } -BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - switch (uMsg) - { - case WM_INITDIALOG: - return TRUE; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: - EndDialog(hW, FALSE); - return TRUE; - } - } - return FALSE; -} - void DEV9configure() { ScopedCoreThreadPause paused_core; @@ -168,15 +150,6 @@ void DEV9configure() paused_core.AllowResume(); } -EXPORT_C_(void) -DEV9about() -{ - DialogBox(hInst, - MAKEINTRESOURCE(IDD_ABOUT), - GetActiveWindow(), - (DLGPROC)AboutDlgProc); -} - /* UINT DEV9ThreadProc() { DEV9thread(); diff --git a/pcsx2/DEV9/Win32/resource.h b/pcsx2/DEV9/Win32/resource.h index b43e1862c9..2e45cb972f 100644 --- a/pcsx2/DEV9/Win32/resource.h +++ b/pcsx2/DEV9/Win32/resource.h @@ -9,7 +9,6 @@ #define IDD_CONFDLG 101 #define IDD_CONFIG 101 -#define IDD_ABOUT 103 #define IDC_NAME 1000 #define IDC_COMBO1 1007 #define IDC_ETHDEV 1007