feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
7,997 Commits 108 Branches 368 Tags
727d71a48d79936ec77368b6498b5cf8cfe1f91f
Commit Graph

244 Commits

Author SHA1 Message Date
Roopesh Chander
2d9996c703 Pass the current block in all applicable invocations of TabSettings::indentationString() 
Merge-request: 1766
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2010-02-08 16:59:10 +01:00
con
7391ba388c Fix navigation history issues. 
Separating navigation history logic from updating of highlights.
 2010-02-08 16:55:07 +01:00
Thorbjørn Lindeijer
9b3dd396be Merge branch '1.3' 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
 2010-02-04 15:09:05 +01:00
hjk
3251309ada texteditor: remove traces of TEXTEDITOR_STANDALONE 2010-02-04 10:38:11 +01:00
Erik Verbruggen
62705df65f Moved indentation utility method from CPPEditor into BaseTextEditor. 
Reviewed-by: Roberto Raggi
 2010-02-03 16:50:21 +01:00
Thorbjørn Lindeijer
580a37b22c Don't insert a snippet for-loop when pressing Ctrl+H 
Universal helper kept around for comfort.
 2010-02-03 14:59:44 +01:00
Thorbjørn Lindeijer
e25b457b59 Avoid drawing a black rectangle due to invalid background for disabled code 
Regression in commit ab3d3cf413

Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2010-02-02 16:47:14 +01:00
Roberto Raggi
7c88796002 Changed BaseTextEditor::Link to use a pair of offsets (begin, end) instead of position and length. 
Done with: Thorbjorn.
 2010-02-01 16:18:27 +01:00
Friedemann Kleint
f672bff338 Fix some code scanning issues. 
foreach()-Loops.
 2010-02-01 14:00:07 +01:00
Friedemann Kleint
2fd8b2d7ff Fix some code scanning issues. 
QString: Use QChar where appropriate.
 2010-02-01 12:43:56 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3' 
Trailing whitespace removal re-applied manually.
 2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
4320314046 Merge branch 'origin/1.3' (early part) 
Conflicts:
	src/plugins/debugger/gdb/trkgdbadapter.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
	src/plugins/texteditor/basetexteditor.cpp
 2010-01-29 22:14:44 +01:00
mae
b932615ca0 fix smart backspace handling 
The smart backspace handling required a preceeding
non empty text block. In this case, the fix introduces
a standard backspace (deletePreviousCharacter).

Reviewed-by: dt
 2010-01-28 16:29:53 +01:00
Thorbjørn Lindeijer
ab3d3cf413 Don't draw the right margin border on top of the text 
Better to draw it explicitly under the text, together with the
associated background color.
 2010-01-25 14:25:00 +01:00
Thorbjørn Lindeijer
0ddfcdff43 Fixed performance issue with scrolling when using X11 graphics system 
Depending on the XRender driver (probably), drawing a short straight
line can take quite a while when this line is transparent. On my
laptop's onboard ATI card, this meant that scrolling was unusably slow
when this transparent line was being drawn.

Fixed by avoiding the issue, since there is no actual need to use
transparency here. We can calculate the resulting color in advance
instead.
 2010-01-25 13:59:01 +01:00
Thorbjørn Lindeijer
8f8ee59d2c Made Join Lines work with a multi-line selection 2010-01-21 15:18:06 +01:00
Thorbjørn Lindeijer
bf4b5879b4 Fixed Join Lines action when dealing with wrapped lines 2010-01-21 15:18:06 +01:00
Thorbjørn Lindeijer
808198c41c Removed the "Join Lines Up" action 
It was a bit confusing, since it reversed the order of the lines. When
this would be fixed, the added value of this action is very small, since
you can then also simply move your cursor one up before joining the
lines.
 2010-01-21 15:18:06 +01:00
Falco Hirschenberger
46a96c25b0 Collapse or expand trailing whitespaces to one 
Merge-request: 1823
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2010-01-21 15:18:06 +01:00
Falco Hirschenberger
ec2b738d61 Add join-line up/down feature to text editor 
Merge-request: 1823
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Task-number: QTCREATORBUG-510
 2010-01-21 15:18:06 +01:00
mae
5b8a678672 first iteration of snippet support for qml 
Done with Thorbjorn and Roberto
 2010-01-19 18:50:50 +01:00
Roberto Raggi
51a33a9f0a Create completion items for the builtin snippets 2010-01-19 16:36:48 +01:00
mae
1f6c25a72e snippet fixes 
done with roberto
 2010-01-19 16:18:50 +01:00
