Small bug fixes

- Add performer and room for breaks if any
- Add missing translations tr()
- Update color background of Items shown at startup

Change-Id: If9224e43ca8be1979394f145a8df0a3149e031f3
Reviewed-by: Niels Weber <niels.weber@digia.com>

3 files changed, 20 insertions, 9 deletions

diff --git a/qml/components/TrackSwitcher.qml b/qml/components/TrackSwitcher.qml
index a3cc76a..4d5d5c2 100644
--- a/qml/components/TrackSwitcher.qml
+++ b/qml/components/TrackSwitcher.qml
@@ -292,12 +292,22 @@ Rectangle {
                             width: Functions.countTrackWidth(start, end) - Theme.margins.ten
                             height: Math.min(breakColumn.height, listView.contentHeight - Theme.margins.ten)
                             Text {
+                                function info()
+                                {
+                                    var info = name +  "\n" + Qt.formatTime(start, "h:mm") + " - " + Qt.formatTime(end, "h:mm")
+                                    if (!!performer)
+                                        info = info + "\n" + Theme.text.by.arg(performer)
+                                    if (!!room)
+                                        info = info + "\n" + Theme.text.room.arg(room)
+                                    return info
+                                }
+
                                 width: parent.width
                                 verticalAlignment: Text.AlignVCenter
                                 height: parent.height
                                 horizontalAlignment: Text.AlignHCenter
                                 font.pointSize: Theme.fonts.seven_pt
-                                text: name +  "\n" + Qt.formatTime(start, "h:mm") + " - " + Qt.formatTime(end, "h:mm")
+                                text: info()
                                 color: Theme.colors.darkgray
                             }
                             MouseArea {
diff --git a/qml/main.qml b/qml/main.qml
index 8c95175..cb966a0 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -234,10 +234,11 @@ ApplicationWindow {
         }
     }
 
-    Item {
+    Rectangle {
         id: splashscreen
         anchors.fill: parent
         visible: !initConferenceSwitcher.visible
+        color: Theme.colors.white
         Image {
             id: splashlogo
             visible: splashscreen.visible
@@ -262,12 +263,12 @@ ApplicationWindow {
     Rectangle {
         id: initConferenceSwitcher
         anchors.fill: parent
-        opacity: 0.01
         visible:  ModelsSingleton.conferenceId === ""
+        color: Theme.colors.white
         Image {
             id: logo
+            opacity: 0.01
             visible: parent.visible
-            opacity: parent.opacity
             anchors.top: parent.top
             anchors.topMargin: Theme.margins.thirty
             anchors.horizontalCenter: parent.horizontalCenter
@@ -280,13 +281,13 @@ ApplicationWindow {
             anchors.top: logo.bottom
             anchors.topMargin: Theme.margins.thirty
             anchors.bottom: parent.bottom
-            opacity: parent.opacity
+            opacity: logo.opacity
             width: parent.width
         }
     }
 
     Connections {
         target: applicationClient
-        onConferencesModelChanged: if (initConferenceSwitcher.visible) initConferenceSwitcher.opacity = 1
+        onConferencesModelChanged: if (initConferenceSwitcher.visible) logo.opacity = 1
     }
 }
diff --git a/src/theme.cpp b/src/theme.cpp
index b818e93..8e1aa8b 100644
--- a/src/theme.cpp
+++ b/src/theme.cpp
@@ -84,9 +84,9 @@ Theme::Theme(QObject *parent)
     m_text->insert(QLatin1String("room"), tr("Room %1"));
     m_text->insert(QLatin1String("room_space"), tr(" - Room %1"));
     m_text->insert(QLatin1String("twitterLink"), tr("https://twitter.com/"));
-    m_text->insert(QLatin1String("select_conference"), "Select a conference");
-    m_text->insert(QLatin1String("switchConf"), "Switch Conference");
-    m_text->insert(QLatin1String("floorPlan"), "Floorplan");
+    m_text->insert(QLatin1String("select_conference"), tr("Select a conference"));
+    m_text->insert(QLatin1String("switchConf"), tr("Switch Conference"));
+    m_text->insert(QLatin1String("floorPlan"), tr("Floor Plan"));
 
     m_colors = new QQmlPropertyMap(this);
     m_colors->insert(QLatin1String("white"), QVariant("#ffffff"));