From 155e6a875fa13ac7e1961022adf1ba9caca23ae6 Mon Sep 17 00:00:00 2001
From: Arno <am@disconnect.de>
Date: Sat, 14 Sep 2013 15:06:14 +0200
Subject: More icons

Add some more icons to to the FilesystemWidget toolbar.
---
 delete.png  | Bin 0 -> 1333 bytes
 folder.png  | Bin 0 -> 1412 bytes
 refresh.png | Bin 0 -> 2182 bytes
 rename.png  | Bin 0 -> 496 bytes
 shemov.cpp  |  22 +++++++++++++++-------
 shemov.qrc  |   4 ++++
 6 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 delete.png
 create mode 100644 folder.png
 create mode 100644 refresh.png
 create mode 100644 rename.png

diff --git a/delete.png b/delete.png
new file mode 100644
index 0000000..351659b
Binary files /dev/null and b/delete.png differ
diff --git a/folder.png b/folder.png
new file mode 100644
index 0000000..53954fa
Binary files /dev/null and b/folder.png differ
diff --git a/refresh.png b/refresh.png
new file mode 100644
index 0000000..afa2a9d
Binary files /dev/null and b/refresh.png differ
diff --git a/rename.png b/rename.png
new file mode 100644
index 0000000..5f089f5
Binary files /dev/null and b/rename.png differ
diff --git a/shemov.cpp b/shemov.cpp
index 9941964..a3096a6 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -373,9 +373,9 @@ void SheMov::createActions(){
 	connect(mPlaySelectedFSA, SIGNAL(triggered()), mFSWidget, SLOT(playSelected()));
 	mNewMovieWizardA = new QAction(tr("Archive movie..."), this);
 	connect(mNewMovieWizardA, SIGNAL(triggered()), this, SLOT(newMovieWizard()));
-    mArchiveSelectedMovsA = new QAction(tr("Archive selected movies..."), this);
+    mArchiveSelectedMovsA = new QAction(QIcon(":/butt_plug.png"), tr("Archive selected movies..."), this);
     connect(mArchiveSelectedMovsA, SIGNAL(triggered()), this, SLOT(newMovieWizardWithFiles()));
-    mArchiveSelectedPicsA = new QAction(tr("Archive selected pics..."), this);
+    mArchiveSelectedPicsA = new QAction(QIcon(":/hourglass_figure.png"), tr("Archive selected pics..."), this);
     connect(mArchiveSelectedPicsA, SIGNAL(triggered()), this, SLOT(newPicsDialogWithFiles()));
 	mConsistencyA = new QAction(tr("Check consisteny..."), this);
 	connect(mConsistencyA, SIGNAL(triggered()), this, SLOT(checkConsistency()));
@@ -400,10 +400,10 @@ void SheMov::createActions(){
 	mUnmarkFilesA->setShortcut(tr("CTRL+-"));
     mUnmarkFilesA->setShortcut(QKeySequence(Qt::CTRL +  Qt::KeypadModifier + Qt::Key_Minus));
 	connect(mUnmarkFilesA, SIGNAL(triggered()), mFSWidget->fileView(), SLOT(unmarkFiles()));
-	mCreateFolderA = new QAction(tr("Create folder..."), this);
+    mCreateFolderA = new QAction(QIcon(":/folder.png"), tr("New folder..."), this);
 	mCreateFolderA->setShortcut(tr("CTRL+n"));
 	connect(mCreateFolderA, SIGNAL(triggered()), mFSWidget->fileView(), SLOT(createFolder()));
-	mDeleteFilesA = new QAction(tr("Delete selected..."), this);
+    mDeleteFilesA = new QAction(QIcon(":/delete.png"), tr("Delete selected..."), this);
 	mDeleteFilesA->setShortcut(tr("CTRL+d"));
 	connect(mDeleteFilesA, SIGNAL(triggered()), mFSWidget, SLOT(deleteFiles()));
 	QSignalMapper *copyCutMapper = new QSignalMapper(this);
@@ -419,7 +419,7 @@ void SheMov::createActions(){
 	mPasteA = new QAction(tr("Paste"), this);
 	mPasteA->setShortcut(tr("Ctrl+v"));
 	connect(mPasteA, SIGNAL(triggered()), mFSWidget, SLOT(fromClipboard()));
-	mRenameA = new QAction(tr("Rename..."), this);
+    mRenameA = new QAction(QIcon(":/rename.png"), tr("Rename..."), this);
 	mRenameA->setShortcut(tr("CTRL+r"));
 	connect(mRenameA, SIGNAL(triggered()), mFSWidget, SLOT(renameFile()));
 	mMountDvdA = new QAction(QIcon(":/diaper.png"), tr("(Un)mount DVD drive"), this);
@@ -431,7 +431,7 @@ void SheMov::createActions(){
     connect(mMoveToArchiveA, SIGNAL(triggered()), mFSWidget, SLOT(moveToArchive()));
 
     //View menu (FS)
-    mRefreshA = new QAction(tr("Refresh"), this);
+    mRefreshA = new QAction(QIcon(":/refresh.png"), tr("Refresh"), this);
     connect(mRefreshA, SIGNAL(triggered()), mFSWidget->fileModel(), SLOT(refresh()));
     mFSViewPropertiesA = new QAction(QIcon(":/bizarre_amputee.png"), tr("Properties..."), this);
     connect(mFSViewPropertiesA, SIGNAL(triggered()), mFSWidget->fileView(), SLOT(properties()));
@@ -831,10 +831,18 @@ void SheMov::createToolBar(){
     mFSWidget->toolBar()->addAction(mBackDirA);
     mFSWidget->toolBar()->addAction(mCdupA);
     mFSWidget->toolBar()->addSeparator();
-    mFSWidget->toolBar()->addAction(mConfigA);
+    mFSWidget->toolBar()->addAction(mCreateFolderA);
+    mFSWidget->toolBar()->addAction(mRenameA);
+    mFSWidget->toolBar()->addAction(mDeleteFilesA);
+    mFSWidget->toolBar()->addAction(mRefreshA);
+    mFSWidget->toolBar()->addSeparator();
+    mFSWidget->toolBar()->addAction(mArchiveSelectedMovsA);
+    mFSWidget->toolBar()->addAction(mArchiveSelectedPicsA);
     mFSWidget->toolBar()->addSeparator();
     mFSWidget->toolBar()->addAction(mFSPreviewA);
     mFSWidget->toolBar()->addAction(mFSViewPropertiesA);
+    mFSWidget->toolBar()->addSeparator();
+    mFSWidget->toolBar()->addAction(mConfigA);
 
     mArchive->toolBar()->addAction(mArchiveFilesQualityA);
     mArchive->toolBar()->addAction(mArchiveFilesDvdNoA);
diff --git a/shemov.qrc b/shemov.qrc
index c4b7a00..cf6379c 100644
--- a/shemov.qrc
+++ b/shemov.qrc
@@ -44,5 +44,9 @@
         <file>letter_d.png</file>
         <file>letter_n.png</file>
         <file>letter_t.png</file>
+        <file>folder.png</file>
+        <file>rename.png</file>
+        <file>delete.png</file>
+        <file>refresh.png</file>
     </qresource>
 </RCC>
-- 
cgit v1.2.3-70-g09d2