Skip to content

Commit

Permalink
View: Clean up rsrc.rc
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aurumaker72
Aurumaker72 committed Nov 26, 2024
1 parent a67c1a2 commit dd22d0d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 129 deletions.
4 changes: 2 additions & 2 deletions view/gui/features/ConfigDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1710,15 +1710,15 @@ void configdialog_show()
i.hInstance = g_app_instance;
}

psp[0].pszTemplate = MAKEINTRESOURCE(IDD_MAIN);
psp[0].pszTemplate = MAKEINTRESOURCE(IDD_SETTINGS_PLUGINS);
psp[0].pfnDlgProc = plugins_cfg;
psp[0].pszTitle = "Plugins";

psp[1].pszTemplate = MAKEINTRESOURCE(IDD_DIRECTORIES);
psp[1].pfnDlgProc = directories_cfg;
psp[1].pszTitle = "Directories";

psp[2].pszTemplate = MAKEINTRESOURCE(IDD_MESSAGES);
psp[2].pszTemplate = MAKEINTRESOURCE(IDD_SETTINGS_GENERAL);
psp[2].pfnDlgProc = general_cfg;
psp[2].pszTitle = "General";

Expand Down
8 changes: 2 additions & 6 deletions view/resource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define IDD_MOVIE_EDITOR 111
#define IDD_CHEATS 113
#define IDD_PIANO_ROLL 116
#define IDD_MAIN 128
#define IDD_SETTINGS_PLUGINS 128
#define IDM_LOAD_ROM 129
#define IDB_LOGO 133
#define IDC_LOGO 134
Expand Down Expand Up @@ -125,7 +125,6 @@
#define RUNDLGORD 1545
#define IDC_MANAGE_LINK 1592
#define ID_POPUP_ROM_SETTING 2000
#define IDD_ROM_SETTING_DIALOG 2001
#define IDC_OK 2003
#define IDC_CANCEL 2004
#define IDC_ROM_CRC1 2006
Expand Down Expand Up @@ -164,7 +163,7 @@
#define IDC_CURRENT_ROM_TEXT 2107
#define IDC_CURRENT_ROM 2108
#define ID_GENERATE_ROM_INFO 2200
#define IDD_MESSAGES 2250
#define IDD_SETTINGS_GENERAL 2250
#define IDC_MESSAGES 2255
#define IDC_LIMITFPS 2257
#define IDC_FPSTITLE 2258
Expand Down Expand Up @@ -448,7 +447,6 @@
#define IDC_GITREPO 40011
#define IDM_RESET_RECENT_LUA 40013
#define IDM_FREEZE_RECENT_LUA 40014
#define IDD_OTHER_OPTIONS_DIALOG 40015
#define IDC_OTHEROPTIONS 40016
#define IDD_COREDBG 40031
#define IDC_COREDBG_GROUPBOX 40032
Expand All @@ -475,13 +473,11 @@
#define IDC_CLOCK_SPD_MULT 40055
#define IDC_CLOCK_SPD_MULT_TEXT 40057
#define IDC_CLOCK_SPD_MULT2 40057
#define IDD_MUPENERROR 40058
#define IDC_ERROR_PANIC_IGNORE 40059
#define IDC_ERROR_PANIC_CLOSE 40060
#define IDC_CRASHREPORT 40061
#define IDC_ERRORTEXT 40062
#define IDC_ERROR_PICTUREBOX 40063
#define IDD_NEW_HOTKEY_DIALOG 40064
#define IDM_SEEKER 40065
#define IDM_FASTFORWARD_ON 40066
#define IDM_FASTFORWARD_OFF 40067
Expand Down
127 changes: 6 additions & 121 deletions view/rsrc.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,17 +185,6 @@ BEGIN
LTEXT "Mupen 64 1.1.9",IDC_STATIC,70,30,120,12
END

IDD_OTHER_OPTIONS_DIALOG DIALOGEX 0, 0, 231, 273
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
CONTROL "No Synchronisation",IDC_AV_NOSYNC,"Button",BS_AUTORADIOBUTTON,12,18,120,8
CONTROL "Audio-Authoritative Synchronisation",IDC_AV_AUDIOSYNC,
"Button",BS_AUTORADIOBUTTON,12,30,150,8
CONTROL "Old Video Synchronisation",IDC_AV_VIDEOSYNC,"Button",BS_AUTORADIOBUTTON,12,42,144,8
GROUPBOX "A/V Synchronization",IDC_STATIC,6,6,216,54
END

