Commit Graph

55 Commits

Author SHA1 Message Date
Friedemann Kleint
774fa49412 Fix more krazy warnings. 2011-04-19 15:43:53 +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
Friedemann Kleint
0e89104b45 API Documentation: Fix warnings. 2011-03-28 14:58:12 +02:00
con
eaea867e53 Implement renaming of tools and categories.
Not possible to reset them yet.
Saves the change in the settings instead of writing new tools xml files.
This probably needs to be adapted for tools that are "local" from the
beginning.
2011-02-18 17:15:39 +01:00
Nicolas Arnaud-Cormos
f3d7bbff0c Add removeShortcut method to the actionManager.
Almost working as the removeAction, but we don't need to check if the command is empty here.

Merge-request: 236
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-01-24 11:39:40 +01:00
con
3f0a4446f3 Make action containers aware of deleted commands.
They need to remove them from their internal structure.
2011-01-20 16:36:55 +01:00
con
06acd2cc25 Refactor ActionContainer internals.
Make groups explicit instead of magic integer stuff.
That also makes group ordering explicit instead of magically working
(the way we happened to use it and the way unique id manager is
implemented).
2011-01-20 16:36:55 +01:00
con
0a8af1720d Another little fix for delayed registering actions.
Make them be correctly updated regarding to current context.
2011-01-18 17:03:33 +01:00
con
e7ad89ffd8 Refactor the "proxy action" behavior of Command to Utils::ProxyAction
A generic action that acts as a proxy for another (changeable) action,
like it is used for mostly all of the visible actions in Qt Creator
through the action manager.
2011-01-12 15:54:15 +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
con
90ecb036a2 Make it possible to specify shortcuts for Locator filters.
Task-number: QTCREATORBUG-1147
2010-12-06 18:24:15 +01:00
con
d7e7c3427d Fix updating of menus with EA_Hide. 2010-11-12 13:48:03 +01:00
con
0078bb0802 Avoid use of QKeySequence::isEmpty in checks in command implementations.
isEmpty is the wrong thing to check when setting the default shortcut. In addition,
registering commands should not set their shortcut automatically (that
should be defined solely by the default shortcut and reading the
settings, which is done later).
2010-10-08 13:19:50 +02:00
hjk
ff0ac20a42 coreplugin: use Core::Id is some places 2010-09-10 17:22:28 +02:00
con
081743a064 Some api documentation adaptions. 2010-07-15 16:42:31 +02:00
hjk
b50ba6a271 Core::Context: fix documentation, remove an unused variable 2010-06-29 10:58:29 +02:00
hjk
f56dacc76f Core::Context: remove special handling of C_GLOBAL_ID/C_GLOBAL 2010-06-28 14:30:03 +02:00
hjk
192a99908c Core::Context: Fix construction of Context(C_GLOBAL_ID) 2010-06-28 10:30:45 +02:00
hjk
1181765a24 cleanup interface of Core::Context 2010-06-25 18:05:09 +02:00
hjk
2f5f358ff4 Core::Context: compile hot fix for Windows. 2010-06-25 17:38:25 +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
con
3d1a97e6df Fix updating the state of menus.
The menus were only updated during context changes
(not if action states where updated directly),
and didn't take into account that the active action for a context
might still be disabled.
Also, enabled separators should not automatically lead to enabled menus.
2010-04-23 04:30:47 +02:00
dt
cbe46198ad ActionManager support for iconVisibleInMenu 2010-03-26 17:34:59 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +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
con
601038689e Remove one level of the Command class hierarchy.
Remove the historical separation of "Action" and "OverridableAction".
The latter is now merged into the former.
2010-01-14 16:37:40 +01:00
Daniel Molkentin
6ba9ae6685 Be a good citizen, retrieve the settings from ICore::instance(). 2010-01-14 15:27:03 +01:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
1e06df7d40 Add views menu for form editor. 2009-08-11 16:38:53 +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
con
c6a0d43d7f Remove unused/unnecessary code. 2009-05-06 17:42:14 +02:00
con
38d7c52d49 Some more documentation about contexts and action containers. 2009-05-04 15:10:23 +02:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
hjk
f31607b33d Fixes: coreplugin: use UniqueIDManager more directly 2009-01-26 13:03:38 +01:00
Thorbjørn Lindeijer
95aad08aad Some shortcut settings improvements
Don't display the useless "Other" category, since the categorization of
commands isn't used anywhere (candidate for removal).

Filter out accelerator ampersands, since they aren't interesting here
and reduce the effectiveness of searching.
2009-01-21 13:13:02 +01:00
hjk
113b81e9db replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() by Core::ICore::instance() 2009-01-20 11:52:04 +01:00
con
fbfcc9a484 Fixes: - ICommand --> Command
Details:  - Naming convention
2009-01-14 13:18:25 +01:00
con
d9f97aa179 Fixes: - Command --> CommandPrivate
Details:  - Preparation for ICommand rename
2009-01-14 13:18:24 +01:00
con
1e4c48a173 Fixes: - IActionContainer --> ActionContainer
Details:  - Conform to naming convention
2009-01-14 13:18:24 +01:00
con
28acadf899 Fixes: - ActionContainer --> ActionContainerPrivate
Details:  - Preparation for IActionContainer --> ActionContainer
2009-01-14 13:18:23 +01:00
con
08e7b0f447 Fixes: - Remove unused tool bar container, and unnecessary enum
Details:  - I'm still not too happy with the whole construction but anyway.
The ToolBarActionContainer was never really used anymore (e.g. you
couldn't create one)
2009-01-14 11:33:10 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
con
768dd19e5b Fixes: - API doc for ActionManager and remove some deprecated things
Details:
ActionManager::registerAction(qaction, id):
  use registerAction(qaction, id, QList<int>() << Core::C_GLOBAL_ID)
ActionManager::addAction/Menu:
  use ActionManager::actionContainer + IActionContainer::addAction/Menu
2009-01-13 19:09:03 +01:00
con
c9889120c3 Fixes: - Rename ActionManagerInterface --> ActionManager
Details:  - To make it conform to naming convention.
2009-01-13 15:44:25 +01:00
con
2562b09f5b Fixes: - Rename ActionManager --> ActionManagerPrivate
Details:  - Step one, step two is ActionManagerInterface -->
ActionManager because it conflicts with our naming conventions
2009-01-13 15:44:25 +01:00