Usability: SeriesTreeView

Switch back to normal view when in burn view and a series is selected in
SeriesTree.

4 files changed, 11 insertions, 2 deletions

diff --git a/archivetreeview.cpp b/archivetreeview.cpp
index 6ee36f1..5eaa857 100644
--- a/archivetreeview.cpp
+++ b/archivetreeview.cpp
@@ -240,6 +240,10 @@ void ArchiveTreeView::currentChanged(const QItemSelection &selected, const QItem
 	Q_UNUSED(selected);
 	Q_UNUSED(deselected);
 
+    if(mFilesModel->displayMode() == FilesTreeModel::Burn){
+        mFilesModel->setDisplayMode(FilesTreeModel::Ids);
+        mNormalViewA->trigger();
+    }
 	QModelIndexList selectedSeries = mSeriesWidget->seriesTree()->selectionModel()->selectedRows();
 	mFilesWidget->resetSize();
 	if(selectedSeries.isEmpty()){
diff --git a/archivetreeview.h b/archivetreeview.h
index 9abbb44..a730fd6 100644
--- a/archivetreeview.h
+++ b/archivetreeview.h
@@ -30,6 +30,7 @@ class QSqlQuery;
 class QPushButton;
 class QContextMenuEvent;
 class QLabel;
+class QAction;
 
 class ArchiveTreeView : public QWidget
 {
@@ -41,6 +42,7 @@ class ArchiveTreeView : public QWidget
 		SeriesTreeWidget *seriesWidget() { return mSeriesWidget; }
 		FilesTreeWidget *filesWidget() { return mFilesWidget; }
 		const QString windowTitle() { return mWindowTitle; }
+        void setNormalViewAction(QAction* a) { mNormalViewA = a; }
 
 	signals:
 		void needWindowTitleChange(QString);
@@ -81,6 +83,7 @@ class ArchiveTreeView : public QWidget
 		//misc
 		QString mWindowTitle;
 		NoCoverMovieDialog *mNoCoverDialog;
+        QAction *mNormalViewA;
 		bool mShowAllFiles;
 };
 #endif
diff --git a/filestreemodel.h b/filestreemodel.h
index e7d1b32..cce75fe 100644
--- a/filestreemodel.h
+++ b/filestreemodel.h
@@ -31,14 +31,15 @@ class FilesTreeModel : public SmTreeModel {
 		const QHash<int, QString> fileTypes() const { return mFileTypes; }
 		const QHash<int, QString> coverTypes() const { return mCoverTypes; }
 		const QHash<QString, int> editableColumns() const { return mEditableColumns; }
-		int mode() const { return mMode; }
+        int mode() const { return mMode; }
+        void setMode(int mode) { mMode = mode; }
         int displayMode() const { return mDisplayMode; }
+        void setDisplayMode(int mode) { mDisplayMode = mode; }
 		~FilesTreeModel();
 
 		//data + flags
 		void setIds(const QList<int> &seriesPartIds);
         void setForBurn();
-		void setMode(int mode) { mMode = mode; }
 		QVariant data(const QModelIndex &index, int role) const;
 		bool setData(const QModelIndex &index, const QVariant &value, int role);
 		Qt::ItemFlags flags(const QModelIndex &index) const;
diff --git a/shemov.cpp b/shemov.cpp
index 73d016a..cb8fc70 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -502,6 +502,7 @@ void SheMov::createActions(){
 	connect(mShowLocalA, SIGNAL(triggered()), viewMapper, SLOT(map()));
 	mShowLocalA->setCheckable(true);
 	mShowNormalA = new QAction(QIcon(":/nipple_up.png"), tr("Normal view"), this);
+    mATree->setNormalViewAction(mShowNormalA);
 	mShowTreeGroup->addAction(mShowNormalA);
 	viewMapper->setMapping(mShowNormalA, SeriesTreeModel::All);
 	connect(mShowNormalA, SIGNAL(triggered()), viewMapper, SLOT(map()));