TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Editor GUI Update PT.2

Browse source 
- Console color scheme + increased font size
- Changed bar extend
- fixed highlights
This commit is contained in:
vvv-yeaf 2022-09-20 21:59:05 -03:00
parent 0137778641
commit 3d41ac7d79
26 changed files with 121 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

234
Templates/BaseGame/game/core/console/guis/console.gui
View file

@ -1,214 +1,80 @@
//--- OBJECT WRITE BEGIN --- //--- OBJECT WRITE BEGIN ---
$guiContent = new GuiControl(ConsoleDlg) { $guiContent = new GuiControl(ConsoleDlg) {
position = "0 0";
extent = "1024 768"; extent = "1024 768";
minExtent = "8 8"; minExtent = "8 8";
horizSizing = "right"; profile = "GuiConsoleProfile";
vertSizing = "bottom"; tooltipProfile = "GuiConsoleProfile";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1"; isContainer = "1";
canSave = "1";
canSaveDynamicFields = "1"; canSaveDynamicFields = "1";
helpTag = "0"; helpTag = "0";
new GuiConsoleEditCtrl(ConsoleEntry) { new GuiConsoleEditCtrl(ConsoleEntry) {
useSiblingScroller = "1";
historySize = "40"; historySize = "40";
tabComplete = "0";
sinkAllKeyEvents = "1";
password = "0";
passwordMask = "*";
maxLength = "255"; maxLength = "255";
margin = "0 0 0 0"; position = "0 751";
padding = "0 0 0 0"; extent = "1024 16";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 750";
extent = "1024 18";
minExtent = "8 8"; minExtent = "8 8";
horizSizing = "width"; horizSizing = "width";
vertSizing = "top"; vertSizing = "top";
profile = "ConsoleTextEditProfile"; profile = "ConsoleTextEditProfile";
visible = "1";
active = "1";
altCommand = "ConsoleEntry::eval();"; altCommand = "ConsoleEntry::eval();";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiConsoleProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiContainer() {
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "1 728";
extent = "1024 22";
minExtent = "8 2";
horizSizing = "width";
vertSizing = "top";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
new GuiBitmapCtrl() {
bitmapAsset = "Core_GUI:hudFill";
color = "255 255 255 255";
wrap = "0";
position = "0 0";
extent = "1024 22";
minExtent = "8 2";
horizSizing = "width";
vertSizing = "bottom";
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiCheckBoxCtrl(ConsoleDlgErrorFilterBtn) {
text = "Errors";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
position = "2 2";
extent = "113 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiCheckBoxProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiCheckBoxCtrl(ConsoleDlgWarnFilterBtn) {
text = "Warnings";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
position = "119 2";
extent = "113 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiCheckBoxProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiCheckBoxCtrl(ConsoleDlgNormalFilterBtn) {
text = "Normal Messages";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
position = "236 2";
extent = "113 20";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiCheckBoxProfile";
visible = "1";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
new GuiSliderCtrl(ConsoleDlgBgAlphaSlider) {
range = "0 1";
ticks = "10";
snap = "0";
value = "0.65";
useFillBar = "0";
fillBarColor = "255 255 255 255";
renderTicks = "1";
position = "361 4";
extent = "106 14";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiSliderProfile";
visible = "1";
active = "1";
command = "ConsoleDlg::setalpha(ConsoleDlgBgAlphaSlider, ConsoleDlgBgAlphaSlider.value);";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "0";
canSave = "1";
canSaveDynamicFields = "0";
};
}; };
new GuiScrollCtrl() { new GuiScrollCtrl() {
willFirstRespond = "1"; position = "0 6";
hScrollBar = "alwaysOn"; extent = "1024 724";
vScrollBar = "alwaysOn";
lockHorizScroll = "0";
lockVertScroll = "0";
constantThumbHeight = "0";
childMargin = "0 0";
mouseWheelScrollSpeed = "-1";
margin = "0 0 0 0";
padding = "0 0 0 0";
anchorTop = "1";
anchorBottom = "0";
anchorLeft = "1";
anchorRight = "0";
position = "0 0";
extent = "1024 730";
minExtent = "8 8"; minExtent = "8 8";
horizSizing = "width"; horizSizing = "width";
vertSizing = "height"; vertSizing = "height";
profile = "ConsoleScrollProfile"; profile = "ConsoleScrollProfile";
visible = "1"; tooltipProfile = "GuiConsoleProfile";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
internalName = "Scroll"; internalName = "Scroll";
canSave = "1";
canSaveDynamicFields = "0";
new GuiConsole(ConsoleMessageLogView) { new GuiConsole(ConsoleMessageLogView) {
position = "1 1"; position = "1 -6538";
extent = "622 324"; extent = "1994 7248";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
profile = "GuiConsoleProfile"; profile = "GuiConsoleProfile";
visible = "1"; tooltipProfile = "GuiConsoleProfile";
active = "1";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";
isContainer = "1";
canSave = "1";
canSaveDynamicFields = "0";
}; };
}; };
new GuiBitmapCtrl() {
BitmapAsset = "Core_GUI:hudfill";
color = "40 40 40 255";
position = "0 729";
extent = "1025 22";
horizSizing = "width";
profile = "GuiConsoleProfile";
tooltipProfile = "GuiConsoleProfile";
};
new GuiSliderCtrl(ConsoleDlgBgAlphaSlider) {
value = "0.65";
fillBarColor = "40 40 40 255";
position = "404 732";
extent = "106 14";
profile = "GuiSliderProfile";
command = "ConsoleDlg::setalpha(ConsoleDlgBgAlphaSlider, ConsoleDlgBgAlphaSlider.value);";
tooltipProfile = "GuiConsoleProfile";
};
new GuiCheckBoxCtrl(ConsoleDlgNormalFilterBtn) {
text = "(266) Messages";
position = "245 730";
extent = "113 20";
profile = "GuiCheckBoxProfile";
tooltipProfile = "GuiConsoleProfile";
};
new GuiCheckBoxCtrl(ConsoleDlgWarnFilterBtn) {
text = "(144) Warnings";
position = "117 730";
extent = "113 20";
profile = "GuiCheckBoxProfile";
tooltipProfile = "GuiConsoleProfile";
};
new GuiCheckBoxCtrl(ConsoleDlgErrorFilterBtn) {
text = "(43) Errors";
position = "10 730";
extent = "113 20";
profile = "GuiCheckBoxProfile";
tooltipProfile = "GuiConsoleProfile";
};
}; };
//--- OBJECT WRITE END --- //--- OBJECT WRITE END ---

23
Templates/BaseGame/game/core/console/scripts/profiles.tscript
View file

@ -22,12 +22,14 @@
if(!isObject(GuiConsoleProfile)) if(!isObject(GuiConsoleProfile))
new GuiControlProfile(GuiConsoleProfile) new GuiControlProfile(GuiConsoleProfile)
{ {
border = true;
borderColor = "15 15 15";
fontType = ($platform $= "macos") ? "Monaco" : "Lucida Console"; fontType = ($platform $= "macos") ? "Monaco" : "Lucida Console";
fontSize = ($platform $= "macos") ? 13 : 12; fontSize = ($platform $= "macos") ? 14 : 13;
fontColor = "255 255 255"; fontColor = "225 225 225";
fontColorHL = "0 255 255"; fontColorHL = "165 214 255";
fontColorNA = "255 0 0"; fontColorNA = "255 65 65";
fontColors[6] = "100 100 100"; fontColors[6] = "100 100 100";
fontColors[7] = "100 100 0"; fontColors[7] = "100 100 0";
fontColors[8] = "0 0 100"; fontColors[8] = "0 0 100";
@ -50,7 +52,7 @@ new GuiControlProfile(GuiConsoleTextProfile)
category = "Core"; category = "Core";
}; };
$ConsoleDefaultFillColor = "0 0 0 175"; $ConsoleDefaultFillColor = "12 14 19 175";
if(!isObject(ConsoleScrollProfile)) if(!isObject(ConsoleScrollProfile))
new GuiControlProfile(ConsoleScrollProfile : GuiScrollProfile) new GuiControlProfile(ConsoleScrollProfile : GuiScrollProfile)
@ -66,7 +68,12 @@ new GuiControlProfile(ConsoleScrollProfile : GuiScrollProfile)
if(!isObject(ConsoleTextEditProfile)) if(!isObject(ConsoleTextEditProfile))
new GuiControlProfile(ConsoleTextEditProfile : GuiTextEditProfile) new GuiControlProfile(ConsoleTextEditProfile : GuiTextEditProfile)
{ {
fillColor = "242 241 240 255"; opaque = true;
fillColorHL = "255 255 255"; border =false;
fontType = "Arial";
fontSize = 16;
fontColor = "255 255 255";
fillColorHL = "30 30 30 255";
cursorColor = "255 255 255";
category = "Core"; category = "Core";
}; };

BIN
Templates/BaseGame/game/core/gui/images/scrollBar.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

BIN
Templates/BaseGame/game/core/gui/images/window.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

11
Templates/BaseGame/game/core/gui/scripts/profiles.tscript
View file

@ -57,7 +57,7 @@ new GuiControlProfile (GuiDefaultProfile)
borderColorNA = "75 75 75"; borderColorNA = "75 75 75";
// font // font
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 14; fontSize = 14;
fontCharset = ANSI; fontCharset = ANSI;
@ -97,7 +97,7 @@ new GuiControlProfile (GuiToolTipProfile)
borderColor = "87 87 87"; borderColor = "87 87 87";
// font // font
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 14; fontSize = 14;
fontColor = "200 200 200"; fontColor = "200 200 200";
@ -185,9 +185,10 @@ new GuiControlProfile(GuiCheckBoxProfile)
border = false; border = false;
borderColor = "100 100 100"; borderColor = "100 100 100";
fontSize = 14; fontSize = 14;
fontColor = "20 20 20"; fontType = "Arial";
fontColor = "215 215 215";
fontColorHL = "80 80 80"; fontColorHL = "80 80 80";
fontColorNA = "200 200 200"; fontColorNA = "200 200 200";
fixedExtent = true; fixedExtent = true;
justify = "left"; justify = "left";
bitmapAsset = "Core_GUI:checkbox_image"; bitmapAsset = "Core_GUI:checkbox_image";
@ -218,7 +219,7 @@ if( !isObject( GuiProgressTextProfile ) )
new GuiControlProfile( GuiProgressTextProfile ) new GuiControlProfile( GuiProgressTextProfile )
{ {
fontSize = "14"; fontSize = "14";
fontType = "Noto Sans"; fontType = "Arial";
fontColor = "0 0 0"; fontColor = "0 0 0";
justify = "center"; justify = "center";
category = "Core"; category = "Core";

2
Templates/BaseGame/game/tools/VPathEditor/GUI/Profiles.tscript
View file

@ -7,6 +7,6 @@ singleton GuiControlProfile( VPathEditorProfile )
{ {
CanKeyFocus = true; CanKeyFocus = true;
FontType = "Noto Sans Bold"; FontType = "Arial Bold";
FontColor = "0 0 0"; FontColor = "0 0 0";
}; };

2
Templates/BaseGame/game/tools/VPathEditor/Scripts/Editor.tscript
View file

@ -224,5 +224,5 @@ function VPathInspector::onInspectorFieldModified( %this, %object, %fieldName, %
function VPathInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) function VPathInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc )
{ {
VPathFieldInfoControl.setText( "<font:ArialBold:14>" @ %fieldName @ "<font:ArialItalic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc ); VPathFieldInfoControl.setText( "<font:Arial Bold:14>" @ %fieldName @ "<font:Arial Italic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc );
} }

6
Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript
View file

@ -15,7 +15,7 @@ singleton GuiControlProfile( VEditorDefaultProfile )
borderColorHL = "100 100 100"; borderColorHL = "100 100 100";
borderColorNA = "240 240 240"; borderColorNA = "240 240 240";
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 12; fontSize = 12;
fontCharset = ANSI; fontCharset = ANSI;
@ -56,7 +56,7 @@ singleton GuiControlProfile( VEditorTextProfile : VEditorDefaultProfile )
border = false; border = false;
opaque = false; opaque = false;
fontType = "Noto Sans Bold"; fontType = "Arial Bold";
}; };
singleton GuiControlProfile( VEditorTextEditProfile : VEditorDefaultProfile ) singleton GuiControlProfile( VEditorTextEditProfile : VEditorDefaultProfile )
@ -186,7 +186,7 @@ singleton GuiControlProfile( VEditorPropertyRolloutProfile : GuiRolloutProfile )
hasBitmapArray = true; hasBitmapArray = true;
bitmapAsset = "ToolsModule:PropertyRollout_image"; bitmapAsset = "ToolsModule:PropertyRollout_image";
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 12; fontSize = 12;
fontCharset = ANSI; fontCharset = ANSI;

2
Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript
View file

@ -778,7 +778,7 @@ function DatablockEditorInspector::onInspectorFieldModified( %this, %object, %fi
function DatablockEditorInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) function DatablockEditorInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc )
{ {
DatablockFieldInfoControl.setText( "<font:ArialBold:14>" @ %fieldName @ "<font:ArialItalic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc ); DatablockFieldInfoControl.setText( "<font:Arial Bold:14>" @ %fieldName @ "<font:Arial Italic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc );
} }
//--------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------

BIN
Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

2
Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript
View file

@ -526,7 +526,7 @@ function ForestEditorInspector::onInspectorFieldModified( %this, %object, %field
function ForestEditorInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) function ForestEditorInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc )
{ {
//FieldInfoControl.setText( "<font:ArialBold:14>" @ %fieldName @ "<font:ArialItalic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc ); //FieldInfoControl.setText( "<font:Arial Bold:14>" @ %fieldName @ "<font:Arial Italic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc );
} }
function ForestBrushSizeSliderCtrlContainer::onWake(%this) function ForestBrushSizeSliderCtrlContainer::onWake(%this)

