little bit win gui polishing

This commit is contained in:
g0me3 2019-06-20 22:32:27 +03:00
parent 9ab9fd1e82
commit e1f52e6ffb
1 changed files with 82 additions and 32 deletions

View File

@ -898,31 +898,31 @@ BEGIN
END END
INPUTCONFIG DIALOGEX 122, 105, 349, 199 INPUTCONFIG DIALOGEX 122, 105, 349, 199
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Input Configuration" CAPTION "Input Configuration"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
GROUPBOX "Port 1:",102,20,31,152,50 GROUPBOX "Port 1:",102,20,31,152,50
COMBOBOX COMBO_PAD1,27,57,71,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX COMBO_PAD1,27,57,74,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "Configure",BTN_PORT1,109,43,56,14 DEFPUSHBUTTON "Configure",BTN_PORT1,109,40,56,14
GROUPBOX "Port 2:",103,176,31,152,50 GROUPBOX "Port 2:",103,176,31,162,50
COMBOBOX COMBO_PAD2,183,57,71,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX COMBO_PAD2,183,57,84,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "Configure",BTN_PORT2,265,41,56,14 DEFPUSHBUTTON "Configure",BTN_PORT2,275,40,56,14
GROUPBOX "NES-style Input Ports",108,10,8,328,83 GROUPBOX "NES-style Input Ports",108,10,8,328,83
GROUPBOX "Famicom Expansion Port:",109,176,93,162,50 GROUPBOX "Famicom Expansion Port:",109,176,93,162,50
COMBOBOX COMBO_FAM,183,122,84,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX COMBO_FAM,183,122,84,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "Configure",BTN_FAM,275,105,56,14 DEFPUSHBUTTON "Configure",BTN_FAM,275,105,56,14
CONTROL "",65487,"Static",SS_BLACKFRAME,27,41,71,12 CONTROL "",65487,"Static",SS_BLACKFRAME,27,41,74,12
CONTROL "",65486,"Static",SS_BLACKFRAME,183,41,71,12 CONTROL "",65486,"Static",SS_BLACKFRAME,183,41,84,12
CONTROL "",65485,"Static",SS_BLACKFRAME,183,106,84,12 CONTROL "",65485,"Static",SS_BLACKFRAME,183,106,84,12
CTEXT "",TXT_PAD1,30,42,65,10 CTEXT "",TXT_PAD1,30,42,68,10
CTEXT "",TXT_PAD2,186,42,65,10 CTEXT "",TXT_PAD2,186,42,78,10
CTEXT "",TXT_FAM,186,107,78,10 CTEXT "",TXT_FAM,186,107,78,10
PUSHBUTTON "Set",BTN_AUTO_HOLD,19,157,45,13 PUSHBUTTON "Set",BTN_AUTO_HOLD,19,157,45,13
LTEXT "not assigned",LBL_AUTO_HOLD,71,159,87,8 LTEXT "not assigned",LBL_AUTO_HOLD,71,159,87,8
PUSHBUTTON "Clear",BTN_CLEAR_AH,19,172,45,13 PUSHBUTTON "Clear",BTN_CLEAR_AH,19,172,45,13
LTEXT "not assigned",LBL_CLEAR_AH,71,174,87,8 LTEXT "not assigned",LBL_CLEAR_AH,71,174,87,8
DEFPUSHBUTTON "Close",BTN_CLOSE,282,177,56,14 DEFPUSHBUTTON "Close",BTN_CLOSE,275,177,56,14
GROUPBOX "Input Presets",113,10,93,162,50 GROUPBOX "Input Presets",113,10,93,162,50
CONTROL "Allow Left+Right / Up+Down",BTN_ALLOW_LRUD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,183,157,107,10 CONTROL "Allow Left+Right / Up+Down",BTN_ALLOW_LRUD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,183,157,107,10
PUSHBUTTON "Set",BTN_PRESET_SET1,34,103,37,11 PUSHBUTTON "Set",BTN_PRESET_SET1,34,103,37,11
@ -934,7 +934,7 @@ BEGIN
PUSHBUTTON "Export",BTN_PRESET_EXPORT1,123,103,37,11 PUSHBUTTON "Export",BTN_PRESET_EXPORT1,123,103,37,11
PUSHBUTTON "Export",BTN_PRESET_EXPORT2,123,115,37,11 PUSHBUTTON "Export",BTN_PRESET_EXPORT2,123,115,37,11
PUSHBUTTON "Export",BTN_PRESET_EXPORT3,123,127,37,11 PUSHBUTTON "Export",BTN_PRESET_EXPORT3,123,127,37,11
GROUPBOX "Auto-Hold",118,10,146,162,44 GROUPBOX "Auto-Hold",118,10,146,162,46
GROUPBOX "Emulation",119,176,146,162,25 GROUPBOX "Emulation",119,176,146,162,25
CTEXT "1",IDC_STATIC,18,105,8,8 CTEXT "1",IDC_STATIC,18,105,8,8
CTEXT "2",IDC_STATIC,18,116,8,8 CTEXT "2",IDC_STATIC,18,116,8,8
@ -1480,7 +1480,7 @@ BEGIN
END END
TRACER DIALOGEX 0, 0, 317, 181 TRACER DIALOGEX 0, 0, 317, 181
STYLE DS_SETFONT | DS_3DLOOK | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
CAPTION "Trace Logger" CAPTION "Trace Logger"
FONT 8, "MS Shell Dlg", 400, 0, 0x0 FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN BEGIN
@ -1513,12 +1513,12 @@ BEGIN
CONTROL "Only log newly mapped code",IDC_CHECK_LOG_NEW_INSTRUCTIONS, CONTROL "Only log newly mapped code",IDC_CHECK_LOG_NEW_INSTRUCTIONS,
"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,8,162,102,10 "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,8,162,102,10
CONTROL "Only log code that accesses newly mapped data",IDC_CHECK_LOG_NEW_DATA, CONTROL "Only log code that accesses newly mapped data",IDC_CHECK_LOG_NEW_DATA,
"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,112,162,171,10 "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,113,162,171,10
CONTROL "Log Bank number",IDC_CHECK_LOG_BANK_NUMBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,211,121,100,10 CONTROL "Log Bank number",IDC_CHECK_LOG_BANK_NUMBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,211,121,100,10
END END
ADDBP DIALOGEX 66, 83, 197, 125 ADDBP DIALOGEX 66, 83, 197, 127
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Add Breakpoint..." CAPTION "Add Breakpoint..."
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
@ -1573,7 +1573,7 @@ BEGIN
END END
ROMPATCHER DIALOGEX 84, 67, 304, 135 ROMPATCHER DIALOGEX 84, 67, 304, 135
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Rom Data Editor" CAPTION "Rom Data Editor"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
@ -1702,7 +1702,7 @@ CAPTION "Play Movie"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
DEFPUSHBUTTON "OK",1,189,183,50,14 DEFPUSHBUTTON "OK",1,189,183,50,14
GROUPBOX "",65497,3,0,293,179 GROUPBOX "",65497,3,0,293,180
RTEXT "File:",65498,8,11,24,10,SS_CENTERIMAGE | NOT WS_GROUP RTEXT "File:",65498,8,11,24,10,SS_CENTERIMAGE | NOT WS_GROUP
COMBOBOX IDC_COMBO_FILENAME,35,10,257,128,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_COMBO_FILENAME,35,10,257,128,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Cancel",2,243,183,50,14 PUSHBUTTON "Cancel",2,243,183,50,14
@ -1966,7 +1966,7 @@ BEGIN
LISTBOX IDC_LIST1,7,7,251,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP LISTBOX IDC_LIST1,7,7,251,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
END END
TEXTHOOKER DIALOGEX 0, 0, 456, 327 TEXTHOOKER DIALOGEX 0, 0, 437, 314
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Text Hooker" CAPTION "Text Hooker"
@ -2198,13 +2198,13 @@ BEGIN
PUSHBUTTON "Remove",IDC_C_WATCH_REMOVE,226,83,34,14 PUSHBUTTON "Remove",IDC_C_WATCH_REMOVE,226,83,34,14
PUSHBUTTON "New",IDC_C_WATCH,226,100,34,14 PUSHBUTTON "New",IDC_C_WATCH,226,100,34,14
PUSHBUTTON "Duplicate",IDC_C_WATCH_DUPLICATE,226,117,34,14 PUSHBUTTON "Duplicate",IDC_C_WATCH_DUPLICATE,226,117,34,14
PUSHBUTTON "Add Cheat",IDC_C_ADDCHEAT,223,168,42,16,WS_DISABLED PUSHBUTTON "Add Cheat",IDC_C_ADDCHEAT,222,163,42,16,WS_DISABLED
GROUPBOX "Watches",IDC_STATIC,222,11,42,145 GROUPBOX "Watches",IDC_STATIC,222,6,42,152
CONTROL "",ID_WATCHES_UPDOWN,"msctls_updown32",WS_TABSTOP,232,23,19,36 CONTROL "",ID_WATCHES_UPDOWN,"msctls_updown32",WS_TABSTOP,232,23,19,36
PUSHBUTTON "Separator",IDC_C_WATCH_SEPARATE,225,137,36,14 PUSHBUTTON "Separator",IDC_C_WATCH_SEPARATE,225,137,36,14
END END
IDD_EDITWATCH DIALOGEX 0, 0, 181, 125 IDD_EDITWATCH DIALOGEX 0, 0, 177, 115
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION " Edit Watch" CAPTION " Edit Watch"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@ -2213,17 +2213,17 @@ BEGIN
EDITTEXT IDC_EDIT_COMPAREADDRESS,48,10,65,12,ES_UPPERCASE | ES_AUTOHSCROLL EDITTEXT IDC_EDIT_COMPAREADDRESS,48,10,65,12,ES_UPPERCASE | ES_AUTOHSCROLL
CTEXT "&Notes:",IDC_PROMPT_TEXT,23,24,22,8 CTEXT "&Notes:",IDC_PROMPT_TEXT,23,24,22,8
EDITTEXT IDC_PROMPT_EDIT,48,22,119,12,ES_AUTOHSCROLL EDITTEXT IDC_PROMPT_EDIT,48,22,119,12,ES_AUTOHSCROLL
GROUPBOX "Data Type",IDC_DATATYPE_GROUPBOX,14,37,75,51,0,WS_EX_TRANSPARENT GROUPBOX "Data Type",IDC_DATATYPE_GROUPBOX,14,37,75,53,0,WS_EX_TRANSPARENT
CONTROL "&Signed",IDC_SIGNED,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,18,47,67,9 CONTROL "&Signed",IDC_SIGNED,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,18,47,67,9
CONTROL "&Unsigned",IDC_UNSIGNED,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,18,57,67,9 CONTROL "&Unsigned",IDC_UNSIGNED,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,18,57,67,9
CONTROL "&Hexadecimal",IDC_HEX,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,18,67,67,9 CONTROL "&Hexadecimal",IDC_HEX,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,18,67,67,9
CONTROL "&Binary",IDC_BINARY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,18,77,67,9 CONTROL "&Binary",IDC_BINARY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,18,77,67,9
GROUPBOX "Data Size",IDC_DATASIZE_GROUPBOX,94,37,73,42,0,WS_EX_TRANSPARENT GROUPBOX "Data Size",IDC_DATASIZE_GROUPBOX,94,37,73,52,0,WS_EX_TRANSPARENT
CONTROL "&1 byte",IDC_1_BYTE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,98,47,61,11 CONTROL "&1 byte",IDC_1_BYTE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,98,47,61,11
CONTROL "&2 bytes",IDC_2_BYTES,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,98,57,61,11 CONTROL "&2 bytes",IDC_2_BYTES,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,98,57,61,11
CONTROL "&4 bytes",IDC_4_BYTES,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,98,67,61,11 CONTROL "&4 bytes",IDC_4_BYTES,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,98,67,61,11
DEFPUSHBUTTON "&OK",IDOK,66,97,50,14 DEFPUSHBUTTON "&OK",IDOK,66,93,50,14
PUSHBUTTON "&Cancel",IDCANCEL,117,97,50,15 PUSHBUTTON "&Cancel",IDCANCEL,118,93,50,14
END END
DLG_SNESPAD DIALOGEX 4, 109, 243, 121 DLG_SNESPAD DIALOGEX 4, 109, 243, 121
@ -2358,7 +2358,7 @@ BEGIN
COMBOBOX IDC_VS_PPU_COMBO,155,154,140,30,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_VS_PPU_COMBO,155,154,140,30,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
CONTROL "iNES 1.0 Unofficial Properties",IDC_CHECK_UNOFFICIAL, CONTROL "iNES 1.0 Unofficial Properties",IDC_CHECK_UNOFFICIAL,
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_DISABLED | WS_TABSTOP,14,164,103,10 "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_DISABLED | WS_TABSTOP,14,164,103,10
GROUPBOX "iNES 1.0 Unofficial Properties",IDC_UNOFFICIAL_GROUP,13,176,104,35,WS_DISABLED GROUPBOX "iNES 1.0 Unofficial Properties",IDC_UNOFFICIAL_GROUP,13,176,105,35,WS_DISABLED
CONTROL "Dual region",IDC_CHECK_UNOFFICIAL_EXTRA_REGION,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_DISABLED | WS_TABSTOP,19,186,48,10 CONTROL "Dual region",IDC_CHECK_UNOFFICIAL_EXTRA_REGION,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_DISABLED | WS_TABSTOP,19,186,48,10
CONTROL "PRG RAM exists",IDC_CHECK_UNOFFICIAL_PRGRAM,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_DISABLED | WS_TABSTOP,70,188,43,17 CONTROL "PRG RAM exists",IDC_CHECK_UNOFFICIAL_PRGRAM,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_DISABLED | WS_TABSTOP,70,188,43,17
CONTROL "Bus conflict",IDC_CHECK_UNOFFICIAL_BUS_CONFLICT,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_DISABLED | WS_TABSTOP,19,198,49,10 CONTROL "Bus conflict",IDC_CHECK_UNOFFICIAL_BUS_CONFLICT,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_DISABLED | WS_TABSTOP,19,198,49,10
@ -2368,7 +2368,7 @@ BEGIN
EDITTEXT IDC_MISCELLANEOUS_ROMS_EDIT,14,215,12,14,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED EDITTEXT IDC_MISCELLANEOUS_ROMS_EDIT,14,215,12,14,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
PUSHBUTTON "Restore",IDC_RESTORE_BUTTON,6,237,44,14,WS_DISABLED PUSHBUTTON "Restore",IDC_RESTORE_BUTTON,6,237,44,14,WS_DISABLED
PUSHBUTTON "Save as...",IDSAVE,223,237,44,14,WS_DISABLED PUSHBUTTON "Save as...",IDSAVE,223,237,44,14,WS_DISABLED
DEFPUSHBUTTON "Close",IDCLOSE,270,237,44,14 DEFPUSHBUTTON "Close",IDCLOSE,271,237,44,14
END END
@ -2431,6 +2431,14 @@ BEGIN
BOTTOMMARGIN, 209 BOTTOMMARGIN, 209
END END
"POWERPADDIALOG", DIALOG
BEGIN
END
"QUIZKINGDIALOG", DIALOG
BEGIN
END
"SOUNDCONFIG", DIALOG "SOUNDCONFIG", DIALOG
BEGIN BEGIN
LEFTMARGIN, 10 LEFTMARGIN, 10
@ -2439,6 +2447,10 @@ BEGIN
BOTTOMMARGIN, 274 BOTTOMMARGIN, 274
END END
"SUBORKBDIALOG", DIALOG
BEGIN
END
"TIMINGCONFIG", DIALOG "TIMINGCONFIG", DIALOG
BEGIN BEGIN
LEFTMARGIN, 10 LEFTMARGIN, 10
@ -2477,13 +2489,17 @@ BEGIN
"ADDBP", DIALOG "ADDBP", DIALOG
BEGIN BEGIN
RIGHTMARGIN, 195 RIGHTMARGIN, 195
BOTTOMMARGIN, 123 BOTTOMMARGIN, 125
END END
"NTVIEW", DIALOG "NTVIEW", DIALOG
BEGIN BEGIN
END END
"ROMPATCHER", DIALOG
BEGIN
END
"GGCONV", DIALOG "GGCONV", DIALOG
BEGIN BEGIN
END END
@ -2573,9 +2589,9 @@ BEGIN
"TEXTHOOKER", DIALOG "TEXTHOOKER", DIALOG
BEGIN BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 449 RIGHTMARGIN, 430
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 320 BOTTOMMARGIN, 307
END END
"CHEATCONSOLE", DIALOG "CHEATCONSOLE", DIALOG
@ -2584,6 +2600,10 @@ BEGIN
BOTTOMMARGIN, 225 BOTTOMMARGIN, 225
END END
IDD_LUA, DIALOG
BEGIN
END
"VIDEOCONFIG", DIALOG "VIDEOCONFIG", DIALOG
BEGIN BEGIN
END END
@ -2598,7 +2618,7 @@ BEGIN
IDD_EDITWATCH, DIALOG IDD_EDITWATCH, DIALOG
BEGIN BEGIN
BOTTOMMARGIN, 94 BOTTOMMARGIN, 112
END END
DLG_SNESPAD, DIALOG DLG_SNESPAD, DIALOG
@ -2698,6 +2718,36 @@ BEGIN
0 0
END END
INPUTCONFIG AFX_DIALOG_LAYOUT
BEGIN
0
END
IDD_REPLAYINP AFX_DIALOG_LAYOUT
BEGIN
0
END
IDD_RAMWATCH AFX_DIALOG_LAYOUT
BEGIN
0
END
TRACER AFX_DIALOG_LAYOUT
BEGIN
0
END
TEXTHOOKER AFX_DIALOG_LAYOUT
BEGIN
0
END
ROMPATCHER AFX_DIALOG_LAYOUT
BEGIN
0
END
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //