|
[-]
[+]
|
Changed |
marble.spec
|
|
|
|
[-]
[+]
|
Deleted |
marble-1.12.20_sfos_151120.tar.xz/src/apps/marble-maps-sailfishos/FlatButton.qml
^
|
| @@ -1,45 +0,0 @@
-//
-// This file is part of the Marble Virtual Globe.
-//
-// This program is free software licensed under the GNU LGPL. You can
-// find a copy of this license in LICENSE.txt in the top directory of
-// the source code.
-//
-// Copyright 2015 Dennis Nienhüser <nienhueser@kde.org>
-//
-
-import QtQuick 2.2
-
-import Sailfish.Silica 1.0
-
-Button {
- id: root
-
- property string imageSource
-
- SystemPalette {
- id: palette
- colorGroup: SystemPalette.Active
- }
-
- contentItem: Rectangle {
- anchors.fill: parent
- color: root.pressed ? palette.highlight : palette.base
- Image {
- id: icon
- anchors.fill: parent
- source: root.imageSource
- }
- }
-// style: ButtonStyle {
-// background: Rectangle {
-// anchors.fill: parent
-// color: root.pressed ? palette.highlight : palette.base
-// Image {
-// id: icon
-// anchors.fill: parent
-// source: root.imageSource
-// }
-// }
-// }
-}
|
|
[-]
[+]
|
Changed |
marble-1.12.20_sfos_151121.tar.xz/src/apps/marble-maps-sailfishos/DeveloperDialog.qml
^
|
| @@ -9,7 +9,7 @@
//
import QtQuick 2.2
-import QtQuick.Layouts 1.1
+
import QtQuick.Window 2.0 as QWindow
import Sailfish.Silica 1.0
|
|
[-]
[+]
|
Changed |
marble-1.12.20_sfos_151121.tar.xz/src/apps/marble-maps-sailfishos/ImageButton.qml
^
|
| @@ -10,35 +10,30 @@
import QtQuick 2.2
-import QtQuick.Layouts 1.1
-import QtQuick.Window 2.0
+import Sailfish.Silica 1.0
Item {
id: root
- width: image.width + 10
- height: image.height + 10
+ width: image.width + Theme.paddingSmall
+ height: image.height + Theme.paddingSmall
property alias imageSource: image.source
signal clicked()
- SystemPalette {
- id: palette
- colorGroup: SystemPalette.Active
- }
-
Rectangle {
id: background
anchors.fill: parent
- color: touchArea.pressed ? palette.button : palette.highlight
+ color: touchArea.pressed ? Theme.rgba(Theme.highlightBackgroundColor, Theme.highlightBackgroundOpacity)
+ : "transparent"
Image {
id: image
anchors.centerIn: parent
- anchors.margins: 10
+ anchors.margins: Theme.paddingSmall
- width: Screen.pixelDensity * 6
+ width: Theme.iconSizeMedium
height: width
fillMode: Image.PreserveAspectFit
|
|
[-]
[+]
|
Changed |
marble-1.12.20_sfos_151121.tar.xz/src/apps/marble-maps-sailfishos/MainScreen.qml
^
|
| @@ -25,6 +25,8 @@
Page {
id: mapItem
+ allowedOrientations: Orientation.All
+
PinchArea {
anchors.fill: parent
enabled: true
|
|
[-]
[+]
|
Changed |
marble-1.12.20_sfos_151121.tar.xz/src/apps/marble-maps-sailfishos/MarbleMaps.qrc
^
|
| @@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/">
- <file>FlatButton.qml</file>
<file>Completion.qml</file>
<file>MainScreen.qml</file>
<file>SearchResults.qml</file>
|
|
[-]
[+]
|
Changed |
marble-1.12.20_sfos_151121.tar.xz/src/apps/marble-maps-sailfishos/PlacemarkDialog.qml
^
|
| @@ -9,7 +9,6 @@
//
import QtQuick 2.2
-import QtQuick.Layouts 1.1
import Sailfish.Silica 1.0
@@ -21,7 +20,7 @@
property var placemark: null
property string actionIconSource: rowLayout.currentItem === addDestinationSwitch ? routeEditor.currentProfileIcon : "qrc:///add.png"
- height: placemark === null ? 0 : Theme.horizontalPageMargin * 2 + Math.max(infoLayout.height, actionsLayout.height)
+ height: placemark === null ? 0 : Theme.horizontalPageMargin + Math.max(Theme.horizontalPageMargin + infoLayout.height, actionsLayout.height)
function addToRoute() {
rowLayout.currentItem.execute()
@@ -71,8 +70,6 @@
Column {
id: actionsLayout
- width: rowLayout.width
- height: rowLayout.height
spacing: Theme.paddingLarge
anchors {
right: parent.right
@@ -88,7 +85,10 @@
Row {
id: rowLayout
- anchors.right: parent.right
+ anchors {
+ right: parent.right
+ margins: 0
+ }
spacing: Theme.paddingSmall
property Item currentItem: addDestinationSwitch
|
|
[-]
[+]
|
Changed |
marble-1.12.20_sfos_151121.tar.xz/src/apps/marble-maps-sailfishos/RouteEditor.qml
^
|
| @@ -10,7 +10,6 @@
//
import QtQuick 2.2
-import QtQuick.Layouts 1.1
import Sailfish.Silica 1.0
@@ -65,6 +64,8 @@
SilicaListView {
id: waypointList
+ // TODO: 10 is arbitrary, needs concept how to deal with full screen height
+ height: count > 0 ? Theme.itemSizeExtraSmall * Math.min(10,count) : 0
anchors {
left: parent.left
right: parent.right
@@ -99,7 +100,8 @@
}
elide: Text.ElideMiddle
text: name
- font.pointSize: Theme.fontSizeMedium
+ font.family: Theme.fontFamily
+ font.pixelSize: Theme.fontSizeMedium
color: Theme.primaryColor
}
|
|
[-]
[+]
|
Changed |
marble-1.12.20_sfos_151121.tar.xz/src/apps/marble-maps-sailfishos/RouteProfileRadioButton.qml
^
|
| @@ -27,7 +27,7 @@
anchors.centerIn: parent
fillMode: Image.PreserveAspectFit
opacity: parent.enabled ? 1.0 : 0.4
- width: Theme.iconSizeSmall
- height: Theme.iconSizeSmall
+ width: Theme.iconSizeMedium
+ height: width
}
}
|
|
[-]
[+]
|
Changed |
marble-1.12.20_sfos_151121.tar.xz/src/apps/marble-maps-sailfishos/Search.qml
^
|
| @@ -80,7 +80,7 @@
id: searchField
property string query : ""
property bool busy : false
- width: Theme.buttonWidthLarge - 2 * anchors.margins
+ width: Theme.buttonWidthLarge
anchors {
top: parent.top
left: parent.left
|
|
[-]
[+]
|
Changed |
marble-1.12.20_sfos_151121.tar.xz/src/apps/marble-maps-sailfishos/SearchResults.qml
^
|
| @@ -41,7 +41,7 @@
model: root.model
delegate: Item {
width: view.width
- height: placemarkName.height + 20
+ height: Theme.itemSizeExtraSmall
Rectangle {
id: delegateBackground
@@ -52,11 +52,11 @@
Image {
id: icon
anchors.left: parent.left
- anchors.leftMargin: 10
+ anchors.leftMargin: Theme.paddingLarge
anchors.verticalCenter: parent.verticalCenter
width: height
height: placemarkName.height
- source: iconPath
+ source: iconPath ? "file://"+iconPath : iconPath
fillMode: Image.Pad
}
@@ -64,9 +64,10 @@
id: placemarkName
anchors.left: icon.right
anchors.right: parent.right
- anchors.rightMargin: 10
+ anchors.rightMargin: Theme.paddingLarge
anchors.verticalCenter: parent.verticalCenter
- font.pointSize: 18
+ font.family: Theme.fontFamily
+ font.pixelSize: Theme.fontSizeSmall
color: palette.text
text: name
elide: Text.ElideMiddle
|
|
[-]
[+]
|
Changed |
marble-1.12.20_sfos_151121.tar.xz/src/apps/marble-maps-sailfishos/WaypointImage.qml
^
|
| @@ -30,7 +30,7 @@
anchors.centerIn: parent
fillMode: Image.PreserveAspectFit
- width: Theme.iconSizeSmall
+ width: Theme.iconSizeMedium
height: width
states: [
|
|
[-]
[+]
|
Changed |
marble.yaml
^
|
| @@ -1,6 +1,6 @@
Name: marble
Summary: Virtual Globe
-Version: 1.12.20_sfos_151120
+Version: 1.12.20_sfos_151121
Release: 1
Group: Applications/Engineering
License: LGPLv2+
@@ -30,7 +30,6 @@
- cmake
Requires:
- sailfishsilica-qt5
- - qt5-qtquickcontrols-layouts
ConfigOptions:
- -DBUILD_TESTING=OFF
- -DBUILD_MARBLE_TESTS=NO
|
