feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,765 Commits 108 Branches 368 Tags
a4b4728267ce81880d0fbde6b8c559e3a762d091
Commit Graph

337 Commits

Author SHA1 Message Date
hjk
6681d3edee vcs: s/VCS/Vcs/ 
According to style guide.

Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-01-09 10:55:41 +01:00
Yuchen Deng
73138f633f Git: Figure out codec for amend commit 
Change-Id: Ib8fddbb8343f92cf74b99117999ec033b1785404
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-14 10:25:43 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
hjk
82f5573626 more Id type fixes 
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 15:57:09 +01:00
Robert Loehning
d0c2cf93e1 Typo fixes 
Change-Id: Id73f96267e34e7c85ee74dd8264c6c350e095ce9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-03 20:45:55 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Tobias Hunger
494fbdb0d2 Git: Do the right thing when commiting 
Do the right thing when commiting in git. This allows
staged files to be commited without additional changes, etc.

Change-Id: Ib04c91cf9c105c4a2bbe013926112d6d5d3bade6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-31 11:49:39 +01:00
Yuchen Deng
2ab22fec74 Git: Add branches to locator 
Change-Id: I02803ed9f131ded8748c526e88ca9825944e7057
Merge-request: 408
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-19 12:27:04 +02:00
Tobias Hunger
433534adb2 Git: Fix string 
Make Blame look like the other file-based options.

Change-Id: I09b8ee9fff2ad3f564daa3922dccce3c5136e4a0
Reviewed-on: http://codereview.qt-project.org/6174
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-06 17:39:36 +02:00
Tobias Hunger
c6a9de7252 Git: Save settings 
VCSBaseClient handles saving of settings for us, but we do not
use that yet, so we have to do that ourselves:-(

Change-Id: I731d01d429497581fad814effd68bbd784e05fe8
Reviewed-on: http://codereview.qt-project.org/6080
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 17:34:46 +02:00
Tobias Hunger
363b230abf git: Reuse more code from vcsbase 
Change-Id: I873d2caa2cead5c339eec887a5fcdef4d33bec24
Reviewed-on: http://codereview.qt-project.org/6071
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 16:03:32 +02:00
Tobias Hunger
35615426d1 Git: Remove debug code 
Change-Id: Icf23c7c3c1c8858d281434f519accc96984cdd09
Reviewed-on: http://codereview.qt-project.org/6069
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 16:01:47 +02:00
hjk
66ab323eb3 use Core::Id for IEditorFactory::id 
Change-Id: Iefd67a0461d9016b8ba0f3371df7ec6d42e188c5
Reviewed-on: http://codereview.qt-project.org/4321
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-08 17:40:53 +02:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone 
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 18:04:55 +02:00
Tobias Hunger
7d573006a9 Git: fetch from remote 
Task-number: QTCREATORBUG-4942
Change-Id: Ifd8586e110379a621c43233fe9b912bd82f7f28a
Reviewed-on: http://codereview.qt.nokia.com/218
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-07 11:32:44 +02:00
Tobias Hunger
7f33ef02e7 VCS: Do not hide virtual methods 
Change-Id: I818eb8246f27b023e35155d50a8d08548660f709
Reviewed-on: http://codereview.qt.nokia.com/350
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-07 10:49:20 +02:00
Tobias Hunger
8966c27207 Git: Add dialog to configure branches 2011-05-12 17:32:56 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
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
Oswald Buddenhagen
45c9cf7a12 add/unify i/o error handling 
lots of use of Utils::FileSaver and Utils::FileReader

Task-number: QTCREATORBUG-1619
 2011-04-18 14:10:14 +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
c07e213399 VCS: Do not claim to support any operation if unconfigured 
Make sure none of the VCS systems claims it does support any
VCS operation while unconfigured. This stops the specific
VCS from showing up in wizards, etc. till they can actually
be used.
 2011-04-15 16:06:38 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02: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
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
Tobias Hunger
2f07660e5b Git: Do not accept invalid commits 
Do not offer to commit in the dialog opened when closing the
commit editor when the commit is not containing all the required
information.
 2010-11-23 16:01:47 +01:00
Tobias Hunger
f84c228568 Git: Add options to diff editor 2010-11-22 12:03:07 +01:00
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup. 
Clean icore.h.
 2010-11-02 16:53:56 +01:00
Tobias Hunger
11fb6d1c52 Git: Rename "reset" back to "undo uncomitted changes" 
Rename "Reset..." back to "Undo Uncommitted Changes..." to be more
in line with git gui as well as the file-based operations.

Reviewed-by: Leena Miettinen
 2010-10-15 18:02:47 +02:00
Tobias Hunger
e78b8cf4cc VCS: String update 
String update as suggested by Leena.
 2010-10-08 14:30:33 +02:00
Tobias Hunger
eb9b15be8c Git: Clean up the menu of the git plugin 2010-10-08 14:30:32 +02:00
Tobias Hunger
9293ecabc3 Git: Show native pathes to repositories 2010-10-08 14:30:31 +02:00
Leena Miettinen
224b43034c UI text - fix capitalization 2010-09-17 11:14:38 +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
Robert Loehning
b719bbda42 VCS[git]: Added git fetch 2010-09-01 13:09:20 +02:00
Friedemann Kleint
0f0c17111d VCS[git]: Add menu option for git amend. 
Task-number: QTCREATORBUG-1642
 2010-08-23 12:18:01 +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
7e739985b2 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
 2010-08-06 10:46:50 +02:00
Robert Loehning
e2347b3d92 git: Added an option to undo unstaged changes only 2010-07-30 19:39:55 +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
6793f1f962 VCS[git]: Add arguments setting for gitk, add to locator. 
Task-number: QTCREATORBUG-1577
 2010-06-16 09:05:50 +02:00
Friedemann Kleint
7dc2760f0e VCS[git]: Add menu option to launch gitk. 
Task-number: QTCREATORBUG-1577
 2010-06-08 15:55:12 +02:00
Friedemann Kleint
1c69b97ca6 VCS[git]: Make push/pull synchronous commands. 
..for timeout handling to take effect. Also,
log window will update continuously.

Task-number: QTCREATORBUG-777
 2010-05-25 11:48:53 +02:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules. 
Reviewed-by: ossi
 2010-05-14 15:53:56 +02:00