summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/actionmanager
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-05-021-0/+16
|\ | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/mainwindow.cpp Change-Id: I975a4208588d174ebb44054de56c5ac8d7c878fe
| * Mac: Build menu stays disabled with Qt 4.8.1 and laterEike Ziller2012-05-021-0/+16
| | | | | | | | | | | | | | Works around QTBUG-25544 Change-Id: I136aaa403f78e9c3903abc013c3267bc3585f54b Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | qtcassert: move actual printing to separate function and enforce stylehjk2012-04-171-1/+1
|/ | | | | | | This also allows simple setting of breakpoints on failed asserts. Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Doc: Some QString->Id correctionsOrgad Shaneh2012-04-021-3/+3
| | | | | | Change-Id: I43c707cb3d27ac706052f8e46f0f1ef8c86e644e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Normalized connect()sRobert Loehning2012-03-061-2/+2
| | | | | | Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-201-1/+1
| | | | | | | | And adapt the other API respectively. Change-Id: I1e04e555409be09242db6890f9e013396f83aeed Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Add ActionContainer::insertGroupEike Ziller2012-02-173-0/+14
| | | | | Change-Id: I1a7047e0ccc074bb38661ecd34e2c0e64469d843 Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-1512-47/+47
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Compile with Qt 5.Friedemann Kleint2012-02-081-0/+1
| | | | | | | | | | | | - QtQuick1 renaming. - Start on qtconcurrent split (pending renaming of Qt Creator's qtconcurrent library). - QWinEventNotifier is a public class in Qt 5. - Metatype system: Classes need to be known. Change-Id: I5582e7cc2777bf791a08b049262217055769c80f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix a crash when loading the qt4projectmangerplugin.Adam Treat2012-01-271-1/+1
| | | | | | | | | | | | | | | | | | | This crash can happen when enabling/disabling a certain combination of plugins and restarting. There was a null pointer de-reference that was occurring because the qt4projectmanagerplugin was referencing an action that it believed to have been registered by the texteditorplugin when it was initialized. However, apparently the texteditorplugin was not initializing its actions at plugin initialization, but rather when 'extensionsInitialized' was called. I do not know the call graph for when this is to be called, but I encountered at least one situation where the qt4projectmanagerplugin was being initialized before this. Change-Id: Iede1831e0ac9c92b80a079157e1bdc8c66473470 Reviewed-by: Leandro Melo <leandro.melo@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-2613-13/+13
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Replace Q_WS_MAC with Q_OS_MAC.Morten Johan Sorvig2012-01-261-1/+1
| | | | | | | | | | | | | | | We want to carry over all mac-specific code paths to Qt 5. WS_MAC is no longer set; OS_MAC is. This change is compatible with Qt 4 builds since OS_MAC is set whenever WS_MAC is. (OS_MAC would also be set for the theoretical X11/Mac platform, but that's anyway not a supported configuration for Creator) Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Use new static ICore interface.hjk2012-01-241-3/+3
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Windows build fix.Eike Ziller2012-01-131-3/+3
| | | | | Change-Id: I4b7223e16eb727e9d98cc973eb64cb4f9feccdcc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Let Command construct its description (former defaultText) itself.Eike Ziller2012-01-123-21/+22
| | | | | | | | Instead of doing it duplicated in the general and the fakevim shortcut settings. Change-Id: Id4b0e5b0630f1e94c825528f1c038776dc205aa3 Reviewed-by: hjk <qthjk@ovi.com>
* CorePlugin: Compile with QT_NO_CAST_FROM_ASCII.Friedemann Kleint2011-12-223-3/+7
| | | | | | | | | | - Wrap literals in QLatin1String()/QLatin1Char(). - Extract some string constants avoiding repeated QString construction. - Fix repeated invocation of Container.end() in loops. Change-Id: If737735507aaf82e53063adda53f54c46418f42f Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* compile fix with namespaceshjk2011-11-241-7/+2
| | | | | Change-Id: I1b888ff8bd5c30a13dc8c00824d4cae6990a4b23 Reviewed-by: hjk <qthjk@ovi.com>
* UI files: Do not polute the global Ui namespaceTobias Hunger2011-11-243-6/+17
| | | | | | | Make sure all ui-files are in the plugin's internal namespace. Change-Id: Ifb2c3093441e8feb89e46f52fbb386fc316cfd13 Reviewed-by: hjk <qthjk@ovi.com>
* mostly core and analyzer: more id-ficationhjk2011-11-159-153/+100
| | | | | Change-Id: Ic794fdc6a582f4a03d84b6220c59111044c753b9 Reviewed-by: hjk <qthjk@ovi.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-1113-26/+26
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-0313-26/+26
| | | | | | | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | More useful warning textEike Ziller2011-11-021-1/+2
| | | | | | | | | | Change-Id: I6e84b3da2f97863a144e95bf0e79a4318ef59986 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Add "presentation mode"Tobias Hunger2011-10-312-1/+96
|/ | | | | | | | | | | | Presentation mode can be entered by passing -presentationMode when starting Qt Creator. It displays a popup with the keyboard shortcut of the commands that are triggered. Great for the DevDays;-) Change-Id: I897966aab491f98e2a5abc4433c40b04e2a8db57 Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
* core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gonehjk2011-09-056-6/+6
| | | | | | | 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>
* core: progress on the QString->QByteArray for Core::Id, remove UniqueIDManagerhjk2011-09-054-38/+40
| | | | | | Change-Id: I94bec127866822b790a6e45a4201a7a5fe71d6ce Reviewed-on: http://codereview.qt.nokia.com/4208 Reviewed-by: hjk <qthjk@ovi.com>
* actioncontainer: stylehjk2011-09-051-3/+3
| | | | | | Change-Id: I8f83b11250817425a06c063532e5662cb72fb7dc Reviewed-on: http://codereview.qt.nokia.com/4204 Reviewed-by: hjk <qthjk@ovi.com>
* Merge app_version.h and ide_version.hEike Ziller2011-08-311-1/+2
| | | | | | | Change-Id: I703d4704a3bdf88bd567c92512ee27db6aea043c Reviewed-on: http://codereview.qt.nokia.com/3918 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* analyze: create a top level menu entryhjk2011-06-293-0/+25
| | | | | | | Change-Id: I17c4d17583d401fb537d5956f5b07a1dc12906e1 Reviewed-on: http://codereview.qt.nokia.com/893 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* Fix/add copyright headersTobias Hunger2011-05-0613-13/+13
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Fix more krazy warnings.Friedemann Kleint2011-04-191-3/+3
|
* add/unify i/o error handlingOswald Buddenhagen2011-04-181-29/+31
| | | | | | lots of use of Utils::FileSaver and Utils::FileReader Task-number: QTCREATORBUG-1619
* Merge branch '2.2'Oswald Buddenhagen2011-04-1413-182/+169
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update license.hjk2011-04-1313-182/+169
| |
* | Core/ProjectExplorer: Deprecate QDom in favour of QXmlStream-classes.Friedemann Kleint2011-03-311-39/+87
| | | | | | | | | | | | | | | | | | | | | | | | Rewrite PersistentSettingsReader/Write and CommandsFile to use QXmlStreamReader/Writer. Files will now be written out using native line endings and contain proper XML version information. Keyboard schemes will contain empty shortcut elements for empty elements. Rubber-stamped-by: con
* | API Documentation: Fix warnings.Friedemann Kleint2011-03-281-6/+6
|/
* Still changes to our options dialogLeandro Melo2011-02-282-24/+9
| | | | We decided to have text-based buttons by default.
* Revert "Make our options dialog a bit more uniform"Leandro Melo2011-02-281-9/+7
| | | | This reverts commit 561f87fcb9d58aaccbccd424417e71b79798ff6b.
* Revert "More options dialog UI changes"Leandro Melo2011-02-281-6/+0
| | | | This reverts commit c5b57ea5f9927a0843d37c793788892a5131c1ee.
* More options dialog UI changesLeandro Melo2011-02-251-0/+6
| | | | Continuing 561f87fcb9d58aaccbccd424417e71b79798ff6b
* Make our options dialog a bit more uniformLeandro Melo2011-02-251-7/+9
| | | | In terms of buttons, layouts, aesthetics in general.
* Implement renaming of tools and categories.con2011-02-185-0/+67
| | | | | | | 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.
* Read external tools from resources and show them in menu.con2011-02-181-1/+1
|
* actionmanager: rename Command::CA_NonConfigureable to CA_NonConfigurablehjk2011-02-092-4/+4
|
* Remove some unused code.con2011-01-241-5/+0
|
* Add removeShortcut method to the actionManager.Nicolas Arnaud-Cormos2011-01-243-1/+20
| | | | | | | 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>
* Make action containers aware of deleted commands.con2011-01-203-1/+16
| | | | They need to remove them from their internal structure.
* Refactor ActionContainer internals.con2011-01-204-145/+112
| | | | | | | 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).
* Another little fix for delayed registering actions.con2011-01-182-0/+2
| | | | Make them be correctly updated regarding to current context.
* ActionManager: Fix CommandAttribute enum to actually use a bit per valuedt2011-01-181-4/+4
| | | | | Task-Nr: QTCREATORBUG-3517 Reviewed-By: con
* Remove unused internal "CommandLocation".con2011-01-174-58/+8
|