summaryrefslogtreecommitdiff
path: root/src/plugins/texteditor/plaintexteditor.cpp
Commit message (Collapse)AuthorAgeFilesLines
* TextEditor: Merge PlainTextEditor into Basehjk2014-07-301-77/+0
| | | | | | | | Same patter. Plain is fully merged now, so remove the files, too. Change-Id: Id8c0ba5689ad9980a0db3580cb9833344fd911f3 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* TextEditor: Replace PlainTextDocument by Base + a setup functionhjk2014-07-301-12/+0
| | | | | | Change-Id: I1088062d0b74fd0dd69e92c55cc8bb80da61ae2d Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* TextEditor: Replace PlainTextEditorWidget by Base + a setup functionhjk2014-07-301-28/+3
| | | | | | Change-Id: I91a3bfb66a72e9234ca59f97d5260bbfc3ccb0d3 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* TextEditor: Move remaining PlainTextEditorWidget functions to Basehjk2014-07-301-22/+2
| | | | | | | Change-Id: Ib10d938fce352f59bcd40f1c6aa493794fe90f8d Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* TextEditor: Remove indenter construction from PlainTextEditorWidgethjk2014-07-301-8/+0
| | | | | | | | | Do it in the users "that know" and remove the special constructor case. Change-Id: I9298c8d13118068adc7958c0894dccb7af4d7855 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* TextEditor: Move highlighting support from Plain to Basehjk2014-07-301-60/+2
| | | | | | | | | Goal is to squash the 'Plain' layer. Change-Id: I2513de57fbbc09e9d0d9d4f1eb008dced76038f0 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Set parent for options dialog where appropriate.Eike Ziller2014-07-141-1/+2
| | | | | | | | | Otherwise the options dialog might appear behind the current "dialog" (for example the "new" wizards). Also, take ICore::dialogParent as default. Change-Id: I4578e269db5763842a942549a45ec8cdd6b28b5d Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* IEditor: Make duplicatesSupported a value memberhjk2014-05-211-0/+1
| | | | | Change-Id: Iee75dd4155d5074bb319df79d006b6d5e2989e14 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-05-201-0/+1
|\ | | | | | | | | | | | | Conflicts: src/plugins/ios/iosdeploystep.cpp Change-Id: I97c80d288d7af30f4bf64509a09e0fe2e3b85f6f
| * Editor: Set tabsettings on new generic highlighter.David Schulz2014-05-191-0/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-12172 Change-Id: I5194da0f6c8c1c453906c9752fc2fdf0e8b0b1be Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | TextEditor: Remove redundant null validationOrgad Shaneh2014-05-061-1/+1
| | | | | | | | | | Change-Id: I286b324003554bce3607e685088d4d8406bc6892 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Editors: Move id() from editor to document.Eike Ziller2014-03-051-1/+1
|/ | | | | | Change-Id: Ib81076842ab1c16832224790194b001206404d64 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Core: Make IEditor::id a value member and adjust usershjk2014-02-251-5/+1
| | | | | | Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* TextEditors: Move font settings to documentEike Ziller2014-01-241-1/+1
| | | | | Change-Id: I325764cbaa9684fa2758b0ea6c6ea58de142cb73 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Editors: Add at least some short documentation.Eike Ziller2014-01-231-0/+10
| | | | | Change-Id: I7fc7946405d3cbb1af0cf29a9d328d857eb8304a Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* TextEditors: Remove widget's setTabSettings methodEike Ziller2014-01-211-13/+13
| | | | | Change-Id: If212b45e2d526534b7853f3fa23b170f61e1976e Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* TextEditors: Move indenter to document.Eike Ziller2014-01-151-1/+2
| | | | | Change-Id: I8bdf7134562d007aa16cc63a34f5a15a708577ae Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* PlainTextEditor: only configure when the file path changesEike Ziller2014-01-151-2/+2
| | | | | | | | It was also configuring whenever the modified state changed. Then it also doesn't seem to be necessary to queue the connection. Change-Id: I4935afbfef2e08c76f10c801281e2cc7796ac047 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* BaseTextEditor: Remove some unnecessary indirections through widgetEike Ziller2014-01-141-2/+2
| | | | | Change-Id: I4f71448d6788a4e553b1495b72263a004e65d8c0 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* TextEditors: Avoid changing document after construction.Eike Ziller2014-01-101-2/+8
| | | | | | | | | | | Also when duplicating editors, we don't want to change the document after construction. Actually at some places (e.g. CppEditorSupport creation) we don't handle document changes correctly, and we are only lucky that things still (more or less?) work. Get rid of BaseTextEditorWidget::duplicateFrom and use copy-constructor style instead. Change-Id: I7f688b7fcc51d1bb5e222bb333f0d28479b597a6 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Editors: Remove BaseTextEditorWidget::setBaseTextDocumentEike Ziller2014-01-101-2/+13
| | | | | | | | | First step in never changing the text document after construction, because that is actually not really supported. Second step will be to fix that for the editor duplicate() methods too. Change-Id: I3d112ba0895e7ee7ac6dd8ae2318f0de7d2cebc9 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Editors: Remove useless parent widget argument from create/duplicateEike Ziller2014-01-081-2/+2
| | | | | | | It was never called with a sensible value anyhow, and only complicates things. Change-Id: I005848700b6c00114d91495670d4a0e15a2d2e64 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/dumper.cpp share/qtcreator/debugger/dumper_p.h share/qtcreator/debugger/test/main.cpp src/plugins/debugger/gdb/classicgdbengine.cpp src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.h src/plugins/debugger/lldblib/guest/main.cpp src/plugins/debugger/lldblib/ipcengineguest.cpp src/plugins/debugger/lldblib/ipcengineguest.h src/plugins/debugger/lldblib/ipcenginehost.cpp src/plugins/debugger/lldblib/ipcenginehost.h src/plugins/debugger/lldblib/lldbenginehost.cpp src/plugins/debugger/lldblib/lldboptionspage.cpp src/plugins/qbsprojectmanager/qbsstep.cpp src/plugins/qbsprojectmanager/qbsstep.h src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp src/plugins/qnx/blackberrycheckdevmodestep.cpp src/plugins/qtsupport/debugginghelper.cpp Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
| * 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>
* | Merge BaseTextEditorWidget::editorDocument() and ::baseTextDocument()Eike Ziller2013-12-181-5/+5
| | | | | | | | | | | | | | | | Doesn't really make sense to have the additional IDocument *editorDocument() method. Change-Id: I0a7420eb1afaa76f63c3f7e9c4b373acf624ffb9 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Remove the need to register editors in the action handlerEike Ziller2013-12-121-1/+1
|/ | | | | | | | | | | The action handler already knows which editors to handle through the context. It only needs to receive signals for updating the actions from the current editor. So there is no need to tell the action handler about every individual editor. This also removes some noise from the text editor implementations. Change-Id: I76dc5b1559cc8cf54ff313e6cdba4e789a3108aa Reviewed-by: David Schulz <david.schulz@digia.com>
* Fix document appearing as it is all changed on openOrgad Shaneh2013-10-161-1/+2
| | | | | | | | | | Broken by 113c5600c909791ddfea3d424a41d982dcdda6b7 Apparently SyntaxHighlighter::rehighlight is called too early Task-number: QTCREATORBUG-10026 Change-Id: Ifa76c156b5b84b79c869d2de1a0ad69c13ac6b48 Reviewed-by: David Schulz <david.schulz@digia.com>
* Apply static pattern to TextEditorSettinghjk2013-09-201-2/+2
| | | | | Change-Id: I4e6f573d893c0aa2bb4ca9812fc8db2961dac172 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fix compilation of generichighlighter test on Windowsjkobus2013-09-181-1/+1
| | | | | | Change-Id: I25c2f68528ede12fa900ea86973c6df39667c421 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Apply 'static' pattern to MimeDatabasehjk2013-09-031-7/+7
| | | | | | | | Also adjust and streamline using and surrounding code. Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Remove superfluous include paths from project files.Christian Kandeler2013-09-021-5/+5
| | | | | | | | | | | | | | | | | | | | A lot of our build system files specify unneeded include paths. These roughly fall into the following categories: a) Paths that are already set in more general files such as qtcreator.pri. b) Paths that serve no purpose at all, possibly left over from earlier versions of the project. c) Paths that act as workarounds for wrong include statements of the form '#include "xyz.h"', where xyz.h is not in the same directory as the including file. This patch removes such path specifications and fixes the offending include statements from case c). Tested on Linux, Windows and OSX with qmake and qbs. Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix generic highlighter autotestjkobus2013-08-301-2/+3
| | | | | | Change-Id: I35994a8c29374edfeb8a230af10c2a3277232f22 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Implement syntax highlighting in diff editorjkobus2013-08-291-20/+2
| | | | | | | | | | | | All Qt Creator's main highlighters are used in the first place, for other mimetypes generic highlighter is used as a fallback. Task-number: QTCREATORBUG-9580 Change-Id: I863b9085520e5bdda142ce88f2074afeacee0531 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Add common interface for text formats inside syntax highlighterjkobus2013-08-261-27/+0
| | | | | | Change-Id: I87f64446161a57aea0896f68e4eafacef791969b Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Move displayName from IEditor to IDocumentEike Ziller2013-07-101-1/+0
| | | | | | | | 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-2/+2
| | | | | | | That is what it actually is, wrt how Qt API calls it. Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* TextEditor: Simplify Utils::CommentDefinition structurehjk2013-05-271-4/+4
| | | | | Change-Id: I8fc97ed61c47af2c3d9e5cc2bf81e97661204d4f Reviewed-by: David Schulz <david.schulz@digia.com>
* Clean headers in TextEditor.Friedemann Kleint2013-03-271-4/+0
| | | | | Change-Id: Ie679e7e9d0d20a0f71dcc1fcf0f7d8305eeeeced Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* PlainTextEditor: Use info suppression for syntax highlightingOrgad Shaneh2013-02-081-12/+1
| | | | | | | Remove specific setting for warning suppression and use the global one Change-Id: I1fe2b749d960283b8414cc5db5a5a7e9f20e7740 Reviewed-by: David Schulz <david.schulz@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>
* | Use Core::Id in ICore::showOptionsDialoghjk2012-12-291-3/+7
| | | | | | | | | | Change-Id: I3865fde2347d687a7dee76dd5ca62db69cc4dd04 Reviewed-by: hjk <qthjk@ovi.com>
* | Id: Add QByteArray constructorOrgad Shaneh2012-11-201-1/+1
|/ | | | | | | | | Distinguish from const char * one. QString ctor is yet to be removed Change-Id: I2da231036c6417353b0566d39666d918ad141c6d Reviewed-by: hjk <qthjk@ovi.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* texteditor: generally allow mark requests for all "plain" textshjk2012-09-121-1/+0
| | | | | | Task-number: QTCREATORBUG-4546 Change-Id: I61ad34a063c720ae53e21e7b0239e8b8b91c0763 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>
* texteditor: use an enum instead of QString as color idshjk2012-05-031-18/+9
| | | | | Change-Id: I658412c18d5ccfe978ec444451c6417ffb18d71c Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Editor: Fix crash in generic highlighterLeandro Melo2012-04-051-1/+1
| | | | | | | | | | Add a method for basic structural checks of a definition. Currently it simply tests for a initial context. Task-number: QTCREATORBUG-7053 Change-Id: I56415034b50908d6da5f66ffab7def8fdd5fa1fb Reviewed-by: David Schulz <david.schulz@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-201-5/+5
| | | | | | | | 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-3/+3
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>