From d76c0b7aab4b87edb3466fcda1bf5c60b05ff163 Mon Sep 17 00:00:00 2001 From: shaojun Date: Fri, 27 Sep 2019 11:41:21 +0800 Subject: [PATCH] fixed(tooltip):change tooltip text color is brightText --- plugins/datetime/datetimeplugin.cpp | 8 -------- plugins/trash/CMakeLists.txt | 2 +- plugins/trash/trashplugin.cpp | 4 +--- plugins/trash/trashplugin.h | 3 ++- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp index 39e3f5026..ea9378fff 100644 --- a/plugins/datetime/datetimeplugin.cpp +++ b/plugins/datetime/datetimeplugin.cpp @@ -83,14 +83,6 @@ void DatetimePlugin::loadPlugin() m_refershTimer->setInterval(1000); m_refershTimer->start(); - m_centralWidget = new DatetimeWidget; - m_dateTipsLabel = new TipsWidget; - m_refershTimer = new QTimer(this); - m_dateTipsLabel->setObjectName("datetime"); - - m_refershTimer->setInterval(1000); - m_refershTimer->start(); - m_centralWidget = new DatetimeWidget; connect(m_centralWidget, &DatetimeWidget::requestUpdateGeometry, [this] { m_proxyInter->itemUpdate(this, pluginName()); }); diff --git a/plugins/trash/CMakeLists.txt b/plugins/trash/CMakeLists.txt index 18a48b802..e980312db 100644 --- a/plugins/trash/CMakeLists.txt +++ b/plugins/trash/CMakeLists.txt @@ -4,7 +4,7 @@ set(PLUGIN_NAME "trash") project(${PLUGIN_NAME}) # Sources files -file(GLOB SRCS "*.h" "*.cpp") +file(GLOB SRCS "*.h" "*.cpp" "../../widgets/*.h" "../../widgets/*.cpp") find_package(PkgConfig REQUIRED) find_package(Qt5Widgets REQUIRED) diff --git a/plugins/trash/trashplugin.cpp b/plugins/trash/trashplugin.cpp index ddc059b11..d02baab30 100644 --- a/plugins/trash/trashplugin.cpp +++ b/plugins/trash/trashplugin.cpp @@ -35,11 +35,9 @@ DWIDGET_USE_NAMESPACE TrashPlugin::TrashPlugin(QObject *parent) : QObject(parent) , m_trashWidget(nullptr) - , m_tipsLabel(new QLabel) + , m_tipsLabel(new TipsWidget) { m_tipsLabel->setObjectName("trash"); - m_tipsLabel->setStyleSheet("color:white;" - "padding: 0 3px;"); } const QString TrashPlugin::pluginName() const diff --git a/plugins/trash/trashplugin.h b/plugins/trash/trashplugin.h index bd80ba6b5..a9a77382c 100644 --- a/plugins/trash/trashplugin.h +++ b/plugins/trash/trashplugin.h @@ -29,6 +29,7 @@ #include "pluginsiteminterface.h" #include "trashwidget.h" +#include "../../widgets/tipswidget.h" #include #include @@ -62,7 +63,7 @@ public: private: TrashWidget *m_trashWidget; - QLabel *m_tipsLabel; + QPointer m_tipsLabel; }; #endif // TRASHPLUGIN_H