8f6afef · unity8 · git.iko.soy

plugins/Unity/Indicators/CMakeLists.txt−1

compare with xenial

unifiedsplit

@@ -36,7 +36,6 @@ set(IndicatorsQML_SOURCES

36 unitymenumodelcache.cpp

37 unitymenumodelstack.cpp

38 visibleindicatorsmodel.cpp

39− timeformatter.cpp

40)

39)

41add_definitions(-DUNITYINDICATORS_LIBRARY)

40add_definitions(-DUNITYINDICATORS_LIBRARY)

42

41

plugins/Unity/Indicators/plugin.cpp−2

@@ -33,7 +33,6 @@

33#include "unitymenumodelcache.h"

34#include "unitymenumodelstack.h"

35#include "visibleindicatorsmodel.h"

36−#include "timeformatter.h"

37

36

38static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

37static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

39 Q_UNUSED(engine);

38 Q_UNUSED(engine);

@@ -52,7 +51,6 @@ void Indicators2Plugin::registerTypes(const char *uri)

52 qmlRegisterType<RootActionState>(uri, 0, 1, "RootActionState");

51 qmlRegisterType<RootActionState>(uri, 0, 1, "RootActionState");

53 qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");

52 qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");

54 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

53 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

55− qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");

56

54

57 qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);

55 qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);

58

56

plugins/Utils/CMakeLists.txt+1

@@ -16,6 +16,7 @@ set(QMLPLUGIN_SRC

16 mediaartcache.cpp

17 qlimitproxymodelqml.cpp

18 qsortfilterproxymodelqml.cpp

19+ timeformatter.cpp

19 ubuntuwindow.cpp

20 ubuntuwindow.cpp

20 unitymenumodelpaths.cpp

21 unitymenumodelpaths.cpp

21 plugin.cpp

22 plugin.cpp

plugins/Utils/plugin.cpp+3

@@ -28,6 +28,7 @@

28#include "applicationpaths.h"

29#include "qlimitproxymodelqml.h"

30#include "qsortfilterproxymodelqml.h"

31+#include "timeformatter.h"

31#include "ubuntuwindow.h"

32#include "ubuntuwindow.h"

32#include "unitymenumodelpaths.h"

33#include "unitymenumodelpaths.h"

33

34

@@ -46,6 +47,8 @@ void UtilsPlugin::registerTypes(const char *uri)

46 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");

47 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");

47 qmlRegisterExtendedType<QQuickWindow, UbuntuWindow>(uri, 0, 1, "Window");

48 qmlRegisterExtendedType<QQuickWindow, UbuntuWindow>(uri, 0, 1, "Window");

48 qmlRegisterSingletonType<ApplicationPaths>(uri, 0, 1, "ApplicationPaths", applicationsPathsSingleton);

49 qmlRegisterSingletonType<ApplicationPaths>(uri, 0, 1, "ApplicationPaths", applicationsPathsSingleton);

50+ qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");

51+ qmlRegisterType<StrFTimeFormatter>(uri, 0, 1, "StrFTimeFormatter");

49}

52}

50

53

51void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

54void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

plugins/Unity/Indicators/timeformatter.cpp → plugins/Utils/timeformatter.cpprenamed+26−1

@@ -167,6 +167,31 @@ void TimeFormatter::setTime(qint64 time)

167

168void TimeFormatter::update()

169{

170− priv->timeString = QDateTime::fromMSecsSinceEpoch(priv->time / 1000).toString(priv->format);

170+ priv->timeString = formatTime();

171 Q_EMIT timeStringChanged(priv->timeString);

172}

173+

174+QString TimeFormatter::formatTime() const

175+{

176+ return QDateTime::fromMSecsSinceEpoch(time() / 1000).toString(format());

177+}

178+

179+StrFTimeFormatter::StrFTimeFormatter(QObject* parent)

180+: TimeFormatter(parent)

181+{

182+}

183+

184+QString StrFTimeFormatter::formatTime() const

185+{

186+ time_t rawtime;

187+ struct tm * timeinfo;

188+ char buffer [80];

189+

190+ rawtime = time();

191+ timeinfo = localtime (&rawtime);

192+

193+ QByteArray formatBytes = format().toUtf8();

194+

195+ strftime (buffer, 80, formatBytes.constData(), timeinfo);

196+ return QString(buffer);

197+}

plugins/Unity/Indicators/timeformatter.h → plugins/Utils/timeformatter.hrenamed+14−3

@@ -19,10 +19,9 @@

19#ifndef TIME_FORMATTER_H

20#define TIME_FORMATTER_H

21

22−#include "unityindicatorsglobal.h"

23#include <QObject>

22#include <QObject>

24

23

25−class UNITYINDICATORS_EXPORT TimeFormatter : public QObject

24+class TimeFormatter : public QObject

26{

25{

27 Q_OBJECT

26 Q_OBJECT

28 Q_PROPERTY(QString format READ format WRITE setFormat NOTIFY formatChanged)

27 Q_PROPERTY(QString format READ format WRITE setFormat NOTIFY formatChanged)

@@ -31,7 +30,7 @@ class UNITYINDICATORS_EXPORT TimeFormatter : public QObject

31

30

32public:

31public:

33 TimeFormatter(QObject *parent = 0);

32 TimeFormatter(QObject *parent = 0);

34− ~TimeFormatter();

33+ virtual ~TimeFormatter();

35

34

36 QString format() const;

35 QString format() const;

37 QString timeString() const;

36 QString timeString() const;

@@ -47,8 +46,20 @@ Q_SIGNALS:

47 void timeStringChanged(const QString &timeString);

46 void timeStringChanged(const QString &timeString);

48 void timeChanged(qint64 time);

47 void timeChanged(qint64 time);

49

48

49+protected:

50+ virtual QString formatTime() const;

51+

50private:

52private:

51 struct TimeFormatterPrivate *priv;

53 struct TimeFormatterPrivate *priv;

52};

54};

53

55

56+class StrFTimeFormatter : public TimeFormatter

57+{

58+public:

59+ StrFTimeFormatter(QObject *parent = 0);

60+

61+protected:

62+ virtual QString formatTime() const;

63+};

64+

54#endif

65#endif

tests/plugins/Unity/Indicators/CMakeLists.txt−1

@@ -30,5 +30,4 @@ run_tests(

30 indicatorsmodeltest

31 menucontentactivatortest

32 rootactionstatetest

33− timeformattertest

34 )

33 )

tests/plugins/Utils/CMakeLists.txt+1

@@ -24,4 +24,5 @@ endmacro(run_tests)

24run_tests(

25 qlimitproxymodeltest

26 qsortfilterproxymodeltest

27+ timeformattertest

27 )

28 )

tests/plugins/Unity/Indicators/timeformattertest.cpp → tests/plugins/Utils/timeformattertest.cpprenamed+13

@@ -48,6 +48,19 @@ private Q_SLOTS:

48

49 QCOMPARE(formatter.timeString(), time.toString(format));

50 }

51+

52+ void testFormatStrF()

53+ {

54+ const QString format = "%d-%m-%Y %I:%M%p";

55+

56+ QDateTime time = QDateTime::currentDateTime();

57+

58+ StrFTimeFormatter formatter;

59+ formatter.setTime(time.toMSecsSinceEpoch() / 1000); // strftime in seconds since epoc

60+ formatter.setFormat(format);

61+

62+ QCOMPARE(formatter.timeString(), time.toString("dd-MM-yyyy hh:mmAP"));

63+ }

51};

64};

52

65

53QTEST_GUILESS_MAIN(TimeFormatterTest)

66QTEST_GUILESS_MAIN(TimeFormatterTest)