Merge pull request #67 from DylanVanAssche/rc5

RC5: Jolla Store Release
DylanVanAssche · Oct 21, 2017 · f7eb52b · f7eb52b
2 parents 53c5ee1 + 16a7f5f
commit f7eb52b
Show file tree

Hide file tree

Showing 23 changed files with 88 additions and 48 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,8 @@
 
 /.qmake.cache
 /.qmake.stash
+/*.pro.user
+/*.pro.user.*
 *.pro.user
 *.pro.user.*
 *.qbs.user

diff --git a/icons/108x108/harbour-sailbook.png b/icons/108x108/harbour-sailbook.png
diff --git a/icons/128x128/harbour-sailbook.png b/icons/128x128/harbour-sailbook.png
diff --git a/icons/256x256/harbour-sailbook.png b/icons/256x256/harbour-sailbook.png
diff --git a/icons/86x86/harbour-sailbook.png b/icons/86x86/harbour-sailbook.png
diff --git a/qml/resources/css/sailbook-theme-ambience.css b/qml/resources/css/sailbook-theme-ambience.css
@@ -2,15 +2,6 @@
  * '!important' CSS property enforces to overide FB CSS styles.
  */
 
-/* Transparent background */
-body {
-    background-color: transparent !important;
-}
-
-._2v9s {
-    background: transparent !important;
-}
-
 ._s15 {
     display: none;
     visibility: hidden;

diff --git a/qml/resources/images/icon-cover.svg b/qml/resources/images/icon-cover.svg
diff --git a/rpm/harbour-sailbook.changes b/rpm/harbour-sailbook.changes
@@ -8,6 +8,17 @@
 # * date Author's Name <author's email> version-release
 # - Summary of changes
 
+* Sat Oct 21 2017 Dylan Van Assche <[email protected]> 10.0-5
+- [MINOR BUGFIX] Sailbook only makes his own directories when it's actually used
+- [MINOR BUGFIX] Fixed logger spacing in title
+- [MAJOR BUGFIX] Revert Ambience CSS theme since rendering fails due other Facebook CSS elements and QTWebkit
+- [STORE] Jolla Store release version based on SFOS 2.1.2.X
+- [STORE] Visual assets updated
+
+* Wed Oct 11 2017 Dylan Van Assche <[email protected]> 10.0-4
+- [TRANSLATIONS] Updated translations
+- [STORE] Visual assets updated
+
 * Sun Oct 8 2017 Dylan Van Assche <[email protected]> 10.0-3
 - [TRANSLATIONS] Updated translations from Transifex (Thanks Rudi Timmermans)
 
@@ -40,8 +51,8 @@
 - [IMPROVEMENT] Notification backend now uses events
 
 * Sat Sep 2 2017 Matthias Weiß <[email protected]> 9.4
-- [IMPROVEMENT] Nightmode
 - [NEW] Nightmode ambience
+- [IMPROVEMENT] Nightmode
 - [IMPROVEMENT] Fix for comments / hide of view switcher
 
 * Thu Aug 31 2017 Rudi Timmermans <[email protected]> 9.3

diff --git a/rpm/harbour-sailbook.spec b/rpm/harbour-sailbook.spec
@@ -14,7 +14,7 @@ Name:       harbour-sailbook
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Sailbook
 Version:    10.0
-Release:    3
+Release:    5
 Group:      Qt/Qt
 License:    GPLv3
 URL:        https://github.com/DylanVanAssche/harbour-sailbook

diff --git a/rpm/harbour-sailbook.yaml b/rpm/harbour-sailbook.yaml
@@ -1,7 +1,7 @@
 Name: harbour-sailbook
 Summary: Sailbook
 Version: 10.0
-Release: 3
+Release: 5
 # 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
 Group: Qt/Qt

diff --git a/src/logger.cpp b/src/logger.cpp
@@ -48,7 +48,7 @@ void handler(QtMsgType type, const QMessageLogContext &context, const QString &m
         }
         logStream.setDevice(&outFile);
         clearLog = false;
-        logStream << QString("%1 V%2\t%3 %4").arg(sfos.appName(), sfos.appVersion(), __DATE__, __TIME__) << endl;
+        logStream << QString("%1 V%2 (%3 %4)").arg(sfos.appName(), sfos.appVersion(), __DATE__, __TIME__) << endl;
         logStream << QString("%1\t%2").arg(sfos.release(), sfos.device()) << endl;
         logStream << QString("-").repeated(LINE_LENGTH) << endl;
     }

