TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-22 21:05:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Shifts the tools messageboxes to be distinct from any messageboxes in the main game

Browse source 
Reorged the canvas handling of gamepad inputs for the axis and triggers to use the SI_ versions in the right spots
Fixed issue where pause menu would be hidden and not display again
Made the pause menu active from the gamepad start button rather than back
This commit is contained in:
Areloch 2020-07-24 00:40:03 -05:00
parent ef4cc8b573
commit 5b289bce5e
57 changed files with 217 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/guiEditor/scripts/EditorChooseGUI.ed.cs
View file

@ -51,7 +51,7 @@ function GE_OpenGUIFile()
// group. And, it should be the only thing in the group.
if( !isObject( %guiContent ) )
{
MessageBox( getEngineName(),
toolsMessageBox( getEngineName(),
"You have loaded a Gui file that was created before this version. It has been loaded but you must open it manually from the content list dropdown",
"Ok", "Information" );
GuiEditContent( Canvas.getContent() );

2
Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.cs
View file

@ -32,7 +32,7 @@ function GuiEdit( %val )
{
if (Canvas.isFullscreen())
{
MessageBoxOK("Windowed Mode Required", "Please switch to windowed mode to access the GUI Editor.");
toolsMessageBoxOK("Windowed Mode Required", "Please switch to windowed mode to access the GUI Editor.");
return;
}

10
Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.cs
View file

@ -283,7 +283,7 @@ function GuiEditCanvas::load( %this, %filename )
// group. And, it should be the only thing in the group.
if( !isObject( %guiContent ) )
{
MessageBox( getEngineName(),
toolsMessageBox( getEngineName(),
"You have loaded a Gui file that was created before this version. It has been loaded but you must open it manually from the content list dropdown",
"Ok", "Information" );
return 0;
@ -333,7 +333,7 @@ function GuiEditCanvas::save( %this, %selectedOnly, %noPrompt )
return;
else if( %selected.getCount() > 1 )
{
MessageBox( "Invalid selection", "Only a single control hierarchy can be saved to a file. Make sure you have selected only one control in the tree view." );
toolsMessageBox( "Invalid selection", "Only a single control hierarchy can be saved to a file. Make sure you have selected only one control in the tree view." );
return;
}
@ -464,7 +464,7 @@ function GuiEditCanvas::save( %this, %selectedOnly, %noPrompt )
GuiEditorStatusBar.print( "Saved file '" @ %currentObject.getFileName() @ "'" );
}
else
MessageBox( "Error writing to file", "There was an error writing to file '" @ %currentFile @ "'. The file may be read-only.", "Ok", "Error" );
toolsMessageBox( "Error writing to file", "There was an error writing to file '" @ %currentFile @ "'. The file may be read-only.", "Ok", "Error" );
}
//---------------------------------------------------------------------------------------------
@ -490,7 +490,7 @@ function GuiEditCanvas::append( %this )
if( !isObject( %guiContent ) )
{
MessageBox( "Error loading GUI file", "The GUI content controls could not be found. This function can only be used with files saved by the GUI editor.", "Ok", "Error" );
toolsMessageBox( "Error loading GUI file", "The GUI content controls could not be found. This function can only be used with files saved by the GUI editor.", "Ok", "Error" );
return;
}
@ -519,7 +519,7 @@ function GuiEditCanvas::revert( %this )
if( %filename $= "" )
return;
if( MessageBox( "Revert Gui", "Really revert the current Gui? This cannot be undone.", "OkCancel", "Question" ) == $MROk )
if( toolsMessageBox( "Revert Gui", "Really revert the current Gui? This cannot be undone.", "OkCancel", "Question" ) == $MROk )
%this.load( %filename );
}

10
Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorContentList.ed.cs
View file

@ -30,11 +30,11 @@ if( !isDefined( "$GuiEditor::GuiFilterList" ) )
$GuiEditor::GuiFilterList =
"GuiEditorGui" TAB
"AL_ShadowVizOverlayCtrl" TAB
"MessageBoxOKDlg" TAB
"MessageBoxOKCancelDlg" TAB
"MessageBoxOKCancelDetailsDlg" TAB
"MessageBoxYesNoDlg" TAB
"MessageBoxYesNoCancelDlg" TAB
"toolsMessageBoxOKDlg" TAB
"toolsMessageBoxOKCancelDlg" TAB
"toolsMessageBoxOKCancelDetailsDlg" TAB
"toolsMessageBoxYesNoDlg" TAB
"toolsMessageBoxYesNoCancelDlg" TAB
"MessagePopupDlg";
}

2
Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorNewGuiDialog.ed.cs
View file

@ -81,7 +81,7 @@ function GuiEditorNewGuiDialog::onOK( %this )
if( isObject( %name ) && %name.isMemberOfClass( "GuiControl" ) )
{
if( MessageBox( "Warning", "Replace the existing control '" @ %name @ "'?", "OkCancel", "Question" ) == $MROk )
if( toolsMessageBox( "Warning", "Replace the existing control '" @ %name @ "'?", "OkCancel", "Question" ) == $MROk )
%name.delete();
else
return;

4
Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.cs
View file

@ -86,13 +86,13 @@ function GuiEditor::showDeleteProfileDialog( %this, %profile )
if( %profile.isInUse() )
{
MessageBoxOk( "Error",
toolsMessageBoxOk( "Error",
"The profile '" @ %profile.getName() @ "' is still used by Gui controls."
);
return;
}
MessageBoxYesNo( "Delete Profile?",
toolsMessageBoxYesNo( "Delete Profile?",
"Do you really want to delete '" @ %profile.getName() @ "'?",
"GuiEditor.deleteProfile( " @ %profile @ " );"
);