Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align level tile naming convention with outside world #118

Merged
merged 1 commit into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 40 additions & 5 deletions source/exportdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>797</width>
<height>368</height>
<height>369</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -61,6 +61,12 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
Expand Down Expand Up @@ -89,6 +95,12 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
Expand Down Expand Up @@ -128,17 +140,17 @@
</item>
<item>
<property name="text">
<string>Subtile</string>
<string>Tile</string>
</property>
</item>
<item>
<property name="text">
<string>Flat Tile</string>
<string>Flat MegaTile</string>
</property>
</item>
<item>
<property name="text">
<string>2.5D Tile</string>
<string>2.5D MegaTile</string>
</property>
</item>
</widget>
Expand All @@ -148,6 +160,12 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
Expand Down Expand Up @@ -193,6 +211,12 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0">
Expand Down Expand Up @@ -312,6 +336,12 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
Expand Down Expand Up @@ -340,6 +370,12 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
Expand All @@ -363,5 +399,4 @@
</widget>
<resources/>
<connections/>
<buttongroups/>
</ui>
6 changes: 3 additions & 3 deletions source/levelcelview.ui
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>874</width>
<height>521</height>
<height>523</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -450,7 +450,7 @@
</size>
</property>
<property name="text">
<string>Tiles:</string>
<string>MegaTiles:</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -979,7 +979,7 @@
</size>
</property>
<property name="text">
<string>Sub-tiles:</string>
<string>Tiles:</string>
</property>
</widget>
</item>
Expand Down
6 changes: 3 additions & 3 deletions source/mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -325,15 +325,15 @@
</action>
<action name="actionCleanupFrames_Tileset">
<property name="text">
<string>Cleanup frames</string>
<string>Cleanup Frames</string>
</property>
<property name="toolTip">
<string>Delete frames not used by any subtile</string>
</property>
</action>
<action name="actionCleanupSubtiles_Tileset">
<property name="text">
<string>Cleanup Subtiles</string>
<string>Cleanup Tiles</string>
</property>
<property name="toolTip">
<string>Delete subtiles not used by any tile</string>
Expand All @@ -357,7 +357,7 @@
</action>
<action name="actionSortSubtiles_Tileset">
<property name="text">
<string>Sort Subtiles</string>
<string>Sort Tiles</string>
</property>
<property name="toolTip">
<string>Sort the subtiles based on the tiles</string>
Expand Down
Loading