IDD_LUAWINDOW DIALOGEX 0, 0, 240, 166
STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
CAPTION "Lua Instance"
Expand Down Expand Up @@ -240,18 +229,7 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,209,204,10
END

IDD_NEW_HOTKEY_DIALOG DIALOGEX 0, 0, 231, 262
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LISTBOX IDC_HOTKEY_LIST,6,24,216,210,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Assign...",IDC_HOTKEY_ASSIGN_SELECTED,6,240,54,14
PUSHBUTTON "Clear",IDC_HOTKEY_CLEAR,180,240,42,14
EDITTEXT IDC_SELECTED_HOTKEY_TEXT,66,240,108,14,ES_AUTOHSCROLL | ES_READONLY
EDITTEXT IDC_HOTKEY_SEARCH,6,6,216,14,ES_AUTOHSCROLL
END

IDD_MAIN DIALOGEX 0, 0, 231, 262
IDD_SETTINGS_PLUGINS DIALOGEX 0, 0, 231, 262
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
Expand Down Expand Up @@ -281,7 +259,7 @@ BEGIN
CONTROL "",IDB_RSP,"Static",SS_BITMAP,13,198,15,13
END

IDD_MESSAGES DIALOGEX 0, 0, 231, 281
IDD_SETTINGS_GENERAL DIALOGEX 0, 0, 231, 281
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
Expand Down Expand Up @@ -313,45 +291,6 @@ BEGIN
CONTROL "",IDC_MOVIE_INFO_TEMPLATE,"Static",SS_BLACKFRAME,6,72,228,138
END

IDD_ROM_SETTING_DIALOG DIALOGEX 0, 0, 340, 305
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "ROM Properties"
FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN
GROUPBOX "ROM Information",IDC_ROM_HEADER_INFO_TEXT,7,7,324,132
LTEXT "File Location:",IDC_ROM_FULLPATH_TEXT,16,22,55,8
LTEXT "Good Name:",IDC_ROM_GOODNAME_TEXT,16,38,55,8
LTEXT "Internal Name:",IDC_ROM_INTERNAL_NAME_TEXT,16,54,55,8
LTEXT "Size:",IDC_ROM_SIZE_TEXT,16,70,55,8
LTEXT "Country:",IDC_ROM_COUNTRY_TEXT,16,86,55,8
LTEXT "Ini Code:",IDC_ROM_INICODE_TEXT,16,102,55,8
LTEXT "MD5 Checksum:",IDC_ROM_MD5_TEXT,16,119,55,8
RTEXT "",IDC_MD5_PROGRESS,250,119,18,13,NOT WS_VISIBLE
CONTROL "",IDC_MD5_PROGRESS_BAR,"msctls_progress32",PBS_SMOOTH | NOT WS_VISIBLE,270,116,50,14,WS_EX_STATICEDGE
PUSHBUTTON "Calculate",IDC_MD5_CALCULATE,270,116,50,14
EDITTEXT IDC_ROM_FULLPATH,72,23,240,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
EDITTEXT IDC_ROM_GOODNAME,72,38,196,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
EDITTEXT IDC_ROM_INTERNAL_NAME,72,55,196,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
EDITTEXT IDC_ROM_SIZE,72,71,196,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
EDITTEXT IDC_ROM_COUNTRY,72,86,196,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
EDITTEXT IDC_ROM_INICODE,72,102,196,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
EDITTEXT IDC_ROM_MD5,72,119,138,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
GROUPBOX "Plugins",IDC_ROM_PLUGINS,7,144,324,98
LTEXT "Video Plugin:",IDC_GFXPLUGIN,16,157,215,80
COMBOBOX IDC_COMBO_GFX,16,167,140,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Sound Plugin:",IDC_SOUNDPLUGIN,180,157,55,8
COMBOBOX IDC_COMBO_SOUND,180,167,140,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Input Plugin:",IDC_INPUTPLUGIN,16,187,55,8
COMBOBOX IDC_COMBO_INPUT,16,197,140,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "RSP Plugin:",IDC_RSPPLUGIN,180,187,55,8
COMBOBOX IDC_COMBO_RSP,180,197,140,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "Save Plugins",IDC_SAVE_PROFILE,270,218,50,16
LTEXT "Comments:",IDC_INI_COMMENTS_TEXT,8,250,37,8
EDITTEXT IDC_INI_COMMENTS,7,261,324,12,ES_AUTOHSCROLL
DEFPUSHBUTTON "OK",IDC_OK,225,282,50,14
PUSHBUTTON "Cancel",IDC_CANCEL,281,282,50,14
END

