feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clearer menu separation between find tool bar and find window.

Browse Source
This commit is contained in:
con
2009-12-14 15:41:43 +01:00
parent 304d398357
commit 165d25f01c
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/find/findplugin.cpp
View File

@@ -166,10 +166,13 @@ void FindPlugin::setupMenu()
cmd = am->registerAction(separator, QLatin1String("Find.Sep.Actions"), globalcontext); cmd = am->registerAction(separator, QLatin1String("Find.Sep.Actions"), globalcontext);
mfind->addAction(cmd, Constants::G_FIND_ACTIONS); 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 = am->registerAction(m_openFindDialog, QLatin1String("Find.Dialog"), globalcontext);
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+F"))); 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())); connect(m_openFindDialog, SIGNAL(triggered()), this, SLOT(openFindFilter()));
} }
@@ -181,7 +184,7 @@ void FindPlugin::setupFilterMenuItems()
Core::Command *cmd; Core::Command *cmd;
QList<int> globalcontext = QList<int>() << Core::Constants::C_GLOBAL_ID; 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(); m_filterActions.clear();
bool haveEnabledFilters = false; bool haveEnabledFilters = false;
foreach (IFindFilter *filter, findInterfaces) { foreach (IFindFilter *filter, findInterfaces) {
@@ -193,7 +196,7 @@ void FindPlugin::setupFilterMenuItems()
action->setData(qVariantFromValue(filter)); action->setData(qVariantFromValue(filter));
cmd = am->registerAction(action, QLatin1String("FindFilter.")+filter->id(), globalcontext); cmd = am->registerAction(action, QLatin1String("FindFilter.")+filter->id(), globalcontext);
cmd->setDefaultKeySequence(filter->defaultShortcut()); cmd->setDefaultKeySequence(filter->defaultShortcut());
mfind->addAction(cmd, Constants::G_FIND_FILTERS); mfindadvanced->addAction(cmd, Constants::G_FIND_FILTERS);
m_filterActions.insert(filter, action); m_filterActions.insert(filter, action);
connect(action, SIGNAL(triggered(bool)), this, SLOT(openFindFilter())); connect(action, SIGNAL(triggered(bool)), this, SLOT(openFindFilter()));
connect(filter, SIGNAL(changed()), this, SLOT(filterChanged())); connect(filter, SIGNAL(changed()), this, SLOT(filterChanged()));

2
src/plugins/find/findtoolbar.cpp
View File

@@ -136,7 +136,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
Core::ActionContainer *mfind = am->actionContainer(Constants::M_FIND); Core::ActionContainer *mfind = am->actionContainer(Constants::M_FIND);
Core::Command *cmd; 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 = am->registerAction(m_findInDocumentAction, Constants::FIND_IN_DOCUMENT, globalcontext);
cmd->setDefaultKeySequence(QKeySequence::Find); cmd->setDefaultKeySequence(QKeySequence::Find);
mfind->addAction(cmd, Constants::G_FIND_CURRENTDOCUMENT); mfind->addAction(cmd, Constants::G_FIND_CURRENTDOCUMENT);

1
src/plugins/find/textfindconstants.h
View File

@@ -34,6 +34,7 @@ namespace Find {
namespace Constants { namespace Constants {
const char * const M_FIND = "Find.FindMenu"; 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_CURRENTDOCUMENT = "Find.FindMenu.CurrentDocument";
const char * const G_FIND_FILTERS = "Find.FindMenu.Filters"; const char * const G_FIND_FILTERS = "Find.FindMenu.Filters";
const char * const G_FIND_FLAGS = "Find.FindMenu.Flags"; const char * const G_FIND_FLAGS = "Find.FindMenu.Flags";