mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-12 07:04:36 +00:00
Streamlined baseUI profiles
Implemented audioOptions file with structure to comply to BaseUI options menu Implemented majority of keybind remapping logic for options menu
This commit is contained in:
parent
f14c96c2bc
commit
55697cffdb
23 changed files with 1605 additions and 1582 deletions
|
|
@ -302,7 +302,7 @@ new VPathEditor(EVPathEditor) {
|
|||
};
|
||||
new GuiPopUpMenuCtrl(EPathEditorNodeOrientationMode){
|
||||
internalName = "weight";
|
||||
Profile = "GuiPopUpMenuProfile";
|
||||
Profile = "ToolsGuiPopUpMenuProfile";
|
||||
HorizSizing = "right";
|
||||
VertSizing = "bottom";
|
||||
Position = "57 84";
|
||||
|
|
@ -385,7 +385,7 @@ new VPathEditor(EVPathEditor) {
|
|||
canSaveDynamicFields = "0";
|
||||
Enabled = "1";
|
||||
isContainer = "1";
|
||||
Profile = "GuiTransparentProfile";
|
||||
Profile = "ToolsGuiTransparentProfile";
|
||||
HorizSizing = "right";
|
||||
VertSizing = "bottom";
|
||||
Position = "1 1";
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ $guiContent = new GuiControl(VPathEditorToolbar)
|
|||
new GuiTextCtrl()
|
||||
{
|
||||
internalName = "ToolbarLabel";
|
||||
profile = "GuiTextProfile";
|
||||
profile = "ToolsGuiTextProfile";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
position = "2 7";
|
||||
|
|
@ -48,7 +48,7 @@ $guiContent = new GuiControl(VPathEditorToolbar)
|
|||
internalName = "PathTypeMenu";
|
||||
Enabled = "1";
|
||||
isContainer = "0";
|
||||
Profile = "GuiPopUpMenuProfile";
|
||||
Profile = "ToolsGuiPopUpMenuProfile";
|
||||
HorizSizing = "right";
|
||||
VertSizing = "bottom";
|
||||
Position = "85 7";
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ singleton GuiControlProfile( VEditorTextEditProfile : VEditorDefaultProfile )
|
|||
canKeyFocus = true;
|
||||
};
|
||||
|
||||
singleton GuiControlProfile( VEditorPopupMenuProfile : GuiPopUpMenuProfile )
|
||||
singleton GuiControlProfile( VEditorPopupMenuProfile : ToolsGuiPopUpMenuProfile )
|
||||
{
|
||||
FillColorHL = "90 90 90";
|
||||
FillColorSEL = "0 0 0";
|
||||
|
|
@ -204,7 +204,7 @@ singleton GuiControlProfile( VEditorPropertyLabelProfile : VEditorTextProfile )
|
|||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
singleton GuiControlProfile( VEditorPreferenceLabelProfile : GuiTextProfile )
|
||||
singleton GuiControlProfile( VEditorPreferenceLabelProfile : ToolsGuiTextProfile )
|
||||
{
|
||||
opaque = true;
|
||||
fillColor = "242 241 240";
|
||||
|
|
|
|||
|
|
@ -2420,7 +2420,7 @@ function AssetBrowserPreviewButton::onMouseDragged(%this)
|
|||
%ctrl = new GuiDragAndDropControl()
|
||||
{
|
||||
canSaveDynamicFields = "0";
|
||||
Profile = "GuiSolidDefaultProfile";
|
||||
Profile = "ToolsGuiSolidDefaultProfile";
|
||||
HorizSizing = "right";
|
||||
VertSizing = "bottom";
|
||||
Position = %xPos SPC %yPos;
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ $guiContent = new GuiControl(IODropdownDlg) {
|
|||
};
|
||||
new GuiBitmapBorderCtrl() {
|
||||
isContainer = "0";
|
||||
profile = "GuiGroupBorderProfile";
|
||||
profile = "ToolsGuiGroupBorderProfile";
|
||||
horizSizing = "width";
|
||||
vertSizing = "bottom";
|
||||
position = "7 51";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ $guiContent = new GuiControl(RenderTargetVisualizer) {
|
|||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiModelessDialogProfile";
|
||||
profile = "ToolsGuiModelessDialogProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
|
|
@ -79,7 +79,7 @@ $guiContent = new GuiControl(RenderTargetVisualizer) {
|
|||
minExtent = "8 2";
|
||||
horizSizing = "width";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiPopUpMenuProfile";
|
||||
profile = "ToolsGuiPopUpMenuProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
command = "RenderTargetsList.updateTarget();";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,7 @@
|
|||
<LevelAsset
|
||||
canSave="true"
|
||||
canSaveDynamicFields="true"
|
||||
AssetName="DefaultEditorLevel"
|
||||
LevelFile="@assetFile=DefaultEditorLevel.mis"
|
||||
LevelName="DefaultEditorLevel"
|
||||
isSubScene="false"
|
||||
description="An empty room"
|
||||
previewImageAsset0="@asset=ToolsModule:DefaultEditorLevel_preview_image"
|
||||
previewImageAsset1="@asset=ToolsModule:DefaultEditorLevel_preview_image"
|
||||
|
|
@ -14,5 +11,4 @@
|
|||
previewImageAsset5="@asset=ToolsModule:DefaultEditorLevel_preview_image"
|
||||
previewImageAsset6="@asset=ToolsModule:DefaultEditorLevel_preview_image"
|
||||
staticObjectAssetDependency0="@asset=Prototyping:FloorGray"
|
||||
staticObjectAssetDependency1="@asset=FPSGameplay:soldier_rigged"
|
||||
VersionId="1" />
|
||||
VersionId="1"/>
|
||||
|
|
|
|||
|
|
@ -2619,7 +2619,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
|
|||
hovertime = "1000";
|
||||
|
||||
new GuiContainer(){ // enable/disable
|
||||
profile="GuiTransparentProfile";
|
||||
profile="ToolsGuiTransparentProfile";
|
||||
isContainer = "1";
|
||||
position = "0 0";
|
||||
Extent = "300 24";
|
||||
|
|
@ -2652,7 +2652,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
|
|||
};
|
||||
|
||||
new GuiContainer(){ // scale
|
||||
profile="GuiTransparentProfile";
|
||||
profile="ToolsGuiTransparentProfile";
|
||||
isContainer = "1";
|
||||
position = "0 0";
|
||||
Extent = "300 24";
|
||||
|
|
@ -2735,7 +2735,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
|
|||
};
|
||||
|
||||
new GuiContainer(){ // direction
|
||||
profile="GuiTransparentProfile";
|
||||
profile="ToolsGuiTransparentProfile";
|
||||
isContainer = "1";
|
||||
position = "0 0";
|
||||
Extent = "300 24";
|
||||
|
|
@ -2817,7 +2817,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
|
|||
};
|
||||
};
|
||||
new GuiContainer(){ // strength
|
||||
profile="GuiTransparentProfile";
|
||||
profile="ToolsGuiTransparentProfile";
|
||||
isContainer = "1";
|
||||
position = "0 0";
|
||||
Extent = "300 24";
|
||||
|
|
@ -2899,7 +2899,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
|
|||
};
|
||||
};
|
||||
new GuiContainer(){ // coverage
|
||||
profile="GuiTransparentProfile";
|
||||
profile="ToolsGuiTransparentProfile";
|
||||
isContainer = "1";
|
||||
position = "0 0";
|
||||
Extent = "300 24";
|
||||
|
|
@ -2981,7 +2981,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
|
|||
};
|
||||
};
|
||||
new GuiContainer(){ // specular
|
||||
profile="GuiTransparentProfile";
|
||||
profile="ToolsGuiTransparentProfile";
|
||||
isContainer = "1";
|
||||
position = "0 0";
|
||||
Extent = "300 24";
|
||||
|
|
@ -3063,7 +3063,7 @@ $guiContent = new GuiControl(MaterialEditorGui,EditorGuiGroup) {
|
|||
};
|
||||
};
|
||||
new GuiContainer(){ // empty space
|
||||
profile="GuiTransparentProfile";
|
||||
profile="ToolsGuiTransparentProfile";
|
||||
isContainer = "1";
|
||||
position = "0 0";
|
||||
Extent = "300 10";
|
||||
|
|
|
|||
|
|
@ -549,7 +549,7 @@ $guiContent = new GuiNavEditorCtrl(NavEditorGui, EditorGuiGroup) {
|
|||
canSaveDynamicFields = "0";
|
||||
Enabled = "1";
|
||||
isContainer = "1";
|
||||
Profile = "GuiTransparentProfile";
|
||||
Profile = "ToolsGuiTransparentProfile";
|
||||
HorizSizing = "width";
|
||||
VertSizing = "height";
|
||||
Position = "1 1";
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ $guiContent = new GuiTabPageCtrl(ENavEditorSettingsPage) {
|
|||
minExtent = "8 2";
|
||||
horizSizing = "width";
|
||||
vertSizing = "height";
|
||||
profile = "GuiSolidDefaultProfile";
|
||||
profile = "ToolsGuiSolidDefaultProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
<Setting
|
||||
name="doubleClickAction">Edit Asset</Setting>
|
||||
<Setting
|
||||
name="LastPosExt">0 976 2016 360</Setting>
|
||||
name="LastPosExt">0 976 2200 360</Setting>
|
||||
<Setting
|
||||
name="previewTileSize">1</Setting>
|
||||
<Setting
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
$guiContent = new GuiControl(AL_ShadowVizOverlayCtrl) {
|
||||
canSaveDynamicFields = "0";
|
||||
isContainer = "1";
|
||||
Profile = "GuiModelessDialogProfile";
|
||||
Profile = "ToolsGuiModelessDialogProfile";
|
||||
HorizSizing = "right";
|
||||
VertSizing = "bottom";
|
||||
Position = "0 0";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue