From 54b87b5de76a926e484a58f03cf9fa6ffc4053db Mon Sep 17 00:00:00 2001 From: Anakin Date: Tue, 20 Jun 2017 11:58:03 +0200 Subject: [PATCH] fixed things i've broken by the merge conflict --- QtMeshViewer/Header/MainWindow.h | 3 +-- QtMeshViewer/Source/MainWindow.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/QtMeshViewer/Header/MainWindow.h b/QtMeshViewer/Header/MainWindow.h index 457e1b9..83fa17f 100644 --- a/QtMeshViewer/Header/MainWindow.h +++ b/QtMeshViewer/Header/MainWindow.h @@ -26,7 +26,6 @@ private: FileInfoWindow* m_infoWindow; QStringList m_filters; - QStringList m_Paths; // functions private: @@ -48,7 +47,7 @@ public slots: // private slots private slots: void setupAssetLibrary(); - void on_fileListWidget_doubleClicked(const QModelIndex &index); + void on_fileTreeWidget_doubleClicked(); void on_dirDropDownList_currentTextChanged(const QString &arg1); // signals diff --git a/QtMeshViewer/Source/MainWindow.cpp b/QtMeshViewer/Source/MainWindow.cpp index 14ec8a1..d609d5d 100644 --- a/QtMeshViewer/Source/MainWindow.cpp +++ b/QtMeshViewer/Source/MainWindow.cpp @@ -171,14 +171,15 @@ void MainWindow::setupWidgets() void MainWindow::updateAssetTree(QString path) { - ui->fileListWidget->clear(); - m_Paths.clear(); + + ui->fileTreeWidget->clear(); QDirIterator itterator(path, QStringList() << "*.msh" << "*.MSH" << "*.mesh" << "*.MESH", QDir::Files, QDirIterator::Subdirectories); while (itterator.hasNext()) { - ui->fileListWidget->insertItem(0, new QListWidgetItem(itterator.fileName())); - m_Paths.prepend(itterator.fileInfo().absoluteFilePath()); + QTreeWidgetItem* sub = new QTreeWidgetItem(ui->fileTreeWidget); + sub->setData(0, Qt::DisplayRole, itterator.fileName()); + sub->setData(1, Qt::DisplayRole, itterator.fileInfo().absoluteFilePath()); itterator.next(); } } @@ -247,10 +248,9 @@ void MainWindow::setupAssetLibrary() updateAssetTree(ui->dirDropDownList->currentData().toString()); } -void MainWindow::on_fileListWidget_doubleClicked(const QModelIndex &index) +void MainWindow::on_fileTreeWidget_doubleClicked() { - int slotVal = index.row(); - QString clickedFile = m_Paths.at(slotVal); + QString clickedFile = ui->fileTreeWidget->currentItem()->text(1); openFile(clickedFile); }