aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/texteditor/fontsettings.h
Commit message (Collapse)AuthorAgeFilesLines
* TextEditor: Set the special weight of Source Code Pro font familyCristian Adam2024-02-281-1/+1
| | | | | | | | | | The text editor font is used also for output panes, make sure that on macOS we use QFont::Medium so that the font is not too skinny. Amends 13dc66a08d3120fe4eb9c1e124618a3d17408d8e Change-Id: Idad26738d42452c8d683df7a40a4a2fe44e9793e Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* Fonts: Add Medium SourceCodePro font variantsCristian Adam2023-12-041-0/+1
| | | | | | | | | | | | | | | | | | | Add the Medium font families. The Medium variants make sure that on a MacBook Pro with Retina display the font doesn't look out of place being too thin. Taken from https://github.com/adobe-fonts/source-code-pro/releases/tag/ 2.030R-ro%2F1.050R-it We need to stay with version 2.0.30 due to hinting on Windows, and to force QFont::Medium on macOS due to the fact that the medium font is not picked up. Newer versions like 2.0.42 do not have this issue. Task-number: QTCREATORBUG-29964 Change-Id: I4c0fba5730c4a6b869d900642b675698c29c6ae8 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Utils, all: Standardize on QtcSettingshjk2023-09-271-3/+4
| | | | | Change-Id: Id222016f15b1c3bfe6710fe5d0297666d4565ef1 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-061-1/+1
| | | | | | | | | | | | | | | Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Editor: fix FontSettings::lineSpacing for zoomed fontsDavid Schulz2022-10-271-1/+0
| | | | | | Change-Id: Ia7ad3a877c56fb9cd962592b6d3e967beb9002dc Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* TextEditor: Proliferate FilePath use to FontSettings and ColorSchemehjk2022-09-231-6/+8
| | | | | | Change-Id: I3fd2e57b9b922d7bf6269b608da48f4a2e13dfb2 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Re-introduction of the feature to adjust the line spacingFlorian Koch2022-09-121-0/+7
| | | | | | | | | | | | | | | | This already has been implemented in change dc64f3207bdf6c0d295859e47791cb8193e67f4e, but was reverted with change f220cb0e23729ddccf52c25dae4e4696641bc62d) because this does not work with text wrapping rendering, due to internal limitations of Qt. Since this is a highly requested feature (e.g. QTCREATORBUG-13727), but an internal change within Qt is not in sight, the approach taken here is to offer the text wrapping feature in the settings only when the line spacing is set to 100%. Additionally, a change has been made to the layout of the display settings page to reflect this. Fixes: QTCREATORBUG-13727 Change-Id: Ib233cf90a5f336bc591fa1bf860e162fa774dfe3 Reviewed-by: David Schulz <david.schulz@qt.io>
* Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
| | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Make some qHash and comparison operators overloads hidden friendshjk2021-12-061-3/+3
| | | | | | | Restricts lookup scope more to necessary bits. Change-Id: Ia42c95aaa70534843b7f6a90bfc56d2a1202c612 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Revert "Editor: Make line spacing adjustable"David Schulz2020-10-201-7/+0
| | | | | | | | | | | This does not work with text wrapping since there are multiple QTextLines inside a block but we can not adjust the line hight inside a block. This needs to be addressed inside Qt. This reverts commit dc64f3207bdf6c0d295859e47791cb8193e67f4e. Change-Id: If6c28056da9891eeeb75f5939a42f08360013a80 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Editor: Make line spacing adjustableDavid Schulz2020-10-011-0/+7
| | | | | | Fixes: QTCREATORBUG-13727 Change-Id: I3dbc3277795b339bced81dc6c5a048c828183cb6 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* TextEditor: Move FontSettingsPage more towards new schemehjk2020-01-301-4/+2
| | | | | | | | | | | Mainly re-using the existing pimpl as new widget implementation, and using the primary storage out of the page (into texteditorsettings). This one is structutally bit different as there is that second path (Ctrl+Wheel) to modify font zoom. Change-Id: I7b85c781c7c53a733b234754beb5bb54664be3fd Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* TextEditor: ModernizeAlessandro Portale2018-11-301-1/+1
| | | | | | | | modernize-* Change-Id: Ic497fea1942a77cf017be3b0033f92e3807066f1 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: hjk <hjk@qt.io>
* TextEditor: Improve speed of hash function for font settingsMarco Bubke2016-06-101-1/+1
| | | | | | | | | | The size of the array is fixed so we can simply use the memory patter as a hash value. Change-Id: If86a58b111a07b2bd9cecc12a03d74b93a914159 Task-number: QTCREATORBUG-16419 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* 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>
* FontSettings: Change argument to be const-referenceOrgad Shaneh2016-03-091-1/+1
| | | | | Change-Id: I8fb22db04692e245819c8b4c778b31e127f1880e Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Clang: Add Declaration highlightingMarco Bubke2016-03-071-9/+1
| | | | | | | | | We are adding declaration detection for function to the highligher on user request. Other declaration will follow in separate patches. Task-number: QTCREATORBUG-15564 Change-Id: I54e97c26425f8d6e9854547d50a9ac8fa076b4e8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* TextEditor: Add mixins for font settingsMarco Bubke2016-02-231-0/+14
| | | | | | | | You can only set one text style but in many cases like Function and Declaration it would be nice if they could be merged. Change-Id: Icda892057b79eef1bea2fa8b2c5f0f7cbc5f518a Reviewed-by: David Schulz <david.schulz@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>
* TextEditor: Add fine control over the color scheme settingsMarco Bubke2015-10-191-1/+1
| | | | | | | | | | | You have seen always all setting but some settings had no meaning because only the foreground color is used. Now you can disable this settings so it is more clear what you can change. Change-Id: I0fdd2ac6f40e27b5160a2c54a512289457674dae Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Compile fixRobert Loehning2014-01-271-1/+1
| | | | | | | Change-Id: Ib09725c757676ba0eaffa935db959830643562da Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* FontSettings: Globally cache textcharformatsEike Ziller2014-01-241-1/+3
| | | | | Change-Id: I02ca646322b07eeb21c2cdd4ef5594b754234e12 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>
* 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 02:45:09 +0000