feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
2,570 Commits 108 Branches 368 Tags
37e382b3bdca45d29cb737ec748fe52a86cb504f
Commit Graph

55 Commits

Author SHA1 Message Date
mae
4d708fa408 new text editor option "Highlight blocks" 2009-04-22 20:04:38 +02:00
mae
ebfcd35ace Workaround backspace issue for now 2009-04-22 18:37:43 +02:00
Oswald Buddenhagen
6d5eeb7afb add missing tr()s, etc., add some //: comments 2009-04-20 16:51:10 +02:00
con
cd638b98bd Keep cursor position and scroll state when reloading text editors. 
Regression coming from the new navigation history mechanism.
 2009-04-02 17:56:38 +02:00
hjk
285fa4a5b3 fakevim: remove "fakevim" option from text editor settings as it has a 
page of its own now
 2009-03-30 15:39:13 +02:00
Thorbjørn Lindeijer
8088ca2c43 Stop fighting over which mouse cursor to show on text editor 
The BaseTextEditor was unconditionally setting the mouse cursor on each
mouse move event, after which the CPPEditor would set it as well when
the mouse was above a link. This caused some mouse cursor flickering, so
now the cursor is only set when it's supposed to change.

Also fixed an issue where the link wasn't removed when leaving the text
editor with the mouse while Ctrl was pressed.
 2009-03-25 12:10:56 +01:00
con
40eab8980b Last 'finish' of this iteration of navigation history. 
Task:     240811
 2009-03-19 16:37:05 +01:00
con
37973823c5 One step to being able to jump back in a senseful way... 2009-03-19 16:37:05 +01:00
con
fc79c737b3 Add last edit position to navigation history. 
Task:     240811
 2009-03-19 16:37:05 +01:00
con
f84c651428 Refactor navigation history again, put last edit position in history 
Task:     240811
 2009-03-19 16:37:05 +01:00
Thorbjørn Lindeijer
551b9f487e Moving some code together that belongs together 2009-03-17 18:25:44 +01:00
Thorbjørn Lindeijer
70d5649428 Don't show code folding margin when it isn't supported 
Introduce setCodeFoldingSupported to the BaseTextEditor, and only
enabled it for the C++ and QtScript editors. This removes the useless
margin meant for code folding markers from the plain text editor and
.pro file editor.
 2009-03-17 18:25:44 +01:00
Thorbjørn Lindeijer
1f3908e0a5 Avoid adding navigation history twice 
This code is already in TextEditor::BaseTextEditor::openEditorAt.
 2009-03-05 17:14:37 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
hjk
f3141d99c4 Merge branch '1.0.0' 
Conflicts:
	src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
	src/plugins/debugger/gdbengine.cpp
 2009-02-17 17:56:18 +01:00
Thorbjørn Lindeijer
7ec3f73594 Center the cursor after (un)collapse all 
Requested on the mailing list. Increases usability.
 2009-02-17 16:14:52 +01:00
Thorbjørn Lindeijer
3230017eaf Merge branch '1.0.0' 
Conflicts:
	src/libs/cplusplus/Overview.h
	src/libs/cplusplus/TypePrettyPrinter.cpp
	src/plugins/cpptools/cppcodecompletion.cpp
 2009-02-16 18:42:22 +01:00
Thorbjørn Lindeijer
cbcc2e518d Don't move cursor on collapse/uncollapse 
When the cursor isn't within the block that's being collapsed, it
shouldn't be moved. When it is, it will now move upwards instead of to
the start of the line.

Reviewed-by: mae
 2009-02-13 17:29:59 +01:00
con
1dcabe5a3a Merge branch '1.0.0' 
Conflicts:
	tests/auto/cplusplus/shared/shared.pri
	tests/auto/cplusplus/shared/shared.pro
 2009-02-09 10:54:36 +01:00
Matthias Ettrich
87b8a97447 fix off by one when selecting block up or the previous open parenthesis. 2009-02-04 19:08:10 +01:00
mae
b9655fd1bc editormanager cleanups 2009-01-30 17:10:22 +01:00
hjk
15ac83eda4 Fixes: fakevim: add flags to settings page 2009-01-23 18:21:36 +01:00
Thorbjørn Lindeijer
6adecf3767 Avoid going through ICore when it's not necessary 
Many singletons have their own instance() method, in which case there is
no need to use ICore::instance() to get access to them.
 2009-01-21 15:55:33 +01:00
