Settings vs Colors
Moved the fontFamily in the settings Theme is now called Colors (as in ColorScheme)
This commit is contained in:
parent
285321dcb9
commit
55bc7c9534
11 changed files with 45 additions and 46 deletions
|
|
@ -26,7 +26,7 @@ PanelWindow {
|
|||
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
color: Theme.backgroundPrimary
|
||||
color: Colors.backgroundPrimary
|
||||
layer.enabled: true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@ Rectangle {
|
|||
Text {
|
||||
id: textItem
|
||||
text: Time.time
|
||||
font.family: Theme.fontFamily
|
||||
font.family: Settings.settings.fontFamily
|
||||
font.weight: Font.Bold
|
||||
font.pointSize: Style.fontMedium * scaling
|
||||
color: Theme.textPrimary
|
||||
color: Colors.textPrimary
|
||||
anchors.centerIn: parent
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@ NPanel {
|
|||
readonly property real scaling: Scaling.scale(screen)
|
||||
|
||||
Rectangle {
|
||||
color: Theme.backgroundPrimary
|
||||
color: Colors.backgroundPrimary
|
||||
radius: Style.radiusMedium * scaling
|
||||
border.color: Theme.backgroundTertiary
|
||||
border.color: Colors.backgroundTertiary
|
||||
border.width: Math.max(1, 1.5 * scale)
|
||||
width: 500 * scaling
|
||||
height: 300
|
||||
|
|
@ -42,7 +42,7 @@ NPanel {
|
|||
spacing: 16 * scaling
|
||||
Text {
|
||||
text: "NIconButton"
|
||||
color: Theme.textPrimary
|
||||
color: Colors.textPrimary
|
||||
}
|
||||
|
||||
NIconButton {
|
||||
|
|
@ -64,7 +64,7 @@ NPanel {
|
|||
uniformCellSizes: true
|
||||
Text {
|
||||
text: "NToggle + NTooltip"
|
||||
color: Theme.textPrimary
|
||||
color: Colors.textPrimary
|
||||
}
|
||||
|
||||
NToggle {
|
||||
|
|
@ -88,7 +88,7 @@ NPanel {
|
|||
spacing: 16 * scaling
|
||||
Text {
|
||||
text: "NSlider"
|
||||
color: Theme.textPrimary
|
||||
color: Colors.textPrimary
|
||||
}
|
||||
|
||||
NSlider {}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue