Add toolbars to tabs

Remove global toolbar and add a toolbar to each tab instead.

10 files changed, 44 insertions, 19 deletions

diff --git a/archiveview.cpp b/archiveview.cpp
index fcfe04d..5fed431 100644
--- a/archiveview.cpp
+++ b/archiveview.cpp
@@ -23,6 +23,7 @@
 #include <QCompleter>
 #include <QStandardItemModel>
 #include <QFormLayout>
+#include <QToolBar>
 
 #include "archiveview.h"
 #include "archivecontroller.h"
@@ -87,6 +88,9 @@ ArchiveView::ArchiveView(QWidget *parent) : QWidget(parent) {
     QWidget *treeWidget = new QWidget;
     treeWidget->setLayout(treeLayout);
 
+    mToolBar = new QToolBar;
+    mToolBar->setIconSize(QSize(16,16));
+
     mFiles = new ArchiveFiles;
     mFiles->setItemDelegateForColumn(ArchiveFilesModel::FileType, new FileTypeDelegate(this));
     mFiles->setItemDelegateForColumn(ArchiveFilesModel::DvdNo, new DvdNoDelegate(this));
@@ -130,6 +134,7 @@ ArchiveView::ArchiveView(QWidget *parent) : QWidget(parent) {
     bottomRightLayout->addWidget(genreBox);
     bottomRightLayout->addWidget(metadataBox);
     QVBoxLayout *rightLayout = new QVBoxLayout;
+    rightLayout->addWidget(mToolBar);
     rightLayout->addWidget(mFiles);
     rightLayout->addLayout(bottomRightLayout);
     QWidget *rightWidget = new QWidget;
diff --git a/archiveview.h b/archiveview.h
index 58213a1..22bc960 100644
--- a/archiveview.h
+++ b/archiveview.h
@@ -32,6 +32,7 @@ class QTextEdit;
 class QCompleter;
 class QStandardItemModel;
 class QSpinBox;
+class QToolBar;
 
 class ArchiveView : public QWidget {
     Q_OBJECT
@@ -43,6 +44,7 @@ class ArchiveView : public QWidget {
         void setCurrentArchivePath(const QStringList &p) { mCurrentArchivePath = p; }
         ArchiveModel *archiveModel() { return mArchiveModel; }
         ArchiveTree *archiveTree() { return mTree; }
+        QToolBar *toolBar() { return mToolBar; }
 
     public slots:
         void refreshArchive();
@@ -74,6 +76,7 @@ class ArchiveView : public QWidget {
         QStandardItemModel *mGenreModel;
         QSplitter *mTreeSplitter;
         QTextEdit *mMetadataView;
+        QToolBar *mToolBar;
 };
 
 class ArchiveTree : public SmTreeView {
diff --git a/filesystemwidget.cpp b/filesystemwidget.cpp
index 8c013ec..2eff69b 100644
--- a/filesystemwidget.cpp
+++ b/filesystemwidget.cpp
@@ -20,6 +20,7 @@
 #include <QUrl>
 #include <QTimer>
 #include <QProgressDialog>
+#include <QToolBar>
 
 #include "filesystemwidget.h"
 #include "filesystemdirproxy.h"
@@ -78,6 +79,8 @@ FilesystemWidget::FilesystemWidget(QWidget *parent) : QWidget(parent), mClipboar
 	mPicViewer = SmGlobals::instance()->pictureViewer();
 
 	QWidget *fileWidget = new QWidget;
+    mToolBar = new QToolBar;
+    mToolBar->setIconSize(QSize(16,16));
 	QHBoxLayout *directoryEdit = new QHBoxLayout;
 	QLabel *dirLabel = new QLabel(tr("&Directory"));
 	mDirEdit = new QLineEdit;
@@ -86,6 +89,7 @@ FilesystemWidget::FilesystemWidget(QWidget *parent) : QWidget(parent), mClipboar
 	completer->setCompletionMode(QCompleter::PopupCompletion);
 	mDirEdit->setCompleter(completer);
 	dirLabel->setBuddy(mDirEdit);
+    directoryEdit->addWidget(mToolBar);
 	directoryEdit->addWidget(dirLabel);
 	directoryEdit->addWidget(mDirEdit);
 	QVBoxLayout *fwLayout = new QVBoxLayout;
diff --git a/filesystemwidget.h b/filesystemwidget.h
index 751a805..6df9ce7 100644
--- a/filesystemwidget.h
+++ b/filesystemwidget.h
@@ -22,6 +22,7 @@ class PictureViewer2;
 class FileSystemModel;
 class SheMovIconProvider;
 class SmDirModel;
+class QToolBar;
 
 class FilesystemWidget : public QWidget {
 	Q_OBJECT
@@ -34,6 +35,7 @@ class FilesystemWidget : public QWidget {
         SmDirModel *fileModel() { return mFileModel; }
 		const QString windowTitle() const { return mWindowTitle; }
         PictureViewer2 *pictureViewer() { return mPicViewer; }
+        QToolBar *toolBar() { return mToolBar; }
 		bool isMounted();
 
 	signals:
@@ -82,6 +84,7 @@ class FilesystemWidget : public QWidget {
 		FileView *mFileView;
 		FilesystemDirProxy *mDirProxy;
 		FilesystemFileProxy *mFileProxy;
+        QToolBar *mToolBar;
 		QLineEdit *mDirEdit;
 		QString mWindowTitle;
 		QString mTemplate;
diff --git a/letter_d.png b/letter_d.png
new file mode 100644
index 0000000..b0d7701
--- /dev/null
+++ b/letter_d.png
diff --git a/letter_n.png b/letter_n.png
new file mode 100644
index 0000000..f11144b
--- /dev/null
+++ b/letter_n.png
diff --git a/letter_q.png b/letter_q.png
new file mode 100644
index 0000000..d061d08
--- /dev/null
+++ b/letter_q.png
diff --git a/letter_t.png b/letter_t.png
new file mode 100644
index 0000000..fc89109
--- /dev/null
+++ b/letter_t.png
diff --git a/shemov.cpp b/shemov.cpp
index 2b7666d..9941964 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -433,9 +433,9 @@ void SheMov::createActions(){
     //View menu (FS)
     mRefreshA = new QAction(tr("Refresh"), this);
     connect(mRefreshA, SIGNAL(triggered()), mFSWidget->fileModel(), SLOT(refresh()));
-    mFSViewPropertiesA = new QAction(tr("Properties..."), this);
+    mFSViewPropertiesA = new QAction(QIcon(":/bizarre_amputee.png"), tr("Properties..."), this);
     connect(mFSViewPropertiesA, SIGNAL(triggered()), mFSWidget->fileView(), SLOT(properties()));
-    mFSPreviewA = new QAction(tr("Preview..."), this);
+    mFSPreviewA = new QAction(QIcon(":/male_chastity_belt.png"), tr("Preview..."), this);
     connect(mFSPreviewA, SIGNAL(triggered()), mFSWidget, SLOT(preview()));
 
 	//Help menu
@@ -587,22 +587,22 @@ void SheMov::createActions(){
     mArchiveFilesPlayA = new QAction(tr("Play selected..."), this);
     connect(mArchiveFilesPlayA, SIGNAL(triggered()), c, SLOT(playSelectedFiles()));
     // set quality
-    mArchiveFilesQualityA = new QAction(tr("Set Quality..."), this);
+    mArchiveFilesQualityA = new QAction(QIcon(":/letter_q.png"), tr("Set Quality..."), this);
     connect(mArchiveFilesQualityA, SIGNAL(triggered()), c, SLOT(editQuality()));
     // set dvd
-    mArchiveFilesDvdNoA = new QAction(tr("Set Dvd No. ..."), this);
+    mArchiveFilesDvdNoA = new QAction(QIcon(":/letter_d.png"), tr("Set Dvd No. ..."), this);
     connect(mArchiveFilesDvdNoA, SIGNAL(triggered()), c, SLOT(editDvdNo()));
     // set file type
-    mArchiveFilesTypeA = new QAction(tr("Set file type..."), this);
+    mArchiveFilesTypeA = new QAction(QIcon(":/letter_t.png"), tr("Set file type..."), this);
     connect(mArchiveFilesTypeA, SIGNAL(triggered()), c, SLOT(editFileType()));
     // set file no
-    mArchiveFilesFileNoA = new QAction(tr("Set File No. ..."), this);
+    mArchiveFilesFileNoA = new QAction(QIcon(":/letter_n.png"), tr("Set File No. ..."), this);
     connect(mArchiveFilesFileNoA, SIGNAL(triggered()), c, SLOT(editFileNo()));
     // show properties
-    mArchiveFilesPropertiesA = new QAction(tr("Properties..."), this);
+    mArchiveFilesPropertiesA = new QAction(QIcon(":/bizarre_amputee.png"), tr("Properties..."), this);
     connect(mArchiveFilesPropertiesA, SIGNAL(triggered()), c, SLOT(showProperties()));
     // preview
-    mArchiveFilesPreviewA = new QAction(tr("Preview..."), this);
+    mArchiveFilesPreviewA = new QAction(QIcon(":/male_chastity_belt.png"), tr("Preview..."), this);
     connect(mArchiveFilesPreviewA, SIGNAL(triggered()), c, SLOT(showPreview()));
 
     // db analyzer dialogs
@@ -828,17 +828,23 @@ void SheMov::createOpenWithMenuFS(){
 }
 
 void SheMov::createToolBar(){
-	QToolBar *toolBar = new QToolBar(this);
-	toolBar->addAction(mBackDirA);
-	toolBar->addAction(mCdupA);
-	toolBar->addSeparator();
-	toolBar->addAction(mConfigA);
-	toolBar->addSeparator();
-    toolBar->addActions(mPicActionGroup->actions());
-    toolBar->addAction(mPVToggleA);
-	toolBar->addSeparator();
-	toolBar->addAction(mMountDvdA);
-	addToolBar(Qt::LeftToolBarArea, toolBar);
+    mFSWidget->toolBar()->addAction(mBackDirA);
+    mFSWidget->toolBar()->addAction(mCdupA);
+    mFSWidget->toolBar()->addSeparator();
+    mFSWidget->toolBar()->addAction(mConfigA);
+    mFSWidget->toolBar()->addSeparator();
+    mFSWidget->toolBar()->addAction(mFSPreviewA);
+    mFSWidget->toolBar()->addAction(mFSViewPropertiesA);
+
+    mArchive->toolBar()->addAction(mArchiveFilesQualityA);
+    mArchive->toolBar()->addAction(mArchiveFilesDvdNoA);
+    mArchive->toolBar()->addAction(mArchiveFilesTypeA);
+    mArchive->toolBar()->addAction(mArchiveFilesFileNoA);
+    mArchive->toolBar()->addSeparator();
+    mArchive->toolBar()->addAction(mArchiveFilesPreviewA);
+    mArchive->toolBar()->addAction(mArchiveFilesPropertiesA);
+    mArchive->toolBar()->addSeparator();
+    mArchive->toolBar()->addAction(mConfigA);
 }
 
 void SheMov::writeSettings(){
diff --git a/shemov.qrc b/shemov.qrc
index ca07ee9..c4b7a00 100644
--- a/shemov.qrc
+++ b/shemov.qrc
@@ -40,5 +40,9 @@
         <file>catheter_with_bag.png</file>
         <file>blue_syringe.png</file>
         <file>shemov_splash2.png</file>
+        <file>letter_q.png</file>
+        <file>letter_d.png</file>
+        <file>letter_n.png</file>
+        <file>letter_t.png</file>
     </qresource>
 </RCC>