Changes - SailfishOS Open Build Service

Changes of Revision cc97df0a72da07865d7962bfa588f995

[-] [+]	Changed	_service:tar_git:glacier-gallery.changes
@@ -1,3 +1,7 @@ +* Thu Jan 04 2018 Aleksi Suomalainen <aleksi.suomalainen@protonmail.com> - 0.2.1 +- [i18n] init i18n +- [Packaking] move to libglacierapp + * Thu Nov 30 2017 Sergey Chupligin <s.chupligin@omprussia.ru> - 0.2.0 - [API] Recalc thumb sizes - [ImageContainer] Move all images to dir
[-] [+]	Changed	_service:tar_git:glacier-gallery.spec ^
@@ -6,7 +6,7 @@ %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Photo Gallery for Nemo -Version: 0.2.0 +Version: 0.2.1 Release: 1 Group: Applications/System License: BSD @@ -20,12 +20,18 @@ Requires: nemo-qml-plugin-thumbnailer-qt5 Requires: qt5-qtdocgallery Requires: mapplauncherd-booster-qtcomponents-qt5 +Requires: libglacierapp >= 0.1.1 + BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(qdeclarative5-boostable) BuildRequires: pkgconfig(libresourceqt5) BuildRequires: desktop-file-utils +BuildRequires: pkgconfig(glacierapp) +BuildRequires: desktop-file-utils +BuildRequires: qt5-qttools-linguist + Provides: meego-handset-video > 0.2.5 Obsoletes: meego-handset-video <= 0.2.5 @@ -44,6 +50,8 @@ rm -rf %{buildroot} %qmake5_install +lrelease %{buildroot}%{_datadir}/%{name}/translations/.ts + desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/.desktop
[-] [+]	Changed	_service ^
@@ -6,7 +6,7 @@ <service name="tar_git"> <param name="url">https://github.com/nemomobile-ux/glacier-gallery.git</param> <param name="branch">master</param> - <param name="revision"/> + <param name="revision">9a1563e5a88e55eb1511b6a1c19d112f2fb268b9</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Changed	_service:tar_git:glacier-gallery-0.2.1.tar.bz2/glacier-gallery.desktop ^
@@ -3,9 +3,10 @@ Type=Application Terminal=false Name=Gallery -Exec=/usr/bin/invoker --single-instance -r 5 --type=qtcomponents-qt5 /usr/bin/glacier-gallery -fullscreen %u +Exec=/usr/bin/glacier-gallery Icon=/usr/share/glacier-gallery/images/icon-app-gallery.png X-Window-Icon= X-HildonDesk-ShowInToolbar=true X-Osso-Type=application/x-executable MimeType=image/;video/; +Name[ru]=Галерея
[-] [+]	Changed	_service:tar_git:glacier-gallery-0.2.1.tar.bz2/glacier-gallery.pro ^
@@ -25,13 +25,21 @@ SOURCES += src/main.cpp \ src/gallery.cpp +TRANSLATIONS += translations/$${PROJECT_NAME}_en.ts\ + translations/$${PROJECT_NAME}_ru.ts +i18n_files.files = translations +i18n_files.path = /usr/share/$$TARGET +INSTALLS += i18n_files + # do not edit below here TEMPLATE = app CONFIG -= app_bundle TARGET = $$PROJECT_NAME CONFIG += link_pkgconfig -PKGCONFIG += libresourceqt5 +PKGCONFIG += libresourceqt5 glacierapp + +LIBS += -lglacierapp packagesExist(qdeclarative5-boostable) { message("Building with qdeclarative5-boostable support") @@ -49,10 +57,12 @@ qml/ImageContainer.qml \ qml/ImagePage.qml \ qml/ImageSlideshowPage.qml \ - qml/main.qml \ qml/VideoPlayer.qml \ qml/SortDialog.qml \ qml/SingleImagePage.qml \ qml/ZoomController.qml \ qml/MainPage.qml \ - rpm/glacier-gallery.spec + rpm/glacier-gallery.spec \ + qml/glacier-gallery.qml \ + translations/glacier-gallery_en.ts \ + translations/glacier-gallery_ru.ts
[-] [+]	Changed	_service:tar_git:glacier-gallery-0.2.1.tar.bz2/qml/glacier-gallery.qml ^
(renamed from qml/main.qml)
[-] [+]	Changed	_service:tar_git:glacier-gallery-0.2.1.tar.bz2/src/main.cpp ^
@@ -37,21 +37,18 @@ #include <QQuickView> #include <QtQml> +#include <glacierapp.h> + int main(int argc, char *argv) { - QGuiApplication app(argc, argv); - app.setOrganizationName("NemoMobile"); - app.setApplicationName("glacier-gallery"); - - QQmlApplicationEngine engine = new QQmlApplicationEngine(QUrl::fromLocalFile("/usr/share/glacier-gallery/qml/main.qml")); - QObject topLevel = engine->rootObjects().value(0); - QQuickWindow window = qobject_cast<QQuickWindow >(topLevel); + QGuiApplication app = GlacierApp::app(argc, argv); + app->setOrganizationName("NemoMobile"); - engine->rootContext()->setContextProperty("__window", window); + QQuickWindow *window = GlacierApp::showWindow(); window->setTitle(QObject::tr("Gallery")); window->showFullScreen(); - return app.exec(); + return app->exec(); }
[-] [+]	Added	_service:tar_git:glacier-gallery-0.2.1.tar.bz2/translations/glacier-gallery_en.ts ^
@@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="en_US"> +<context> + <name>ImagePage</name> + <message> + <location filename="../qml/ImagePage.qml" line="47"/> + <source>Show image</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MainPage</name> + <message> + <location filename="../qml/MainPage.qml" line="71"/> + <source>All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="72"/> + <source>Videos</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="73"/> + <source>Images</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="79"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="80"/> + <source>Type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="81"/> + <source>Clear</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="86"/> + <source>Gallery</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="91"/> + <source>Slideshow</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="105"/> + <source>Filter:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="149"/> + <source>Sort:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QObject</name> + <message> + <location filename="../src/main.cpp" line="49"/> + <source>Gallery</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>SingleImagePage</name> + <message> + <location filename="../qml/SingleImagePage.qml" line="112"/> + <source>Image</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>VideoPlayer</name> + <message> + <location filename="../qml/VideoPlayer.qml" line="49"/> + <source>Video</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS>
[-] [+]	Added	_service:tar_git:glacier-gallery-0.2.1.tar.bz2/translations/glacier-gallery_nl.ts ^
@@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="nl"> +<context> + <name>ImagePage</name> + <message> + <location filename="../qml/ImagePage.qml" line="47"/> + <source>Show image</source> + <translation>Afbeelding tonen</translation> + </message> +</context> +<context> + <name>MainPage</name> + <message> + <location filename="../qml/MainPage.qml" line="71"/> + <source>All</source> + <translation>Alles</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="72"/> + <source>Videos</source> + <translation>Video’s</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="73"/> + <source>Images</source> + <translation>Afbeeldingen</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="79"/> + <source>Name</source> + <translation>Naam</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="80"/> + <source>Type</source> + <translation>Type</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="81"/> + <source>Clear</source> + <translation>Wissen</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="86"/> + <source>Gallery</source> + <translation>Galerij</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="91"/> + <source>Slideshow</source> + <translation>Diavoorstelling</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="105"/> + <source>Filter:</source> + <translation>Filteren:</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="149"/> + <source>Sort:</source> + <translation>Sorteren:</translation> + </message> +</context> +<context> + <name>QObject</name> + <message> + <location filename="../src/main.cpp" line="49"/> + <source>Gallery</source> + <translation>Galerij</translation> + </message> +</context> +<context> + <name>SingleImagePage</name> + <message> + <location filename="../qml/SingleImagePage.qml" line="112"/> + <source>Image</source> + <translation>Afbeelding</translation> + </message> +</context> +<context> + <name>VideoPlayer</name> + <message> + <location filename="../qml/VideoPlayer.qml" line="49"/> + <source>Video</source> + <translation>Video</translation> + </message> +</context> +</TS>
[-] [+]	Added	_service:tar_git:glacier-gallery-0.2.1.tar.bz2/translations/glacier-gallery_ru.ts ^
@@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="ru_RU"> +<context> + <name>ImagePage</name> + <message> + <location filename="../qml/ImagePage.qml" line="47"/> + <source>Show image</source> + <translation>Показать изображение</translation> + </message> +</context> +<context> + <name>MainPage</name> + <message> + <location filename="../qml/MainPage.qml" line="71"/> + <source>All</source> + <translation>Все</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="72"/> + <source>Videos</source> + <translation>Видео</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="73"/> + <source>Images</source> + <translation>Изображение</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="79"/> + <source>Name</source> + <translation>Имя</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="80"/> + <source>Type</source> + <translation>Тип</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="81"/> + <source>Clear</source> + <translation>Отчистить</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="86"/> + <source>Gallery</source> + <translation>Галерея</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="91"/> + <source>Slideshow</source> + <translation>Слайдшоу</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="105"/> + <source>Filter:</source> + <translation>Фильтр:</translation> + </message> + <message> + <location filename="../qml/MainPage.qml" line="149"/> + <source>Sort:</source> + <translation>Сортировка:</translation> + </message> +</context> +<context> + <name>QObject</name> + <message> + <location filename="../src/main.cpp" line="49"/> + <source>Gallery</source> + <translation>Галерея</translation> + </message> +</context> +<context> + <name>SingleImagePage</name> + <message> + <location filename="../qml/SingleImagePage.qml" line="112"/> + <source>Image</source> + <translation>Изображение</translation> + </message> +</context> +<context> + <name>VideoPlayer</name> + <message> + <location filename="../qml/VideoPlayer.qml" line="49"/> + <source>Video</source> + <translation>Видео</translation> + </message> +</context> +</TS>