Commit Graph

370 Commits

Author SHA1 Message Date
hjk
89687ddd4b fakevim: code cosmetics. 2010-06-02 09:30:36 +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
hjk
b9e8d35693 fakevim: remove two global static objects 2010-05-19 18:02:25 +02:00
hjk
2f99706031 fakevim: prepare for better integration with creator core
For :ex commands, the plugin is now asked first unconditionally.
The handler only provides fallbacks for the standalone case.
2010-05-19 12:00:52 +02:00
hjk
dcda5099a3 fakevim: allow ':mak' shortcut for ':make' 2010-05-19 12:00:52 +02:00
con
2d17da65a9 Icon update. 2010-05-18 14:26:33 +02:00
hjk
034ee0a947 fakevim: add option to show positions of marks in the main text editor 2010-05-11 14:26:59 +02:00
hjk
ce920cf92e fakevim: add some debugging output 2010-05-10 15:39:41 +02:00
hjk
d110043cff fakevim: make :e open the Locator by default 2010-05-06 14:46:08 +02:00
hjk
325bc6664f fakevim: some refactoring. also, implement QTCREATORBUG-1335 2010-05-05 16:08:58 +02:00
con
3fd04c233c Fix usage of shutdown methods in FakeVim.
Reviewed-by: hjk
2010-04-29 13:39:09 +02:00
con
ca14299790 Rename IPlugin::shutdown --> IPlugin::aboutToShutdown
Discussed-with: hjk
2010-04-28 17:32:01 +02:00
hjk
5dba164823 fakevim: add IsKeyword configuration option 2010-04-28 11:35:07 +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
hjk
e1ad88e677 fakevim: remove unneeded debug output 2010-04-19 11:36:05 +02:00
hjk
b5b29532f3 fakevim: add a setting for (rudimentary) reading of .vimrc on startup 2010-04-16 17:47:28 +02:00
Thorbjørn Lindeijer
7fc5c4173d Corrected a bunch of capitalizations in label texts 2010-04-15 15:08:51 +02:00
Thorbjørn Lindeijer
7d023ef115 FakeVim: Text editor always does incremental search
When copying text editor settings, put incremental search on true.

Reviewed-by: hjk
2010-04-12 18:54:06 +02:00
Thorbjørn Lindeijer
4d5b7325af Redesigned the layout of the FakeVim options page
Also use spin boxes for the number inputs.

Reviewed-by: hjk
2010-04-12 18:54:06 +02:00
Thorbjørn Lindeijer
a1000e1eec Reverse the order of FakeVim setting pages
Reviewed-by: hjk
2010-04-08 16:28:05 +02:00
hjk
0a93ca9259 fakevim: split 'IncSearch' into 'IncSearch' and 'UseCoreDialog' 2010-04-08 14:08:40 +02:00
Vladimir Kuznetsov
14ad890903 Don't forget to setupWidget on FakeVim initialization.
Merge-request: 132
Reviewed-by: hjk <qtc-committer@nokia.com>
2010-04-07 18:18:52 +02:00
Daniel Molkentin
7e1f9d9f85 Highlight colliding shortcuts for imported keyboard schemes. 2010-04-07 18:02:34 +02:00
dt
5f2ae2af47 Less includes 2010-04-07 13:51:07 +02:00
hjk
a9a880d984 fakevim: disable some debug output 2010-04-06 17:58:46 +02:00
hjk
1dc68b8f22 fakevim: hot fix for the 'must change tabsize in fakevim, too'-problem 2010-03-26 17:56:35 +01:00
Thorbjørn Lindeijer
2d21060bc9 Added icons to options dialog categories
Some categories do not have icons yet, unfortunately.
2010-03-26 17:47:31 +01:00
hjk
c317acfdbe fakevim: make UseFakeVim option independent from the settings groupbox again 2010-03-26 14:53:12 +01:00
Friedemann Kleint
8a58a2fe71 Header cleaning mainly in find/cpaster. 2010-03-24 10:43:01 +01:00
Martin Aumüller
2ee91c8aab fakevim: map ctrl-] (follow tag in vim) to "Follow symbol under cursor" and ctrl-t (move up in tag stack) to "Go Back"
Merge-request: 131
Reviewed-by: hjk <qtc-committer@nokia.com>
2010-03-18 13:15:59 +01:00
Martin Aumüller
215ad05701 fakevim: make sure that disabled default actions are not called accidentally
disabled default actions are set to an empty regex pattern (which would match
any command)

