diff --git a/Templates/BaseGame/game/core/console/guis/console.gui b/Templates/BaseGame/game/core/console/guis/console.gui index daf013102..10250788a 100644 --- a/Templates/BaseGame/game/core/console/guis/console.gui +++ b/Templates/BaseGame/game/core/console/guis/console.gui @@ -1,214 +1,80 @@ //--- OBJECT WRITE BEGIN --- $guiContent = new GuiControl(ConsoleDlg) { - position = "0 0"; extent = "1024 768"; minExtent = "8 8"; - horizSizing = "right"; - vertSizing = "bottom"; - profile = "GuiDefaultProfile"; - visible = "1"; - active = "1"; - tooltipProfile = "GuiToolTipProfile"; - hovertime = "1000"; + profile = "GuiConsoleProfile"; + tooltipProfile = "GuiConsoleProfile"; isContainer = "1"; - canSave = "1"; canSaveDynamicFields = "1"; helpTag = "0"; new GuiConsoleEditCtrl(ConsoleEntry) { - useSiblingScroller = "1"; historySize = "40"; - tabComplete = "0"; - sinkAllKeyEvents = "1"; - password = "0"; - passwordMask = "*"; maxLength = "255"; - margin = "0 0 0 0"; - padding = "0 0 0 0"; - anchorTop = "1"; - anchorBottom = "0"; - anchorLeft = "1"; - anchorRight = "0"; - position = "0 750"; - extent = "1024 18"; + position = "0 751"; + extent = "1024 16"; minExtent = "8 8"; horizSizing = "width"; vertSizing = "top"; profile = "ConsoleTextEditProfile"; - visible = "1"; - active = "1"; altCommand = "ConsoleEntry::eval();"; - tooltipProfile = "GuiToolTipProfile"; - 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"; - }; + tooltipProfile = "GuiConsoleProfile"; }; new GuiScrollCtrl() { - willFirstRespond = "1"; - hScrollBar = "alwaysOn"; - 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"; + position = "0 6"; + extent = "1024 724"; minExtent = "8 8"; horizSizing = "width"; vertSizing = "height"; profile = "ConsoleScrollProfile"; - visible = "1"; - active = "1"; - tooltipProfile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "1"; + tooltipProfile = "GuiConsoleProfile"; internalName = "Scroll"; - canSave = "1"; - canSaveDynamicFields = "0"; new GuiConsole(ConsoleMessageLogView) { - position = "1 1"; - extent = "622 324"; - minExtent = "8 2"; - horizSizing = "right"; - vertSizing = "bottom"; + position = "1 -6538"; + extent = "1994 7248"; profile = "GuiConsoleProfile"; - visible = "1"; - active = "1"; - tooltipProfile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "1"; - canSave = "1"; - canSaveDynamicFields = "0"; + tooltipProfile = "GuiConsoleProfile"; }; }; + 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 --- diff --git a/Templates/BaseGame/game/core/console/scripts/profiles.tscript b/Templates/BaseGame/game/core/console/scripts/profiles.tscript index fa358c3ca..bfd1e1d2e 100644 --- a/Templates/BaseGame/game/core/console/scripts/profiles.tscript +++ b/Templates/BaseGame/game/core/console/scripts/profiles.tscript @@ -22,12 +22,14 @@ if(!isObject(GuiConsoleProfile)) new GuiControlProfile(GuiConsoleProfile) -{ +{ + border = true; + borderColor = "15 15 15"; fontType = ($platform $= "macos") ? "Monaco" : "Lucida Console"; - fontSize = ($platform $= "macos") ? 13 : 12; - fontColor = "255 255 255"; - fontColorHL = "0 255 255"; - fontColorNA = "255 0 0"; + fontSize = ($platform $= "macos") ? 14 : 13; + fontColor = "225 225 225"; + fontColorHL = "165 214 255"; + fontColorNA = "255 65 65"; fontColors[6] = "100 100 100"; fontColors[7] = "100 100 0"; fontColors[8] = "0 0 100"; @@ -50,7 +52,7 @@ new GuiControlProfile(GuiConsoleTextProfile) category = "Core"; }; -$ConsoleDefaultFillColor = "0 0 0 175"; +$ConsoleDefaultFillColor = "12 14 19 175"; if(!isObject(ConsoleScrollProfile)) new GuiControlProfile(ConsoleScrollProfile : GuiScrollProfile) @@ -66,7 +68,12 @@ new GuiControlProfile(ConsoleScrollProfile : GuiScrollProfile) if(!isObject(ConsoleTextEditProfile)) new GuiControlProfile(ConsoleTextEditProfile : GuiTextEditProfile) { - fillColor = "242 241 240 255"; - fillColorHL = "255 255 255"; + opaque = true; + border =false; + fontType = "Arial"; + fontSize = 16; + fontColor = "255 255 255"; + fillColorHL = "30 30 30 255"; + cursorColor = "255 255 255"; category = "Core"; }; diff --git a/Templates/BaseGame/game/core/gui/images/scrollBar.png b/Templates/BaseGame/game/core/gui/images/scrollBar.png index e8c34dc85..b5d0a95c5 100644 Binary files a/Templates/BaseGame/game/core/gui/images/scrollBar.png and b/Templates/BaseGame/game/core/gui/images/scrollBar.png differ diff --git a/Templates/BaseGame/game/core/gui/images/window.png b/Templates/BaseGame/game/core/gui/images/window.png index d9e8006e4..0f71a0a19 100644 Binary files a/Templates/BaseGame/game/core/gui/images/window.png and b/Templates/BaseGame/game/core/gui/images/window.png differ diff --git a/Templates/BaseGame/game/core/gui/scripts/profiles.tscript b/Templates/BaseGame/game/core/gui/scripts/profiles.tscript index cae923bd0..a434c8909 100644 --- a/Templates/BaseGame/game/core/gui/scripts/profiles.tscript +++ b/Templates/BaseGame/game/core/gui/scripts/profiles.tscript @@ -57,7 +57,7 @@ new GuiControlProfile (GuiDefaultProfile) borderColorNA = "75 75 75"; // font - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 14; fontCharset = ANSI; @@ -97,7 +97,7 @@ new GuiControlProfile (GuiToolTipProfile) borderColor = "87 87 87"; // font - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 14; fontColor = "200 200 200"; @@ -185,9 +185,10 @@ new GuiControlProfile(GuiCheckBoxProfile) border = false; borderColor = "100 100 100"; fontSize = 14; - fontColor = "20 20 20"; + fontType = "Arial"; + fontColor = "215 215 215"; fontColorHL = "80 80 80"; - fontColorNA = "200 200 200"; + fontColorNA = "200 200 200"; fixedExtent = true; justify = "left"; bitmapAsset = "Core_GUI:checkbox_image"; @@ -218,7 +219,7 @@ if( !isObject( GuiProgressTextProfile ) ) new GuiControlProfile( GuiProgressTextProfile ) { fontSize = "14"; - fontType = "Noto Sans"; + fontType = "Arial"; fontColor = "0 0 0"; justify = "center"; category = "Core"; diff --git a/Templates/BaseGame/game/tools/VPathEditor/GUI/Profiles.tscript b/Templates/BaseGame/game/tools/VPathEditor/GUI/Profiles.tscript index 1f09a74a9..ae99719c6 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/GUI/Profiles.tscript +++ b/Templates/BaseGame/game/tools/VPathEditor/GUI/Profiles.tscript @@ -7,6 +7,6 @@ singleton GuiControlProfile( VPathEditorProfile ) { CanKeyFocus = true; - FontType = "Noto Sans Bold"; + FontType = "Arial Bold"; FontColor = "0 0 0"; }; \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/VPathEditor/Scripts/Editor.tscript b/Templates/BaseGame/game/tools/VPathEditor/Scripts/Editor.tscript index 363e17bde..d18c18753 100644 --- a/Templates/BaseGame/game/tools/VPathEditor/Scripts/Editor.tscript +++ b/Templates/BaseGame/game/tools/VPathEditor/Scripts/Editor.tscript @@ -224,5 +224,5 @@ function VPathInspector::onInspectorFieldModified( %this, %object, %fieldName, % function VPathInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - VPathFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + VPathFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript b/Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript index f3df808ae..3d7217100 100644 --- a/Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript +++ b/Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript @@ -15,7 +15,7 @@ singleton GuiControlProfile( VEditorDefaultProfile ) borderColorHL = "100 100 100"; borderColorNA = "240 240 240"; - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 12; fontCharset = ANSI; @@ -56,7 +56,7 @@ singleton GuiControlProfile( VEditorTextProfile : VEditorDefaultProfile ) border = false; opaque = false; - fontType = "Noto Sans Bold"; + fontType = "Arial Bold"; }; singleton GuiControlProfile( VEditorTextEditProfile : VEditorDefaultProfile ) @@ -186,7 +186,7 @@ singleton GuiControlProfile( VEditorPropertyRolloutProfile : GuiRolloutProfile ) hasBitmapArray = true; bitmapAsset = "ToolsModule:PropertyRollout_image"; - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 12; fontCharset = ANSI; diff --git a/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript b/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript index d780731ef..1f53cb664 100644 --- a/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript +++ b/Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript @@ -778,7 +778,7 @@ function DatablockEditorInspector::onInspectorFieldModified( %this, %object, %fi function DatablockEditorInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - DatablockFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + DatablockFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } //--------------------------------------------------------------------------------------------- diff --git a/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header.png b/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header.png index 899491473..114ec2ca1 100644 Binary files a/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header.png and b/Templates/BaseGame/game/tools/editorClasses/gui/images/rollout_plusminus_header.png differ diff --git a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript index 55ed484cb..7b7144ebe 100644 --- a/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript +++ b/Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript @@ -526,7 +526,7 @@ function ForestEditorInspector::onInspectorFieldModified( %this, %object, %field function ForestEditorInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - //FieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + //FieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } function ForestBrushSizeSliderCtrlContainer::onWake(%this) diff --git a/Templates/BaseGame/game/tools/gui/profiles.ed.tscript b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript index d7f58cc36..cd8e35888 100644 --- a/Templates/BaseGame/game/tools/gui/profiles.ed.tscript +++ b/Templates/BaseGame/game/tools/gui/profiles.ed.tscript @@ -50,7 +50,7 @@ new GuiControlProfile (ToolsGuiDefaultProfile) borderColorNA = EditorSettings.value("Theme/dividerLightColor"); // font - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 14; fontCharset = ANSI; @@ -132,7 +132,7 @@ new GuiControlProfile (ToolsGuiToolTipProfile) borderColor = EditorSettings.value("Theme/tooltipDivColor"); // font - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 14; fontColor = EditorSettings.value("Theme/tooltipTextColor"); @@ -204,14 +204,14 @@ new GuiControlProfile (ToolsGuiTextProfile) if( !isObject( ToolsGuiTextBoldProfile ) ) new GuiControlProfile (ToolsGuiTextBoldProfile : ToolsGuiTextProfile) { - fontType = "Noto Sans Bold"; + fontType = "Arial Bold"; }; if( !isObject( ToolsGuiTextBoldCenterProfile ) ) new GuiControlProfile (ToolsGuiTextBoldCenterProfile : ToolsGuiTextProfile) { fontColor = EditorSettings.value("Theme/headerTextColor"); - fontType = "Noto Sans Bold"; + fontType = "Arial Bold"; fontSize = 16; justify = "center"; category = "Tools"; @@ -227,7 +227,7 @@ new GuiControlProfile (ToolsGuiTextRightProfile : ToolsGuiTextProfile) if( !isObject( ToolsGuiTextBoldRightProfile ) ) new GuiControlProfile (ToolsGuiTextBoldRightProfile : ToolsGuiTextRightProfile) { - fontType = "Noto Sans Bold"; + fontType = "Arial Bold"; fontSize = 16; }; @@ -306,13 +306,13 @@ new GuiControlProfile( ToolsGuiTextEditProfile ) //borderWidth = "1"; // fix to display textEdit img //borderColor = "100 100 100"; fillColor = EditorSettings.value("Theme/fieldBGColor"); - fillColorHL = EditorSettings.value("Theme/fieldBGHLColor"); + fillColorHL = "75 75 75 255"; fillColorSEL = EditorSettings.value("Theme/fieldBGSELColor"); - + fontSize = 14; fontColor = EditorSettings.value("Theme/fieldTextColor"); - //fontColorSEL = EditorSettings.value("Theme/fieldBGSELColor"); - fontColorSEL = EditorSettings.value("Theme/dividerMidColor"); + fontColorSEL = EditorSettings.value("Theme/fieldBGSELColor"); + //fontColorSEL = EditorSettings.value("Theme/dividerMidColor"); fontColorHL = EditorSettings.value("Theme/fieldTextSELColor"); fontColorNA = EditorSettings.value("Theme/fieldTextNAColor"); textOffset = "4 2"; @@ -351,7 +351,7 @@ if( !isObject( ToolsGuiProgressTextProfile ) ) new GuiControlProfile( ToolsGuiProgressTextProfile ) { fontSize = "14"; - fontType = "Noto Sans"; + fontType = "Arial"; fontColor = "215 215 215"; justify = "center"; category = "Tools"; @@ -611,7 +611,7 @@ new GuiControlProfile( ToolsGuiTabBookProfile ) fontColor = EditorSettings.value("Theme/headerTextColor"); fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); fontColorNA = EditorSettings.value("Theme/fieldTextSELColor"); - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 14; justify = "center"; bitmapAsset = "ToolsModule:tab_image"; @@ -635,7 +635,7 @@ new GuiControlProfile( ToolsGuiTabBookNoBitmapProfile : ToolsGuiTabBookProfile ) if( !isObject( ToolsGuiTabPageProfile ) ) new GuiControlProfile( ToolsGuiTabPageProfile : ToolsGuiDefaultProfile ) { - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 10; justify = "center"; bitmapAsset = "ToolsModule:tab_image"; @@ -712,7 +712,7 @@ singleton GuiControlProfile( GuiBackFillProfile ) fillColor = "0 94 94"; border = true; borderColor = "255 128 128"; - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 12; fontColor = "215 215 215"; fontColorHL = "50 50 50"; @@ -780,7 +780,7 @@ singleton GuiControlProfile( GuiInspectorTextEditProfile ) canKeyFocus = true; // font - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 14; fontColor = EditorSettings.value("Theme/fieldTextColor"); @@ -803,8 +803,8 @@ singleton GuiControlProfile( GuiInspectorTextEditRightProfile : GuiInspectorText //Scene Tree GUI Inspector Dropdown menus singleton GuiControlProfile( GuiInspectorGroupProfile ) { - fontType = "Noto Sans"; - fontSize = "14"; + fontType = "Arial"; + fontSize = "14"; fontColor = EditorSettings.value("Theme/fieldTextColor"); fontColorHL = EditorSettings.value("Theme/fieldTextHLColor"); @@ -840,7 +840,7 @@ singleton GuiControlProfile( GuiInspectorFieldProfile) //bevelColorLL = "0 0 0"; // font - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 14; fontColor = EditorSettings.value("Theme/fieldTextColor"); @@ -881,7 +881,7 @@ singleton GuiControlProfile( GuiInspectorDynamicFieldProfile : GuiInspectorField canKeyFocus = true; // font - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 14; fontColor = EditorSettings.value("Theme/headerTextColor"); @@ -910,7 +910,7 @@ singleton GuiControlProfile( GuiRolloutProfile ) singleton GuiControlProfile( GuiInspectorRolloutProfile0 ) { // font - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 14; fontColor = "32 32 32"; @@ -920,10 +920,10 @@ singleton GuiControlProfile( GuiInspectorRolloutProfile0 ) justify = "left"; opaque = false; - border = 0; + border = false; borderColor = "190 190 190"; borderColorHL = "156 156 156"; - borderColorNA = "64 64 64"; + borderColorNA = "255 64 64"; bitmapAsset = "ToolsModule:rollout_plusminus_header_image"; @@ -984,7 +984,7 @@ singleton GuiControlProfile( GuiInspectorTypeFileNameProfile ) canKeyFocus = true; // font - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 14; // Center text @@ -1048,7 +1048,7 @@ singleton GuiControlProfile( GuiDirectoryTreeProfile : ToolsGuiTreeViewProfile ) fontColorSEL= EditorSettings.value("Theme/fieldTextSELColor"); fillColorHL = EditorSettings.value("Theme/fieldBGColor"); fontColorNA = EditorSettings.value("Theme/fieldTextSELColor"); - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 14; category = "Editor"; }; @@ -1059,7 +1059,7 @@ singleton GuiControlProfile( GuiDirectoryFileListProfile ) fontColorSEL= EditorSettings.value("Theme/fieldTextSELColor"); fillColorHL = EditorSettings.value("Theme/fieldBGColor"); fontColorNA = EditorSettings.value("Theme/fieldTextSELColor"); - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 14; category = "Editor"; }; @@ -1112,7 +1112,7 @@ singleton GuiControlProfile( GuiCreatorIconButtonProfile ) //tab = true; //canKeyFocus = true; - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 14; fontColor = EditorSettings.value("Theme/fieldTextColor"); @@ -1154,6 +1154,7 @@ singleton GuiControlProfile( ToolsMenubarProfile : ToolsGuiDefaultProfile ) category = "Editor"; opaque = true; + border = false; fillColor = EditorSettings.value("Theme/headerColor"); fontColor = EditorSettings.value("Theme/headerTextColor"); diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorInspector.ed.tscript b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorInspector.ed.tscript index fafc0a7c2..3cc59381d 100644 --- a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorInspector.ed.tscript +++ b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorInspector.ed.tscript @@ -154,7 +154,7 @@ function GuiEditorInspectFields::onInspectorDiscardFieldModification( %this ) function GuiEditorInspectFields::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - GuiEditorFieldInfo.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + GuiEditorFieldInfo.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } //--------------------------------------------------------------------------------------------- diff --git a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript index e2a16756d..65f005e2f 100644 --- a/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript +++ b/Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorProfiles.ed.tscript @@ -418,7 +418,7 @@ function GuiEditorProfilesTree::setSelectedProfile( %this, %profile ) function GuiEditorProfileInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - GuiEditorProfileFieldInfo.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + GuiEditorProfileFieldInfo.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } //--------------------------------------------------------------------------------------------- diff --git a/Templates/BaseGame/game/tools/materialEditor/gui/Profiles.ed.tscript b/Templates/BaseGame/game/tools/materialEditor/gui/Profiles.ed.tscript index 60d461bf5..f8711a2b0 100644 --- a/Templates/BaseGame/game/tools/materialEditor/gui/Profiles.ed.tscript +++ b/Templates/BaseGame/game/tools/materialEditor/gui/Profiles.ed.tscript @@ -31,7 +31,7 @@ singleton GuiControlProfile (GuiMatEdSliderProfile) singleton GuiControlProfile (GuiMatEdRightJustifyProfile) { // font - fontType = "Noto Sans"; + fontType = "Arial"; fontSize = 14; fontCharset = ANSI; diff --git a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript index 070f7eac1..c1ef1c9c5 100644 --- a/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript +++ b/Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript @@ -179,7 +179,7 @@ function MeshRoadInspector::onInspectorFieldModified( %this, %object, %fieldName function MeshRoadInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - MeshFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + MeshFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } function MeshRoadTreeView::onInspect(%this, %obj) diff --git a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript index 7d8e79225..3b13670aa 100644 --- a/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript +++ b/Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript @@ -80,5 +80,5 @@ function MissionAreaInspector::onInspectorFieldModified( %this, %object, %fieldN function MissionAreaInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - MissionAreaFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + MissionAreaFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } diff --git a/Templates/BaseGame/game/tools/navEditor/navEditor.tscript b/Templates/BaseGame/game/tools/navEditor/navEditor.tscript index bbe6fe8b0..2c02fb68d 100644 --- a/Templates/BaseGame/game/tools/navEditor/navEditor.tscript +++ b/Templates/BaseGame/game/tools/navEditor/navEditor.tscript @@ -303,7 +303,7 @@ function NavInspector::onInspectorFieldModified(%this, %object, %fieldName, %arr function NavInspector::onFieldSelected(%this, %fieldName, %fieldTypeStr, %fieldDoc) { - NavFieldInfoControl.setText("" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc); + NavFieldInfoControl.setText("" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc); } function NavTreeView::onInspect(%this, %obj) diff --git a/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript b/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript index e70c02bbf..247ed643c 100644 --- a/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript +++ b/Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript @@ -182,7 +182,7 @@ function RiverInspector::onInspectorFieldModified( %this, %object, %fieldName, % function RiverInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - RiverFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + RiverFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } function RiverTreeView::onInspect(%this, %obj) diff --git a/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript b/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript index 5861fb164..351491167 100644 --- a/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript +++ b/Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript @@ -181,7 +181,7 @@ function RoadInspector::onInspectorFieldModified( %this, %object, %fieldName, %a function RoadInspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - RoadFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + RoadFieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } function RoadTreeView::onInspect(%this, %obj) diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui index a5cfc8380..f8185f554 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui @@ -26,7 +26,7 @@ $guiContent = new GuiContainer(EditorGui,EditorGuiGroup) { Profile = "ToolsMenubarProfile"; HorizSizing = "width"; VertSizing = "bottom"; - Position = "0 0"; + Position = "0 10"; Extent = "800 32"; MinExtent = "8 8"; canSave = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteWindow.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteWindow.ed.gui index 491f7ad1b..79f5f2a29 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteWindow.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsPaletteWindow.ed.gui @@ -23,7 +23,7 @@ $guiContent = new GuiControl() { VertSizing = "windowRelative"; Extent = "36 24"; MinExtent = "36 24"; - Position = "-1 63"; + Position = "-1 73"; canSave = "1"; Visible = "1"; hovertime = "1000"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui index b295abba0..14e419edf 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui +++ b/Templates/BaseGame/game/tools/worldEditor/gui/ToolsToolbar.ed.gui @@ -7,7 +7,7 @@ $guiContent = new GuiContainer(EWToolsToolbar) { Profile = "ToolsMenubarProfile"; HorizSizing = "right"; VertSizing = "bottom"; - Position = "0 31"; + Position = "0 41"; Extent = "0 33"; MinExtent = "8 2"; canSave = "1"; @@ -15,7 +15,7 @@ $guiContent = new GuiContainer(EWToolsToolbar) { hovertime = "1000"; isClosed = "0"; isDynamic = "0"; - + new GuiDynamicCtrlArrayControl(ToolsToolbarArray) { canSaveDynamicFields = "0"; Enabled = "1"; diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/profiles.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/gui/profiles.ed.tscript index 00a6e8507..1319fb1e1 100644 --- a/Templates/BaseGame/game/tools/worldEditor/gui/profiles.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/gui/profiles.ed.tscript @@ -35,7 +35,7 @@ singleton GuiControlProfile (EditorToolButtonProfile) singleton GuiControlProfile (EditorTextProfile) { - fontType = "Noto Sans Bold"; + fontType = "Arial Bold"; fontColor = "215 215 215"; autoSizeWidth = true; autoSizeHeight = true; @@ -44,7 +44,7 @@ singleton GuiControlProfile (EditorTextProfile) singleton GuiControlProfile (EditorTextProfileWhite) { - fontType = "Noto Sans Bold"; + fontType = "Arial Bold"; fontColor = "255 255 255"; autoSizeWidth = true; autoSizeHeight = true; diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/worldEditor.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/worldEditor.ed.tscript index 3ff1a1075..bd4d3b566 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/editors/worldEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/editors/worldEditor.ed.tscript @@ -423,7 +423,7 @@ function Inspector::onInspectorFieldModified( %this, %object, %fieldName, %array function Inspector::onFieldSelected( %this, %fieldName, %fieldTypeStr, %fieldDoc ) { - FieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); + FieldInfoControl.setText( "" @ %fieldName @ " (" @ %fieldTypeStr @ ") " NL "" @ %fieldDoc ); } // The following three methods are for fields that edit field value live and thus cannot record diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript index 0fd609019..ea9b26918 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.tscript @@ -113,8 +113,8 @@ function EditorGui::buildMenus(%this) %this.menuBar = new GuiMenuBar(WorldEditorMenubar) { dynamicItemInsertPos = 3; - extent = Canvas.extent.x SPC "20"; - minExtent = "320 20"; + extent = Canvas.extent.x SPC "30"; + minExtent = "320 30"; horizSizing = "width"; profile = "ToolsGuiMenuBarProfile"; };