Commit Graph

15886 Commits

Author SHA1 Message Date
Tobias Hunger
d74f90b511 Git: Bring iexisting editors to foreground
If we have some git operation in an editor already: Bring that to
the foreground.
2010-12-09 16:41:34 +01:00
Tobias Hunger
827800c2c4 Git: Allow for pretty format selection in git show
Allow for pretty format selection in git show.

Save selected value and default to "email".

Task-number: QTCREATORBUG-3341
2010-12-09 16:41:32 +01:00
Marco Bubke
1312a04221 QmlDesigner: Add component complete feature
This notifies the views if the instance has be really instanced.
2010-12-09 16:35:28 +01:00
Pawel Polanski
c04797fdce Certificate management should not throw exceptions when loading Dev Certificates
Task-number: QTCREATORBUG-3323
Reviewed-by: Tobias Hunger
2010-12-09 15:40:53 +01:00
Marco Bubke
abe68bf89d Add qtpromaker to gitignores 2010-12-09 13:46:09 +01:00
Marco Bubke
224f3eae57 QmlDesigner.NodeInstances: Revert to base state for every state change
This is a woukround and should be fixed later.
2010-12-09 13:44:21 +01:00
Christian Kamm
5f04fbba1a QmlJS indenter: Fix for expressions starting with numbers or strings.
Reviewed-by: Roberto Raggi
2010-12-09 13:28:43 +01:00
con
abd4a7b931 Recent files should remember the editor type as well.
Task-number: QTCREATORBUG-1785
2010-12-09 11:38:12 +01:00
Leandro Melo
f1021f2a18 Snippets: Replace forward declaration by include
Avoid issues with QXmlStream* classes on Mac.

Reviewed-by: con
2010-12-09 11:28:47 +01:00
Tobias Hunger
3ec173bfdd Qt4: Simplify makestep
* Remove unnecessary member variable.
2010-12-09 11:05:19 +01:00
Friedemann Kleint
88b77ba838 Symbian CODA: Add ping for serial, handle reading long messages.
Some renaming and cleanup.
2010-12-09 09:49:23 +01:00
Christian Kamm
e641bfbd9a QmlJS: Set default import paths in constructor.
Also, remove the import path of the Qt that Creator was built with. It
might make things seem to work on built-from-source Creators that will
fail when Creator is shipped.

