ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #696 from MELERIX/UI 

Minor UI changes
This commit is contained in:
zilmar 2015-10-27 23:37:51 +11:00
parent fed00d697f ba27fc543c
commit 3be6bfc7b9
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/Project64/User Interface/UI Resources.rc
View File

@ -152,19 +152,16 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
CONTROL "Pause emulation when window is not active?",IDC_AUTOSLEEP, CONTROL "Pause emulation when window is not active?",IDC_AUTOSLEEP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,9,206,8
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,9,198,8 CONTROL "On loading a ROM go to full screen",IDC_LOAD_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,25,206,8
CONTROL "On loading a ROM go to full screen",IDC_LOAD_FULLSCREEN, CONTROL "Disable Screen Saver when running rom",IDC_SCREEN_SAVER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,41,206,8
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,25,198,8 CONTROL "Hide Advanced Settings",IDC_BASIC_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,57,206,8
CONTROL "Disable Screen Saver when running rom",IDC_SCREEN_SAVER,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,41,198,8
CONTROL "Hide Advanced Settings",IDC_BASIC_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,57,198,8
LTEXT "Max # of Roms Remembered (Max 10):",IDC_MAXROMS_TXT,6,81,145,8 LTEXT "Max # of Roms Remembered (Max 10):",IDC_MAXROMS_TXT,6,81,145,8
EDITTEXT IDC_REMEMBER,154,79,26,12,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_REMEMBER,148,79,26,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "roms",IDC_ROMSEL_TEXT2,184,81,31,8 LTEXT "roms",IDC_ROMSEL_TEXT2,178,82,31,8
LTEXT "Max # of Rom Dirs Remembered (Max 10):",IDC_MAXROMDIR_TXT,6,96,145,8 LTEXT "Max # of Rom Dirs Remembered (Max 10):",IDC_MAXROMDIR_TXT,6,96,145,8
EDITTEXT IDC_REMEMBERDIR,154,94,26,12,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_REMEMBERDIR,148,94,26,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "dirs",IDC_ROMSEL_TEXT4,184,99,31,8 LTEXT "dirs",IDC_ROMSEL_TEXT4,178,98,34,8
CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,4,73,208,1 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,4,73,208,1
END END
@ -232,8 +229,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1 FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
LTEXT "CPU State:",IDC_S_CPU_STATE,8,9,42,11 LTEXT "CPU State:",IDC_S_CPU_STATE,8,9,52,11
COMBOBOX IDC_C_CPU_STATE,58,7,156,66,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_C_CPU_STATE,68,7,144,66,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Menu Item:",IDC_MENU_ITEM_TEXT,8,23,84,10 LTEXT "Menu Item:",IDC_MENU_ITEM_TEXT,8,23,84,10
CONTROL "Tree1",IDC_MENU_ITEMS,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_NOTOOLTIPS | TVS_TRACKSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,8,33,128,78 CONTROL "Tree1",IDC_MENU_ITEMS,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_NOTOOLTIPS | TVS_TRACKSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,8,33,128,78
LTEXT "Current Keys:",IDC_S_CURRENT_KEYS,142,23,52,10 LTEXT "Current Keys:",IDC_S_CURRENT_KEYS,142,23,52,10
@ -241,8 +238,8 @@ BEGIN
PUSHBUTTON "Remove",IDC_REMOVE,144,97,68,12 PUSHBUTTON "Remove",IDC_REMOVE,144,97,68,12
GROUPBOX "Create New Shortcut Key:",IDC_S_SELECT_SHORT,8,115,207,57 GROUPBOX "Create New Shortcut Key:",IDC_S_SELECT_SHORT,8,115,207,57
COMBOBOX IDC_VIRTUALKEY,8,125,91,90,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_VIRTUALKEY,8,125,91,90,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Detect Key",IDC_KEY_PROMPT,103,125,44,12 PUSHBUTTON "Detect Key",IDC_KEY_PROMPT,103,125,62,12
PUSHBUTTON "Assign to Menu",IDC_ASSIGN,152,125,62,12 PUSHBUTTON "Assign to Menu",IDC_ASSIGN,170,125,42,12
CONTROL "&Ctrl",IDC_CTL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,142,23,9 CONTROL "&Ctrl",IDC_CTL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,142,23,9
CONTROL "A&lt",IDC_ALT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,39,142,21,9 CONTROL "A&lt",IDC_ALT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,39,142,21,9
CONTROL "&Shift",IDC_SHIFT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,69,142,26,10 CONTROL "&Shift",IDC_SHIFT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,69,142,26,10
@ -582,10 +579,10 @@ BEGIN
PUSHBUTTON "Cancel",IDCANCEL,248,186,50,14 PUSHBUTTON "Cancel",IDCANCEL,248,186,50,14
CONTROL "Tree1",IDC_PAGELIST,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,8,7,116,169 CONTROL "Tree1",IDC_PAGELIST,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,8,7,116,169
CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,7,180,343,1 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,7,180,343,1
PUSHBUTTON "Reset Page",IDC_RESET_PAGE,7,186,50,14,WS_DISABLED PUSHBUTTON "Reset Page",IDC_RESET_PAGE,7,186,58,14,WS_DISABLED
CONTROL "",IDC_SETTING_INFO,"Static",SS_ETCHEDFRAME,131,7,219,170 CONTROL "",IDC_SETTING_INFO,"Static",SS_ETCHEDFRAME,131,7,219,170
PUSHBUTTON "Apply",IDAPPLY,301,186,50,14,WS_DISABLED PUSHBUTTON "Apply",IDAPPLY,301,186,50,14,WS_DISABLED
PUSHBUTTON "Reset All",IDC_RESET_ALL,63,186,50,14,WS_DISABLED PUSHBUTTON "Reset All",IDC_RESET_ALL,68,186,52,14,WS_DISABLED
END END
IDD_Settings_GameRecompiler DIALOGEX 0, 0, 230, 156 IDD_Settings_GameRecompiler DIALOGEX 0, 0, 230, 156