TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +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

6
Templates/BaseGame/game/tools/gui/materialSelector.ed.gui
View file

@ -1368,7 +1368,7 @@ function MaterialSelector::createFilter( %this, %filter )
{
if( %filter $= %existingFilters )
{
MessageBoxOK( "Error", "Can not create blank filter.");
toolsMessageBoxOK( "Error", "Can not create blank filter.");
return;
}
@ -1377,7 +1377,7 @@ function MaterialSelector::createFilter( %this, %filter )
%existingFilters = MaterialSelector-->filterArray.getObject(%i).getObject(0).filter;
if( %filter $= %existingFilters )
{
MessageBoxOK( "Error", "Can not create two filters of the same name.");
toolsMessageBoxOK( "Error", "Can not create two filters of the same name.");
return;
}
}
@ -1713,7 +1713,7 @@ function MaterialSelector::showDeleteDialog( %this )
if( isObject( %material ) )
{
MessageBoxYesNoCancel("Delete Material?",
toolsMessageBoxYesNoCancel("Delete Material?",
"Are you sure you want to delete<br><br>" @ %material.getName() @ "<br><br> Material deletion won't take affect until the engine is quit.",
"MaterialSelector.deleteMaterial( " @ %material @ ", " @ %secondFilter @ ", " @ %secondFilterName @" );",
"",

94
Templates/BaseGame/game/tools/gui/messageBoxes/messageBox.ed.cs
View file

@ -24,16 +24,16 @@
// Cleanup Dialog created by 'core'
if( isObject( MessagePopupDlg ) )
MessagePopupDlg.delete();
if( isObject( MessageBoxYesNoDlg ) )
MessageBoxYesNoDlg.delete();
if( isObject( MessageBoxYesNoCancelDlg ) )
MessageBoxYesNoCancelDlg.delete();
if( isObject( MessageBoxOKCancelDetailsDlg ) )
MessageBoxOKCancelDetailsDlg.delete();
if( isObject( MessageBoxOKCancelDlg ) )
MessageBoxOKCancelDlg.delete();
if( isObject( MessageBoxOKDlg ) )
MessageBoxOKDlg.delete();
if( isObject( toolsMessageBoxYesNoDlg ) )
toolsMessageBoxYesNoDlg.delete();
if( isObject( toolsMessageBoxYesNoCancelDlg ) )
toolsMessageBoxYesNoCancelDlg.delete();
if( isObject( toolsMessageBoxOKCancelDetailsDlg ) )
toolsMessageBoxOKCancelDetailsDlg.delete();
if( isObject( toolsMessageBoxOKCancelDlg ) )
toolsMessageBoxOKCancelDlg.delete();
if( isObject( toolsMessageBoxOKDlg ) )
toolsMessageBoxOKDlg.delete();
if( isObject( IODropdownDlg ) )
IODropdownDlg.delete();
@ -51,7 +51,7 @@ exec("./messagePopup.ed.gui");
// --------------------------------------------------------------------
// Message Sound
// --------------------------------------------------------------------
/*new SFXDescription(MessageBoxAudioDescription)
/*new SFXDescription(toolsMessageBoxAudioDescription)
{
volume = 1.0;
isLooping = false;
@ -59,10 +59,10 @@ exec("./messagePopup.ed.gui");
channel = $GuiAudioType;
};
new SFXProfile(messageBoxBeep)
new SFXProfile(toolsMessageBoxBeep)
{
filename = "./messageBoxSound";
description = MessageBoxAudioDescription;
filename = "./toolsMessageBoxSound";
description = toolsMessageBoxAudioDescription;
preload = true;
};*/
@ -122,7 +122,7 @@ function MBSetText(%text, %frame, %msg)
%frame.canMinimize = "0";
%frame.canMaximize = "0";
//sfxPlayOnce( messageBoxBeep );
//sfxPlayOnce( toolsMessageBoxBeep );
}
//---------------------------------------------------------------------------------------------
@ -130,34 +130,34 @@ function MBSetText(%text, %frame, %msg)
// callback for each button.
//---------------------------------------------------------------------------------------------
function MessageBoxOK(%title, %message, %callback)
function toolsMessageBoxOK(%title, %message, %callback)
{
MBOKFrame.text = %title;
Canvas.pushDialog(MessageBoxOKDlg);
Canvas.pushDialog(toolsMessageBoxOKDlg);
MBSetText(MBOKText, MBOKFrame, %message);
MessageBoxOKDlg.callback = %callback;
toolsMessageBoxOKDlg.callback = %callback;
}
function MessageBoxOKDlg::onSleep( %this )
function toolsMessageBoxOKDlg::onSleep( %this )
{
%this.callback = "";
}
function MessageBoxOKCancel(%title, %message, %callback, %cancelCallback)
function toolsMessageBoxOKCancel(%title, %message, %callback, %cancelCallback)
{
MBOKCancelFrame.text = %title;
Canvas.pushDialog(MessageBoxOKCancelDlg);
Canvas.pushDialog(toolsMessageBoxOKCancelDlg);
MBSetText(MBOKCancelText, MBOKCancelFrame, %message);
MessageBoxOKCancelDlg.callback = %callback;
MessageBoxOKCancelDlg.cancelCallback = %cancelCallback;
toolsMessageBoxOKCancelDlg.callback = %callback;
toolsMessageBoxOKCancelDlg.cancelCallback = %cancelCallback;
}
function MessageBoxOKCancelDlg::onSleep( %this )
function toolsMessageBoxOKCancelDlg::onSleep( %this )
{
%this.callback = "";
}
function MessageBoxOKCancelDetails(%title, %message, %details, %callback, %cancelCallback)
function toolsMessageBoxOKCancelDetails(%title, %message, %details, %callback, %cancelCallback)
{
if(%details $= "")
{
@ -168,7 +168,7 @@ function MessageBoxOKCancelDetails(%title, %message, %details, %callback, %cance
MBOKCancelDetailsFrame.setText( %title );
Canvas.pushDialog(MessageBoxOKCancelDetailsDlg);
Canvas.pushDialog(toolsMessageBoxOKCancelDetailsDlg);
MBSetText(MBOKCancelDetailsText, MBOKCancelDetailsFrame, %message);
MBOKCancelDetailsInfoText.setText(%details);
@ -183,8 +183,8 @@ function MessageBoxOKCancelDetails(%title, %message, %details, %callback, %cance
MBOKCancelDetailsFrame.setExtent(300, %extentY);
MessageBoxOKCancelDetailsDlg.callback = %callback;
MessageBoxOKCancelDetailsDlg.cancelCallback = %cancelCallback;
toolsMessageBoxOKCancelDetailsDlg.callback = %callback;
toolsMessageBoxOKCancelDetailsDlg.cancelCallback = %cancelCallback;
MBOKCancelDetailsFrame.defaultExtent = MBOKCancelDetailsFrame.getExtent();
}
@ -223,33 +223,33 @@ function MBOKCancelDetailsToggleInfoFrame()
}
}
function MessageBoxOKCancelDetailsDlg::onSleep( %this )
function toolsMessageBoxOKCancelDetailsDlg::onSleep( %this )
{
%this.callback = "";
}
function MessageBoxYesNo(%title, %message, %yesCallback, %noCallback)
function toolsMessageBoxYesNo(%title, %message, %yesCallback, %noCallback)
{
MBYesNoFrame.text = %title;
MessageBoxYesNoDlg.profile = "GuiOverlayProfile";
Canvas.pushDialog(MessageBoxYesNoDlg);
toolsMessageBoxYesNoDlg.profile = "GuiOverlayProfile";
Canvas.pushDialog(toolsMessageBoxYesNoDlg);
MBSetText(MBYesNoText, MBYesNoFrame, %message);
MessageBoxYesNoDlg.yesCallBack = %yesCallback;
MessageBoxYesNoDlg.noCallback = %noCallBack;
toolsMessageBoxYesNoDlg.yesCallBack = %yesCallback;
toolsMessageBoxYesNoDlg.noCallback = %noCallBack;
}
function MessageBoxYesNoCancel(%title, %message, %yesCallback, %noCallback, %cancelCallback)
function toolsMessageBoxYesNoCancel(%title, %message, %yesCallback, %noCallback, %cancelCallback)
{
MBYesNoCancelFrame.text = %title;
MessageBoxYesNoDlg.profile = "GuiOverlayProfile";
Canvas.pushDialog(MessageBoxYesNoCancelDlg);
toolsMessageBoxYesNoDlg.profile = "GuiOverlayProfile";
Canvas.pushDialog(toolsMessageBoxYesNoCancelDlg);
MBSetText(MBYesNoCancelText, MBYesNoCancelFrame, %message);
MessageBoxYesNoCancelDlg.yesCallBack = %yesCallback;
MessageBoxYesNoCancelDlg.noCallback = %noCallBack;
MessageBoxYesNoCancelDlg.cancelCallback = %cancelCallback;
toolsMessageBoxYesNoCancelDlg.yesCallBack = %yesCallback;
toolsMessageBoxYesNoCancelDlg.noCallback = %noCallBack;
toolsMessageBoxYesNoCancelDlg.cancelCallback = %cancelCallback;
}
function MessageBoxYesNoDlg::onSleep( %this )
function toolsMessageBoxYesNoDlg::onSleep( %this )
{
%this.yesCallback = "";
%this.noCallback = "";
@ -311,15 +311,15 @@ function CloseMessagePopup()
// "Old" message box function aliases for backwards-compatibility.
//---------------------------------------------------------------------------------------------
function MessageBoxOKOld( %title, %message, %callback )
function toolsMessageBoxOKOld( %title, %message, %callback )
{
MessageBoxOK( %title, %message, %callback );
toolsMessageBoxOK( %title, %message, %callback );
}
function MessageBoxOKCancelOld( %title, %message, %callback, %cancelCallback )
function toolsMessageBoxOKCancelOld( %title, %message, %callback, %cancelCallback )
{
MessageBoxOKCancel( %title, %message, %callback, %cancelCallback );
toolsMessageBoxOKCancel( %title, %message, %callback, %cancelCallback );
}
function MessageBoxYesNoOld( %title, %message, %yesCallback, %noCallback )
function toolsMessageBoxYesNoOld( %title, %message, %yesCallback, %noCallback )
{
MessageBoxYesNo( %title, %message, %yesCallback, %noCallback );
toolsMessageBoxYesNo( %title, %message, %yesCallback, %noCallback );
}

4
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOK.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MessageBoxOKDlg) {
%guiContent = new GuiControl(toolsMessageBoxOKDlg) {
profile = "GuiOverlayProfile";
horizSizing = "width";
vertSizing = "height";
@ -49,7 +49,7 @@
extent = "80 24";
minExtent = "8 8";
visible = "1";
command = "MessageCallback(MessageBoxOKDlg,MessageBoxOKDlg.callback);";
command = "MessageCallback(toolsMessageBoxOKDlg,toolsMessageBoxOKDlg.callback);";
accelerator = "return";
helpTag = "0";
text = "Ok";

18
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKBuy.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MessageBoxOKBuyDlg) {
%guiContent = new GuiControl(toolsMessageBoxOKBuyDlg) {
profile = "ToolsGuiDefaultProfile";
horizSizing = "width";
vertSizing = "height";
@ -27,7 +27,7 @@
canMaximize = "0";
minSize = "50 50";
text = "";
closeCommand = "MessageCallback(MessageBoxOKBuyDlg,MessageBoxOKBuyDlg.noCallback);";
closeCommand = "MessageCallback(toolsMessageBoxOKBuyDlg,toolsMessageBoxOKBuyDlg.noCallback);";
new GuiMLTextCtrl(MBOKBuyText) {
profile = "ToolsGuiMLTextProfile";
@ -50,7 +50,7 @@
extent = "80 22";
minExtent = "8 8";
visible = "1";
command = "MessageCallback(MessageBoxOKBuyDlg,MessageBoxOKBuyDlg.OKCallback);";
command = "MessageCallback(toolsMessageBoxOKBuyDlg,toolsMessageBoxOKBuyDlg.OKCallback);";
accelerator = "return";
helpTag = "0";
text = "OK";
@ -64,7 +64,7 @@
extent = "80 22";
minExtent = "8 8";
visible = "1";
command = "MessageCallback(MessageBoxOKBuyDlg,MessageBoxOKBuyDlg.BuyCallback);";
command = "MessageCallback(toolsMessageBoxOKBuyDlg,toolsMessageBoxOKBuyDlg.BuyCallback);";
accelerator = "escape";
helpTag = "0";
text = "Buy Now!";
@ -74,12 +74,12 @@
};
//--- OBJECT WRITE END ---
function MessageBoxOKBuy(%title, %message, %OKCallback, %BuyCallback)
function toolsMessageBoxOKBuy(%title, %message, %OKCallback, %BuyCallback)
{
MBOKBuyFrame.text = %title;
MessageBoxOKBuyDlg.profile = "ToolsGuiOverlayProfile";
Canvas.pushDialog(MessageBoxOKBuyDlg);
toolsMessageBoxOKBuyDlg.profile = "ToolsGuiOverlayProfile";
Canvas.pushDialog(toolsMessageBoxOKBuyDlg);
MBSetText(MBOKBuyText, MBOKBuyFrame, %message);
MessageBoxOKBuyDlg.OKCallback = %OKCallback;
MessageBoxOKBuyDlg.BuyCallback = %BuyCallback;
toolsMessageBoxOKBuyDlg.OKCallback = %OKCallback;
toolsMessageBoxOKBuyDlg.BuyCallback = %BuyCallback;
}

6
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancel.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MessageBoxOKCancelDlg) {
%guiContent = new GuiControl(toolsMessageBoxOKCancelDlg) {
profile = "GuiOverlayProfile";
horizSizing = "width";
vertSizing = "height";
@ -50,7 +50,7 @@
extent = "80 24";
minExtent = "8 8";
visible = "1";
command = "MessageCallback(MessageBoxOKCancelDlg,MessageBoxOKCancelDlg.callback);";
command = "MessageCallback(toolsMessageBoxOKCancelDlg,toolsMessageBoxOKCancelDlg.callback);";
accelerator = "return";
helpTag = "0";
text = "Ok";
@ -64,7 +64,7 @@
extent = "80 24";
minExtent = "8 8";
visible = "1";
command = "MessageCallback(MessageBoxOKCancelDlg,MessageBoxOKCancelDlg.cancelCallback);";
command = "MessageCallback(toolsMessageBoxOKCancelDlg,toolsMessageBoxOKCancelDlg.cancelCallback);";
accelerator = "escape";
helpTag = "0";
text = "Cancel";

6
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxOKCancelDetailsDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MessageBoxOKCancelDetailsDlg) {
%guiContent = new GuiControl(toolsMessageBoxOKCancelDetailsDlg) {
canSaveDynamicFields = "0";
Profile = "GuiOverlayProfile";
HorizSizing = "width";
@ -57,7 +57,7 @@
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Command = "MessageCallback(MessageBoxOKCancelDetailsDlg,MessageBoxOKCancelDetailsDlg.callback);";
Command = "MessageCallback(toolsMessageBoxOKCancelDetailsDlg,toolsMessageBoxOKCancelDetailsDlg.callback);";
Accelerator = "return";
hovertime = "1000";
text = "OK";
@ -74,7 +74,7 @@
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Command = "MessageCallback(MessageBoxOKCancelDetailsDlg,MessageBoxOKCancelDetailsDlg.cancelCallback);";
Command = "MessageCallback(toolsMessageBoxOKCancelDetailsDlg,toolsMessageBoxOKCancelDetailsDlg.cancelCallback);";
Accelerator = "escape";
hovertime = "1000";
text = "CANCEL";

8
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNo.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MessageBoxYesNoDlg) {
%guiContent = new GuiControl(toolsMessageBoxYesNoDlg) {
profile = "GuiOverlayProfile";
horizSizing = "width";
vertSizing = "height";
@ -27,7 +27,7 @@
canMaximize = "0";
minSize = "50 50";
text = "";
closeCommand = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.noCallback);";
closeCommand = "MessageCallback(toolsMessageBoxYesNoDlg,toolsMessageBoxYesNoDlg.noCallback);";
new GuiMLTextCtrl(MBYesNoText) {
profile = "ToolsGuiMLTextProfile";
@ -50,7 +50,7 @@
extent = "80 22";
minExtent = "8 8";
visible = "1";
command = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.yesCallback);";
command = "MessageCallback(toolsMessageBoxYesNoDlg,toolsMessageBoxYesNoDlg.yesCallback);";
accelerator = "return";
helpTag = "0";
text = "Yes";
@ -64,7 +64,7 @@
extent = "80 22";
minExtent = "8 8";
visible = "1";
command = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.noCallback);";
command = "MessageCallback(toolsMessageBoxYesNoDlg,toolsMessageBoxYesNoDlg.noCallback);";
accelerator = "escape";
helpTag = "0";
text = "No";

10
Templates/BaseGame/game/tools/gui/messageBoxes/messageBoxYesNoCancel.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MessageBoxYesNoCancelDlg) {
%guiContent = new GuiControl(toolsMessageBoxYesNoCancelDlg) {
canSaveDynamicFields = "0";
Profile = "GuiOverlayProfile";
HorizSizing = "width";
@ -31,7 +31,7 @@
canMaximize = "0";
minSize = "50 50";
text = "";
closeCommand="MessageCallback(MessageBoxYesNoCancelDlg,MessageBoxYesNoCancelDlg.cancelCallback);";
closeCommand="MessageCallback(toolsMessageBoxYesNoCancelDlg,toolsMessageBoxYesNoCancelDlg.cancelCallback);";
new GuiMLTextCtrl(MBYesNoCancelText) {
canSaveDynamicFields = "0";
@ -58,7 +58,7 @@
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Command = "MessageCallback(MessageBoxYesNoCancelDlg,MessageBoxYesNoCancelDlg.yesCallback);";
Command = "MessageCallback(toolsMessageBoxYesNoCancelDlg,toolsMessageBoxYesNoCancelDlg.yesCallback);";
Accelerator = "return";
hovertime = "1000";
text = "Yes";
@ -75,7 +75,7 @@
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Command = "MessageCallback(MessageBoxYesNoCancelDlg,MessageBoxYesNoCancelDlg.noCallback);";
Command = "MessageCallback(toolsMessageBoxYesNoCancelDlg,toolsMessageBoxYesNoCancelDlg.noCallback);";
hovertime = "1000";
text = "No";
groupNum = "-1";
@ -91,7 +91,7 @@
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Command = "MessageCallback(MessageBoxYesNoCancelDlg,MessageBoxYesNoCancelDlg.cancelCallback);";
Command = "MessageCallback(toolsMessageBoxYesNoCancelDlg,toolsMessageBoxYesNoCancelDlg.cancelCallback);";
Accelerator = "escape";
hovertime = "1000";
text = "Cancel";

28
Templates/BaseGame/game/tools/gui/saveChangesMBDlg.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(MessageBoxSaveChangesDlg, EditorGuiGroup) {
%guiContent = new GuiControl(toolsMessageBoxSaveChangesDlg, EditorGuiGroup) {
canSaveDynamicFields = "0";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "width";
@ -136,45 +136,45 @@
};
//--- OBJECT WRITE END ---
function MessageBoxSaveChangesDlg::onWake( %this )
function toolsMessageBoxSaveChangesDlg::onWake( %this )
{
MBSaveChangesFrame.setText( %this.Data );
}
function mbSaveDlgSaveButton::onClick( %this )
{
if( MessageBoxSaveChangesDlg.SaveCallback !$= "" )
eval( MessageBoxSaveChangesDlg.SaveCallback @ "(" @ MessageBoxSaveChangesDlg.Data @ ");" );
Canvas.popDialog( MessageBoxSaveChangesDlg );
if( toolsMessageBoxSaveChangesDlg.SaveCallback !$= "" )
eval( toolsMessageBoxSaveChangesDlg.SaveCallback @ "(" @ toolsMessageBoxSaveChangesDlg.Data @ ");" );
Canvas.popDialog( toolsMessageBoxSaveChangesDlg );
}
function mbSaveDlgCancelButton::onClick( %this )
{
Canvas.popDialog( MessageBoxSaveChangesDlg );
Canvas.popDialog( toolsMessageBoxSaveChangesDlg );
}
function mbSaveDlgDontButton::onClick( %this )
{
if( MessageBoxSaveChangesDlg.DontSaveCallback !$= "" )
eval( MessageBoxSaveChangesDlg.DontSaveCallback @ "(" @ MessageBoxSaveChangesDlg.Data @ ");" );
Canvas.popDialog( MessageBoxSaveChangesDlg );
if( toolsMessageBoxSaveChangesDlg.DontSaveCallback !$= "" )
eval( toolsMessageBoxSaveChangesDlg.DontSaveCallback @ "(" @ toolsMessageBoxSaveChangesDlg.Data @ ");" );
Canvas.popDialog( toolsMessageBoxSaveChangesDlg );
}
// Deprecated when platform layers are all sufficient
function checkSaveChangesOld( %data, %saveCallback, %dontSaveCallback )
{
// Sanity Check
if( MessageBoxSaveChangesDlg.isAwake() )
if( toolsMessageBoxSaveChangesDlg.isAwake() )
{
warn("Save Changes Dialog already Awake, NOT creating second instance.");
return;
}
// Set Proper State
MessageBoxSaveChangesDlg.SaveCallback = %saveCallback;
MessageBoxSaveChangesDlg.DontSaveCallback = %dontSaveCallback;
MessageBoxSaveChangesDlg.Data = %data;
toolsMessageBoxSaveChangesDlg.SaveCallback = %saveCallback;
toolsMessageBoxSaveChangesDlg.DontSaveCallback = %dontSaveCallback;
toolsMessageBoxSaveChangesDlg.Data = %data;
// Show Dialog
Canvas.pushDialog( MessageBoxSaveChangesDlg );
Canvas.pushDialog( toolsMessageBoxSaveChangesDlg );
}