summaryrefslogtreecommitdiff
path: root/src/plugins/glsleditor
Commit message (Collapse)AuthorAgeFilesLines
* Add ActionContainer::addSeparator(...)Eike Ziller2012-06-052-18/+2
| | | | | | | Gets rid of a lot of code duplication. Change-Id: I2ce38fb38a0b61cb821e0bdc7bcc9a7ccdf9da72 Reviewed-by: hjk <qthjk@ovi.com>
* ActionManager API cleanup.Eike Ziller2012-05-252-13/+11
| | | | | | | | d-pointer instead of inheritance static methods Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258 Reviewed-by: hjk <qthjk@ovi.com>
* Fix the rest of the warnings about integer sign change with ICCThiago Macieira2012-05-221-1/+1
| | | | | | | | | | None of these change the code in any way. The solutions applied are: - change the type to a more appropriate one, if possible - use ~0 instead of -1 when flags were intended - cast a -1 to the proper type otherwise Change-Id: Ifcc125528f32b8c8f9ab20bea103e2a693045bf8 Reviewed-by: hjk <qthjk@ovi.com>
* use Core::Id for IMode::id and IMode::typehjk2012-05-082-3/+3
| | | | | Change-Id: Ic7ce5b883e054c6eeba078327042e99e1c556345 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-05-071-1/+2
|\
| * Translate editor display names in correct context.Konstantin Tokarev2012-05-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | These strings were internationalized long ago, but wrong context prevented them from being actually tranlated in GUI. This patch won't break anything - if these strings were not translated for particular language, they stay untranslated, but if they were, translations are used (e.g. for RU). Change-Id: I175e29e8b0cee2bff9306623dad4a5956db69288 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | texteditor: use an enum instead of QString as color idshjk2012-05-031-13/+13
| | | | | | | | | | Change-Id: I658412c18d5ccfe978ec444451c6417ffb18d71c Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Added default implementation for IEditorFactory::open().Konstantin Tokarev2012-04-182-11/+0
| | | | | | | | | | | | | | This change allows to avoid massive code duplication along editors. Change-Id: Ifdc6ae4b44ab399d34193ab8dddfa1f76d65ad11 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | qbs files: use Qt5 module dependenciesJoerg Bornemann2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | Renamed gui -> widgets. Renamed declarative -> quick1. With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported. Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* | Port Qt Creator to the new plugin system of Qt 5.Friedemann Kleint2012-03-021-0/+1
|/ | | | | | | | | | - Add Q_PLUGIN_METADATA for Qt 5, use Q_EXPORT_PLUGIN for Qt 4. - Generate the Json files for Qt 5 from the pluginspec files by using a XSLT sheet. Change-Id: I8653f182ae7d61615971c093df10b84fb06c2172 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qbs: CleanupOrgad Shaneh2012-02-281-3/+0
| | | | | | | | | * Removed utils, extensionsystem and aggregation dependencies for plugins that depend on Core * Capitalized Find and CPlusPlus Change-Id: I505e5f46976f26da47ad778860f103b173668b1c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* add qbs filesJoerg Bornemann2012-02-201-0/+58
| | | | | Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-205-13/+12
| | | | | | | | 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-1518-61/+61
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Wizards: changes the structure of WizardsThomas Hartmann2012-02-082-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | This patch introduces platforms as a top level topic when choosing a wizard. Also I changed the categories and priorities. Details: 1. I did change the way the dialog/view is structured in newdialog.cpp 2. I added platformName() and supportsPlatform() to BaseQtVersion. I needed two functions because the Simulator does not provide a platform and therefore has no platformName but supports two platforms. I still have to turn the platform names into proper constants. 3. I changed the categories and priorities to get the layout that was discussed. (I had to touch quite alot of files but this is mostly trivial) 4. I added a combobox that allows filtering for platforms. 5. I added flags() to IWizard to indicate that a wizard is platform independent. Change-Id: I86c7ad628a431ad06505c76580885c6e6c3ddc23 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Wizards: refactoring - adding WizardDialogParametersThomas Hartmann2012-02-072-6/+5
| | | | | | | | | | | | | The Wizards itself (derived from IWizard) and the dialogs implementing the wizards were quite discoupled. Since I want to add parameters that are delivered from IWizard::run to the dialog a I added WizardDialogParameters. Examples of paramters I want to add are the choosen platform and the choosen subOption/template for this wizard. Change-Id: I9c0ae2901e3d46d3c36a3f433f4d7d508a6ba74e Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Don't parse GLSL init files at startup.Eike Ziller2012-02-032-25/+39
| | | | | | | Can easily be done when they are actually requested. Change-Id: I2022b2b97ea13725ed62ed2657f99cb505553c45 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Long live the king!hjk2012-01-2626-26/+26
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Use new static ICore interface.hjk2012-01-242-6/+6
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Wizards: allows filtering of wizards based on Qt versionThomas Hartmann2012-01-182-0/+7
| | | | | | | | | | | | | Every wizard now implements requiredFeatures() to define a feature set. If the feature set is not satisfied by the available Qt Versions, the wizard is not shown in the create file/project dialog. Every Qt version can define the provided feature set in availableFeatures() defined in BaseQtVersion. Change-Id: Ie9e2c210d19187b2296451948c36d274f2096623 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-1126-52/+52
|\ | | | | | | | | | | | | | | | | | | | | | | 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-0326-52/+52
| | | | | | | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | more Id type fixeshjk2011-11-106-12/+13
| | | | | | | | | | | | | | | | | | Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283 x Change-Id: Iab58bc34bc56371405d132315573b484a533b77c Reviewed-by: hjk <qthjk@ovi.com>
* | more style fixes of string literal accesshjk2011-11-021-14/+14
|/ | | | | Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096 Reviewed-by: hjk <qthjk@ovi.com>
* Implement Code Style schemesJarek Kobus2011-09-232-4/+2
| | | | | | | | Task-number: QTCREATORBUG-5092 Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07 Reviewed-on: http://codereview.qt-project.org/5160 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* s/error_message/errorMessage/ghjk2011-09-211-3/+3
| | | | | | Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710 Reviewed-on: http://codereview.qt-project.org/5312 Reviewed-by: hjk <qthjk@ovi.com>
* use Core::Id for IEditorFactory::idhjk2011-09-082-16/+4
| | | | | | Change-Id: Iefd67a0461d9016b8ba0f3371df7ec6d42e188c5 Reviewed-on: http://codereview.qt-project.org/4321 Reviewed-by: hjk <qthjk@ovi.com>
* core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gonehjk2011-09-052-2/+2
| | | | | | | Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854 Reviewed-on: http://codereview.qt.nokia.com/4215 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* Header cleanup in various plugins.Friedemann Kleint2011-08-183-4/+14
| | | | | | Change-Id: I16b273cc792bfd2035d35e7c67675f039cd387b9 Reviewed-on: http://codereview.qt.nokia.com/3185 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Merge remote-tracking branch 'origin/2.3'Eike Ziller2011-08-104-10/+10
|\ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/libs/libs.pro src/plugins/debugger/watchwindow.cpp src/plugins/remotelinux/maemopackagecreationstep.h Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
| * Fix crash when spliting GLSL editorLeandro Melo2011-08-024-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not a good idea to keep the editor stored since when removing a split, for example, the editor will go away and the highlighter is not aware of it anyhow since it actually belongs to the document. Although it's not necessary for the fix this patch add another constructor to SyntaxHighlighter which takes the BaseTextDocument. This is convenient. Task-number: QTCREATORBUG-5695 Change-Id: Ic91837b7d91ebd3a44c16e2fd589d7f6c5c0c002 Reviewed-on: http://codereview.qt.nokia.com/2508 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* | Refactor: Get rid of BaseTextEditorWidget from IndenterJarek Kobus2011-08-052-14/+11
|/ | | | | | | | | | | Provide directly TabSettings instead. This will be used for indenting a text for which there is no editor instance. Change-Id: Ia5f11a481f42464cf4820efdf2c7c4c32166f55e Reviewed-on: http://codereview.qt.nokia.com/2622 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
* New QTC_CHECK warning replacing QTC_ASSERT(x, /**/)Kai Koehne2011-07-291-1/+1
| | | | | | | | | Warn if the condition fails, but otherwise don't change the execution flow. Change-Id: Id7b14c745109b66960add967b2a4ef8d31e1a546 Reviewed-on: http://codereview.qt.nokia.com/2389 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Make C++ code style configurable.Christian Kamm2011-05-241-2/+8
| | | | | | | | | | | | | | Change-Id: Iaf08edb2361146e6b5e1cbafdb716a23c938875b Done-with: Jarek Kobus Task-number: QTCREATORBUG-2670 Task-number: QTCREATORBUG-4310 Task-number: QTCREATORBUG-2763 Task-number: QTCREATORBUG-3623 Task-number: QTCREATORBUG-567 Reviewed-on: http://codereview.qt.nokia.com/74 Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* New code assist APILeandro Melo2011-05-1810-879/+748
| | | | | | | | | | | This is a re-work of our completion engine. Primary goals are: - Allow the computation to run in a separate thread so the GUI is not locked. - Support a model-based approach. QStrings are still needed (filtering, etc), but internal structures are free to use more efficient representations. - Unifiy all kinds of *assist* into a more reusable and extensible framework. - Remove unnecessary dependencies on the text editor so we have more generic and easily "plugable" components (still things to be resolved).
* add auto-saving of modified editorsOswald Buddenhagen2011-05-122-3/+3
| | | | Task-number: QTCREATORBUG-2847
* add some mimetype for geometry shadershjk2011-05-121-0/+6
| | | | This gives at least some syntax highlighting.
* Fix/add copyright headersTobias Hunger2011-05-0624-24/+24
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* add errorString output argument to IFile::reload() & IEditor::open()Oswald Buddenhagen2011-04-182-3/+3
| | | | add/unify read error handling in all affected classes
* Merge branch '2.2'Oswald Buddenhagen2011-04-1424-336/+312
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp src/plugins/qt4projectmanager/qt4target.cpp src/plugins/qt4projectmanager/qt4target.h src/plugins/qt4projectmanager/qtoptionspage.h src/plugins/qt4projectmanager/qtversionmanager.cpp src/plugins/welcome/welcomemode.cpp
| * Update license.hjk2011-04-1324-336/+312
| |
* | Remove unused constants, fix lacking virtual destructorJarek Kobus2011-04-141-3/+0
| | | | | | | | Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | core: make context and widget IContext data membershjk2011-04-144-14/+3
|/
* Fixed layout issues in some editor toolbarsThorbjørn Lindeijer2011-02-251-5/+2
| | | | | | Cleaned up some hacky code in the process. Done-with: Tobias Hunger
* texteditor: merge ITextEditable into ITextEditorhjk2011-02-2214-62/+62
| | | | | | | | rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor rename BaseTextEditor{,Widget} subclasses rename editableInterface->editorInterface rename createEditableInterface->createEditor minor cleanups after renamings
* completion: call directly from base text editorhjk2011-02-211-6/+0
| | | | Reviewed-by: con
* completion: enable multiple completors for different use cases.hjk2011-02-213-12/+17
| | | | | | | | Introduce CompletionPolicy enum, use 'TextCompletion' for the new plain text completion, and 'SemanticCompletion' or 'QuickFixCompletion' for the existing cases. Reviewed-by: Erik Verbruggen
* L10n: tr()-Fixes for 2.2Friedemann Kleint2011-02-151-14/+14
|
* It's 2011 now.con2011-01-1225-25/+25
| | | | Reviewed-by: hjk
* License headers, part 2con2010-12-1720-140/+220
|
View Lorry Controller Status