IDD_LUAINPUTPROMPT DIALOGEX 0, 0, 250, 200
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
Expand All @@ -362,17 +301,6 @@ BEGIN
EDITTEXT IDC_TEXTBOX_LUAPROMPT,6,6,234,168,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
END

IDD_MUPENERROR DIALOGEX 0, 0, 341, 90
STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
CAPTION "Error"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
PUSHBUTTON "Exit",IDC_ERROR_PANIC_CLOSE,276,72,60,12
PUSHBUTTON "Ignore",IDC_ERROR_PANIC_IGNORE,216,72,60,12
LTEXT "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vulputate ut pharetra sit amet aliquam id diam maecenas ultricies. Accumsan sit amet nulla facilisi morbi tempus. Et ultrices neque",IDC_ERRORTEXT,102,6,234,60
CONTROL "",IDC_ERROR_PICTUREBOX,"Static",SS_OWNERDRAW,6,6,42,36
END

IDD_COREDBG DIALOGEX 0, 0, 213, 252
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU
CAPTION "CoreDbg"
Expand All @@ -385,7 +313,6 @@ BEGIN
LISTBOX IDC_COREDBG_LIST,0,72,210,180,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
END


/////////////////////////////////////////////////////////////////////////////
//
// Icon
Expand Down Expand Up @@ -440,10 +367,6 @@ BEGIN
BEGIN
END

IDD_OTHER_OPTIONS_DIALOG, DIALOG
BEGIN
END

IDD_LUAWINDOW, DIALOG
BEGIN
END
Expand All @@ -452,34 +375,22 @@ BEGIN
BEGIN
END

IDD_NEW_HOTKEY_DIALOG, DIALOG
BEGIN
END

IDD_MAIN, DIALOG
IDD_SETTINGS_PLUGINS, DIALOG
BEGIN
END

IDD_MESSAGES, DIALOG
IDD_SETTINGS_GENERAL, DIALOG
BEGIN
END

IDD_MOVIE_DIALOG, DIALOG
BEGIN
END

IDD_ROM_SETTING_DIALOG, DIALOG
BEGIN
END

IDD_LUAINPUTPROMPT, DIALOG
BEGIN
END

IDD_MUPENERROR, DIALOG
BEGIN
END

IDD_COREDBG, DIALOG
BEGIN
LEFTMARGIN, 4
Expand All @@ -496,17 +407,7 @@ END
// AFX_DIALOG_LAYOUT
//

IDD_MESSAGES AFX_DIALOG_LAYOUT
BEGIN
0
END

IDD_OTHER_OPTIONS_DIALOG AFX_DIALOG_LAYOUT
BEGIN
0
END

IDD_NEW_HOTKEY_DIALOG AFX_DIALOG_LAYOUT
IDD_SETTINGS_GENERAL AFX_DIALOG_LAYOUT
BEGIN
0
END
Expand All @@ -516,7 +417,7 @@ BEGIN
0
END

IDD_MAIN AFX_DIALOG_LAYOUT
IDD_SETTINGS_PLUGINS AFX_DIALOG_LAYOUT
BEGIN
0
END
Expand All @@ -526,11 +427,6 @@ BEGIN
0
END

IDD_MUPENERROR AFX_DIALOG_LAYOUT
BEGIN
0
END

IDD_LUAINPUTPROMPT AFX_DIALOG_LAYOUT
BEGIN
0
Expand Down Expand Up @@ -585,12 +481,6 @@ END
// String Table
//

STRINGTABLE
BEGIN
IDM_START_MOVIE_RECORDING
"Starts AVI capture with previous codec and preset (avi.cfg)"
END

#endif // Neutral (Default) resources
/////////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -785,11 +675,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// AFX_DIALOG_LAYOUT
//

IDD_NEW_HOTKEY_DIALOG AFX_DIALOG_LAYOUT
BEGIN
0
END

#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////

Expand Down

0 comments on commit dd22d0d

Please sign in to comment.