Reviewed-by: Erik Verbruggen
2010-12-09 09:46:47 +01:00
Thomas Hartmann
5d93717c81 QmlDesigner: fixes warnings 2010-12-08 18:20:20 +01:00
Thomas Hartmann
5f8eb4a3e4 QmlDesigner.statesEditorView: crash fix
fixes crash on shutdown
2010-12-08 18:20:19 +01:00
hjk
1be10d3bdd debugger: the mainwindow does not have to be in the plugin object pool 2010-12-08 18:15:22 +01:00
Thomas Hartmann
a08bf9cab9 QmlDesigner: compile fix 2010-12-08 18:12:34 +01:00
hjk
a0c287136b debugger: remove superflous namespace qualifications 2010-12-08 17:56:20 +01:00
hjk
2e1cad3b6d debugger: fix crash on exit
Order matters.
2010-12-08 17:54:51 +01:00
Marco Bubke
562d0c5fbd QmlDesigner: Refactor states editor
Reviewed-By: Thomas Hartmann
2010-12-08 17:28:50 +01:00
Leandro Melo
fabf76d202 Snippets: Remove the snippets manager
Let the collection itself be the singleton.
2010-12-08 17:22:15 +01:00
Leandro Melo
e699f5d594 Snippets: Add include 2010-12-08 17:22:14 +01:00
Leandro Melo
898bc97cce Snippets: Make it flexible for adding builtin snippets
Instead of in one XML embedded as a resource, now builtin
snippets can be specified on any XML distributed under share.
2010-12-08 17:22:14 +01:00
Leandro Melo
f614663223 Snippets: Correct top-left/bottom-right when emiting dataChanged 2010-12-08 17:22:13 +01:00
Leandro Melo
1175705bfc Snippets: Make it easier for plugins to add snippets groups
Groups are no longer enum values but identified from snippet providers.
2010-12-08 17:22:13 +01:00
Leandro Melo
fdbb34adb8 Snippets: Track begin of first selection
Since in the snippets overlay the selections are created with
ExpandBegin the interest is mostly in detecting when the first one
moved to the left (for example, when an undo is performed right
after inserting the snippet). However, this tracking doesn't need
to necessarily be associated with that flag.
2010-12-08 17:22:12 +01:00
Leandro Melo
b87861f9b4 Snippets: Add more use-cases
- Restored removed built-in snippets.
- Revert a built-in snippet.
- Reset the snippets collection.
2010-12-08 17:22:11 +01:00
Leandro Melo
22c9b652b0 Snippets: Move code from the manager to the collection.
Reloading and synchronizing are now directly accessible from
the collection interface.
2010-12-08 17:22:11 +01:00
Leandro Melo
4a8bdaf843 Snippets: Do not update content on window deactivation 2010-12-08 17:22:10 +01:00
Leandro Melo
44ffd76e8b Snippets: Rename a method in the snippet editor. 2010-12-08 17:22:10 +01:00
Leandro Melo
a997749522 Snippets: Set auto-completers. 2010-12-08 17:22:09 +01:00
Leandro Melo
212e39a972 Snippets: Enable editor's parentheses matching. 2010-12-08 17:22:09 +01:00
Leandro Melo
de527d060d Snippets: Set indenters. 2010-12-08 17:22:08 +01:00
Leandro Melo
920967d901 Snippets: Make text snippets available to all groups.
And mark the completion item as a snippet.
2010-12-08 17:22:08 +01:00
Leandro Melo
7eecf3940c Snippets: Synchronize editing of equivalent variables inside snippets.
When editing one variable from a code snippet, all other variables
with the same name are updated accordingly.
2010-12-08 17:22:08 +01:00
Leandro Melo
7528c6d617 Snippets: Feature enhancement start...
Provide an interface so users can create/edit/remove snippets.
2010-12-08 17:22:07 +01:00
Leandro Melo
27bab4e811 Compile fix. 2010-12-08 17:20:45 +01:00
Thomas Hartmann
c2f04f3f2a QmlDesigner.nodeInstances: changing ordering of notification
This avoids flickering, since parentChanged now
comes after property changed.
2010-12-08 17:10:14 +01:00
Thomas Hartmann
de96223b76 QmlDesigner.dragAndDrop: optimize drag and drop behaivour
We select now after the drop event.
Some fixes for the out of process stuff.
2010-12-08 17:10:13 +01:00
Thomas Hartmann
c0ebc47ef2 QmlDesigner.itemLibrary: simplification 2010-12-08 17:10:13 +01:00
hjk
7cd3272282 debugger: make memory view updatable
Task-number: QTCREATORBUG-3242
2010-12-08 16:48:35 +01:00
hjk
cfd2dbb395 debugger: split debuggeragents.{h,cpp} int {memory,disassembler}agent.{h,cpp} 2010-12-08 16:48:35 +01:00
Friedemann Kleint
d7ca39da06 Symbian/CODA: Add infrastructure for serial communication.
Add USB protocol and chunking.
2010-12-08 16:50:40 +01:00
Kai Koehne
c4e4913870 QmlProject: Add mainFile property
The mainFile property of QmlProject is the default file to run. People
have still the opportunity to override this in their run settings,
though.

The wizard generated code was updated accordingly. Note that this makes
projects generated by the wizard incompatible with QtCreator 2.1!

Task-number: QTCREATORBUG-3249
2010-12-08 15:08:49 +01:00
Kai Koehne
efcac96f57 QmlProject: Add autotest for Files element 2010-12-08 15:08:49 +01:00
Christian Kamm
8848038164 C++ indenter: Fix for access declarations and initializer lists.
Reviewed-by: Erik Verbruggen
2010-12-08 13:52:42 +01:00
con
e49a8d9ace Add method to get all the visible "top level" editors in splits. 2010-12-08 11:42:03 +01:00
Christian Kandeler
0d02c49cdc Maemo: Add GUI element to set project description. 2010-12-08 11:21:40 +01:00
con
519b544f62 Merge remote branch 'origin/2.1'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qt4projectmanager/qmakestep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
2010-12-08 10:57:21 +01:00
con
f6a0c69106 Mac: Fix opening ui files in external designer 2010-12-08 09:52:22 +01:00
Friedemann Kleint
bff0dd4a16 L10n: Update more German translations.
Task-number: QTCREATORBUG-3312
2010-12-08 09:51:45 +01:00