From 78adca4e1f7fbc5c0416e2d15a33b6b25f6dfbae Mon Sep 17 00:00:00 2001 From: Dusko Angirevic Date: Thu, 25 Oct 2018 15:49:44 +0200 Subject: [PATCH] v1.0.0 --- .gitignore | 2 ++ rpm/harbour-tooter.spec | 2 +- rpm/harbour-tooter.yaml | 2 +- src/harbour-tooter.cpp | 18 +++++++++--------- 4 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e31cfb2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +*.user diff --git a/rpm/harbour-tooter.spec b/rpm/harbour-tooter.spec index 559fd15..f0a62f4 100644 --- a/rpm/harbour-tooter.spec +++ b/rpm/harbour-tooter.spec @@ -13,7 +13,7 @@ Name: harbour-tooter %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Tooter -Version: 0.2.8 +Version: 1.0.0 Release: 0 Group: Qt/Qt License: LICENSE diff --git a/rpm/harbour-tooter.yaml b/rpm/harbour-tooter.yaml index 2def057..5276e87 100644 --- a/rpm/harbour-tooter.yaml +++ b/rpm/harbour-tooter.yaml @@ -1,6 +1,6 @@ Name: harbour-tooter Summary: Tooter -Version: 0.2.8 +Version: 1.0.0 Release: 0 # The contents of the Group field should be one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS diff --git a/src/harbour-tooter.cpp b/src/harbour-tooter.cpp index 158624e..6ebfd40 100644 --- a/src/harbour-tooter.cpp +++ b/src/harbour-tooter.cpp @@ -13,10 +13,10 @@ #include #include //#include -//#include "filedownloader.h" +#include "filedownloader.h" #include "imageuploader.h" -//#include "notifications.h" -//#include "dbus.h" +#include "notifications.h" +#include "dbus.h" int main(int argc, char *argv[]) { @@ -25,16 +25,16 @@ int main(int argc, char *argv[]) //QQmlContext *context = view.data()->rootContext(); QQmlEngine* engine = view->engine(); - //FileDownloader *fd = new FileDownloader(engine); - //view->rootContext()->setContextProperty("FileDownloader", fd); + FileDownloader *fd = new FileDownloader(engine); + view->rootContext()->setContextProperty("FileDownloader", fd); qmlRegisterType("harbour.tooter.Uploader", 1, 0, "ImageUploader"); - //Notifications *no = new Notifications(); - //view->rootContext()->setContextProperty("Notifications", no); + Notifications *no = new Notifications(); + view->rootContext()->setContextProperty("Notifications", no); QObject::connect(engine, SIGNAL(quit()), app.data(), SLOT(quit())); - //Dbus *dbus = new Dbus(); - //view->rootContext()->setContextProperty("Dbus", dbus); + Dbus *dbus = new Dbus(); + view->rootContext()->setContextProperty("Dbus", dbus); view->setSource(SailfishApp::pathTo("qml/harbour-tooter.qml")); view->show();