From 03831d3669ea49a99a15aaf5d17724be8c533b85 Mon Sep 17 00:00:00 2001 From: Arno Date: Wed, 20 Mar 2013 21:27:35 +0100 Subject: Use a Thread for collecting file data blocking the GUI isn't nice, so use a separate Thread to gather all the data for SmDirModel. Populating and changing directory works, but modifying a file is most likely broken. --- filesystemwidget.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'filesystemwidget.cpp') diff --git a/filesystemwidget.cpp b/filesystemwidget.cpp index 4b7a9c7..b842541 100644 --- a/filesystemwidget.cpp +++ b/filesystemwidget.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -18,16 +17,12 @@ #include #include #include -#include #include -#include -#include #include #include #include #include #include -#include #include "filesystemwidget.h" #include "filesystemdirproxy.h" @@ -40,13 +35,17 @@ #include "smdirmodel.h" FilesystemWidget::FilesystemWidget(QWidget *parent) : QWidget(parent), mClipboardMode(None) { - mModel = new FileSystemModel(this); + mModel = new FileSystemModel(this); mModel->setRootPath("/"); mModel->setFilter(QDir::AllEntries | QDir::NoDot); mModel->setReadOnly(false); mIconProvider = new SheMovIconProvider; mModel->setIconProvider(mIconProvider); + QStringList fHeaders = QStringList() << tr("Name") << tr("Size") << tr("Type") << tr("Created") << tr("Md5Sum") << tr("Duration") << tr("Bitrate") << tr("Full Path"); + mFileModel = new SmDirModel(fHeaders, this); + connect(mFileModel, SIGNAL(needResize()), this, SLOT(resizeFileView())); + mDirProxy = new FilesystemDirProxy; mDirProxy->setSourceModel(mModel); mDirView = new QTreeView; @@ -64,9 +63,7 @@ FilesystemWidget::FilesystemWidget(QWidget *parent) : QWidget(parent), mClipboar mFileView = new FileView; mFileProxy = new FilesystemFileProxy; - QStringList fHeaders = QStringList() << tr("Name") << tr("Size") << tr("Type") << tr("Created") << tr("Md5Sum") << tr("Duration") << tr("Bitrate") << tr("Full Path"); - mFileModel = new SmDirModel(fHeaders, this); - connect(mFileModel, SIGNAL(needResize()), this, SLOT(resizeFileView())); + mFileProxy->setSourceModel(mFileModel); mFileView->setModel(mFileProxy); mFileView->setSortingEnabled(true); @@ -114,7 +111,6 @@ FilesystemWidget::FilesystemWidget(QWidget *parent) : QWidget(parent), mClipboar splitter->setStretchFactor(0, 1); splitter->setStretchFactor(1, 2); mainLayout->addWidget(splitter); - setLayout(mainLayout); } -- cgit v1.2.3-70-g09d2