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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
This commit is contained in:
Eike Ziller
2013-09-27 10:44:32 +02:00
parent 19c735a491 a12a9f491c
commit 63ff745213
133 changed files with 1386 additions and 1326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
src/plugins/coreplugin/icore.cpp
View File

@@ -37,7 +37,7 @@
/*!
\namespace Core
\brief The Core namespace contains all classes that make up the Core plugin
which constitute the basic functionality of Qt Creator.
which constitute the basic functionality of \QC.
*/
/*!
@@ -62,11 +62,12 @@
const QList<IWizard *> &wizards,
const QString &defaultLocation = QString(),
const QVariantMap &extraVariables = QVariantMap())
\brief Opens a dialog where the user can choose from a set of \a wizards that
create new files/classes/projects.
The \a title argument is shown as the dialogs title. The path where the
files will be created (if the user doesn't change it) is set
Opens a dialog where the user can choose from a set of \a wizards that
create new files, classes, or projects.
The \a title argument is shown as the dialog title. The path where the
files will be created (if the user does not change it) is set
in \a defaultLocation. It defaults to the path of the file manager's
current file.
@@ -75,8 +76,9 @@
/*!
\fn bool ICore::showOptionsDialog(Id group, Id page, QWidget *parent = 0);
\brief Opens the application options/preferences dialog with preselected
\a page in a specified \a group.
Opens the application \gui Options (or \gui Preferences) dialog with preselected
\a page in the specified \a group.
The arguments refer to the string IDs of the corresponding IOptionsPage.
*/
@@ -88,45 +90,33 @@
Id settingsId = Id(),
QWidget *parent = 0)
\brief Show a warning message with a button that opens a settings page.
Shows a warning message with a button that opens a settings page.
Should be used to display configuration errors and point users to the setting.
Returns true if the settings dialog was accepted.
Returns \c true if the settings dialog was accepted.
*/
/*!
\fn ProgressManager *ICore::progressManager()
\brief Returns the application's progress manager.
\fn MimeDatabase *ICore::mimeDatabase()
Use the progress manager to register a concurrent task to
show a progress bar the way Qt Creator does it.
*/
/*!
\fn VcsManager *ICore::vcsManager()
\brief Returns the application's vcs manager.
The vcs manager can be used to e.g. retrieve information about
the version control system used for a directory on hard disk.
The actual functionality for a specific version control system
must be implemented in a IVersionControl object and registered in
the plugin manager's object pool.
Uses the MIME database to manage MIME types.
*/
/*!
\fn QSettings *ICore::settings(QSettings::Scope scope = QSettings::UserScope)
\brief Returns the application's main settings object.
Returns the application's main settings object.
You can use it to retrieve or set application wide settings
(in contrast to session or project specific settings).
If \a scope is QSettings::UserScope (the default), the
If \a scope is \c QSettings::UserScope (the default), the
users settings will be read from the users settings, with
a fallback to global settings provided with Qt Creator.
a fallback to global settings provided with \QC.
If \a scope is QSettings::SystemScope, only the system settings
shipped with the current version of Qt Creator will be read. This
If \a scope is \c QSettings::SystemScope, only the system settings
shipped with the current version of \QC will be read. This
functionality exists for internal purposes only.
\see settingsDatabase()
@@ -134,7 +124,8 @@
/*!
\fn SettingsDatabase *ICore::settingsDatabase()
\brief Returns the application's settings database.
Returns the application's settings database.
The settings database is meant as an alternative to the regular settings
object. It is more suitable for storing large amounts of data. The settings
@@ -145,7 +136,8 @@
/*!
\fn QPrinter *ICore::printer()
\brief Returns the application's printer object.
Returns the application's printer object.
Always use this printer object for printing, so the different parts of the
application re-use its settings.
@@ -153,33 +145,38 @@
/*!
\fn QString ICore::resourcePath()
\brief Returns the absolute path that is used for resources like
Returns the absolute path that is used for resources like
project templates and the debugger macros.
This abstraction is needed to avoid platform-specific code all over
the place, since e.g. on Mac the resources are part of the application bundle.
the place, since on Mac OS X, for example, the resources are part of the
application bundle.
*/
/*!
\fn QString ICore::userResourcePath()
\brief Returns the absolute path in the users directory that is used for
Returns the absolute path in the users directory that is used for
resources like project templates.
Use this method for finding the place for resources that the user may
write to, e.g. to allow for custom palettes or templates.
write to, for example, to allow for custom palettes or templates.
*/
/*!
\fn QWidget *ICore::mainWindow()
\brief Returns the main application window.
For use as dialog parent etc.
Returns the main application window.
For use as dialog parent, and so on.
*/
/*!
\fn IContext *ICore::currentContextObject()
\brief Returns the context object of the current main context.
Returns the context object of the current main context.
\sa ICore::updateAdditionalContexts()
\sa ICore::addContextObject()
@@ -187,7 +184,7 @@
/*!
\fn void ICore::updateAdditionalContexts(const Context &remove, const Context &add)
\brief Change the currently active additional contexts.
Changes the currently active additional contexts.
Removes the list of additional contexts specified by \a remove and adds the
list of additional contexts specified by \a add.
@@ -197,7 +194,7 @@
/*!
\fn bool ICore::hasContext(int context) const
\brief Returns if the given \a context is currently one of the active contexts.
Returns whether the given \a context is currently one of the active contexts.
\sa ICore::updateAdditionalContexts()
\sa ICore::addContextObject()
@@ -205,7 +202,7 @@
/*!
\fn void ICore::addContextObject(IContext *context)
\brief Registers an additional \a context object.
Registers an additional \a context object.
After registration this context object gets automatically the
current context object whenever its widget gets focus.
@@ -217,7 +214,7 @@
/*!
\fn void ICore::removeContextObject(IContext *context)
\brief Unregisters a \a context object from the list of know contexts.
Unregisters a \a context object from the list of know contexts.
\sa ICore::addContextObject()
\sa ICore::updateAdditionalContexts()
@@ -227,9 +224,9 @@
/*!
\fn void ICore::openFiles(const QStringList &fileNames, OpenFilesFlags flags = None)
\brief Open all files from a list of \a fileNames like it would be
done if they were given to Qt Creator on the command line, or
they were opened via \gui{File|Open}.
Opens all files from a list of \a fileNames like it would be
done if they were given to \QC on the command line, or
they were opened via \gui File > \gui Open.
*/
/*!
@@ -244,12 +241,12 @@
/*!
\fn void ICore::coreOpened()
\brief Emitted after all plugins have been loaded and the main window shown.
Indicates that all plugins have been loaded and the main window is shown.
*/
/*!
\fn void ICore::saveSettingsRequested()
\brief Emitted to signal that the user has requested that the global settings
Signals that the user has requested that the global settings
should be saved to disk.
At the moment that happens when the application is closed, and on \gui{Save All}.
@@ -257,29 +254,30 @@
/*!
\fn void ICore::optionsDialogRequested()
\brief Signal that allows plugins to perform actions just before the \gui{Tools|Options}
Enables plugins to perform actions just before the \gui Tools > \gui Options
dialog is shown.
*/
/*!
\fn void ICore::coreAboutToClose()
\brief Plugins can do some pre-end-of-life actions when they get this signal.
Enables plugins to perform some pre-end-of-life actions.
The application is guaranteed to shut down after this signal is emitted.
It's there as an addition to the usual plugin lifecycle methods, namely
IPlugin::aboutToShutdown(), just for convenience.
It is there as an addition to the usual plugin lifecycle methods, namely
\c IPlugin::aboutToShutdown(), just for convenience.
*/
/*!
\fn void ICore::contextAboutToChange(const QList<Core::IContext *> &context)
\brief Sent just before a new \a context becomes the current context
(meaning that itself or one of its child widgets got focus).
Indicates that a new \a context will shortly become the current context
(meaning that its widget got focus).
*/
/*!
\fn void ICore::contextChanged(Core::IContext *context, const Core::Context &additionalContexts)
\brief Sent just after a new \a context became the current context
(meaning that its widget got focus), or if the additional context ids changed.
Indicates that a new \a context just became the current context
(meaning that its widget got focus), or that the additional context ids
specified by \a additionalContexts changed.
*/
#include "mainwindow.h"