From 1ac7084c21e190112b853b59a24a70750eb0f03a Mon Sep 17 00:00:00 2001 From: Niels Weber Date: Mon, 13 Oct 2014 14:03:55 +0200 Subject: Remove useful info section from HomeScreen Items are all available through the menu. This gives more space for upcoming and news. Change-Id: Ice5920dad233dcc066ca0050ce9b6fd22f0947fd Reviewed-by: Caroline Chao --- qml/components/HomeScreen.qml | 63 +------------ qml/components/images/Btn_FloorMap.svg | 42 --------- qml/components/images/Btn_Schedule.svg | 159 -------------------------------- qml/components/images/Btn_ToWebsite.svg | 100 -------------------- resource.qrc | 3 - src/theme.cpp | 4 - 6 files changed, 2 insertions(+), 369 deletions(-) delete mode 100644 qml/components/images/Btn_FloorMap.svg delete mode 100644 qml/components/images/Btn_Schedule.svg delete mode 100644 qml/components/images/Btn_ToWebsite.svg diff --git a/qml/components/HomeScreen.qml b/qml/components/HomeScreen.qml index e46340f..e52a1b9 100644 --- a/qml/components/HomeScreen.qml +++ b/qml/components/HomeScreen.qml @@ -47,7 +47,6 @@ Rectangle { height: window.height - header.height width: window.width objectName: "homeScreen" - property int usefulItemHeight: Theme.sizes.infoButtonSize + Theme.sizes.homeTitleHeight + Theme.margins.twenty property var idx property var ids @@ -102,7 +101,7 @@ Rectangle { // upcoming id: upcomingItem width: homeScreenWindow.width - height: (homeScreenWindow.height - homeScreenWindow.usefulItemHeight)/2 + height: homeScreenWindow.height / 2 property string visibleDate: "" property string formatDate: "ddd d.MM" @@ -261,7 +260,7 @@ Rectangle { Item { // twitter news width: window.width - height: (homeScreenWindow.height - homeScreenWindow.usefulItemHeight)/2 + height: homeScreenWindow.height / 2 TweetModel { id: tweetModel @@ -479,63 +478,5 @@ Rectangle { delegate: tweetDelegate } } - Item { - // useful info - id: usefulItem - width: window.width - height: homeScreenWindow.usefulItemHeight - Text { - id: labelInfo - z: 1 - text: Theme.text.info - width: parent.width - height: Theme.sizes.homeTitleHeight - font.pointSize: Theme.fonts.seven_pt - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - font.capitalization: Font.AllUppercase - Rectangle { - anchors.fill: parent - z: -1 - color: Theme.colors.smokewhite - } - } - Row { - anchors.top: labelInfo.bottom - anchors.bottom: usefulItem.bottom - anchors.horizontalCenter: parent.horizontalCenter - spacing: Theme.margins.thirty - Image { - source: Theme.images.btnFloorMap - sourceSize.height: Theme.sizes.infoButtonSize - sourceSize.width: Theme.sizes.infoButtonSize - anchors.verticalCenter: parent.verticalCenter - MouseArea { - anchors.fill: parent - onClicked: stack.push(Qt.resolvedUrl("Floorplan.qml")) - } - } - Image { - source: Theme.images.btnSchedule - sourceSize.height: Theme.sizes.infoButtonSize - sourceSize.width: Theme.sizes.infoButtonSize - anchors.verticalCenter: parent.verticalCenter - MouseArea { - anchors.fill: parent - onClicked: stack.push(Qt.resolvedUrl("TrackSwitcher.qml")) - } - } - Image { - source: Theme.images.btnToWebsite - sourceSize.height: Theme.sizes.infoButtonSize - sourceSize.width: Theme.sizes.infoButtonSize - anchors.verticalCenter: parent.verticalCenter - MouseArea { - anchors.fill: parent - onClicked: Qt.openUrlExternally(applicationClient.currentConferenceDetails.infopage) - } - } - } - } } } diff --git a/qml/components/images/Btn_FloorMap.svg b/qml/components/images/Btn_FloorMap.svg deleted file mode 100644 index ea997d7..0000000 --- a/qml/components/images/Btn_FloorMap.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qml/components/images/Btn_Schedule.svg b/qml/components/images/Btn_Schedule.svg deleted file mode 100644 index f466a10..0000000 --- a/qml/components/images/Btn_Schedule.svg +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qml/components/images/Btn_ToWebsite.svg b/qml/components/images/Btn_ToWebsite.svg deleted file mode 100644 index d41b936..0000000 --- a/qml/components/images/Btn_ToWebsite.svg +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resource.qrc b/resource.qrc index 7404c48..a20d803 100644 --- a/resource.qrc +++ b/resource.qrc @@ -31,12 +31,9 @@ qml/components/images/icon-loading.svg qml/components/images/Location.svg qml/components/images/Twitter.svg - qml/components/images/Btn_ToWebsite.svg - qml/components/images/Btn_FloorMap.svg qml/components/images/LevelA.svg qml/components/images/LevelB.svg qml/components/images/LevelC.svg qml/components/images/sfo_floor.png - qml/components/images/Btn_Schedule.svg diff --git a/src/theme.cpp b/src/theme.cpp index 3ee3714..bc6b3a0 100644 --- a/src/theme.cpp +++ b/src/theme.cpp @@ -78,7 +78,6 @@ Theme::Theme(QObject *parent) m_text->insert(QLatin1String("feedback"), tr("Send Feedback")); m_text->insert(QLatin1String("upcoming"), tr("Upcoming: %1 %2")); m_text->insert(QLatin1String("news"), tr("Tweets")); - m_text->insert(QLatin1String("info"), tr("Useful Information")); m_text->insert(QLatin1String("writeYourCommentHere"), tr("Write your comments here")); m_text->insert(QLatin1String("by"), tr("by %1")); m_text->insert(QLatin1String("room"), tr("Room %1")); @@ -143,9 +142,6 @@ Theme::Theme(QObject *parent) m_images->insert(QLatin1String("anonymous"), QVariant("qrc:/images/anonymous.svg")); m_images->insert(QLatin1String("location"), QVariant("qrc:/images/Location.svg")); m_images->insert(QLatin1String("twitter"), QVariant("qrc:/images/Twitter.svg")); - m_images->insert(QLatin1String("btnToWebsite"), QVariant("qrc:/images/Btn_ToWebsite.svg")); - m_images->insert(QLatin1String("btnFloorMap"), QVariant("qrc:/images/Btn_FloorMap.svg")); - m_images->insert(QLatin1String("btnSchedule"), QVariant("qrc:/images/Btn_Schedule.svg")); m_images->insert(QLatin1String("levelA"), QVariant("qrc:/images/LevelA.svg")); m_images->insert(QLatin1String("levelB"), QVariant("qrc:/images/LevelB.svg")); m_images->insert(QLatin1String("levelC"), QVariant("qrc:/images/LevelC.svg")); -- cgit v1.2.3