Add "Advanced..." button to find tool bar that opens the search dialog.

We had multiple cases where people were assuming that you can't do
project wide search/replace, because they tried Ctrl+f and that is only
single file.

Reviewed-by: Thorbjørn Lindeijer

4 files changed, 16 insertions, 1 deletions

diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp
index 96e68705dd..900020c765 100644
--- a/src/plugins/find/findplugin.cpp
+++ b/src/plugins/find/findplugin.cpp
@@ -209,7 +209,8 @@ void FindPlugin::setupMenu()
     mfindadvanced->menu()->setTitle(tr("Advanced Find"));
     mfind->addMenu(mfindadvanced, Constants::G_FIND_FILTERS);
     d->m_openFindDialog = new QAction(tr("Open Advanced Find..."), this);
-    cmd = am->registerAction(d->m_openFindDialog, QLatin1String("Find.Dialog"), globalcontext);
+    d->m_openFindDialog->setIconText(tr("Advanced..."));
+    cmd = am->registerAction(d->m_openFindDialog, Constants::ADVANCED_FIND, globalcontext);
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+F")));
     mfindadvanced->addAction(cmd);
     connect(d->m_openFindDialog, SIGNAL(triggered()), this, SLOT(openFindFilter()));
diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp
index 2c1f828645..6b0118759e 100644
--- a/src/plugins/find/findtoolbar.cpp
+++ b/src/plugins/find/findtoolbar.cpp
@@ -140,6 +140,8 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     Core::ActionContainer *mfind = am->actionContainer(Constants::M_FIND);
     Core::Command *cmd;
 
+    m_ui.advancedButton->setDefaultAction(am->command(Constants::ADVANCED_FIND)->action());
+
     QIcon icon = QIcon::fromTheme(QLatin1String("edit-find-replace"));
     m_findInDocumentAction = new QAction(icon, tr("Find/Replace"), this);
     cmd = am->registerAction(m_findInDocumentAction, Constants::FIND_IN_DOCUMENT, globalcontext);
@@ -345,6 +347,7 @@ void FindToolBar::updateToolBar()
     m_ui.replaceButton->setVisible(replaceEnabled);
     m_ui.replaceNextButton->setVisible(replaceEnabled);
     m_ui.replaceAllButton->setVisible(replaceEnabled);
+    m_ui.advancedButton->setVisible(replaceEnabled);
     layout()->invalidate();
 
     if (!replaceEnabled && enabled && replaceFocus)
diff --git a/src/plugins/find/findwidget.ui b/src/plugins/find/findwidget.ui
index d5eb4556db..2457dbc698 100644
--- a/src/plugins/find/findwidget.ui
+++ b/src/plugins/find/findwidget.ui
@@ -168,6 +168,16 @@
        </property>
       </spacer>
      </item>
+     <item>
+      <widget class="QToolButton" name="advancedButton">
+       <property name="text">
+        <string>Advanced...</string>
+       </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextOnly</enum>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>
diff --git a/src/plugins/find/textfindconstants.h b/src/plugins/find/textfindconstants.h
index d1afe64822..69f6a2428e 100644
--- a/src/plugins/find/textfindconstants.h
+++ b/src/plugins/find/textfindconstants.h
@@ -40,6 +40,7 @@ const char * const G_FIND_FILTERS    = "Find.FindMenu.Filters";
 const char * const G_FIND_FLAGS      = "Find.FindMenu.Flags";
 const char * const G_FIND_ACTIONS    = "Find.FindMenu.Actions";
 
+const char * const ADVANCED_FIND     = "Find.Dialog";
 const char * const FIND              = "Find.FindReplace";
 const char * const FIND_IN_DOCUMENT  = "Find.FindInCurrentDocument";
 const char * const FIND_NEXT         = "Find.FindNext";