Commit Graph

35 Commits

Author SHA1 Message Date
Alessandro Portale
ce799321ac Qt Creator Dark text color scheme: Fix #d64564
Replace all three occurrences of #d64564 with #ff6aad
Otherwise it is hard to read preprocessor code, qml bindings or
mismatched parentheses.

Change-Id: I2812f3d10a1b1d4d2206cc4c19e97b81391e4ce4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-02 21:49:12 +00:00
Alessandro Portale
5e93c5efa9 creator-dark scheme: Make selection behave with the other colors #2
Set the selection color back to the previous one.

Task-number: QTCREATORBUG-16682
Change-Id: I13a00bde7fcceda5d911802e65afd3593b1630f5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-30 11:59:20 +00:00
Alessandro Portale
39ddd353e4 creator-dark scheme: Make selection behave with the other colors
Selected preprocessor code was unreadble: unsaturated red on turquese.
The selection color now defines a foreground color (the same as the
line number color).

Task-number: QTCREATORBUG-16682
Change-Id: Ibb213010557da5bd68fb5a22822cad467fd03092
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-30 11:52:04 +00:00
Orgad Shaneh
3b95ad3fa9 Dark style: Several improvements
* Make comments lighter
* Add background to disabled code
* Use the same "Value" for red and green shades in diff.

Change-Id: I075974098d8a88b21864483accabeba38b3b6063
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-19 15:24:59 +00:00
Thomas Hartmann
6335fbf842 Qt Creator Dark syntax highlighting schema
This is a new dark theme for syntax highlighting,
that works well with the new dark theme.

Change-Id: I10df9cd2f9925687d30f6f621e252459c30e12f8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-19 09:47:34 +00:00
Lorenz Haas
676b317dd0 Tweak solarized editor themes
Use solarized yellow and red for warnings and errors.

Change-Id: I5164b1184e397eaaca68e06db74b43f6e59edfdd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-15 08:32:28 +00:00
Thomas Hartmann
e43773014a Adding Solarized editor themes
These color schemes are based on the Solarized color schemes, originally
created by Ethan Schoonover:

http://ethanschoonover.com/solarized/

Change-Id: I75848608f59bbb32a78520e7b1a1a2554f2eca44
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-14 15:58:59 +00:00
Georger Araújo
c3a5eecfc5 Modnokai Night Shift v2 color scheme for QtC Text Editor
Change-Id: I7919dab34402ce5da0b77fb8fe0630c7c318479f
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2016-06-23 18:34:58 +00:00
David Schulz
d21cd57e13 Editor: Animate automatic completed text.
This gives a clear hint that something has changed.
And gets the attention of the author in the case he didn't
expect some kind of automatic brace or quote completion.

Change-Id: I33e383db9a1e797ecb285a407e46671f41be7051
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-31 12:58:19 +00:00
Marco Bubke
40c4f7847f TextEditor: Add global variable text styles
Change-Id: I088dc484b6a4ace79609ca7fcc4145344ccea5a9
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-07 12:07:38 +00:00
Marco Bubke
331e9d8878 TextEdit: Add underline support to text settings
Underlines colors was hard coded to the foreground color of some settings.
With this patch you can set the underline color and the underline style
to your taste.

Change-Id: Ibc64c2d2c89bf1827a2cadaf6aee9d50d08cd1ee
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-09-10 13:40:04 +00:00
David Schulz
f34b32abd5 Editor: Make parenthese mismatch color configurable.
Task-number: QTCREATORBUG-14357
Change-Id: I92a0d50fb8f3448195f3d38f7544a31eb695733b
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-18 12:18:17 +00:00
Orgad Shaneh
dcd3b958cf VCS: Highlight commit lines in log editor
Task-number: QTCREATORBUG-13997
Change-Id: I7d9a85cd6022a20a487010a35164ff100b72218d
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-25 10:48:12 +00:00
hjk
8b5bca7223 Rename 'vim (dark)' color scheme to 'Dark'
The darkness has not much to do with vim, and people stay
confused about the relation of the color scheme and FakeVim.

Change-Id: Ie04089045314321a60ac284551367d0b637b2e7d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-01 10:41:12 +02:00
Anton Kalmykov
496cfdd21d Add syntax highlight for primitive data types
Syntax highlight rules for keywords are changed to highlight control
keywords and primitive data types separately.

Change-Id: Ifb25be7a97b92589030aa190641320c233dc7f2d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-06-24 15:44:13 +02:00
hluk
fe20970f12 DiffEditor: Fix name for style constant
Change-Id: I8fdbcfc702574a0b61f57bb3d92594b66b2171df
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-03 07:42:12 +02:00
jkobus
abe3951d67 Take diff colors from color scheme
Change-Id: I706612a8f89917cb57b7d1e9ecebd86b3f4bcc8d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-12 09:23:50 +02:00
Francois Ferrand
809611f346 CppHighlighter: highlight all functions/methods.
- Highlight all function/methods (not just virtual methods).
- Highlight as a function even if number of arguments does not match. In
  that case, add a diagnostic message to indicate there are too many/too
  few arguments.
- Fix highlighting of parameters in function declarations.
  These used to be handled indiferently, and they could be mistaken for
  type or field references.
