Merge lp:~laney/ubuntu-system-settings/storageinfo-5.4 into lp:ubuntu-system-settings

[Timo Jyrinki]

[Timo Jyrinki (timo-jyrinki)]

Got functional as the bandaid solution by:

- Add #include <QtCore/QStorageInfo> to plugins/about/storageabout.cpp
- Instead of "storageInfo.availableDiskSpace", use "backendInfos.getFreeSpace" in plugins/about/PageComponent.qml line 172

review: Needs Fixing

[Timo Jyrinki (timo-jyrinki)]

(plus for the actual bandaid made the item non-clickable because I needed to comment out the StorageInfo { } in PageComponent.qml as long as such QML class is not available)

[Timo Jyrinki (timo-jyrinki)]

Landed with the mentioned fixes together with Qt 5.4.

review: Approve

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2015-01-14 00:00:41 +0000
+++ plugins/about/PageComponent.qml	2015-02-13 12:09:58 +0000
@@ -169,7 +169,7 @@
                 objectName: "storageItem"
                 text: i18n.tr("Storage")
                 /* TRANSLATORS: that's the free disk space, indicated in the most appropriate storage unit */
-                value: i18n.tr("%1 free").arg(Utilities.formatSize(storageInfo.availableDiskSpace("/home")))
+                value: i18n.tr("%1 free").arg(Utilities.formatSize(storageInfo.getFreeSpace("/home")))
                 progression: true
                 onClicked: pageStack.push(Qt.resolvedUrl("Storage.qml"))
             }

=== modified file 'plugins/about/storageabout.cpp'
--- plugins/about/storageabout.cpp	2014-10-24 20:04:30 +0000
+++ plugins/about/storageabout.cpp	2015-02-13 12:09:58 +0000
@@ -344,6 +344,15 @@
     return s_mount_point;
 }
 
+qint64 StorageAbout::getFreeSpace(const QString mount_point)
+{
+    QStorageInfo si(mount_point);
+    if (si.isValid())
+        return si.bytesFree();
+
+    return -1;
+}
+
 StorageAbout::~StorageAbout() {
     if (m_cancellable) {
         g_cancellable_cancel(m_cancellable);

=== modified file 'plugins/about/storageabout.h'
--- plugins/about/storageabout.h	2014-10-24 20:04:30 +0000
+++ plugins/about/storageabout.h	2015-02-13 12:09:58 +0000
@@ -111,6 +111,7 @@
     quint64 getHomeSize();
     Q_INVOKABLE void populateSizes();
     Q_INVOKABLE QString getDevicePath (const QString mount_point);
+    Q_INVOKABLE qint64 getFreeSpace (const QString mount_point);
     bool getDeveloperMode();
     void setDeveloperMode(bool newMode);