diff --git a/src/ui/qml/pages/BlockedPage.qml b/src/ui/qml/pages/BlockedPage.qml index e2979aed..d8f39b17 100644 --- a/src/ui/qml/pages/BlockedPage.qml +++ b/src/ui/qml/pages/BlockedPage.qml @@ -97,7 +97,7 @@ BasePage { id: ipListView Layout.fillWidth: true Layout.fillHeight: true - spacing: 4 + spacing: 5 model: ipListModel diff --git a/src/ui/qml/pages/StatisticsPage.qml b/src/ui/qml/pages/StatisticsPage.qml index aafbda50..0265d0da 100644 --- a/src/ui/qml/pages/StatisticsPage.qml +++ b/src/ui/qml/pages/StatisticsPage.qml @@ -192,7 +192,7 @@ BasePage { id: trafListView Layout.fillWidth: true Layout.fillHeight: true - spacing: 4 + spacing: 5 clip: true model: trafListModel diff --git a/src/ui/util/dateutil.cpp b/src/ui/util/dateutil.cpp index 5cbb5f0c..a6336a22 100644 --- a/src/ui/util/dateutil.cpp +++ b/src/ui/util/dateutil.cpp @@ -1,6 +1,7 @@ #include "dateutil.h" #include +#include DateUtil::DateUtil(QObject *parent) : QObject(parent) @@ -48,25 +49,26 @@ qint32 DateUtil::addUnixMonths(qint32 unixHour, int months) QString DateUtil::formatTime(qint64 unixTime) { - return formatDateTime(unixTime, "yyyy-MM-dd hh:mm:ss"); + return formatDateTime(unixTime, "dd-MMM-yyyy hh:mm:ss"); } QString DateUtil::formatHour(qint64 unixTime) { - return formatDateTime(unixTime, "yyyy-MM-dd hh:00"); + return formatDateTime(unixTime, "dd-MMM-yyyy hh:00"); } QString DateUtil::formatDay(qint64 unixTime) { - return formatDateTime(unixTime, "yyyy-MM-dd"); + return formatDateTime(unixTime, "dd MMMM yyyy"); } QString DateUtil::formatMonth(qint64 unixTime) { - return formatDateTime(unixTime, "yyyy-MM"); + return formatDateTime(unixTime, "MMMM yyyy"); } QString DateUtil::formatDateTime(qint64 unixTime, const QString &format) { - return QDateTime::fromSecsSinceEpoch(unixTime).toString(format); + const QDateTime dt = QDateTime::fromSecsSinceEpoch(unixTime); + return QLocale().toString(dt, format); }