feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,648 Commits 108 Branches 368 Tags
d2f8baad67bb18d70f42ed2bc62ced778a46ff20
Commit Graph

80 Commits

Author SHA1 Message Date
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
hjk
4a21f0c3c8 Use new static ICore interface. 
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-24 18:48:47 +01:00
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
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
Friedemann Kleint
7cf99d2031 Codepaster: Add paste.kde.org. 
Change-Id: I285acf25ef13d8b1d7f0fa15e092f2e289ba2730
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-08 09:51:45 +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
hjk
7bfde77d7c s/error_message/errorMessage/g 
Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-21 13:06:52 +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
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Friedemann Kleint
5001aec7ce CodePaster: Provide service for soft-dependent plugins. 
Offer 'Paste' in VCSBase-Diff-Editor context menu.
Make new protocol the default one if user changes it
in view/paste dialogs.
 2011-04-21 15:21:50 +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
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
d78cc7201d Codepaster: Always enable send to codepaster menu action. 
As the dialog is editable, now.

Task-number: QTCREATORBUG-4060
 2011-03-16 10:28:16 +01:00
Oswald Buddenhagen
53298420ed don't create a temp file just for mime type detection 2011-03-09 22:24:13 +01:00
Friedemann Kleint
8ed8554cd4 CodePaster: Allow for editing snippets. 
Introduce separate plain text mode parallel to diff-chunk mode
using a stacked widget with a QPlainTextEdit.

Task-number: QTCREATORBUG-3859
 2011-02-28 15:44:01 +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
d8630e808b Update "paste snippet" action state depending on editor. 2011-02-04 14:44:47 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
793d1cba77 Start on some cleanup of EditorManager API and usage. 2011-01-05 10:41:34 +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
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
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
94babbd9ca CodePaster: Do better checking on hosts. 
Do an initial connection check on the host
(once per host). Add utility function to
NetworkProtocol, displaying connection check
message box.
Move the 'Paste' handling into the PasteView
dialog, such that the checking happens there
and the dialog stays open if something fails.

Task-number: QTCREATORBUG-2117
 2010-08-20 17:08:09 +02:00
Friedemann Kleint
3e31a770b5 CodePaster: Do not show popup about modified files on Windows. 
QTemporaryFile destructor causes a file changed signal due to it
holding on to it.

Reviewed-by: dt
Task-number: QTCREATORBUG-2083
 2010-08-18 15:39:54 +02:00
con
b3dbc4b4e4 Add flag to IPlugin::aboutToShutdown that allows asynchronous shutdown. 
If a plugin requests asyncronous shutdown, the shutdown sequence does
not continue to deleting the plugins before it has sent a
asynchronousShutdownFinished signal. During that time an event loop
is running.
 2010-07-13 15:25:21 +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
ca14299790 Rename IPlugin::shutdown --> IPlugin::aboutToShutdown 
Discussed-with: hjk
 2010-04-28 17:32:01 +02:00
Friedemann Kleint
f6bc879d2c CodePaster: Clean up configuration checks. 
Point user to settings if something goes wrong.
 2010-04-23 15:06:53 +02:00
Friedemann Kleint
646fc6f629 CPaster: Make Pastebin.Com default 
Change order of protocols and default accordingly.
 2010-04-06 14:40:33 +02:00
Friedemann Kleint
7c3caca03c CPaster: Introduce Proxy for QNetworkAccessManager 
that is shared and provides delayed creation.
Add "Paste clipboard" option.
 2010-03-30 12:05:24 +02:00
Friedemann Kleint
6903f13bf3 CPaster: Revive pastebin.com 
-Pass simplified type based on mimetype to paste for highlighting.
-Remove QHttp from CodePaster and pastebin.com in favour of QNetwork.
-Implement new pastebin.com protocol
-Implement listing via parsing the HTML-page for pastebin.com
 2010-03-29 14:54:25 +02:00
Friedemann Kleint
a4e3139688 Further love for Cpaster plugin 
Introduce capabilities flags for Protocols, disable controls
in Pasteview accordingly. Work towards making PasteBin.com
work.
 2010-03-26 17:42:23 +01:00
Friedemann Kleint
10809cdd99 Some love for the Cpaster plugin 
- Put classes into namespace.
- Fix settings not storing the selected protocol.
- Refactor settings by introducing standard handling.
- Create PasteSelectDialog class and fix list/refresh handling.
- No longer stuff the QListWidget into the protocol for listing, wire
via signals.
 2010-03-26 12:47:15 +01:00
Friedemann Kleint
7cf4bb7286 cpaster: Polish fetching snippets. 
Limit file name, default to ".txt" suffix if none
can be found. Print errors on empty snippets.
 2010-03-26 10:37:46 +01:00
Friedemann Kleint
de28b61cca VCS[git], CodePaster: Add support for applying patches. 
Modify CodePaster::fetch to do a mimetype detection on the
content, create a filename with the matching extension and
open that file.
This gives correct syntax highlighting  and makes "Save as"
more convenient. Keep the file around and delete on exit.

Modify patch mimetype with some content detection (higher priority
than C++).

Add a "current patch file" to the VCSBasePlugin::State. Add "Apply
patch" to git with whitespace fix.
 2010-03-25 16:23:37 +01:00
Friedemann Kleint
8a58a2fe71 Header cleaning mainly in find/cpaster. 2010-03-24 10:43:01 +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
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
f4943f3c2e Debugger/various plugins: Fix memory leaks. 
Reviewed-by: hjk <qtc-committer@nokia.com>
Reviewed-by: dt <qtc-committer@nokia.com>
 2009-11-04 17:11:35 +01:00
Daniel Molkentin
1bdb4d1953 Rename Category: CodePaster -> Code Pasting. 
Reviewed-By: TrustMe
 2009-10-15 16:41:05 +02:00
con
fe9d0bf3c5 Enable multi key shortcuts on the Mac. 
Since that was fixed in Qt.
 2009-10-09 13:33: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
hjk
89b3f8216e cpaster: compile fix for namespaced qt plus code cosmetics 
QListWidget forward declaration was not namespaced.
 2009-08-10 16:35:50 +02:00