|
[-]
[+]
|
Changed |
_service:tar_git:ktrip.spec
|
|
|
|
[-]
[+]
|
Added |
_service:tar_git:git-0001-Use-geo-URI-to-show-location-on-map.patch
^
|
| @@ -0,0 +1,32 @@
+From 3f8fb9d3488359c97c41730bc974d8e27e8c4e97 Mon Sep 17 00:00:00 2001
+From: Rinigus Saar <rinigus.git@gmail.com>
+Date: Sun, 7 May 2023 16:56:51 +0300
+Subject: [PATCH 18/20] Use geo: URI to show location on map
+
+---
+ src/controller.cpp | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/src/controller.cpp b/src/controller.cpp
+index 1d71108..e50024e 100644
+--- a/src/controller.cpp
++++ b/src/controller.cpp
+@@ -103,12 +103,8 @@ KPublicTransport::StopoverRequest Controller::createStopoverRequest()
+
+ void Controller::showOnMap(KPublicTransport::Location location)
+ {
+- QUrl url;
+- url.setScheme(QStringLiteral("https"));
+- url.setHost(QStringLiteral("www.openstreetmap.org"));
+- url.setPath(QStringLiteral("/"));
+- const QString fragment = QLatin1String("map=") + QString::number(17) + QLatin1Char('/') + QString::number(location.latitude()) + QLatin1Char('/')
+- + QString::number(location.longitude());
+- url.setFragment(fragment);
++ if (!location.hasCoordinate())
++ return;
++ QUrl url(QLatin1String("geo:") + QString::number(location.latitude()) + QLatin1Char(',') + QString::number(location.longitude()));
+ QDesktopServices::openUrl(url);
+ }
+--
+2.39.3
+
|
|
[-]
[+]
|
Added |
_service:tar_git:git-0002-Wait-till-location-query-has-finished-before-making-.patch
^
|
| @@ -0,0 +1,59 @@
+From 9fea45af4fd49cddd5113be02ec96e4aadc57794 Mon Sep 17 00:00:00 2001
+From: Rinigus Saar <rinigus.git@gmail.com>
+Date: Sat, 6 May 2023 17:16:36 +0300
+Subject: [PATCH 19/20] Wait till location query has finished before making a
+ new one
+
+This fixes frequent crashes of KTrip when you type location name faster than
+the backend is able to resolve. In addition, it shows cached locations if there
+is no query entered by user
+---
+ src/qml/LocationQueryPage.qml | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/src/qml/LocationQueryPage.qml b/src/qml/LocationQueryPage.qml
+index 04ee200..2dc98e9 100644
+--- a/src/qml/LocationQueryPage.qml
++++ b/src/qml/LocationQueryPage.qml
+@@ -13,17 +13,23 @@ import org.kde.ktrip 1.0
+
+ Kirigami.ScrollablePage
+ {
+- property bool showCached: true
++ property bool showCached: !(queryTextField.text)
+ property var callback
+
++ property string _lastQuery
++
+ header: Kirigami.SearchField {
+ id: queryTextField
+
+ visible: Manager.enabledBackends.length !== 0
+ width: parent.width
+- onAccepted: {
+- queryModel.request = Controller.createLocationRequest(text)
+- showCached = false
++ onAccepted: query()
++ }
++
++ function query() {
++ if (queryTextField.text && queryTextField.text !== _lastQuery && !queryModel.loading) {
++ _lastQuery = queryTextField.text
++ queryModel.request = Controller.createLocationRequest(_lastQuery)
+ }
+ }
+
+@@ -69,6 +75,10 @@ Kirigami.ScrollablePage
+ KPT.LocationQueryModel {
+ id: queryModel
+ manager: Manager
++ onLoadingChanged: {
++ if (!loading && queryTextField.text)
++ Qt.callLater(query)
++ }
+ }
+
+ LocationCacheModel {
+--
+2.39.3
+
|
|
[-]
[+]
|
Added |
_service:tar_git:git-0003-Add-query-delay-to-avoid-calling-service-while-typin.patch
^
|
| @@ -0,0 +1,25 @@
+From c23861e00a2f59897d9f7a191c7fa7337cbea082 Mon Sep 17 00:00:00 2001
+From: Rinigus Saar <rinigus.git@gmail.com>
+Date: Thu, 11 May 2023 21:38:07 +0300
+Subject: [PATCH 20/20] Add query delay to avoid calling service while typing
+ location
+
+---
+ src/qml/LocationQueryPage.qml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/qml/LocationQueryPage.qml b/src/qml/LocationQueryPage.qml
+index 2dc98e9..d8bc19a 100644
+--- a/src/qml/LocationQueryPage.qml
++++ b/src/qml/LocationQueryPage.qml
+@@ -75,6 +75,7 @@ Kirigami.ScrollablePage
+ KPT.LocationQueryModel {
+ id: queryModel
+ manager: Manager
++ queryDelay: 500
+ onLoadingChanged: {
+ if (!loading && queryTextField.text)
+ Qt.callLater(query)
+--
+2.39.3
+
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos-chum/ktrip.git</param>
<param name="branch">main</param>
- <param name="revision">23.03.90+git1</param>
+ <param name="revision">23.04.1+git1</param>
</service>
</services>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
_service:tar_git:ktrip-23.04.1+git1.tar.xz/upstream/CMakeLists.txt
^
|
| @@ -5,8 +5,8 @@
# KDE Applications version, managed by release script.
set(RELEASE_SERVICE_VERSION_MAJOR "23")
-set(RELEASE_SERVICE_VERSION_MINOR "03")
-set(RELEASE_SERVICE_VERSION_MICRO "90")
+set(RELEASE_SERVICE_VERSION_MINOR "04")
+set(RELEASE_SERVICE_VERSION_MICRO "1")
set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
project(ktrip VERSION ${RELEASE_SERVICE_VERSION})
|
|
[-]
[+]
|
Changed |
_service:tar_git:ktrip-23.04.1+git1.tar.xz/upstream/org.kde.ktrip.appdata.xml
^
|
| @@ -56,6 +56,7 @@
<summary xml:lang="pl">Przemieszczanie się transportem publicznym</summary>
<summary xml:lang="pt">Navegador de transportes públicos</summary>
<summary xml:lang="pt-BR">Navegador de transportes públicos</summary>
+ <summary xml:lang="ru">Навигатор общественного транспорта</summary>
<summary xml:lang="sl">Navigator po javnem prometu</summary>
<summary xml:lang="sv">Kollektivtrafiknavigering</summary>
<summary xml:lang="tr">Toplu Taşıma için Yol Bulucu</summary>
@@ -80,6 +81,7 @@
<p xml:lang="pl">KTrip pomaga przemieszczać się transportem publicznym. Umożliwia odpytanie o połączenia pomiędzy dwoma danymi miejscami, odjazdy z danego przystanku wraz z opóźnieniami i utrudnieniami w czasie rzeczywistym.</p>
<p xml:lang="pt">O KTrip ajuda-o a navegar pelos transportes públicos. Ajuda-o a consultar trajectos entre localizações específicas, partidas de uma dada estação e mostra informações de atrasos e disrupção em tempo-real.</p>
<p xml:lang="pt-BR">O KTrip ajuda-o a locomover-se com transportes públicos. Ajuda-o a encontrar trajetos entre os locais indicados, partidas de uma estação específica, mostra atrasos em tempo real e informações sobre interrupções.</p>
+ <p xml:lang="ru">KTrip помогает планировать поездки на общественном транспорте. Программа позволяет находить маршруты между указанными местами, просматривать время отправления с определённых станций, а также в режиме реального времени показывает данные о задержках и отмене рейсов.</p>
<p xml:lang="sl">KTrip vam pomaga pri navigaciji v javnem prevozu. Omogoča vam najti o potovanja med določenimi lokacijami, odhode z navedenih postaj in zamude v realnem času ter informacije o motnjah obratovanja.</p>
<p xml:lang="sv">Ktripp hjälper till att navigera i kollektivtrafik. Det låter dig söka efter resor mellan angivna platser, avgångar från en viss station, samt visar realtidsfördröjningar och störningsinformation.</p>
<p xml:lang="tr">K Yolculuk, toplu taşımada yolunuzu bulmanıza yardımcı olur. Belirli konumlar arasındaki yolları, istasyon kalkışlarını, anlık gecikme ve iptal bilgilerini bulmanıza izin verir.</p>
@@ -109,6 +111,7 @@
<caption xml:lang="pl">Widok podróży</caption>
<caption xml:lang="pt">Área da viagem</caption>
<caption xml:lang="pt-BR">Visualização da jornada</caption>
+ <caption xml:lang="ru">Просмотр маршрута</caption>
<caption xml:lang="sl">Pogled na potovanje</caption>
<caption xml:lang="sv">Resevisning</caption>
<caption xml:lang="tr">Yolculuk görünümü</caption>
@@ -137,6 +140,8 @@
<value key="KDE::matrix">#plasmamobile:kde.org</value>
</custom>
<releases>
+ <release version="23.04.1" date="2023-05-11"/>
+ <release version="23.04.0" date="2023-04-20"/>
<release version="23.01" date="2023-01-30">
<url>https://plasma-mobile.org/2023/01/30/january-blog-post/</url>
</release>
|
|
[-]
[+]
|
Changed |
_service:tar_git:ktrip-23.04.1+git1.tar.xz/upstream/po/de/ktrip.po
^
|
| @@ -13,7 +13,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 21.12.3\n"
#, kde-format
|
|
[-]
[+]
|
Changed |
_service:tar_git:ktrip-23.04.1+git1.tar.xz/upstream/po/it/ktrip.po
^
|
| @@ -1,6 +1,6 @@
# Copyright (C) YEAR This file is copyright:
# This file is distributed under the same license as the ktrip package.
-# Paolo Zamponi <zapaolo@email.it>, 2019, 2020, 2021.
+# Paolo Zamponi <feus73@gmail.com>, 2019, 2020, 2021.
#
msgid ""
msgstr ""
@@ -8,7 +8,7 @@
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
"POT-Creation-Date: 2022-11-29 00:50+0000\n"
"PO-Revision-Date: 2021-12-22 12:55+0100\n"
-"Last-Translator: Paolo Zamponi <zapaolo@email.it>\n"
+"Last-Translator: Paolo Zamponi <feus73@gmail.com>\n"
"Language-Team: Italian <kde-i18n-it@kde.org>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@
#, kde-format
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
-msgstr "zapaolo@email.it"
+msgstr "feus73@gmail.com"
#: main.cpp:95
#, kde-format
|
|
[-]
[+]
|
Changed |
_service:tar_git:ktrip-23.04.1+git1.tar.xz/upstream/po/ru/ktrip.po
^
|
| @@ -3,41 +3,42 @@
#
# Alexander Potashev <aspotashev@gmail.com>, 2019.
# Alexander Yavorsky <kekcuha@gmail.com>, 2021.
+# Olesya Gerasimenko <translation-team@basealt.ru>, 2023.
msgid ""
msgstr ""
"Project-Id-Version: ktrip\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
"POT-Creation-Date: 2022-11-29 00:50+0000\n"
-"PO-Revision-Date: 2021-02-08 09:41+0300\n"
-"Last-Translator: Alexander Yavorsky <kekcuha@gmail.com>\n"
-"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
+"PO-Revision-Date: 2023-04-25 14:30+0300\n"
+"Last-Translator: Olesya Gerasimenko <translation-team@basealt.ru>\n"
+"Language-Team: Basealt Translation Team\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Lokalize 20.12.2\n"
+"X-Generator: Lokalize 22.12.3\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
-msgstr ""
+msgstr "Олеся Герасименко"
#, kde-format
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
-msgstr ""
+msgstr "translation-team@basealt.ru"
#: main.cpp:95
#, kde-format
msgid "KTrip"
-msgstr ""
+msgstr "KTrip"
#: main.cpp:97
#, kde-format
msgid "Public transport assistant"
-msgstr ""
+msgstr "Навигатор общественного транспорта"
#: main.cpp:99
#, kde-format
@@ -52,12 +53,12 @@
#: qml/BackendPage.qml:17 qml/main.qml:51
#, kde-format
msgid "Providers"
-msgstr ""
+msgstr "Поставщики данных"
#: qml/BackendPage.qml:20
#, kde-format
msgid "Select the providers relevant for your area"
-msgstr ""
+msgstr "Выберите поставщиков данных, которые соответствуют вашему региону"
#: qml/BackendPage.qml:25
#, kde-format
@@ -67,18 +68,18 @@
#: qml/BackendPage.qml:99
#, kde-format
msgid "Global"
-msgstr ""
+msgstr "Глобальный"
#: qml/BackendPage.qml:101
#, kde-format
msgid "🇪🇺 European Union"
-msgstr ""
+msgstr "🇪🇺 Европейский союз"
#: qml/BackendPage.qml:104
#, kde-format
msgctxt "emoji flag, country name"
msgid "%1 %2"
-msgstr ""
+msgstr "%1 %2"
#: qml/ConnectionDetailsPage.qml:17
#, kde-format
@@ -90,121 +91,121 @@
#, kde-format
msgid "Walking (%1 minute)"
msgid_plural "Walking (%1 minutes)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Пешком (%1 минута)"
+msgstr[1] "Пешком (%1 минуты)"
+msgstr[2] "Пешком (%1 минут)"
+msgstr[3] "Пешком (%1 минута)"
#: qml/ConnectionDetailsPage.qml:50
#, kde-format
msgid "Waiting (%1 minute)"
msgid_plural "Waiting (%1 minutes)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Ожидание (%1 минута)"
+msgstr[1] "Ожидание (%1 минуты)"
+msgstr[2] "Ожидание (%1 минут)"
+msgstr[3] "Ожидание (%1 минута)"
#: qml/ConnectionDetailsPage.qml:58
#, kde-format
msgid "Transfer (%1 minute)"
msgid_plural "Transfer (%1 minutes)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Пересадка (%1 минута)"
+msgstr[1] "Пересадка (%1 минуты)"
+msgstr[2] "Пересадка (%1 минут)"
+msgstr[3] "Пересадка (%1 минута)"
#: qml/ConnectionDetailsPage.qml:94
#, kde-format
msgid "Hide intermediate Stops"
-msgstr ""
+msgstr "Скрыть промежуточные остановки"
#: qml/ConnectionDetailsPage.qml:94
#, kde-format
msgid "Show intermediate Stops"
-msgstr ""
+msgstr "Показать промежуточные остановки"
#: qml/ConnectionsPage.qml:16
#, kde-format
msgctxt "@title"
msgid "Connections"
-msgstr ""
+msgstr "Подходящие рейсы"
#: qml/ConnectionsPage.qml:58 qml/ConnectionsPage.qml:84
#, kde-format
msgid "%1 %2"
-msgstr ""
+msgstr "%1 %2"
#: qml/ConnectionsPage.qml:64 qml/ConnectionsPage.qml:90
#, kde-format
msgid "+%1"
-msgstr ""
+msgstr "+%1"
#: qml/ConnectionsPage.qml:74
#, kde-format
msgid "%1 change"
msgid_plural "%1 changes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%1 изменение"
+msgstr[1] "%1 изменения"
+msgstr[2] "%1 изменений"
+msgstr[3] "%1 изменение"
#: qml/ConnectionsPage.qml:106
#, kde-format
msgid "No connections found"
-msgstr ""
+msgstr "Подходящие рейсы не найдены"
#: qml/DeparturesPage.qml:16
#, kde-format
msgctxt "@title"
msgid "Departures"
-msgstr ""
+msgstr "Отправления"
#: qml/DeparturesPage.qml:35
#, kde-format
msgid "%3 %1 (%2)"
-msgstr ""
+msgstr "%3 %1 (%2)"
#: qml/LocationQueryPage.qml:47
#, kde-format
msgid "No locations found"
-msgstr ""
+msgstr "Расположения не найдены"
#: qml/LocationQueryPage.qml:54
#, kde-format
msgid "No providers enabled"
-msgstr ""
|
|
[-]
[+]
|
Changed |
_service:tar_git:ktrip-23.04.1+git1.tar.xz/upstream/po/zh_CN/ktrip.po
^
|
| @@ -3,7 +3,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
"POT-Creation-Date: 2022-11-29 00:50+0000\n"
-"PO-Revision-Date: 2023-03-27 12:02\n"
+"PO-Revision-Date: 2023-04-29 08:36\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
|
|
[-]
[+]
|
Changed |
_service:tar_git:ktrip-23.04.1+git1.tar.xz/upstream/src/org.kde.ktrip.desktop
^
|
| @@ -50,6 +50,7 @@
GenericName[pt]=Navegador de transportes públicos
GenericName[pt_BR]=Navegador de transportes públicos
GenericName[ro]=Navigator de transport public
+GenericName[ru]=Навигатор общественного транспорта
GenericName[sk]=Navigátor verejnej dopravy
GenericName[sl]=Navigator javnega transporta
GenericName[sv]=Kollektivtrafiknavigering
@@ -79,6 +80,7 @@
Comment[pt]=Navegador de transportes públicos.
Comment[pt_BR]=Navegador de transportes públicos.
Comment[ro]=Navigator de transport public.
+Comment[ru]=Навигатор общественного транспорта.
Comment[sk]=Navigátor verejnej dopravy.
Comment[sl]=Navigator javnega transporta.
Comment[sv]=Kollektivtrafiknavigering
|
