Merge branch 'master' into wip-translator

WohlSoft · Mar 9, 2024 · bfc1923 · bfc1923
2 parents 5f89b40 + 3779ea4
commit bfc1923
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/Editor/editing/edit_level/levelprops.ui b/Editor/editing/edit_level/levelprops.ui
@@ -32,16 +32,13 @@
  <string>Level Properties</string>
  </property>
  <property name="windowIcon">
- <iconset resource="../../_resources/editor.qrc">
+ <iconset resource="../../_resources/toolbar/toolbar.qrc">
  <normaloff>:/toolbar/dock/level16.png</normaloff>
  <normalon>:/toolbar/dock/level16.png</normalon>
  <activeoff>:/toolbar/dock/level16.png</activeoff>
  <activeon>:/toolbar/dock/level16.png</activeon>
  <selectedon>:/toolbar/dock/level16.png</selectedon>:/toolbar/dock/level16.png</iconset>
  </property>
- <property name="locale">
- <locale language="English" country="UnitedStates"/>
- </property>
  <property name="modal">
  <bool>false</bool>
  </property>
@@ -334,7 +331,7 @@
  </layout>
  </widget>
  <resources>
- <include location="../../_resources/editor.qrc"/>
+ <include location="../../_resources/toolbar/toolbar.qrc"/>
  </resources>
  <connections>
  <connection>