Merge lp:~ken-vandine/ubuntu-system-settings/rtm-1385286 into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

Move formatSize into a new Utilities class in the qml context and call this from the updates panel to consistently display sizes

Move formatSize into a new Utilities class in the qml context and call this from the updates panel to consistently display sizes

[Sebastien Bacher (seb128)]

Thanks

review: Approve

[Sebastien Bacher (seb128)]

seems like we are not doing more rtm landing, so cleaning the list a bit, that one is rather going to be including with the vivid rebase

Unmerged revisions

940. By Ken VanDine on 2014-11-18

Move formatSize into a new Utilities class in the qml context and call this from the updates panel to consistently display sizes

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2014-11-12 16:03:25 +0000
+++ plugins/about/PageComponent.qml	2014-11-18 19:44:46 +0000
@@ -143,7 +143,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(backendInfos.formatSize(storageInfo.availableDiskSpace("/home")))
+                value: i18n.tr("%1 free").arg(Utilities.formatSize(storageInfo.availableDiskSpace("/home")))
                 progression: true
                 onClicked: pageStack.push(Qt.resolvedUrl("Storage.qml"))
             }

=== modified file 'plugins/about/Storage.qml'
--- plugins/about/Storage.qml	2014-09-26 08:35:34 +0000
+++ plugins/about/Storage.qml	2014-11-18 19:44:46 +0000
@@ -138,7 +138,7 @@
                 id: diskItem
                 objectName: "diskItem"
                 text: i18n.tr("Total storage")
-                value: backendInfo.formatSize(diskSpace)
+                value: Utilities.formatSize(diskSpace)
                 showDivider: false
             }
 
@@ -199,7 +199,7 @@
                     iconFrame: iconPath // no frame for invalid icons, since these aren't app icons
                     text: displayName
                     value: installedSize ?
-                               backendInfo.formatSize(installedSize) :
+                               Utilities.formatSize(installedSize) :
                                i18n.tr("N/A")
                 }
             }

=== modified file 'plugins/about/StorageItem.qml'
--- plugins/about/StorageItem.qml	2014-01-27 10:41:38 +0000
+++ plugins/about/StorageItem.qml	2014-11-18 19:44:46 +0000
@@ -25,7 +25,7 @@
         id: sizelabel
         objectName: "sizeLabel"
         anchors.right: parent.right
-        text: backendInfo.formatSize(value)
+        text: Utilities.formatSize(value)
         visible: ready
     }
     ActivityIndicator {

=== modified file 'plugins/about/storageabout.cpp'
--- plugins/about/storageabout.cpp	2014-10-02 16:35:40 +0000
+++ plugins/about/storageabout.cpp	2014-11-18 19:44:46 +0000
@@ -290,17 +290,6 @@
     return m_homeSize;
 }
 
-QString StorageAbout::formatSize(quint64 size) const
-{
-    guint64 g_size = size;
-
-    gchar * formatted_size = g_format_size (g_size);
-    QString q_formatted_size = QString::fromLocal8Bit(formatted_size);
-    g_free (formatted_size);
-
-    return q_formatted_size;
-}
-
 void StorageAbout::populateSizes()
 {
     quint32 *running = new quint32(0);

=== modified file 'plugins/about/storageabout.h'
--- plugins/about/storageabout.h	2014-09-24 12:29:57 +0000
+++ plugins/about/storageabout.h	2014-11-18 19:44:46 +0000
@@ -109,7 +109,6 @@
     quint64 getAudioSize();
     quint64 getPicturesSize();
     quint64 getHomeSize();
-    Q_INVOKABLE QString formatSize (quint64 size) const;
     Q_INVOKABLE void populateSizes();
     Q_INVOKABLE QString getDevicePath (const QString mount_point);
     bool getDeveloperMode();

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2014-10-20 20:53:02 +0000
+++ plugins/system-update/PageComponent.qml	2014-11-18 19:44:46 +0000
@@ -535,11 +535,11 @@
                                 fontSize: "small"
                                 text: {
                                     if (!labelUpdateStatus.visible)
-                                        return convert_bytes_to_size(modelData.binaryFilesize);
+                                        return Utilities.formatSize(modelData.binaryFilesize);
 
                                     return i18n.tr("%1 of %2").arg(
-                                        convert_bytes_to_size(modelData.binaryFilesize * (progress.value * 0.01))).arg(
-                                        convert_bytes_to_size(modelData.binaryFilesize)
+                                        Utilities.formatSize(modelData.binaryFilesize * (progress.value * 0.01))).arg(
+                                        Utilities.formatSize(modelData.binaryFilesize)
                                     );
                                 }
                             }
@@ -640,12 +640,12 @@
                                 elide: Text.ElideRight
                                 fontSize: "small"
                             }
-                            
+
                             Label {
                                 id: labelSize
                                 objectName: "labelSize"
                                 anchors.right: parent.right
-                                text: convert_bytes_to_size(modelData.binaryFilesize)
+                                text: Utilities.formatSize(modelData.binaryFilesize)
                                 fontSize: "small"
                                 visible: !labelUpdateStatus.visible && !installing && !installed
                             }
@@ -773,27 +773,4 @@
             onClicked: pageStack.push(Qt.resolvedUrl("Configuration.qml"))
         }
     }
