feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
16,092 Commits 108 Branches 368 Tags
11e21e16c17964f7734ef9c8b97e3225553b891a
Commit Graph

63 Commits

Author SHA1 Message Date
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
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
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup. 
Clean icore.h.
 2010-11-02 16:53:56 +01:00
mae
cdf9d03e62 Fix (Un)FoldAll action naming 
The action was forgotten in the rename from collapse to fold.
 2010-08-08 15:28:37 +02:00
hjk
2f5f358ff4 Core::Context: compile hot fix for Windows. 2010-06-25 17:38:25 +02:00
mae
e07c34017e Rework code folding 
The new and cleaner foldingIndent in the block user data will
make it easier to support other kinds of indentation for various
other programming languages (like Python).
 2010-05-20 15:11:31 +02:00
con
3922be1b2e Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/texteditor/texteditoractionhandler.cpp
 2010-05-11 13:39:21 +02:00
mae
87b3755b6f Missing actions in keyboard options 
Task-number: QTCREATORBUG-61
 2010-05-07 15:40:07 +02:00
Thorbjørn Lindeijer
fbcf42eeda Changed default shortcut for Insert Line Below Current Line 
Use the Visual Studio shortcut instead of the Eclipse shortcut by
default. It seems to make a bit more sense in combination with
Ctrl+Shift+Return.
 2010-05-03 17:17:12 +02:00
André Fillipe
32ab9878fe Added Insert Line Above/Below actions to BaseTextEditor 
The actions perform exactly like their counterparts in Eclipse: a new,
indented line is inserted above or below the current line and the text
cursor is moved to the start of the new line. The line where the cursor
was before the action was triggered remains unchanged.

The shortcuts are also like in Eclipse: "Ctrl+Shift+Return" inserts a
line above the current, "Shift+Return" inserts a line below the current.

Merge-request: 140
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2010-05-03 17:03:11 +02:00
hjk
ed77a90d02 texteditor: code cosmetics 2010-04-28 12:02:37 +02:00
con
2958b0bae2 Cmd+0 is already taken for hiding the navigation sidebar. 2010-04-23 04:30:47 +02:00
Friedemann Kleint
bbcacaf59f Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4. 2010-03-18 10:59:06 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Thorbjørn Lindeijer
808198c41c Removed the "Join Lines Up" action 
It was a bit confusing, since it reversed the order of the lines. When
this would be fixed, the added value of this action is very small, since
you can then also simply move your cursor one up before joining the
lines.
 2010-01-21 15:18:06 +01:00
Falco Hirschenberger
ec2b738d61 Add join-line up/down feature to text editor 
Merge-request: 1823
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Task-number: QTCREATORBUG-510
 2010-01-21 15:18:06 +01:00
Thorbjørn Lindeijer
a248406644 A bit of include cleanup 2009-12-08 18:22:52 +01:00
con
4d93981be2 "Goto" --> "Go to" in visible strings. 2009-12-08 17:56:51 +01:00
mae
d6e4a787d5 separate font zoom from font size 
Introduce "Reset Font Size" action, bound to Ctrl+0
 2009-11-30 19:01:04 +01:00
Friedemann Kleint
066b1d8d6b Shortcut Ctrk-L (Locator Goto Line) broken in most translations. 
Change the translateable string not to contain a blank.

Task-number: QTCREATORBUG-299
Reviewed-by: Thorbjorn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2009-11-17 16:56:04 +01:00
con
a5bfacecb7 Rename directory quickopen --> locator 2009-10-16 11:44:18 +02:00
con
17d9bd6b0a Rename QuickOpen namespace. 2009-10-16 11:30:46 +02:00
con
5d74b9271d Rename resource file. 2009-10-16 10:40:57 +02:00
con
2adb5d5599 QuickOpenManager --> LocatorManager 2009-10-16 04:00:57 +02:00
con
fe9d0bf3c5 Enable multi key shortcuts on the Mac. 
Since that was fixed in Qt.
 2009-10-09 13:33:56 +02:00
