summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/projecttreewidget.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Session: Remove addProjects(...) methodTobias Hunger2016-06-141-1/+1
| | | | | | | | | | | | It is unused. Also remove singleProjectAdded signal, and replace the only use with the projectAdded signal. The singleProjectAdded signal was emitted for each project that was ever added, simply because nobody ever used addProjects(...) with more than one project. Change-Id: I5aee315c64a2cfb721471d580989a6a02d44fefc Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Projectexplorer: Modernize codebaseTobias Hunger2016-04-151-13/+7
| | | | | | Change-Id: I4793b58aa77bcd46af99f8b843c0f7439cdc9269 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
* ProjectExplorer: Use Qt5-style connectsOrgad Shaneh2016-02-011-24/+26
| | | | | | | The heavy lifting was done by clazy. Change-Id: I619db09a79760186b72e7662490ed1205155c1a7 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ProjectExplorer: WS fixesOrgad Shaneh2016-02-011-6/+6
| | | | | Change-Id: I49c961159ad1d3ece0e55f453377daa879ef7703 Reviewed-by: hjk <hjk@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Themed Icons: Introduce Utils::IconAlessandro Portale2015-11-251-5/+3
| | | | | | | | | | | | | | Instead of describing icons via file name or in the themed icons case via a string that is a list of mask/color pairs, we have now a class for it. Icons are now listed in per-plugin *icons.h headers. RunControl::m_icon was The only place left where an icon property was in fact a string. This patch changes that member to be a Utils::Icon. Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* ProjectNode: Rename path() to filePath()Tobias Hunger2015-11-031-7/+7
| | | | | Change-Id: I78bb73f8c9457fd74c470eacbf54eb9195ac9681 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.6'Eike Ziller2015-10-301-0/+1
|\ | | | | | | Change-Id: I68512c775ed25b51c8b0abe1818c9c7c5955874c
| * ProjectExplorer: Add a soft assertionOrgad Shaneh2015-10-291-0/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-15246 Change-Id: Ide3d94f6a72579626feb0f031c5381518db45326 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Icon refresh: First step towards the new Qt Creator themesAlessandro Portale2015-10-231-2/+4
|/ | | | | | | | | | http://blog.qt.io/blog/author/didesous/ announced new designs/themes for Qt Creator. This patch replaces many of the existing toolbar icons with recolorizable masks for better theming support. Change-Id: I557aa485205fe2624f33724226f698c303342b40 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Open Project: Don't show a error dialog for duplicated projectsDaniel Teske2015-08-241-1/+13
| | | | | | | | | | | | Instead, switch to edit mode, show sidebar, scroll to project, and show a tooltip next to the project. The tooltip is somewhat easy to miss, but this is a clear improvement in most cases. Change-Id: Icd27f76e7d434f33e731b6fd56473ff913986a89 Task-number: QTCREATORBUG-8422 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* ProjectExplorer: Add missing override modifiers.Christian Kandeler2015-08-201-1/+1
| | | | | Change-Id: I8f71a0992baead514a9c0962d5a574e75a5cb733 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* ProjectTree: Improve resizing of project treeDaniel Teske2015-08-101-0/+56
| | | | | | | | | | | | | On each resize event the treeview iterated over all rows to get the maximum width of them. That involves text layout and is very slow with bigger trees. So cache the size hint for the column and connect to all signals that can potentially change the size hint. Change-Id: I83a13982848df56515fed8225ced336096370546 Task-number: QTCREATORBUG-8075 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* ProjectTree: Improve save/load of expand dataDaniel Teske2015-04-271-14/+32
| | | | | | | | | | | | | | | | | So far the code only saved the path of the expanded nodes, which always created problems for nodes that had the same path. This broke for the virtual folders SOURCES, FORMS, HEADERS recently because they have nowadys the same path. They used to have different paths. This new code saves both the path and the displayname and compares that, this fixes the expanding for those folders. Obviously there is no sure way to indetify the right nodes to expand, and this isn't backwards compatible. Change-Id: I9854f90ca942f92420970765b0cc19138ad5d63d Task-number: QTCREATORBUG-14304 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Optimize ProjectTree for adding folders/filesDaniel Teske2015-03-091-2/+6
| | | | | | | | Instead of searching the whole tree for the current node, only check the newly added files/folders. Change-Id: I015a955815223767367c4cad476d0620f69abd71 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Clean exported headers of the Core plugin.Friedemann Kleint2015-03-051-0/+1
| | | | | Change-Id: I26472d568844d5fee62323e01f5c5c12082d5450 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* ProjectExplorer: Use FileName for Node::pathOrgad Shaneh2015-02-131-8/+8
| | | | | | Change-Id: I4a41cfb629be8bb06b4b0616cd4475525e617a51 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-161-6/+6
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | ProjectExplorer: Remove unneeded qualificationsOrgad Shaneh2015-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly done using the following ruby script: Dir.glob('**/*.cpp').each { |file| next if file =~ %r{src/shared/qbs|/qmljs/} s = File.read(file) s.scan(/^using namespace (.*);$/) { ns = $1 t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m| before = $1 char = $2 if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/ m else before + char end } if t != s puts file File.open(file, 'w').write(t) end } } Change-Id: I1d05d48b23f44e3d589cc2a790803714786b57d2 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* | Remove DocumentManager::currentFile, use DocumentManager::currentEditorDaniel Teske2015-01-191-1/+3
| | | | | | | | | | Change-Id: Ided1a14481cfbbcc49e901f3837e056582ff60e3 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | ProjectTree: Fix context menu actionsDaniel Teske2015-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Opening the context menu would move the focus, which then would reset the current node/project to come from the DocumentManager. So move the context menu handling code to the ProjectTree class and ensure that while it is open, the corresponding ProjectTree is considered the focused widget. Task-number: QTCREATORBUG-13684 Change-Id: I8b3dc410f5f5bc5e9a2dd663421b22cf3f147190 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Fix crash in ProjectTree on restoring a sessionDaniel Teske2014-12-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | On adding nodes to the node structure, both the FlatModel::nodesAdded and ProjectTree::nodesAdded code is run. We need to ensure that FlatModel::nodesAdded is run first though, as we need that information in the ProjectTree. Task-number: QTCREATORBUG-13667 Change-Id: I0b4b41ed6036cfdef668c16689d25611633ab0c9 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Completely rework currentNode/currentProject handlingDaniel Teske2014-12-031-28/+57
|/ | | | | | | | | | | Centralize the handling inside a new class ProjectTree. React to moving focus and remove most special handling. This properly fixes the linked task. Task-number: QTCREATORBUG-13357 Change-Id: I6b06aa32b1e4305ec8a6d432857b302585d8734b Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* ProjectTree: Fix saving of tree expansion state in sessionDaniel Teske2014-10-221-5/+24
| | | | | Change-Id: I747b36b0f6a63dcf60eebd95cb1acf72e1629c1c Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/3.2'"Eike Ziller2014-10-141-7/+8
|\
| * Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
| | * License updateEike Ziller2014-10-091-7/+8
| | | | | | | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | | ProjectExplorer: Remove redundant namespace qualificationsOrgad Shaneh2014-10-141-3/+3
|/ / | | | | | | | | Change-Id: Id9034e31f3f61c38894111951534dd0d59b746dc Reviewed-by: hjk <hjk121@nokiamail.com>
* | Fix handling of current node if project tree view is hiddenDaniel Teske2014-10-091-33/+0
| | | | | | | | | | | | | | | | | | | | I'm not 100% sure that this fixes the crash from QTCREATORBUG-12876. But it's clearly wrong to only check for removed nodes in the project tree widget and thus only if a tree widget is shown. Task-number: QTCREATORBUG-12876 Change-Id: Iaaafcef0fe408e8bc2f4d2b61133f4419a612d57 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | ProjectExplorer: Apply static pattern to ProjectExplorerPluginhjk2014-09-261-13/+12
| | | | | | | | | | | | | | Adjust caller sites and surroundings. Change-Id: I6c3c80e42f35eabedc1f89c8c42cca1025aca12f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | ProjectTree: Support dragging files onto editor splitsEike Ziller2014-09-101-0/+2
| | | | | | | | | | Change-Id: I26e4de2818d89c012526116851d67155d3eeaa7e Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | FindToolBar: Add support for "lightcolored" panelsDaniel Teske2014-08-121-1/+2
| | | | | | | | | | | | | | | | The labels need to be polished so that they get the right palette, and the icon needs to be switched from light to dark. Change-Id: I3e37947e741c3d92f3c1ac3bb02e631aa7803f59 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | TreeViewFind -> ItemViewFindDaniel Teske2014-08-111-3/+3
| | | | | | | | | | | | | | The code changes to enable this is minimal. Change-Id: Ia5571adcc724e89eb5c68a5f91e38b9cf274516d Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | ProjectExplorer: Select the current node with more magicDaniel Teske2014-07-081-0/+56
| | | | | | | | | | | | | | | | | | | | If there are multiple file nodes for the same file, check in how many project views they are expanded and select the one that is expanded in most. Task-number: QTCREATORBUG-12595 Change-Id: Ic4a640a80b8244b30b8dec62248aebeeaf9216cf Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Core: Use some data members in NavigationWidgetFactoryhjk2014-07-011-24/+4
|/ | | | | | | Adjust user code, remove unused bits. Change-Id: I351deb27679c9251518a4d1bf7f78a12bacae2fb Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ProjectTreeView: Find all nodesDaniel Teske2014-06-121-1/+2
| | | | | Change-Id: I5c28c7f05b8e4766a5e04e00d9c8cd7e48b8cd95 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Add search to project tree.Eike Ziller2014-06-121-1/+2
| | | | | Change-Id: I1c3c3dbb27adebcacfbb1e937e76e7ff2dd3d385 Reviewed-by: Daniel Teske <daniel.teske@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>
* SessionManager: Apply 'static' patternhjk2013-09-051-10/+12
| | | | | Change-Id: I370f72fcf7a24216ee189979ce6b5c8bfc5f4140 Reviewed-by: David Schulz <david.schulz@digia.com>
* Core::Id: Remove some explicit casts to Core::IdTobias Hunger2013-09-031-1/+1
| | | | | Change-Id: Ibe505c8331f7d1280fdb8784a00321742f5d94cb Reviewed-by: hjk <hjk121@nokiamail.com>
* Fix possible crash when clicking on Filenodes with a line numberTobias Hunger2013-08-061-1/+1
| | | | | | | | | If the path() set on that node can not be opened, then the editor is 0 and thus there is a crash. Task-number: QBS-367 Change-Id: I8887a3bb84e19292d97357df49ef988d74bf6739 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Switch less often to edit modeEike Ziller2013-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This change * Removes IMode::type, ModeManager::activateModeType, and IEditor::preferredModeType, and adds IEditor::isDesignModePreferred instead * Adapts the mode switching code in EditorManager to handle multiple windows, for example switching to edit mode should only happen if the editor/view is in the main window. Otherwise the editor window should be raised and focused * Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor * Reverts the EditorManager::ModeSwitch logic to switch mode or make the current editor visible by default, introducing DoNotMakeVisible flag instead * Fixes a few instances where EditorManager::ModeSwitch should have been used One non-trivial problem left: If you open a .ui file and switch to an external editor window, edit mode is activated, because the current editor no longer is a .ui file, which means that the design mode gets deactivated. Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41 Reviewed-by: David Schulz <david.schulz@digia.com>
* Clean headers in ProjectExplorer.Friedemann Kleint2013-03-261-7/+0
| | | | | | Change-Id: If61a8a91d2a39c5c97974a5bfcef91892b68d3f1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectTree: Preserve selection when enabling syncOrgad Shaneh2013-02-071-3/+5
| | | | | | | When current open file is selected Change-Id: I24567008ce22e4ebd9810fbbf498a90b7f586ce0 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectNodes: Add line information and act on itTobias Hunger2013-01-311-2/+6
| | | | | | | | Also allow for the path to be set. Qbs can move products from one file to the next, so that is needed there. Change-Id: Iebaf3be40fdb0e5e462d45b00cf46d58f985a163 Reviewed-by: hjk <hjk121@nokiamail.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>
* | Allow for disabled nodes in Projects viewTobias Hunger2013-01-211-1/+19
| | | | | | | | | | Change-Id: I8b9a2666c8efdc5981adfe6a3a032884a6e50d2a Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | ProjectTreeWidget: Use Core namespaceOrgad Shaneh2013-01-111-14/+14
| | | | | | | | | | Change-Id: Ica77f730a2461db20269b291639118f97dae2f88 Reviewed-by: hjk <qthjk@ovi.com>
View Lorry Controller Status