Roberto Raggi
cb74282c59 Some work on the our little test case for snippets. 2010-01-19 15:59:32 +01:00
mae
a5df2e7b24 backspace/delete handling for snippet editing 2010-01-19 12:54:14 +01:00
mae
4959230cc5 beginnings of fancy snippet editing support 2010-01-19 12:29:13 +01:00
con
7199223a6e Merge remote branch 'origin/1.3' 
Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmleditor/QmlEditor.pluginspec
	src/plugins/qmleditor/idcollector.cpp
	src/plugins/qmleditor/idcollector.h
	src/plugins/qmleditor/parser/qmljsglobal_p.h
	src/plugins/qmleditor/qmlcodecompletion.cpp
	src/plugins/qmleditor/qmlcodeformatter.cpp
	src/plugins/qmleditor/qmlcodeformatter.h
	src/plugins/qmleditor/qmlexpressionundercursor.cpp
	src/plugins/qmleditor/qmllookupcontext.cpp
	src/plugins/qmleditor/qmlresolveexpression.cpp
	src/plugins/qmleditor/qmlsymbol.cpp
	src/plugins/qmleditor/qmlsymbol.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qtscripteditor/QtScriptEditor.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	src/shared/qml/parser/qmljsast.cpp
	src/shared/qml/parser/qmljsast_p.h
	src/shared/qml/parser/qmljsastfwd_p.h
	src/shared/qml/parser/qmljsastvisitor.cpp
	src/shared/qml/parser/qmljsastvisitor_p.h
	src/shared/qml/parser/qmljsengine_p.cpp
	src/shared/qml/parser/qmljsengine_p.h
	src/shared/qml/parser/qmljsgrammar.cpp
	src/shared/qml/parser/qmljsgrammar_p.h
	src/shared/qml/parser/qmljslexer.cpp
	src/shared/qml/parser/qmljslexer_p.h
	src/shared/qml/parser/qmljsmemorypool_p.h
	src/shared/qml/parser/qmljsnodepool_p.h
	src/shared/qml/parser/qmljsparser.cpp
	src/shared/qml/parser/qmljsparser_p.h
 2010-01-12 18:02:04 +01:00
Roberto Raggi
92ed2daa6f Generalized the auto complete of braces. 2010-01-12 13:32:19 +01:00
mae
ee53ebbf08 Fix inserting printable text with AltGt 
Task: QTCREATORBUG-543
Reviewed-by: Tobias Hunger
 2010-01-11 20:36:30 +01:00
Tobias Hunger
b95c86db23 Remove duplicate inclusions of headers 
Reviewed-by: thorbjorn
 2010-01-11 10:26:12 +01:00
mae
3bb71243d4 Fix ambiguous shortcut problems 
The dummy shortcut eater did not always work, we sometimes do have
mutual exclusive shortcuts in the same context.

The current solution is simpler: ignore text input when the control modifier
is used. This seems to be in line with other toolkits and applications.

Done with: thorbjorn
 2009-12-16 13:32:14 +01:00
con
7081a3d415 Merge remote branch 'origin/1.3' 
Conflicts:
	src/plugins/projectexplorer/outputwindow.cpp
 2009-12-14 11:47:39 +01:00
Thorbjørn Lindeijer
05914458f0 Made it possible to turn off scroll wheel zooming 
It activates too easily for some people.

Task-number: QTCREATORBUG-406
 2009-12-09 16:31:09 +01:00
Thorbjørn Lindeijer
a248406644 A bit of include cleanup 2009-12-08 18:22:52 +01:00
Thorbjørn Lindeijer
3d2d122472 Moved the mouse navigation option to the Behaviour settings page 
It used to be hidden on the Display settings page.

Task-number: QTCREATORBUG-135
 2009-12-08 18:22:52 +01:00
Thorbjørn Lindeijer
fdc2463971 Relax the selection requirement for indent/unindent selection 
Before, the selection was required to span multiple lines. Now, any
selection will trigger the line indenting functionality of
Tab/Shift+Tab. This should lead to less surprises.

Also, Shift+Tab will now always unindent the current line, even if there
is no selection, since there is nothing else sensible for this shortcut
to do.

Task-number: QTCREATORBUG-414
Reviewed-by: mae
 2009-12-08 17:30:27 +01:00
mae
9ced67bd62 workaround for the occasional auto-unfold when doing pageUp/pageDown 2009-12-03 19:58:44 +01:00
mae
c1120587a8 Merge commit 'origin/1.3' 
Conflicts:
	src/plugins/cppeditor/cppeditor.cpp
 2009-12-03 18:41:21 +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
Thorbjørn Lindeijer
67bbce7911 Fixed problem with indentation when auto-indent is turned off 
When auto-indent is turned off, Qt Creator uses a simplistic approach of
copying the indentation string from the previous line. This was broken
when the cursor was positioned inside the indentation, since this caused
part of the indentation to go to the next line, which was then prepended
with the copied indentation, in effect increasing the indentation for
each new line.

The solution here was to copy the indentation from the previous block
only after inserting the new block, which causes the indentation of the
previous line to be cut off by exactly the right amount to keep the
indentation constant.

Task-number: QTCREATORBUG-396
Reviewed-by: mae
 2009-12-03 16:15:26 +01:00
mae
8c4ede6be4 fix find scope scelection, special case empty overlay selections 2009-12-02 14:12:59 +01:00
mae
89693f6347 forbid overlapping search results when highlighting 2009-12-02 13:31:17 +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
18b9bdd413 some tuning of the overlay search result selection 2009-12-01 19:44:31 +01:00
mae
43f5b46649 increase threshold for highlighting of all search results to 2 2009-12-01 19:09:17 +01:00
mae
7d0d467980 obey the "auto-fold first comment" option also for reloads 2009-12-01 18:14:02 +01:00
mae
dc713d0684 added "auto-fold first comment"-option to the editor 
Convenient when you don't want to see all the big license headers.
 2009-12-01 18:08:47 +01:00
mae
0fffad22ad Merge commit 'origin/1.3' 2009-12-01 15:58:09 +01:00