From 20ad0443c67feaf949ebbaa6b5894758e1611ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E5=8D=9A=E6=96=87?= Date: Fri, 17 Jun 2016 09:42:06 +0800 Subject: [PATCH] changed activate dus interface Change-Id: I88cfceab09abb643971b3752e42d63c0aff06e32 --- frame/dbus/dbusdockentry.h | 7 ------- frame/item/appitem.cpp | 2 +- plugins/datetime/datetimeplugin.cpp | 5 ++++- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/frame/dbus/dbusdockentry.h b/frame/dbus/dbusdockentry.h index b155c0fa5..256425a0c 100644 --- a/frame/dbus/dbusdockentry.h +++ b/frame/dbus/dbusdockentry.h @@ -88,13 +88,6 @@ public Q_SLOTS: // METHODS return asyncCallWithArgumentList(QStringLiteral("Activate"), argumentList); } - inline QDBusPendingReply<> Activate1() - { - QList argumentList; - argumentList << QVariant::fromValue(qint32(0)) << QVariant::fromValue(qint32(0)) << QVariant::fromValue(quint32(0)); - return asyncCallWithArgumentList(QStringLiteral("Activate"), argumentList); - } - Q_SIGNALS: // SIGNALS // begin property changed signals void ActiveChanged(); diff --git a/frame/item/appitem.cpp b/frame/item/appitem.cpp index 03de98203..25b0234b5 100644 --- a/frame/item/appitem.cpp +++ b/frame/item/appitem.cpp @@ -76,7 +76,7 @@ void AppItem::mouseReleaseEvent(QMouseEvent *e) // activate // TODO: dbus signature changed if (e->button() == Qt::LeftButton) - m_itemEntry->Activate1(); + m_itemEntry->Activate(); } void AppItem::mousePressEvent(QMouseEvent *e) diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp index 5a52ab79a..df413be0f 100644 --- a/plugins/datetime/datetimeplugin.cpp +++ b/plugins/datetime/datetimeplugin.cpp @@ -5,7 +5,10 @@ DatetimePlugin::DatetimePlugin(QObject *parent) m_timeLabel(new QLabel), m_refershTimer(new QTimer(this)) { - m_timeLabel->setStyleSheet("color:red;"); + m_timeLabel->setAlignment(Qt::AlignCenter); + m_timeLabel->setStyleSheet("color:white;" + "background-color:black;" + "font-size:12px;"); m_refershTimer->setInterval(1000); m_refershTimer->start();