feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Add a couple of new theme colors

Browse Source 
Change-Id: Iab39c0dae28d82f76a8d2ac8bc26562c89bf8e7c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Thomas Hartmann
2018-04-17 11:56:09 +02:00
parent 32c54dfdac
commit 5c8c208f26
9 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml
View File

@@ -30,7 +30,7 @@ import QtQuickDesignerTheme 1.0
ScrollViewStyle { ScrollViewStyle {
readonly property color scrollbarColor: Theme.color(Theme.BackgroundColorDark) readonly property color scrollbarColor: Theme.color(Theme.BackgroundColorDark)
readonly property color scrollBarHandleColor: Theme.qmlDesignerButtonColor() readonly property color scrollBarHandleColor: Theme.color(Theme.QmlDesigner_ScrollBarHandleColor)
padding {left: 0; top: 0; right: 0; bottom: 0} padding {left: 0; top: 0; right: 0; bottom: 0}

8
share/qtcreator/themes/dark.creatortheme
View File

@@ -16,6 +16,7 @@ warning=ffe0b716
textColorLink=ff007af4 textColorLink=ff007af4
textColorLinkVisited=ffa57aff textColorLinkVisited=ffa57aff
backgroundColorDisabled=ff444444 backgroundColorDisabled=ff444444
qmlDesignerButtonColor=ff3c3e40
[Colors] [Colors]
BackgroundColorAlternate=alternateBackground BackgroundColorAlternate=alternateBackground
@@ -213,16 +214,19 @@ PaletteWindowTextDisabled=textDisabled
PaletteBaseDisabled=backgroundColorDisabled PaletteBaseDisabled=backgroundColorDisabled
PaletteTextDisabled=textDisabled PaletteTextDisabled=textDisabled
QmlDesigner_BackgroundColor=ff3c3e40 QmlDesigner_BackgroundColor=qmlDesignerButtonColor
QmlDesigner_HighlightColor=ff46a2da QmlDesigner_HighlightColor=ff46a2da
QmlDesigner_FormEditorSelectionColor=ff4ba2ff QmlDesigner_FormEditorSelectionColor=ff4ba2ff
QmlDesigner_FormEditorForegroundColor=ffffffff QmlDesigner_FormEditorForegroundColor=ffffffff
QmlDesigner_BackgroundColorDarkAlternate=ff3c3e40 QmlDesigner_BackgroundColorDarkAlternate=qmlDesignerButtonColor
QmlDesigner_BackgroundColorDarker=ff151515 QmlDesigner_BackgroundColorDarker=ff151515
QmlDesigner_BorderColor=SplitterColor QmlDesigner_BorderColor=SplitterColor
QmlDesigner_ButtonColor=ff505050 QmlDesigner_ButtonColor=ff505050
QmlDesigner_TabDark=shadowBackground QmlDesigner_TabDark=shadowBackground
QmlDesigner_TabLight=text QmlDesigner_TabLight=text
QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor
QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor
QmlDesigner_ScrollBarHandleColor=ff505050
[Flags] [Flags]
ComboBoxDrawTextShadow=false ComboBoxDrawTextShadow=false

8
share/qtcreator/themes/default.creatortheme
View File

@@ -10,6 +10,7 @@ error=ffdf4f4f
warning=ffecbc1c warning=ffecbc1c
shadowBackground=ff232323 shadowBackground=ff232323
splitterColor=ff151515 splitterColor=ff151515
qmlDesignerButtonColor=ff4c4e50
[Colors] [Colors]
BackgroundColorAlternate=ff3d3d3d BackgroundColorAlternate=ff3d3d3d
@@ -186,16 +187,19 @@ ProjectExplorer_TaskWarn_TextMarkColor=warning
ClangCodeModel_Error_TextMarkColor=error ClangCodeModel_Error_TextMarkColor=error
ClangCodeModel_Warning_TextMarkColor=warning ClangCodeModel_Warning_TextMarkColor=warning
QmlDesigner_BackgroundColor=ff4c4e50 QmlDesigner_BackgroundColor=qmlDesignerButtonColor
QmlDesigner_HighlightColor=ff46a2da QmlDesigner_HighlightColor=ff46a2da
QmlDesigner_FormEditorSelectionColor=ff4ba2ff QmlDesigner_FormEditorSelectionColor=ff4ba2ff
QmlDesigner_FormEditorForegroundColor=brightText QmlDesigner_FormEditorForegroundColor=brightText
QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50 QmlDesigner_BackgroundColorDarkAlternate=qmlDesignerButtonColor
QmlDesigner_BackgroundColorDarker=ff4e4e4e QmlDesigner_BackgroundColorDarker=ff4e4e4e
QmlDesigner_BorderColor=splitterColor QmlDesigner_BorderColor=splitterColor
QmlDesigner_ButtonColor=ff7a7a7a QmlDesigner_ButtonColor=ff7a7a7a
QmlDesigner_TabDark=shadowBackground QmlDesigner_TabDark=shadowBackground
QmlDesigner_TabLight=brightText QmlDesigner_TabLight=brightText
QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor
QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor
QmlDesigner_ScrollBarHandleColor=ff7a7a7a
[Flags] [Flags]
ComboBoxDrawTextShadow=true ComboBoxDrawTextShadow=true

8
share/qtcreator/themes/flat-dark.creatortheme
View File

@@ -21,6 +21,7 @@ splitter=ff06080A
textColorLink=ff007af4 textColorLink=ff007af4
textColorLinkVisited=ffa57aff textColorLinkVisited=ffa57aff
backgroundColorDisabled=ff444444 backgroundColorDisabled=ff444444
qmlDesignerButtonColor=ff4c4e50
[Colors] [Colors]
BackgroundColorAlternate=alternateBackground BackgroundColorAlternate=alternateBackground
@@ -197,16 +198,19 @@ ProjectExplorer_TaskWarn_TextMarkColor=warning
ClangCodeModel_Error_TextMarkColor=error ClangCodeModel_Error_TextMarkColor=error
ClangCodeModel_Warning_TextMarkColor=warning ClangCodeModel_Warning_TextMarkColor=warning
QmlDesigner_BackgroundColor=ff4c4e50 QmlDesigner_BackgroundColor=qmlDesignerButtonColor
QmlDesigner_HighlightColor=ff3f91c4 QmlDesigner_HighlightColor=ff3f91c4
QmlDesigner_FormEditorSelectionColor=ff4ba2ff QmlDesigner_FormEditorSelectionColor=ff4ba2ff
QmlDesigner_FormEditorForegroundColor=ffffffff QmlDesigner_FormEditorForegroundColor=ffffffff
QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50 QmlDesigner_BackgroundColorDarkAlternate=qmlDesignerButtonColor
QmlDesigner_BackgroundColorDarker=ff262728 QmlDesigner_BackgroundColorDarker=ff262728
QmlDesigner_BorderColor=splitter QmlDesigner_BorderColor=splitter
QmlDesigner_ButtonColor=ff595b5c QmlDesigner_ButtonColor=ff595b5c
QmlDesigner_TabDark=shadowBackground QmlDesigner_TabDark=shadowBackground
QmlDesigner_TabLight=text QmlDesigner_TabLight=text
QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor
QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor
QmlDesigner_ScrollBarHandleColor=ff595b5c
PaletteWindow=normalBackground PaletteWindow=normalBackground
PaletteWindowText=text PaletteWindowText=text

8
share/qtcreator/themes/flat-light.creatortheme
View File

@@ -19,6 +19,7 @@ run_success=ff52c23b
splitter=ffbdbebf splitter=ffbdbebf
error=ffdf4f4f error=ffdf4f4f
warning=ffecbc1c warning=ffecbc1c
qmlDesignerButtonColor=fff8f8f8
[Colors] [Colors]
BackgroundColorAlternate=alternateBackground BackgroundColorAlternate=alternateBackground
@@ -195,16 +196,19 @@ ProjectExplorer_TaskWarn_TextMarkColor=warning
ClangCodeModel_Error_TextMarkColor=error ClangCodeModel_Error_TextMarkColor=error
ClangCodeModel_Warning_TextMarkColor=warning ClangCodeModel_Warning_TextMarkColor=warning
QmlDesigner_BackgroundColor=fff8f8f8 QmlDesigner_BackgroundColor=qmlDesignerButtonColor
QmlDesigner_HighlightColor=ff46a2da QmlDesigner_HighlightColor=ff46a2da
QmlDesigner_FormEditorSelectionColor=ff4ba2ff QmlDesigner_FormEditorSelectionColor=ff4ba2ff
QmlDesigner_FormEditorForegroundColor=ffffffff QmlDesigner_FormEditorForegroundColor=ffffffff
QmlDesigner_BackgroundColorDarkAlternate=fff8f8f8 QmlDesigner_BackgroundColorDarkAlternate=qmlDesignerButtonColor
QmlDesigner_BackgroundColorDarker=fff5f5f5 QmlDesigner_BackgroundColorDarker=fff5f5f5
QmlDesigner_BorderColor=splitter QmlDesigner_BorderColor=splitter
QmlDesigner_ButtonColor=ffcccccc QmlDesigner_ButtonColor=ffcccccc
QmlDesigner_TabDark=ff585858 QmlDesigner_TabDark=ff585858
QmlDesigner_TabLight=ffd0d0d0 QmlDesigner_TabLight=ffd0d0d0
QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor
QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor
QmlDesigner_ScrollBarHandleColor=ffcccccc
[Flags] [Flags]
ComboBoxDrawTextShadow=false ComboBoxDrawTextShadow=false

8
share/qtcreator/themes/flat.creatortheme
View File

@@ -17,6 +17,7 @@ alternateBackground=ff515151
error=ffdf4f4f error=ffdf4f4f
warning=ffecbc1c warning=ffecbc1c
splitter=ff313131 splitter=ff313131
qmlDesignerButtonColor=ff4c4e50
[Colors] [Colors]
BackgroundColorAlternate=alternateBackground BackgroundColorAlternate=alternateBackground
@@ -193,16 +194,19 @@ ProjectExplorer_TaskWarn_TextMarkColor=warning
ClangCodeModel_Error_TextMarkColor=error ClangCodeModel_Error_TextMarkColor=error
ClangCodeModel_Warning_TextMarkColor=warning ClangCodeModel_Warning_TextMarkColor=warning
QmlDesigner_BackgroundColor=ff4c4e50 QmlDesigner_BackgroundColor=qmlDesignerButtonColor
QmlDesigner_HighlightColor=ff46a2da QmlDesigner_HighlightColor=ff46a2da
QmlDesigner_FormEditorSelectionColor=ff4ba2ff QmlDesigner_FormEditorSelectionColor=ff4ba2ff
QmlDesigner_FormEditorForegroundColor=ffffffff QmlDesigner_FormEditorForegroundColor=ffffffff
QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50 QmlDesigner_BackgroundColorDarkAlternate=qmlDesignerButtonColor
QmlDesigner_BackgroundColorDarker=ff262728 QmlDesigner_BackgroundColorDarker=ff262728
QmlDesigner_BorderColor=splitter QmlDesigner_BorderColor=splitter
QmlDesigner_ButtonColor=ff595b5c QmlDesigner_ButtonColor=ff595b5c
QmlDesigner_TabDark=shadowBackground QmlDesigner_TabDark=shadowBackground
QmlDesigner_TabLight=ffffffff QmlDesigner_TabLight=ffffffff
QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor
QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor
QmlDesigner_ScrollBarHandleColor=ff595b5c
[Flags] [Flags]
ComboBoxDrawTextShadow=false ComboBoxDrawTextShadow=false

5
src/libs/utils/theme/theme.h
View File

@@ -301,7 +301,10 @@ public:
QmlDesigner_TabLight, QmlDesigner_TabLight,
QmlDesigner_TabDark, QmlDesigner_TabDark,
QmlDesigner_ButtonColor, QmlDesigner_ButtonColor,
QmlDesigner_BorderColor QmlDesigner_BorderColor,
QmlDesigner_FormeditorBackgroundColor,
QmlDesigner_AlternateBackgroundColor,
QmlDesigner_ScrollBarHandleColor
}; };
enum Gradient { enum Gradient {

6
src/plugins/qmldesigner/components/resources/formeditorstylesheet.css
View File

@@ -7,11 +7,7 @@ QStackedWidget {
QGraphicsView { QGraphicsView {
padding: 2px; padding: 2px;
border: 0px; border: 0px;
background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate; background-color: creatorTheme.QmlDesigner_FormeditorBackgroundColor;
}
QGraphicsView:focus {
background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate;
} }
QLineEdit QLineEdit

2
src/plugins/qmldesigner/components/resources/scrollbar.css
View File

@@ -11,7 +11,7 @@ QScrollBar:horizontal {
} }
QScrollBar::handle { QScrollBar::handle {
background-color: creatorTheme.QmlDesigner_ButtonColor; background-color: creatorTheme.QmlDesigner_ScrollBarHandleColor;
} }
QScrollBar::handle:vertical { QScrollBar::handle:vertical {