feat: module use resources

Change-Id: I901b9d81c97430e3511cea288d8dfe389e3cdea4
linuxdeepin · Feb 27, 2018 · 424710e · 424710e
1 parent 9c772a9
commit 424710e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/src/mainwindow.cc b/src/mainwindow.cc
@@ -149,6 +149,8 @@ BaseModuleWidget *MainWindow::initVideoWidgt()
 BaseModuleWidget *MainWindow::initDesktopModeModule()
 {
     BaseModuleWidget* w = new BaseModuleWidget(new DesktopModeModule, m_fakerWidget);
+    w->setTitle(tr("Please select desktop mode"));
+    w->setDescribe(tr("You can switch it in Mode by right clicking on dock"));
     return w;
 }
 
@@ -161,5 +163,7 @@ BaseModuleWidget *MainWindow::initWMModeModule()
 BaseModuleWidget *MainWindow::initIconModule()
 {
     BaseModuleWidget* w = new BaseModuleWidget(new IconModule, m_fakerWidget);
+    w->setTitle(tr("Please select icon theme"));
+    w->setDescribe(tr("You can change it in Control Center > Personalization > Theme > Icon Theme"));
     return w;
 }
diff --git a/src/modules/desktopmodemodule.cc b/src/modules/desktopmodemodule.cc
@@ -29,6 +29,9 @@ DesktopModeModule::DesktopModeModule(QWidget *parent)
     m_efficientWidget->setTitle(tr("Efficient Mode"));
     m_fashionWidget->setTitle(tr("Fashion Mode"));
 
+    m_efficientWidget->setPixmap(":/resources/effective_mode_big.png");
+    m_fashionWidget->setPixmap(":/resources/fashion_mode_big.png");
+
     connect(m_model, &Model::desktopModeChanged, this, &DesktopModeModule::onDesktopTypeChanged);
     connect(m_fashionWidget, &BaseWidget::clicked, this, [=] {
         m_worker->setDesktopMode(Model::FashionMode);

diff --git a/src/modules/iconmodule.cc b/src/modules/iconmodule.cc
@@ -35,7 +35,7 @@ IconModule::IconModule(QWidget *parent)
     currentIconChanged(m_model->currentIcon());
 
     m_layout->setSpacing(20);
-    m_layout->setContentsMargins(20, 0, 10, 0);
+    m_layout->setContentsMargins(15, 0, 10, 0);
 
     QWidget *content = new QWidget;
     content->setLayout(m_layout);
@@ -49,7 +49,7 @@ IconModule::IconModule(QWidget *parent)
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setStyleSheet("background-color:transparent;");
 
-    setFixedSize(700, 350);
+    setFixedSize(750, 300);
 }
 
 void IconModule::addIcon(const IconStruct &icon)

diff --git a/src/modules/wmmodemodule.cc b/src/modules/wmmodemodule.cc
@@ -29,6 +29,9 @@ WMModeModule::WMModeModule(QWidget *parent)
     m_efficientWidget->setTitle(tr("Efficient Mode"));
     m_fashionWidget->setTitle(tr("Fashion Mode"));
 
+    m_efficientWidget->setPixmap(":/resources/3d_big.png");
+    m_fashionWidget->setPixmap(":/resources/2d_big.png");
+
     connect(m_model, &Model::wmTypeChanged, this, &WMModeModule::onWMModeChanged);
     connect(m_fashionWidget, &BaseWidget::clicked, this, [=] {
         m_worker->setWMMode(Model::WM_2D);

diff --git a/src/widgets/basewidget.cc b/src/widgets/basewidget.cc
@@ -17,6 +17,9 @@
  */
 
 #include "basewidget.h"
+#include <DHiDPIHelper>
+
+DWIDGET_USE_NAMESPACE
 
 BaseWidget::BaseWidget(QWidget *parent)
     : QFrame(parent)
@@ -35,9 +38,13 @@ BaseWidget::BaseWidget(QWidget *parent)
     setLayout(m_layout);
 }
 
+void BaseWidget::setPixmap(const QString &url) {
+    setPixmap(QPixmap(DHiDPIHelper::loadNxPixmap(url)));
+}
+
 void BaseWidget::setPixmap(const QPixmap &pixmap)
 {
-    m_borderWidget->setFixedSize(pixmap.size());
+    m_borderWidget->setFixedSize(pixmap.size() + QSize(5, 5));
     m_borderWidget->setPixmap(pixmap);
 
     adjustSize();

diff --git a/src/widgets/basewidget.h b/src/widgets/basewidget.h
@@ -37,6 +37,7 @@ class BaseWidget : public QFrame
     void clicked();
 
 public Q_SLOTS:
+    void setPixmap(const QString &url);
     void setPixmap(const QPixmap &pixmap);
     void setTitle(const QString &title);
     void setChecked(const bool checked);