feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,741 Commits 108 Branches 368 Tags
f8ef0fac136d48e4ddc1df260bab4344ca812bc8
Commit Graph

47 Commits

Author SHA1 Message Date
Orgad Shaneh
e237a84339 VCS: Added a shortcut for Diff Selected Files 
Merge-request: 289
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-05-03 16:00:52 +02:00
cerf
326ea080c5 vcsbase: VCSBaseClient::log() now accepts extra options 
Merge-request: 323
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-05-03 14:44:38 +02:00
Oswald Buddenhagen
469199e7a5 abort commit if commit message cannot be saved 2011-04-18 14:10:13 +02:00
Oswald Buddenhagen
e35fe2a770 file manager: introduce saveFile() and remove blockFileChange() & unblockFileChange() 
this replaces the ever-repeating idiom block/save/unblock with a single
call.
 2011-04-18 14:10:12 +02:00
Tobias Hunger
bcd8740a6e VCS: Notify project wizard about config changes 
... and have the project wizard update the available VCS.

Task-number: QTCREATORBUG-4423
 2011-04-15 17:45:34 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Oswald Buddenhagen
ca2fecb3ea use an assert for a clearly internal error 
there are no external reasons why this could fail ...

Reviewed-by: dt
 2011-03-11 15:33:58 +01:00
Friedemann Kleint
273b1da2fc Bazaar: Fixup, set unique action id. 
Duplicate ids in Mercurial, Bazaar.
 2011-02-28 17:29:21 +01:00
cerf
6c1dd96f12 Refactored the Mercurial plugin 
Refactored the mercurial plugin which led to new vcsbase common
tools (VCSBaseClient, VCSBaseClientSettings and VCSJobRunner)

Merge-request: 229
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-02-28 16:08:15 +01:00
hjk
f576ad9f2c texteditor: merge ITextEditable into ITextEditor 
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
 2011-02-22 11:23:53 +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
hjk
5bce99b9e5 Replace BaseMode convenience class by individual implementation. 
Using the convienience class does not really save code and adds another
needless level in the hierarchy. This affects the three remaining BaseMode
users: Help, ProjectExplorer and HelloWorld.
 2010-12-07 16:45:58 +01:00
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup. 
Clean icore.h.
 2010-11-02 16:53:56 +01:00
Leena Miettinen
e779886ab0 UI text - fix capitalization 2010-09-21 17:19:50 +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
dt
bde1ebaaea Remove EditorManager::ensureEditorManagerVisible() 
The function always switched to Edit Mode, which was the cause for
several bugs. Since openEditor() already does switch to the right mode,
the function is not really needed.

The following actions now respect the prefered mode of the editor:
"f file"-locator
The Open Documents list
Editor history navigation
 2010-09-06 13:56:53 +02:00
Kai Koehne
ef1e52dfd1 Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline 
Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/debugger/gdb/attachgdbadapter.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
	src/plugins/mercurial/mercurialjobrunner.h
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qmljseditor/qmljseditor.pro
	src/plugins/qmljseditor/qmljseditorplugin.cpp
	src/plugins/qmljseditor/qmljseditorplugin.h
	src/plugins/qmljseditor/qmljspreviewrunner.cpp
	src/plugins/qmljseditor/qmljspreviewrunner.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
	src/plugins/qt4projectmanager/qt4projectmanager.pro
	src/plugins/qt4projectmanager/qtversionmanager.h
	src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
	src/plugins/qt4projectmanager/wizards/targetsetuppage.h
 2010-08-23 16:00:24 +02:00
Friedemann Kleint
abaf2e9f21 VCS[hg]: Mercurial forgets working directory from commit #2 on. 
Do not clear variable containing submit repository. Fix potential
crash (closing diff editor before command termination),
use proper temp file name. Pass --non-interactive to "commit"
to suppress editors being launched (despite -l).

Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Task-number: QTCREATORBUG-1503
 2010-08-19 16:26:47 +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
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
Friedemann Kleint
7b60fd1b89 VCS[Mercurial]: Make push/pull synchronous commands. 
..for timeout handling to take effect. Also,
log window will update continuously.

Task-number: QTCREATORBUG-777
 2010-05-25 12:24:18 +02:00
Friedemann Kleint
aa0926901b VCS: Initially enable menus. 
Fix breakage introduced by:
5923733889
 2010-04-26 09:12:58 +02:00
dt
5f2ae2af47 Less includes 2010-04-07 13:51:07 +02:00
Friedemann Kleint
80858f810b VCS[Mercurial]: Fix initialization order. 2010-03-19 18:07:40 +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
Friedemann Kleint
4b76d828f7 CommandLocator: Sort filter by priority and id, fix hg filter enabling. 2010-02-15 13:55:11 +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
c07e1f7fc1 Mercurial: Fixed committing untracked files. 
by passing -A (plus security check).
 2010-01-11 15:43:23 +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
Friedemann Kleint
da6463ee2f VCS[Mercurial]: Implement annotate previous as for git. 
Task-number:   QTCREATORBUG-503
 2010-01-08 09:44:07 +01:00
Friedemann Kleint
8bb87fcda4 VCS[Mercurial]: Single file log annotation. 
Task-number: QTCREATORBUG-503
 2010-01-07 17:29:58 +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
de49067803 Mercurial: Adapt to 8097879d6d 
Make use of VCS base class.
 2009-12-08 14:28:00 +01:00
Friedemann Kleint
5ec1c36c23 Mercurial: Emit version control changed() signals correctly. 
Add a QVariant cookie to HgTask to be emitted on successful
execution, wired to IVersionControl.
 2009-12-04 12:58:01 +01:00
Friedemann Kleint
b0e1fdbfc4 Mercurial: Save resources, polishing. 
Start the jobrunner on demand, save options only if changed,
give it the structure used elsewhere in the VCS plugins. Remove
last traces of the cmd /c hack.
 2009-11-06 12:32:38 +01:00
Friedemann Kleint
d570b05bec Mercurial: Work on Windows using Tortoise Hg, polishing. 
Do not use "cmd /c hg" on Windows as this will fail randomly
depending on arguments with blanks, such as "-U 8". Output log
messages about synchronous commands, format author correctly,
label menus correctly.
 2009-11-05 12:45:02 +01:00
Friedemann Kleint
db9a967f75 Mercurial: Compile with QT_NO_CAST_FROM_ASCII, const-correctness. 2009-11-03 16:38:39 +01:00
Friedemann Kleint
5e8d179a5d Mercurial: Compile windows, use common output window. 
Polish: Canconical slots, const-correctness, some QLatin1Strings/tr,
 2009-11-03 14:21:48 +01:00
dt
cb5bc3ba16 Compile 2009-11-02 19:52:28 +01:00
dt
9c5271470c Adding License to mecurial plugin 2009-11-02 18:50:06 +01:00
Brian McGillion
989e1b5acf Mercurial plugin, merge request with suggested fixes. 2009-09-21 12:29:31 +03:00