45 lines
2.2 KiB
Diff
45 lines
2.2 KiB
Diff
From 6b462e70ec6072b9861b57e720407ada9a78ac80 Mon Sep 17 00:00:00 2001
|
|
From: David Rosca <nowrep@gmail.com>
|
|
Date: Thu, 12 Mar 2015 21:13:53 +0100
|
|
Subject: [PATCH 11/12] Fix displaying label1 in job notifications
|
|
|
|
Move label1 and labelName1 properties to correct place.
|
|
This fixes displaying second field in job description (eg. Destination).
|
|
|
|
REVIEW: 122916
|
|
---
|
|
applets/notifications/package/contents/ui/JobDelegate.qml | 2 ++
|
|
applets/notifications/package/contents/ui/JobDetailsItem.qml | 2 --
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/applets/notifications/package/contents/ui/JobDelegate.qml b/applets/notifications/package/contents/ui/JobDelegate.qml
|
|
index a27b5abf5280772bd3d28026c68f7ba1cda7b4a4..4c792588e13ef8cb54f2a117f4cd2726a785519c 100644
|
|
--- a/applets/notifications/package/contents/ui/JobDelegate.qml
|
|
+++ b/applets/notifications/package/contents/ui/JobDelegate.qml
|
|
@@ -35,7 +35,9 @@ Column {
|
|
readonly property int animationDuration: units.shortDuration * 2
|
|
|
|
readonly property string labelName0: getData(jobsSource.data, "labelName0", '')
|
|
+ readonly property string labelName1: getData(jobsSource.data, "labelName1", '')
|
|
readonly property string label0: getData(jobsSource.data, "label0", '')
|
|
+ readonly property string label1: getData(jobsSource.data, "label1", '')
|
|
readonly property string jobstate: getData(jobsSource.data, "state", '')
|
|
|
|
function getData(data, name, defaultValue) {
|
|
diff --git a/applets/notifications/package/contents/ui/JobDetailsItem.qml b/applets/notifications/package/contents/ui/JobDetailsItem.qml
|
|
index 8b18356846990bbf5c19b5c2ba0e803aa019f357..52b950ec0ff73a82cf9cec1f68c4d0652283761c 100644
|
|
--- a/applets/notifications/package/contents/ui/JobDetailsItem.qml
|
|
+++ b/applets/notifications/package/contents/ui/JobDetailsItem.qml
|
|
@@ -32,8 +32,6 @@ Column {
|
|
|
|
spacing: jobItem.layoutSpacing
|
|
|
|
- readonly property string labelName1: jobItem.getData(jobsSource.data, "labelName1", '')
|
|
- readonly property string label1: jobItem.getData(jobsSource.data, "label1", '')
|
|
readonly property int eta: jobItem.getData(jobsSource.data, "eta", 0)
|
|
readonly property string speed: jobItem.getData(jobsSource.data, "speed", '')
|
|
|
|
--
|
|
2.3.1
|
|
|