Commit Graph

56 Commits

Author SHA1 Message Date
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1'
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup.
Clean icore.h.
2010-11-02 16:53:56 +01:00
Tobias Hunger
e78b8cf4cc VCS: String update
String update as suggested by Leena.
2010-10-08 14:30:33 +02:00
dt
08ccda5862 EditorManager: Change openEditor/activateEditor to not do mode switching
Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.

That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode
2010-09-14 15:23:11 +02:00
hjk
ff0ac20a42 coreplugin: use Core::Id is some places 2010-09-10 17:22:28 +02:00
Friedemann Kleint
817d4370d5 VCS: Add 'Check/Uncheck' all context menu to submit file list.
Update 'Commit' button to show number of files to be committed.
Task-number: QTCREATORBUG-2090
2010-08-19 10:04:21 +02:00
Friedemann Kleint
cc533b40c8 VCS[CVS]: Complement menu options, support 'edit'.
Add missing menu options for project/repository actions. Add support for
'edit' (current file) and 'unedit' (current file/repository, with
prompt).
Note: Unediting modified files will only work with cvsnt, since it uses
the '-y' option to force a 'yes' to CVS asking to revert changes.
Implement IVersionControl::vcsOpen() by using 'edit', causing it to
prompt for read-only as it does for Perforce.

Task-number: QTCREATORBUG-1971
Task-number: QTCREATORBUG-1864
2010-08-06 16:12:31 +02:00
Friedemann Kleint
c3eb4b6611 VCS: Windows slash display fixing spree.
Task-number: QTCREATORBUG-1795
2010-07-05 09:52:32 +02:00
hjk
2f5f358ff4 Core::Context: compile hot fix for Windows. 2010-06-25 17:38:25 +02:00
hjk
c7e8b51d37 core: use a class derived from QList<int> instead of a QList<int> for Core::Context
A mostly mechanical change.

Reviewed-By: con
2010-06-25 12:58:07 +02:00
con
7f733b1545 Merge remote branch 'origin/2.0'
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmlinspector/QmlInspector.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
2010-06-08 10:39:45 +02:00
Friedemann Kleint
c745155191 VCS/Diff editors: Set readonly attributes correctly.
Make VCS-generated editors read-only, enable editing
when opening a patch.
Make VCS-Editor non-read-only by default, add setter
for "Forced read-only" that makes it a temporary,
read-only file.

Task-number: QTCREATORBUG-1528
Reviewed-by: Thorbjorn Lindeijer <thorbjorn.lindeijer@nokia.com>
2010-06-07 14:53:28 +02:00
Friedemann Kleint
5364f5c152 VCS: Show message box on timeouts/Add SSH prompt.
- Use message boxes on timeouts.
- Add a configuration for a graphical SSH password prompt binary with
defaults
- Launch commands that require authentification with no terminal on UNIX
and environment variable SSH_ASKPASS set accordingly.
- First attempt at introduce a common function to synchronously run VCS
commands in base plugin with flags.
- Use standard execution log entries in all VCS plugins (outputwindow).
2010-05-21 17:46:00 +02:00
con
e327467a03 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
2010-05-21 16:04:27 +02:00
Friedemann Kleint
c3bab51991 VCS[CVS]: Fix crash when describing a change. 2010-05-21 14:19:12 +02:00
Friedemann Kleint
7003b82e2b Version control: Improve detection.
Merge managesDirectory() and findTopLevelForDirectory()
into one giving managesDirectory() an optional topLevel
parameter. This removes the need to go up the directory
hierarchy twice when checking for Merurial or git and also
saves some checks for CVS/Subversion.
VCSManager: Check cache in reverse order starting out with
the full path first to improve handling of nested repositories.
Rubber-stamped-by: con
Acked-by: dt
2010-05-20 16:24:56 +02:00
Friedemann Kleint
6383643d32 VCS[Subversion/Perforce]: Fix VCSManager caching (Windows).
Ensure clean paths are returned by
IVersionControl::findTopLevelForDirectory() as otherwise caching
of VCSManager breaks (Windows) and commands are executed all over
again. Fix display in SVN/CVS.

Acked-by: con
2010-05-20 14:52:08 +02:00
Friedemann Kleint
aa0926901b VCS: Initially enable menus.
Fix breakage introduced by:
5923733889
2010-04-26 09:12:58 +02:00
Friedemann Kleint
751d7d043c VCS: Add 'Annotate' context menu entry to build issues task window. 2010-03-19 17:22:53 +01:00
Friedemann Kleint
bbcacaf59f Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4. 2010-03-18 10:59:06 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
dt
75545a2bf0 Fix FileManager to correctly handle multiple IFile's for the same file
And port the Qt4ProjectManager to use that API for synchronization
between editors and the .pro file tree.

Reviewed-By: con
2010-02-17 16:51:02 +01:00
Friedemann Kleint
b03ab1d704 Add command locator.
Make it possible to trigger actions from the locator bar by
registering an instance of Locator::CommandLocator by prefix.
Currently used for VCS systems.

