From b02e80a6ae083734c8406a91d06a5c7131d239fc Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@pcbsd.org>
Date: Mon, 27 Apr 2015 11:11:30 -0400
Subject: Add support for launching lumina-search on the currently-viewed
 directory from within lumina-fm

---
 lumina-fm/MainUI.cpp | 4 ++++
 lumina-fm/MainUI.h   | 1 +
 lumina-fm/MainUI.ui  | 9 +++++++++
 3 files changed, 14 insertions(+)

(limited to 'lumina-fm')

diff --git a/lumina-fm/MainUI.cpp b/lumina-fm/MainUI.cpp
index 7f1e5fcc..dc35efa0 100644
--- a/lumina-fm/MainUI.cpp
+++ b/lumina-fm/MainUI.cpp
@@ -679,6 +679,10 @@ void MainUI::on_actionNew_Tab_triggered(){
   tabBar->setCurrentIndex(tabBar->count()-1);
 }
 
+void MainUI::on_actionSearch_triggered(){
+  QProcess::startDetached("lumina-search -dir \""+getCurrentDir()+"\"");
+}
+
 void MainUI::on_actionClose_triggered(){
   if(tabBar->count() > 1){
     if(QMessageBox::Yes != QMessageBox::question(this, tr("Verify Quit"), tr("You have multiple tabs open. Are you sure you want to quit?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes ) ){
diff --git a/lumina-fm/MainUI.h b/lumina-fm/MainUI.h
index b18d25a5..345e2dd4 100644
--- a/lumina-fm/MainUI.h
+++ b/lumina-fm/MainUI.h
@@ -140,6 +140,7 @@ private slots:
 	
 	//Menu Actions
 	void on_actionNew_Tab_triggered();
+	void on_actionSearch_triggered();
 	void on_actionClose_triggered();
 	void on_actionView_Hidden_Files_triggered();
 	void on_actionShow_Action_Buttons_triggered();
diff --git a/lumina-fm/MainUI.ui b/lumina-fm/MainUI.ui
index 4b2156c2..9ef367d7 100644
--- a/lumina-fm/MainUI.ui
+++ b/lumina-fm/MainUI.ui
@@ -1113,6 +1113,7 @@
      <string>File</string>
     </property>
     <addaction name="actionNew_Tab"/>
+    <addaction name="actionSearch"/>
     <addaction name="separator"/>
     <addaction name="actionClose"/>
    </widget>
@@ -1297,6 +1298,14 @@
     <string>Load Thumbnails</string>
    </property>
   </action>
+  <action name="actionSearch">
+   <property name="text">
+    <string>Search Directory</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+F</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>
-- 
cgit 


From 275faae68a3a3bc6d6cf475b2778301a20e62f3a Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@pcbsd.org>
Date: Mon, 27 Apr 2015 11:17:00 -0400
Subject: Oops, forgot to add an icon for the new search menu option.

---
 lumina-fm/MainUI.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lumina-fm')

diff --git a/lumina-fm/MainUI.cpp b/lumina-fm/MainUI.cpp
index dc35efa0..95c4af4e 100644
--- a/lumina-fm/MainUI.cpp
+++ b/lumina-fm/MainUI.cpp
@@ -162,6 +162,7 @@ void MainUI::setupIcons(){
   ui->actionBackToBrowser->setIcon( LXDG::findIcon("go-previous","") );
   ui->actionManage_Bookmarks->setIcon( LXDG::findIcon("bookmarks-organize","") );
   ui->actionScan->setIcon( LXDG::findIcon("system-search","") );
+  ui->actionSearch->setIcon( LXDG::findIcon("edit-find","") );
 	
   //Browser page
   ui->tool_addNewFile->setIcon( LXDG::findIcon("document-new",""));
-- 
cgit