Commit Graph

296 Commits

Author SHA1 Message Date
Erik Verbruggen
d4c9a47460 Fixed uninitialized members by initializing them. 2010-06-04 11:15:39 +02:00
hjk
5806009d29 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
2010-06-02 09:57:23 +02:00
Thorbjørn Lindeijer
2641496a99 Fixed line select in gutter when text marks are not visible
The ProjectFilesEditor used for editing the generic project's files does
not show text marks, which broke the line select in the gutter.

Task-number: QTCREATORBUG-1238
Reviewed-by: mae
2010-06-01 13:33:35 +02:00
Thorbjørn Lindeijer
8ffc25bbad Fixed the collapsed block popup to draw on top of cursor/highlights
The various text editor overlays and the text cursor were being painted
on top of the collapsed block popup.

Reviewed-by: mae
2010-06-01 12:01:23 +02:00
Erik Verbruggen
d349cafe2d Fixes rounding errors in block positions.
Influences the position of the folded-block markers.

Reviewed-by: thorbjorn
2010-05-31 15:06:30 +02:00
Jarek Kobus
1263babfc6 Enable line numbers selection in pro editor
Make it possible to select multiple lines in pro editor by d'n'd over
the line numbers like in the cpp editor.

Reviewed-by: mae <qt-info@nokia.com>
2010-05-25 17:58:54 +02:00
mae
886aef937f Merge commit 'origin/2.0' 2010-05-21 16:10:46 +02:00
mae
076c03498f Fix critical vertical block selection issue
Vertical block selections could be painted where there was no
selection, or they could jump randomly to columns futher right.

Reviewed-by: dt
2010-05-21 16:06:31 +02:00
mae
576a8ae799 Fix current line highlighting
we now draw it with alpha, so block highlighting and find scope
paintings shine through
2010-05-20 17:01:58 +02:00
mae
e07c34017e Rework code folding
The new and cleaner foldingIndent in the block user data will
make it easier to support other kinds of indentation for various
other programming languages (like Python).
2010-05-20 15:11:31 +02:00
con
7f4cbe2383 Merge remote branch 'origin/2.0'
Conflicts:
	src/plugins/debugger/moduleshandler.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
2010-05-20 09:28:00 +02:00
con
04840b0ea7 Fix text highlighting on Mac.
Broke with 8c9a97479a

Reviewed-by: Thorbjørn Lindeijer
2010-05-19 11:40:27 +02:00
mae
8c9a97479a Small fixes for vertical block selection
The find scope was sometimes painted incorrectly, and the last
line was occassionally ommited from the standard selection paint.

Reviewed-by: thorbjorn
2010-05-18 16:02:03 +02:00
con
38f6379f39 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
2010-05-17 17:40:40 +02:00
mae
78f130a121 Fix Backtab behavior to standard Windows behavior
Creator implemented Backtab similar to Eclipse and other editors,
now we do standard windows behavior.
2010-05-17 11:42:07 +02:00
con
1fd12ab63b Merge remote branch 'origin/2.0'
Conflicts:
	src/plugins/cpptools/cppcodecompletion.cpp
2010-05-12 17:25:40 +02:00
Thorbjørn Lindeijer
7767786cc8 Disable bracket matching when automatic insertion is disabled
When automatic insertion of brackets is disabled in the completion
settings, it is reasonable to expect the automatic matching of brackets
is also disabled.

Task-number: QTCREATORBUG-454
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2010-05-11 15:11:12 +02:00
con
3922be1b2e Merge remote branch 'origin/2.0'
Conflicts:
	src/plugins/texteditor/texteditoractionhandler.cpp
2010-05-11 13:39:21 +02:00
mae
87b3755b6f Missing actions in keyboard options
Task-number: QTCREATORBUG-61
2010-05-07 15:40:07 +02:00
con
e1c032f325 Fix drawing of collapse block indicator (fractional font sizes).
Task-number: QTCREATORBUG-1319
Reviewed-by: Thorbjørn Lindeijer
2010-05-06 15:27:10 +02:00
André Fillipe
32ab9878fe Added Insert Line Above/Below actions to BaseTextEditor
The actions perform exactly like their counterparts in Eclipse: a new,
indented line is inserted above or below the current line and the text
cursor is moved to the start of the new line. The line where the cursor
was before the action was triggered remains unchanged.

The shortcuts are also like in Eclipse: "Ctrl+Shift+Return" inserts a
line above the current, "Shift+Return" inserts a line below the current.

