Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

add hover tooltip

Browse Source 
Change-Id: I34a0b315032bbd5d4308f43be934494eb78dd6dd
This commit is contained in:
石博文 2016-08-30 15:46:08 +08:00
parent 4bfaa78d66
commit 0c7f8f6677
Notes: Deepin Code Review 2016-09-01 06:50:13 +00:00 
Verified+1: Anonymous Coward #1000004
Verified+1: <zhaofangfang@linuxdeepin.com>
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Thu, 01 Sep 2016 06:50:13 +0000
Reviewed-on: https://cr.deepin.io/15677
Project: dde/dde-dock
Branch: refs/heads/master
6 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/disk-mount/diskcontrolitem.cpp
View File

@ -6,7 +6,7 @@
DWIDGET_USE_NAMESPACE DWIDGET_USE_NAMESPACE
DiskControlItem::DiskControlItem(const DiskInfo &info, QWidget *parent) DiskControlItem::DiskControlItem(const DiskInfo &info, QWidget *parent)
: QWidget(parent), : QFrame(parent),
m_unknowIcon(":/icons/resources/unknown.svg"), m_unknowIcon(":/icons/resources/unknown.svg"),
@ -62,9 +62,13 @@ DiskControlItem::DiskControlItem(const DiskInfo &info, QWidget *parent)
centeralLayout->addWidget(m_diskIcon); centeralLayout->addWidget(m_diskIcon);
centeralLayout->addLayout(progressLayout); centeralLayout->addLayout(progressLayout);
centeralLayout->setSpacing(0); centeralLayout->setSpacing(0);
centeralLayout->setMargin(0); centeralLayout->setContentsMargins(0, 0, 5, 0);
setLayout(centeralLayout); setLayout(centeralLayout);
setObjectName("DiskItem");
setStyleSheet("QFrame #DiskItem:hover {"
"background-color:rgba(255, 255, 255, .1);"
"}");
connect(m_unmountButton, &DImageButton::clicked, [this] {emit requestUnmount(m_info.m_id);}); connect(m_unmountButton, &DImageButton::clicked, [this] {emit requestUnmount(m_info.m_id);});

2
plugins/disk-mount/diskcontrolitem.h
View File

@ -10,7 +10,7 @@
#include <QProgressBar> #include <QProgressBar>
#include <QIcon> #include <QIcon>
class DiskControlItem : public QWidget class DiskControlItem : public QFrame
{ {
Q_OBJECT Q_OBJECT

3
plugins/disk-mount/diskcontrolwidget.cpp
View File

@ -1,7 +1,6 @@
#include "diskcontrolwidget.h" #include "diskcontrolwidget.h"
#include "diskcontrolitem.h" #include "diskcontrolitem.h"
#define MAX_HEIGHT 300
#define WIDTH 300 #define WIDTH 300
DiskControlWidget::DiskControlWidget(QWidget *parent) DiskControlWidget::DiskControlWidget(QWidget *parent)
@ -56,7 +55,7 @@ void DiskControlWidget::diskListChanged()
emit diskCountChanged(mountedCount); emit diskCountChanged(mountedCount);
const int contentHeight = mountedCount * 70; const int contentHeight = mountedCount * 70;
const int maxHeight = std::min(contentHeight, MAX_HEIGHT); const int maxHeight = std::min(contentHeight, 70 * 6);
m_centeralWidget->setFixedHeight(contentHeight); m_centeralWidget->setFixedHeight(contentHeight);
setFixedHeight(maxHeight); setFixedHeight(maxHeight);

12
plugins/disk-mount/diskmountplugin.cpp
View File

@ -5,10 +5,15 @@ DiskMountPlugin::DiskMountPlugin(QObject *parent)
m_pluginAdded(false), m_pluginAdded(false),
m_tipsLabel(new QLabel),
m_diskPluginItem(new DiskPluginItem), m_diskPluginItem(new DiskPluginItem),
m_diskControlApplet(nullptr) m_diskControlApplet(nullptr)
{ {
m_diskPluginItem->setVisible(false); m_diskPluginItem->setVisible(false);
m_tipsLabel->setVisible(false);
m_tipsLabel->setText(tr("Disk"));
m_tipsLabel->setStyleSheet("color:white;"
"padding:5px 10px;");
} }
const QString DiskMountPlugin::pluginName() const const QString DiskMountPlugin::pluginName() const
@ -31,6 +36,13 @@ QWidget *DiskMountPlugin::itemWidget(const QString &itemKey)
return m_diskPluginItem; return m_diskPluginItem;
} }
QWidget *DiskMountPlugin::itemTipsWidget(const QString &itemKey)
{
Q_UNUSED(itemKey);
return m_tipsLabel;
}
QWidget *DiskMountPlugin::itemPopupApplet(const QString &itemKey) QWidget *DiskMountPlugin::itemPopupApplet(const QString &itemKey)
{ {
Q_UNUSED(itemKey); Q_UNUSED(itemKey);

4
plugins/disk-mount/diskmountplugin.h
View File

@ -1,6 +1,8 @@
#ifndef DISKMOUNTPLUGIN_H #ifndef DISKMOUNTPLUGIN_H
#define DISKMOUNTPLUGIN_H #define DISKMOUNTPLUGIN_H
#include <QLabel>
#include "pluginsiteminterface.h" #include "pluginsiteminterface.h"
#include "diskcontrolwidget.h" #include "diskcontrolwidget.h"
#include "diskpluginitem.h" #include "diskpluginitem.h"
@ -18,6 +20,7 @@ public:
void init(PluginProxyInterface *proxyInter); void init(PluginProxyInterface *proxyInter);
QWidget *itemWidget(const QString &itemKey); QWidget *itemWidget(const QString &itemKey);
QWidget *itemTipsWidget(const QString &itemKey);
QWidget *itemPopupApplet(const QString &itemKey); QWidget *itemPopupApplet(const QString &itemKey);
private: private:
@ -31,6 +34,7 @@ private slots:
private: private:
bool m_pluginAdded; bool m_pluginAdded;
QLabel *m_tipsLabel;
DiskPluginItem *m_diskPluginItem; DiskPluginItem *m_diskPluginItem;
DiskControlWidget *m_diskControlApplet; DiskControlWidget *m_diskControlApplet;
}; };

13
plugins/shutdown/shutdownplugin.cpp
View File

@ -40,18 +40,15 @@ QWidget *ShutdownPlugin::itemWidget(const QString &itemKey)
QWidget *ShutdownPlugin::itemTipsWidget(const QString &itemKey) QWidget *ShutdownPlugin::itemTipsWidget(const QString &itemKey)
{ {
const Dock::DisplayMode mode = displayMode();
if (mode == Dock::Efficient && itemKey == SHUTDOWN_KEY)
return nullptr;
const BatteryPercentageMap data = m_powerInter->batteryPercentage(); const BatteryPercentageMap data = m_powerInter->batteryPercentage();
if (data.isEmpty()) if (itemKey == SHUTDOWN_KEY || data.isEmpty())
return nullptr; {
m_tipsLabel->setText(tr("Shut down"));
return m_tipsLabel;
}
m_tipsLabel->setText(QString("%1%").arg(data.value("Display"), 1, 'f', 1)); m_tipsLabel->setText(QString("%1%").arg(data.value("Display"), 1, 'f', 1));
return m_tipsLabel; return m_tipsLabel;
} }