From ea04ee5226fcbdae36375f355a5accf79bc42555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E5=8D=9A=E6=96=87?= Date: Tue, 9 Aug 2016 14:51:03 +0800 Subject: [PATCH] optimize ui details Change-Id: I9ad3312423a757f44ea8cc04afceb86d522a172d --- frame/item/appitem.cpp | 6 ++++-- frame/panel/mainpanel.cpp | 3 +++ plugins/disk-mount/diskcontrolitem.cpp | 17 ++++++++++------- plugins/disk-mount/diskpluginitem.cpp | 2 +- .../network/item/applet/devicecontrolwidget.cpp | 1 + .../network/item/applet/horizontalseperator.cpp | 10 ++++++++-- .../network/item/applet/horizontalseperator.h | 5 +++++ plugins/network/item/deviceitem.cpp | 2 +- plugins/network/item/wirelessitem.cpp | 2 +- plugins/shutdown/pluginwidget.cpp | 4 ++-- plugins/shutdown/powerstatuswidget.cpp | 2 +- .../sound/componments/horizontalseparator.cpp | 2 +- plugins/sound/sinkinputwidget.cpp | 1 + plugins/sound/soundapplet.cpp | 7 ++++++- plugins/sound/sounditem.cpp | 4 ++-- plugins/system-tray/traywidget.cpp | 2 +- plugins/trash/trashwidget.cpp | 8 +++++--- 17 files changed, 53 insertions(+), 25 deletions(-) diff --git a/frame/item/appitem.cpp b/frame/item/appitem.cpp index acedbb7d6..428f59d52 100644 --- a/frame/item/appitem.cpp +++ b/frame/item/appitem.cpp @@ -117,10 +117,12 @@ void AppItem::paintEvent(QPaintEvent *e) { case Top: case Bottom: - backgroundRect = itemRect.marginsRemoved(QMargins(2, 1, 2, 1)); +// backgroundRect = itemRect;//.marginsRemoved(QMargins(2, 0, 2, 0)); +// backgroundRect = itemRect.marginsRemoved(QMargins(0, 1, 0, 1)); case Left: case Right: - backgroundRect = itemRect.marginsRemoved(QMargins(1, 2, 1, 2)); + backgroundRect = itemRect.marginsRemoved(QMargins(1, 1, 1, 1)); +// backgroundRect = itemRect.marginsRemoved(QMargins(1, 0, 1, 0)); } } diff --git a/frame/panel/mainpanel.cpp b/frame/panel/mainpanel.cpp index 4acfd1802..2502215d3 100644 --- a/frame/panel/mainpanel.cpp +++ b/frame/panel/mainpanel.cpp @@ -28,6 +28,9 @@ MainPanel::MainPanel(QWidget *parent) "border:" xstr(PANEL_BORDER) "px solid rgba(162, 162, 162, .2);" "background-color:rgba(10, 10, 10, .6);" "}" + "QWidget #MainPanel[displayMode='1'] {" + "border:none;" + "}" // Top "QWidget #MainPanel[displayMode='0'][position='0'] {" "border-bottom-left-radius:5px;" diff --git a/plugins/disk-mount/diskcontrolitem.cpp b/plugins/disk-mount/diskcontrolitem.cpp index dc12cbd54..851e7ce1f 100644 --- a/plugins/disk-mount/diskcontrolitem.cpp +++ b/plugins/disk-mount/diskcontrolitem.cpp @@ -19,29 +19,32 @@ DiskControlItem::DiskControlItem(const DiskInfo &info, QWidget *parent) QIcon::setThemeName("deepin"); m_diskName->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); - m_diskName->setStyleSheet("color:white;"); + m_diskName->setStyleSheet("color:white;" + "font-size:12px;"); - m_diskCapacity->setStyleSheet("color:white;"); + m_diskCapacity->setStyleSheet("color:rgba(255, 255, 255, .6);" + "font-size:10px;"); m_capacityValueBar->setTextVisible(false); - m_capacityValueBar->setFixedHeight(3); + m_capacityValueBar->setFixedHeight(2); m_capacityValueBar->setStyleSheet("QProgressBar {" "border:none;" - "background-color:rgba(255, 255, 255, .3);" + "background-color:rgba(255, 255, 255, .1);" "}" "QProgressBar::chunk {" - "background-color:white;" + "background-color:rgba(255, 255, 255, .8);" "}"); m_unmountButton->setNormalPic(":/icons/resources/unmount-normal.png"); m_unmountButton->setHoverPic(":/icons/resources/unmount-hover.png"); m_unmountButton->setPressPic(":/icons/resources/unmount-press.png"); + m_unmountButton->setStyleSheet("margin-top:12px;"); QVBoxLayout *infoLayout = new QVBoxLayout; infoLayout->addWidget(m_diskName); infoLayout->addWidget(m_diskCapacity); infoLayout->setSpacing(0); - infoLayout->setContentsMargins(3, 4, 0, 8); + infoLayout->setContentsMargins(3, 6, 0, 8); QHBoxLayout *unmountLayout = new QHBoxLayout; unmountLayout->addLayout(infoLayout); @@ -72,7 +75,7 @@ void DiskControlItem::updateInfo(const DiskInfo &info) { m_info = info; - m_diskIcon->setPixmap(QIcon::fromTheme(info.m_icon, m_unknowIcon).pixmap(32, 32)); + m_diskIcon->setPixmap(QIcon::fromTheme(info.m_icon, m_unknowIcon).pixmap(48, 48)); if (!info.m_name.isEmpty()) m_diskName->setText(info.m_name); else diff --git a/plugins/disk-mount/diskpluginitem.cpp b/plugins/disk-mount/diskpluginitem.cpp index f4daad5fc..875d425c9 100644 --- a/plugins/disk-mount/diskpluginitem.cpp +++ b/plugins/disk-mount/diskpluginitem.cpp @@ -34,7 +34,7 @@ void DiskPluginItem::resizeEvent(QResizeEvent *e) QSize DiskPluginItem::sizeHint() const { - return QSize(20, 20); + return QSize(26, 26); } void DiskPluginItem::updateIcon() diff --git a/plugins/network/item/applet/devicecontrolwidget.cpp b/plugins/network/item/applet/devicecontrolwidget.cpp index eea2f6f5e..eb3c967a6 100644 --- a/plugins/network/item/applet/devicecontrolwidget.cpp +++ b/plugins/network/item/applet/devicecontrolwidget.cpp @@ -23,6 +23,7 @@ DeviceControlWidget::DeviceControlWidget(QWidget *parent) m_seperator = new HorizontalSeperator; m_seperator->setFixedHeight(1); + m_seperator->setColor(0.1); QVBoxLayout *centeralLayout = new QVBoxLayout; centeralLayout->addStretch(); diff --git a/plugins/network/item/applet/horizontalseperator.cpp b/plugins/network/item/applet/horizontalseperator.cpp index cc3415e24..59990a5a9 100644 --- a/plugins/network/item/applet/horizontalseperator.cpp +++ b/plugins/network/item/applet/horizontalseperator.cpp @@ -3,15 +3,21 @@ #include HorizontalSeperator::HorizontalSeperator(QWidget *parent) - : QWidget(parent) + : QWidget(parent), + m_color(255, 255, 255, 255 * 0.1) { setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); } +void HorizontalSeperator::setColor(const QColor color) +{ + m_color = color; +} + void HorizontalSeperator::paintEvent(QPaintEvent *e) { QWidget::paintEvent(e); QPainter painter(this); - painter.fillRect(rect(), QColor(255, 255, 255, 255 * 0.1)); + painter.fillRect(rect(), m_color); } diff --git a/plugins/network/item/applet/horizontalseperator.h b/plugins/network/item/applet/horizontalseperator.h index 1c176c829..b255bb870 100644 --- a/plugins/network/item/applet/horizontalseperator.h +++ b/plugins/network/item/applet/horizontalseperator.h @@ -10,8 +10,13 @@ class HorizontalSeperator : public QWidget public: explicit HorizontalSeperator(QWidget *parent = 0); + void setColor(const QColor color); + protected: void paintEvent(QPaintEvent *e); + +private: + QColor m_color; }; #endif // HORIZONTALSEPERATOR_H diff --git a/plugins/network/item/deviceitem.cpp b/plugins/network/item/deviceitem.cpp index 5ffbab427..ee67d62af 100644 --- a/plugins/network/item/deviceitem.cpp +++ b/plugins/network/item/deviceitem.cpp @@ -11,7 +11,7 @@ DeviceItem::DeviceItem(const QUuid &deviceUuid) QSize DeviceItem::sizeHint() const { - return QSize(20, 20); + return QSize(26, 26); } const QUuid DeviceItem::uuid() const diff --git a/plugins/network/item/wirelessitem.cpp b/plugins/network/item/wirelessitem.cpp index 2e4e8a81e..3cf03c98a 100644 --- a/plugins/network/item/wirelessitem.cpp +++ b/plugins/network/item/wirelessitem.cpp @@ -32,7 +32,7 @@ void WirelessItem::paintEvent(QPaintEvent *e) const Dock::DisplayMode displayMode = qApp->property(PROP_DISPLAY_MODE).value(); - const int iconSize = std::min(width(), height()) * 0.8; + const int iconSize = displayMode == Dock::Fashion ? std::min(width(), height()) * 0.8 : 16; const QPixmap pixmap = iconPix(displayMode, iconSize); QPainter painter(this); diff --git a/plugins/shutdown/pluginwidget.cpp b/plugins/shutdown/pluginwidget.cpp index faf61256c..ecfaafc50 100644 --- a/plugins/shutdown/pluginwidget.cpp +++ b/plugins/shutdown/pluginwidget.cpp @@ -15,7 +15,7 @@ PluginWidget::PluginWidget(QWidget *parent) QSize PluginWidget::sizeHint() const { - return QSize(20, 20); + return QSize(26, 26); } void PluginWidget::paintEvent(QPaintEvent *e) @@ -29,7 +29,7 @@ void PluginWidget::paintEvent(QPaintEvent *e) if (displayMode == Dock::Efficient) { - pixmap = loadSvg(":/icons/resources/icons/normal.svg", QSize(18, 18)); + pixmap = loadSvg(":/icons/resources/icons/normal.svg", QSize(16, 16)); break; } diff --git a/plugins/shutdown/powerstatuswidget.cpp b/plugins/shutdown/powerstatuswidget.cpp index 0a69bd59c..89923d8dc 100644 --- a/plugins/shutdown/powerstatuswidget.cpp +++ b/plugins/shutdown/powerstatuswidget.cpp @@ -13,7 +13,7 @@ PowerStatusWidget::PowerStatusWidget(QWidget *parent) QSize PowerStatusWidget::sizeHint() const { - return QSize(20, 20); + return QSize(26, 26); } void PowerStatusWidget::paintEvent(QPaintEvent *e) diff --git a/plugins/sound/componments/horizontalseparator.cpp b/plugins/sound/componments/horizontalseparator.cpp index 79bbd0b9b..643cd80f4 100644 --- a/plugins/sound/componments/horizontalseparator.cpp +++ b/plugins/sound/componments/horizontalseparator.cpp @@ -14,5 +14,5 @@ void HorizontalSeparator::paintEvent(QPaintEvent *e) QWidget::paintEvent(e); QPainter painter(this); - painter.fillRect(rect(), QColor(255, 255, 255, 255 * 0.5)); + painter.fillRect(rect(), QColor(255, 255, 255, 255 * 0.1)); } diff --git a/plugins/sound/sinkinputwidget.cpp b/plugins/sound/sinkinputwidget.cpp index 7de0ec1a8..d3bf2e311 100644 --- a/plugins/sound/sinkinputwidget.cpp +++ b/plugins/sound/sinkinputwidget.cpp @@ -18,6 +18,7 @@ SinkInputWidget::SinkInputWidget(const QString &inputPath, QWidget *parent) QHBoxLayout *centeralLayout = new QHBoxLayout; centeralLayout->addWidget(m_volumeIcon); + centeralLayout->addSpacing(10); centeralLayout->addWidget(m_volumeSlider); centeralLayout->setSpacing(2); centeralLayout->setMargin(0); diff --git a/plugins/sound/soundapplet.cpp b/plugins/sound/soundapplet.cpp index f50ab06dd..f4c78977a 100644 --- a/plugins/sound/soundapplet.cpp +++ b/plugins/sound/soundapplet.cpp @@ -30,6 +30,7 @@ SoundApplet::SoundApplet(QWidget *parent) QHBoxLayout *deviceLineLayout = new QHBoxLayout; deviceLineLayout->addWidget(deviceLabel); +// deviceLineLayout->addSpacing(12); deviceLineLayout->addWidget(new HorizontalSeparator); deviceLineLayout->setMargin(0); deviceLineLayout->setSpacing(10); @@ -37,6 +38,7 @@ SoundApplet::SoundApplet(QWidget *parent) QHBoxLayout *volumeCtrlLayout = new QHBoxLayout; volumeCtrlLayout->addSpacing(2); volumeCtrlLayout->addWidget(m_volumeBtn); + volumeCtrlLayout->addSpacing(10); volumeCtrlLayout->addWidget(m_volumeSlider); volumeCtrlLayout->setSpacing(0); volumeCtrlLayout->setMargin(0); @@ -59,8 +61,11 @@ SoundApplet::SoundApplet(QWidget *parent) m_centeralLayout = new QVBoxLayout; m_centeralLayout->addLayout(deviceLineLayout); + m_centeralLayout->addSpacing(8); m_centeralLayout->addLayout(volumeCtrlLayout); + m_centeralLayout->addSpacing(10); m_centeralLayout->addWidget(m_applicationTitle); + m_centeralLayout->addSpacing(8); m_centeralWidget->setLayout(m_centeralLayout); m_centeralWidget->setFixedWidth(WIDTH); @@ -124,7 +129,7 @@ void SoundApplet::volumeSliderValueChanged() void SoundApplet::sinkInputsChanged() { QVBoxLayout *appLayout = m_centeralLayout; - while (QLayoutItem *item = appLayout->takeAt(3)) + while (QLayoutItem *item = appLayout->takeAt(6)) { delete item->widget(); delete item; diff --git a/plugins/sound/sounditem.cpp b/plugins/sound/sounditem.cpp index 2a0b1808a..fc9c291be 100644 --- a/plugins/sound/sounditem.cpp +++ b/plugins/sound/sounditem.cpp @@ -24,7 +24,7 @@ QWidget *SoundItem::popupApplet() QSize SoundItem::sizeHint() const { - return QSize(20, 20); + return QSize(26, 26); } void SoundItem::resizeEvent(QResizeEvent *e) @@ -75,7 +75,7 @@ void SoundItem::refershIcon() iconString = QString("audio-volume-%1-symbolic").arg(volumeString); } - const int iconSize = std::min(width(), height()) * 0.8; + const int iconSize = displayMode == Dock::Fashion ? std::min(width(), height()) * 0.8 : 16; const QIcon icon = QIcon::fromTheme(iconString); m_iconPixmap = icon.pixmap(iconSize, iconSize); diff --git a/plugins/system-tray/traywidget.cpp b/plugins/system-tray/traywidget.cpp index 4336f47aa..f89a96825 100644 --- a/plugins/system-tray/traywidget.cpp +++ b/plugins/system-tray/traywidget.cpp @@ -44,7 +44,7 @@ const QImage TrayWidget::trayImage() const QSize TrayWidget::sizeHint() const { - return QSize(20, 20); + return QSize(26, 26); } void TrayWidget::paintEvent(QPaintEvent *e) diff --git a/plugins/trash/trashwidget.cpp b/plugins/trash/trashwidget.cpp index 0b3a8527c..bf5c518eb 100644 --- a/plugins/trash/trashwidget.cpp +++ b/plugins/trash/trashwidget.cpp @@ -29,7 +29,7 @@ QWidget *TrashWidget::popupApplet() QSize TrashWidget::sizeHint() const { - return QSize(20, 20); + return QSize(26, 26); } void TrashWidget::dragEnterEvent(QDragEnterEvent *e) @@ -64,13 +64,15 @@ void TrashWidget::resizeEvent(QResizeEvent *e) void TrashWidget::updateIcon() { + const Dock::DisplayMode displayMode = qApp->property(PROP_DISPLAY_MODE).value(); + QString iconString = "user-trash"; if (!m_popupApplet->empty()) iconString.append("-full"); - if (qApp->property(PROP_DISPLAY_MODE).value() == Dock::Efficient) + if (displayMode == Dock::Efficient) iconString.append("-symbolic"); - const int size = std::min(width(), height()) * 0.8; + const int size = displayMode == Dock::Fashion ? std::min(width(), height()) * 0.8 : 16; QIcon icon = QIcon::fromTheme(iconString); m_icon = icon.pixmap(size, size);