Merge-request: 140
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
2010-05-03 17:03:11 +02:00
mae
5b46ae79b5 Fix hangup with regular expression search and 0-size match 2010-04-26 19:37:19 +02:00
Thorbjørn Lindeijer
8e9a70addf Renamed TextEditDocumentLayout to BaseTextDocumentLayout 2010-04-26 14:42:11 +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
con
b169ff5800 Guard against use of editable interface before it's created.
Reviewed-by: Thorbjørn Lindeijer
Task-number: QTCREATORBUG-1261
2010-04-23 14:33:22 +02:00
hjk
d8be1fbca4 textedit: make whitespace visualization work with overwrite mode cursor
Done with mae.
2010-04-16 13:26:46 +02:00
mae
db0a0f2996 "Fix" overwrite cursor for fake vim mode
It now behaves less logical but closer to what vim does. Since
this is the main target group, the change is probably right.
In detail: Overwrite cursor no longer shows *what* will get overwritten,
but instead it simply indicates *that* the editor is in overwrite mode,
with a more or less fixed size (fixed when the font is truly monospace).
2010-04-16 13:06:58 +02:00
mae
b1577b0e20 Make the current line highlighting prettier
Especially in combination with block highlighting.
2010-04-14 13:40:36 +02:00
mae
be92567948 Add "center cursor on scroll" option for the base text editor 2010-04-14 13:40:36 +02:00
mae
e9be9a0d57 Fix minor ifdefed-out block drawing issue
When drawing the background for an ifdefed-out block, expand
to the end of the visible viewport, even when scrolled
horizontally to the right.
2010-04-13 14:37:54 +02:00
mae
d633ec2094 Fix find scope expanding
We now use two cursors, with the first one being positioned at the
character before the find scope starts. This makes it possible
to extend the scope when typing at the beginning or the end of
it. This is more what the user expects. The effect is noticable
with find&replace of words at the beginning or end of the scope.
2010-04-13 12:07:43 +02:00
mae
bf28a3db54 Restrict find & replace to vertical block selection 2010-04-12 20:50:09 +02:00
Erik Verbruggen
fbb8f39945 Fixed ruler alignment on MacOS for fonts with fractional metrics.
Task-number: QTCREATORBUG-1065
Reviewed-by: mae
2010-04-12 15:39:42 +02:00
mae
5332925626 Turning blinking cursor on when handling backspace
Reviewed-by: thorbjorn
2010-04-12 14:33:13 +02:00
Thorbjørn Lindeijer
cba9730802 Rename method to match signal name
Signal is called contentsChangedBecauseOfUndo
2010-04-08 16:28:04 +02:00
mae
91dac9385e Re-enable snippets
Fixed colors to use the same as refactoring rename, and a few
fixes for undo and document changes outside the tab areas.

Reviewed-by: Roberto Raggi
2010-03-29 16:45:41 +02:00
mae
17579bb97f Make completion box hide on an editor undo operation 2010-03-29 16:45:41 +02:00
mae
f9fb0bc270 Fix background of folded-block popups
If the disabled code format in creator does not have a background
defined, we now use the page's default background.
2010-03-26 14:46:56 +01:00
Thorbjørn Lindeijer
fb82e101ea Handle forward/backward mouse buttons for editor navigation
Task-number: QTCREATORBUG-899
Reviewed-by: kh1
2010-03-19 16:53:38 +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
mae
f30627b48e Make persistent code folding and auto-collapse of the license header work together 2010-03-15 13:17:20 +01:00
mae
80b60b9906 Make code fodling persistent between session
Task-number: QTCREATORBUG-214
2010-03-15 12:27:11 +01:00
hjk
944b6dad7d texteditor: return information on whether openEditor actually created an
editor or re-used an existing one
2010-03-10 13:46:45 +01:00
Marius Storm-Olsen
651ff4b172 Don't draw column margin twice
The last line is even blended, which slows things down.

Reviewed-by: Thorbjørn Lindeijer
(caused by wrong merge of ab3d3cf413)
2010-03-05 15:08:44 +01:00
Marius Storm-Olsen
b448e6e7b9 Enable suppressing syntax and setting a foreground color on disabled blocks
If the foreground color for the disabled text is different than the normal
text foreground, that's an indication that the user wants the disabled
block to be colored differently. If so, disable the syntax highlighting
and set uniform colors for the block.

If the foreground colors are identical apply full syntax highlighting in
the disabled block too. Some people want that.

Reviewed-by: Thorbjørn Lindeijer
2010-03-05 15:04:23 +01:00
Thorbjørn Lindeijer
181b086f99 Added syntax highlighted code to clipboard as HTML when copying
The generated HTML is not the prettiest HTML in the universe, but it
does the job. When copying code from Qt Creator to Microsoft Office or
OpenOffice.org, the syntax highlighting is now preserved. The code also
pastes as preformatted text.

Reviewed-by: mae
Task-number: QTCREATORBUG-727
2010-03-05 15:04:23 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
mae
868dac8088 Fixed moving lines up/down through folded code
Previously this resulted in the folded code being removed.

Task-number: QTCREATORBUG-768
2010-02-26 14:52:01 +01:00
mae
e0572239ba Fixed: Search scope is hidden by block highlighting
Task-number: QTCREATORBUG-758
Reviewed-by: thorbjorn
2010-02-25 13:04:08 +01:00
Jens Bache-Wiig
c94e06bbbd Migrate ManhattanStyle to use QProxyStyle 2010-02-23 12:42:35 +01:00