Commit Graph

77 Commits

Author SHA1 Message Date
Leandro Melo
d8dedb439c Editor: Keyboard option for overriding delete word's start/end
Regular and camel-case version.

Task-number: QTCREATORBUG-5160
Change-Id: I749fbc4c768d4f11fb741fd1b9d00ddee56eb965
Reviewed-on: http://codereview.qt-project.org/5537
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2011-09-26 15:10:39 +02:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-05 18:04:55 +02:00
Friedemann Kleint
610f77ed33 Header cleanup in TextEditor.
Change-Id: I832d255a4d8f291426d54ad0353641db515a511a
Reviewed-on: http://codereview.qt.nokia.com/3182
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-18 14:23:43 +02:00
Leena Miettinen
8aea021dc3 UI text: fix capitalization and terminology
Change-Id: Ieb52b4e2e6e8b5835219ecc4f6fe7907539e5bdb
Reviewed-on: http://codereview.qt.nokia.com/1827
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-07-19 15:54:50 +02:00
Fawzi Mohamed
ed0f9f678e Editor: fix disabling modifying actions for read-only editors
Now correctly disables all modifying actions and shortcuts of
texteditoractionhandler if the editor is readonly.

Task-number: QTCREATORBUG-4774
Change-Id: Ic212a2fe3b6dcc18e2fbc461d24bed031c67f6a2
Reviewed-on: http://codereview.qt.nokia.com/7
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-05-19 14:07:55 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2'
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Leandro Melo
126aa9ec39 Editors: Change shortcut for copy line operation
Change the key binding for the copy line operation
introduced at 8ae4317394
to Ctrl+Ins. We already use Shift+Del for the cut line
operation, so this would be CUA consistent.
2011-03-17 11:17:47 +01:00
Kostas Karanikolas
8ae4317394 Added "Copy Line" keyboard command and associated action
Merge-request: 223
Reviewed-by: Leandro Melo
2011-03-17 10:51:46 +01:00
Steffen Imhof
b316970101 Add uppercase and lowercase selection actions to the text editor.
Merge-request: 256
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
2011-02-25 16:11:20 +01:00
hjk
f576ad9f2c texteditor: merge ITextEditable into ITextEditor
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
2011-02-22 11:23:53 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
Nicolas Arnaud-Cormos
f5fbbbfd4f New plugin: plugin macro
This plugin let the user record and replay some macros:
 * 3 handlers: action, find and texteditor
 * almost all texteditor and cpp actions recorded
 * options page to set the directories where the macros are stored
 * optional dialog to give a name and comment at the end of a macro
 * locator integration to play a macro
 * shortcuts assignment to macro

The most important change outside the plugin macros is the isScriptable method
for command: All scriptable commands can be stored in a macro.

Merge-request: 2176
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2010-12-20 11:16:15 +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
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