Roberto Raggi
91f8a2992b Use CTRL+SHIFT+U as shortcut for the `Find Usages of a symbol'. 
Done with mae
 2009-10-07 11:14:45 +02:00
Erik Verbruggen
91a492a562 Reverted a change which introduced a duplicate action for 
(re-)formatting.
 2009-09-25 10:47:04 +02:00
mae
600fc9b218 cpp editor actions 
remove some standard actions from the cpp editor context menu,
and enhance the advanced menu instead.
 2009-09-24 14:51:40 +02:00
Thorbjørn Lindeijer
e089db4da9 Fixed warning about non-existing group 
Makes a currently non-functional 'Reformat' action visible.

Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2009-09-14 13:43:05 +02:00
Erik Verbruggen
71549ec6a2 First version of QML navigation. 2009-09-11 14:42:50 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
cf6d8d63d2 Make it possible to localize text from goto line shortcut. 
Task-number: 258302
 2009-07-23 10:39:31 +02:00
Thorbjørn Lindeijer
4442ebccfc Think about the poor Mac users, since they can't have sequence shortcuts 
Reminded by con.
 2009-07-21 14:58:47 +02:00
Thorbjørn Lindeijer
e1362eab38 Set Ctrl+E, R as default shortcut for rewrap paragraph 
Suggested by dt.
 2009-07-21 12:38:18 +02:00
Henrik Abelsson
f053ec8c14 Initial support for emacs like fill-paragraph. 
Merge-request: 882
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2009-07-21 10:50:20 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
Oswald Buddenhagen
d2a8449bea ifdef Q_?S_* cleanup 
- clear up some Q_OS_LINUX vs. Q_OS_UNIX
- clear up Q_WS_* vs. Q_OS_* (relatively theoretical exercise)
- use proper #if-#else cascades instead of free-standing #ifs
 2009-06-03 20:54:59 +02:00
Thorbjørn Lindeijer
5cc007e9d9 Moved initialization of actions 2009-05-26 12:05:05 +02:00
Thorbjørn Lindeijer
5208444d7a Merge branch 'copylines' 
Conflicts:
	src/plugins/texteditor/texteditorconstants.h
 2009-05-18 12:34:12 +02:00
Serge Ratke
2dd046640d implementation of copy lines up/down functionality 2009-05-15 23:17:11 +02:00
Thorbjørn Lindeijer
9a79a06930 Introduce a Delete Line action that doesn't copy to clipboard 
The version that does copy to clipboard is now called Cut Line, and is
still mapped to Shift+Delete by default.
 2009-05-14 17:55:17 +02:00
Oswald Buddenhagen
6d5eeb7afb add missing tr()s, etc., add some //: comments 2009-04-20 16:51:10 +02:00
Thorbjørn Lindeijer
0a48bd8731 Unduplicated the code that initializes editor settings 
This stuff was all over the place, a relic from before the editor
settings were unified. Now the initialization is only done in
TextEditorSettings.

Fixes the .pro file editor and the generic project files editor, which
before only used the font settings.
 2009-03-17 18:25:45 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
mae
8598a59b9f fix context definitions of the vcs editors (this makes shortcuts work again) 2009-02-16 12:50:15 +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
897c05f57c replace Core::ICore::instance()->pluginManager() by ExtensionSystem::PluginManager::instance() 2009-01-20 15:31:33 +01:00
Thorbjørn Lindeijer
e0a4789081 Added some structure to the advanced edit menu 
It was getting a bit cluttered without any grouping of the different
actions. Also, the collapse and expand actions have been added, mainly
for discoverability.
 2009-01-20 09:51:56 +01:00
con
fbfcc9a484 Fixes: - ICommand --> Command 
Details:  - Naming convention
 2009-01-14 13:18:25 +01:00