mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-01-19 20:24:49 +00:00
Remove tabs from asset broser and win. console
Remove the tabs from the asset browser and windowed console. There were some issues and asset browser will be changed soon. Downside is that the windowed console and asset browser will now open on top of each other.
This commit is contained in:
parent
e9638d285f
commit
0291b000e0
|
|
@ -1180,90 +1180,6 @@ $guiContent = new GuiControl(AssetBrowser) {
|
|||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiButtonCtrl(assetBrowser_Tab1) {
|
||||
text = "Tab1 Text 1";
|
||||
buttonType = "PushButton";
|
||||
useMouseEvents = "0";
|
||||
position = "5 1";
|
||||
extent = "95 20";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiEditorTabButton";
|
||||
visible = "1";
|
||||
hidden = "1";
|
||||
active = "1";
|
||||
command = "";
|
||||
tooltipProfile = "ToolsGuiToolTipProfile";
|
||||
ToolTip = "Bring this window to the front";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "0";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiButtonCtrl(assetBrowser_Tab2) {
|
||||
text = "Tab1 Text 2";
|
||||
buttonType = "PushButton";
|
||||
useMouseEvents = "0";
|
||||
position = "105 1";
|
||||
extent = "95 20";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiEditorTabButton";
|
||||
visible = "1";
|
||||
hidden = "1";
|
||||
active = "1";
|
||||
command = "";
|
||||
tooltipProfile = "ToolsGuiToolTipProfile";
|
||||
ToolTip = "Bring this window to the front";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "0";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiButtonCtrl(assetBrowser_Tab3) {
|
||||
text = "Tab1 Text 3";
|
||||
buttonType = "PushButton";
|
||||
useMouseEvents = "0";
|
||||
position = "205 1";
|
||||
extent = "95 20";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiEditorTabButton";
|
||||
visible = "1";
|
||||
hidden = "1";
|
||||
active = "1";
|
||||
command = "";
|
||||
tooltipProfile = "ToolsGuiToolTipProfile";
|
||||
ToolTip = "Bring this window to the front";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "0";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiButtonCtrl(assetBrowser_Tab4) {
|
||||
text = "Tab1 Text 4";
|
||||
buttonType = "PushButton";
|
||||
useMouseEvents = "0";
|
||||
position = "305 1";
|
||||
extent = "95 20";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiEditorTabButton";
|
||||
visible = "1";
|
||||
hidden = "1";
|
||||
active = "1";
|
||||
command = "";
|
||||
tooltipProfile = "ToolsGuiToolTipProfile";
|
||||
ToolTip = "Bring this window to the front";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "0";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiBitmapButtonCtrl(AssetBrowserWindow_UnDockBtn) {
|
||||
canSaveDynamicFields = "0";
|
||||
internalName = "";
|
||||
|
|
|
|||
|
|
@ -92,42 +92,6 @@ function AssetBrowser::onDialogPop(%this)
|
|||
function AssetBrowser::onDialogPush(%this)
|
||||
{
|
||||
$AssetBrowser::Open = true;
|
||||
|
||||
// Add a tab to the windowed console
|
||||
if($WindowConsole::Open)
|
||||
{
|
||||
%text = "Console Log";
|
||||
%command = "windowConsoleControl.putToFront();";
|
||||
|
||||
AssetBrowserWindow.text = "";
|
||||
windowConsoleControl.text = "";
|
||||
|
||||
AssetBrowser.setTab(assetBrowser_Tab1, "Asset Browser", "");
|
||||
assetBrowser_Tab1.setHidden(false);
|
||||
assetBrowser_Tab1.setActive(false);
|
||||
|
||||
if(assetBrowser_Tab2.text $= %text || assetBrowser_Tab3.text $= %text || assetBrowser_Tab4.text $= %text)
|
||||
{
|
||||
// we have a tab, don't do anything
|
||||
}
|
||||
else if(assetBrowser_Tab2.hidden == true)
|
||||
{
|
||||
AssetBrowser.setTab(assetBrowser_Tab2, %text, %command);
|
||||
}
|
||||
else if(assetBrowser_Tab3.hidden == true)
|
||||
{
|
||||
AssetBrowser.setTab(assetBrowser_Tab3, %text, %command);
|
||||
}
|
||||
else if(assetBrowser_Tab4.hidden == true)
|
||||
{
|
||||
AssetBrowser.setTab(assetBrowser_Tab4, %text, %command);
|
||||
}
|
||||
else
|
||||
{
|
||||
warn("Ran out of tabs for AssetBrowserWindow - windowConsoleDlg::showWindow()");
|
||||
}
|
||||
}
|
||||
|
||||
EditorGui.updateSideBar();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -304,90 +304,6 @@ $guiContent = new GuiControl(windowConsoleDlg) {
|
|||
canSave = "0";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiButtonCtrl(windowConsole_Tab1) {
|
||||
text = "Tab1 Text 1";
|
||||
buttonType = "PushButton";
|
||||
useMouseEvents = "0";
|
||||
position = "5 1";
|
||||
extent = "95 20";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiEditorTabButton";
|
||||
visible = "1";
|
||||
hidden = "1";
|
||||
active = "1";
|
||||
command = "";
|
||||
tooltipProfile = "ToolsGuiToolTipProfile";
|
||||
ToolTip = "Bring this window to the front";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "0";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiButtonCtrl(windowConsole_Tab2) {
|
||||
text = "Tab1 Text 2";
|
||||
buttonType = "PushButton";
|
||||
useMouseEvents = "0";
|
||||
position = "105 1";
|
||||
extent = "95 20";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiEditorTabButton";
|
||||
visible = "1";
|
||||
hidden = "1";
|
||||
active = "1";
|
||||
command = "";
|
||||
tooltipProfile = "ToolsGuiToolTipProfile";
|
||||
ToolTip = "Bring this window to the front";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "0";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiButtonCtrl(windowConsole_Tab3) {
|
||||
text = "Tab Text 3";
|
||||
buttonType = "PushButton";
|
||||
useMouseEvents = "0";
|
||||
position = "205 1";
|
||||
extent = "95 20";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiEditorTabButton";
|
||||
visible = "1";
|
||||
hidden = "1";
|
||||
active = "1";
|
||||
command = "";
|
||||
tooltipProfile = "ToolsGuiToolTipProfile";
|
||||
ToolTip = "Bring this window to the front";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "0";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiButtonCtrl(windowConsole_Tab4) {
|
||||
text = "Tab Text 3";
|
||||
buttonType = "PushButton";
|
||||
useMouseEvents = "0";
|
||||
position = "305 1";
|
||||
extent = "95 20";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiEditorTabButton";
|
||||
visible = "1";
|
||||
hidden = "1";
|
||||
active = "1";
|
||||
command = "";
|
||||
tooltipProfile = "ToolsGuiToolTipProfile";
|
||||
ToolTip = "Bring this window to the front";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
canSave = "0";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiBitmapButtonCtrl(windowConsole_UnDockBtn) {
|
||||
canSaveDynamicFields = "0";
|
||||
internalName = "";
|
||||
|
|
|
|||
|
|
@ -105,41 +105,6 @@ function windowConsoleDlg::showWindow(%this)
|
|||
$WindowConsole::Open = true;
|
||||
Canvas.pushDialog(%this);
|
||||
%this-->Scroll.setVisible(true);
|
||||
|
||||
// Add a tab to the asset browser
|
||||
if($AssetBrowser::Open)
|
||||
{
|
||||
%text = "Asset Browser";
|
||||
%command = "AssetBrowser.putToFront();";
|
||||
|
||||
AssetBrowserWindow.text = "";
|
||||
windowConsoleControl.text = "";
|
||||
|
||||
windowConsoleControl.setTab(windowConsole_Tab1, "Console Log", "");
|
||||
windowConsole_Tab1.setHidden(false);
|
||||
windowConsole_Tab1.setActive(false);
|
||||
|
||||
if(windowConsole_Tab2.text $= %text || windowConsole_Tab3.text $= %text || windowConsole_Tab4.text $= %text)
|
||||
{
|
||||
// we have a tab, don't do anything
|
||||
}
|
||||
else if(windowConsole_Tab2.hidden == true)
|
||||
{
|
||||
windowConsoleControl.setTab(windowConsole_Tab2, %text, %command);
|
||||
}
|
||||
else if(windowConsole_Tab3.hidden == true)
|
||||
{
|
||||
windowConsoleControl.setTab(windowConsole_Tab3, %text, %command);
|
||||
}
|
||||
else if(windowConsole_Tab4.hidden == true)
|
||||
{
|
||||
windowConsoleControl.setTab(windowConsole_Tab4, %text, %command);
|
||||
}
|
||||
else
|
||||
{
|
||||
warn("Ran out of tabs for AssetBrowserWindow - windowConsoleDlg::showWindow()");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in a new issue