summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels Weber <niels.weber@digia.com>2014-10-13 14:03:55 +0200
committerNiels Weber <niels.weber@digia.com>2014-10-14 10:12:56 +0200
commit1ac7084c21e190112b853b59a24a70750eb0f03a (patch)
tree5e0ef2762ec398c2fd64a5c39fb55471a8b8e33e
parenteddb62168f180d3969c218390089828ffeb59b81 (diff)
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 <caroline.chao@digia.com>
-rw-r--r--qml/components/HomeScreen.qml63
-rw-r--r--qml/components/images/Btn_FloorMap.svg42
-rw-r--r--qml/components/images/Btn_Schedule.svg159
-rw-r--r--qml/components/images/Btn_ToWebsite.svg100
-rw-r--r--resource.qrc3
-rw-r--r--src/theme.cpp4
6 files changed, 2 insertions, 369 deletions
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="310px" height="300px" viewBox="0 0 310 300" enable-background="new 0 0 310 300" xml:space="preserve">
-<g>
- <rect fill="#D85B3A" width="310" height="300"/>
-</g>
-<g>
- <polygon fill="#FFFFFF" points="128,150.666 88,164 88,81.334 128,68 "/>
- <polygon fill="#FFFFFF" points="182,81.334 222,68 222,150.666 182,164 "/>
- <polygon fill="#FFFFFF" points="135,150.666 175,164 175,81.334 135,68 "/>
-</g>
-<g>
- <path fill="#FFFFFF" d="M55.324,239.88H52.17v-27.127h15.122v2.802H55.324v9.927h11.244v2.802H55.324V239.88z"/>
- <path fill="#FFFFFF" d="M71.782,239.88v-27.127h3.154v24.27h11.968v2.857H71.782z"/>
- <path fill="#FFFFFF" d="M115.052,226.279c0,4.342-1.099,7.756-3.294,10.242s-5.248,3.729-9.156,3.729
- c-3.996,0-7.078-1.222-9.25-3.664c-2.17-2.443-3.256-5.892-3.256-10.345c0-4.416,1.088-7.839,3.266-10.271
- c2.177-2.43,5.27-3.646,9.277-3.646c3.896,0,6.939,1.237,9.129,3.711C113.957,218.512,115.052,221.926,115.052,226.279z
- M93.436,226.279c0,3.674,0.782,6.46,2.348,8.358c1.564,1.899,3.837,2.849,6.818,2.849c3.006,0,5.275-0.946,6.81-2.839
- s2.301-4.682,2.301-8.368c0-3.648-0.765-6.417-2.292-8.304c-1.527-1.886-3.788-2.829-6.781-2.829c-3.006,0-5.291,0.949-6.855,2.849
- C94.218,219.894,93.436,222.655,93.436,226.279z"/>
- <path fill="#FFFFFF" d="M144.646,226.279c0,4.342-1.098,7.756-3.293,10.242c-2.196,2.486-5.248,3.729-9.157,3.729
- c-3.995,0-7.079-1.222-9.249-3.664c-2.172-2.443-3.257-5.892-3.257-10.345c0-4.416,1.089-7.839,3.266-10.271
- c2.177-2.43,5.27-3.646,9.277-3.646c3.896,0,6.939,1.237,9.129,3.711C143.552,218.512,144.646,221.926,144.646,226.279z
- M123.03,226.279c0,3.674,0.782,6.46,2.347,8.358c1.564,1.899,3.838,2.849,6.819,2.849c3.006,0,5.275-0.946,6.81-2.839
- c1.533-1.893,2.301-4.682,2.301-8.368c0-3.648-0.764-6.417-2.291-8.304c-1.528-1.886-3.789-2.829-6.782-2.829
- c-3.006,0-5.292,0.949-6.856,2.849C123.812,219.894,123.03,222.655,123.03,226.279z"/>
- <path fill="#FFFFFF" d="M153.85,228.599v11.281h-3.154v-27.127h7.44c3.327,0,5.786,0.638,7.376,1.911
- c1.589,1.274,2.384,3.191,2.384,5.752c0,3.588-1.818,6.012-5.455,7.273l7.366,12.19h-3.729l-6.568-11.281H153.85z M153.85,225.89
- h4.323c2.227,0,3.859-0.442,4.898-1.326c1.039-0.885,1.559-2.211,1.559-3.98c0-1.793-0.528-3.086-1.587-3.878
- c-1.057-0.791-2.755-1.188-5.093-1.188h-4.101V225.89z"/>
- <path fill="#FFFFFF" d="M196.062,239.88l-9.203-24.047h-0.148c0.173,1.905,0.26,4.169,0.26,6.791v17.256h-2.913v-27.127h4.75
- l8.591,22.377h0.148l8.665-22.377h4.713v27.127h-3.154v-17.479c0-2.004,0.086-4.181,0.26-6.531h-0.148l-9.277,24.01H196.062z"/>
- <path fill="#FFFFFF" d="M235.416,239.88l-3.377-8.628h-10.873l-3.34,8.628h-3.191l10.725-27.238h2.653l10.669,27.238H235.416z
- M231.056,228.413l-3.154-8.405c-0.408-1.063-0.829-2.368-1.262-3.915c-0.272,1.188-0.662,2.493-1.169,3.915l-3.191,8.405H231.056z
- "/>
- <path fill="#FFFFFF" d="M259.611,220.657c0,2.746-0.938,4.858-2.811,6.336c-1.875,1.479-4.556,2.218-8.044,2.218h-3.191v10.669
- h-3.154v-27.127h7.032C256.222,212.753,259.611,215.388,259.611,220.657z M245.565,226.502h2.839c2.795,0,4.817-0.451,6.067-1.354
- c1.249-0.902,1.874-2.35,1.874-4.342c0-1.793-0.588-3.129-1.763-4.008c-1.176-0.878-3.006-1.317-5.492-1.317h-3.525V226.502z"/>
-</g>
-</svg>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="310px" height="300px" viewBox="-0.5 -0.5 310 300" enable-background="new -0.5 -0.5 310 300" xml:space="preserve">
-<g>
- <polygon fill="#FFFFFF" points="127.5,150.166 87.5,163.5 87.5,80.834 127.5,67.5 "/>
- <polygon fill="#FFFFFF" points="181.5,80.834 221.5,67.5 221.5,150.166 181.5,163.5 "/>
- <polygon fill="#FFFFFF" points="134.5,150.166 174.5,163.5 174.5,80.834 134.5,67.5 "/>
-</g>
-<g>
- <path fill="#FFFFFF" d="M55.324,239.88H52.17v-27.127h15.122v2.802H55.324v9.928h11.244v2.802H55.324V239.88z"/>
- <path fill="#FFFFFF" d="M71.782,239.88v-27.127h3.154v24.271h11.968v2.856H71.782z"/>
- <path fill="#FFFFFF" d="M115.052,226.279c0,4.342-1.099,7.756-3.294,10.242c-2.195,2.485-5.248,3.729-9.156,3.729
- c-3.996,0-7.078-1.223-9.25-3.664c-2.17-2.443-3.256-5.893-3.256-10.345c0-4.416,1.088-7.839,3.266-10.271
- c2.177-2.431,5.27-3.646,9.277-3.646c3.896,0,6.939,1.236,9.129,3.711C113.957,218.512,115.052,221.926,115.052,226.279z
- M93.436,226.279c0,3.674,0.782,6.46,2.348,8.357c1.564,1.899,3.837,2.85,6.818,2.85c3.006,0,5.275-0.946,6.81-2.84
- c1.535-1.893,2.301-4.682,2.301-8.367c0-3.648-0.765-6.418-2.292-8.305c-1.527-1.886-3.788-2.828-6.781-2.828
- c-3.006,0-5.291,0.949-6.855,2.849C94.218,219.895,93.436,222.655,93.436,226.279z"/>
- <path fill="#FFFFFF" d="M144.646,226.279c0,4.342-1.098,7.756-3.293,10.242c-2.196,2.485-5.248,3.729-9.157,3.729
- c-3.995,0-7.079-1.223-9.249-3.664c-2.172-2.443-3.257-5.893-3.257-10.345c0-4.416,1.089-7.839,3.266-10.271
- c2.177-2.431,5.27-3.646,9.277-3.646c3.896,0,6.939,1.236,9.129,3.711C143.552,218.512,144.646,221.926,144.646,226.279z
- M123.03,226.279c0,3.674,0.782,6.46,2.347,8.357c1.564,1.899,3.838,2.85,6.819,2.85c3.006,0,5.275-0.946,6.81-2.84
- c1.533-1.893,2.301-4.682,2.301-8.367c0-3.648-0.764-6.418-2.291-8.305c-1.528-1.886-3.789-2.828-6.782-2.828
- c-3.006,0-5.292,0.949-6.856,2.849C123.812,219.895,123.03,222.655,123.03,226.279z"/>
- <path fill="#FFFFFF" d="M153.85,228.6v11.28h-3.154v-27.127h7.44c3.327,0,5.786,0.638,7.376,1.911s2.385,3.191,2.385,5.752
- c0,3.588-1.818,6.012-5.455,7.273l7.365,12.189h-3.729l-6.568-11.281h-5.66V228.6z M153.85,225.891h4.323
- c2.228,0,3.859-0.442,4.897-1.326c1.039-0.885,1.56-2.211,1.56-3.98c0-1.793-0.528-3.086-1.587-3.878
- c-1.057-0.791-2.755-1.188-5.093-1.188h-4.101L153.85,225.891L153.85,225.891z"/>
- <path fill="#FFFFFF" d="M196.062,239.88l-9.203-24.047h-0.148c0.173,1.905,0.26,4.169,0.26,6.791v17.256h-2.912v-27.127h4.75
- l8.59,22.377h0.148l8.665-22.377h4.713v27.127h-3.153V222.4c0-2.004,0.086-4.181,0.26-6.53h-0.148l-9.277,24.01H196.062z"/>
- <path fill="#FFFFFF" d="M235.416,239.88l-3.377-8.628h-10.873l-3.34,8.628h-3.191l10.725-27.237h2.654l10.668,27.237H235.416z
- M231.057,228.413l-3.154-8.405c-0.408-1.062-0.829-2.367-1.262-3.915c-0.272,1.188-0.662,2.493-1.17,3.915l-3.19,8.405H231.057z"
- />
- <path fill="#FFFFFF" d="M259.611,220.657c0,2.745-0.938,4.858-2.812,6.336c-1.875,1.479-4.556,2.218-8.044,2.218h-3.191v10.669
- h-3.153v-27.127h7.032C256.223,212.753,259.611,215.389,259.611,220.657z M245.564,226.502h2.84c2.795,0,4.816-0.451,6.066-1.354
- c1.249-0.902,1.874-2.351,1.874-4.342c0-1.793-0.588-3.13-1.763-4.009c-1.176-0.878-3.006-1.317-5.492-1.317h-3.525V226.502z"/>
-</g>
-<g>
- <path fill="#FFFFFF" d="M59.564,239.88H56.41v-24.325h-8.592v-2.802h20.336v2.802h-8.59V239.88z"/>
- <path fill="#FFFFFF" d="M95.783,226.279c0,4.342-1.099,7.756-3.294,10.242c-2.196,2.485-5.248,3.729-9.157,3.729
- c-3.995,0-7.078-1.223-9.249-3.664c-2.171-2.443-3.257-5.893-3.257-10.345c0-4.416,1.089-7.839,3.266-10.271
- c2.178-2.431,5.27-3.646,9.277-3.646c3.896,0,6.939,1.236,9.129,3.711C94.688,218.512,95.783,221.926,95.783,226.279z
- M74.166,226.279c0,3.674,0.783,6.46,2.348,8.357c1.564,1.899,3.838,2.85,6.818,2.85c3.006,0,5.275-0.946,6.811-2.84
- c1.533-1.893,2.301-4.682,2.301-8.367c0-3.648-0.765-6.418-2.292-8.305c-1.528-1.886-3.788-2.828-6.782-2.828
- c-3.006,0-5.291,0.949-6.855,2.849C74.949,219.895,74.166,222.655,74.166,226.279z"/>
- <path fill="#FFFFFF" d="M135.379,239.88h-3.117l-5.475-18.165c-0.26-0.804-0.551-1.818-0.871-3.043
- c-0.322-1.225-0.489-1.96-0.502-2.208c-0.271,1.634-0.705,3.421-1.299,5.362l-5.307,18.054h-3.117l-7.217-27.127h3.34l4.285,16.755
- c0.594,2.352,1.027,4.479,1.299,6.383c0.334-2.264,0.829-4.478,1.484-6.643l4.861-16.495h3.34l5.104,16.644
- c0.594,1.918,1.094,4.082,1.502,6.494c0.235-1.756,0.681-3.896,1.336-6.42l4.268-16.718h3.34L135.379,239.88z"/>
- <path fill="#FFFFFF" d="M162.004,239.88h-15.121v-27.127h15.121v2.802h-11.967v8.739h11.244v2.783h-11.244v9.981h11.967V239.88z"/>
- <path fill="#FFFFFF" d="M168.016,212.753h7.664c3.601,0,6.203,0.538,7.812,1.614s2.411,2.777,2.411,5.103
- c0,1.608-0.447,2.936-1.344,3.98c-0.897,1.045-2.205,1.723-3.926,2.03v0.187c4.119,0.705,6.18,2.87,6.18,6.494
- c0,2.425-0.819,4.317-2.459,5.678c-1.639,1.361-3.931,2.041-6.875,2.041h-9.463V212.753z M171.17,224.368h5.195
- c2.227,0,3.828-0.351,4.807-1.05c0.977-0.697,1.465-1.875,1.465-3.533c0-1.521-0.544-2.619-1.633-3.294
- c-1.088-0.675-2.82-1.011-5.195-1.011h-4.639V224.368L171.17,224.368z M171.17,227.04v10.149h5.66c2.189,0,3.837-0.424,4.943-1.271
- s1.662-2.174,1.662-3.98c0-1.682-0.566-2.918-1.699-3.711c-1.131-0.791-2.854-1.188-5.166-1.188L171.17,227.04L171.17,227.04z"/>
- <path fill="#FFFFFF" d="M207.945,232.662c0,2.388-0.865,4.249-2.598,5.585c-1.733,1.336-4.082,2.004-7.052,2.004
- c-3.217,0-5.688-0.414-7.422-1.243v-3.043c1.112,0.471,2.326,0.842,3.637,1.113c1.312,0.271,2.609,0.408,3.896,0.408
- c2.104,0,3.686-0.399,4.75-1.196c1.063-0.799,1.596-1.908,1.596-3.331c0-0.939-0.188-1.71-0.565-2.311s-1.008-1.152-1.894-1.66
- c-0.883-0.508-2.229-1.082-4.035-1.727c-2.522-0.902-4.325-1.973-5.407-3.21c-1.082-1.235-1.623-2.851-1.623-4.843
- c0-2.09,0.785-3.754,2.354-4.991c1.569-1.235,3.647-1.854,6.233-1.854c2.697,0,5.179,0.494,7.441,1.484l-0.984,2.745
- c-2.237-0.938-4.416-1.409-6.53-1.409c-1.671,0-2.976,0.358-3.914,1.075c-0.94,0.718-1.41,1.714-1.41,2.987
- c0,0.939,0.172,1.71,0.521,2.311c0.346,0.601,0.93,1.15,1.752,1.65c0.824,0.502,2.082,1.057,3.776,1.661
- c2.845,1.015,4.804,2.104,5.871,3.266C207.41,229.298,207.945,230.807,207.945,232.662z"/>
- <path fill="#FFFFFF" d="M213.493,239.88v-27.127h3.153v27.127H213.493z"/>
- <path fill="#FFFFFF" d="M232.438,239.88h-3.153v-24.325h-8.591v-2.802h20.336v2.802h-8.592V239.88z"/>
- <path fill="#FFFFFF" d="M260.232,239.88h-15.123v-27.127h15.123v2.802h-11.969v8.739h11.244v2.783h-11.244v9.981h11.969V239.88z"/>
-</g>
-<g>
- <path fill="#FFFFFF" d="M154.496,165.5c-27.452,0-49.854-22.26-49.995-49.744c-0.142-27.569,22.173-50.115,49.743-50.256h0.498
- c13.273,0.067,25.738,5.269,35.113,14.645c9.375,9.375,14.576,21.84,14.645,35.099c0.068,13.355-5.068,25.938-14.463,35.43
- c-9.396,9.493-21.926,14.758-35.28,14.826C154.671,165.499,154.582,165.5,154.496,165.5z M157.514,135.859v22.438
- c6.25-5.613,11.104-12.403,14.336-19.94C167.17,136.936,162.354,136.104,157.514,135.859z M137.154,138.356
- c2.207,5.116,5.181,9.934,8.877,14.311c1.684,1.992,3.515,3.88,5.457,5.628v-22.436
- C146.649,136.104,141.833,136.936,137.154,138.356z M177.527,140.402c-2.68,6.354-6.399,12.234-11.051,17.432
- c7.231-2.034,13.851-5.914,19.277-11.398c0.368-0.371,0.729-0.748,1.081-1.13C183.852,143.379,180.736,141.744,177.527,140.402z
- M122.184,145.294c5.429,5.886,12.439,10.285,20.345,12.524c-0.373-0.416-0.738-0.838-1.099-1.266
- c-4.166-4.933-7.503-10.374-9.956-16.152C128.273,141.741,125.162,143.372,122.184,145.294z M179.604,134.74
- c3.811,1.576,7.502,3.525,11.027,5.849c4.537-6.503,7.209-14.083,7.745-22.076h-15.937c-0.037,0.846-0.092,1.692-0.164,2.541
- C181.88,125.759,180.979,130.34,179.604,134.74z M110.627,118.513c0.555,8.164,3.348,15.722,7.765,22.062
- c3.516-2.316,7.197-4.259,10.996-5.831c-1.646-5.23-2.604-10.679-2.836-16.231H110.627z M132.583,118.513
- c0.226,4.849,1.061,9.607,2.479,14.184c5.356-1.657,10.879-2.614,16.426-2.868v-11.315L132.583,118.513L132.583,118.513z
- M157.514,129.828c5.541,0.254,11.062,1.21,16.414,2.865c1.203-3.907,1.994-7.974,2.346-12.146c0.059-0.68,0.103-1.358,0.137-2.035
- h-18.896V129.828L157.514,129.828z M182.428,112.488h15.947c-0.538-7.996-3.214-15.579-7.744-22.077
- c-3.562,2.351-7.299,4.316-11.152,5.901C181.158,101.521,182.152,106.95,182.428,112.488z M157.514,112.488h18.881
- c-0.266-4.838-1.14-9.582-2.594-14.142c-5.312,1.632-10.787,2.573-16.287,2.825V112.488z M132.618,112.488h18.87v-11.316
- c-5.495-0.252-10.969-1.193-16.277-2.822c-1.281,4.042-2.118,8.256-2.482,12.585C132.685,111.453,132.646,111.971,132.618,112.488z
- M110.627,112.488h15.957c0.036-0.686,0.083-1.372,0.141-2.06c0.41-4.855,1.357-9.584,2.809-14.112
- c-3.85-1.582-7.582-3.546-11.142-5.891C113.972,96.771,111.18,104.33,110.627,112.488z M157.514,73.188v21.954
- c4.774-0.241,9.526-1.055,14.147-2.441c-2.187-4.957-5.099-9.63-8.69-13.884C161.286,76.822,159.456,74.936,157.514,73.188z
- M137.337,92.699c4.621,1.387,9.376,2.201,14.151,2.442V73.186C145.354,78.693,140.567,85.332,137.337,92.699z M165.876,73.003
- c0.579,0.631,1.146,1.274,1.694,1.927c4.068,4.816,7.346,10.116,9.781,15.743c3.27-1.356,6.444-3.016,9.484-4.979
- c-0.404-0.438-0.816-0.867-1.24-1.291C180.049,78.855,173.27,74.97,165.876,73.003z M122.183,85.706
- c3.033,1.957,6.202,3.612,9.464,4.965c2.777-6.453,6.629-12.408,11.444-17.646C134.948,75.213,127.737,79.686,122.183,85.706z"/>
-</g>
-<g>
- <rect x="-0.5" y="-0.5" fill="#D85B3A" width="310" height="300"/>
-</g>
-<g>
- <path fill="#FFFFFF" d="M78.926,232.662c0,2.388-0.866,4.249-2.598,5.585c-1.732,1.336-4.082,2.004-7.051,2.004
- c-3.217,0-5.69-0.414-7.422-1.243v-3.043c1.113,0.471,2.325,0.842,3.637,1.113c1.311,0.272,2.609,0.408,3.896,0.408
- c2.103,0,3.686-0.399,4.75-1.196c1.063-0.799,1.596-1.908,1.596-3.331c0-0.939-0.189-1.71-0.566-2.31
- c-0.377-0.601-1.008-1.153-1.893-1.661c-0.885-0.507-2.229-1.082-4.035-1.726c-2.523-0.902-4.326-1.973-5.408-3.21
- c-1.083-1.236-1.624-2.851-1.624-4.843c0-2.09,0.785-3.754,2.356-4.991c1.57-1.236,3.648-1.855,6.234-1.855
- c2.696,0,5.177,0.495,7.44,1.484l-0.983,2.746c-2.239-0.939-4.416-1.41-6.531-1.41c-1.67,0-2.975,0.359-3.915,1.076
- c-0.94,0.718-1.41,1.714-1.41,2.987c0,0.94,0.173,1.71,0.52,2.311c0.347,0.6,0.931,1.15,1.753,1.65
- c0.822,0.502,2.082,1.056,3.776,1.661c2.845,1.015,4.802,2.104,5.872,3.266C78.391,229.298,78.926,230.807,78.926,232.662z"/>
- <path fill="#FFFFFF" d="M96.089,215.184c-2.981,0-5.335,0.993-7.06,2.978c-1.727,1.986-2.589,4.704-2.589,8.155
- c0,3.551,0.831,6.293,2.495,8.229c1.664,1.936,4.036,2.903,7.116,2.903c1.893,0,4.051-0.34,6.476-1.021v2.765
- c-1.881,0.705-4.199,1.058-6.958,1.058c-3.995,0-7.079-1.212-9.249-3.637c-2.172-2.424-3.257-5.869-3.257-10.335
- c0-2.795,0.522-5.244,1.567-7.348c1.045-2.103,2.555-3.723,4.527-4.861c1.973-1.138,4.296-1.707,6.968-1.707
- c2.845,0,5.331,0.52,7.459,1.559l-1.336,2.709C100.195,215.666,98.143,215.184,96.089,215.184z"/>
- <path fill="#FFFFFF" d="M129.042,239.88h-3.154v-12.766h-14.287v12.766h-3.154v-27.127h3.154v11.541h14.287v-11.541h3.154V239.88z"
- />
- <path fill="#FFFFFF" d="M151.604,239.88h-15.122v-27.127h15.122v2.802h-11.968v8.739h11.244v2.783h-11.244v9.982h11.968V239.88z"/>
- <path fill="#FFFFFF" d="M179.27,226.057c0,4.479-1.215,7.901-3.646,10.271c-2.43,2.368-5.928,3.553-10.492,3.553h-7.515v-27.127
- h8.312c4.218,0,7.496,1.169,9.834,3.507S179.27,221.863,179.27,226.057z M175.93,226.168c0-3.537-0.888-6.203-2.662-7.997
- c-1.775-1.793-4.414-2.69-7.914-2.69h-4.583v21.672h3.841c3.76,0,6.587-0.925,8.479-2.774
- C174.983,232.529,175.93,229.793,175.93,226.168z"/>
- <path fill="#FFFFFF" d="M205.803,212.753v17.553c0,3.093-0.935,5.523-2.802,7.292c-1.868,1.77-4.435,2.653-7.7,2.653
- s-5.793-0.891-7.58-2.672s-2.681-4.23-2.681-7.348v-17.479h3.154v17.701c0,2.264,0.618,4.002,1.855,5.214
- c1.237,1.213,3.055,1.818,5.455,1.818c2.288,0,4.051-0.609,5.288-1.827c1.236-1.219,1.855-2.966,1.855-5.242v-17.664H205.803z"/>
- <path fill="#FFFFFF" d="M212.983,239.88v-27.127h3.154v24.27h11.968v2.857H212.983z"/>
- <path fill="#FFFFFF" d="M247.829,239.88h-15.122v-27.127h15.122v2.802h-11.968v8.739h11.244v2.783h-11.244v9.982h11.968V239.88z"/>
-</g>
-<g>
- <g>
- <path fill="#FFFFFF" d="M174.5,71.5v70h-74v-70H174.5 M180.5,65.5h-86v82h86V65.5L180.5,65.5z"/>
- <rect x="107.434" y="95.434" fill="#FFFFFF" width="60" height="6"/>
- <rect x="107.5" y="109.5" fill="#FFFFFF" width="60" height="6"/>
- <rect x="107.5" y="123.5" fill="#FFFFFF" width="60" height="6"/>
- <g>
- <rect x="94.5" y="65.5" fill="#FFFFFF" width="86" height="16"/>
- </g>
- <g>
- <rect x="107.934" y="54.934" fill="#FFFFFF" width="8" height="17"/>
- <path fill="#D85B3A" d="M114.434,56.434v14h-5v-14H114.434 M117.434,53.434h-3h-5h-3v3v14v3h3h5h3v-3v-14V53.434L117.434,53.434z
- "/>
- </g>
- <g>
- <rect x="158.934" y="54.934" fill="#FFFFFF" width="8" height="17"/>
- <path fill="#D85B3A" d="M165.434,56.434v14h-5v-14H165.434 M168.434,53.434h-3h-5h-3v3v14v3h3h5h3v-3v-14V53.434L168.434,53.434z
- "/>
- </g>
- </g>
- <g>
- <path fill="#D85B3A" d="M188.5,169.5c-17.645,0-32-14.355-32-32s14.355-32,32-32s32,14.355,32,32S206.145,169.5,188.5,169.5z"/>
- <path fill="#FFFFFF" d="M188.5,108.5c16.018,0,29,12.982,29,29s-12.982,29-29,29s-29-12.982-29-29S172.482,108.5,188.5,108.5
- M188.5,102.5c-19.299,0-35,15.701-35,35s15.701,35,35,35s35-15.701,35-35S207.799,102.5,188.5,102.5L188.5,102.5z"/>
- </g>
- <g>
- <ellipse fill="#FFFFFF" cx="188.5" cy="137.5" rx="22.5" ry="22.895"/>
- </g>
- <g>
- <polygon fill="#D85B3A" points="204.5,141 184.003,140.999 184,122.5 189,122.5 189.003,135.999 204.5,136 "/>
- </g>
-</g>
-</svg>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="310px" height="300px" viewBox="0 0 310 300" enable-background="new 0 0 310 300" xml:space="preserve">
-<g>
- <polygon fill="#FFFFFF" points="128,150.666 88,164 88,81.334 128,68 "/>
- <polygon fill="#FFFFFF" points="182,81.334 222,68 222,150.666 182,164 "/>
- <polygon fill="#FFFFFF" points="135,150.666 175,164 175,81.334 135,68 "/>
-</g>
-<g>
- <path fill="#FFFFFF" d="M55.324,239.88H52.17v-27.127h15.122v2.802H55.324v9.927h11.244v2.802H55.324V239.88z"/>
- <path fill="#FFFFFF" d="M71.782,239.88v-27.127h3.154v24.27h11.968v2.857H71.782z"/>
- <path fill="#FFFFFF" d="M115.052,226.279c0,4.342-1.099,7.756-3.294,10.242s-5.248,3.729-9.156,3.729
- c-3.996,0-7.078-1.222-9.25-3.664c-2.17-2.443-3.256-5.892-3.256-10.345c0-4.416,1.088-7.839,3.266-10.271
- c2.177-2.43,5.27-3.646,9.277-3.646c3.896,0,6.939,1.237,9.129,3.711C113.957,218.512,115.052,221.926,115.052,226.279z
- M93.436,226.279c0,3.674,0.782,6.46,2.348,8.358c1.564,1.899,3.837,2.849,6.818,2.849c3.006,0,5.275-0.946,6.81-2.839
- s2.301-4.682,2.301-8.368c0-3.648-0.765-6.417-2.292-8.304c-1.527-1.886-3.788-2.829-6.781-2.829c-3.006,0-5.291,0.949-6.855,2.849
- C94.218,219.894,93.436,222.655,93.436,226.279z"/>
- <path fill="#FFFFFF" d="M144.646,226.279c0,4.342-1.098,7.756-3.293,10.242c-2.196,2.486-5.248,3.729-9.157,3.729
- c-3.995,0-7.079-1.222-9.249-3.664c-2.172-2.443-3.257-5.892-3.257-10.345c0-4.416,1.089-7.839,3.266-10.271
- c2.177-2.43,5.27-3.646,9.277-3.646c3.896,0,6.939,1.237,9.129,3.711C143.552,218.512,144.646,221.926,144.646,226.279z
- M123.03,226.279c0,3.674,0.782,6.46,2.347,8.358c1.564,1.899,3.838,2.849,6.819,2.849c3.006,0,5.275-0.946,6.81-2.839
- c1.533-1.893,2.301-4.682,2.301-8.368c0-3.648-0.764-6.417-2.291-8.304c-1.528-1.886-3.789-2.829-6.782-2.829
- c-3.006,0-5.292,0.949-6.856,2.849C123.812,219.894,123.03,222.655,123.03,226.279z"/>
- <path fill="#FFFFFF" d="M153.85,228.599v11.281h-3.154v-27.127h7.44c3.327,0,5.786,0.638,7.376,1.911
- c1.589,1.274,2.384,3.191,2.384,5.752c0,3.588-1.818,6.012-5.455,7.273l7.366,12.19h-3.729l-6.568-11.281H153.85z M153.85,225.89
- h4.323c2.227,0,3.859-0.442,4.898-1.326c1.039-0.885,1.559-2.211,1.559-3.98c0-1.793-0.528-3.086-1.587-3.878
- c-1.057-0.791-2.755-1.188-5.093-1.188h-4.101V225.89z"/>
- <path fill="#FFFFFF" d="M196.062,239.88l-9.203-24.047h-0.148c0.173,1.905,0.26,4.169,0.26,6.791v17.256h-2.913v-27.127h4.75
- l8.591,22.377h0.148l8.665-22.377h4.713v27.127h-3.154v-17.479c0-2.004,0.086-4.181,0.26-6.531h-0.148l-9.277,24.01H196.062z"/>
- <path fill="#FFFFFF" d="M235.416,239.88l-3.377-8.628h-10.873l-3.34,8.628h-3.191l10.725-27.238h2.653l10.669,27.238H235.416z
- M231.056,228.413l-3.154-8.405c-0.408-1.063-0.829-2.368-1.262-3.915c-0.272,1.188-0.662,2.493-1.169,3.915l-3.191,8.405H231.056z
- "/>
- <path fill="#FFFFFF" d="M259.611,220.657c0,2.746-0.938,4.858-2.811,6.336c-1.875,1.479-4.556,2.218-8.044,2.218h-3.191v10.669
- h-3.154v-27.127h7.032C256.222,212.753,259.611,215.388,259.611,220.657z M245.565,226.502h2.839c2.795,0,4.817-0.451,6.067-1.354
- c1.249-0.902,1.874-2.35,1.874-4.342c0-1.793-0.588-3.129-1.763-4.008c-1.176-0.878-3.006-1.317-5.492-1.317h-3.525V226.502z"/>
-</g>
-<g>
- <rect fill="#D85B3A" width="310" height="300"/>
-</g>
-<g>
- <path fill="#FFFFFF" d="M59.564,239.88H56.41v-24.325h-8.592v-2.802h20.336v2.802h-8.59V239.88z"/>
- <path fill="#FFFFFF" d="M95.783,226.279c0,4.342-1.099,7.756-3.294,10.242c-2.196,2.486-5.248,3.729-9.157,3.729
- c-3.995,0-7.078-1.222-9.249-3.664c-2.171-2.443-3.257-5.892-3.257-10.345c0-4.416,1.089-7.839,3.266-10.271
- c2.178-2.43,5.27-3.646,9.277-3.646c3.896,0,6.939,1.237,9.129,3.711C94.688,218.512,95.783,221.926,95.783,226.279z
- M74.166,226.279c0,3.674,0.783,6.46,2.348,8.358c1.564,1.899,3.838,2.849,6.818,2.849c3.006,0,5.275-0.946,6.811-2.839
- c1.533-1.893,2.301-4.682,2.301-8.368c0-3.648-0.765-6.417-2.292-8.304c-1.528-1.886-3.788-2.829-6.782-2.829
- c-3.006,0-5.291,0.949-6.855,2.849C74.949,219.894,74.166,222.655,74.166,226.279z"/>
- <path fill="#FFFFFF" d="M135.379,239.88h-3.117l-5.475-18.165c-0.26-0.804-0.551-1.818-0.871-3.043
- c-0.322-1.225-0.489-1.96-0.502-2.208c-0.271,1.633-0.705,3.421-1.299,5.362l-5.307,18.054h-3.117l-7.217-27.127h3.34l4.285,16.755
- c0.594,2.351,1.027,4.479,1.299,6.383c0.334-2.264,0.829-4.478,1.484-6.643l4.861-16.495h3.34l5.104,16.644
- c0.594,1.918,1.094,4.082,1.502,6.494c0.235-1.756,0.681-3.896,1.336-6.42l4.268-16.718h3.34L135.379,239.88z"/>
- <path fill="#FFFFFF" d="M162.004,239.88h-15.121v-27.127h15.121v2.802h-11.967v8.739h11.244v2.783h-11.244v9.982h11.967V239.88z"/>
- <path fill="#FFFFFF" d="M168.016,212.753h7.664c3.6,0,6.203,0.538,7.811,1.614c1.608,1.076,2.412,2.777,2.412,5.103
- c0,1.608-0.448,2.935-1.345,3.98c-0.897,1.045-2.205,1.723-3.925,2.031v0.186c4.119,0.705,6.18,2.87,6.18,6.494
- c0,2.425-0.82,4.317-2.459,5.678c-1.639,1.361-3.931,2.041-6.875,2.041h-9.463V212.753z M171.17,224.368h5.195
- c2.227,0,3.828-0.35,4.807-1.049c0.977-0.698,1.465-1.876,1.465-3.534c0-1.521-0.544-2.619-1.633-3.294
- c-1.088-0.674-2.82-1.011-5.195-1.011h-4.639V224.368z M171.17,227.04v10.149h5.66c2.189,0,3.837-0.424,4.944-1.271
- c1.106-0.848,1.661-2.174,1.661-3.98c0-1.682-0.566-2.919-1.698-3.711c-1.132-0.791-2.854-1.188-5.167-1.188H171.17z"/>
- <path fill="#FFFFFF" d="M207.945,232.662c0,2.388-0.865,4.249-2.598,5.585s-4.082,2.004-7.051,2.004
- c-3.217,0-5.689-0.414-7.422-1.243v-3.043c1.113,0.471,2.326,0.842,3.637,1.113c1.311,0.272,2.609,0.408,3.896,0.408
- c2.104,0,3.686-0.399,4.75-1.196c1.064-0.799,1.596-1.908,1.596-3.331c0-0.939-0.188-1.71-0.566-2.31
- c-0.377-0.601-1.008-1.153-1.893-1.661c-0.883-0.507-2.229-1.082-4.035-1.726c-2.523-0.902-4.326-1.973-5.408-3.21
- c-1.082-1.236-1.623-2.851-1.623-4.843c0-2.09,0.785-3.754,2.355-4.991c1.57-1.236,3.648-1.855,6.234-1.855
- c2.697,0,5.178,0.495,7.441,1.484l-0.984,2.746c-2.238-0.939-4.416-1.41-6.531-1.41c-1.67,0-2.975,0.359-3.914,1.076
- c-0.941,0.718-1.41,1.714-1.41,2.987c0,0.94,0.172,1.71,0.52,2.311c0.346,0.6,0.93,1.15,1.752,1.65
- c0.824,0.502,2.082,1.056,3.777,1.661c2.844,1.015,4.803,2.104,5.871,3.266C207.41,229.298,207.945,230.807,207.945,232.662z"/>
- <path fill="#FFFFFF" d="M213.493,239.88v-27.127h3.154v27.127H213.493z"/>
- <path fill="#FFFFFF" d="M232.438,239.88h-3.154v-24.325h-8.591v-2.802h20.336v2.802h-8.591V239.88z"/>
- <path fill="#FFFFFF" d="M260.232,239.88H245.11v-27.127h15.122v2.802h-11.968v8.739h11.244v2.783h-11.244v9.982h11.968V239.88z"/>
-</g>
-<g>
- <path fill="#FFFFFF" d="M154.996,166c-27.452,0-49.854-22.26-49.995-49.744C104.859,88.687,127.174,66.141,154.744,66h0.498
- c13.273,0.067,25.739,5.269,35.114,14.645c9.375,9.375,14.576,21.84,14.644,35.099c0.068,13.355-5.068,25.938-14.463,35.43
- c-9.396,9.493-21.925,14.758-35.28,14.826C155.171,165.999,155.082,166,154.996,166z M158.013,136.359v22.438
- c6.251-5.613,11.104-12.403,14.337-19.94C167.67,137.436,162.853,136.604,158.013,136.359z M137.654,138.856
- c2.207,5.116,5.181,9.934,8.877,14.311c1.684,1.992,3.515,3.88,5.457,5.628v-22.436
- C147.149,136.604,142.333,137.436,137.654,138.856z M178.028,140.902c-2.68,6.354-6.4,12.234-11.052,17.432
- c7.232-2.034,13.851-5.914,19.278-11.398c0.368-0.371,0.729-0.748,1.081-1.13C184.351,143.879,181.236,142.244,178.028,140.902z
- M122.684,145.794c5.429,5.885,12.439,10.285,20.345,12.525c-0.373-0.417-0.738-0.839-1.099-1.266
- c-4.166-4.933-7.503-10.374-9.956-16.152C128.773,142.241,125.662,143.872,122.684,145.794z M180.103,135.24
- c3.811,1.576,7.503,3.525,11.028,5.849c4.537-6.503,7.209-14.083,7.745-22.076h-15.937c-0.037,0.846-0.092,1.692-0.163,2.541
- C182.38,126.259,181.478,130.84,180.103,135.24z M111.127,119.013c0.555,8.164,3.348,15.722,7.765,22.062
- c3.516-2.316,7.197-4.259,10.996-5.831c-1.646-5.23-2.604-10.679-2.836-16.231H111.127z M133.083,119.013
- c0.226,4.849,1.061,9.607,2.479,14.184c5.356-1.657,10.879-2.614,16.426-2.868v-11.315H133.083z M158.013,130.328
- c5.542,0.254,11.063,1.21,16.415,2.865c1.203-3.907,1.994-7.974,2.346-12.146c0.058-0.68,0.102-1.358,0.136-2.035h-18.896V130.328z
- M182.928,112.988h15.947c-0.538-7.996-3.214-15.579-7.744-22.077c-3.563,2.351-7.299,4.316-11.153,5.901
- C181.658,102.021,182.653,107.45,182.928,112.988z M158.013,112.988h18.881c-0.265-4.838-1.139-9.582-2.593-14.142
- c-5.313,1.632-10.788,2.573-16.288,2.825V112.988z M133.118,112.988h18.87v-11.316c-5.495-0.252-10.969-1.193-16.277-2.822
- c-1.281,4.042-2.118,8.256-2.482,12.585C133.185,111.953,133.146,112.471,133.118,112.988z M111.127,112.988h15.957
- c0.036-0.686,0.083-1.372,0.141-2.06c0.41-4.856,1.357-9.584,2.809-14.112c-3.85-1.582-7.582-3.546-11.142-5.891
- C114.472,97.271,111.68,104.83,111.127,112.988z M158.013,73.688v21.954c4.775-0.241,9.527-1.055,14.148-2.441
- c-2.187-4.957-5.099-9.63-8.691-13.884C161.786,77.322,159.956,75.436,158.013,73.688z M137.837,93.199
- c4.621,1.387,9.376,2.201,14.151,2.442V73.686C145.854,79.193,141.067,85.832,137.837,93.199z M166.376,73.503
- c0.579,0.631,1.145,1.274,1.695,1.927c4.067,4.816,7.345,10.116,9.78,15.743c3.27-1.356,6.445-3.016,9.485-4.979
- c-0.404-0.438-0.817-0.867-1.241-1.291C180.549,79.355,173.77,75.47,166.376,73.503z M122.683,86.206
- c3.033,1.957,6.202,3.612,9.464,4.965c2.777-6.453,6.629-12.408,11.444-17.646C135.448,75.713,128.237,80.186,122.683,86.206z"/>
-</g>
-</svg>
diff --git a/resource.qrc b/resource.qrc
index 7404c48..a20d803 100644
--- a/resource.qrc
+++ b/resource.qrc
@@ -31,12 +31,9 @@
<file alias="images/icon-loading.svg">qml/components/images/icon-loading.svg</file>
<file alias="images/Location.svg">qml/components/images/Location.svg</file>
<file alias="images/Twitter.svg">qml/components/images/Twitter.svg</file>
- <file alias="images/Btn_ToWebsite.svg">qml/components/images/Btn_ToWebsite.svg</file>
- <file alias="images/Btn_FloorMap.svg">qml/components/images/Btn_FloorMap.svg</file>
<file alias="images/LevelA.svg">qml/components/images/LevelA.svg</file>
<file alias="images/LevelB.svg">qml/components/images/LevelB.svg</file>
<file alias="images/LevelC.svg">qml/components/images/LevelC.svg</file>
<file alias="images/sfo_floor.png">qml/components/images/sfo_floor.png</file>
- <file alias="images/Btn_Schedule.svg">qml/components/images/Btn_Schedule.svg</file>
</qresource>
</RCC>
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"));