Commit Graph

514 Commits

Author SHA1 Message Date
hjk
d909d8ba64 debugger/basehoverhandler: introduce tooltipOverrideRequested and use it
Reviewed-by: con
Task-number: QTCREATOR-201
2011-01-04 13:58:05 +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
Roberto Raggi
d7e826771d Don't request a new completion when the completion box is already visible. 2010-12-14 12:57:58 +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
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
ea8cb4764b Editors: Move auto-completion code out of the editor
This is basically a continuation of the commits which
refactor code out of the base text editor. For instance,
36fa1de4c6 and
3a684586fa.

Also removed the doXXXX() forwarding methods.
2010-12-01 09:07:15 +01:00
con
af99e09b05 Window title didn't show nice name for e.g. diff views.
Use the editor's displayName for the window title.
Also there were missing change signal emissions in setDisplayName
implementations.
Moves the actual handling of the window title from Session to
EditorManager (so it now is also done for the hypothetical case of no
project explorer plugin).

Task-number: QTCREATORBUG-3207
2010-11-30 13:18:34 +01:00
Francois Ferrand
cda026ee34 Surround selected text with matching symbols on (, [, {, " and '.
Merge-request: 198
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2010-11-24 19:44:54 +01:00
Thorbjørn Lindeijer
68266eae2e Fixed visible wrap column on systems with non-fractional fonts sizes
QFontMetricsF::averageCharWidth seems to always return a fractional size
(at least on Linux/GNOME with DejaVu Mono), even when the font is not
actually drawn at sub-pixels. This caused the visible wrap column to
appear in the wrong place.

As a workaround, use the width of the character 'x', which is pretty
average and does align to pixels when needed.

Task-number: QTCREATORBUG-2746
Reviewed-by: con
2010-11-22 16:41:04 +01:00
Tobias Hunger
f84c228568 Git: Add options to diff editor 2010-11-22 12:03:07 +01:00
con
46d289e4f5 Visible wrap column wrong with fractional font metrics.
E.g. on Mac.
2010-11-15 13:41:23 +01:00
Leandro Melo
5723a73ba5 Editors: Make block highlights go beyond the margin
Block highlights should still be visible even outside the margin (when
margins are displayed naturally), since it acts only as indicator of
the character limit.

Apparently this had already been noticed before and recently there was
a merge request (no. 204) with an attempt to fix it. However, the
implementation was not handling it in a nice form. This is a small
patch that solves the issue and keeps the editor beautiful. (Check
the merge request for more details.)

Reviewed-by: Thorbjorn Lindeijer
2010-11-12 14:06:45 +01:00
dt
4ac7253205 Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
2010-11-10 17:02:40 +01:00
Leandro Melo
fb46c31934 Plain text editor: Make sure user setting about folding markers is used
It was being reset based on the highlighter definitions.

Consider some refactoring with the related options as well to avoid
overriding user's settings.

Done-with: Thorbjorn Lindeijer
2010-11-10 16:05:10 +01:00
mae
b14e54b458 Extend camel-case cursor movement
We now have different actions to bind to (saves us an explicit option).
Small fixes to state machines.

Done-with: Erik Verbruggen
2010-11-10 12:54:06 +01:00
mae
d7516902c9 Extend camel-case cursor movement
Fix small issue with forward movement, and overwrite deleting to start
or end of word (normally Ctrl+Delete and Ctrl+Backspace)

Reviewed-by: Erik Verbruggen
2010-11-10 12:26:33 +01:00
mae
87d8adb1c3 Support camel-case for word-wise movement
This was DevDay's 3rd most requested feature

Done-with: Erik Verbruggen
2010-11-10 10:56:32 +01:00
Leandro Melo
c8a53a66ad Editors: Continue refactoring indenters out of the editors.
This is pretty much a complement of commit 3a684586fa,
which is an attempt to make editors and indenters a bit more decoupled.

Reviewed-by: Thorbjorn Lindeijer
2010-11-09 11:01:48 +01:00
Leandro Melo
36fa1de4c6 Editors: Refactor auto-complete code out of the editors for better reusability.
Reviewed-by: Thorbjorn Lindeijer
2010-11-09 11:01:47 +01:00
Leandro Melo
3a684586fa Editors: Refactor indenters out of the editors for better reusability.
Reviewed-by: ckamm
2010-11-05 14:28:38 +01:00
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup.
Clean icore.h.
2010-11-02 16:53:56 +01:00
mae
8415d0faa0 Fix painting order
text on top of seach results on top of find scope on
top of ifdefed out lines.
2010-11-02 13:48:32 +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
Francois Ferrand
c0b02c61d2 Fix margin drawing when disabled code has a 'transparent' background
(default).

Merge-request: 201
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2010-10-26 11:02:49 +02:00
Oswald Buddenhagen
dfee3388af Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp
2010-10-18 20:59:12 +02:00
Thorbjørn Lindeijer
c5d5657c13 Don't cut off zoomed font sizes to the nearest integer point size
This caused it to go to 0 when for example displaying size 9 at 10%,
which is an invalid value so it caused the text to revert back to the
default size.

It also caused zooming to sometimes appearing to have no effect. For
example zooming size 9 to 110% would still yield size 9 rather than 9.9.

Task-number: QTCREATORBUG-2744
Task-number: QTCREATORBUG-2745
Reviewed-by: Robert Loehning
Reviewed-by: hjk
2010-10-15 17:44:15 +02:00
Jarek Kobus
b6da2d4537 Implement "Jump To File Under Cursor" in profile editor
Reviewed-by: dt <qtc-committer@nokia.com>
Reviewed-by: ossi <oswald.buddenhagen@nokia.com>
Task-number: QTCREATORBUG-688
2010-10-14 11:58:34 +02:00
Erik Verbruggen
5ad1b35a76 Editor: cleanup special cases for snippets. 2010-09-24 13:02:44 +02:00
Erik Verbruggen
79009f55ff Editor: leave completion mode when user pasts. 2010-09-24 11:35:53 +02:00
Erik Verbruggen
f6a99f6163 Editor: don't leave snippet mode when user pasts/completes. 2010-09-24 11:35:53 +02:00
Thorbjørn Lindeijer
24548a4d44 Fixed cursor width inconsistency
While it was set to 2 for most editors, some editors, like the .pro file
editor, set another document on the BaseTextEditor, which then did not
get its cursor width set.

Also removed a duplicated line.

Reviewed-by: dt
2010-09-16 18:17:18 +02:00
hjk
80bc682d2e fakevim: more selection refactoring 2010-09-14 17:18:44 +02:00
hjk
fb05c7a9e2 basetexteditor: make block selection accessible 2010-09-14 17:18:44 +02:00
mae
31de38601b Leave block selection mode
The patch makes the editor leave block selection
mode when users continue to select text with
the keyboard. The editor will smoothly convert
to standard selection mode.
2010-09-08 13:43:15 +02:00
mae
ebc305b0d8 Fix: Folded code is deleted on save
Also fixes a crash when folding code at the very end
of the document

Task-number: QTCREATORBUG-2159
2010-09-07 16:38:03 +02:00
Thomas Hartmann
5c72f73d26 TextEditor: update text markers in moveLineUpDown()
When the user moves a block up or down the text markers have to be
updated correctly.
This is done now in moveLineUpDown().
We check if a text marker is in the block that is about to be moved and
set the position of the QTextCursor to the correct value, afterwards.

Reviewed-by: mae
2010-09-07 16:31:23 +02:00
Friedemann Kleint
763b59aa73 Debugger: Fix debugger switching to edit mode.
... on clicking stack frames or disassembler/
memory views.

Introduce flags to openEditorAt, pass
EditorManager::NoModeSwitch where applicable.

Task-number: QTCREATORBUG-2278
2010-09-07 09:51:20 +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
Leandro Melo
14ffff317c Better flexibility and extensibility in text editor tooltip's internals. 2010-08-24 13:39:40 +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
Thorbjørn Lindeijer
07845306db Fixed the Goto Next/Previous Line actions
Due to the wrong enumerators being used, it was impossible to define
custom shortcuts for these actions.

Reviewed-by: mae
Task-number: QTCREATORBUG-2139
2010-08-23 11:21:03 +02:00
Roberto Raggi
fe1010046f Use QFontMetricsF instead of QFontMetric. 2010-08-06 16:41:57 +02:00
mae
47046ec1ce Fix editor color scheme
Use the defined foreground for search scope instead of calculating
something from background. Support empty foreground for the standard
selections (allows us to match certain popular colorschemes)
2010-08-06 12:59:18 +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
Thorbjørn Lindeijer
dace83badc Avoid retriggering the completion box when it's already there
There should be no need for the text editor to request an update of the
completion box, since when it's there it will have focus and update
itself.

Reviewed-by: Roberto Raggi
2010-08-03 14:36:03 +02:00
Roberto Raggi
ac124d39f4 Check the cursor position before to trigger an automatic completion. 2010-07-20 14:36:01 +02:00
Roberto Raggi
a0faf279d5 Delay the automatic completion. 2010-07-19 14:06:19 +02:00
con
cecf9ac25a Move find flags from IFindSupport to more accessible place.
For later use in IFindFilter.
2010-07-15 16:42:31 +02:00