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

Add ActionContainer::addSeparator(...)

Browse Source 
Gets rid of a lot of code duplication.

Change-Id: I2ce38fb38a0b61cb821e0bdc7bcc9a7ccdf9da72
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Eike Ziller
2012-06-05 14:22:20 +02:00
committed by hjk
parent d90264d6c2
commit cdd44befff
34 changed files with 132 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/analyzerbase/analyzermanager.cpp
+3 -17
View File
@@ -286,23 +286,9 @@ void AnalyzerManagerPrivate::setupActions()
command = Core::ActionManager::registerAction(m_stopAction, "Analyzer.Stop", globalcontext);
m_menu->addAction(command, G_ANALYZER_CONTROL);
QAction *separatorAction1 = new QAction(m_menu);
separatorAction1->setSeparator(true);
command = Core::ActionManager::registerAction(separatorAction1,
"Menu.Action.Analyzer.Tools.Separator1", globalcontext);
m_menu->addAction(command, G_ANALYZER_TOOLS);
QAction *separatorAction2 = new QAction(m_menu);
separatorAction2->setSeparator(true);
command = Core::ActionManager::registerAction(separatorAction2,
"Menu.Action.Analyzer.Tools.Separator2", globalcontext);
m_menu->addAction(command, G_ANALYZER_REMOTE_TOOLS);
QAction *separatorAction3 = new QAction(m_menu);
separatorAction3->setSeparator(true);
command = Core::ActionManager::registerAction(separatorAction3,
"Menu.Action.Analyzer.Tools.Separator3", globalcontext);
m_menu->addAction(command, G_ANALYZER_OPTIONS);
m_menu->addSeparator(globalcontext, G_ANALYZER_TOOLS);
m_menu->addSeparator(globalcontext, G_ANALYZER_REMOTE_TOOLS);
m_menu->addSeparator(globalcontext, G_ANALYZER_OPTIONS);
}
void AnalyzerManagerPrivate::delayedInit()
src/plugins/bazaar/bazaarplugin.cpp
+4 -11
View File
@@ -217,11 +217,11 @@ void BazaarPlugin::createMenu()
menu->setTitle(tr("Bazaar"));
createFileActions(context);
createSeparator(context, Core::Id("Bazaar.FileDirSeperator"));
m_bazaarContainer->addSeparator(context);
createDirectoryActions(context);
createSeparator(context, Core::Id("Bazaar.DirRepoSeperator"));
m_bazaarContainer->addSeparator(context);
createRepositoryActions(context);
createSeparator(context, Core::Id("Bazaar.Repository Management"));
m_bazaarContainer->addSeparator(context);
// Request the Tools menu and add the Bazaar menu to it
Core::ActionContainer *toolsMenu = Core::ActionManager::actionContainer(Core::Id(Core::Constants::M_TOOLS));
@@ -264,7 +264,7 @@ void BazaarPlugin::createFileActions(const Core::Context &context)
m_bazaarContainer->addAction(command);
m_commandLocator->appendCommand(command);
createSeparator(context, Core::Id("Bazaar.FileDirSeperator1"));
m_bazaarContainer->addSeparator(context);
m_addAction = new Utils::ParameterAction(tr("Add"), tr("Add \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_addAction, Core::Id(Constants::ADD), context);
@@ -676,13 +676,6 @@ void BazaarPlugin::deleteCommitLog()
}
}
void BazaarPlugin::createSeparator(const Core::Context &context, const Core::Id &id)
{
QAction *action = new QAction(this);
action->setSeparator(true);
m_bazaarContainer->addAction(Core::ActionManager::registerAction(action, id, context));
}
void BazaarPlugin::updateActions(VcsBase::VcsBasePlugin::ActionState as)
{
if (!enableMenuAction(as, m_menuAction)) {
src/plugins/bazaar/bazaarplugin.h
-1
View File
@@ -126,7 +126,6 @@ private:
// Methods
void createMenu();
void createSubmitEditorActions();
void createSeparator(const Core::Context &context, const Core::Id &id);
void createFileActions(const Core::Context &context);
void createDirectoryActions(const Core::Context &context);
void createRepositoryActions(const Core::Context &context);
src/plugins/bookmarks/bookmarksplugin.cpp
+2 -8
View File
@@ -85,10 +85,7 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *)
cmd->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+M") : tr("Ctrl+M")));
mbm->addAction(cmd);
QAction *sep = new QAction(this);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep, Core::Id("Bookmarks.Sep.Toggle"), textcontext);
mbm->addAction(cmd);
mbm->addSeparator(textcontext);
//Previous
m_prevAction = new QAction(tr("Previous Bookmark"), this);
@@ -102,10 +99,7 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *)
cmd->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+.") : tr("Ctrl+.")));
mbm->addAction(cmd);
sep = new QAction(this);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep, Core::Id("Bookmarks.Sep.DirNavigation"), globalcontext);
mbm->addAction(cmd);
mbm->addSeparator(globalcontext);
//Previous Doc
m_docPrevAction = new QAction(tr("Previous Bookmark in Document"), this);
src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
+1 -4
View File
@@ -64,10 +64,7 @@ CMakeEditorFactory::CMakeEditorFactory(CMakeManager *manager)
cmd = Core::ActionManager::command(TextEditor::Constants::JUMP_TO_FILE_UNDER_CURSOR);
contextMenu->addAction(cmd);
QAction *separator = new QAction(this);
separator->setSeparator(true);
contextMenu->addAction(Core::ActionManager::registerAction(separator,
Id(Constants::SEPARATOR), cmakeEditorContext));
contextMenu->addSeparator(cmakeEditorContext);
cmd = Core::ActionManager::command(TextEditor::Constants::UN_COMMENT_SELECTION);
contextMenu->addAction(cmd);
src/plugins/cmakeprojectmanager/cmakeprojectconstants.h
-3
View File
@@ -50,9 +50,6 @@ const char CMAKEPROJECT_ID[] = "CMakeProjectManager.CMakeProject";
// Menu
const char M_CONTEXT[] = "CMakeEditor.ContextMenu";
// Actions
const char SEPARATOR[] = "CMakeEditor.Separator";
} // namespace Constants
} // namespace CMakeProjectManager
src/plugins/coreplugin/actionmanager/actioncontainer.cpp
+26
View File
@@ -32,6 +32,7 @@
#include "actioncontainer_p.h"
#include "actionmanager_p.h"
#include "actionmanager.h"
#include "command_p.h"
@@ -293,6 +294,31 @@ void ActionContainerPrivate::addMenu(ActionContainer *before, ActionContainer *m
scheduleUpdate();
}
/*!
* \fn Command *ActionContainer::addSeparator(const Context &context, const Id &group, QAction **outSeparator)
*
* Adds a separator to the end of the given \a group to the action container, which is enabled
* for a given \a context. The created separator action is returned through \a outSeparator.
*
* Returns the created Command for the separator.
*/
/*! \a context \a group \a outSeparator
* \internal
*/
Command *ActionContainerPrivate::addSeparator(const Context &context, const Id &group, QAction **outSeparator)
{
static int separatorIdCount = 0;
QAction *separator = new QAction(this);
separator->setSeparator(true);
Command *cmd = ActionManager::registerAction(separator, Id(QString::fromLatin1("%1.Separator.%2")
.arg(id().toString()).arg(++separatorIdCount)),
context);
addAction(cmd, group);
if (outSeparator)
*outSeparator = separator;
return cmd;
}
void ActionContainerPrivate::clear()
{
QMutableListIterator<Group> it(m_groups);
src/plugins/coreplugin/actionmanager/actioncontainer.h
+2
View File
@@ -34,6 +34,7 @@
#define ACTIONCONTAINER_H
#include "coreplugin/id.h"
#include "coreplugin/icontext.h"
#include <QObject>
@@ -72,6 +73,7 @@ public:
virtual void addAction(Command *action, const Id &group = Id()) = 0;
virtual void addMenu(ActionContainer *menu, const Id &group = Id()) = 0;
virtual void addMenu(ActionContainer *before, ActionContainer *menu, const Id &group = Id()) = 0;
virtual Command *addSeparator(const Context &context, const Id &group = Id(), QAction **outSeparator = 0) = 0;
// This clears this menu and submenus from all actions and submenus.
// It does not destroy the submenus and commands, just removes them from their parents.
src/plugins/coreplugin/actionmanager/actioncontainer_p.h
+1
View File
@@ -65,6 +65,7 @@ public:
void addAction(Command *action, const Id &group = Id());
void addMenu(ActionContainer *menu, const Id &group = Id());
void addMenu(ActionContainer *before, ActionContainer *menu, const Id &group = Id());
Command *addSeparator(const Context &context, const Id &group = Id(), QAction **outSeparator = 0);
virtual void clear();
Id id() const;
src/plugins/coreplugin/actionmanager/command.cpp
-10
View File
@@ -265,16 +265,6 @@ Id CommandPrivate::id() const
return m_id;
}
QAction *CommandPrivate::action() const
{
return 0;
}
QShortcut *CommandPrivate::shortcut() const
{
return 0;
}
Core::Context CommandPrivate::context() const
{
return m_context;
src/plugins/coreplugin/actionmanager/command_p.h
+3 -2
View File
@@ -66,8 +66,6 @@ public:
Id id() const;
QAction *action() const;
QShortcut *shortcut() const;
Context context() const;
@@ -100,6 +98,8 @@ public:
void setShortcut(QShortcut *shortcut);
QShortcut *shortcut() const;
QAction *action() const { return 0; }
void setContext(const Context &context);
Context context() const;
void setCurrentContext(const Context &context);
@@ -125,6 +125,7 @@ public:
QKeySequence keySequence() const;
QAction *action() const;
QShortcut *shortcut() const { return 0; }
void setCurrentContext(const Context &context);
bool isActive() const;
src/plugins/coreplugin/editormanager/editormanager.cpp
+6 -26
View File
@@ -274,15 +274,6 @@ static EditorManager *m_instance = 0;
EditorManager *EditorManager::instance() { return m_instance; }
static Command *createSeparator(QObject *parent,
const Id &id, const Context &context)
{
QAction *tmpaction = new QAction(parent);
tmpaction->setSeparator(true);
Command *cmd = ActionManager::registerAction(tmpaction, id, context);
return cmd;
}
EditorManager::EditorManager(QWidget *parent) :
QWidget(parent),
d(new EditorManagerPrivate(parent))
@@ -319,15 +310,8 @@ EditorManager::EditorManager(QWidget *parent) :
ActionContainer *mwindow = ActionManager::actionContainer(Constants::M_WINDOW);
// Window menu separators
QAction *tmpaction = new QAction(this);
tmpaction->setSeparator(true);
cmd = ActionManager::registerAction(tmpaction, "QtCreator.Window.Sep.Split", editManagerContext);
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
tmpaction = new QAction(this);
tmpaction->setSeparator(true);
cmd = ActionManager::registerAction(tmpaction, "QtCreator.Window.Sep.Navigate", editManagerContext);
mwindow->addAction(cmd, Constants::G_WINDOW_NAVIGATE);
mwindow->addSeparator(editManagerContext, Constants::G_WINDOW_SPLIT);
mwindow->addSeparator(editManagerContext, Constants::G_WINDOW_NAVIGATE);
// Close Action
cmd = ActionManager::registerAction(d->m_closeCurrentEditorAction, Constants::CLOSE, editManagerContext, true);
@@ -431,14 +415,10 @@ EditorManager::EditorManager(QWidget *parent) :
advancedMenu->appendGroup(Constants::G_EDIT_EDITOR);
// Advanced menu separators
cmd = createSeparator(this, Id("QtCreator.Edit.Sep.Collapsing"), editManagerContext);
advancedMenu->addAction(cmd, Constants::G_EDIT_COLLAPSING);
cmd = createSeparator(this, Id("QtCreator.Edit.Sep.Blocks"), editManagerContext);
advancedMenu->addAction(cmd, Constants::G_EDIT_BLOCKS);
cmd = createSeparator(this, Id("QtCreator.Edit.Sep.Font"), editManagerContext);
advancedMenu->addAction(cmd, Constants::G_EDIT_FONT);
cmd = createSeparator(this, Id("QtCreator.Edit.Sep.Editor"), editManagerContext);
advancedMenu->addAction(cmd, Constants::G_EDIT_EDITOR);
advancedMenu->addSeparator(editManagerContext, Constants::G_EDIT_COLLAPSING);
advancedMenu->addSeparator(editManagerContext, Constants::G_EDIT_BLOCKS);
advancedMenu->addSeparator(editManagerContext, Constants::G_EDIT_FONT);
advancedMenu->addSeparator(editManagerContext, Constants::G_EDIT_EDITOR);
// other setup
d->m_splitter = new SplitterOrView(d->m_editorModel);
src/plugins/coreplugin/mainwindow.cpp
+12 -39
View File
@@ -548,15 +548,6 @@ void MainWindow::registerDefaultContainers()
ac->appendGroup(Constants::G_HELP_ABOUT);
}
static Command *createSeparator(QObject *parent,
const Id &id, const Context &context)
{
QAction *tmpaction = new QAction(parent);
tmpaction->setSeparator(true);
Command *cmd = ActionManager::registerAction(tmpaction, id, context);
return cmd;
}
void MainWindow::registerDefaultActions()
{
ActionContainer *mfile = ActionManager::actionContainer(Constants::M_FILE);
@@ -568,41 +559,25 @@ void MainWindow::registerDefaultActions()
Context globalContext(Constants::C_GLOBAL);
// File menu separators
Command *cmd = createSeparator(this, Id("QtCreator.File.Sep.Save"), globalContext);
mfile->addAction(cmd, Constants::G_FILE_SAVE);
cmd = createSeparator(this, Id("QtCreator.File.Sep.Print"), globalContext);
QIcon icon = QIcon::fromTheme(QLatin1String("edit-cut"), QIcon(QLatin1String(Constants::ICON_CUT)));
mfile->addAction(cmd, Constants::G_FILE_PRINT);
cmd = createSeparator(this, Id("QtCreator.File.Sep.Close"), globalContext);
mfile->addAction(cmd, Constants::G_FILE_CLOSE);
cmd = createSeparator(this, Id("QtCreator.File.Sep.Other"), globalContext);
mfile->addAction(cmd, Constants::G_FILE_OTHER);
mfile->addSeparator(globalContext, Constants::G_FILE_SAVE);
mfile->addSeparator(globalContext, Constants::G_FILE_PRINT);
mfile->addSeparator(globalContext, Constants::G_FILE_CLOSE);
mfile->addSeparator(globalContext, Constants::G_FILE_OTHER);
// Edit menu separators
cmd = createSeparator(this, Id("QtCreator.Edit.Sep.CopyPaste"), globalContext);
medit->addAction(cmd, Constants::G_EDIT_COPYPASTE);
cmd = createSeparator(this, Id("QtCreator.Edit.Sep.SelectAll"), globalContext);
medit->addAction(cmd, Constants::G_EDIT_SELECTALL);
cmd = createSeparator(this, Id("QtCreator.Edit.Sep.Find"), globalContext);
medit->addAction(cmd, Constants::G_EDIT_FIND);
cmd = createSeparator(this, Id("QtCreator.Edit.Sep.Advanced"), globalContext);
medit->addAction(cmd, Constants::G_EDIT_ADVANCED);
medit->addSeparator(globalContext, Constants::G_EDIT_COPYPASTE);
medit->addSeparator(globalContext, Constants::G_EDIT_SELECTALL);
medit->addSeparator(globalContext, Constants::G_EDIT_FIND);
medit->addSeparator(globalContext, Constants::G_EDIT_ADVANCED);
// Return to editor shortcut: Note this requires Qt to fix up
// handling of shortcut overrides in menus, item views, combos....
m_focusToEditor = new QShortcut(this);
cmd = ActionManager::registerShortcut(m_focusToEditor, Constants::S_RETURNTOEDITOR, globalContext);
Command *cmd = ActionManager::registerShortcut(m_focusToEditor, Constants::S_RETURNTOEDITOR, globalContext);
cmd->setDefaultKeySequence(QKeySequence(Qt::Key_Escape));
connect(m_focusToEditor, SIGNAL(activated()), this, SLOT(setFocusToEditor()));
// New File Action
icon = QIcon::fromTheme(QLatin1String("document-new"), QIcon(QLatin1String(Constants::ICON_NEWFILE)));
QIcon icon = QIcon::fromTheme(QLatin1String("document-new"), QIcon(QLatin1String(Constants::ICON_NEWFILE)));
m_newAction = new QAction(icon, tr("&New File or Project..."), this);
cmd = ActionManager::registerAction(m_newAction, Constants::NEW, globalContext);
cmd->setDefaultKeySequence(QKeySequence::New);
@@ -734,8 +709,7 @@ void MainWindow::registerDefaultActions()
// Options Action
mtools->appendGroup(Constants::G_TOOLS_OPTIONS);
cmd = createSeparator(this, Id("QtCreator.Tools.Sep.Options"), globalContext);
mtools->addAction(cmd, Constants::G_TOOLS_OPTIONS);
mtools->addSeparator(globalContext, Constants::G_TOOLS_OPTIONS);
m_optionsAction = new QAction(tr("&Options..."), this);
cmd = ActionManager::registerAction(m_optionsAction, Constants::OPTIONS, globalContext);
if (UseMacShortcuts) {
@@ -760,8 +734,7 @@ void MainWindow::registerDefaultActions()
connect(m_zoomAction, SIGNAL(triggered()), this, SLOT(showMaximized()));
// Window separator
cmd = createSeparator(this, Id("QtCreator.Window.Sep.Size"), globalContext);
mwindow->addAction(cmd, Constants::G_WINDOW_SIZE);
mwindow->addSeparator(globalContext, Constants::G_WINDOW_SIZE);
}
// Show Sidebar Action
src/plugins/coreplugin/outputpanemanager.cpp
+1 -4
View File
@@ -242,10 +242,7 @@ void OutputPaneManager::init()
connect(m_minMaxAction, SIGNAL(triggered()), this, SLOT(slotMinMax()));
m_minMaxButton->setDefaultAction(cmd->action());
QAction *sep = new QAction(this);
sep->setSeparator(true);
cmd = ActionManager::registerAction(sep, "Coreplugin.OutputPane.Sep", globalContext);
mpanes->addAction(cmd, "Coreplugin.OutputPane.ActionsGroup");
mpanes->addSeparator(globalContext, "Coreplugin.OutputPane.ActionsGroup");
QFontMetrics titleFm = m_titleLabel->fontMetrics();
int minTitleWidth = 0;
src/plugins/cppeditor/cppeditorconstants.h
-4
View File
@@ -44,10 +44,6 @@ const char SWITCH_DECLARATION_DEFINITION[] = "CppEditor.SwitchDeclarationDefinit
const char RENAME_SYMBOL_UNDER_CURSOR[] = "CppEditor.RenameSymbolUnderCursor";
const char FIND_USAGES[] = "CppEditor.FindUsages";
const char M_REFACTORING_MENU_INSERTION_POINT[] = "CppEditor.RefactorGroup";
const char SEPARATOR[] = "CppEditor.Separator";
const char SEPARATOR2[] = "CppEditor.Separator2";
const char SEPARATOR3[] = "CppEditor.Separator3";
const char SEPARATOR4[] = "CppEditor.Separator4";
const char UPDATE_CODEMODEL[] = "CppEditor.UpdateCodeModel";
const int TYPE_HIERARCHY_PRIORITY = 700;
src/plugins/cppeditor/cppplugin.cpp
+4 -17
View File
@@ -123,16 +123,6 @@ QStringList CppEditorFactory::mimeTypes() const
///////////////////////////////// CppPlugin //////////////////////////////////
static inline
Core::Command *createSeparator(QObject *parent,
Core::Context &context,
const char *id)
{
QAction *separator = new QAction(parent);
separator->setSeparator(true);
return Core::ActionManager::registerAction(separator, Core::Id(id), context);
}
CppPlugin *CppPlugin::m_instance = 0;
CppPlugin::CppPlugin() :
@@ -263,12 +253,9 @@ bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMess
// Refactoring sub-menu
Core::Context globalContext(Core::Constants::C_GLOBAL);
Core::Command *sep = createSeparator(this, globalContext,
Constants::SEPARATOR2);
Core::Command *sep = contextMenu->addSeparator(globalContext);
sep->action()->setObjectName(QLatin1String(Constants::M_REFACTORING_MENU_INSERTION_POINT));
contextMenu->addAction(sep);
contextMenu->addAction(createSeparator(this, globalContext,
Constants::SEPARATOR3));
contextMenu->addSeparator(globalContext);
m_renameSymbolUnderCursorAction = new QAction(tr("Rename Symbol Under Cursor"),
this);
@@ -281,7 +268,7 @@ bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMess
cppToolsMenu->addAction(cmd);
// Update context in global context
cppToolsMenu->addAction(createSeparator(this, globalContext, CppEditor::Constants::SEPARATOR4));
cppToolsMenu->addSeparator(globalContext);
m_updateCodeModelAction = new QAction(tr("Update Code Model"), this);
cmd = Core::ActionManager::registerAction(m_updateCodeModelAction, Core::Id(Constants::UPDATE_CODEMODEL), globalContext);
CPlusPlus::CppModelManagerInterface *cppModelManager = CPlusPlus::CppModelManagerInterface::instance();
@@ -296,7 +283,7 @@ bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMess
m_actionHandler->initializeActions();
contextMenu->addAction(createSeparator(this, context, CppEditor::Constants::SEPARATOR));
contextMenu->addSeparator(context);
cmd = Core::ActionManager::command(TextEditor::Constants::AUTO_INDENT_SELECTION);
contextMenu->addAction(cmd);
src/plugins/cvs/cvsplugin.cpp
+4 -17
View File
@@ -98,14 +98,11 @@ static const char CMD_ID_EDIT_FILE[] = "CVS.EditFile";
static const char CMD_ID_UNEDIT_FILE[] = "CVS.UneditFile";
static const char CMD_ID_UNEDIT_REPOSITORY[] = "CVS.UneditRepository";
static const char CMD_ID_REVERT[] = "CVS.Revert";
static const char CMD_ID_SEPARATOR0[] = "CVS.Separator0";
static const char CMD_ID_DIFF_PROJECT[] = "CVS.DiffAll";
static const char CMD_ID_DIFF_CURRENT[] = "CVS.DiffCurrent";
static const char CMD_ID_SEPARATOR1[] = "CVS.Separator1";
static const char CMD_ID_COMMIT_ALL[] = "CVS.CommitAll";
static const char CMD_ID_REVERT_ALL[] = "CVS.RevertAll";
static const char CMD_ID_COMMIT_CURRENT[] = "CVS.CommitCurrent";
static const char CMD_ID_SEPARATOR2[] = "CVS.Separator2";
static const char CMD_ID_FILELOG_CURRENT[] = "CVS.FilelogCurrent";
static const char CMD_ID_ANNOTATE_CURRENT[] = "CVS.AnnotateCurrent";
static const char CMD_ID_STATUS[] = "CVS.Status";
@@ -116,7 +113,6 @@ static const char CMD_ID_REPOSITORYLOG[] = "CVS.RepositoryLog";
static const char CMD_ID_REPOSITORYDIFF[] = "CVS.RepositoryDiff";
static const char CMD_ID_REPOSITORYSTATUS[] = "CVS.RepositoryStatus";
static const char CMD_ID_REPOSITORYUPDATE[] = "CVS.RepositoryUpdate";
static const char CMD_ID_SEPARATOR3[] = "CVS.Separator3";
static const VcsBaseEditorParameters editorParameters[] = {
{
@@ -223,15 +219,6 @@ static const VcsBaseSubmitEditorParameters submitParameters = {
Constants::CVSCOMMITEDITOR
};
static Command *createSeparator(QObject *parent,
const char *id,
const Context &globalcontext)
{
QAction *tmpaction = new QAction(parent);
tmpaction->setSeparator(true);
return Core::ActionManager::registerAction(tmpaction, id, globalcontext);
}
bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
Q_UNUSED(arguments);
@@ -306,7 +293,7 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
cvsMenu->addAction(command);
m_commandLocator->appendCommand(command);
cvsMenu->addAction(createSeparator(this, CMD_ID_SEPARATOR0, globalcontext));
cvsMenu->addSeparator(globalcontext);
m_addAction = new Utils::ParameterAction(tr("Add"), tr("Add \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_addAction, CMD_ID_ADD,
@@ -342,7 +329,7 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
cvsMenu->addAction(command);
m_commandLocator->appendCommand(command);
cvsMenu->addAction(createSeparator(this, CMD_ID_SEPARATOR1, globalcontext));
cvsMenu->addSeparator(globalcontext);
m_editCurrentAction = new Utils::ParameterAction(tr("Edit"), tr("Edit \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_editCurrentAction, CMD_ID_EDIT_FILE, globalcontext);
@@ -364,7 +351,7 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
cvsMenu->addAction(command);
m_commandLocator->appendCommand(command);
cvsMenu->addAction(createSeparator(this, CMD_ID_SEPARATOR2, globalcontext));
cvsMenu->addSeparator(globalcontext);
m_diffProjectAction = new Utils::ParameterAction(tr("Diff Project"), tr("Diff Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_diffProjectAction, CMD_ID_DIFF_PROJECT,
@@ -403,7 +390,7 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
cvsMenu->addAction(command);
m_commandLocator->appendCommand(command);
cvsMenu->addAction(createSeparator(this, CMD_ID_SEPARATOR3, globalcontext));
cvsMenu->addSeparator(globalcontext);
m_diffRepositoryAction = new QAction(tr("Diff Repository"), this);
command = Core::ActionManager::registerAction(m_diffRepositoryAction, CMD_ID_REPOSITORYDIFF, globalcontext);
src/plugins/debugger/debuggerplugin.cpp
+8 -34
View File
@@ -3200,11 +3200,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
mstart->addAction(cmd, Constants::G_MANUAL_REMOTE);
}
QAction *sep = new QAction(mstart);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep,
"Debugger.Start.Qml", globalcontext);
mstart->addAction(cmd, Constants::G_START_QML);
mstart->addSeparator(globalcontext, Constants::G_START_QML);
cmd = Core::ActionManager::registerAction(m_attachToQmlPortAction,
"Debugger.AttachToQmlPort", globalcontext);
@@ -3243,10 +3239,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
cmd->setDescription(tr("Reset Debugger"));
debugMenu->addAction(cmd, CC::G_DEFAULT_ONE);
sep = new QAction(this);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep, "Debugger.Sep.Step", globalcontext);
debugMenu->addAction(cmd);
debugMenu->addSeparator(globalcontext);
cmd = Core::ActionManager::registerAction(m_nextAction,
Constants::NEXT, globalcontext);
@@ -3298,10 +3291,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
cmd->setAttribute(Command::CA_Hide);
debugMenu->addAction(cmd);
sep = new QAction(this);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep, "Debugger.Sep.Break", globalcontext);
debugMenu->addAction(cmd);
debugMenu->addSeparator(globalcontext);
//cmd = Core::ActionManager::registerAction(m_snapshotAction,
// "Debugger.Snapshot", cppDebuggercontext);
@@ -3326,10 +3316,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
connect(m_breakAction, SIGNAL(triggered()),
SLOT(toggleBreakpoint()));
sep = new QAction(this);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep, "Debugger.Sep.Watch", globalcontext);
debugMenu->addAction(cmd);
debugMenu->addSeparator(globalcontext);
// Don't add '1' to the string as it shows up in the shortcut dialog.
cmd = Core::ActionManager::registerAction(m_watchAction1,
@@ -3341,9 +3328,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
// the editor context menu.
if (ActionContainer *editorContextMenu =
Core::ActionManager::actionContainer(CppEditor::Constants::M_CONTEXT)) {
cmd = Core::ActionManager::registerAction(sep, "Debugger.Sep.Views",
cppDebuggercontext);
editorContextMenu->addAction(cmd);
cmd = editorContextMenu->addSeparator(cppDebuggercontext);
cmd->setAttribute(Command::CA_Hide);
cmd = Core::ActionManager::registerAction(m_watchAction2,
@@ -3590,20 +3575,9 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
mstart->appendGroup(Constants::G_START_QML);
// Separators
QAction *sep = new QAction(mstart);
sep->setSeparator(true);
Command *cmd = Core::ActionManager::registerAction(sep, "Debugger.Local.Cpp", globalcontext);
mstart->addAction(cmd, Constants::G_START_LOCAL);
sep = new QAction(mstart);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep, "Debugger.StartRemote.Cpp", globalcontext);
mstart->addAction(cmd, Constants::G_MANUAL_REMOTE);
sep = new QAction(mstart);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep, "Debugger.AttachRemote.Cpp", globalcontext);
mstart->addAction(cmd, Constants::G_AUTOMATIC_REMOTE);
mstart->addSeparator(globalcontext, Constants::G_START_LOCAL);
mstart->addSeparator(globalcontext, Constants::G_MANUAL_REMOTE);
mstart->addSeparator(globalcontext, Constants::G_AUTOMATIC_REMOTE);
return theDebuggerCore->initialize(arguments, errorMessage);
}
src/plugins/designer/formeditorw.cpp
+7 -24
View File
@@ -125,20 +125,6 @@ static inline QIcon designerIcon(const QString &iconName)
return icon;
}
// Create a menu separator
static QAction *createSeparator(QObject *parent,
const Core::Context &context,
Core::ActionContainer *container,
const Core::Id &id,
const Core::Id &group = Core::Id())
{
QAction *actSeparator = new QAction(parent);
actSeparator->setSeparator(true);
Core::Command *command = Core::ActionManager::registerAction(actSeparator, id, context);
container->addAction(command, group);
return actSeparator;
}
using namespace Designer::Constants;
namespace Designer {
@@ -462,10 +448,7 @@ void FormEditorW::setupActions()
m_actionGroupEditMode->setExclusive(true);
connect(m_actionGroupEditMode, SIGNAL(triggered(QAction*)), this, SLOT(activateEditMode(QAction*)));
m_modeActionSeparator = new QAction(this);
m_modeActionSeparator->setSeparator(true);
command = Core::ActionManager::registerAction(m_modeActionSeparator, Core::Id("FormEditor.Sep.ModeActions"), m_contexts);
medit->addAction(command, Core::Constants::G_EDIT_OTHER);
medit->addSeparator(m_contexts, Core::Constants::G_EDIT_OTHER);
m_toolActionIds.push_back(Core::Id("FormEditor.WidgetEditor"));
createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
@@ -528,7 +511,7 @@ void FormEditorW::setupActions()
addToolAction(m_fwm->actionSimplifyLayout(), m_contexts,
m_toolActionIds.back(), mformtools);
createSeparator(this, m_contexts, mformtools, Core::Id("FormEditor.Menu.Tools.Separator1"));
mformtools->addSeparator(m_contexts);
addToolAction(m_fwm->actionLower(), m_contexts,
Core::Id("FormEditor.Lower"), mformtools);
@@ -537,7 +520,7 @@ void FormEditorW::setupActions()
Core::Id("FormEditor.Raise"), mformtools);
// Commands that do not go into the editor toolbar
createSeparator(this, m_contexts, mformtools, Core::Id("FormEditor.Menu.Tools.Separator2"));
mformtools->addSeparator(m_contexts);
#if QT_VERSION >= 0x050000
m_actionPreview = m_fwm->action(QDesignerFormWindowManagerInterface::DefaultPreviewAction);
@@ -561,9 +544,9 @@ void FormEditorW::setupActions()
setPreviewMenuEnabled(false);
// Form settings
createSeparator(this, m_contexts, medit, Core::Id("FormEditor.Edit.Separator2"), Core::Constants::G_EDIT_OTHER);
medit->addSeparator(m_contexts, Core::Constants::G_EDIT_OTHER);
createSeparator(this, m_contexts, mformtools, Core::Id("FormEditor.Menu.Tools.Separator3"));
mformtools->addSeparator(m_contexts);
m_actionSwitchSource = new QAction(tr("Switch Source/Form"), this);
connect(m_actionSwitchSource, SIGNAL(triggered()), this, SLOT(switchSourceForm()));
@@ -574,7 +557,7 @@ void FormEditorW::setupActions()
addToolAction(m_actionSwitchSource, switchContexts, Core::Id("FormEditor.FormSwitchSource"), mformtools,
tr("Shift+F4"));
createSeparator(this, m_contexts, mformtools, Core::Id("FormEditor.Menu.Tools.Separator4"));
mformtools->addSeparator(m_contexts);
#if QT_VERSION >= 0x050000
QAction *actionFormSettings = m_fwm->action(QDesignerFormWindowManagerInterface::FormWindowSettingsDialogAction);
#else
@@ -582,7 +565,7 @@ void FormEditorW::setupActions()
#endif
addToolAction(actionFormSettings, m_contexts, Core::Id("FormEditor.FormSettings"), mformtools);
createSeparator(this, m_contexts, mformtools, Core::Id("FormEditor.Menu.Tools.Separator5"));
mformtools->addSeparator(m_contexts);
m_actionAboutPlugins = new QAction(tr("About Qt Designer plugins...."), this);
addToolAction(m_actionAboutPlugins, m_contexts,
Core::Id("FormEditor.AboutPlugins"), mformtools);
src/plugins/designer/formeditorw.h
-1
View File
@@ -193,7 +193,6 @@ private:
QActionGroup *m_actionGroupPreviewInStyle;
QMenu *m_previewInStyleMenu;
QAction *m_actionAboutPlugins;
QAction *m_modeActionSeparator;
QAction *m_actionSwitchSource;
QSignalMapper *m_shortcutMapper;
src/plugins/find/findplugin.cpp
+2 -9
View File
@@ -206,15 +206,8 @@ void FindPlugin::setupMenu()
mfind->appendGroup(Constants::G_FIND_ACTIONS);
Core::Context globalcontext(Core::Constants::C_GLOBAL);
Core::Command *cmd;
QAction *separator;
separator = new QAction(this);
separator->setSeparator(true);
cmd = Core::ActionManager::registerAction(separator, "Find.Sep.Flags", globalcontext);
mfind->addAction(cmd, Constants::G_FIND_FLAGS);
separator = new QAction(this);
separator->setSeparator(true);
cmd = Core::ActionManager::registerAction(separator, "Find.Sep.Actions", globalcontext);
mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
mfind->addSeparator(globalcontext, Constants::G_FIND_FLAGS);
mfind->addSeparator(globalcontext, Constants::G_FIND_ACTIONS);
Core::ActionContainer *mfindadvanced = Core::ActionManager::createMenu(Constants::M_FIND_ADVANCED);
mfindadvanced->menu()->setTitle(tr("Advanced Find"));
src/plugins/git/gitplugin.cpp
+10 -19
View File
@@ -182,15 +182,6 @@ static const VcsBase::VcsBaseSubmitEditorParameters submitParameters = {
Git::Constants::C_GITSUBMITEDITOR
};
static Core::Command *createSeparator(const Core::Context &context,
const Core::Id &id,
QObject *parent)
{
QAction *a = new QAction(parent);
a->setSeparator(true);
return Core::ActionManager::registerAction(a, id, context);
}
// Create a parameter action
ParameterActionCommandPair
GitPlugin::createParameterAction(Core::ActionContainer *ac,
@@ -341,7 +332,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
parameterActionCommand.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+L") : tr("Alt+G,Alt+L")));
// ------
gitContainer->addAction(createSeparator(globalcontext, Core::Id("Git.Sep.File"), this));
gitContainer->addSeparator(globalcontext);
parameterActionCommand
= createFileAction(gitContainer,
@@ -368,7 +359,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
parameterActionCommand.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+U") : tr("Alt+G,Alt+U")));
// ------------
gitContainer->addAction(createSeparator(globalcontext, Core::Id("Git.Sep.Project"), this));
gitContainer->addSeparator(globalcontext);
parameterActionCommand
= createProjectAction(gitContainer,
@@ -393,7 +384,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
// --------------
gitContainer->addAction(createSeparator(globalcontext, Core::Id("Git.Sep.Repository"), this));
gitContainer->addSeparator(globalcontext);
createRepositoryAction(gitContainer,
tr("Diff"), Core::Id("Git.DiffRepository"),
@@ -422,7 +413,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
gitContainer->addAction(createRepositoryCommand);
// --------------
gitContainer->addAction(createSeparator(globalcontext, Core::Id("Git.Sep.Info"), this));
gitContainer->addSeparator(globalcontext);
createRepositoryAction(gitContainer,
tr("Launch gitk"), Core::Id("Git.LaunchGitK"),
@@ -448,7 +439,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
// --------------
gitContainer->addAction(createSeparator(globalcontext, Core::Id("Git.Sep.RarelyUsed"), this));
gitContainer->addSeparator(globalcontext);
Core::ActionContainer *patchMenu = Core::ActionManager::createMenu(Core::Id("Git.PatchMenu"));
patchMenu->menu()->setTitle(tr("Patch"));
@@ -476,7 +467,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
tr("Stashes..."), Core::Id("Git.StashList"),
globalcontext, false, SLOT(stashList()));
stashMenu->addAction(createSeparator(globalcontext, Core::Id("Git.Sep.StashMenuPush"), this));
stashMenu->addSeparator(globalcontext);
ActionCommandPair actionCommand =
createRepositoryAction(stashMenu,
@@ -489,7 +480,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
globalcontext, true, SLOT(stashSnapshot()));
actionCommand.first->setToolTip(tr("Saves the current state of your work."));
stashMenu->addAction(createSeparator(globalcontext, Core::Id("Git.Sep.StashMenuPop"), this));
stashMenu->addSeparator(globalcontext);
actionCommand = createRepositoryAction(stashMenu,
tr("Stash Pop"), Core::Id("Git.StashPop"),
@@ -508,9 +499,9 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
tr("Fetch"), Core::Id("Git.Subversion.Fetch"),
globalcontext, false, &GitClient::synchronousSubversionFetch);
gitContainer->addAction(createSeparator(globalcontext, Core::Id("Git.Sep.PushPull"), this));
gitContainer->addSeparator(globalcontext);
gitContainer->addAction(createSeparator(globalcontext, Core::Id("Git.Sep.Global"), this));
gitContainer->addSeparator(globalcontext);
createRepositoryAction(gitContainer,
tr("Fetch"), Core::Id("Git.Fetch"),
@@ -534,7 +525,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
globalcontext, true, SLOT(startAmendCommit()));
// Subversion in a submenu.
gitContainer->addAction(createSeparator(globalcontext, Core::Id("Git.Sep.Subversion"), this));
gitContainer->addSeparator(globalcontext);
if (0) {
const QList<QAction*> snapShotActions = createSnapShotTestActions();
src/plugins/glsleditor/glsleditorconstants.h
-2
View File
@@ -42,8 +42,6 @@ namespace Constants {
const char M_CONTEXT[] = "GLSL Editor.ContextMenu";
const char M_TOOLS_GLSL[] = "GLSLEditor.Tools.Menu";
const char SEPARATOR1[] = "GLSLEditor.Separator1";
const char SEPARATOR2[] = "GLSLEditor.Separator2";
const char M_REFACTORING_MENU_INSERTION_POINT[] = "GLSLEditor.RefactorGroup";
const char C_GLSLEDITOR_ID[] = "GLSLEditor.GLSLEditor";
src/plugins/glsleditor/glsleditorplugin.cpp
+2 -16
View File
@@ -105,17 +105,6 @@ GLSLEditorPlugin::~GLSLEditorPlugin()
m_instance = 0;
}
/*! Copied from cppplugin.cpp */
static inline
Core::Command *createSeparator(QObject *parent,
Core::Context &context,
const char *id)
{
QAction *separator = new QAction(parent);
separator->setSeparator(true);
return Core::ActionManager::registerAction(separator, Core::Id(id), context);
}
bool GLSLEditorPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
{
if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":/glsleditor/GLSLEditor.mimetypes.xml"), errorMessage))
@@ -151,12 +140,9 @@ bool GLSLEditorPlugin::initialize(const QStringList & /*arguments*/, QString *er
// Insert marker for "Refactoring" menu:
Core::Context globalContext(Core::Constants::C_GLOBAL);
Core::Command *sep = createSeparator(this, globalContext,
Constants::SEPARATOR1);
Core::Command *sep = contextMenu->addSeparator(globalContext);
sep->action()->setObjectName(Constants::M_REFACTORING_MENU_INSERTION_POINT);
contextMenu->addAction(sep);
contextMenu->addAction(createSeparator(this, globalContext,
Constants::SEPARATOR2));
contextMenu->addSeparator(globalContext);
cmd = Core::ActionManager::command(TextEditor::Constants::UN_COMMENT_SELECTION);
contextMenu->addAction(cmd);
src/plugins/mercurial/mercurialplugin.cpp
+5 -12
View File
@@ -202,13 +202,13 @@ void MercurialPlugin::createMenu()
menu->setTitle(tr("Mercurial"));
createFileActions(context);
createSeparator(context, Core::Id("Mercurial.FileDirSeperator"));
mercurialContainer->addSeparator(context);
createDirectoryActions(context);
createSeparator(context, Core::Id("Mercurial.DirRepoSeperator"));
mercurialContainer->addSeparator(context);
createRepositoryActions(context);
createSeparator(context, Core::Id("Mercurial.Repository Management"));
mercurialContainer->addSeparator(context);
createRepositoryManagementActions(context);
createSeparator(context, Core::Id("Mercurial.LessUsedfunctionality"));
mercurialContainer->addSeparator(context);
createLessUsedActions(context);
// Request the Tools menu and add the Mercurial menu to it
@@ -252,7 +252,7 @@ void MercurialPlugin::createFileActions(const Core::Context &context)
mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
createSeparator(context, Core::Id("Mercurial.FileDirSeperator1"));
mercurialContainer->addSeparator(context);
m_addAction = new ParameterAction(tr("Add"), tr("Add \"%1\""), ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_addAction, Core::Id(Constants::ADD), context);
@@ -687,13 +687,6 @@ void MercurialPlugin::createLessUsedActions(const Core::Context &context)
return;
}
void MercurialPlugin::createSeparator(const Core::Context &context, const Core::Id &id)
{
QAction *action = new QAction(this);
action->setSeparator(true);
mercurialContainer->addAction(Core::ActionManager::registerAction(action, id, context));
}
void MercurialPlugin::updateActions(VcsBasePlugin::ActionState as)
{
if (!enableMenuAction(as, m_menuAction)) {
src/plugins/mercurial/mercurialplugin.h
-1
View File
@@ -129,7 +129,6 @@ protected:
private:
void createMenu();
void createSubmitEditorActions();
void createSeparator(const Core::Context &context, const Core::Id &id);
void createFileActions(const Core::Context &context);
void createDirectoryActions(const Core::Context &context);
void createRepositoryActions(const Core::Context &context);
src/plugins/perforce/perforceplugin.cpp
+4 -16
View File
@@ -162,9 +162,6 @@ static const char CMD_ID_ANNOTATE[] = "Perforce.Annotate";
static const char CMD_ID_FILELOG_CURRENT[] = "Perforce.FilelogCurrent";
static const char CMD_ID_FILELOG[] = "Perforce.Filelog";
static const char CMD_ID_UPDATEALL[] = "Perforce.UpdateAll";
static const char CMD_ID_SEPARATOR1[] = "Perforce.Separator1";
static const char CMD_ID_SEPARATOR2[] = "Perforce.Separator2";
static const char CMD_ID_SEPARATOR3[] = "Perforce.Separator3";
////
// PerforcePlugin
@@ -220,15 +217,6 @@ static const VcsBase::VcsBaseSubmitEditorParameters submitParameters = {
Perforce::Constants::PERFORCESUBMITEDITOR_CONTEXT
};
static inline Core::Command *createSeparator(QObject *parent,
const char *id,
const Core::Context &globalcontext)
{
QAction *tmpaction = new QAction(parent);
tmpaction->setSeparator(true);
return Core::ActionManager::registerAction(tmpaction, id, globalcontext);
}
bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *errorMessage)
{
typedef VcsBase::VcsEditorFactory<PerforceEditor> PerforceEditorFactory;
@@ -296,7 +284,7 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
mperforce->addAction(command);
m_commandLocator->appendCommand(command);
mperforce->addAction(createSeparator(this, "Perforce.Sep.Edit", globalcontext));
mperforce->addSeparator(globalcontext);
m_editAction = new Utils::ParameterAction(tr("Edit"), tr("Edit \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_editAction, CMD_ID_EDIT, globalcontext);
@@ -333,7 +321,7 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
mperforce->addAction(command);
m_commandLocator->appendCommand(command);
mperforce->addAction(createSeparator(this, "Perforce.Sep.Project", globalcontext));
mperforce->addSeparator(globalcontext);
const QString diffProjectDefaultText = tr("Diff Current Project/Session");
m_diffProjectAction = new Utils::ParameterAction(diffProjectDefaultText, tr("Diff Project \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
@@ -383,7 +371,7 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
mperforce->addAction(command);
m_commandLocator->appendCommand(command);
mperforce->addAction(createSeparator(this, "Perforce.Sep.Repository", globalcontext));
mperforce->addSeparator(globalcontext);
m_diffAllAction = new QAction(tr("Diff Opened Files"), this);
command = Core::ActionManager::registerAction(m_diffAllAction, CMD_ID_DIFF_ALL, globalcontext);
@@ -416,7 +404,7 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
mperforce->addAction(command);
m_commandLocator->appendCommand(command);
mperforce->addAction(createSeparator(this, "Perforce.Sep.Dialogs", globalcontext));
mperforce->addSeparator(globalcontext);
m_describeAction = new QAction(tr("Describe..."), this);
command = Core::ActionManager::registerAction(m_describeAction, CMD_ID_DESCRIBE, globalcontext);
src/plugins/projectexplorer/projectexplorer.cpp
+15 -46
View File
@@ -530,45 +530,18 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
//
Core::Command *cmd;
QAction *sep;
sep = new QAction(this);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep, Core::Id("ProjectExplorer.Config.Sep"), projecTreeContext);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD);
msessionContextMenu->addSeparator(projecTreeContext, Constants::G_SESSION_REBUILD);
sep = new QAction(this);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep, Core::Id("ProjectExplorer.Files.Sep"), projecTreeContext);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_FILES);
mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_FILES);
msubProjectContextMenu->addAction(cmd, Constants::G_PROJECT_FILES);
sep = new QAction(this);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep, Core::Id("ProjectExplorer.Projects.Sep"), globalcontext);
mfile->addAction(cmd, Core::Constants::G_FILE_PROJECT);
sep = new QAction(this);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep, Core::Id("ProjectExplorer.Other.Sep"), globalcontext);
mbuild->addAction(cmd, Constants::G_BUILD_REBUILD);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_OTHER);
sep = new QAction(this);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep, Core::Id("ProjectExplorer.CancelBuild.Sep"), globalcontext);
mbuild->addAction(cmd, Constants::G_BUILD_CANCEL);
sep = new QAction(this);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep, Core::Id("ProjectExplorer.Run.Sep"), globalcontext);
mbuild->addAction(cmd, Constants::G_BUILD_RUN);
sep = new QAction(this);
sep->setSeparator(true);
cmd = Core::ActionManager::registerAction(sep, Core::Id("ProjectExplorer.Rebuild.Sep"), globalcontext);
mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_REBUILD);
msessionContextMenu->addSeparator(projecTreeContext, Constants::G_SESSION_FILES);
mprojectContextMenu->addSeparator(projecTreeContext, Constants::G_PROJECT_FILES);
msubProjectContextMenu->addSeparator(projecTreeContext, Constants::G_PROJECT_FILES);
mfile->addSeparator(globalcontext, Core::Constants::G_FILE_PROJECT);
mbuild->addSeparator(globalcontext, Constants::G_BUILD_REBUILD);
msessionContextMenu->addSeparator(globalcontext, Constants::G_SESSION_OTHER);
mbuild->addSeparator(globalcontext, Constants::G_BUILD_CANCEL);
mbuild->addSeparator(globalcontext, Constants::G_BUILD_RUN);
mprojectContextMenu->addSeparator(globalcontext, Constants::G_PROJECT_REBUILD);
//
// Actions
@@ -861,23 +834,19 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_FIRST);
// Collapse All.
sep = new QAction(this);
sep->setSeparator(true);
Core::Command *treeSpacer = Core::ActionManager::registerAction(sep, Core::Id("ProjectExplorer.Tree.Sep"), globalcontext);
d->m_projectTreeCollapseAllAction = new QAction(tr("Collapse All"), this);
cmd = Core::ActionManager::registerAction(d->m_projectTreeCollapseAllAction, Constants::PROJECTTREE_COLLAPSE_ALL,
projecTreeContext);
const Core::Id treeGroup = Constants::G_PROJECT_TREE;
mfileContextMenu->addAction(treeSpacer, treeGroup);
mfileContextMenu->addSeparator(globalcontext, treeGroup);
mfileContextMenu->addAction(cmd, treeGroup);
msubProjectContextMenu->addAction(treeSpacer, treeGroup);
msubProjectContextMenu->addSeparator(globalcontext, treeGroup);
msubProjectContextMenu->addAction(cmd, treeGroup);
mfolderContextMenu->addAction(treeSpacer, treeGroup);
mfolderContextMenu->addSeparator(globalcontext, treeGroup);
mfolderContextMenu->addAction(cmd, treeGroup);
mprojectContextMenu->addAction(treeSpacer, treeGroup);
mprojectContextMenu->addSeparator(globalcontext, treeGroup);
mprojectContextMenu->addAction(cmd, treeGroup);
msessionContextMenu->addAction(treeSpacer, treeGroup);
msessionContextMenu->addSeparator(globalcontext, treeGroup);
msessionContextMenu->addAction(cmd, treeGroup);
// target selector
src/plugins/qmljseditor/qmljseditorconstants.h
-3
View File
@@ -40,9 +40,6 @@ namespace Constants {
const char M_CONTEXT[] = "QML JS Editor.ContextMenu";
const char SEPARATOR1[] = "QmlJSEditor.Separator1";
const char SEPARATOR2[] = "QmlJSEditor.Separator2";
const char SEPARATOR3[] = "QmlJSEditor.Separator3";
const char M_REFACTORING_MENU_INSERTION_POINT[] = "QmlJSEditor.RefactorGroup";
const char C_QMLJSEDITOR_ID[] = "QMLProjectManager.QMLJSEditor";
src/plugins/qmljseditor/qmljseditorplugin.cpp
+3 -17
View File
@@ -115,17 +115,6 @@ QmlJSEditorPlugin::~QmlJSEditorPlugin()
m_instance = 0;
}
/*! Copied from cppplugin.cpp */
static inline
Core::Command *createSeparator(QObject *parent,
Core::Context &context,
const char *id)
{
QAction *separator = new QAction(parent);
separator->setSeparator(true);
return Core::ActionManager::registerAction(separator, Core::Id(id), context);
}
bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
{
if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":/qmljseditor/QmlJSEditor.mimetypes.xml"), errorMessage))
@@ -181,7 +170,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
Core::ActionContainer *qmlToolsMenu = Core::ActionManager::actionContainer(Core::Id(QmlJSTools::Constants::M_TOOLS_QMLJS));
Core::Context globalContext(Core::Constants::C_GLOBAL);
qmlToolsMenu->addAction(createSeparator(this, globalContext, QmlJSEditor::Constants::SEPARATOR3));
qmlToolsMenu->addSeparator(globalContext);
Core::Command *cmd;
cmd = Core::ActionManager::command(TextEditor::Constants::FOLLOW_SYMBOL_UNDER_CURSOR);
@@ -222,12 +211,9 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
qmlToolsMenu->addAction(cmd);
// Insert marker for "Refactoring" menu:
Core::Command *sep = createSeparator(this, globalContext,
Constants::SEPARATOR1);
Core::Command *sep = contextMenu->addSeparator(globalContext);
sep->action()->setObjectName(Constants::M_REFACTORING_MENU_INSERTION_POINT);
contextMenu->addAction(sep);
contextMenu->addAction(createSeparator(this, globalContext,
Constants::SEPARATOR2));
contextMenu->addSeparator(globalContext);
cmd = Core::ActionManager::command(TextEditor::Constants::AUTO_INDENT_SELECTION);
contextMenu->addAction(cmd);
src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
-1
View File
@@ -68,7 +68,6 @@ const char REBUILDSUBDIRCONTEXTMENU[] = "Qt4Builder.RebuildSubDirContextMenu";
const char CLEANSUBDIRCONTEXTMENU[] = "Qt4Builder.CleanSubDirContextMenu";
const char BUILDFILECONTEXTMENU[] = "Qt4Builder.BuildFileContextMenu";
const char ADDLIBRARY[] = "Qt4.AddLibrary";
const char SEPARATOR[] = "Qt4.Separator";
// Tasks
const char PROFILE_EVALUATE[] = "Qt4ProjectManager.ProFileEvaluate";
src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+3 -9
View File
@@ -204,12 +204,9 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
connect(m_runQMakeActionContextMenu, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(runQMakeContextMenu()));
m_subProjectRebuildSeparator = new QAction(this);
m_subProjectRebuildSeparator->setSeparator(true);
command = msubproject->addSeparator(projectContext, ProjectExplorer::Constants::G_PROJECT_BUILD,
&m_subProjectRebuildSeparator);
command->setAttribute(Core::Command::CA_Hide);
command = Core::ActionManager::registerAction(
m_subProjectRebuildSeparator, Core::Id("ProjectExplorer.SubprojectRebuild.Sep"), projectContext);
msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
m_rebuildSubProjectContextMenu = new QAction(tr("Rebuild"), this);
command = Core::ActionManager::registerAction(
@@ -303,10 +300,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
mproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_FILES);
msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_FILES);
QAction *separator = new QAction(this);
separator->setSeparator(true);
contextMenu->addAction(Core::ActionManager::registerAction(separator,
Core::Id(Constants::SEPARATOR), proFileEditorContext));
contextMenu->addSeparator(proFileEditorContext);
command = Core::ActionManager::command(TextEditor::Constants::UN_COMMENT_SELECTION);
contextMenu->addAction(command);
src/plugins/subversion/subversionplugin.cpp
+3 -16
View File
@@ -88,18 +88,14 @@ static const char CMD_ID_SUBVERSION_MENU[] = "Subversion.Menu";
static const char CMD_ID_ADD[] = "Subversion.Add";
static const char CMD_ID_DELETE_FILE[] = "Subversion.Delete";
static const char CMD_ID_REVERT[] = "Subversion.Revert";
static const char CMD_ID_SEPARATOR0[] = "Subversion.Separator0";
static const char CMD_ID_DIFF_PROJECT[] = "Subversion.DiffAll";
static const char CMD_ID_DIFF_CURRENT[] = "Subversion.DiffCurrent";
static const char CMD_ID_SEPARATOR1[] = "Subversion.Separator1";
static const char CMD_ID_COMMIT_ALL[] = "Subversion.CommitAll";
static const char CMD_ID_REVERT_ALL[] = "Subversion.RevertAll";
static const char CMD_ID_COMMIT_CURRENT[] = "Subversion.CommitCurrent";
static const char CMD_ID_SEPARATOR2[] = "Subversion.Separator2";
static const char CMD_ID_FILELOG_CURRENT[] = "Subversion.FilelogCurrent";
static const char CMD_ID_ANNOTATE_CURRENT[] = "Subversion.AnnotateCurrent";
static const char CMD_ID_SEPARATOR3[] = "Subversion.Separator3";
static const char CMD_ID_SEPARATOR4[] = "Subversion.Separator4";
static const char CMD_ID_STATUS[] = "Subversion.Status";
static const char CMD_ID_PROJECTLOG[] = "Subversion.ProjectLog";
static const char CMD_ID_REPOSITORYLOG[] = "Subversion.RepositoryLog";
@@ -248,15 +244,6 @@ static const VcsBase::VcsBaseSubmitEditorParameters submitParameters = {
Subversion::Constants::SUBVERSIONCOMMITEDITOR
};
static inline Core::Command *createSeparator(QObject *parent,
const char*id,
const Core::Context &globalcontext)
{
QAction *tmpaction = new QAction(parent);
tmpaction->setSeparator(true);
return Core::ActionManager::registerAction(tmpaction, id, globalcontext);
}
bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *errorMessage)
{
typedef VcsBase::VcsSubmitEditorFactory<SubversionSubmitEditor> SubversionSubmitEditorFactory;
@@ -330,7 +317,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
subversionMenu->addAction(command);
m_commandLocator->appendCommand(command);
subversionMenu->addAction(createSeparator(this, CMD_ID_SEPARATOR0, globalcontext));
subversionMenu->addSeparator(globalcontext);
m_addAction = new Utils::ParameterAction(tr("Add"), tr("Add \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_addAction, CMD_ID_ADD,
@@ -366,7 +353,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
subversionMenu->addAction(command);
m_commandLocator->appendCommand(command);
subversionMenu->addAction(createSeparator(this, CMD_ID_SEPARATOR1, globalcontext));
subversionMenu->addSeparator(globalcontext);
m_diffProjectAction = new Utils::ParameterAction(tr("Diff Project"), tr("Diff Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(m_diffProjectAction, CMD_ID_DIFF_PROJECT,
@@ -405,7 +392,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
subversionMenu->addAction(command);
m_commandLocator->appendCommand(command);
subversionMenu->addAction(createSeparator(this, CMD_ID_SEPARATOR2, globalcontext));
subversionMenu->addSeparator(globalcontext);
m_diffRepositoryAction = new QAction(tr("Diff Repository"), this);
command = Core::ActionManager::registerAction(m_diffRepositoryAction, CMD_ID_REPOSITORYDIFF, globalcontext);
src/plugins/valgrind/callgrindtool.cpp
+1 -5
View File
@@ -546,11 +546,7 @@ void CallgrindTool::extensionsInitialized()
QAction *action = 0;
Core::Command *cmd = 0;
action = new QAction(this);
action->setSeparator(true);
cmd = Core::ActionManager::registerAction(action, "Analyzer.Callgrind.ContextMenu.Sep",
analyzerContext);
editorContextMenu->addAction(cmd);
editorContextMenu->addSeparator(analyzerContext);
action = new QAction(tr("Profile Costs of this Function and its Callees"), this);
action->setIcon(QIcon(Analyzer::Constants::ANALYZER_CONTROL_START_ICON));