|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/VeggieSailor/VeggieSailor.git</param>
<param name="branch">master</param>
- <param name="revision">b1c6e51cf7329bfae989c1fbb0e0941b7087b4d4</param>
+ <param name="revision">a4888f5577b7a6b3fa21e5e9b8600bb3125c00d2</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.7.2.tar.bz2/VegSailor.pro
^
|
| @@ -38,7 +38,9 @@
rpm/harbour-veggiesailor.legacy \
rpm/harbour-veggiesailor.yaml \
pyveggiesailor/vegguide_cache.py \
- qml/pages/EntryMap.qml
+ qml/pages/EntryMap.qml \
+ qml/pages/EntryBackgroundItem.qml \
+
# to disable building translations every time, comment out the
# following CONFIG line
@@ -49,6 +51,9 @@
# following TRANSLATIONS line. And also do not forget to
# modify the localized app name in the the .desktop file.
TRANSLATIONS += translations/harbour-veggiesailor-de.ts
+TRANSLATIONS += translations/harbour-veggiesailor-fr.ts
+
+
RESOURCES += \
images.qrc
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.7.2.tar.bz2/qml/pages/Credits.qml
^
|
| @@ -47,7 +47,6 @@
wrapMode: Text.WordWrap
color: Theme.primaryColor
x: Theme.paddingLarge
-
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.7.2.tar.bz2/qml/pages/Entries.qml
^
|
| @@ -91,7 +91,9 @@
onClicked: pageStack.push(Qt.resolvedUrl("PlaceInfo.qml"),
{
"uri":uri,"name":typeof name != 'undefined' ? name : '',
+ "phone":typeof phone != 'undefined' ? phone : qsTr('Unknown'),
"address1":typeof address1 != 'undefined' ? address1 : '',
+
"address2":typeof address2 != 'undefined' ? address2 : '',
"city":typeof city != 'undefined' ? city : '',
"country":typeof country != 'undefined' ? country : '',
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-veggiesailor-0.7.2.tar.bz2/qml/pages/EntryBackgroundItem.qml
^
|
| @@ -0,0 +1,81 @@
+EntryBackgroundItem {
+ property string name
+ height: Theme.itemSizeMedium
+ anchors {
+ left: parent.left
+ right: parent.right
+ }
+ // Stolen from:
+ // https://github.com/mattaustin/fremantleline/blob/master/qml/silica/DepartureListPage.qml
+ Rectangle {
+ width: Theme.paddingSmall
+ radius: Math.round(height/3)
+ color: color_txt
+ anchors {
+ top: parent.top
+ bottom: parent.bottom
+ left: parent.left
+ topMargin: Theme.paddingSmall/2
+ bottomMargin: Theme.paddingSmall/2
+ leftMargin: -width/2
+ }
+ }
+ Column {
+ id:column
+ anchors {
+ left: parent.left
+ leftMargin: Theme.paddingLarge
+ right: parent.right
+ rightMargin: Theme.paddingSmall
+ verticalCenter: parent.verticalCenter
+ }
+ Label {
+ text: name
+ color: highlighted ? Theme.highlightColor : Theme.primaryColor
+
+ }
+ Row {
+ width: column.width
+ Label {
+ id: text1
+ text: veg_level_description
+ color: highlighted ? Theme.highlightColor : Theme.secondaryColor
+ font.pixelSize: Theme.fontSizeSmall
+ width: parent.width - (Theme.fontSizeSmall * rating_parsed)
+
+ }
+ Repeater {
+ id: repeater
+
+ model: rating_parsed
+
+ Image
+ {
+ id:image
+ source: "image://theme/icon-m-favorite-selected"
+ height: Theme.fontSizeSmall
+ width: Theme.fontSizeSmall
+
+ }
+ }
+
+ }
+ }
+
+ onClicked: pageStack.push(Qt.resolvedUrl("PlaceInfo.qml"),
+ {
+ "uri":uri,"name":typeof name != 'undefined' ? name : '',
+ "address1":typeof address1 != 'undefined' ? address1 : '',
+ "address2":typeof address2 != 'undefined' ? address2 : '',
+ "city":typeof city != 'undefined' ? city : '',
+ "country":typeof country != 'undefined' ? country : '',
+ "veg_level_description":typeof veg_level_description != 'undefined' ? veg_level_description : '',
+ "price_range":typeof price_range != 'undefined' ? price_range : '',
+ "long_description":typeof long_description != 'undefined' ? long_description : '',
+ "short_description":typeof short_description != 'undefined' ? short_description : '',
+ "hours_txt": typeof hours_txt != 'undefined' ? hours_txt : '',
+ "cuisines_txt": typeof cuisines_txt != 'undefined' ? cuisines_txt : '',
+ "tags_txt": typeof tags_txt != 'undefined' ? tags_txt : '',
+ "color_txt": typeof color_txt != 'color_txt' ? tags_txt : '',
+ })
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.7.2.tar.bz2/qml/pages/EntryMap.qml
^
|
| @@ -6,6 +6,8 @@
property int entry_id
property string map_url
property string name
+ property string address
+ property string phone
Column {
@@ -19,28 +21,26 @@
id: header
title: page.name
}
-
-
-
SilicaWebView {
id: webView
x: Theme.paddingLarge
width: parent.width - (Theme.paddingLarge*2)
- height: parent.height - (Theme.paddingLarge*2) -(header.height*2)
-// anchors {
-// top: parent.top
-// left: parent.left
-// right: parent.right
-// bottom: parent.bottom
-
-// }
-// url: "https://www.google.com/maps/place/"+page.address
+ height: parent.height - (Theme.paddingLarge*4) -header.height - label1.height - label2.height
url: page.map_url
-// Component.onCompleted: {
+ }
+
+ DetailItem {
+ id: label1
+ label: qsTr('Address')
+ value: qsTr(page.address)
+ }
-// page.entry_id = page.uri.split('/')[(page.uri.split('/')).length-1];
-// }
+ DetailItem {
+ id: label2
+ label: qsTr('Phone')
+ value: qsTr(page.phone)
}
+
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.7.2.tar.bz2/qml/pages/PlaceInfo.qml
^
|
| @@ -15,7 +15,7 @@
property string long_description
property string short_description
-
+ property string phone
property variant cousines
property variant cuisines_txt
property string hours_txt
@@ -123,13 +123,19 @@
console.log("ENTRY_ID", address.entry_id);
address.map_url = "https://veggiesailor.com/transformer/entry/"+address.entry_id+"/map";
console.log("MY PAGE:",address.map_url);
- pageStack.push(Qt.resolvedUrl("EntryMap.qml"), {"map_url":address.map_url, "name":page.name});
+ pageStack.push(Qt.resolvedUrl("EntryMap.qml"), {"map_url":address.map_url, "name":page.name,
+ "address":page.address, "phone":page.phone});
}
}
}
DetailItem {
+ label: qsTr('Phone')
+ value: qsTr(page.phone)
+ }
+
+ DetailItem {
label: qsTr('Description')
value: qsTr(page.short_description)
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.7.2.tar.bz2/translations/harbour-veggiesailor-de.ts
^
|
| @@ -6,7 +6,7 @@
<message>
<location filename="../qml/cover/CoverPage.qml" line="37"/>
<source>Veggie Sailor</source>
- <translation type="unfinished"></translation>
+ <translation>Vegetarisch Seemann</translation>
</message>
</context>
<context>
@@ -19,7 +19,7 @@
<message>
<location filename="../qml/pages/Credits.qml" line="16"/>
<source>Veggie Sailor</source>
- <translation type="unfinished"></translation>
+ <translation>Vegetarisch Seemann</translation>
</message>
<message>
<location filename="../qml/pages/Credits.qml" line="45"/>
@@ -28,6 +28,27 @@
</message>
</context>
<context>
+ <name>Entries</name>
+ <message>
+ <location filename="../qml/pages/Entries.qml" line="94"/>
+ <source>Unknown</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>EntryMap</name>
+ <message>
+ <location filename="../qml/pages/EntryMap.qml" line="34"/>
+ <source>Address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/EntryMap.qml" line="40"/>
+ <source>Phone</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Fav</name>
<message>
<location filename="../qml/pages/Fav.qml" line="33"/>
@@ -65,7 +86,7 @@
<message>
<location filename="../qml/pages/FirstPage.qml" line="43"/>
<source>Veggie Sailor</source>
- <translation type="unfinished"></translation>
+ <translation>Vegetarisch Seemann</translation>
</message>
<message>
<location filename="../qml/pages/FirstPage.qml" line="104"/>
@@ -91,27 +112,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/PlaceInfo.qml" line="133"/>
+ <location filename="../qml/pages/PlaceInfo.qml" line="134"/>
+ <source>Phone</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="139"/>
<source>Description</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/PlaceInfo.qml" line="138"/>
+ <location filename="../qml/pages/PlaceInfo.qml" line="144"/>
<source>Price Range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/PlaceInfo.qml" line="143"/>
+ <location filename="../qml/pages/PlaceInfo.qml" line="149"/>
<source>Hours</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/PlaceInfo.qml" line="148"/>
+ <location filename="../qml/pages/PlaceInfo.qml" line="154"/>
<source>Cuisines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/PlaceInfo.qml" line="152"/>
+ <location filename="../qml/pages/PlaceInfo.qml" line="158"/>
<source>Tags</source>
<translation type="unfinished"></translation>
</message>
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-veggiesailor-0.7.2.tar.bz2/translations/harbour-veggiesailor-fr.ts
^
|
| @@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+ <name>CoverPage</name>
+ <message>
+ <location filename="../qml/cover/CoverPage.qml" line="37"/>
+ <source>Veggie Sailor</source>
+ <translation>Marin Végétarien</translation>
+ </message>
+</context>
+<context>
+ <name>Credits</name>
+ <message>
+ <location filename="../qml/pages/Credits.qml" line="12"/>
+ <source>Credits</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Credits.qml" line="16"/>
+ <source>Veggie Sailor</source>
+ <translation>Marin Végétarien</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Credits.qml" line="45"/>
+ <source>If you like the app - please support us, we need developers, translators, content editors and more :)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>Entries</name>
+ <message>
+ <location filename="../qml/pages/Entries.qml" line="94"/>
+ <source>Unknown</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>EntryMap</name>
+ <message>
+ <location filename="../qml/pages/EntryMap.qml" line="34"/>
+ <source>Address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/EntryMap.qml" line="40"/>
+ <source>Phone</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>Fav</name>
+ <message>
+ <location filename="../qml/pages/Fav.qml" line="33"/>
+ <source>Favourites</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/Fav.qml" line="42"/>
+ <source>Places</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>FirstPage</name>
+ <message>
+ <location filename="../qml/pages/FirstPage.qml" line="12"/>
+ <source>Clear cache</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FirstPage.qml" line="17"/>
+ <source>Credits</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FirstPage.qml" line="21"/>
+ <source>Sail</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FirstPage.qml" line="25"/>
+ <source>Favorites</source>
+ <translation>Favori</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FirstPage.qml" line="43"/>
+ <source>Veggie Sailor</source>
+ <translation>Marin Végétarien</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FirstPage.qml" line="104"/>
+ <source>Powered by VegGuide.org</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PlaceInfo</name>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="38"/>
+ <source>Add to favorites</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="107"/>
+ <source>Veg Level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="115"/>
+ <source>Address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="134"/>
+ <source>Phone</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="139"/>
+ <source>Description</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="144"/>
+ <source>Price Range</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="149"/>
+ <source>Hours</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="154"/>
+ <source>Cuisines</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="158"/>
+ <source>Tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>SecondPage</name>
+ <message>
+ <location filename="../qml/pages/SecondPage.qml" line="42"/>
+ <source>Nested Page</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/SecondPage.qml" line="49"/>
+ <source>Item</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor-0.7.2.tar.bz2/translations/harbour-veggiesailor.ts
^
|
| @@ -28,6 +28,27 @@
</message>
</context>
<context>
+ <name>Entries</name>
+ <message>
+ <location filename="../qml/pages/Entries.qml" line="94"/>
+ <source>Unknown</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>EntryMap</name>
+ <message>
+ <location filename="../qml/pages/EntryMap.qml" line="34"/>
+ <source>Address</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/EntryMap.qml" line="40"/>
+ <source>Phone</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Fav</name>
<message>
<location filename="../qml/pages/Fav.qml" line="33"/>
@@ -91,27 +112,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/PlaceInfo.qml" line="133"/>
+ <location filename="../qml/pages/PlaceInfo.qml" line="134"/>
+ <source>Phone</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/PlaceInfo.qml" line="139"/>
<source>Description</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/PlaceInfo.qml" line="138"/>
+ <location filename="../qml/pages/PlaceInfo.qml" line="144"/>
<source>Price Range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/PlaceInfo.qml" line="143"/>
+ <location filename="../qml/pages/PlaceInfo.qml" line="149"/>
<source>Hours</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/PlaceInfo.qml" line="148"/>
+ <location filename="../qml/pages/PlaceInfo.qml" line="154"/>
<source>Cuisines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/PlaceInfo.qml" line="152"/>
+ <location filename="../qml/pages/PlaceInfo.qml" line="158"/>
<source>Tags</source>
<translation type="unfinished"></translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-veggiesailor.yaml
^
|
| @@ -1,6 +1,6 @@
Name: harbour-veggiesailor
Summary: Veggie Sailor
-Version: 0.7.1
+Version: 0.7.2
Release: 1
# The contents of the Group field should be one of the groups listed here:
# http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
|
