Commit Graph

14 Commits

Author SHA1 Message Date
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