From 352a7cc42662eb99d261d6479313c27b56af4519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E5=8D=9A=E6=96=87?= <sbw@sbw.so>
Date: Wed, 13 Jul 2016 10:08:38 +0800
Subject: [PATCH] modify datetime plugin

Change-Id: Id37812646bcaf307d98e80ac75567fe013ee886a
---
 plugins/datetime/datetime.pro       |  2 +-
 plugins/datetime/datetimeplugin.cpp | 28 ++++++++++++++++++----------
 plugins/datetime/datetimeplugin.h   |  9 ++++-----
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/plugins/datetime/datetime.pro b/plugins/datetime/datetime.pro
index f3e2aa8e5..7a57bf790 100644
--- a/plugins/datetime/datetime.pro
+++ b/plugins/datetime/datetime.pro
@@ -4,7 +4,7 @@ include(../../interfaces/interfaces.pri)
 QT              += widgets svg
 TEMPLATE         = lib
 CONFIG          += plugin c++11 link_pkgconfig
-PKGCONFIG       += dtkwidget dtkbase
+PKGCONFIG       +=
 
 TARGET          = $$qtLibraryTarget(datetime)
 DESTDIR          = $$_PRO_FILE_PWD_/../
diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp
index adf858cd7..3768eed56 100644
--- a/plugins/datetime/datetimeplugin.cpp
+++ b/plugins/datetime/datetimeplugin.cpp
@@ -1,17 +1,16 @@
 #include "datetimeplugin.h"
 
+#include <QLabel>
+
 DatetimePlugin::DatetimePlugin(QObject *parent)
     : QObject(parent),
 
-      m_calendar(new DCalendar(nullptr)),
+      m_dateTipsLabel(new QLabel),
 
       m_refershTimer(new QTimer(this))
 {
-    m_calendar->setFixedSize(300, 300);
-    m_calendar->setDateInfoVisible(true);
-    m_calendar->setControlPanelVisible(false);
-    m_calendar->setSolarDisplayFormat(tr("MM/dd/yyyy"));
-    m_calendar->setLunarVisible(QLocale::system().name().startsWith("zh_"));
+    m_dateTipsLabel->setStyleSheet("color:white;"
+                                   "padding:6px 10px;");
 
     m_refershTimer->setInterval(1000);
     m_refershTimer->start();
@@ -24,7 +23,7 @@ DatetimePlugin::DatetimePlugin(QObject *parent)
 DatetimePlugin::~DatetimePlugin()
 {
     delete m_centeralWidget;
-    delete m_calendar;
+    delete m_dateTipsLabel;
 }
 
 const QString DatetimePlugin::pluginName() const
@@ -70,14 +69,23 @@ QWidget *DatetimePlugin::itemTipsWidget(const QString &itemKey)
 {
     Q_UNUSED(itemKey);
 
-    m_calendar->setCurrentDate(QDate::currentDate());
+    return m_dateTipsLabel;
+}
 
-    return m_calendar;
+const QString DatetimePlugin::itemCommand(const QString &itemKey)
+{
+    Q_UNUSED(itemKey);
+
+    return "dde-calendar";
 }
 
 void DatetimePlugin::updateCurrentTimeString()
 {
-    const QString currentString = QTime::currentTime().toString("mm");
+    const QDateTime currentDateTime = QDateTime::currentDateTime();
+
+    m_dateTipsLabel->setText(currentDateTime.toString(tr("MM/dd/yyyy ddd HH:mm:ss")));
+
+    const QString currentString = currentDateTime.toString("mm");
 
     if (currentString == m_currentTimeString)
         return;
diff --git a/plugins/datetime/datetimeplugin.h b/plugins/datetime/datetimeplugin.h
index 7f023eb1b..78d210deb 100644
--- a/plugins/datetime/datetimeplugin.h
+++ b/plugins/datetime/datetimeplugin.h
@@ -5,10 +5,7 @@
 #include "datetimewidget.h"
 
 #include <QTimer>
-
-#include <dcalendar.h>
-
-DWIDGET_USE_NAMESPACE
+#include <QLabel>
 
 class DatetimePlugin : public QObject, PluginsItemInterface
 {
@@ -30,12 +27,14 @@ public:
     QWidget *itemWidget(const QString &itemKey);
     QWidget *itemTipsWidget(const QString &itemKey);
 
+    const QString itemCommand(const QString &itemKey);
+
 private slots:
     void updateCurrentTimeString();
 
 private:
     DatetimeWidget *m_centeralWidget;
-    DCalendar *m_calendar;
+    QLabel *m_dateTipsLabel;
 
     QTimer *m_refershTimer;