Commit 1c7e4182 authored by hjk's avatar hjk

Fixes: rename some commands to get something like a 'naming scheme'

in place
RevBy:   con
parent bddd9fa3
......@@ -42,10 +42,10 @@ const char * const BOOKMARKS_MOVEUP_ACTION = "Bookmarks.MoveUp";
const char * const BOOKMARKS_MOVEDOWN_ACTION = "Bookmarks.MoveDown";
const char * const BOOKMARKS_PREV_ACTION = "Bookmarks.Previous";
const char * const BOOKMARKS_NEXT_ACTION = "Bookmarks.Next";
const char * const BOOKMARKS_PREVDIR_ACTION = "Bookmarks.Previous.Directory";
const char * const BOOKMARKS_NEXTDIR_ACTION = "Bookmarks.Next.Directory";
const char * const BOOKMARKS_PREVDOC_ACTION = "Bookmarks.Previous.Document";
const char * const BOOKMARKS_NEXTDOC_ACTION = "Bookmarks.Next.Document";
const char * const BOOKMARKS_PREVDIR_ACTION = "Bookmarks.PreviousDirectory";
const char * const BOOKMARKS_NEXTDIR_ACTION = "Bookmarks.NextDirectory";
const char * const BOOKMARKS_PREVDOC_ACTION = "Bookmarks.PreviousDocument";
const char * const BOOKMARKS_NEXTDOC_ACTION = "Bookmarks.NextDocument";
const char * const BOOKMARKS_MENU = "Bookmarks.Menu";
const char * const BOOKMARKS_CONTEXT = "Bookmarks";
......
......@@ -63,9 +63,9 @@ const char * const IDE_REVISION_STR = "";
#undef STRINGIFY_INTERNAL
//modes
const char * const MODE_WELCOME = "QtCreator.Mode.Welcome";
const char * const MODE_EDIT = "QtCreator.Mode.Edit";
const char * const MODE_OUTPUT = "QtCreator.Mode.Output";
const char * const MODE_WELCOME = "Welcome";
const char * const MODE_EDIT = "Edit";
const char * const MODE_OUTPUT = "Output";
const int P_MODE_WELCOME = 100;
const int P_MODE_EDIT = 90;
const int P_MODE_OUTPUT = 10;
......
......@@ -312,7 +312,7 @@ bool MainWindow::init(QString *errorMessage)
// Add widget to the bottom, we create the view here instead of inside the
// OutputPaneManager, since the ViewManager needs to be initilized before
m_outputView = new Core::BaseView;
m_outputView->setUniqueViewName("OutputWindow.Buttons");
m_outputView->setUniqueViewName("OutputWindow");
m_outputView->setWidget(OutputPaneManager::instance()->buttonsWidget());
m_outputView->setDefaultPosition(Core::IView::Second);
pm->addObject(m_outputView);
......
......@@ -326,7 +326,7 @@ void NavigationWidget::objectAdded(QObject * obj)
QShortcut *shortcut = new QShortcut(this);
shortcut->setWhatsThis(tr("Activate %1 Pane").arg(displayName));
Core::Command *cmd = am->registerShortcut(shortcut,
displayName + QLatin1String(".FocusShortcut"), navicontext);
QLatin1String("QtCreator.Sidebar.") + displayName, navicontext);
cmd->setDefaultKeySequence(factory->activationSequence());
connect(shortcut, SIGNAL(activated()), this, SLOT(activateSubWidget()));
......
......@@ -103,14 +103,14 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_m
Core::Command *command;
m_postAction = new QAction(tr("Paste snippet..."), this);
command = actionManager->registerAction(m_postAction, "CodePaster.post", globalcontext);
m_postAction = new QAction(tr("Paste Snippet..."), this);
command = actionManager->registerAction(m_postAction, "CodePaster.Post", globalcontext);
command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+P")));
connect(m_postAction, SIGNAL(triggered()), this, SLOT(post()));
cpContainer->addAction(command);
m_fetchAction = new QAction(tr("Fetch snippet..."), this);
command = actionManager->registerAction(m_fetchAction, "CodePaster.fetch", globalcontext);
m_fetchAction = new QAction(tr("Fetch Snippet..."), this);
command = actionManager->registerAction(m_fetchAction, "CodePaster.Fetch", globalcontext);
command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+F")));
connect(m_fetchAction, SIGNAL(triggered()), this, SLOT(fetch()));
cpContainer->addAction(command);
......
......@@ -38,10 +38,10 @@ namespace Designer {
namespace Constants {
// context
const char * const C_FORMEDITOR = "Formeditor";
const char * const T_FORMEDITOR = "Formeditor.Toolbar";
const char * const M_FORMEDITOR = "Formeditor.Menu";
const char * const M_FORMEDITOR_PREVIEW = "Formeditor.Menu.Preview";
const char * const C_FORMEDITOR = "FormEditor";
const char * const T_FORMEDITOR = "FormEditor.Toolbar";
const char * const M_FORMEDITOR = "FormEditor.Menu";
const char * const M_FORMEDITOR_PREVIEW = "FormEditor.Menu.Preview";
// Wizard type
const char * const FORM_FILE_TYPE = "Qt4FormFiles";
......
......@@ -44,8 +44,8 @@ const char * const GIT_DIFF_EDITOR_KIND = "Git Diff Editor";
const char * const C_GITSUBMITEDITOR = "Git Submit Editor";
const char * const GITSUBMITEDITOR_KIND = "Git Submit Editor";
const char * const SUBMIT_CURRENT = "Nokia.Git.SubmitCurrentLog";
const char * const DIFF_SELECTED = "Nokia.Git.DiffSelectedFilesInLog";
const char * const SUBMIT_CURRENT = "Git.SubmitCurrentLog";
const char * const DIFF_SELECTED = "Git.DiffSelectedFilesInLog";
const char * const SUBMIT_MIMETYPE = "application/vnd.nokia.text.git.submit";
const char * const GIT_BINARY = "git";
......
......@@ -71,7 +71,7 @@ namespace Constants {
const char * const HELPVIEWER_KIND = "Qt Help Viewer";
const char * const C_MODE_HELP = "Help Mode";
const int P_MODE_HELP = 70;
const char * const ID_MODE_HELP = "Help.HelpMode";
const char * const ID_MODE_HELP = "Help";
}
class HELP_EXPORT HelpManager : public QObject
......
......@@ -42,8 +42,8 @@ const char * const C_PERFORCEEDITOR = "Perforce Editor";
const char * const PERFORCEEDITOR_KIND = "Perforce Editor";
const char * const C_PERFORCESUBMITEDITOR = "Perforce Submit Editor";
const char * const PERFORCESUBMITEDITOR_KIND = "Perforce Submit Editor";
const char * const SUBMIT_CURRENT = "Nokia.Perforce.SubmitCurrentLog";
const char * const DIFF_SELECTED = "Nokia.Perforce.DiffSelectedFilesInLog";
const char * const SUBMIT_CURRENT = "Perforce.SubmitCurrentLog";
const char * const DIFF_SELECTED = "Perforce.DiffSelectedFilesInLog";
const char * const SUBMIT_MIMETYPE = "application/vnd.nokia.text.p4.submit";
enum { debug = 0 };
} // Internal
......
......@@ -38,7 +38,7 @@ namespace ProjectExplorer {
namespace Constants {
// modes and their priorities
const char * const MODE_SESSION = "ProjectExplorer.Mode.Session";
const char * const MODE_SESSION = "Project";
const int P_MODE_SESSION = 85;
// actions
......
......@@ -38,8 +38,8 @@ namespace QtScriptEditor {
namespace Constants {
const char * const M_CONTEXT = "Qt Script Editor.ContextMenu";
const char * const RUN = "Qt Script Editor.Run";
const char * const RUN_SEP = "Qt Script Editor.Run.Separator";
const char * const RUN = "QtScriptEditor.Run";
const char * const RUN_SEP = "QtScriptEditor.Run.Separator";
const char * const C_QTSCRIPTEDITOR = "Qt Script Editor";
const char * const C_QTSCRIPTEDITOR_MIMETYPE = "application/javascript";
......
......@@ -91,14 +91,14 @@ bool QuickOpenPlugin::initialize(const QStringList &, QString *)
m_quickOpenToolWindow = new QuickOpenToolWindow(this);
m_quickOpenToolWindow->setEnabled(false);
Core::BaseView *view = new Core::BaseView;
view->setUniqueViewName("QuickOpen.ToolWindow");
view->setUniqueViewName("QuickOpen");
view->setWidget(m_quickOpenToolWindow);
view->setContext(QList<int>() << core->uniqueIDManager()
->uniqueIdentifier(QLatin1String("QuickOpenToolWindow")));
view->setDefaultPosition(Core::IView::First);
addAutoReleasedObject(view);
const QString actionId = QLatin1String("QtCreator.View.QuickOpen.ToolWindow");
const QString actionId = QLatin1String("QtCreator.QuickOpen");
QAction *action = new QAction(m_quickOpenToolWindow->windowIcon(), m_quickOpenToolWindow->windowTitle(), this);
Core::Command *cmd = core->actionManager()->registerAction(action, actionId, QList<int>() << Core::Constants::C_GLOBAL_ID);
cmd->setDefaultKeySequence(QKeySequence("Ctrl+K"));
......
......@@ -82,7 +82,7 @@ bool SnippetsPlugin::initialize(const QStringList &arguments, QString *)
m_snippetWnd = new SnippetsWindow();
Core::BaseView *view = new Core::BaseView;
view->setUniqueViewName("Snippets.SnippetsTree");
view->setUniqueViewName("Snippets");
view->setWidget(m_snippetWnd);
view->setContext(QList<int>()
<< core->uniqueIDManager()->uniqueIdentifier(QLatin1String("Snippets Window"))
......
......@@ -42,8 +42,8 @@ const char * const SUBVERSIONEDITOR = "Subversion Editor";
const char * const SUBVERSIONEDITOR_KIND = "Subversion Editor";
const char * const SUBVERSIONCOMMITEDITOR = "Subversion Commit Editor";
const char * const SUBVERSIONCOMMITEDITOR_KIND = "Subversion Commit Editor";
const char * const SUBMIT_CURRENT = "Nokia.Subversion.SubmitCurrentLog";
const char * const DIFF_SELECTED = "Nokia.Subversion.DiffSelectedFilesInLog";
const char * const SUBMIT_CURRENT = "Subversion.SubmitCurrentLog";
const char * const DIFF_SELECTED = "Subversion.DiffSelectedFilesInLog";
enum { debug = 0 };
} // namespace Constants
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment