Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Leander Schulten
Lichtsteuerung
Commits
e17b9425
Commit
e17b9425
authored
Oct 07, 2019
by
Leander Schulten
Browse files
UI: Fix all text colors that are black when theme is dark.
#55
parent
3c9c71a3
Pipeline
#191690
passed with stage
in 5 minutes and 3 seconds
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/qml/BarMapView.qml
View file @
e17b9425
import
QtQuick
2.12
import
QtQuick
.
Layouts
1.12
import
QtQuick
.
Controls
2.5
import
QtQuick
.
Controls
2.12
import
QtQuick
.
Controls
.
Material
2.12
import
QtGraphicalEffects
1.12
import
custom
.
licht
1.0
import
"
components
"
...
...
@@ -309,6 +310,7 @@ ColumnLayout{
Layout.preferredWidth
:
200
Text
{
text
:
parent
.
value
.
toFixed
(
2
)
color
:
Material
.
foreground
anchors.bottom
:
parent
.
handle
.
top
anchors.bottomMargin
:
2
anchors.horizontalCenter
:
parent
.
handle
.
horizontalCenter
...
...
src/qml/DeviceView.qml
View file @
e17b9425
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
import
QtQuick
.
Layouts
1.0
import
QtQuick
.
Dialogs
1.2
import
QtQuick
2.12
import
QtQuick
.
Controls
2.12
import
QtQuick
.
Controls
.
Material
2.12
import
QtQuick
.
Layouts
1.12
import
QtQuick
.
Dialogs
1.3
import
custom
.
licht
1.0
import
"
components
"
...
...
@@ -38,12 +39,11 @@ ModelView{
}
}
Text
{
Label
{
Layout.row
:
2
Layout.column
:
2
text
:
"
start
DMXChannel:
"
text
:
"
First
DMX
-
Channel:
"
Layout.rightMargin
:
20
font.pixelSize
:
15
}
TextInputField
{
Layout.row
:
2
...
...
@@ -56,35 +56,35 @@ ModelView{
}
onTextChanged
:
if
(
parent
.
currentModelData
)
parent
.
currentModelData
.
startDMXChannel
=
text
.
length
?
text
:
0
}
Text
{
Label
{
Layout.row
:
3
Layout.column
:
2
text
:
"
DevicePrototype:
"
Layout.rightMargin
:
20
font.pixelSize
:
15
}
Text
{
Layout.row
:
3
Layout.column
:
3
text
:
parent
.
currentModelData
?
parent
.
currentModelData
.
prototype
.
name
:
""
font.pixelSize
:
15
color
:
Material
.
secondaryTextColor
TextUnderline
{
extendetWidth
:
1
color
:
"
lightgrey
"
}
}
Text
{
Label
{
Layout.row
:
4
Layout.column
:
2
text
:
"
Position:
"
Layout.rightMargin
:
20
font.pixelSize
:
15
}
RowLayout
{
Layout.row
:
4
Layout.column
:
3
Text
{
text
:
"
x:
"
color
:
Material
.
foreground
font.pixelSize
:
15
}
TextInputField
{
...
...
@@ -97,6 +97,7 @@ ModelView{
Text
{
Layout.leftMargin
:
10
text
:
"
y:
"
color
:
Material
.
foreground
font.pixelSize
:
15
}
TextInputField
{
...
...
src/qml/FFTGraphView.qml
View file @
e17b9425
import
QtQuick
2.12
import
QtQuick
.
Layouts
1.12
import
QtQuick
.
Controls
2.5
import
QtQuick
.
Controls
2.12
import
QtQuick
.
Controls
.
Material
2.12
import
custom
.
licht
1.0
Item
{
...
...
@@ -39,12 +40,14 @@ Item {
xScale
:
1
origin.y
:
200
}
lineColor
:
Material
.
foreground
}
Repeater
{
model
:
((
flickable
.
contentWidth
+
40
)
/
40
).
toFixed
(
0
)
delegate
:
Text
{
text
:
((
index
*
40
+
20
)
/
graph
.
implicitWidth
*
(
44100
/
2
)
*
(
1
/
scaleID
.
xScale
)).
toFixed
(
0
)
color
:
Material
.
foreground
x
:
index
*
40
+
20
-
contentWidth
/
2
textFormat
:
Text
.
PlainText
y
:
2
...
...
@@ -86,6 +89,7 @@ Item {
Layout.preferredWidth
:
200
Text
{
text
:
parent
.
value
.
toFixed
(
2
)
color
:
Material
.
foreground
anchors.bottom
:
parent
.
handle
.
top
anchors.bottomMargin
:
4
anchors.horizontalCenter
:
parent
.
handle
.
horizontalCenter
...
...
@@ -103,6 +107,7 @@ Item {
Layout.preferredWidth
:
200
Text
{
text
:
parent
.
value
.
toFixed
(
2
)
color
:
Material
.
foreground
anchors.bottom
:
parent
.
handle
.
top
anchors.bottomMargin
:
4
anchors.horizontalCenter
:
parent
.
handle
.
horizontalCenter
...
...
src/qml/ModuleProgramView.qml
View file @
e17b9425
import
QtQuick
2.
9
import
QtQuick
.
Controls
2.
4
import
QtQuick
.
Layouts
1.
3
import
QtQuick
2.
12
import
QtQuick
.
Controls
2.
12
import
QtQuick
.
Layouts
1.
12
import
custom
.
licht
1.0
import
QtQuick
.
Dialogs
1.
2
import
QtQuick
.
Dialogs
1.
3
import
QtQuick
.
Controls
.
Material
2.12
import
"
components
"
...
...
@@ -45,7 +45,7 @@ Item{
anchors.left
:
parent
.
left
anchors.leftMargin
:
15
onTextChanged
:
modelData
.
name
=
text
color
:
parent
.
selected
?
"
white
"
:
"
black
"
color
:
parent
.
selected
?
"
white
"
:
Material
.
foreground
onFocusChanged
:
{
if
(
focus
){
parent
.
makeCurrentItem
();
...
...
src/qml/ProgrammPrototypeView.qml
View file @
e17b9425
import
QtQuick
2.9
import
QtQuick
.
Controls
2.2
import
QtQuick
.
Layouts
1.0
import
QtQuick
.
Dialogs
1.2
import
QtQuick
2.12
import
QtQuick
.
Controls
2.12
import
QtQuick
.
Controls
.
Material
2.12
import
QtQuick
.
Layouts
1.12
import
QtQuick
.
Dialogs
1.3
import
custom
.
licht
1.0
import
"
components
"
...
...
@@ -36,6 +37,7 @@ ModelView{
Layout.fillWidth
:
true
header
:
Text
{
text
:
"
Die einzelnen ChannelProgramme :
"
color
:
Material
.
foreground
height
:
70
}
id
:
channelView
...
...
src/qml/components/TextInputField.qml
View file @
e17b9425
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
import
QtQuick
2.12
import
QtQuick
.
Controls
2.12
import
QtQuick
.
Controls
.
Material
2.12
TextInput
{
color
:
Material
.
foreground
selectByMouse
:
true
font.pixelSize
:
15
selectionColor
:
"
lightgreen
"
...
...
src/qml/main.qml
View file @
e17b9425
...
...
@@ -3,6 +3,7 @@ import QtQuick 2.12
import
QtQuick
.
Controls
2.12
import
QtQuick
.
Layouts
1.12
import
custom
.
licht
1.0
import
QtQuick
.
Controls
.
Material
2.12
import
"
ControlPane
"
import
"
components
"
import
"
HelpSystem
"
...
...
@@ -228,6 +229,7 @@ ApplicationWindow {
Oscillogram
{
visibleForUser
:
SwipeView
.
isCurrentItem
lineColor
:
Material
.
foreground
}
FFTGraphView
{
...
...
@@ -256,6 +258,7 @@ ApplicationWindow {
}
LedWindow
{
color
:
window
.
Material
.
background
id
:
ledWindow
property
int
insertAtIndex
function
moveToWindow
(
index
){
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment