[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ring-kde] src: wizard: Fix some colors
From:       Emmanuel Lepage Vallee <null () kde ! org>
Date:       2017-08-01 3:47:01
Message-ID: E1dcO97-0003ZY-Pa () code ! kde ! org
[Download RAW message or body]

Git commit 40c73c4eab667834c65d6b5a4a7415e246b8e8d4 by Emmanuel Lepage Vall=
ee.
Committed on 01/08/2017 at 03:47.
Pushed by lepagevalleeemmanuel into branch 'master'.

wizard: Fix some colors

M  +12   -8    src/timeline/qml/contactinfo.qml
M  +1    -0    src/wizard/qml/ProfilePage.qml

https://commits.kde.org/ring-kde/40c73c4eab667834c65d6b5a4a7415e246b8e8d4

diff --git a/src/timeline/qml/contactinfo.qml b/src/timeline/qml/contactinf=
o.qml
index 6bcd940a..48d7c137 100644
--- a/src/timeline/qml/contactinfo.qml
+++ b/src/timeline/qml/contactinfo.qml
@@ -33,6 +33,8 @@ Item {
     property bool showImage: false
     property bool showSave: true
 =

+    property var labelColor: undefined
+
     property var cachedPhoto: undefined
 =

     function save() {
@@ -185,8 +187,6 @@ Item {
         id: advanced
         title: qsTr("Advanced")
         clip: true
-        anchors.top: mainInfo.bottom
-        visible: false
 =

         ColumnLayout {
             id: tabbedContactInfo
@@ -250,7 +250,7 @@ Item {
                         Label {
                             id: label
                             text: qsTr("Formatted name:")
-                            color: activePalette.text
+                            color: labelColor ? labelColor : activePalette=
.text
                         }
                         TextField {
                             id: formattedName
@@ -261,7 +261,7 @@ Item {
 =

                         Label {
                             text: qsTr("Primary name:")
-                            color: activePalette.text
+                            color: labelColor ? labelColor : activePalette=
.text
                         }
                         TextField {
                             id: firstName
@@ -272,7 +272,7 @@ Item {
 =

                         Label {
                             text: qsTr("Last name:")
-                            color: activePalette.text
+                            color: labelColor ? labelColor : activePalette=
.text
                         }
                         TextField {
                             id: lastName
@@ -283,7 +283,7 @@ Item {
 =

                         Label {
                             text: qsTr("Email:")
-                            color: activePalette.text
+                            color: labelColor ? labelColor : activePalette=
.text
                         }
                         TextField {
                             id: email
@@ -294,7 +294,7 @@ Item {
 =

                         Label {
                             text: qsTr("Organization:")
-                            color: activePalette.text
+                            color: labelColor ? labelColor : activePalette=
.text
                         }
                         TextField {
                             id: organization
@@ -417,7 +417,7 @@ Item {
                 target: advanced
                 anchors.right: contactViewPage.right
                 anchors.bottom: contactViewPage.bottom
-                anchors.top: contactViewPage.top
+                anchors.top:  contactPicture.bottom
                 anchors.left: undefined
             }
             AnchorChanges {
@@ -507,6 +507,10 @@ Item {
                 target: tabbedContactInfo
                 anchors.fill: contactViewPage
             }
+            PropertyChanges {
+                target: advanced
+                visible: false
+            }
         }
     ]
 =

diff --git a/src/wizard/qml/ProfilePage.qml b/src/wizard/qml/ProfilePage.qml
index 2d4543ea..88bf9c5c 100644
--- a/src/wizard/qml/ProfilePage.qml
+++ b/src/wizard/qml/ProfilePage.qml
@@ -22,4 +22,5 @@ ContactInfo {
     showStat: false
     showImage: true
     showSave: false
+    labelColor: "white"
 }
[prev in list] [next in list] [prev in thread] [next in thread]