hjk
113b81e9db replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() by Core::ICore::instance() 2009-01-20 11:52:04 +01:00
hjk
cc5ff1ec74 Remove #include <extensionsystem/pluginmanager.h> from icore.h, a 
forward declaration is sufficient.
 2009-01-19 12:39:20 +01:00
Daniel Molkentin
14276f72ff Fixes: Warning on MSVC, no not temporary convert to int. 
RevBy: Matthias
 2009-01-15 16:52:12 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
Thorbjørn Lindeijer
719894044d Keep completion popup on the screen 
Pop it upwards when it would otherwise go below the screen and shift it
to the left when it would otherwise exit the screen on the right.
 2008-12-18 17:02:20 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
Thorbjørn Lindeijer
4c04c1a774 Fixed mouse handling for code folding when hidden 
The mouse handling for code folding wasn't deactivated when the code
folding markers were hidden.

Reviewed-by: mae
 2008-12-15 17:08:50 +01:00
mae
ffc082a3b3 small fix for collapse/expand 2008-12-12 18:25:24 +01:00
mae
d937ee5570 tweak collapse/expand short cuts, and do not draw collpase boxes 
in ifdefed out sections
 2008-12-12 14:09:56 +01:00
mae
18c8471158 line is blockNumber + 1 2008-12-11 15:50:37 +01:00
mae
46535482d0 Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta 2008-12-11 14:12:24 +01:00
mae
9890705295 make the home key jump to column 0 if the caret if before the first non-space 2008-12-11 14:11:28 +01:00
mae
6adb3f617e connect the parenthesis matcher with the ifdefed out information. 2008-12-11 13:20:59 +01:00
Roberto Raggi
f1e67fa3a3 Added `editorKind' to BaseTextEditor::openEditorAt(). We need it to force the CPPEDITOR kind 
when opening files from the C++ editor (e.g. when the user press F2 on #include <QMutex>).
 2008-12-11 10:28:39 +01:00
mae
8580234ec8 added Move Line Up and Move Line Down actions. Can be extended to 
support statements later.
 2008-12-10 18:01:33 +01:00
mae
1931304da1 add explicit "Clean Whitespace" advanced action 2008-12-09 17:43:31 +01:00
mae
cab48e0d7c Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta 2008-12-09 15:42:37 +01:00
mae
23872bb997 make indenting the selection a single undo/redo command 2008-12-09 15:41:01 +01:00
hjk
4a552ead9f use QTC_ASSERT instead of Q_ASSERT 2008-12-09 15:25:01 +01:00
Thorbjørn Lindeijer
756de96d99 Don't clip the right margin indication 
Doesn't look right, since it causes some background to show through
between the indicator and the scrollbar.
 2008-12-09 12:12:21 +01:00
mae
9ef62848ac avoid parentheses matching flicker when navigationt to block end / start. 2008-12-05 17:06:17 +01:00
mae
6d37029be8 support different selection kinds in basetexteditor. 
enum ExtraSelectionKind {
        CurrentLineSelection,
        ParenthesesMatchingSelection,
        CodeWarningsSelection,
        CodeSemanticsSelection,
        OtherSelection,
        NExtraSelectionKinds
    };
    void setExtraSelections(ExtraSelectionKind kind, const QList<QTextEdit::ExtraSelection> &selections);
    QList<QTextEdit::ExtraSelection> extraSelections(ExtraSelectionKind kind) const;

This is mainly for the benefit of the cppmodelmanager.
 2008-12-05 13:19:57 +01:00
mae
786e183aa6 markContextMenuRequested signal in ITextEditor 2008-12-05 12:12:20 +01:00
mae
923bfa52d3 Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta 2008-12-04 19:35:59 +01:00
mae
4fd9f1e6f7 new signal: BaseTextEditor::lineContextMenuRequested(TextEditor::ITextEditor *editor, int line, QMenu *menu); 
To be useful and used by the bookmarkmanager, this has to move to ITextEditor.
 2008-12-04 19:33:23 +01:00
mae
e594815842 two new actions: "select block up" and "select block down", current default is Ctrl+U 2008-12-04 19:25:20 +01:00
mae
e9ad023def block navigation and selection (bound to Ctrl+[]{} 2008-12-04 18:37:02 +01:00