feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
48,948 Commits 108 Branches 368 Tags
b002e87ca46413d15d697fa18ddc34795a7ad4b7
Commit Graph

345 Commits

Author SHA1 Message Date
Oswald Buddenhagen
35bb61590d Merge remote branch 'origin/2.1' 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/templates/mobileapp/app.pro
 2010-10-25 11:27:30 +02:00
con
6b47a0f277 Fix previous fakevim fix (make slot actually a slot) 
Reviewed-by: Friedemann Kleint
 2010-10-21 10:02:05 +02:00
con
0d5211cc45 Prevent crash when closing Qt Creator while cdb session is running. 
The debugger plugin opens an editor in this case, leading to fakevim and
cppeditor crashing.
This commit doesn't fix the problem's source, but adds safeguards that
are sensible anyhow: FakeVim should not register with editors during
shutdown, and CppEditor should not unconditionally assume an existing
editor manager in the destructor.

Reviewed-by: Friedemann Kleint
 2010-10-20 17:10:47 +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
48a75201a6 fakevim: fix :wq complaint when writing to the current file. 
Reviewed-by: Kornelia Poenitz
 2010-10-11 11:54:01 +02:00
dt
d8a9af9fbe FakeVim: Remove unneded include 2010-10-04 15:10:00 +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
88a248d3c8 fakevim: move "status line" to the main statusbar 2010-09-17 14:33:35 +02:00
hjk
59a341d650 fakevim: use QTextCursor for fakevim marks 2010-09-15 13:48:11 +02:00
hjk
80bc682d2e fakevim: more selection refactoring 2010-09-14 17:18:44 +02:00
hjk
259c0c1d8e fakevim: use main editor selection 2010-09-14 17:18:44 +02:00
hjk
2989ac1d69 fakevim: make :q after :sp more vim-ish 2010-09-08 15:57:57 +02:00
hjk
c4d48c5ec8 fakevim: code cosmetics 2010-09-08 15:57:57 +02:00
hjk
495c3f52fa fakevim: improve selection interaction with main text editor 2010-08-11 13:42:22 +02:00
Roberto Raggi
da5d6d7db2 Get rid of the old deprecated indenter. 2010-08-10 10:50:00 +02:00
hjk
2d551de03f fakevim: make recognition of ex command names similar to vi's 2010-07-14 18:15:17 +02:00
hjk
e7e0ead0fc fakevim: implement :only 2010-07-14 17:59:48 +02:00
hjk
29af23cdb1 fakevim: implement some of the :bn/bp commands 2010-07-14 14:33:56 +02:00
hjk
8a2aa96f14 fakevim: reduce line noise 2010-07-14 14:33:56 +02:00
hjk
5574a13849 fakevim: implement [{ and ]} 2010-07-14 13:08:38 +02:00
con
b3dbc4b4e4 Add flag to IPlugin::aboutToShutdown that allows asynchronous shutdown. 
If a plugin requests asyncronous shutdown, the shutdown sequence does
not continue to deleting the plugins before it has sent a
asynchronousShutdownFinished signal. During that time an event loop
is running.
 2010-07-13 15:25:21 +02:00
hjk
f56dacc76f Core::Context: remove special handling of C_GLOBAL_ID/C_GLOBAL 2010-06-28 14:30:03 +02:00
hjk
c7e8b51d37 core: use a class derived from QList<int> instead of a QList<int> for Core::Context 
A mostly mechanical change.

Reviewed-By: con
 2010-06-25 12:58:07 +02:00
Tobias Hunger
5d5f647f3d Fix preprocessor directives 
* The standard says all preprocessor directives have to start
   at column 0.
 2010-06-10 13:28:14 +02:00
hjk
3bff717f37 fakevim: use basetext indentation access instead of the cppeditor based one 2010-06-03 13:29:17 +02:00
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