#5565: Some tweaking

codereader · Mar 28, 2021 · da58afd · da58afd
1 parent c87c44d
commit da58afd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/install/ui/materialeditor.fbp b/install/ui/materialeditor.fbp
@@ -15951,7 +15951,7 @@
                                 <property name="gripper">0</property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
-                                <property name="label">Note: changes will be written to the file .....</property>
+                                <property name="label"></property>
                                 <property name="markup">0</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>

diff --git a/install/ui/materialeditor.xrc b/install/ui/materialeditor.xrc
@@ -2779,7 +2779,7 @@
 						<flag>wxALIGN_CENTER_VERTICAL</flag>
 						<border>5</border>
 						<object class="wxStaticText" name="MaterialEditorSaveNote">
-							<label>Note: changes will be written to the file .....</label>
+							<label></label>
 							<wrap>-1</wrap>
 						</object>
 					</object>

diff --git a/radiant/ui/materials/editor/MaterialEditor.cpp b/radiant/ui/materials/editor/MaterialEditor.cpp
@@ -1368,7 +1368,7 @@ void MaterialEditor::updateStageButtonSensitivity()
 {
     auto item = _stageView->GetSelection();
 
-    if (_material && item.IsOk())
+    if (_material && item.IsOk() && GlobalMaterialManager().materialCanBeModified(_material->getName()))
     {
         auto row = wxutil::TreeModel::Row(item, *_stageList);
         auto index = row[STAGE_COLS().index].getInteger();
@@ -1380,6 +1380,7 @@ void MaterialEditor::updateStageButtonSensitivity()
         getControl<wxButton>("MaterialEditorMoveUpStageButton")->Enable(!isGlobalStage && index > 0);
         getControl<wxButton>("MaterialEditorMoveDownStageButton")->Enable(!isGlobalStage && index + 1 < layersCount);
         getControl<wxButton>("MaterialEditorDuplicateStageButton")->Enable(!isGlobalStage);
+        getControl<wxButton>("MaterialEditorAddStageButton")->Enable();
     }
     else
     {
@@ -1388,6 +1389,7 @@ void MaterialEditor::updateStageButtonSensitivity()
         getControl<wxButton>("MaterialEditorMoveUpStageButton")->Disable();
         getControl<wxButton>("MaterialEditorMoveDownStageButton")->Disable();
         getControl<wxButton>("MaterialEditorDuplicateStageButton")->Disable();
+        getControl<wxButton>("MaterialEditorAddStageButton")->Disable();
     }
 }
 
@@ -1555,7 +1557,7 @@ void MaterialEditor::updateMaterialPropertiesFromMaterial()
     getControl<wxPanel>("MaterialEditorStageSettingsPanel")->Enable(materialCanBeModified);
 
     auto nameEntry = getControl<wxTextCtrl>("MaterialName");
-    nameEntry->Enable(_material != nullptr);
+    nameEntry->Enable(materialCanBeModified);
     nameEntry->SetValue(_material ? _material->getName() : "");
     updateMaterialNameControl();