summaryrefslogtreecommitdiff
path: root/src/plugins/texteditor/fontsettings.h
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Find: Add text editor color scheme to search resultDavid Schulz2012-11-131-0/+1
|/ | | | | | | Task-number: QTCREATORBUG-8070 Change-Id: Ic220e3364aa9a5227518a210dbf0590deb06a4d6 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.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-3/+3
| | | | | Change-Id: I658412c18d5ccfe978ec444451c6417ffb18d71c 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>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* 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>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Update license.hjk2011-04-131-14/+13
|
* Exported header cleanup.Friedemann Kleint2011-01-201-5/+2
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* License headers.con2010-12-171-7/+11
|
* Fixes: Selection in color scheme settings sometimes didn't match reality.con2010-03-221-1/+1
| | | | | | | | | In case of the default being used, the selected item in the settings was always the first of the schemes, in "inode order". The fix always puts the default scheme at the top of the list which makes sense anyhow. Reviewed-by: Thorbjørn
* Long live the king!hjk2010-03-051-1/+1
|
* Merge remote branch 'origin/1.3'con2010-01-141-1/+1
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/bineditor/bineditorplugin.cpp src/plugins/coreplugin/editormanager/editormanager.cpp src/plugins/debugger/gdb/gdbengine.cpp src/plugins/debugger/watchhandler.cpp
| * Fixed an issue with keeping a shipped color scheme selectedThorbjørn Lindeijer2010-01-131-1/+1
| | | | | | | | | | | | | | | | When the path to the shipped color schemes changes, Qt Creator was unable to load the chosen color scheme. Now, when it can't find the color scheme, it will look for it in the default color scheme path. Reviewed-by: con
* | separate font zoom from font sizemae2009-11-301-0/+4
|/ | | | Introduce "Reset Font Size" action, bound to Ctrl+0
* Purge out include files in exported headersFriedemann Kleint2009-10-011-1/+2
|
* long live the kinghjk2009-08-141-1/+1
|
* Embedded the color scheme editor in the options dialog againThorbjørn Lindeijer2009-07-201-0/+3
| | | | | With the new representation it fits fine, and this is a bit more convenient for the user.
* Added importing of customized color schemes from the ini fileThorbjørn Lindeijer2009-07-151-2/+2
| | | | | So people's customized color schemes don't get lost, but get converted to the new format instead.
* Made cloning, deleting and editing of color schemes functionalThorbjørn Lindeijer2009-07-131-1/+2
|
* Made selecting the color scheme functionalThorbjørn Lindeijer2009-07-131-1/+1
| | | | | | Also, defaults formats are now applied to any format that hasn't been defined in the color scheme file. This allows a color scheme to fall back on the default selection color, for example.
* Introduced a ColorSchemeReader class for reading color scheme filesThorbjørn Lindeijer2009-07-131-24/+7
|
* Moved editing of the color scheme into a separate dialogThorbjørn Lindeijer2009-07-131-1/+7
| | | | In preparation of being able to select from multiple color schemes.
* Introduced a ColorScheme class that encapsulates a color schemeThorbjørn Lindeijer2009-07-131-34/+3
|
* make zoom-in/-out apply to all editorsmae2009-06-171-1/+2
|
* Update license headers and sales contact details.Jason McDonald2009-06-171-2/+2
| | | | Reviewed-by: Trust Me
* Add option to turn antialiasing on/off for text editor fonts.con2009-05-271-0/+7
| | | | | Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> Task-number: 234394
* Fixes: change file license headers to include LGPLhjk2009-02-251-21/+17
|
* Bump year in licence header.Daniel Molkentin2009-01-131-1/+1
|
* chancge Nokia GPL exception version from 1.2 to 1.3hjk2008-12-161-1/+1
|
* more code cosmeticshjk2008-12-021-0/+1
|
* off-by-one in headershjk2008-12-021-1/+0
|
* end-of-line whitespace correction of the new headershjk2008-12-021-10/+11
|
* Initial importcon2008-12-021-0/+149
View Lorry Controller Status