diff options
| -rw-r--r-- | filestreemodel.cpp | 1 | ||||
| -rw-r--r-- | filestreewidget.cpp | 1 | ||||
| -rw-r--r-- | shemov.cpp | 28 |
3 files changed, 26 insertions, 4 deletions
diff --git a/filestreemodel.cpp b/filestreemodel.cpp index 1020b17..c44e449 100644 --- a/filestreemodel.cpp +++ b/filestreemodel.cpp @@ -107,7 +107,6 @@ QVariant FilesTreeModel::data(const QModelIndex &index, int role) const{ SmTreeItem *item = static_cast<SmTreeItem*>(index.internalPointer()); if(role == Qt::DisplayRole){ - //if(index.column()) if(index.column() == DvdNo){ if(index.data(FileTypeRole) == QVariant()){ return QVariant(); diff --git a/filestreewidget.cpp b/filestreewidget.cpp index 9aa00f0..d87396e 100644 --- a/filestreewidget.cpp +++ b/filestreewidget.cpp @@ -20,6 +20,7 @@ #include <QFileDialog> #include <QSettings> #include <QEvent> +#include <QSettings> #include <QDebug> @@ -41,6 +41,7 @@ #include "seriestreewidget.h" #include "newmoviewizard.h" #include "filestreewidget.h" +#include "filestreemodel.h" SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags), mOpenWithGroupFS(0), mOpenWithGroupAV(0) { //application icon @@ -86,9 +87,9 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla QWidget *centralWidget = new QWidget; centralWidget->setLayout(mainLayout); setCentralWidget(centralWidget); - readSettings(); - mFSWidget->readSettings(); mATree->seriesWidget()->readSettings(); + mFSWidget->readSettings(); + readSettings(); show(); mFSWidget->fileView()->setFocus(Qt::ActiveWindowFocusReason); } @@ -97,8 +98,8 @@ void SheMov::closeEvent(QCloseEvent *event){ mFSWidget->writeSettings(); mFSWidget->pictureViewer()->close(); mATree->seriesWidget()->writeSettings(); - delete SmGlobals::instance(); writeSettings(); + delete SmGlobals::instance(); event->accept(); } @@ -562,6 +563,9 @@ void SheMov::writeSettings(){ s.setValue("windows/mainsize", size()); bool winState = windowState() & Qt::WindowMaximized; s.setValue("windows/maximized", winState); + s.setValue("ui/selectedtab", mTab->currentIndex()); + FilesTreeModel *filesModel = static_cast<FilesTreeModel*>(SmGlobals::instance()->model("FilesModel")); + s.setValue("ui/filestreemode", filesModel->mode()); } void SheMov::readSettings(){ @@ -574,4 +578,22 @@ void SheMov::readSettings(){ if(winState){ setWindowState(Qt::WindowMaximized); } + int currentTab = s.value("ui/selectedtab", 0).toInt(); + if(currentTab < mTab->count() && currentTab != mTab->currentIndex()){ + mTab->setCurrentIndex(currentTab); + } + int filesMode = s.value("ui/filestreemode", FilesTreeModel::Normal).toInt(); + switch(filesMode){ + case FilesTreeModel::Normal: + mShowNormalA->trigger(); + break; + case FilesTreeModel::Local: + mShowLocalA->trigger(); + break; + case FilesTreeModel::Archived: + mShowArchivedA->trigger(); + break; + default: + ; + } } |