Merge-request: 131
Reviewed-by: hjk <qtc-committer@nokia.com>
2010-03-18 13:15:58 +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
Martin Aumüller
af3b1ce778 factor out the commonalities between the keyboard shortcut & ex command mapping dialog
Merge-request: 125
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2010-03-11 16:42:39 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Daniel Molkentin
22773fc825 Shortcutsettings/FakeVim: Indicate modified shortcuts/regexps.
Fixes: QTCREATORBUG-559
2010-03-04 19:22:16 +01:00
Daniel Molkentin
4025adf647 Shortcut settings: Group shortcut categories into sections.
Do this for the fakevim plugin as well, which uses
a slightly modified version for its settings.
2010-03-02 17:55:25 +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
a6ca348636 remove trailing whitespace
doing it in 1.3 as well to avoid possible later conflicts
2010-01-29 21:33:57 +01:00
hjk
4537e2be6c fakevim: code cosmetics 2010-01-22 17:05:03 +01:00
Martin Aumüller
8ad7e88ac3 fakevim: make ':n'/':N' switch to the next/previous open file
this approximates vim's behaviour better than moving forward/back in the navigation history

Merge-request: 101
Reviewed-by: hjk <qtc-committer@nokia.com>
2010-01-22 17:05:03 +01:00
Martin Aumüller
a4e34a804a fakevim: make sure that FakeVimHandler has returned before being deleted
some actions might cause the parent editor to be deleted,
don't crash in that case

Merge-request: 101
Reviewed-by: hjk <qtc-committer@nokia.com>
2010-01-22 17:05:03 +01:00
Martin Aumüller
7c9c7a0f20 fakevim: configurable mapping of ex commands to actions
default mapping:
- :make -> build
- :A -> switch header/source
- :cn -> next issue item
- :cp -> previous issue item

Merge-request: 101
Reviewed-by: hjk <qtc-committer@nokia.com>
2010-01-22 17:05:03 +01:00
Martin Aumüller
bf607962e5 fakevim: change Find plugin's case sensitivity with ':set (no)ignorecase'
- allow for handling unknown arguments to ':set' by the layer having installed the FakeVim handler
- use that to change the Find plugin's case sensitivity

Merge-request: 97
Reviewed-by: hjk <qtc-committer@nokia.com>
2010-01-21 17:23:32 +01:00
Martin Aumüller
f6482a3871 fakevim: implement incremental backward search '?' using Find plugin
Merge-request: 97
Reviewed-by: hjk <qtc-committer@nokia.com>
2010-01-21 17:23:31 +01:00
Martin Aumüller
474d883eac for fakevim mode, terminate incremental search after pressing enter/return
Merge-request: 97
Reviewed-by: hjk <qtc-committer@nokia.com>
2010-01-21 17:23:31 +01:00
Martin Aumüller
fb1e56cbe0 fakevim: use FakeVim indentation settings instead of creator's
Merge-request: 2160
Reviewed-by: hjk <qtc-committer@nokia.com>
2010-01-15 15:27:42 +01:00
hjk
c2d6e6d54a fakevim: break long lines 2010-01-08 11:04:13 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
Martin Aumüller
0b49fb310f fakevim: creator auto indent is more like vim's smartindent
Merge-request: 98
Reviewed-by: hjk <qtc-committer@nokia.com>
2010-01-06 15:21:17 +01:00
Martin Aumüller
c4fede0fd3 fakevim: use BaseTextEditor's isElectricCharacter
in order for automatic indenting to work, isElectricCharacter has to match the language of the document

Merge-request: 98
Reviewed-by: hjk <qtc-committer@nokia.com>
2010-01-06 15:21:17 +01:00