51
Templates/BaseGame/game/tools/gui/profiles.ed.tscript
View file

@ -50,7 +50,7 @@ new GuiControlProfile (ToolsGuiDefaultProfile)
borderColorNA = EditorSettings.value("Theme/dividerLightColor"); borderColorNA = EditorSettings.value("Theme/dividerLightColor");
// font // font
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 14; fontSize = 14;
fontCharset = ANSI; fontCharset = ANSI;
@ -132,7 +132,7 @@ new GuiControlProfile (ToolsGuiToolTipProfile)
borderColor = EditorSettings.value("Theme/tooltipDivColor"); borderColor = EditorSettings.value("Theme/tooltipDivColor");
// font // font
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 14; fontSize = 14;
fontColor = EditorSettings.value("Theme/tooltipTextColor"); fontColor = EditorSettings.value("Theme/tooltipTextColor");
@ -204,14 +204,14 @@ new GuiControlProfile (ToolsGuiTextProfile)
if( !isObject( ToolsGuiTextBoldProfile ) ) if( !isObject( ToolsGuiTextBoldProfile ) )
new GuiControlProfile (ToolsGuiTextBoldProfile : ToolsGuiTextProfile) new GuiControlProfile (ToolsGuiTextBoldProfile : ToolsGuiTextProfile)
{ {
fontType = "Noto Sans Bold"; fontType = "Arial Bold";
}; };
if( !isObject( ToolsGuiTextBoldCenterProfile ) ) if( !isObject( ToolsGuiTextBoldCenterProfile ) )
new GuiControlProfile (ToolsGuiTextBoldCenterProfile : ToolsGuiTextProfile) new GuiControlProfile (ToolsGuiTextBoldCenterProfile : ToolsGuiTextProfile)
{ {
fontColor = EditorSettings.value("Theme/headerTextColor"); fontColor = EditorSettings.value("Theme/headerTextColor");
fontType = "Noto Sans Bold"; fontType = "Arial Bold";
fontSize = 16; fontSize = 16;
justify = "center"; justify = "center";
category = "Tools"; category = "Tools";
@ -227,7 +227,7 @@ new GuiControlProfile (ToolsGuiTextRightProfile : ToolsGuiTextProfile)
if( !isObject( ToolsGuiTextBoldRightProfile ) ) if( !isObject( ToolsGuiTextBoldRightProfile ) )
new GuiControlProfile (ToolsGuiTextBoldRightProfile : ToolsGuiTextRightProfile) new GuiControlProfile (ToolsGuiTextBoldRightProfile : ToolsGuiTextRightProfile)
{ {
fontType = "Noto Sans Bold"; fontType = "Arial Bold";
fontSize = 16; fontSize = 16;
}; };
@ -306,13 +306,13 @@ new GuiControlProfile( ToolsGuiTextEditProfile )
//borderWidth = "1"; // fix to display textEdit img //borderWidth = "1"; // fix to display textEdit img
//borderColor = "100 100 100"; //borderColor = "100 100 100";
fillColor = EditorSettings.value("Theme/fieldBGColor"); fillColor = EditorSettings.value("Theme/fieldBGColor");
fillColorHL = EditorSettings.value("Theme/fieldBGHLColor"); fillColorHL = "75 75 75 255";
fillColorSEL = EditorSettings.value("Theme/fieldBGSELColor"); fillColorSEL = EditorSettings.value("Theme/fieldBGSELColor");
fontSize = 14;
fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColor = EditorSettings.value("Theme/fieldTextColor");
//fontColorSEL = EditorSettings.value("Theme/fieldBGSELColor"); fontColorSEL = EditorSettings.value("Theme/fieldBGSELColor");
fontColorSEL = EditorSettings.value("Theme/dividerMidColor"); //fontColorSEL = EditorSettings.value("Theme/dividerMidColor");
fontColorHL = EditorSettings.value("Theme/fieldTextSELColor"); fontColorHL = EditorSettings.value("Theme/fieldTextSELColor");
fontColorNA = EditorSettings.value("Theme/fieldTextNAColor"); fontColorNA = EditorSettings.value("Theme/fieldTextNAColor");
textOffset = "4 2"; textOffset = "4 2";
@ -351,7 +351,7 @@ if( !isObject( ToolsGuiProgressTextProfile ) )
new GuiControlProfile( ToolsGuiProgressTextProfile ) new GuiControlProfile( ToolsGuiProgressTextProfile )
{ {
fontSize = "14"; fontSize = "14";
fontType = "Noto Sans"; fontType = "Arial";
fontColor = "215 215 215"; fontColor = "215 215 215";
justify = "center"; justify = "center";
category = "Tools"; category = "Tools";
@ -611,7 +611,7 @@ new GuiControlProfile( ToolsGuiTabBookProfile )
fontColor = EditorSettings.value("Theme/headerTextColor"); fontColor = EditorSettings.value("Theme/headerTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor"); fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 14; fontSize = 14;
justify = "center"; justify = "center";
bitmapAsset = "ToolsModule:tab_image"; bitmapAsset = "ToolsModule:tab_image";
@ -635,7 +635,7 @@ new GuiControlProfile( ToolsGuiTabBookNoBitmapProfile : ToolsGuiTabBookProfile )
if( !isObject( ToolsGuiTabPageProfile ) ) if( !isObject( ToolsGuiTabPageProfile ) )
new GuiControlProfile( ToolsGuiTabPageProfile : ToolsGuiDefaultProfile ) new GuiControlProfile( ToolsGuiTabPageProfile : ToolsGuiDefaultProfile )
{ {
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 10; fontSize = 10;
justify = "center"; justify = "center";
bitmapAsset = "ToolsModule:tab_image"; bitmapAsset = "ToolsModule:tab_image";
@ -712,7 +712,7 @@ singleton GuiControlProfile( GuiBackFillProfile )
fillColor = "0 94 94"; fillColor = "0 94 94";
border = true; border = true;
borderColor = "255 128 128"; borderColor = "255 128 128";
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 12; fontSize = 12;
fontColor = "215 215 215"; fontColor = "215 215 215";
fontColorHL = "50 50 50"; fontColorHL = "50 50 50";
@ -780,7 +780,7 @@ singleton GuiControlProfile( GuiInspectorTextEditProfile )
canKeyFocus = true; canKeyFocus = true;
// font // font
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 14; fontSize = 14;
fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColor = EditorSettings.value("Theme/fieldTextColor");
@ -803,8 +803,8 @@ singleton GuiControlProfile( GuiInspectorTextEditRightProfile : GuiInspectorText
//Scene Tree GUI Inspector Dropdown menus //Scene Tree GUI Inspector Dropdown menus
singleton GuiControlProfile( GuiInspectorGroupProfile ) singleton GuiControlProfile( GuiInspectorGroupProfile )
{ {
fontType = "Noto Sans"; fontType = "Arial";
fontSize = "14"; fontSize = "14";
fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColor = EditorSettings.value("Theme/fieldTextColor");
fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); fontColorHL = EditorSettings.value("Theme/fieldTextHLColor");
@ -840,7 +840,7 @@ singleton GuiControlProfile( GuiInspectorFieldProfile)
//bevelColorLL = "0 0 0"; //bevelColorLL = "0 0 0";
// font // font
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 14; fontSize = 14;
fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColor = EditorSettings.value("Theme/fieldTextColor");
@ -881,7 +881,7 @@ singleton GuiControlProfile( GuiInspectorDynamicFieldProfile : GuiInspectorField
canKeyFocus = true; canKeyFocus = true;
// font // font
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 14; fontSize = 14;
fontColor = EditorSettings.value("Theme/headerTextColor"); fontColor = EditorSettings.value("Theme/headerTextColor");
@ -910,7 +910,7 @@ singleton GuiControlProfile( GuiRolloutProfile )
singleton GuiControlProfile( GuiInspectorRolloutProfile0 ) singleton GuiControlProfile( GuiInspectorRolloutProfile0 )
{ {
// font // font
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 14; fontSize = 14;
fontColor = "32 32 32"; fontColor = "32 32 32";
@ -920,10 +920,10 @@ singleton GuiControlProfile( GuiInspectorRolloutProfile0 )
justify = "left"; justify = "left";
opaque = false; opaque = false;
border = 0; border = false;
borderColor = "190 190 190"; borderColor = "190 190 190";
borderColorHL = "156 156 156"; borderColorHL = "156 156 156";
borderColorNA = "64 64 64"; borderColorNA = "255 64 64";
bitmapAsset = "ToolsModule:rollout_plusminus_header_image"; bitmapAsset = "ToolsModule:rollout_plusminus_header_image";
@ -984,7 +984,7 @@ singleton GuiControlProfile( GuiInspectorTypeFileNameProfile )
canKeyFocus = true; canKeyFocus = true;
// font // font
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 14; fontSize = 14;
// Center text // Center text
@ -1048,7 +1048,7 @@ singleton GuiControlProfile( GuiDirectoryTreeProfile : ToolsGuiTreeViewProfile )
fontColorSEL= EditorSettings.value("Theme/fieldTextSELColor"); fontColorSEL= EditorSettings.value("Theme/fieldTextSELColor");
fillColorHL = EditorSettings.value("Theme/fieldBGColor"); fillColorHL = EditorSettings.value("Theme/fieldBGColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor"); fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 14; fontSize = 14;
category = "Editor"; category = "Editor";
}; };
@ -1059,7 +1059,7 @@ singleton GuiControlProfile( GuiDirectoryFileListProfile )
fontColorSEL= EditorSettings.value("Theme/fieldTextSELColor"); fontColorSEL= EditorSettings.value("Theme/fieldTextSELColor");
fillColorHL = EditorSettings.value("Theme/fieldBGColor"); fillColorHL = EditorSettings.value("Theme/fieldBGColor");
fontColorNA = EditorSettings.value("Theme/fieldTextSELColor"); fontColorNA = EditorSettings.value("Theme/fieldTextSELColor");
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 14; fontSize = 14;
category = "Editor"; category = "Editor";
}; };
@ -1112,7 +1112,7 @@ singleton GuiControlProfile( GuiCreatorIconButtonProfile )
//tab = true; //tab = true;
//canKeyFocus = true; //canKeyFocus = true;
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 14; fontSize = 14;
fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColor = EditorSettings.value("Theme/fieldTextColor");
@ -1154,6 +1154,7 @@ singleton GuiControlProfile( ToolsMenubarProfile : ToolsGuiDefaultProfile )
category = "Editor"; category = "Editor";
opaque = true; opaque = true;
border = false;
fillColor = EditorSettings.value("Theme/headerColor"); fillColor = EditorSettings.value("Theme/headerColor");
fontColor = EditorSettings.value("Theme/headerTextColor"); fontColor = EditorSettings.value("Theme/headerTextColor");

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

@ -154,7 +154,7 @@ function GuiEditorInspectFields::onInspectorDiscardFieldModification( %this )
function GuiEditorInspectFields::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) function GuiEditorInspectFields::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc )
{ {
GuiEditorFieldInfo.setText( "<font:ArialBold:14>" @ %fieldName @ "<font:ArialItalic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc ); GuiEditorFieldInfo.setText( "<font:Arial Bold:14>" @ %fieldName @ "<font:Arial Italic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc );
} }
//--------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------

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

@ -418,7 +418,7 @@ function GuiEditorProfilesTree::setSelectedProfile( %this, %profile )
function GuiEditorProfileInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) function GuiEditorProfileInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc )
{ {
GuiEditorProfileFieldInfo.setText( "<font:ArialBold:14>" @ %fieldName @ "<font:ArialItalic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc ); GuiEditorProfileFieldInfo.setText( "<font:Arial:14>" @ %fieldName @ "<font:Arial Italic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc );
} }
//--------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------

2
Templates/BaseGame/game/tools/materialEditor/gui/Profiles.ed.tscript
View file

@ -31,7 +31,7 @@ singleton GuiControlProfile (GuiMatEdSliderProfile)
singleton GuiControlProfile (GuiMatEdRightJustifyProfile) singleton GuiControlProfile (GuiMatEdRightJustifyProfile)
{ {
// font // font
fontType = "Noto Sans"; fontType = "Arial";
fontSize = 14; fontSize = 14;
fontCharset = ANSI; fontCharset = ANSI;

2
Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript
View file

@ -179,7 +179,7 @@ function MeshRoadInspector::onInspectorFieldModified( %this, %object, %fieldName
function MeshRoadInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) function MeshRoadInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc )
{ {
MeshFieldInfoControl.setText( "<font:ArialBold:14>" @ %fieldName @ "<font:ArialItalic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc ); MeshFieldInfoControl.setText( "<font:Arial Bold:14>" @ %fieldName @ "<font:Arial Italic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc );
} }
function MeshRoadTreeView::onInspect(%this, %obj) function MeshRoadTreeView::onInspect(%this, %obj)

2
Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript
View file

@ -80,5 +80,5 @@ function MissionAreaInspector::onInspectorFieldModified( %this, %object, %fieldN
function MissionAreaInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) function MissionAreaInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc )
{ {
MissionAreaFieldInfoControl.setText( "<font:ArialBold:14>" @ %fieldName @ "<font:ArialItalic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc ); MissionAreaFieldInfoControl.setText( "<font:Arial Bold:14>" @ %fieldName @ "<font:Arial Italic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc );
} }

2
Templates/BaseGame/game/tools/navEditor/navEditor.tscript
View file

@ -303,7 +303,7 @@ function NavInspector::onInspectorFieldModified(%this, %object, %fieldName, %arr
function NavInspector::onFieldSelected(%this, %fieldName, %fieldTypeStr, %fieldDoc) function NavInspector::onFieldSelected(%this, %fieldName, %fieldTypeStr, %fieldDoc)
{ {
NavFieldInfoControl.setText("<font:ArialBold:14>" @ %fieldName @ "<font:ArialItalic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc); NavFieldInfoControl.setText("<font:Arial Bold:14>" @ %fieldName @ "<font:Arial Italic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc);
} }
function NavTreeView::onInspect(%this, %obj) function NavTreeView::onInspect(%this, %obj)

2
Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript
View file

@ -182,7 +182,7 @@ function RiverInspector::onInspectorFieldModified( %this, %object, %fieldName, %
function RiverInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) function RiverInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc )
{ {
RiverFieldInfoControl.setText( "<font:ArialBold:14>" @ %fieldName @ "<font:ArialItalic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc ); RiverFieldInfoControl.setText( "<font:Arial Bold:14>" @ %fieldName @ "<font:Arial Italic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc );
} }
function RiverTreeView::onInspect(%this, %obj) function RiverTreeView::onInspect(%this, %obj)

2
Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript
View file

@ -181,7 +181,7 @@ function RoadInspector::onInspectorFieldModified( %this, %object, %fieldName, %a
function RoadInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) function RoadInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc )
{ {
RoadFieldInfoControl.setText( "<font:ArialBold:14>" @ %fieldName @ "<font:ArialItalic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc ); RoadFieldInfoControl.setText( "<font:Arial Bold:14>" @ %fieldName @ "<font:Arial Italic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc );
} }
function RoadTreeView::onInspect(%this, %obj) function RoadTreeView::onInspect(%this, %obj)

2
Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui
View file

@ -26,7 +26,7 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) {
Profile = "ToolsMenubarProfile"; Profile = "ToolsMenubarProfile";
HorizSizing = "width"; HorizSizing = "width";
VertSizing = "bottom"; VertSizing = "bottom";
Position = "0 0"; Position = "0 10";
Extent = "800 32"; Extent = "800 32";
MinExtent = "8 8"; MinExtent = "8 8";
canSave = "1"; canSave = "1";

2
Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteWindow.ed.gui
View file

@ -23,7 +23,7 @@ $guiContent = new GuiControl() {
VertSizing = "windowRelative"; VertSizing = "windowRelative";
Extent = "36 24"; Extent = "36 24";
MinExtent = "36 24"; MinExtent = "36 24";
Position = "-1 63"; Position = "-1 73";
canSave = "1"; canSave = "1";
Visible = "1"; Visible = "1";
hovertime = "1000"; hovertime = "1000";

4
Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui
View file

@ -7,7 +7,7 @@ $guiContent = new GuiContainer(EWToolsToolbar) {
Profile = "ToolsMenubarProfile"; Profile = "ToolsMenubarProfile";
HorizSizing = "right"; HorizSizing = "right";
VertSizing = "bottom"; VertSizing = "bottom";
Position = "0 31"; Position = "0 41";
Extent = "0 33"; Extent = "0 33";
MinExtent = "8 2"; MinExtent = "8 2";
canSave = "1"; canSave = "1";
@ -15,7 +15,7 @@ $guiContent = new GuiContainer(EWToolsToolbar) {
hovertime = "1000"; hovertime = "1000";
isClosed = "0"; isClosed = "0";
isDynamic = "0"; isDynamic = "0";
new GuiDynamicCtrlArrayControl(ToolsToolbarArray) { new GuiDynamicCtrlArrayControl(ToolsToolbarArray) {
canSaveDynamicFields = "0"; canSaveDynamicFields = "0";
Enabled = "1"; Enabled = "1";

4
Templates/BaseGame/game/tools/worldEditor/gui/profiles.ed.tscript
View file

@ -35,7 +35,7 @@ singleton GuiControlProfile (EditorToolButtonProfile)
singleton GuiControlProfile (EditorTextProfile) singleton GuiControlProfile (EditorTextProfile)
{ {
fontType = "Noto Sans Bold"; fontType = "Arial Bold";
fontColor = "215 215 215"; fontColor = "215 215 215";
autoSizeWidth = true; autoSizeWidth = true;
autoSizeHeight = true; autoSizeHeight = true;
@ -44,7 +44,7 @@ singleton GuiControlProfile (EditorTextProfile)
singleton GuiControlProfile (EditorTextProfileWhite) singleton GuiControlProfile (EditorTextProfileWhite)
{ {
fontType = "Noto Sans Bold"; fontType = "Arial Bold";
fontColor = "255 255 255"; fontColor = "255 255 255";
autoSizeWidth = true; autoSizeWidth = true;
autoSizeHeight = true; autoSizeHeight = true;

2
Templates/BaseGame/game/tools/worldEditor/scripts/editors/worldEditor.ed.tscript
View file

@ -423,7 +423,7 @@ function Inspector::onInspectorFieldModified( %this, %object, %fieldName, %array
function Inspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) function Inspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc )
{ {
FieldInfoControl.setText( "<font:ArialBold:14>" @ %fieldName @ "<font:ArialItalic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc ); FieldInfoControl.setText( "<font:Arial Bold:14>" @ %fieldName @ "<font:Arial Italic:14> (" @ %fieldTypeStr @ ") " NL "<font:Arial:14>" @ %fieldDoc );
} }
// The following three methods are for fields that edit field value live and thus cannot record // The following three methods are for fields that edit field value live and thus cannot record

4
Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript
View file

@ -113,8 +113,8 @@ function EditorGui::buildMenus(%this)
%this.menuBar = new GuiMenuBar(WorldEditorMenubar) %this.menuBar = new GuiMenuBar(WorldEditorMenubar)
{ {
dynamicItemInsertPos = 3; dynamicItemInsertPos = 3;
extent = Canvas.extent.x SPC "20"; extent = Canvas.extent.x SPC "30";
minExtent = "320 20"; minExtent = "320 30";
horizSizing = "width"; horizSizing = "width";
profile = "ToolsGuiMenuBarProfile"; profile = "ToolsGuiMenuBarProfile";
}; };