Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-08 02:54:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix layouts list sorting by ID rather than name

Browse Source
This commit is contained in:
GriffinR 2024-12-06 11:02:38 -05:00
parent 9c40b04ad5
commit 435d22c63a
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ui/maplistmodels.h
View File

@ -148,6 +148,7 @@ public:
~LayoutTreeModel() {}
QVariant data(const QModelIndex &index, int role) const override;
QStandardItem *createMapFolderItem(const QString &folderName, QStandardItem *folder) override;
protected:
void removeItem(QStandardItem *item) override;

8
src/mainwindow.cpp
View File

@ -1279,13 +1279,13 @@ void MainWindow::onOpenMapListContextMenu(const QPoint &point) {
});
}
if (copyDisplayNameAction) {
connect(copyDisplayNameAction, &QAction::triggered, [this, sourceModel, index] {
setClipboardData(sourceModel->data(index, Qt::DisplayRole).toString());
connect(copyDisplayNameAction, &QAction::triggered, [this, selectedItem] {
setClipboardData(selectedItem->text());
});
}
if (copyToolTipAction) {
connect(copyToolTipAction, &QAction::triggered, [this, sourceModel, index] {
setClipboardData(sourceModel->data(index, Qt::ToolTipRole).toString());
connect(copyToolTipAction, &QAction::triggered, [this, selectedItem] {
setClipboardData(selectedItem->toolTip());
});
}

37
src/ui/maplistmodels.cpp
View File

@ -98,6 +98,7 @@ QStandardItem *MapListModel::createMapItem(const QString &mapName, QStandardItem
map->setData("map_name", MapListUserRoles::TypeRole);
map->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemNeverHasChildren);
map->setEditable(this->editable); // Will override flags if necessary
map->setToolTip(this->project->mapNamesToMapConstants.value(mapName));
this->mapItems.insert(mapName, map);
return map;
}
@ -147,9 +148,9 @@ QVariant MapListModel::data(const QModelIndex &index, int role) const {
const QString type = item->data(MapListUserRoles::TypeRole).toString();
const QString name = item->data(MapListUserRoles::NameRole).toString();
if (type == "map_name") {
// Data for maps in the map list
if (role == Qt::DecorationRole) {
if (role == Qt::DecorationRole) {
if (type == "map_name") {
// Decorating map in the map list
if (name == this->activeItemName)
return this->mapOpenedIcon;
@ -157,12 +158,8 @@ QVariant MapListModel::data(const QModelIndex &index, int role) const {
if (!map)
return this->mapGrayIcon;
return map->hasUnsavedChanges() ? this->mapEditedIcon : this->mapIcon;
} else if (role == Qt::ToolTipRole) {
return this->project->mapNamesToMapConstants.value(name);
}
} else if (type == this->folderTypeName) {
// Data for map folders in the map list
if (role == Qt::DecorationRole) {
} else if (type == this->folderTypeName) {
// Decorating map folder in the map list
return item->hasChildren() ? this->mapFolderIcon : this->emptyMapFolderIcon;
}
}
@ -451,6 +448,19 @@ void LayoutTreeModel::removeItem(QStandardItem *) {
// TODO: Deleting layouts not supported
}
QStandardItem *LayoutTreeModel::createMapFolderItem(const QString &folderName, QStandardItem *folder) {
folder = MapListModel::createMapFolderItem(folderName, folder);
// Despite using layout IDs internally, the Layouts map list shows layouts using their file path name.
// We could handle this with Qt::DisplayRole in LayoutTreeModel::data, but then it would be sorted using the ID instead of the name.
const Layout* layout = this->project->mapLayouts.value(folderName);
if (layout) {
folder->setText(layout->name);
folder->setToolTip(layout->id);
}
return folder;
}
QVariant LayoutTreeModel::data(const QModelIndex &index, int role) const {
if (!index.isValid())
return QVariant();
@ -463,23 +473,16 @@ QVariant LayoutTreeModel::data(const QModelIndex &index, int role) const {
const QString name = item->data(MapListUserRoles::NameRole).toString();
if (type == this->folderTypeName) {
const Layout* layout = this->project->mapLayouts.value(name);
if (role == Qt::DecorationRole) {
// Map layouts are used as folders, but we display them with the same icons as maps.
if (name == this->activeItemName)
return this->mapOpenedIcon;
const Layout* layout = this->project->mapLayouts.value(name);
if (!layout || !layout->loaded)
return this->mapGrayIcon;
return layout->hasUnsavedChanges() ? this->mapEditedIcon : this->mapIcon;
}
else if (role == Qt::DisplayRole) {
// Despite using layout IDs internally, the Layouts map list shows layouts using their file path name.
if (layout) return layout->name;
} else if (role == Qt::ToolTipRole) {
if (layout) return layout->id;
}
}
return MapListModel::data(index, role);
}