aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/resourceeditor/resourceeditorw.h
Commit message (Collapse)AuthorAgeFilesLines
* ResourceEditor: Complete transition to Qt5-style connectOrgad Shaneh2017-03-201-5/+2
| | | | | Change-Id: I39380ed83f3d554d326b956cf729bc5f69f612c1 Reviewed-by: hjk <hjk@qt.io>
* Revert "Replace virtual isModified method with a getter/setter/notifier"Jarek Kobus2016-10-211-0/+4
| | | | | | | | | | This doesn't fix the issue with cleaning the clear state of undo stack. This introduced the issue when ui file is opened it's marked as modified. It reverts 59c90e00c1e8b18d120f5b5c15b331b1ee427ace and d0c537ca759aa7facfdd0efedac5f5385d16ddb9 Change-Id: Ifd4ff8483d6c297461632de500a4502b1fd0871f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Replace virtual isModified method with a getter/setter/notifierJarek Kobus2016-10-171-4/+0
| | | | | | | We have lacked the setter and dedicated notifier before. Change-Id: I58845a48259d260c5cc90ae94b173c79cddcfef9 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Wholesale conversion to #pragma oncehjk2016-03-301-4/+1
| | | | | | | Kudos to cgmb and https://github.com/cgmb/guardonce Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ResourceEditor: Properly support contents()Ulf Hermann2016-01-211-0/+1
| | | | | Change-Id: I1953153de66a1228ab98d6f3295696b2d8f1facb Reviewed-by: Eike Ziller <eike.ziller@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>
* Add default implementation for IDocument::fallbackSaveAs(Path|FileName)Eike Ziller2016-01-191-2/+0
| | | | | | | | | The methods are only relevant for documents without a filePath, and there was a mix of different irrelevant implementations present in subclasses. Change-Id: I4f57d306e5ddd913974cfe6ed0b4db062eb907a1 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* IDocument: Rename defaultPath and suggestedFileNameEike Ziller2016-01-141-2/+2
| | | | | | | | To fallbackSaveAsPath and fallbackSaveAsFileName. That makes it clearer what they are for, and that they actually belong to each other. Change-Id: Ie5b83b9db77d39a7fe9e979cc8f22b7f5b9101a3 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Add override to IDocument hierarchyEike Ziller2015-06-111-10/+11
| | | | | Change-Id: I6884f59fe0f06e380254c1f8076dd561d9df4ee3 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Editor manager: Abort with a single message if file is not readable.Eike Ziller2015-06-101-1/+1
| | | | | | | | | | | | | | We show a dialog that offers opening a file in a different editor type if opening a file fails, but we should not do that if opening the file fails because it is not readable. With this change, documents now specify if they failed to open a file because reading failed, or because they could not handle the file contents. Task-number: QTCREATORBUG-14495 Change-Id: I5d4b7cfa74b87ef21b9b55bc30b3ebe2f8238dfa Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Move "open" from IEditor to IDocumentEike Ziller2015-06-101-2/+1
| | | | | | | | | | For non-editor documents it currently is not used, but for editors it makes more sense to have that on the document instead of the editor. Most actual implementations of "open" were done in the documents already anyhow, because it is needed for reloading. Change-Id: I29d4df2078995cbe80172b51a9bebeecb3afad3c Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Add override keyword to IEditor & TextEditorWidget implementationsEike Ziller2015-06-091-4/+4
| | | | | Change-Id: I403101d788d9edfea5c5c9440ab4f39ad00e81f7 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Resource editor: Remove lots of indirectionsEike Ziller2015-06-091-10/+13
| | | | | | | | | | | Because only the tree view had access to the resource model, many methods in the IEditor instance and document were going their way through IEditor -> QRC editor widget -> tree view -> model. Create the model in the document instead, pass that model to the tree view, and let the document work on the model directly. Change-Id: I76405e60f118e2bbf63d3f9a4d39cd73be64aa14 Reviewed-by: Daniel Teske <daniel.teske@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>
* | Core: Use FileName for file path in IDocumentOrgad Shaneh2015-01-121-1/+1
|/ | | | | Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Resource editor: Fix paste.Friedemann Kleint2014-11-201-0/+2
| | | | | | | | | | Add a "plainText" property to the resource editor's document similar to the diff editor (see f268d0f8e14dd10e05180b4bc195fff036b5ba33 ). Task-number: QTCREATORBUG-13458 Change-Id: Icd11134432f796b37090a16bbaa13f075fa8c2bd Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* IDocument: Make mimeType a value memberhjk2014-07-011-2/+0
| | | | | Change-Id: I2e90ccf0a45ae8d00bcd00ec77fe0d9776f2f119 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Core: Make IEditor::id a value member and adjust usershjk2014-02-251-1/+0
| | | | | | Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6 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>
* Move IEditor::createNew to IDocument::setContentsEike Ziller2013-07-171-1/+1
| | | | | | | | | The method is for setting the contents, so it belongs to the document, and should be named correspondingly. Change-Id: I40363dc08f11268f530885b512e4a88e8b10d096 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Move IEditor::isTemporary to IDocumentEike Ziller2013-07-121-1/+0
| | | | | | | | | It's a property of the document implementation, not of the specific editor instance working on it. Change-Id: I5c3dd054e21b646e2d94b891916a096d045923f8 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Move displayName from IEditor to IDocumentEike Ziller2013-07-101-4/+5
| | | | | | | | The display name is not editor instance specific, but belongs to the document. Change-Id: I3c936f04a86e10e6ca30063d85036d85b4b5880e Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Rename IDocument::fileName --> filePathEike Ziller2013-07-091-1/+1
| | | | | | | That is what it actually is, wrt how Qt API calls it. Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Make IDocument::fileName a member with setter.Eike Ziller2013-07-091-3/+2
| | | | | | | | | | Instead of requiring subclasses to implement a method. Also renames IDocument::rename to IDocument::setFileName, since it doesn't really rename any files or such. Change-Id: I1344025c24d2f74a6a983e04fb0a5245f1f37aad Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Editors: Provide a base implementation for {save,restore}Statehjk2013-05-271-2/+0
| | | | | Change-Id: Iedfc0d59ecfe257ad5823cff39977bce82ada3a5 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Editors: Provide a base implementation for duplicate{,Supported}hjk2013-05-271-2/+0
| | | | | | | Helps avoiding trivial re-implementations. Change-Id: Iaa2e6b92503a2b9553432568c2047c28899c7ea6 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix Krazy warnings about includes/header guards in various plugins.Friedemann Kleint2013-03-131-3/+3
| | | | | | | 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>
* | Work around for an apparent MinGW-w64 compiler (4.7.2-2) bug.Ray Donnelly2012-12-131-1/+1
|/ | | | | | | | | | | | The public virtual inheritence of ResourceEditorDocument from Core::IDocument seems to be creating an invalid vtable. It's now just public inheritence which is all that is needed. The compiler in question was Ruben Van Boxem's 4.7.2-2. Change-Id: I66f54ec04ce5aad847ac5bd6a4807fbd613c2d99 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ResourceEditor: copy current resource path to clipboardKonstantin Tokarev2012-08-071-0/+2
| | | | | | | | | | This menu action provides easy way to insert references to resources into source code. Change-Id: I3a77910e82c6ef896cac8a2562d59bb9db78efa2 Reviewed-by: Eike Ziller <eike.ziller@nokia.com> (cherry picked from commit da3e3200afb1123fbd80c2b336ca6099ca386fa6) Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Use plain QrcEditor* instead of QPointerKonstantin Tokarev2012-07-241-3/+1
| | | | | Change-Id: Ie8529d0daf1573130212be7c0acfd42f7627a092 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Moved QrcEditor to Internal namespace, fixed namespace usage.Konstantin Tokarev2012-07-241-3/+1
| | | | | Change-Id: I24a142318cd6898ce32991085dcbeb7f00507f4e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Moved QrcEditor to ResourceEditor plugin.Konstantin Tokarev2012-07-181-5/+4
| | | | | Change-Id: I623b47ab4fdad7abf07e47abd99959f0326639c6 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Implemented file rename in ResourceEditor.Konstantin Tokarev2012-07-181-0/+2
| | | | | | | | | | Renaming supports version control. To prevent code duplication part of ProjectExplorerPlugin::renameFile implementation was separated into FileUtils::renameFile. Change-Id: I28481bea89d0824339e5db025ceb7216713bd5a0 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Highlight missing files in resource tree with red font.Konstantin Tokarev2012-07-091-1/+6
| | | | | | | Also added possibility to recheck file existance. Change-Id: I9f5e1d0499eb86238bb5c26420c48f322c87c65e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Open file with default editor when it's activated in ResourceEditor.Konstantin Tokarev2012-05-161-0/+3
| | | | | | | | This patch provides more convenient way to view/edit resource files than "Open With" context menu. Change-Id: I1c1fbfe48ed069d004f900e040b6517a4064b0f1 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-201-8/+8
| | | | | | | | 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>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-1/+1
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Make IFile::isReadOnly consistent.Eike Ziller2012-02-141-1/+0
| | | | | | | | | | | It is supposed to refer to the property of the file on disk (if there is any). Task-number: QTCREATORBUG-4998 Change-Id: Iaed62c17d124b364aecec4d1f910046bade42d40 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> 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>
* Provide "Open with" context menu in qrc editor.Eike Ziller2011-12-131-0/+7
| | | | | | | Task-number: QTCREATORBUG-4224 Change-Id: If2b13fa8b58779058d483d532c2c9649f7fa8dfd Reviewed-by: Jarek Kobus <jaroslaw.kobus@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-1/+1
|/ | | | | | | | | Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283 x Change-Id: Iab58bc34bc56371405d132315573b484a533b77c Reviewed-by: hjk <qthjk@ovi.com>
* add auto-saving of modified editorsOswald Buddenhagen2011-05-121-2/+6
| | | | Task-number: QTCREATORBUG-2847
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 11:50:48 +0000