Revamp actions for FilesystemWidget

Make actions for FilesystemWidget more Qt-like. Wrapped Rename menu into
an Action and got rid of the ugly findAction(). Use signal instead.

Also added actions for OpenWith.

1 files changed, 2 insertions, 29 deletions

diff --git a/fileview.cpp b/fileview.cpp
index 4e20e47..649ef3c 100644
--- a/fileview.cpp
+++ b/fileview.cpp
@@ -30,15 +30,6 @@ FileView::FileView(QWidget *parent) : QTreeView(parent), mDeleteA(0) {
 	connect(mCreateFolderDialog, SIGNAL(accepted()), this, SLOT(doCreateFolder()));
 }
 
-void FileView::findActions(){
-	foreach(QAction *a, actions()){
-		if(a->data().toString() == "DA"){
-			mDeleteA = a;
-		}
-	}
-	Q_ASSERT(mDeleteA != 0);
-}
-
 void FileView::markFiles(){
 	mMarkDialog->show();
 }
@@ -109,26 +100,8 @@ void FileView::doCreateFolder(){
 
 void FileView::contextMenuEvent(QContextMenuEvent *e){
 	QMenu contextMenu(this);
-	QMenu renameMenu(tr("Rename..."));
-	QMenu extractMenu(tr("Extract To..."));
-	int ctr(0);
 	foreach(QAction *a, actions()){
-		if(a->data() == "RenameMenu"){
-			renameMenu.addAction(a);
-		}else if(a->data() == "ExtractMenu"){
-			extractMenu.addAction(a);
-		}else{
-			contextMenu.addAction(a);
-			if((ctr == 0) || (ctr == 1) || (ctr == 3)){
-				contextMenu.addSeparator();
-			}
-			if(ctr == 8){
-				contextMenu.addMenu(&renameMenu);
-				contextMenu.addSeparator();
-				contextMenu.addMenu(&extractMenu);
-			}
-			++ctr;
-		}
+		contextMenu.addAction(a);
 	}
 	contextMenu.exec(e->globalPos());
 }
@@ -145,7 +118,7 @@ void FileView::keyPressEvent(QKeyEvent *e){
 			e->accept();
 			break;
 		case Qt::Key_Delete:
-			mDeleteA->trigger();
+			emit delFiles();
 			e->accept();
 			break;
 		default: