summaryrefslogtreecommitdiff
path: root/src/plugins/qmljseditor
Commit message (Collapse)AuthorAgeFilesLines
* Utils: Rename PathChooser::changed() signal.Christian Kandeler2015-09-031-1/+1
| | | | | | | | | The name is overly generic, particularly with a pathChanged() signal also present. Rename to "rawPathChanged", which adequately describes the semantics. Change-Id: Ia62b8b0a97a794cb6d5ad6b8ce0abcd36b5f5cdb Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Clang: Add diagnosticsMarco Bubke2015-08-312-3/+3
| | | | | | | | Diagnostics are now moved to the clang backend process. Fixits are supported too. Change-Id: I20faacf466bbf78dec479220c3d7b336a47bc453 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* QML/JS: Fix that warnings about editing .ui.qml files accumulatedEike Ziller2015-08-194-14/+18
| | | | | | | | | | Splitting the editor would add the warning again. Since the warning is a document property, handle it in the document instead of the widgets. Change-Id: Ie20377b05dee14983f7ff46ba04ed2af2b737c96 Task-number: QTCREATORBUG-14923 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* PNG: Run pngcrush on images with iCCP or sRGB profilesTobias Hunger2015-07-031-0/+0
| | | | | | | | This quietens warnings from libPNG during startup and shrinks the image sizes. Change-Id: Ieb4cb5e8ba30b99653896e283c2fb2cc267257f2 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Fix inserting on extra curly brace upon pressing enter key.Marco Benelli2015-06-161-0/+3
| | | | | | | | | Special handling of the case in which the current token is Token::RightBrace. This works in every case *except* for nested braces without separator between them. Change-Id: Ief625086c4d33ba77b36b1181e78cad124feb7a9 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Introduce dragging for all explorer nodes.Jochen Becher2015-06-151-3/+3
| | | | | | | | | | | | | Extend drop support with variant values. A drop may be a file drop or a value drop or both. Rename Utils::FileDropSupport to Utils::DropSupport and add methods to add not only files but any QVariant value to the mime data. Project explorer adds dragged nodes (which will be needed for future ModelEditor plugin). Change-Id: I799542c60fdecb3e64af0d3ba47b6caa9adbcfd7 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Add override to IDocument hierarchyEike Ziller2015-06-111-3/+3
| | | | | Change-Id: I6884f59fe0f06e380254c1f8076dd561d9df4ee3 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Add override keyword to IEditor & TextEditorWidget implementationsEike Ziller2015-06-091-12/+12
| | | | | Change-Id: I403101d788d9edfea5c5c9440ab4f39ad00e81f7 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* qmljseditor: s/Q_DECL_OVERRIDE/override/gTobias Hunger2015-06-043-26/+26
| | | | | | Change-Id: Ie01505be57f8e16b782ebd8ed1ff339cfb63cd8c Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* CodeAssist: Support asynchronous processing without threadsNikolai Kosjar2015-06-032-3/+3
| | | | | | | | | | | | | | | | | This is required for the CodemodelBackendIPC integration in the ClangCodeModelPlugin. Since the heavy calculation happens in a separate process, we only need to send appropriate requests and receive results for a working completion. However, the CodeAssist API does not fit here since it only provides means of caculating the results in the main thread or a worker thread. We can't use the worker thread approach since that would lead to threading issues regarding QLocalSocket in CodemodelBackendIPC. IAssistProcessor::setAsyncProposalAvailable() will hand the results back to CodeAssist in order to display them. Change-Id: I496192560fb406ec40fa8bcb7904f7a03d2eef50 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Qml&Js: properties/methods/enums inspectionNikita Baryshnikov2015-04-154-2/+176
| | | | | | | | .. of builtIn qml and cpp code over "Inspect API For Element Under Cursor" action. Change-Id: I70d5bec2933b682295c5242248a2b0f95dba4e76 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.4'Eike Ziller2015-04-023-3/+9
|\ | | | | | | | | | | | | Conflicts: src/libs/extensionsystem/pluginview.cpp Change-Id: I316199fe0a257cb085668ccb183b1590555278f2
| * Fixed wrong behavior of "Move Component in Separate File" for qml.Marco Benelli2015-04-023-3/+9
| | | | | | | | | | | | | | | | The dialog accepted/rejected value is now checked. Task-number: QTCREATORBUG-14175 Change-Id: I9a39c0cf87b7e11613a333b2d3a63b77e39b6d97 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Remove a few unneeded "QT += script"sAlessandro Portale2015-04-011-1/+0
| | | | | | | | | | Change-Id: I078300c7b7a9667109754522048736c886b815ae Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.4'Eike Ziller2015-03-111-3/+4
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/coreplugin/coreplugin.cpp Change-Id: I9aa6c61412e2ef4a91efe028296bcc2d075856d7
| * QmlJSEditor: Export QmlJSCompletionAssistInterfaceOrgad Shaneh2015-03-101-3/+4
| | | | | | | | | | | | | | Requested in the mailing list Change-Id: Ica71665f72dbe448fbe5a0fe82c4113c22d06324 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Remove aggregation dependency from project filesNikita Baryshnikov2015-03-092-2/+0
|/ | | | | Change-Id: Idfd3941f47b71d6b84306d88604b744e3585e4af Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Clean headers in lib qmljs and plugins qmljstools, qmljseditor.Friedemann Kleint2015-03-055-3/+3
| | | | | Change-Id: I3256db8f4d42b6326d986d754b45e6c6c2030839 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Clean exported headers of the TextEditor plugin.Friedemann Kleint2015-02-261-0/+1
| | | | | Change-Id: I1e7dd34ba5a51fb0b34d137dc03add4457b32ed1 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Core: Make Context parameter to registerAction optionalhjk2015-02-261-5/+4
| | | | | | | | | ... and default to C_GLOBAL. A rather common case. Similar for ActionContainer::addSeparator(). Change-Id: I7f9ba573af201c0a472132d5a494ad17cc4175b7 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* QmlDesigner: Remove unneeded qualificationsOrgad Shaneh2015-02-1812-81/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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: I492792bb9e5655c55795e938031efc557c9a462f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlJSEditor: Adding and exporting helper function for usagesThomas Hartmann2015-02-172-1/+32
| | | | | | | | This patch adds and exports findUsageOfType() which can be used in e.g. the Qt Quick Desigener. Change-Id: I6e87df746bdb377485da052823f86b89d638ac2f Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
* ProjectExplorer: Use FileName for Node::pathOrgad Shaneh2015-02-131-1/+4
| | | | | | Change-Id: I4a41cfb629be8bb06b4b0616cd4475525e617a51 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-1255-328/+328
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1655-328/+328
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Do not use QDir::separator() for internal pathsOrgad Shaneh2015-02-022-7/+4
| | | | | | | | | | | | | | Internal paths are supposed to be normalized Change-Id: Ic6943ce13ad389dfdb44054a9e6f03da8c6cd88d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Outline: Redo save/restore of settingsKai Koehne2015-01-132-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OutlineStackWidget stored its position in the outline to be able to save/restore settings specific to the sub-widget (IOutlineWidget). However, the index can get out sync if another NavigationWidget with a lower index number is split, and the relative position changes. The change therefore avoids saving an index, and rather keeps the sum of all sub-widget settings in a QVariantMap, only reading and writing to the global settings object if necessary. The settings are also not stored in the [General] section anymore, but in a subgroup [Sidebar.Outline.X], where X is the index of the outline in the view. This avoids having to always iterate over all keys. No effort has been made to take over the old settings. I doubt anyone will notice, though. Change-Id: I85017cbb3e32b0a16da43ce6339deb7a053d6b09 Task-number: QTCREATORBUG-13614 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | Core: Use FileName for file path in IDocumentOrgad Shaneh2015-01-124-10/+10
| | | | | | | | | | Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Utils: Start simplification of tooltip handlinghjk2014-12-081-3/+2
| | | | | | | | | | | | | | | | There's a bit too much unneeded flexibility in there, requiring extra boiler-plate code on the user side. Change-Id: I34d03838fb1cd3182fcbb93bf65158ebfc7e2bce Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Completely rework currentNode/currentProject handlingDaniel Teske2014-12-031-2/+2
|/ | | | | | | | | | | 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>
* qbs build: Remove unneeded import statements.Christian Kandeler2014-11-101-2/+0
| | | | | | | The respective items are available without it. Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possiblehjk2014-11-031-1/+1
| | | | | | | | Faster. Change-Id: I91aa67462e11ff3258600d7f158de79942d0dc81 Reviewed-by: Marc Reilly <marc.reilly@gmail.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* License update.Eike Ziller2014-10-151-1/+1
| | | | | Change-Id: I0acde2c3b995693de682679471f03af85bdd0a61 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* TextEditor: Factory cosmeticshjk2014-10-151-3/+3
| | | | | | | Pimpl, add some convenience setters. Change-Id: I525c080179fddab6fe2bd2270505fdbf33e56be2 Reviewed-by: David Schulz <david.schulz@digia.com>
* JsonWizard: Replace JsFileWizard with a JsonWizardTobias Hunger2014-10-145-214/+0
| | | | | Change-Id: I4da3485ed83fda7f17f3fa9a1f3d59bfabb7ea4d Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/3.2'"Eike Ziller2014-10-1456-392/+448
|\
| * Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-1456-392/+448
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0963-436/+498
| | | | | | | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | | QmlJSEditor: warn when editing .ui.qml, activate designer checksThomas Hartmann2014-10-143-1/+24
|/ / | | | | | | | | | | Change-Id: I2f6d39633341bd1197d16c5c097573d4ab090896 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | JsonWizard: Replace QmlFileWizard with JsonWizardsTobias Hunger2014-10-096-157/+1
| | | | | | | | | | Change-Id: If1079db1f4e3eb4fc62d0066a43aa58c072e2290 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | TextEditor: Move CompletionAssistProvider constructionhjk2014-10-062-3/+1
| | | | | | | | | | | | | | | | | | ... to the editor factories and pass it to the document, not the widget. Saves some code, puts fewer objects into the object pool. Change-Id: Iaaf250af74dc4e0c62700873accbb40ba88b7d9e Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* | TextEditor: Remove HighLighterFactoryhjk2014-10-021-12/+0
| | | | | | | | | | | | | | Unused. Change-Id: Idd9805756c51e025e99842fa6fc8707b10927c4d Reviewed-by: David Schulz <david.schulz@digia.com>
* | JsonWizard: Replace TextFileWizard with JsonWizardTobias Hunger2014-09-301-1/+0
| | | | | | | | | | Change-Id: Iae2833554529c2f333d9781eb0f7fa28f3bfde79 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | TextEditor: Simplify HoverHandler handlinghjk2014-09-304-14/+6
| | | | | | | | | | | | | | | | | | | | The editor factories are already a central place to associate hover handlers with editors, no need to retrieve them later from the object pool again. This also allows for easy handling of more than one active handler per editor. Change-Id: Ie716b96f5ce6b526ee897468635e03e909d81538 Reviewed-by: David Schulz <david.schulz@digia.com>
* | TextEditor: Flatten QuickFixAssistProcessor hierarchyhjk2014-09-302-29/+1
| | | | | | | | | | | | | | | | | | {Cpp,QmlJS}QuickFixProcessor were doing the same (storing a single pointer to a IAssistProvider). This could be done in the base class with the leaf classes removed. Change-Id: I0e419f37c5547d5ddfcfd1a767d356040dd7e56f Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | Editors: Support dragging from outline viewsEike Ziller2014-09-303-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | Fill the line and column information in the location returned by QmlOutlineModel::sourceLocation for that. The drag & drop code also needed a way to override the executed drop action for file drops, because the QML outline supports move-drags, which would lead to the items being removed from the outline when dragged onto a split... Change-Id: I2478abc7d5aa2f3aa676cdd609ecb69a50adce8c Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | TextEditor: Rename BaseTextEditorWidget to TextEditorWidgethjk2014-09-298-26/+26
| | | | | | | | | | | | | | ... and some of the related implementation details Change-Id: I1f03aa5acf2d3fb2cfc2a6a7845f3d3578b0408d Reviewed-by: David Schulz <david.schulz@digia.com>
* | TextEditor: Add a convenience append method for quick fixeshjk2014-09-265-9/+8
| | | | | | | | | | | | | | Less noise on the user side. Change-Id: Ia5b495a1f9d3ec43623056d793f6771b3b84fd6b Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | TextEditor: More BaseText* -> Text* renamingshjk2014-09-268-12/+12
| | | | | | | | | | | | | | *Document* and *Layout* classes, all basetext* files Change-Id: I1c6e376733a434fcb5c7f19c6210dfa031eeafde Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Rename {Core,TextEditor},{Base,}TextDocument classeshjk2014-09-252-3/+3
| | | | | | | | | | | | | | | | | | First step of some more 'Base' removal in TextEditor. s/Core::TextDocument/Core::BaseTextDocument/ s/TextEditor::BaseTextDocument/TextEditor::TextDocument/ Change-Id: I71ba325a2f0ad72ec9dae0d96846cbae72d326f7 Reviewed-by: hjk <hjk121@nokiamail.com>