From 1dceb4e28073a4ebd85831f6ff01392662d1f4f1 Mon Sep 17 00:00:00 2001
From: feiyangqingyun <feiyangqingyun@163.com>
Date: Wed, 20 May 2020 10:15:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=81=E5=B9=B3=E5=8C=96?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flatui/flatui.cpp     | 20 --------------------
 flatui/flatui.h       |  7 -------
 flatui/frmflatui.cpp  | 38 +++++++++++++++++++-------------------
 flatui/frmflatui.ui   |  4 ++--
 styledemo/frmmain.cpp |  2 --
 5 files changed, 21 insertions(+), 50 deletions(-)

diff --git a/flatui/flatui.cpp b/flatui/flatui.cpp
index fefdd9c..e01d42c 100644
--- a/flatui/flatui.cpp
+++ b/flatui/flatui.cpp
@@ -1,7 +1,6 @@
 #pragma execution_character_set("utf-8")
 
 #include "flatui.h"
-#include "qmutex.h"
 #include "qpushbutton.h"
 #include "qlineedit.h"
 #include "qprogressbar.h"
@@ -11,25 +10,6 @@
 #include "qscrollbar.h"
 #include "qdebug.h"
 
-QScopedPointer<FlatUI> FlatUI::self;
-FlatUI *FlatUI::Instance()
-{
-    if (self.isNull()) {
-        static QMutex mutex;
-        QMutexLocker locker(&mutex);
-        if (self.isNull()) {
-            self.reset(new FlatUI);
-        }
-    }
-
-    return self.data();
-}
-
-FlatUI::FlatUI(QObject *parent) : QObject(parent)
-{
-
-}
-
 QString FlatUI::setPushButtonQss(QPushButton *btn, int radius, int padding,
                                     const QString &normalColor,
                                     const QString &normalTextColor,
diff --git a/flatui/flatui.h b/flatui/flatui.h
index 05b5790..8d1fdd8 100644
--- a/flatui/flatui.h
+++ b/flatui/flatui.h
@@ -37,13 +37,6 @@ class FlatUI : public QObject
 
 {
     Q_OBJECT
-public:
-    static FlatUI *Instance();
-    explicit FlatUI(QObject *parent = 0);    
-
-private:
-    static QScopedPointer<FlatUI> self;
-
 public:
     //设置按钮样式
     static QString setPushButtonQss(QPushButton *btn,                               //按钮对象
diff --git a/flatui/frmflatui.cpp b/flatui/frmflatui.cpp
index 2b5d8ee..3e4f82d 100644
--- a/flatui/frmflatui.cpp
+++ b/flatui/frmflatui.cpp
@@ -32,30 +32,30 @@ void frmFlatUI::initForm()
 
     this->setStyleSheet("*{outline:0px;}QWidget#frmFlatUI{background:#FFFFFF;}");
 
-    FlatUI::Instance()->setPushButtonQss(ui->btn1);
-    FlatUI::Instance()->setPushButtonQss(ui->btn2, 5, 8, "#1ABC9C", "#E6F8F5", "#2EE1C1", "#FFFFFF", "#16A086", "#A7EEE6");
-    FlatUI::Instance()->setPushButtonQss(ui->btn3, 5, 8, "#3498DB", "#FFFFFF", "#5DACE4", "#E5FEFF", "#2483C7", "#A0DAFB");
-    FlatUI::Instance()->setPushButtonQss(ui->btn4, 5, 8, "#E74C3C", "#FFFFFF", "#EC7064", "#FFF5E7", "#DC2D1A", "#F5A996");
+    FlatUI::setPushButtonQss(ui->btn1);
+    FlatUI::setPushButtonQss(ui->btn2, 5, 8, "#1ABC9C", "#E6F8F5", "#2EE1C1", "#FFFFFF", "#16A086", "#A7EEE6");
+    FlatUI::setPushButtonQss(ui->btn3, 5, 8, "#3498DB", "#FFFFFF", "#5DACE4", "#E5FEFF", "#2483C7", "#A0DAFB");
+    FlatUI::setPushButtonQss(ui->btn4, 5, 8, "#E74C3C", "#FFFFFF", "#EC7064", "#FFF5E7", "#DC2D1A", "#F5A996");
 
-    FlatUI::Instance()->setLineEditQss(ui->txt1);
-    FlatUI::Instance()->setLineEditQss(ui->txt2, 5, 2, "#DCE4EC", "#1ABC9C");
-    FlatUI::Instance()->setLineEditQss(ui->txt3, 3, 1, "#DCE4EC", "#3498DB");
-    FlatUI::Instance()->setLineEditQss(ui->txt4, 3, 1, "#DCE4EC", "#E74C3C");
+    FlatUI::setLineEditQss(ui->txt1);
+    FlatUI::setLineEditQss(ui->txt2, 5, 2, "#DCE4EC", "#1ABC9C");
+    FlatUI::setLineEditQss(ui->txt3, 3, 1, "#DCE4EC", "#3498DB");
+    FlatUI::setLineEditQss(ui->txt4, 3, 1, "#DCE4EC", "#E74C3C");
 
-    FlatUI::Instance()->setProgressQss(ui->bar1);
-    FlatUI::Instance()->setProgressQss(ui->bar2, 8, 5, 9, "#E8EDF2", "#1ABC9C");
+    FlatUI::setProgressQss(ui->bar1);
+    FlatUI::setProgressQss(ui->bar2, 8, 5, 9, "#E8EDF2", "#1ABC9C");
 
-    FlatUI::Instance()->setSliderQss(ui->slider1);
-    FlatUI::Instance()->setSliderQss(ui->slider2, 10, "#E8EDF2", "#E74C3C", "#E74C3C");
-    FlatUI::Instance()->setSliderQss(ui->slider3, 10, "#E8EDF2", "#34495E", "#34495E");
+    FlatUI::setSliderQss(ui->slider1);
+    FlatUI::setSliderQss(ui->slider2, 10, "#E8EDF2", "#E74C3C", "#E74C3C");
+    FlatUI::setSliderQss(ui->slider3, 10, "#E8EDF2", "#34495E", "#34495E");
 
-    FlatUI::Instance()->setRadioButtonQss(ui->rbtn1);
-    FlatUI::Instance()->setRadioButtonQss(ui->rbtn2, 8, "#D7DBDE", "#1ABC9C");
-    FlatUI::Instance()->setRadioButtonQss(ui->rbtn3, 8, "#D7DBDE", "#3498DB");
-    FlatUI::Instance()->setRadioButtonQss(ui->rbtn4, 8, "#D7DBDE", "#E74C3C");
+    FlatUI::setRadioButtonQss(ui->rbtn1);
+    FlatUI::setRadioButtonQss(ui->rbtn2, 8, "#D7DBDE", "#1ABC9C");
+    FlatUI::setRadioButtonQss(ui->rbtn3, 8, "#D7DBDE", "#3498DB");
+    FlatUI::setRadioButtonQss(ui->rbtn4, 8, "#D7DBDE", "#E74C3C");
 
-    FlatUI::Instance()->setScrollBarQss(ui->horizontalScrollBar);
-    FlatUI::Instance()->setScrollBarQss(ui->verticalScrollBar, 8, 120, 20, "#606060", "#34495E", "#1ABC9C", "#E74C3C");
+    FlatUI::setScrollBarQss(ui->horizontalScrollBar);
+    FlatUI::setScrollBarQss(ui->verticalScrollBar, 8, 120, 20, "#606060", "#34495E", "#1ABC9C", "#E74C3C");
 
     //设置列数和列宽
     int width = qApp->desktop()->availableGeometry().width() - 120;
diff --git a/flatui/frmflatui.ui b/flatui/frmflatui.ui
index 5034bea..c95b752 100644
--- a/flatui/frmflatui.ui
+++ b/flatui/frmflatui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>600</width>
-    <height>450</height>
+    <width>800</width>
+    <height>600</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/styledemo/frmmain.cpp b/styledemo/frmmain.cpp
index ea23a57..8f76cd2 100644
--- a/styledemo/frmmain.cpp
+++ b/styledemo/frmmain.cpp
@@ -182,8 +182,6 @@ void frmMain::initStyle()
         qApp->setStyleSheet(qss);
         file.close();
     }
-
-
 }
 
 void frmMain::initTranslator()