atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Prevent autoexpanding all map groups on resort (#78)

Browse source 
Also fix path separator in status bar text
This commit is contained in:
Diegoisawesome 2019-01-05 16:38:37 -06:00 committed by huderlem
parent f1caa03c6c
commit fdd5e4851a
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mainwindow.cpp
View file

@ -191,8 +191,13 @@ void MainWindow::mapSortOrder_changed(QAction *action)
void MainWindow::on_lineEdit_filterBox_textChanged(const QString &arg1) void MainWindow::on_lineEdit_filterBox_textChanged(const QString &arg1)
{ {
mapListProxyModel->setFilterRegExp(QRegExp(arg1, Qt::CaseInsensitive, QRegExp::FixedString)); mapListProxyModel->setFilterRegExp(QRegExp(arg1, Qt::CaseInsensitive, QRegExp::FixedString));
ui->mapList->expandToDepth(0); if (arg1.isEmpty()) {
ui->mapList->collapseAll();
} else {
ui->mapList->expandToDepth(0);
}
ui->mapList->setExpanded(mapListProxyModel->mapFromSource(mapListIndexes.value(editor->map->name)), true); ui->mapList->setExpanded(mapListProxyModel->mapFromSource(mapListIndexes.value(editor->map->name)), true);
ui->mapList->scrollTo(mapListProxyModel->mapFromSource(mapListIndexes.value(editor->map->name)), QAbstractItemView::PositionAtCenter);
} }
void MainWindow::loadUserSettings() { void MainWindow::loadUserSettings() {
@ -216,7 +221,9 @@ bool MainWindow::openProject(QString dir) {
return false; return false;
} }
this->statusBar()->showMessage(QString("Opening project %1").arg(dir)); QString nativeDir = QDir::toNativeSeparators(dir);
this->statusBar()->showMessage(QString("Opening project %1").arg(nativeDir));
bool success = true; bool success = true;
projectConfig.setProjectDir(dir); projectConfig.setProjectDir(dir);
@ -239,9 +246,9 @@ bool MainWindow::openProject(QString dir) {
} }
if (success) { if (success) {
this->statusBar()->showMessage(QString("Opened project %1").arg(dir)); this->statusBar()->showMessage(QString("Opened project %1").arg(nativeDir));
} else { } else {
this->statusBar()->showMessage(QString("Failed to open project %1").arg(dir)); this->statusBar()->showMessage(QString("Failed to open project %1").arg(nativeDir));
} }
return success; return success;
@ -683,7 +690,6 @@ void MainWindow::sortMapList() {
} }
ui->mapList->setUpdatesEnabled(true); ui->mapList->setUpdatesEnabled(true);
ui->mapList->expandToDepth(0);
ui->mapList->repaint(); ui->mapList->repaint();
} }