Commit Graph

63 Commits

Author SHA1 Message Date
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
Friedemann Kleint
e93410897c Fixed warnings about removing null-objects from Plugin-Manager. 2009-07-31 17:11:42 +02:00
Erik Verbruggen
b54517ad0f Pimpin' the UI a bit. 2009-07-31 12:59:41 +02:00
Maurice Kalinowski
5c663082cc add pastebin.ca support for codepaster
- cannot list and does not need any preferences, as there is
  only one server
2009-07-31 12:13:37 +02:00
Maurice Kalinowski
435207a223 ensure editor is visible
after fetching a codesnippet, we should switch to edit mode
and open the editor
2009-07-31 11:24:12 +02:00
Maurice Kalinowski
6a91b63af9 move editor creation to plugin
each protocol needed to create the editor on their own.
Instead emit fetchDone and let the plugin instantiate it for
every protocol
2009-07-31 11:17:57 +02:00
Maurice Kalinowski
3629e091c4 refactor and add support for pastebin.com
- created protocol class as basis for different paste servers
- removed custom classes and replaced functionality with
  simple QHttp* usage
- removed poster and fetcher classes copied from cpaster
  application. It not getting updated anyways in creator
- Known issue: Listing does not update, when user changes
  protocol
- TODO: add pastebin.ca support. Code is done already, just
  needs to be placed inside plugin.
2009-07-27 20:55:19 +02:00
Alessandro Portale
d3f9757916 Removing some unused semicolons after Q_UNUSED
There were both variants, with and without extra semicolon.
2009-07-13 17:35:17 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
Oswald Buddenhagen
d2a8449bea ifdef Q_?S_* cleanup
- clear up some Q_OS_LINUX vs. Q_OS_UNIX
- clear up Q_WS_* vs. Q_OS_* (relatively theoretical exercise)
- use proper #if-#else cascades instead of free-standing #ifs
2009-06-03 20:54:59 +02:00
Thorbjørn Lindeijer
1e4620a655 Fixed two dialogs to use the main window as parent
Setting a parent makes sure the dialog is correctly centered and shares
the taskbar entry.
2009-05-12 09:59:56 +02:00
Oswald Buddenhagen
6d5eeb7afb add missing tr()s, etc., add some //: comments 2009-04-20 16:51:10 +02:00
con
bcf559cd50 Fixes: - Don't use multiple key shortcuts on Mac
Task:     - 244529
Details:  - It just doesn't work in Mac menus (at least not with Qt, but
I suspect it's some Mac thingy), so just don't do it.
2009-03-05 15:28:20 +01:00
hjk
12018c89d6 Fixes: simplify ProjectExplorerPlugin::instance() access 2009-03-04 09:38:01 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
hjk
1c7e4182ac Fixes: rename some commands to get something like a 'naming scheme'
in place
RevBy:   con
2009-02-20 17:22:16 +01:00
lowinu
ae7864f9c0 Fixes: cpaster plugin options
RevBy:    andre
Details:  - the settings have not been taken into respect so far.
2009-02-13 14:09:48 +01:00
hjk
f6db0ab343 Fixes: cpaster: fix potential double deletion test
Task:     180315
    RevBy:
    Details:
2009-02-04 18:03:50 +01:00