- Properly highlight template method calls.

Change-Id: I6e61c9ee47763db95c62314f9cc1c4d398df38b3
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-06-05 09:30:54 +02:00
Erik Verbruggen
210c191216 Revert "CppHighlighter: highlight all functions/methods."
This reverts commit e3e67467cfea5934f16a95385761455b0c495a0d

Reason is that it shows errors for calls to function-like macros. For example, any use of Q_DISABLE_COPY results in invalid errors.

Change-Id: I1fd1473ac5a30da5b9aebf6a3f0f11055bdbe8ad
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2012-03-29 15:53:23 +02:00
Francois Ferrand
e639a2381f CppHighlighter: highlight all functions/methods.
- Highlight all function/methods (not just virtual methods).
- Highlight as a function even if number of arguments does not match. In
  that case, add a diagnostic message to indicate there are too many/too
  few arguments.
- Fix highlighting of parameters in function declarations.
  These used to be handled indiferently, and they could be mistaken for
  type or field references.
- Properly highlight template method calls.

Change-Id: I6ab463996dda47554839f482da47f561f76663a7
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2012-03-29 14:53:48 +02:00
Campbell Barton
e6ea2db67e Heres some corrections to inkpot color scheme
- numbers were blue, should be yellow
- preprocessor used wrong shade of green
- bracket matching was missing background color.
- operators were green, when this isn't so for the vim original.

reference
https://github.com/ciaranm/inkpot/

Change-Id: I9bd8357d4f2473fa769aae995e795ded05f970a6
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-03 19:23:18 +01:00
Eike Ziller
81cce8902e Merge remote-tracking branch 'origin/2.4'
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
2011-10-28 10:17:44 +02:00
Christian Kamm
b1915231b4 QmlJS: Fix black-on-black text with dark color schemes.
Change-Id: Ie0eacf9677abe23e28eaa7b9491e6a21ea4f7dfc
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-10-21 09:41:41 +02:00
Leandro Melo
0b048986b8 Editors: Update inkpot color scheme
Task-number: QTCREATORBUG-6267
Change-Id: Iac21c28726e5e8725ff8195027a17efa3c184706
Reviewed-on: http://codereview.qt-project.org/6453
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-10-11 18:19:46 +02:00
Leandro Melo
c09c870248 Editors: Change Link color from inkpot scheme
In addition for the report below, the cmake highlighter
now uses the keyword color for functions. This was done
in the previous commit: 5ecd885af3d25acfd8f688428268da2d9198a1bd

Task-number: QTCREATORBUG-5037
Change-Id: I7cdf11d0b13cdf7fbd6fac9bfbe715944c57c5a2
Reviewed-on: http://codereview.qt.nokia.com/274
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
2011-05-31 16:00:15 +02:00
Thorbjørn Lindeijer
07e7351bf1 Tweaks to the Inkpot style
Added missing categories with customized colors for Field, Occurences,
Static and VisualWhitespace.

Removed highlighting for the 'Local' category, since at least I consider
the white names a little messy. In general we've considered the
highlighting of locals less useful than highlighting the members.

Task-number: QTCREATORBUG-2490
2010-11-12 15:36:39 +01:00
Thorbjørn Lindeijer
d9b9b4ad0f Added the Inkpot color scheme
This color scheme is based on the vim Inkpot color scheme, originally
created by Ciaran McCreesh:

 http://www.vim.org/scripts/script.php?script_id=1143

It was adapted for use by Qt Creator by Jan Kundrát and subsequently
updated by Campbell Barton.

Task-number: QTCREATORBUG-2490
2010-11-12 14:24:00 +01:00
Thorbjørn Lindeijer
c028e78b63 Updated Grayscale and Vim (dark) color schemes
Needed fixing after highlighting for Locals, Fields, Statics and Virtual
Methods was added.
2010-09-10 09:46:12 +02:00
Thorbjørn Lindeijer
6267de71d9 Added IntelliJ IDEA color scheme
It's missing some highlights that we currently don't support, but it
comes very close.
2010-08-03 11:37:10 +02:00
hjk
939562af36 rename the 'FakeVim (dark)' colorsceem to 'Vim (dark)'
It has nothing to do with fakevim.
2010-03-18 16:14:12 +01:00
Thorbjørn Lindeijer
0662ba391f Fixed the background color of "disabled code" in the grayscale scheme
This background color is also used for right margin background and
folded code popup. Not setting any resulted in weird affects in those
places.
2010-02-04 13:01:50 +01:00
Thorbjørn Lindeijer
7057584f98 Set a background color for disabled code in FakeVim style
Fixes right margin and folded code popup background to be
non-transparent.
2009-12-02 12:34:32 +01:00
Thorbjørn Lindeijer
2fcf2ac5d3 Added a FakeVim color theme
Specially for FakeVim users out there who want an easy way to switch to
vim's default color theme on a dark brackground.

Also did a little cleanup.
2009-07-14 15:30:27 +02:00
Thorbjørn Lindeijer
947b719e69 Made selecting the color scheme functional
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.
2009-07-13 14:22:27 +02:00
Thorbjørn Lindeijer
065689478c Introduced a ColorSchemeReader class for reading color scheme files 2009-07-13 14:22:27 +02:00