hjk
6159e5b860
fakevim: start with work on Ctrl-N/Ctrl-P
2010-12-21 12:30:50 +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
b4e421062f
Removed stray tokens and fixed warnings/errors when compiling with pedantic C++ compilers.
2010-12-16 12:05:48 +01:00
Arvid Ephraim Picciani
a2459e0abe
fakevim: Fix cursor movement in insert mode on Mac.
...
Reviewed-by: hjk
(cherry picked from commit 51c8491158 )
2010-12-13 16:50:44 +01:00
Tobias Hunger
cf3a418cd8
Fix spelling in comments
...
Krazy was complaining about those.
2010-11-03 12:45:34 +01:00
Arvid Ephraim Picciani
51c8491158
fakevim: Fix cursor movement in insert mode on Mac.
...
Reviewed-by: hjk
2010-11-02 12:37:36 +01:00
Martin Aumüller
893f5bfd23
fakevim: don't swap cmd and ctrl keys on os x
...
qt reversed the mapping of cmd and ctrl internally, this should be re-reversed in vi
Merge-request: 190
Reviewed-by: hjk <qtc-committer@nokia.com >
2010-10-26 10:56:32 +02:00
Martin Aumüller
9f99bdb6f1
fakevim: fixes for search using Core find dialog
...
- repeated searching ('n'/'N') would not work
- search would have been restricted to selection
- fix search when used as motion in an edit command ('c/...')
Merge-request: 190
Reviewed-by: hjk <qtc-committer@nokia.com >
2010-10-26 10:56:32 +02:00
Christian Kamm
b78c1ef6da
Merge remote branch 'origin/2.1'
...
Conflicts:
README
doc/qt-html-templates.qdocconf
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
src/app/Info.plist
src/plugins/bineditor/BinEditor.pluginspec
src/plugins/bookmarks/Bookmarks.pluginspec
src/plugins/classview/ClassView.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/cpptools/CppTools.pluginspec
src/plugins/cvs/CVS.pluginspec
src/plugins/debugger/Debugger.pluginspec
src/plugins/debugger/breakhandler.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/imageviewer/ImageViewer.pluginspec
src/plugins/locator/Locator.pluginspec
src/plugins/mercurial/Mercurial.pluginspec
src/plugins/perforce/Perforce.pluginspec
src/plugins/projectexplorer/ProjectExplorer.pluginspec
src/plugins/qmldesigner/QmlDesigner.pluginspec
src/plugins/qmljseditor/QmlJSEditor.pluginspec
src/plugins/qmljsinspector/QmlJSInspector.pluginspec
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
src/plugins/regexp/RegExp.pluginspec
src/plugins/resourceeditor/ResourceEditor.pluginspec
src/plugins/snippets/Snippets.pluginspec
src/plugins/subversion/Subversion.pluginspec
src/plugins/tasklist/TaskList.pluginspec
src/plugins/texteditor/TextEditor.pluginspec
src/plugins/vcsbase/VCSBase.pluginspec
src/plugins/welcome/Welcome.pluginspec
tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
tests/manual/fakevim/fakevim.pro
tests/manual/ssh/errorhandling/main.cpp
2010-10-11 14:16:33 +02:00
hjk
da91600bf4
fakevim: fix 'Delete' in insert mode to delete exactly one char again
...
Reviewed-by: Kornelia Poenitz
2010-10-11 11:54:00 +02:00
Adrien Bustany
6371d2835d
FakeVim: Allow ctrl+left/right to move word-wise in insert mode
...
Merge-request: 185
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2010-10-08 12:51:19 +02:00
Adrien Bustany
e3a5ff16f7
FakeVim: add ctrl-w in insert mode
...
Merge-request: 185
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2010-10-08 12:51:19 +02:00
dt
6b6d9871b8
Merge remote branch 'origin/2.1'
...
Conflicts:
share/qtcreator/templates/mobileapp/app.pro
share/qtcreator/templates/qmlapp/app.pro
src/plugins/cpptools/cpptools.pro
2010-10-04 16:07:46 +02:00
hjk
77259d1d38
fakevim: reset op count when leaving insert mode
...
Reviewed-by: Alessandro Portale
Task-number: QTCREATORBUG-2552
2010-10-01 18:43:01 +02:00
hjk
a75758f082
fakevim: next attempt at fixing QTCREATORBUG-1263
...
AltGr + 4 on Swedish keyboards on Vista
2010-09-30 11:58:22 +02:00
hjk
32a54bbc3d
fakevim: use more of base text's cursor handling
...
Done with mae.
2010-09-29 10:53:49 +02:00
hjk
f5258cbc13
fakevim: disable Shift-Up style keyboard selection in insert mode.
2010-09-27 15:38:17 +02:00
hjk
65c5a84e45
fakevim: fix anchor setting after %
2010-09-27 15:25:18 +02:00
hjk
74cf70deaf
fakevim: add an option to pass Control + <x> directly to Creator core
...
Original code by dcarr.
2010-09-24 13:05:15 +02:00
hjk
3ba4812749
fakevim: disable completion on each keystroke.
...
This has bad interaction with '.' and ESC.
2010-09-21 16:33:14 +02:00
hjk
3d36ece27b
fakevim: fake tab completion
2010-09-21 16:33:14 +02:00
hjk
8016e96bec
fakevim: bind automatic code completion to InsertMode
2010-09-17 08:56:16 +02:00
hjk
c9395b45a2
fakevim: fix 'O'
2010-09-16 16:56:25 +02:00
hjk
3c1dbd53ca
fakevim: fix anchor positioning in insert mode
2010-09-16 16:56:25 +02:00
hjk
dcef626416
fakevim: co-operate with code completion again
2010-09-16 15:28:51 +02:00
hjk
5b403c376f
fakevim: fix '#'
2010-09-16 14:32:41 +02:00
hjk
2e02f4cb27
fakevim: fix backspace at start of line in insert mode
2010-09-15 19:02:35 +02:00
hjk
02966feab6
fakevim: handle editors that get removed during execution of a command
2010-09-15 16:19:57 +02:00
hjk
59a341d650
fakevim: use QTextCursor for fakevim marks
2010-09-15 13:48:11 +02:00
hjk
9fc20bf7a8
fakevim: fix 'o'
2010-09-14 18:49:59 +02:00
hjk
c2edf7929e
fakevim: fix 'A'
2010-09-14 18:48:04 +02:00
hjk
db14763c2d
fakevim: fix undo
2010-09-14 18:30:49 +02:00
hjk
b85597da6f
fakevim: more selection refactoring
2010-09-14 17:18:44 +02:00
hjk
80bc682d2e
fakevim: more selection refactoring
2010-09-14 17:18:44 +02:00
hjk
a9891347dd
fakevim: cursor refactoring
2010-09-14 17:18:44 +02:00
hjk
042c9f06a5
fakevim: create a document() accessor function.
2010-09-14 17:18:44 +02:00
hjk
259c0c1d8e
fakevim: use main editor selection
2010-09-14 17:18:44 +02:00
Jarek Kobus
c072293ef0
Typos spotted while translating
2010-08-19 14:06:50 +02:00
hjk
362c41be5b
fakevim: slightly better support for regular expressions in search patterns
2010-08-16 16:47:01 +02:00
hjk
91c909120b
fakevim: Fix mark interpretion for d'a etc.
...
http://bugreports.qt.nokia.com/browse/QTCREATORBUG-1342
2010-08-11 15:15:19 +02:00
hjk
495c3f52fa
fakevim: improve selection interaction with main text editor
2010-08-11 13:42:22 +02:00
hjk
a40094c99f
fakevim: fix indentation of first line after >iB and >ib
...
http://bugreports.qt.nokia.com/browse/QTCREATORBUG-2015
2010-08-11 12:07:05 +02:00
hjk
2d551de03f
fakevim: make recognition of ex command names similar to vi's
2010-07-14 18:15:17 +02:00
hjk
6df48b6650
fakevim: implement :nohlsearch
2010-07-14 16:04:10 +02:00
hjk
29af23cdb1
fakevim: implement some of the :bn/bp commands
2010-07-14 14:33:56 +02:00
hjk
816f60f0e1
fakevim: implement Ctrl-J, Ctrl-N, Ctrl-P
...
Funny to see what people are using instead of 'j' and 'k'...
2010-07-14 14:33:56 +02:00
hjk
e0f6d43bf7
fakevim: implement [( and ])
2010-07-14 14:33:55 +02:00
hjk
5574a13849
fakevim: implement [{ and ]}
2010-07-14 13:08:38 +02:00
con
d24d01f49c
Merge commit '52b9fcca2ddd5d5e95c6e13cbded018699c7dd68' (origin/2.0)
...
Conflicts:
src/plugins/debugger/debuggeragents.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
2010-07-13 11:31:05 +02:00