aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/locator/locatorwidget.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Core: Merge Find and Locator into Core pluginhjk2014-01-141-594/+0
| | | | | | | Change-Id: I7053310272235d854c9f409670ff52a10a7add8b Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Always use display names in locator context menu.Eike Ziller2013-10-081-1/+1
| | | | | | | Task-number: QTCREATORBUG-10340 Change-Id: I442811a66c3f1a54343dadacbcfa633c18632584 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Core: Clean up FileIconProvider interfacehjk2013-09-131-1/+1
| | | | | Change-Id: I98c3c8796cb887f5bb3c5184854562ff36727836 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Locator: Simplify conditionOrgad Shaneh2013-08-231-2/+1
| | | | | | | | a || (!a && b) === a || b Change-Id: I3d3b602fa496a7d5a1f57a95ebedf30748429850 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Locator: Whitespace fixes.Andre Hartmann2013-08-231-9/+9
| | | | | Change-Id: I8ae3c7b28586d8248a677c9f1f365cacf0709240 Reviewed-by: hjk <hjk121@nokiamail.com>
* Locator: Fix locator behavior with qt5Daniel Teske2013-08-221-14/+6
| | | | | | | Task-number: QTCREATORBUG-10013 Change-Id: I2bf55cfa2fe1e11bac56cced765789566b659469 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Locator: Do not popup on focus inOrgad Shaneh2013-08-211-1/+4
| | | | | | | | | | * When a dialog initiated by the locator is closed * When the main window loses focus Task-number: QTCREATORBUG-9953 Change-Id: Iff923320e7f1cc9a633d3a6a9bee1fa49b41bb68 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Locator: Refactor out filter_helper for testsNikolai Kosjar2013-08-191-25/+3
| | | | | | | ...and rename it to runSearch. Change-Id: I12482b62751a234982f41cafb7e63a641012bc30 Reviewed-by: David Schulz <david.schulz@digia.com>
* Add split in new window action for editor views.Eike Ziller2013-05-081-0/+2
| | | | | | | | | | | | | A few details are still to be done: - extra windows are not restored yet - window title of extra windows should show information about current editor - the "raise main window" hack for Linux doesn't work with Qt 5 But it should already now be quite usable. Change-Id: I638583ee4b2abe32e95c261bdf31b4a10b472748 Reviewed-by: David Schulz <david.schulz@digia.com>
* Clean headers in Locator.Friedemann Kleint2013-04-031-11/+0
| | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: Icaa569dcfe4d4a03094122a7f113799dc4ce83f6 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Clean headers in Core-plugin.Friedemann Kleint2013-03-271-0/+1
| | | | | Change-Id: Ie79d334765ca5c6a034fa2f5eccff5d45b481975 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Locator: Remove unneeded #ifdef.Christian Kandeler2013-03-191-4/+6
| | | | | | | Get host OS info at runtime. Change-Id: I1b64a95021eac969cc7fa51ca16a8d11b0b03e3c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fix Krazy warnings about values or keys iteration in various places.Friedemann Kleint2013-03-151-4/+8
| | | | | Change-Id: Iced108cc7fc74f6ce5501c59db7090fea21cb87a Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix Krazy warnings about includes/header guards in various plugins.Friedemann Kleint2013-03-131-3/+0
| | | | | | | Change-Id: Iafd1b3be1ad43bb7519e14059ac2d33eb859c625 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Locator: Fix valgrind warning about uninitialized variable.Friedemann Kleint2013-01-311-1/+2
| | | | | | | | | | Change-Id: Ie46af65a76c8da847d0f8b12ca4d3e8f5beb61dc Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Core: simplify ILocator interfacehjk2013-01-181-15/+14
| | | | | | | | | | | | | | | | | | Use data members instead of virtual functions for id, displayName and priority, use Core::Id, not QStrings for id, de-pimpl CommandLocator. Change-Id: Id8b41f184cb995138b2d76c923d6d3ae02b7e3f5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* | Use Id::fromString instead of the constructor.hjk2013-01-171-2/+3
| | | | | | | | | | Change-Id: Ie18714ac2872a085e8c20d445472901cc9f6b6c5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* | Use Core::Id in ICore::showOptionsDialoghjk2012-12-291-2/+3
| | | | | | | | | | Change-Id: I3865fde2347d687a7dee76dd5ca62db69cc4dd04 Reviewed-by: hjk <qthjk@ovi.com>
* | Locator: Fix icon for files/directories ending with "[+:][0-9]*"Eike Ziller2012-12-061-5/+3
| | | | | | | | | | | | | | | | | | They didn't have an icon at all on Mac/Win. On Linux, directories had the default file icon, and files that matched a registered mimetype (like .c++) didn't get the mimetype icon. Change-Id: I57875a2743e6499fd4aabba70b95907b5ab8ac01 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-111-1/+2
|\| | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbp src/libs/ssh/sshconnection.cpp Change-Id: I2946cbec1b5159eef9e47949860b28fba1e51529
| * Fix compilation with Qt5Eike Ziller2012-10-111-1/+2
| | | | | | | | | | Change-Id: Ib74a8c94f74974e1154f381afdf10ecf9198a9be Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-051-21/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessageloghandler.h src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/madde/maemodeployconfigurationwidget.h src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentinfo.h src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/ichecklib_global.h tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h tests/manual/ssh/tunnel/tunnel.h Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
| * Adjust license headershjk2012-10-051-21/+20
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Do not use QAbstractItemModel::reset().Christian Kandeler2012-09-201-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie49bdf576a6d3543aef6df133b27c8827775c935 Rationale: a) It is conceptually cleaner to do the changes to the model in between calls to beginResetModel() and endResetModel, respectively. b) The function is deprecated in Qt 5, for exactly that reason. Reviewed-by: hjk <qthjk@ovi.com>
* | Utils: Introduce HostOsInfo class.Christian Kandeler2012-08-271-11/+15
|/ | | | | | | | | | | | | The class' member functions are intended to be used instead of the Q_OS_* macros in all contexts where the latter are not syntactically required. This lowers the likelihood of changes made on one platform breaking the build on another, e.g. due to the code model missing symbols in #ifdef'ed out code when refactoring. Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa Reviewed-by: hjk <qthjk@ovi.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Allow specifying line number when selecting a file with the locator.Francois Ferrand2012-06-211-2/+4
| | | | | | | | | | | | | | | | When using the file selections locators (OpenDocumentsFilter, FileSystemFilter, and those inherited from BaseFileFilter), allow specifying the line where to open the file: like 'file.cpp:654'. This syntax works for wildcards/incomplete expression as well: toto:423 will match 'toto', and open resulting file at line 423. Also, fix line extraction in editormanager, to support a single semicolon (without number) as well as a line explicitely set to 0. Change-Id: I80e13b59aa9c972f33963cfee81ec04f277fe526 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* ActionManager API cleanup.Eike Ziller2012-05-251-4/+3
| | | | | | | | d-pointer instead of inheritance static methods Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258 Reviewed-by: hjk <qthjk@ovi.com>
* Remove dead code.Eike Ziller2012-05-161-47/+1
| | | | | Change-Id: I693fa221027a10c739bde0d27813a57fefbf836f Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Normalized connect()sRobert Loehning2012-03-061-1/+1
| | | | | | Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-20/+20
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Move QtConcurrent library into Utils.Friedemann Kleint2012-02-091-1/+1
| | | | | | | | It causes a conflict with the new QtConcurrent library of Qt 5 and is quite small. Change-Id: Ib97ab6daf8f67a88300cf03f044ba3593a4cd270 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Core::ModeManager: make some functions statichjk2012-01-271-1/+6
| | | | | | Change-Id: I5c1275ba3f596d8911fd2e4404181bf57b58f494 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | 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-2/+2
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Locator: Compile with QT_NO_CAST_FROM_ASCII.Friedemann Kleint2012-01-201-4/+5
| | | | | Change-Id: I7b4b5e25aba9f2de9cbfde0f4553685cd4e01346 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* fix for locator using up and down keys under macDavid Schulz2012-01-181-59/+53
| | | | | | | | Fixes the issue that you cannot switch elements by the up- and downkey in the locator under mac. Task-number: QTCREATORBUG-6826 Change-Id: I452bb487608fad3b32c845036939f02e9cf4b3b6 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* added tooltip popup if alt-key was pressed and releasedDavid Schulz2012-01-111-32/+81
| | | | | Change-Id: I167aca3c6f0e25d9a7a76f9e0d51ae85ed1a3a8f Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-111-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | 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-031-2/+2
| | | | | | | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | more Id type fixeshjk2011-11-101-2/+2
|/ | | | | | | | | Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283 x Change-Id: Iab58bc34bc56371405d132315573b484a533b77c Reviewed-by: hjk <qthjk@ovi.com>
* Move some settings pages.Eike Ziller2011-09-201-1/+2
| | | | | | | | | | Reducing vertical size of preferences dialog, and moving languages settings adjacent. Change-Id: I1cb5a4310350a0552c920982854f671ae443ed7e Reviewed-on: http://codereview.qt-project.org/5251 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Wait with activating/opening a Locator entry until update has finishedEike Ziller2011-08-051-10/+32
| | | | | | | | | | | | So, if you pressed the enter key faster than the list updated, it will wait for the list to update and then select an entry, which is much saner behavior. Task-number: QTCREATORBUG-5710 Change-Id: Ic98d48122c9db1aad903f9b76040ae5c14a8c44e Reviewed-on: http://codereview.qt.nokia.com/2667 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bill King <bill.king@nokia.com>
* Show shortcut for LocatorEike Ziller2011-07-051-1/+5
| | | | | | | | | Task-number: QTCREATORBUG-5164 Change-Id: Idd73a88697167de3de984de8519d8bddaa7aefb3 Reviewed-on: http://codereview.qt.nokia.com/1084 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 11:25:52 +0000