#4554 Harmonized path separator direction in hierarchy file dialog on windows

This commit is contained in:
Jacob Støren
2019-08-16 09:05:15 +02:00
parent 010c9a539f
commit f3c0c4ff82
@@ -283,7 +283,7 @@ void RicFileHierarchyDialog::appendToFileList(const QString& fileName)
{ {
QString itemText = fileName; QString itemText = fileName;
itemText.remove(0, rootDir().size()); itemText.remove(0, rootDir().size());
QListWidgetItem* item = new QListWidgetItem(itemText, m_fileList); QListWidgetItem* item = new QListWidgetItem(QDir::toNativeSeparators(itemText), m_fileList);
item->setFlags(item->flags() | Qt::ItemIsUserCheckable); item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
item->setCheckState(Qt::Checked); item->setCheckState(Qt::Checked);
} }
@@ -715,7 +715,7 @@ void RicFileHierarchyDialog::slotDialogOkClicked()
const QListWidgetItem* item = m_fileList->item(i); const QListWidgetItem* item = m_fileList->item(i);
if ((item->flags() & Qt::ItemIsUserCheckable) != 0 && item->checkState()) if ((item->flags() & Qt::ItemIsUserCheckable) != 0 && item->checkState())
{ {
m_files.push_back(rootDir() + item->text()); m_files.push_back(rootDir() + RiaFilePathTools::toInternalSeparator(item->text()));
} }
} }
accept(); accept();
@@ -737,7 +737,7 @@ void RicFileHierarchyDialog::slotDialogCancelClicked()
void RicFileHierarchyDialog::slotBrowseButtonClicked() void RicFileHierarchyDialog::slotBrowseButtonClicked()
{ {
QString folder = QFileDialog::getExistingDirectory(this, "Select root folder", m_rootDir->text()); QString folder = QFileDialog::getExistingDirectory(this, "Select root folder", m_rootDir->text());
if(!folder.isEmpty()) m_rootDir->setText(folder); if(!folder.isEmpty()) m_rootDir->setText(QDir::toNativeSeparators(folder));
} }