Clearer menu separation between find tool bar and find window.

3 files changed, 9 insertions, 5 deletions

diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp
index 03a51a94a9..9e97a8049b 100644
--- a/src/plugins/find/findplugin.cpp
+++ b/src/plugins/find/findplugin.cpp
@@ -166,10 +166,13 @@ void FindPlugin::setupMenu()
     cmd = am->registerAction(separator, QLatin1String("Find.Sep.Actions"), globalcontext);
     mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
 
-    m_openFindDialog = new QAction(tr("Find..."), this);
+    Core::ActionContainer *mfindadvanced = am->createMenu(Constants::M_FIND_ADVANCED);
+    mfindadvanced->menu()->setTitle(tr("Advanced Find"));
+    mfind->addMenu(mfindadvanced, Constants::G_FIND_FILTERS);
+    m_openFindDialog = new QAction(tr("Open Advanced Find..."), this);
     cmd = am->registerAction(m_openFindDialog, QLatin1String("Find.Dialog"), globalcontext);
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+F")));
-    mfind->addAction(cmd, Constants::G_FIND_FILTERS);
+    mfindadvanced->addAction(cmd);
     connect(m_openFindDialog, SIGNAL(triggered()), this, SLOT(openFindFilter()));
 }
 
@@ -181,7 +184,7 @@ void FindPlugin::setupFilterMenuItems()
     Core::Command *cmd;
     QList<int> globalcontext = QList<int>() << Core::Constants::C_GLOBAL_ID;
 
-    Core::ActionContainer *mfind = am->actionContainer(Constants::M_FIND);
+    Core::ActionContainer *mfindadvanced = am->actionContainer(Constants::M_FIND_ADVANCED);
     m_filterActions.clear();
     bool haveEnabledFilters = false;
     foreach (IFindFilter *filter, findInterfaces) {
@@ -193,7 +196,7 @@ void FindPlugin::setupFilterMenuItems()
         action->setData(qVariantFromValue(filter));
         cmd = am->registerAction(action, QLatin1String("FindFilter.")+filter->id(), globalcontext);
         cmd->setDefaultKeySequence(filter->defaultShortcut());
-        mfind->addAction(cmd, Constants::G_FIND_FILTERS);
+        mfindadvanced->addAction(cmd, Constants::G_FIND_FILTERS);
         m_filterActions.insert(filter, action);
         connect(action, SIGNAL(triggered(bool)), this, SLOT(openFindFilter()));
         connect(filter, SIGNAL(changed()), this, SLOT(filterChanged()));
diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp
index 948aeb6f89..546c153131 100644
--- a/src/plugins/find/findtoolbar.cpp
+++ b/src/plugins/find/findtoolbar.cpp
@@ -136,7 +136,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
     Core::ActionContainer *mfind = am->actionContainer(Constants::M_FIND);
     Core::Command *cmd;
 
-    m_findInDocumentAction = new QAction(tr("Current Document"), this);
+    m_findInDocumentAction = new QAction(tr("Find/Replace"), this);
     cmd = am->registerAction(m_findInDocumentAction, Constants::FIND_IN_DOCUMENT, globalcontext);
     cmd->setDefaultKeySequence(QKeySequence::Find);
     mfind->addAction(cmd, Constants::G_FIND_CURRENTDOCUMENT);
diff --git a/src/plugins/find/textfindconstants.h b/src/plugins/find/textfindconstants.h
index ca945f7246..bc36c6cc56 100644
--- a/src/plugins/find/textfindconstants.h
+++ b/src/plugins/find/textfindconstants.h
@@ -34,6 +34,7 @@ namespace Find {
 namespace Constants {
 
 const char * const M_FIND            = "Find.FindMenu";
+const char * const M_FIND_ADVANCED   = "Find.FindAdvancedMenu";
 const char * const G_FIND_CURRENTDOCUMENT = "Find.FindMenu.CurrentDocument";
 const char * const G_FIND_FILTERS    = "Find.FindMenu.Filters";
 const char * const G_FIND_FLAGS      = "Find.FindMenu.Flags";