-
-    function convert_bytes_to_size(bytes) {
-        var SIZE_IN_GIB = 1024.0 * 1024.0 * 1024.0;
-        var SIZE_IN_MIB = 1024.0 * 1024.0;
-        var SIZE_IN_KIB = 1024.0;
-
-        var result = "";
-        var size = 0;
-        if (bytes < SIZE_IN_KIB) {
-            result = bytes + i18n.tr(" bytes");
-        } else if (bytes < SIZE_IN_MIB) {
-            size = (bytes / SIZE_IN_KIB).toFixed(1);
-            result = size + i18n.tr(" KiB");
-        } else if (bytes < SIZE_IN_GIB) {
-            size = (bytes / SIZE_IN_MIB).toFixed(1);
-            result = size + i18n.tr(" MiB");
-        } else {
-            size = (bytes / SIZE_IN_GIB).toFixed(1);
-            result = size + i18n.tr(" GiB");
-        }
-
-        return result;
-    }
 }

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-11-12 16:03:25 +0000
+++ src/CMakeLists.txt	2014-11-18 19:44:46 +0000
@@ -1,3 +1,5 @@
+include_directories(${GLIB_INCLUDE_DIRS})
+
 add_definitions(-DI18N_DIRECTORY="${CMAKE_INSTALL_PREFIX}/share/locale")
 add_definitions(-DI18N_DOMAIN="ubuntu-system-settings")
 add_definitions(-DPLUGIN_PRIVATE_MODULE_DIR="${PLUGIN_PRIVATE_MODULE_DIR}")
@@ -30,7 +32,7 @@
 
 add_executable(system-settings ${USS_SOURCES} ${QML_SOURCES} ${system-settings-resources})
 qt5_use_modules(system-settings Core Gui Quick Qml)
-target_link_libraries(system-settings SystemSettings)
+target_link_libraries(system-settings SystemSettings ${GLIB_LDFLAGS})
 install(TARGETS system-settings RUNTIME DESTINATION bin)
 
 add_library(uss-accountsservice SHARED accountsservice.h accountsservice.cpp)

=== modified file 'src/main.cpp'
--- src/main.cpp	2014-10-21 15:20:07 +0000
+++ src/main.cpp	2014-11-18 19:44:46 +0000
@@ -85,6 +85,7 @@
                      Qt::QueuedConnection);
     qmlRegisterType<QAbstractItemModel>();
     qmlRegisterType<SystemSettings::PluginManager>("SystemSettings", 1, 0, "PluginManager");
+    view.engine()->rootContext()->setContextProperty("Utilities", new Utilities());
     view.setResizeMode(QQuickView::SizeRootObjectToView);
     view.engine()->addImportPath(PLUGIN_PRIVATE_MODULE_DIR);
     view.engine()->addImportPath(PLUGIN_QML_DIR);

=== modified file 'src/utils.cpp'
--- src/utils.cpp	2014-07-23 13:29:15 +0000
+++ src/utils.cpp	2014-11-18 19:44:46 +0000
@@ -21,6 +21,7 @@
 #include "utils.h"
 #include "debug.h"
 
+#include <glib.h>
 #include <QUrl>
 #include <QUrlQuery>
 
@@ -59,4 +60,20 @@
     }
 }
 
+Utilities::Utilities(QObject *parent) :
+    QObject(parent)
+{
+}
+
+QString Utilities::formatSize(quint64 size) const
+{
+    guint64 g_size = size;
+
+    gchar * formatted_size = g_format_size (g_size);
+    QString q_formatted_size = QString::fromLocal8Bit(formatted_size);
+    g_free (formatted_size);
+
+    return q_formatted_size;
+}
+
 } // namespace

=== modified file 'src/utils.h'
--- src/utils.h	2013-09-30 09:29:34 +0000
+++ src/utils.h	2014-11-18 19:44:46 +0000
@@ -29,6 +29,14 @@
 void parsePluginOptions(const QStringList &arguments, QString &defaultPlugin,
                         QVariantMap &pluginOptions);
 
+class Utilities : public QObject {
+    Q_OBJECT
+
+public:
+    explicit Utilities(QObject *parent = 0);
+    Q_INVOKABLE QString formatSize(quint64) const;
+};
+
 } // namespace
 
 #endif // SYSTEM_SETTINGS_UTILS_H

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-09-03 15:38:36 +0000
+++ tests/CMakeLists.txt	2014-11-18 19:44:46 +0000
@@ -1,4 +1,5 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ../src)
+include_directories(${GLIB_INCLUDE_DIRS})
 add_definitions(-DI18N_DOMAIN="ubuntu-system-settings")
 add_definitions(-DPLUGIN_PRIVATE_MODULE_DIR="${PLUGIN_PRIVATE_MODULE_DIR}")
 add_definitions(-DPLUGIN_MANIFEST_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
@@ -36,6 +37,7 @@
 set_tests_properties(tst-plugins PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
 
 qt5_use_modules(tst-arguments Core Test)
+target_link_libraries(tst-arguments ${GLIB_LDFLAGS})
 add_test(tst-arguments tst-arguments)
 
 add_executable(tst-pagelist tst_pagelist.cpp ../wizard/PageList.cpp)