feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
17,084 Commits 108 Branches 368 Tags
e32cf192f7ba34dda96b61507b440c6a17b51a0c
Commit Graph

34 Commits

Author SHA1 Message Date
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
Leandro Melo
e699f5d594 Snippets: Add include 2010-12-08 17:22:14 +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
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
dt
c9c5fe1542 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/static.pro
	src/plugins/qmljseditor/qmljshoverhandler.cpp
	src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
 2010-11-18 19:28:23 +01:00
Christian Kamm
3564feacce Fix crash when computing the selection path. 
Task-number: QTCREATORBUG-3097
Reviewed-by: con
 2010-11-16 10:08:51 +01:00
Friedemann Kleint
6063fb84c2 Fix exported headers in Core and TextEditor. 
- Unexport Core::Internal::MainWindow and remove its includes.
- Move RssFetcher from Core::Internal to Core.
- Unexport CopyTaskHandler.
- Move TextEditor's completion support and Refactor Overlay
  helper classes from TextEditor::Internal to TextEditor as they
  are exported.
- Move internal BaseTextBlockSelection into private header.
- Unexport TextEditorOverlay as they are not used.
 2010-11-01 16:29:45 +01:00
mae
da5cdda70d Fixed find scope 
There was an off-by-one error for the normal find scope.
Improved look by ignoring the left side.
 2010-10-18 15:45:21 +02:00
mae
5c6cfdf848 Fixed find scope 
There was an off-by-one error for the normal find scope.
Improved look by ignoring the left side.
 2010-09-28 16:50:40 +02:00
Christian Kamm
726985303b TextEditor: Fix extra selection for snippets to match the editable area. 
Task-number: QTCREATORBUG-2099
Reviewed-by: mae
 2010-08-25 14:34:13 +02:00
mae
ec1d555a3b Reduces editor updates in certain cases 
Done-with: Roberto Raggi
 2010-08-06 21:56:48 +02:00
mae
29b073e92e Refactor block selection 
Block selection was "broken" when using tabs, or rather
incomplete: It treated tabs as normal characters, which
has shown to be unexpected by people using tabs in code.

The new implementation has a vastly improved find scope
as well. In addition, creating a blog selection with
mouse or keyboard feels a lot more solid now, as the
actual selection is detached from possible valid cursor
positions.

Task-number: QTCREATORBUG-1541
 2010-08-05 15:26:58 +02:00
mae
b61c376914 Fix findScope performance issue 
Fixes the performance of large find scope selections. Try
Ctrl+A Ctrl+F in a large file and scroll.
 2010-07-14 18:48:36 +02:00
Thorbjørn Lindeijer
41ab8fbbf1 Moved TextEditDocumentLayout and related classes to their own file 
The Parentheses, TextBlockUserData and TextEditDocumentLayout classes
and their member function implementations were spread around the
BaseTextEditor class. Moving them to their own file to make the code a
bit better organized.

Reviewed-by: mae
 2010-04-26 14:42:11 +02:00
mae
bf28a3db54 Restrict find & replace to vertical block selection 2010-04-12 20:50:09 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
mae
f1932cffa4 update properly on text editor overlay visibility changes 2010-01-19 15:56:55 +01:00
mae
4959230cc5 beginnings of fancy snippet editing support 2010-01-19 12:29:13 +01:00
Christian Kamm
d282ee9bdf Fix a bug with selection paths in the editor overlay. 
If the first or last line in a selection ended up with nothing to
highlight after whitespaces were trimmed, they'd use a codepath that
only works correctly for inner 'empty' lines.

Instead we now make sure the beginning and end of a selection are always
highlighted.
 2009-12-15 10:12:50 +01:00
Roberto Raggi
425c61f624 Fixed drop shadow 
Done with: mae
 2009-12-04 13:04:47 +01:00
mae
480c9a5bf4 refactor rename selections 
the new approach makes it possible to use more edit features
inside the rename selection like cut/copy/paste. Furthermore
it compresses rename operations better on the undo stack.
 2009-12-03 18:35:36 +01:00
mae
aeb3e92f21 off by one 
done with thorbjorn
 2009-12-02 14:32:52 +01:00
mae
8c4ede6be4 fix find scope scelection, special case empty overlay selections 2009-12-02 14:12:59 +01:00
mae
54d3d06614 use new selection type for find scopes, draw shadow in overlay (not underlay) 2009-12-02 13:26:33 +01:00
mae
e68cd407ce final drop shadow tuning 2009-12-02 11:29:38 +01:00
mae
b440068d4d refactor search result overlay painting 2009-12-02 10:57:05 +01:00
mae
44ade7c475 add missing license header 2009-12-02 10:12:41 +01:00
mae
18b9bdd413 some tuning of the overlay search result selection 2009-12-01 19:44:31 +01:00
mae
e2a899e354 improved search result selection with over and underlay 
done with thorbjorn
 2009-12-01 14:47:40 +01:00
mae
32d0bc1ff2 some tuning of the layer extra selections 
Remove overlap. Add extra selection tooltips for the cpp hover handler.
 2009-11-30 17:24:06 +01:00
mae
28e3ba5bfb Fixed overlay selections 
1. allow empty overlay selections
2. make it possible to bind a selection to a specified length
 2009-11-30 13:57:47 +01:00
mae
53a3071580 first steps for a refactoring overlay system. 
As side effect we can now play a bit with visualizing extra selections
 2009-11-25 15:56:30 +01:00