Acked-by: con
Initial-patch-by: Roberto Raggi <roberto.raggi@nokia.com>
2010-02-12 16:03:08 +01:00
Friedemann Kleint
d5271a086d VCS[hg, git]: Add support for repository creation.
Add repository creation operation to IVersionControl, implement for hg
and git, add convenience slot with prompts to VCSBasePlugin.
Add respective menu options and make menus are visible in case no VCS is
active.
Change project wizards extension page to list VCS that are capable of
repository creation in a QComboBox in case the directory is not managed
by another VCS (in which case it lists that one for operation 'add').
On that occasion, polish the Project selection to use a QComboBox as
well and add some smartness to find the most suitable project to add via
path matching.
2010-01-12 16:45:21 +01:00
Friedemann Kleint
834a47b1b3 VCS[p4,cvs,svn]: Reorder menu options.
Add "revert all" to cvs,svn.
2010-01-11 17:17:16 +01:00
Friedemann Kleint
95da419067 VCS[vcs,p4,svn,hg]: Use VCManager for delete operations.
...and its dialog prompt consistently. Rename method and
introduce overload taking IVersionControl. Add convenience slot to
VCSBasePlugin.
2010-01-11 15:43:23 +01:00
Tobias Hunger
cacdc6c736 Add display name to VCS plugin structs
Reviewed-by: Friedemann Kleint
2010-01-08 11:51:53 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
Friedemann Kleint
b4969672d3 VCS[Perforce/SVN/CVS]: Add "Annotate" to single file logs.
...over change numbers. Add missing "Log project/repository"
actions and log count limits.
Task-number: QTCREATORBUG-503
2010-01-07 11:33:30 +01:00
Friedemann Kleint
7c0f4e8f50 VCS[SVN, CVS, Perforce]: Implement "Annotate Previous" context menu.
in annotation editor, including base infrastructure in
VCSBaseEditor. Pass signals of VCSBaseEditor to opaque
VCSBaseEditable (IEditor) for convenience.

Task-number: QTCREATORBUG-503
2010-01-06 17:24:40 +01:00
Friedemann Kleint
dde46ec1eb VCS: Introduce configureable timeout to vcs,svn, p4.
as already present for git, mercurial.

Task-number: QTCREATORBUG-475
2009-12-14 12:45:45 +01:00
Friedemann Kleint
0af3c1f13a VCS Submit: Run check script in repository, do not front-trim message.
Make checkscript a bit more verbose.

Task-number: QTCREATORBUG-451
Task-number: QTCREATORBUG-422
2009-12-14 10:56:50 +01:00
Friedemann Kleint
7ce3683143 CVS: Use new VCSBasePlugin-class.
Make the diff-base directory a property of VCSBaseEditor and use
everywhere.
2009-12-09 12:41:10 +01:00
Friedemann Kleint
8097879d6d VCS: Introduce Base class for VCS plugins, use in git.
Fixes:
- Cannot diff a file that does not belong to a project
- Cannot commit when a temporary diff/log view is open
  due to the current file pointing to a temporary directory
- git's project-related actions not passing the correct
  relative path.

Implementation:
- Centralize code to listen for Qt Creator's relevant state changes
  in VCSBasePlugin, dispatching the changes to the instances affected.
  (avoiding multiple invocations of searches/QFileInfo on current).
- Do the same for the corelistener catching closing SubmitEditors.
- Introduce VCSBasePluginState representing the relevant state
  (current file/project).
- Call git with working directory set and relative arguments
- Remove setEnabled/isEnabled() logic of IVersionControl
- Pass toplevel from VCSManager to avoid duplicate searches.
2009-12-08 14:26:41 +01:00
Friedemann Kleint
7cbbada3f0 Wizards: Improve list of files displayed.
Extract the common root directory and display in separate
line. Use the routine from
the cvs plugin for that, moving it to stringutils.h.
2009-11-25 12:34:56 +01:00
Friedemann Kleint
8335a06ed4 Code model: Update on changes from the versioning system.
Add changed signals to IVersionControl and
VCSManager and wire them to the update methods. Add a menu action for
manually updating. Improved version of reverted
7aa2411693.

Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2009-11-11 14:32:54 +01:00
con
e4b1a25dd2 Revert "Code model: Update on changes from the versioning system."
This reverts commit 7aa2411693.
It breaks the code model updates completely. So reverting this change
until we have the right thing.

Reviewed-by: Roberto Raggi
2009-11-10 18:19:37 +01:00
Friedemann Kleint
7aa2411693 Code model: Update on changes from the versioning system.
Add state logic to CppCodeModelManagerInterface, making it aware whether
an indexer is running, protect the update methods from another
invocation while running. Add changed signals to IVersionControl and
VCSManager and wire them to the update methods. Add a menu action for
manually updating.

Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: con <qtc-committer@nokia.com>
2009-11-09 15:57:56 +01:00
con
fe9d0bf3c5 Enable multi key shortcuts on the Mac.
Since that was fixed in Qt.
2009-10-09 13:33:56 +02:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
2009-10-05 11:06:05 +02:00
Friedemann Kleint
01877b2c86 VCS: perforce, cvs, subversion: Goto current line in blame. 2009-10-01 17:32:26 +02:00
Friedemann Kleint
978cf4bda8 Rename IRunConfigurationRunner -> IRunControlFactory...
and ApplicationRunConfiguration to LocalApplicationRunConfiguration,
preparing remote debugging. Change the interface canRun() to be const,
run() to create() (since it does not run anything), use references
to the QSharedPointer<Foo>. Introduce d-Pointer and remove
unneeded headers from ProjectExplorerPlugin and add missing includes
everywhere.
2009-09-25 11:35:44 +02:00
Friedemann Kleint
5aa65b12f3 Version control: Do not keep lock on message file while committing.
Store the file name and do not keep the QTemporaryFile around,
which still seems to maintain some kind of lock on Windows although
it is closed.
2009-09-22 12:23:44 +02:00
Sergey Belyashov
770ec46a4e Fixed dublicated placeholder in message.
Merge-request: 1270
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2009-08-19 15:58:53 +02:00
Friedemann Kleint
7fb0de70e5 Tr glitches. 2009-08-17 15:50:43 +02:00
Friedemann Kleint
d7c5e2ed24 Version Control: Release the commit message temporary file.
... and add some logging to p4.
2009-08-17 09:49:56 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
188dbc3a43 API naming.
Reviewed-by: hjk
2009-08-12 10:41:30 +02:00