diff options
| author | Ken Moore <ken@pcbsd.org> | 2015-04-27 15:07:28 -0400 |
|---|---|---|
| committer | Ken Moore <ken@pcbsd.org> | 2015-04-27 15:07:28 -0400 |
| commit | d590979dba8ee6f23d91b1c0b1b8e092c4e68454 (patch) | |
| tree | 6e6807820f2394764615e7788ee68d82baa75f91 /lumina-fm | |
| parent | Setup the lumina-desktop to use the new favorites system: (diff) | |
| parent | Add two new keybard shortcuts to the default Fluxbox setting: (diff) | |
| download | lumina-d590979dba8ee6f23d91b1c0b1b8e092c4e68454.tar.gz lumina-d590979dba8ee6f23d91b1c0b1b8e092c4e68454.tar.bz2 lumina-d590979dba8ee6f23d91b1c0b1b8e092c4e68454.zip | |
Merge branch 'master' of github.com:pcbsd/lumina
Diffstat (limited to 'lumina-fm')
| -rw-r--r-- | lumina-fm/MainUI.cpp | 5 | ||||
| -rw-r--r-- | lumina-fm/MainUI.h | 1 | ||||
| -rw-r--r-- | lumina-fm/MainUI.ui | 9 |
3 files changed, 15 insertions, 0 deletions
diff --git a/lumina-fm/MainUI.cpp b/lumina-fm/MainUI.cpp index 7f1e5fcc..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","")); @@ -679,6 +680,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/> |