Skip to content

Commit 74cf2bc

Browse files
committed
Moved natural sorting option to "Interface" section
It probably fits slightly better there than in "Saving and Loading".
1 parent 5e74ff4 commit 74cf2bc

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

src/tiled/preferencesdialog.ui

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,6 @@
6464
</property>
6565
</widget>
6666
</item>
67-
<item row="4" column="0">
68-
<widget class="QCheckBox" name="naturalSorting">
69-
<property name="toolTip">
70-
<string>Sort files numerically (d3, d20) instead of alphabetically (d20, d3)</string>
71-
</property>
72-
<property name="text">
73-
<string>Use natural sorting in Projects view</string>
74-
</property>
75-
</widget>
76-
</item>
7767
</layout>
7868
</widget>
7969
</item>
@@ -273,6 +263,16 @@
273263
</property>
274264
</widget>
275265
</item>
266+
<item row="7" column="0" colspan="2">
267+
<widget class="QCheckBox" name="naturalSorting">
268+
<property name="toolTip">
269+
<string>Sort files numerically (d3, d20) instead of alphabetically (d20, d3)</string>
270+
</property>
271+
<property name="text">
272+
<string>Use natural sorting in Projects view</string>
273+
</property>
274+
</widget>
275+
</item>
276276
<item row="4" column="1" colspan="2">
277277
<layout class="QHBoxLayout" name="horizontalLayout_3">
278278
<item>
@@ -702,6 +702,7 @@
702702
<tabstop>gridMajorY</tabstop>
703703
<tabstop>objectLineWidth</tabstop>
704704
<tabstop>openGL</tabstop>
705+
<tabstop>naturalSorting</tabstop>
705706
<tabstop>objectSelectionBehaviorCombo</tabstop>
706707
<tabstop>preciseTileObjectSelection</tabstop>
707708
<tabstop>wheelZoomsByDefault</tabstop>

src/tiled/projectdock.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,9 @@ ProjectView::ProjectView(QWidget *parent)
209209
this, &ProjectView::onRowsInserted);
210210

211211
connect(this, &QTreeView::expanded,
212-
this, [=] (const QModelIndex &index) {
213-
mExpandedPaths.insert(filePath(index));
214-
});
212+
this, [=] (const QModelIndex &index) { mExpandedPaths.insert(filePath(index)); });
215213
connect(this, &QTreeView::collapsed,
216-
this, [=] (const QModelIndex &index) {
217-
mExpandedPaths.remove(filePath(index));
218-
});
214+
this, [=] (const QModelIndex &index) { mExpandedPaths.remove(filePath(index)); });
219215

220216
// Reselect a previously selected path and restore scrollbar after refresh
221217
connect(mProjectModel, &ProjectModel::aboutToRefresh,

0 commit comments

Comments
 (0)