diff --git a/src/os.cpp b/src/os.cpp
@@ -13,7 +13,7 @@
  */
 OS::OS() {
     QList<QPair<QString, QString> > dataList;
-    QList<QString> directoryList({logLocation(), cacheLocation(), dataLocation(), photoLocation(), musicLocation(), documentLocation(), videoLocation(), downloadLocation()});
+    QList<QString> directoryList({logLocation(), cacheLocation(), dataLocation()});
 
     // Creating default directories
     QDir directory;
@@ -253,21 +253,37 @@ QString OS::logFile() {
 }
 
 QString OS::photoLocation() {
-    return QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).at(0) + "/" + appNamePretty();
+    QDir directory;
+    directory.setPath(QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).at(0) + "/" + appNamePretty());
+    directory.mkpath(QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).at(0) + "/" + appNamePretty());
+    return directory.path();
 }
 
 QString OS::musicLocation() {
-    return QStandardPaths::standardLocations(QStandardPaths::MusicLocation).at(0) + "/" + appNamePretty();
+    QDir directory;
+    directory.setPath(QStandardPaths::standardLocations(QStandardPaths::MusicLocation).at(0) + "/" + appNamePretty());
+    directory.mkpath(QStandardPaths::standardLocations(QStandardPaths::MusicLocation).at(0) + "/" + appNamePretty());
+    return directory.path();
 }
 
 QString OS::documentLocation() {
-    return QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation).at(0) + "/" + appNamePretty();
+    QDir directory;
+    directory.setPath(QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation).at(0) + "/" + appNamePretty());
+    directory.mkpath(QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation).at(0) + "/" + appNamePretty());
+    return directory.path();
 }
 
 QString OS::videoLocation() {
-    return QStandardPaths::standardLocations(QStandardPaths::MoviesLocation).at(0) + "/" + appNamePretty();
+    QDir directory;
+    directory.setPath(QStandardPaths::standardLocations(QStandardPaths::MoviesLocation).at(0) + "/" + appNamePretty());
+    directory.mkpath(QStandardPaths::standardLocations(QStandardPaths::MoviesLocation).at(0) + "/" + appNamePretty());
+    return directory.path();
 }
 
 QString OS::downloadLocation() {
-    return QStandardPaths::standardLocations(QStandardPaths::DownloadLocation).at(0) + "/" + appNamePretty();
+    QDir directory;
+    directory.setPath(QStandardPaths::standardLocations(QStandardPaths::DownloadLocation).at(0) + "/" + appNamePretty());
+    directory.mkpath(QStandardPaths::standardLocations(QStandardPaths::DownloadLocation).at(0) + "/" + appNamePretty());
+    return directory.path();
 }
+
diff --git a/store/banner_sailbook.svg → store/banner.svg b/store/banner_sailbook.svg → store/banner.svg
diff --git a/store/banner_sailbook_540x270.png → store/banner_store.png b/store/banner_sailbook_540x270.png → store/banner_store.png
diff --git a/store/screenshot1.png b/store/screenshot1.png
diff --git a/store/screenshot2.png b/store/screenshot2.png
diff --git a/store/screenshot3.png b/store/screenshot3.png
diff --git a/translations/harbour-sailbook-de.ts b/translations/harbour-sailbook-de.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de">
 <context>
     <name>AboutPage</name>
     <message>
@@ -337,4 +339,4 @@
         <translation>Öffne externen Link</translation>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/translations/harbour-sailbook-fi.ts b/translations/harbour-sailbook-fi.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fi">
 <context>
     <name>AboutPage</name>
     <message>
@@ -337,4 +339,4 @@
         <translation>Avaamalla ulkoisen osoitteen</translation>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/translations/harbour-sailbook-fr.ts b/translations/harbour-sailbook-fr.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr">
 <context>
     <name>AboutPage</name>
     <message>
@@ -337,4 +339,4 @@
         <translation>Externe link openen</translation>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/translations/harbour-sailbook-it.ts b/translations/harbour-sailbook-it.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="it">
 <context>
     <name>AboutPage</name>
     <message>
@@ -337,4 +339,4 @@
         <translation>Apertura link esterno</translation>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/translations/harbour-sailbook-nl.ts b/translations/harbour-sailbook-nl.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="nl">
 <context>
     <name>AboutPage</name>
     <message>
@@ -337,4 +339,4 @@
         <translation>Externe link openen</translation>
     </message>
 </context>
-</TS>
+</TS>
diff --git a/translations/harbour-sailbook-pl.ts b/translations/harbour-sailbook-pl.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="pl">
 <context>
     <name>AboutPage</name>
     <message>
@@ -337,4 +339,4 @@
         <translation>Otwieranie łącza zewnętrznego</translation>
     </message>
 </context>
-</TS>
+</TS>