From 17dc1f5d42b47362c31a0ee2c6fde5869d48488b Mon Sep 17 00:00:00 2001
From: xmuli <xmulitech@gmail.com>
Date: Sat, 28 Mar 2020 17:33:20 +0800
Subject: [PATCH] feat: The custom control MySwitchButton has been implemented

---
 QtCustomStyleEx/ExMyGlobal.h                  |  35 ----
 QtCustomStyleEx/ExMyStyle.cpp                 | 158 ------------------
 QtCustomStyleEx/ExMyStyle.h                   | 153 -----------------
 QtCustomStyleEx/Example.cpp                   |  92 ----------
 QtCustomStyleEx/Example.h                     |  40 -----
 QtCustomStyleEx/MyWidget/ExSwitchButton.cpp   | 105 ------------
 QtCustomStyleEx/MyWidget/ExSwitchButton.h     |  56 -------
 QtCustomStyleEx/MyWidget/ExSwitchButton_p.h   |  59 -------
 QtCustomStyleEx/QtCustomStyleEx.pro           |  45 -----
 QtCustomStyleEx/images/icon.icns              | Bin 11126 -> 0 bytes
 QtCustomStyleEx/images/icon.ico               | Bin 4286 -> 0 bytes
 QtCustomStyleEx/main.cpp                      |  44 -----
 QtMyStyleEx/Example.cpp                       |  11 --
 QtMyStyleEx/Example.h                         |  14 --
 QtMyStyleEx/QtExample03/QtStyleEx/mystyle.cpp |  20 ---
 QtMyStyleEx/QtExample03/QtStyleEx/mystyle.h   |  16 +-
 .../QtExample03/QtStyleEx/myswitchbutton.cpp  |   2 +-
 QtMyStyleEx/QtMyStyleEx.pro                   |  28 ----
 QtMyStyleEx/main.cpp                          |  11 --
 19 files changed, 5 insertions(+), 884 deletions(-)
 delete mode 100644 QtCustomStyleEx/ExMyGlobal.h
 delete mode 100644 QtCustomStyleEx/ExMyStyle.cpp
 delete mode 100644 QtCustomStyleEx/ExMyStyle.h
 delete mode 100644 QtCustomStyleEx/Example.cpp
 delete mode 100644 QtCustomStyleEx/Example.h
 delete mode 100644 QtCustomStyleEx/MyWidget/ExSwitchButton.cpp
 delete mode 100644 QtCustomStyleEx/MyWidget/ExSwitchButton.h
 delete mode 100644 QtCustomStyleEx/MyWidget/ExSwitchButton_p.h
 delete mode 100644 QtCustomStyleEx/QtCustomStyleEx.pro
 delete mode 100644 QtCustomStyleEx/images/icon.icns
 delete mode 100644 QtCustomStyleEx/images/icon.ico
 delete mode 100644 QtCustomStyleEx/main.cpp
 delete mode 100644 QtMyStyleEx/Example.cpp
 delete mode 100644 QtMyStyleEx/Example.h
 delete mode 100644 QtMyStyleEx/QtMyStyleEx.pro
 delete mode 100644 QtMyStyleEx/main.cpp

diff --git a/QtCustomStyleEx/ExMyGlobal.h b/QtCustomStyleEx/ExMyGlobal.h
deleted file mode 100644
index fe69a87..0000000
--- a/QtCustomStyleEx/ExMyGlobal.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C)  2019 ~ 2019 touwoyimuli.  All rights reserved.
- *
- * Author:  touwoyimuli <touwoyimuli@gmai.com>
- *
- * github:  https://github.com/touwoyimuli
- * blogs:   https://touwoyimuli.github.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://touwoyimuli.github.io/>.
- */
-#ifndef EXMYGLOBAL_H
-#define EXMYGLOBAL_H
-
-//定义命名空间宏
-#define EXWIDGET_BEGIN_NAMESPACE namespace ExPlumStyle {
-#define EXWIDGET_END_NAMESPACE }
-
-#define EXWIDGET_USE_NAMESPACE using namespace ExPlumStyle;
-
-//ExPlumStyle命名空间里面嵌套的的子命名空间
-#define EXDRAWUTILS_BEGIN_NAMESPACE namespace ExDrawUtils {
-#define EXDRAWUTILS_END_NAMESPACE }
-
-#endif // EXMYGLOBAL_H
diff --git a/QtCustomStyleEx/ExMyStyle.cpp b/QtCustomStyleEx/ExMyStyle.cpp
deleted file mode 100644
index 8b2f911..0000000
--- a/QtCustomStyleEx/ExMyStyle.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (C)  2019 ~ 2019 touwoyimuli.  All rights reserved.
- *
- * Author:  touwoyimuli <touwoyimuli@gmai.com>
- *
- * github:  https://github.com/touwoyimuli
- * blogs:   https://touwoyimuli.github.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://touwoyimuli.github.io/>.
- */
-#include "ExMyStyle.h"
-
-#include <QProxyStyle>
-#include <QDebug>
-#include <QPainter>
-#include <QStyleOption>
-#include <QLinearGradient>
-
-EXWIDGET_BEGIN_NAMESPACE
-ExMyStyle::ExMyStyle()
-{
-
-}
-
-void ExMyStyle::drawPrimitive(QStyle::PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const
-{
-
-}
-
-
-
-void ExMyStyle::polish(QWidget *widget)
-{
-    QCommonStyle::polish(widget);
-}
-
-void ExMyStyle::unpolish(QWidget *widget)
-{
-    QCommonStyle::unpolish(widget);
-}
-
-void ExMyStyle::drawControl(QStyle::ControlElement element, const QStyleOption *opt, QPainter *p, const QWidget *w) const
-{
-    p->setRenderHint(QPainter::Antialiasing);
-
-    switch (element) {
-    case CE_ScrollBarAddPage: {  //增加页(在滑槽)
-        p->fillRect(opt->rect, QColor("#bfe9ff"));
-        return;
-    }
-    case CE_ScrollBarSubPage: {  //减少页(在滑槽)
-        p->fillRect(opt->rect, QColor("#EC6EAD"));
-        return;
-    }
-    case CE_ScrollBarSlider: {  //滑块
-        p->fillRect(opt->rect, QColor("#A8BFFF"));
-        return;
-    }
-    case CE_ScrollBarAddLine: {  //增加按钮
-        p->fillRect(opt->rect, QColor("#21d4fd"));
-        return;
-    }
-    case CE_ScrollBarSubLine: {  //减少按钮
-        p->fillRect(opt->rect, QColor("#de6161"));
-        return;
-    }
-    default:
-        break;
-    }
-
-    QCommonStyle::drawControl(element, opt, p, w);
-}
-
-void ExMyStyle::drawComplexControl(QStyle::ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget) const
-{
-    switch (cc) {
-//    case CC_:
-//        break;
-    default:
-        break;
-    }
-
-    QCommonStyle::drawComplexControl(cc, opt, p, widget);
-}
-
-QSize ExMyStyle::sizeFromContents(QStyle::ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const
-{
-    QSize size = QCommonStyle::sizeFromContents(ct, opt, contentsSize, w);
-
-    switch (ct) {
-    case CT_ScrollBar: {
-        int widget = size.width();
-        int height = size.height();
-
-        if (widget < height)
-            size.setHeight(height * 1.2);
-
-        if (widget > height)
-            size.setWidth(widget * 1.2);
-
-        qDebug()<<"----01----:"<<size;
-        return size;
-    }
-    default:
-        break;
-    }
-
-    return size;
-}
-
-QRect ExMyStyle::subElementRect(QStyle::SubElement subElement, const QStyleOption *option, const QWidget *widget) const
-{
-    switch (subElement) {
-//    case SE_:
-//        break;
-    default:
-        break;
-    }
-
-    return QCommonStyle::subElementRect(subElement, option, widget);
-}
-
-int ExMyStyle::pixelMetric(QStyle::PixelMetric metric, const QStyleOption *option, const QWidget *widget) const
-{
-    switch (metric) {
-//    case PM_:
-//        return 36;
-    default:
-        break;
-    }
-
-    return QCommonStyle::pixelMetric(metric, option, widget);
-}
-
-int ExMyStyle::styleHint(QStyle::StyleHint stylehint, const QStyleOption *opt, const QWidget *widget, QStyleHintReturn *returnData) const
-{
-    switch (stylehint) {
-//    case SH_:
-//        break;
-    default:
-        break;
-    }
-
-    return QCommonStyle::styleHint(stylehint, opt, widget, returnData);
-}
-
-EXWIDGET_END_NAMESPACE
diff --git a/QtCustomStyleEx/ExMyStyle.h b/QtCustomStyleEx/ExMyStyle.h
deleted file mode 100644
index edca7c0..0000000
--- a/QtCustomStyleEx/ExMyStyle.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C)  2019 ~ 2019 touwoyimuli.  All rights reserved.
- *
- * Author:  touwoyimuli <touwoyimuli@gmai.com>
- *
- * github:  https://github.com/touwoyimuli
- * blogs:   https://touwoyimuli.github.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://touwoyimuli.github.io/>.
- */
-#ifndef EXMYSTYLE_H
-#define EXMYSTYLE_H
-
-#include "ExMyGlobal.h"
-
-#include "qglobal.h"
-#include <QCommonStyle>
-
-QT_BEGIN_NAMESPACE
-//class QCommonStyle;
-QT_END_NAMESPACE
-
-EXWIDGET_BEGIN_NAMESPACE
-class ExMyStyle : public QCommonStyle
-{
-//    Q_OBJECT
-
-public:
-    ExMyStyle();
-
-//    enum ControlElement {
-//        CE_SwitchButton = QStyle::CE_CustomBase + 1,
-//        CE_CustomBase = QStyle::CE_CustomBase + 0xf00000
-//    };
-
-public:
-//    enum PrimitiveElement {
-//        PE_ItemBackground = QStyle::PE_CustomBase + 1,          //列表项的背景色
-//        PE_SwitchButtonGroove,
-//        PE_SwitchButtonHandle,
-//        PE_CustomBase = QStyle::PE_CustomBase + 0xf00000
-//    };
-
-//    enum ControlElement {
-//        CE_IconButton = QStyle::CE_CustomBase + 1,
-//        CE_SwitchButton,
-//        CE_CustomBase = QStyle::CE_CustomBase + 0xf00000
-//    };
-
-//    enum SubElement {
-//        SE_IconButtonIcon = QStyle::SE_CustomBase + 1,
-//        SE_SwitchButtonGroove,
-//        SE_SwitchButtonHandle,
-//        SE_CustomBase = QStyle::SE_CustomBase + 0xf00000
-//    };
-
-//    enum PixelMetric {
-//        PM_FocusBorderWidth = QStyle::PM_CustomBase + 1,        //控件焦点状态的边框宽度
-//        PM_FrameRadius,
-//        PM_CustomBase = QStyle::PM_CustomBase + 0xf00000
-//    };
-
-//    enum ContentsType {
-//        CT_IconButton = QStyle::CT_CustomBase + 1,
-//        CT_SwitchButton,
-//        CT_CustomBase = QStyle::CT_CustomBase + 0xf00000
-//    };
-
-//    enum StyleHint {
-//        SH_CustomBase = QStyle::SH_CustomBase + 0xf00000
-//    };
-
-//    enum StandardPixmap {
-//        SP_CustomBase = QStyle::SP_CustomBase + 0xf00000
-//    };
-
-//    /*枚举通过按位 ~ ^ | !来计算得到需要组合
-//     * //0b对应的二进制        0x十六进制    对应的十进制
-//     *   0b0000 0001       0x0000 0001       1
-//     *   0b0000 0010       0x0000 0002       2
-//     *   0b0000 0100       0x0000 0004       4
-//     *   0b0000 1000       0x0000 0006       8
-//     *   0b0001 0000       0x0000 0010      16
-//    */
-
-//    enum StyleState {
-//        SS_NormalState = 0x00000000,
-//        SS_HoverState  = 0x00000001,
-//        SS_PressState  = 0x00000002,
-//    };
-//    Q_DECLARE_FLAGS(StateFlags, StyleState)  //而类型定义(typedef)和操作符重载正是宏Q_DECLARE_FLAGS 和 Q_DECLARE_OPERATORS_FOR_FLAGS  (均无关于元对象系统)
-
-    //静态static函数
-//    static void drawPrimitive(const QStyle *style, ExCustomStyle::PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w);
-//    static void drawControl(const QStyle *style, ExCustomStyle::ControlElement element, const QStyleOption *opt, QPainter *p, const QWidget *w);
-//    static int pixelMetric(const QStyle *style, QStyle::PixelMetric metric, const QStyleOption *option, const QWidget *widget);
-//    static QRect subElementRect(const QStyle *style, ExCustomStyle::SubElement subElement, const QStyleOption *option, const QWidget *widget);
-//    static QSize sizeFromContents(const QStyle *style, ExCustomStyle::ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w);
-//    static QIcon standardIcon(const QStyle *style, ExCustomStyle::StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget);
-
-
-    //内联inline函数,然后[自动选择]是调用静态函数,还是重写的基类的函数
-    inline void drawPrimitive(ExMyStyle::PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const;
-//    inline void drawControl(ExCustomStyle::ControlElement element, const QStyleOption *opt, QPainter *p, const QWidget *w) const;
-//    inline QRect subElementRect(ExCustomStyle::SubElement subElement, const QStyleOption *option, const QWidget *widget) const;
-//    inline int pixelMetric(ExCustomStyle::PixelMetric metric, const QStyleOption *option, const QWidget *widget) const;
-//    inline QSize sizeFromContents(ExCustomStyle::ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const;
-//    inline int styleHint(ExCustomStyle::StyleHint stylehint, const QStyleOption *opt, const QWidget *widget, QStyleHintReturn *returnData) const;
-
-//    inline void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget) const;     //这三个不用写成内联函数,且会编译不通过
-//    inline QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const;
-//    inline QStyle::SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, const QPoint &pt, const QWidget *widget) const;
-//    virtual void polish(QPalette &palette) override;        //通常在此函数内指定配色方案，也即配置调色板
-//    virtual void polish(QWidget *widget) override;          //当样式应用到窗口部件时，polish(QWidget*)就会调用,从而允许我们进行最后的定制
-//    virtual void unpolish(QWidget *widget) override;        //当动态改变样式的时候，unpolish就会调用，来撤销polish的影响。polish(QWidget*)一般用做窗口部件的事件过滤器。
-
-    // QStyle interface    重写QCommonStyle重载的函数
-public:
-    virtual void polish(QWidget *widget) override;
-    virtual void unpolish(QWidget *widget) override;
-    virtual void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, const QWidget *w) const override;
-    virtual void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget) const override;
-    virtual QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const override;
-    virtual QRect subElementRect(SubElement subElement, const QStyleOption *option, const QWidget *widget) const override;
-    virtual int pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const override;
-    virtual int styleHint(StyleHint stylehint, const QStyleOption *opt, const QWidget *widget, QStyleHintReturn *returnData) const override;
-
-
-    //重实现,使得父类的多个同名 函数 (不同参数) 任然可以在本类里面使用
-    using QCommonStyle::drawPrimitive;
-    using QCommonStyle::drawControl;
-    using QCommonStyle::subElementRect;
-    using QCommonStyle::pixelMetric;
-    using QCommonStyle::sizeFromContents;
-    using QCommonStyle::styleHint;
-    using QCommonStyle::standardIcon;
-
-public:
-};
-EXWIDGET_END_NAMESPACE
-
-#endif // EXMYSTYLE_H
diff --git a/QtCustomStyleEx/Example.cpp b/QtCustomStyleEx/Example.cpp
deleted file mode 100644
index 08ffafd..0000000
--- a/QtCustomStyleEx/Example.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C)  2019 ~ 2019 touwoyimuli.  All rights reserved.
- *
- * Author:  touwoyimuli <touwoyimuli@gmai.com>
- *
- * github:  https://github.com/touwoyimuli
- * blogs:   https://touwoyimuli.github.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://touwoyimuli.github.io/>.
- */
-#include "Example.h"
-
-#include <QStyleFactory>
-#include <QDebug>
-#include <QTableWidget>
-#include <QProgressBar>
-#include <QPushButton>
-#include <QApplication>
-#include <QSlider>
-#include <QScrollBar>
-
-#include "MyWidget/ExSwitchButton.h"
-
-EXWIDGET_USE_NAMESPACE
-
-Example::Example(QWidget *parent)
-    : QWidget(parent)
-{
-
-}
-
-Example::~Example()
-{
-
-}
-
-void Example::init()
-{
-    QTableWidget *table = new QTableWidget(10, 10, this);
-    QScrollBar *scrollBarH = new QScrollBar(this);
-    QScrollBar *scrollBarV = new QScrollBar(this);
-
-    table->move(10, 10);
-
-    scrollBarH->move(300, 50);
-    scrollBarH->setRange(0, 100);
-    scrollBarH->setValue(34);
-    scrollBarH->resize(380, 20);
-    scrollBarH->setOrientation(Qt::Horizontal);
-
-    scrollBarV->move(50, 250);
-    scrollBarV->setRange(0, 100);
-    scrollBarV->setValue(67);
-    scrollBarV->resize(20, 380);
-    scrollBarV->setOrientation(Qt::Vertical);
-
-    int i = 0;
-    QStringList listStyle = QStyleFactory::keys();
-    foreach(QString val, listStyle) {   //打印当前系统支持的系统风格
-        QPushButton *btn = new QPushButton(val, this);
-        btn->move(this->rect().right() - 100, this->rect().top() + i++ * 40);
-        connect(btn, &QPushButton::clicked, this, [=](){
-            qApp->setStyle(val);
-        });
-    }
-
-    QPushButton *btn = new QPushButton("ExMyStyle", this);
-    btn->move(this->rect().right() - 100, this->rect().top() + i++ * 40);
-    connect(btn, &QPushButton::clicked, this, [=](){
-        qApp->setStyle(new ExMyStyle());
-    });
-
-    ExSwitchButton* switchBtn = new ExSwitchButton();
-    switchBtn->move(300, 300);
-//    switchBtn->move(700, 500);
-    switchBtn->resize(200, 200);
-    switchBtn->setText("switchBtn");
-    switchBtn->setParent(this);
-    switchBtn->show();
-    qDebug()<<"----03-----------------"<<switchBtn->rect();
-}
diff --git a/QtCustomStyleEx/Example.h b/QtCustomStyleEx/Example.h
deleted file mode 100644
index dc0e8c9..0000000
--- a/QtCustomStyleEx/Example.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C)  2019 ~ 2019 touwoyimuli.  All rights reserved.
- *
- * Author:  touwoyimuli <touwoyimuli@gmai.com>
- *
- * github:  https://github.com/touwoyimuli
- * blogs:   https://touwoyimuli.github.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://touwoyimuli.github.io/>.
- */
-#ifndef EXAMPLE_H
-#define EXAMPLE_H
-
-#include <QWidget>   //Qt的库
-
-#include "ExMyStyle.h"  //自己的库
-
-class Example : public QWidget
-{
-    Q_OBJECT
-
-public:
-    Example(QWidget *parent = 0);
-    ~Example();
-
-    void init();
-};
-
-#endif // EXAMPLE_H
diff --git a/QtCustomStyleEx/MyWidget/ExSwitchButton.cpp b/QtCustomStyleEx/MyWidget/ExSwitchButton.cpp
deleted file mode 100644
index 56f0b93..0000000
--- a/QtCustomStyleEx/MyWidget/ExSwitchButton.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C)  2019 ~ 2019 touwoyimuli.  All rights reserved.
- *
- * Author:  touwoyimuli <touwoyimuli@gmai.com>
- *
- * github:  https://github.com/touwoyimuli
- * blogs:   https://touwoyimuli.github.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://touwoyimuli.github.io/>.
- */
-#include "ExSwitchButton.h"
-#include "ExSwitchButton_p.h"
-#include <QDebug>
-#include <QPainter>
-#include "ExMyStyle.h"
-
-EXWIDGET_BEGIN_NAMESPACE
-
-//xxxPrivate class 会在 xxx.cpp 里面来实现
-/*!
- * \~chinese \brief ExSwitchButtonPrivate 的构造函数
- */
-ExSwitchButtonPrivate::ExSwitchButtonPrivate(/*ExSwitchButton *qq*/)
-{
-    init();
-}
-
-ExSwitchButtonPrivate::~ExSwitchButtonPrivate()
-{
-
-}
-
-void ExSwitchButtonPrivate::init()
-{
-    m_checked = false;      //xxxxPrivate 自带的变量
-    Q_Q(ExSwitchButton);    //Q_Q 可以在 xxxxPrivate 里面调用 xxxx 的方法和变量
-
-    q->setObjectName("ExSwitchButtonPrivate");
-    q->setCheckable(true);
-    q->connect(q, SIGNAL(toggled(bool)), q, SLOT(onChange(bool)));
-
-    q->onChange(true);
-}
-
-ExSwitchButton::ExSwitchButton()
-{
-    Q_D(ExSwitchButton);
-}
-
-ExSwitchButton::~ExSwitchButton()
-{
-
-}
-
-void ExSwitchButton::onChange(bool)
-{
-    Q_D(ExSwitchButton);
-
-   d->m_checked = (!d->m_checked);
-
-   qDebug()<<"------01-----ExSwitchButton::onChange(bool):"<<d->m_checked;
-}
-
-void ExSwitchButton::paintEvent(QPaintEvent *event)
-{
-    Q_UNUSED(event);
-
-    QPainter painter(this);
-    QStyleOptionButton opt;
-    initStyleOption(&opt);
-
-    ExMyStyle MyStyle;
-//    MyStyle.drawControl(ExMyStyle::CE_Sw);
-
-
-}
-
-void ExSwitchButton::initStyleOption(QStyleOptionButton *option) const
-{
-    if (!option)
-        return;
-
-    option->init(this);      //QStyleOption 对象进行初始化(其中属性很多,整体初始化，然后局部进行参数修改)
-    option->initFrom(this);
-
-    if (isChecked()) {
-        option->state |= QStyle::State_On;
-    } else {
-        option->state |= QStyle::State_Off;
-    }
-}
-
-
-EXWIDGET_END_NAMESPACE
diff --git a/QtCustomStyleEx/MyWidget/ExSwitchButton.h b/QtCustomStyleEx/MyWidget/ExSwitchButton.h
deleted file mode 100644
index 0da3126..0000000
--- a/QtCustomStyleEx/MyWidget/ExSwitchButton.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C)  2019 ~ 2019 touwoyimuli.  All rights reserved.
- *
- * Author:  touwoyimuli <touwoyimuli@gmai.com>
- *
- * github:  https://github.com/touwoyimuli
- * blogs:   https://touwoyimuli.github.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://touwoyimuli.github.io/>.
- */
-#ifndef EXSWITCHBUTTON_H
-#define EXSWITCHBUTTON_H
-
-#include "ExMyGlobal.h"
-#include <QtGlobal>
-
-#include <QAbstractButton>
-#include <QStyleOption>
-//#include <QStyleOptionButton>
-
-EXWIDGET_BEGIN_NAMESPACE
-
-class ExSwitchButtonPrivate;    //Q_DECLARE_PRIVATE() 宏展开使用的
-class ExSwitchButton : public QAbstractButton
-{
-public:
-    explicit ExSwitchButton();
-    ~ExSwitchButton();
-
-private slots:
-    void onChange(bool);
-
-private:
-    Q_DECLARE_PRIVATE(ExSwitchButton)
-
-    // QWidget interface
-protected:
-    virtual void paintEvent(QPaintEvent *event) override;  //必须重载的纯虚函数
-    void initStyleOption(QStyleOptionButton* option) const;
-
-};
-
-EXWIDGET_END_NAMESPACE
-
-#endif
diff --git a/QtCustomStyleEx/MyWidget/ExSwitchButton_p.h b/QtCustomStyleEx/MyWidget/ExSwitchButton_p.h
deleted file mode 100644
index b60251d..0000000
--- a/QtCustomStyleEx/MyWidget/ExSwitchButton_p.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C)  2019 ~ 2019 touwoyimuli.  All rights reserved.
- *
- * Author:  touwoyimuli <touwoyimuli@gmai.com>
- *
- * github:  https://github.com/touwoyimuli
- * blogs:   https://touwoyimuli.github.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://touwoyimuli.github.io/>.
- */
-#ifndef EXSWITCHBUTTON_P_H
-#define EXSWITCHBUTTON_P_H
-
-#include "ExMyGlobal.h"
-#include <QWidget>
-#include <QtGlobal>
-#include <private/qobject_p.h>
-
-EXWIDGET_BEGIN_NAMESPACE
-
-/*!
- * \~chinese \class ExSwitchButtonPrivate
- * \~chinese \brief ExSwitchButton 类的数据类， 便于实现源码/二进制兼容, 通常继承于 “自定义_Private” 的类
- *                  若是自定义控件,没有继承于 QObjectPrivate 之类的, 使用 Q_Q Q_D 时候，会报错，需要自己定义 q_fun() 函数
- * \~chinese \sa Qt 自带的 QPushButtonPrivate， QPushButton 实现
- */
-
-
-class ExSwitchButtonPrivate : public QObjectPrivate
-{
-public:
-    explicit ExSwitchButtonPrivate();
-    ~ExSwitchButtonPrivate();
-
-//    virtual ~QObjectData();
-
-    void init();
-
-public:
-    bool m_checked;   //switch 是否处于开启状态
-
-public:
-    Q_DECLARE_PUBLIC(ExSwitchButton)  //要加上宏
-};
-
-EXWIDGET_END_NAMESPACE
-
-#endif
diff --git a/QtCustomStyleEx/QtCustomStyleEx.pro b/QtCustomStyleEx/QtCustomStyleEx.pro
deleted file mode 100644
index eb5cd90..0000000
--- a/QtCustomStyleEx/QtCustomStyleEx.pro
+++ /dev/null
@@ -1,45 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2019-11-07T16:47:52
-#
-#-------------------------------------------------
-
-#xxxPrivate 继承 Q-xxxx-Private的话，是需要的添加 core-private（有一些核心方法? 类 可能不开放）
-QT       += core gui core-private
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets widgets-private   # 若是需要继承 widgets相关，需要添加 widgets-private
-
-TARGET = custom-style
-TEMPLATE = app
-
-# The following define makes your compiler emit warnings if you use
-# any feature of Qt which has been marked as deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if you use deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-CONFIG += c++11
-
-SOURCES += \
-        main.cpp \
-        Example.cpp \
-    ExMyStyle.cpp \
-    MyWidget/ExSwitchButton.cpp
-
-HEADERS += \
-        Example.h \
-    ExMyStyle.h \
-    ExMyGlobal.h \
-    MyWidget/ExSwitchButton.h \
-    MyWidget/ExSwitchButton_p.h
-
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
diff --git a/QtCustomStyleEx/images/icon.icns b/QtCustomStyleEx/images/icon.icns
deleted file mode 100644
index 9d5eb31f9fdab410eb005d0b29a939f2c088e97b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11126
zcmY+q2UJtR*04>JUKIfWrK$+1C`c2f2nr~@D2OycX-Y>Bkx-@gE=4-h1f&Vld+)sk
z5>kMW0wD>I<cs&-_h0MJIyrOJ*)y|e_RO>QWG2pUKYCM9N%=Xyy?39A>RLs#q5d;A
zW`1TWDk?S|ZB1iJs`l^8NJF__XMsdh5^8VbXBt$slY($c2}>PKbyKGcd7oE)i7y4%
zAOc?^$2O4b7Q+_eG55ucy`*n7fE2GW>s)hVtYf_yz|2WUfAQ|!ueu~UT6Jr;KAl`)
zb{etJ4=Z+jG0B%dw>oJ~KK|6T5fq55-CO-c*7x0d_{qumc}!p1f?4?_;RJ~bDu;>d
zR2Zl_<xDml%oW@%u;tU6xuR$1ky8d<!racW8-B7rRlzFeK}!Bj)TC`Ka5^5Mzoc<X
zGNwp|Rb`FIO4VaS`hpnu1Yj}korQ%Isz_p_L6}*3?Bd664(qdfU`+k)WAsfTxtKb~
z-ih9)y;k7#u{Ot5g_EFR{xr18U0!BgBVNtu?N>2nDdGc?idyPa*SIb0F60js3)x)J
zG@icK7?+9K`mGRbPtO<0)H|I!A@f~ACq)`9h|GEyj7);O>abpLHH#9ozj2}|uDAPH
zbSD<%|G40ZO_6X+5x`D*=uHXalH&`=uyOGHP?6bOwIji*3hBN(^yF67ZfU+4{W%Ba
zZ2#Jq(&;Rp?VMRn7q?WsZnro6uHj*MURf{#Q>sMiGLp(oBs4S3%;psHUwfRcx5ldS
zt-_n(KBKqn`QMY~jTCIamp}9<d3%C6{?KF9Ieql?E9Bn1wpof*rhjW!v6!804Xo+#
zu%N~|*KQdUenm6iWn6d{2ExM~RQ7Ov!oqu}jbUXPYYD{Yc}W(n_`9Qx6%8p~wJk!i
z)cy{@Gvb_e&0<B9Wt8;u>={$;(?Pdpzkp}P+|2Xj8d`Ox+`bF>Mmo!7Rq>~*r~E_r
zHj3Xac@F0mj9<7Kcjl${hLfLP{#OPtB-Zx_Lg;ElU7hR01Vpv{qmY~TAFDRFDd(HM
zW;06TdOY%h({o$tWA}SttH-BYM~lvG`s><WHMg``AMWF%&3-DFqtfs&g8E!N$S}K4
z%1l`-S=gtc_g&B*dcA=Rte6~NL~!WJF~fit)AnvrT>Y|}N`|SPxvAon8(PB5ZfCux
z&oxl?g@)Z6eKJ5Qs0t^G1E2MEE3Go$&tBXET!*=HiPW2TQ|U1oYPwF3LzGMUcJwqC
z|KE{irHvr@)AOcS-p+l!r^OK6=bYiCE8xWXl7|Z0bD!&5TRC`WhA_9K8mpm=Nsc;#
zpzHXmT3%uHI(5D>=Peva@v=j@qmn8sUV6XDz->)K(R!MSr7&Q#;MC83FZ-j@fPJZc
zxVG%317G%=pz@QxB2G8nlXyYXJDGN)Q+&m6aaQ{Bjnmc0ZnWWN@E_-th&$RhEnZ4<
zYo`g@_ugW0lZwA+ZDyfP<tgtZ7hhD%665w-=60mP&Wwj*zMcaAZPn*ZUZtjY3PxfR
zie=D$r}MpvM3?x7Q+pivCIcg|qPg29SA+vb{e-j3t9<2`lvq}dkJEUB6O>tR9RD3|
zc1j3q(U4c#h%^2PtdWZj(CLj($h%%RrPEO1TrDgr{vwh#8j5upkbxRn8ku~P71NQ8
zeqySp_2!pC4&n13R_%*Vz-r>Q>mw5K?W>=emi$jfZqNlspLcVFdi`lE$q}CyU!uJV
zj=QWbs#R+1^YLO)$j_*~Xcho!+EeYDdrmS^U0*oLzLn4LEpu2M@N!KPHvC=WhRGYV
zbX{K;i|b}uhC62Q_DY}R1x`K_W*szAwtsW0(3Nprx$0XJH4PZ>_;R22ad=L@_Pyc8
z=jgtRxk?8j(U;yUrzWw8RLWry0fGZ|+;8SDmL&uwN{`5NDt!wHQBXHy3bf!4QP38B
zUKJl%&C8HitLE6W7<2h4=T~lg{K5n4<h(!k4sb`U878_>rDAK`Quq6MMWO@jJE459
zIJqLIm&4H9u>+-WvG4e=JmpbQGSYV$8||}`b^>)cHDo=x^WO6`@O#qHT^AN&UwK$p
zJ?vYjGSp}1^`KOTf2dhWDlJB)*}COBLH+lNt)}P4@h?jsYTPjmZU$w8J~3)9ApOaX
zq1MskoG~^qe(3M_1b`MGwpUUAenP|;6Tx-Z+z7UeXZy~6l_i;4g3;$$K0_m`jP6Z`
z!B~c}m{dOd$d_u&&U~d`wU2s36{ciF*UE_9d~C6$Mdm+G&N`NTM@v&I=NZDN>FS#6
zuRHCzEq{9BekG%us`p+MAyo;?VS%qD3)23eYS4V8c0MEbBPVV;d5~%>SGebbh$)_4
znDqsdolcUYCPs$Qh}w$L`1w;!EjC+A2N7e*x`r%GE+6e<R<dw?I?t@zI?~Mb!5`E7
z7iGZTwY--t^7YHLztmuTa~vZ(=D2@JCrF#TY@zwiY&G?La>MgjkT!f>BGQvqp61R)
z*(hO0p^H#)u4G}63gIw!z$HnsbWZLEEf5qq(U~fdFK73{Ojt&@8n;M!sFNYdP5hn1
z6^9+8mN};f<+V8Qh{>yWI>}KbMX!K_!PPR*tCKICb?o<VkGbq;5<@b>jp3MhD4!ZC
zBv8Fs<{Dn;g&>z0`}uG^^{$<&xOn-kSfIeO5Jyp@21acd<tDmxM4Ksx$+^v#ODmDl
zZ%A{4!PAZ}`91V4^*g?&kk+r|-XO^ByNrn(iRx0R{lt#~ImTv9uYR&K(Avkxij656
z&EDCd6Yxl+sLT!bDHQCz^JN~}D=aGUm{I*&3U9+@zHmmSD!UibBF_V2F8Z@4PQq_e
ziwYIAUK{dU9DhYcmwT_C!}rk~&Gv=K+s3SQaA+64@?M@#LL#?T<bEKd&6SAoB;j!p
z{ahgn`q4hZyz)v{Hx<S;MMm)b)NO7_J76Eac=`zmz(f<`Afn+qT(5GgUhR>Nm~Coh
zx=+H}o{>Kpye!){txcJ8qFFD*PDMj39!KJCq6d1W^TnAhfa<DiOYW=&XT>X~CTRqp
z$bQBrv%0%~l%_5%r7*RoDyZ;aQ8ct!^wjrs;<h>M#mu!e6Ag#E*(|!>FbWNJJ1`pG
z@}$x*(!DO&R~DtftLOBGnGm+hV(h~zn^@4A{4>Rg|HkoWzi+HzP2AiIf(gtEIhK{(
z)SPNb2|RP=u4Vv<qUztY2{Cb#y0hNq;rA!<rru6nmrS?>xSjvbZkJP)nZMVT^<kMd
zm6Di3L8`;%?`&04W^s1hTm6R{M~V^GxkTtUuD$!K$nVO-?Yxduxck9G?%DGq_jU=J
z`a9AZ+~F4_tU7z^<?i+kXMfrx0+M3MBW{h4WF;4vx#@znhSet%?T!WQg+!Izz5z!E
z0+fvMbvgI0mTVd**L^894jF1cx<1~2)%qex`ij^l)UVZ_W53w^DUDxHW_q~&ALh)E
zSvxmH54IGKdOlVUk-Y^E+xx+oax!$2_>6^)rKuM}MKqa}V7e#9r-qIp(Hz_izI09f
z?`f{7a$l9)cO#;8aCY-l!7gvBg#-^vrB_=Q!+9NwE*X>@HdI{ip2`|j%UHcoy>N<P
z2Pm+03qNQ46iaxO(A9e91>hyKmGAdku9)vzgethtU|oqxC=czB7r^POrmh(``QFZr
z&kUOC{Wx@s0<5Pkqrp}J(8>)L(-B-!%AEGLn)WHRUNepGg!*hN`B(D#Q03dTFnsAs
zb0H;&KEJLde<M{GmHg)s@5zgN5UY??QhjcC8F-Mn&w~oqBjDbtXC)_c?^>V8S5CTW
z1G)?mk-`-5cLx5kVv3Rbw$>M^WR!OaE8|Y-V+qd05A?$Fcn)Qm9BH$QfwM~Llie~Q
zAaSk7S6SWqTJb!MrZwj8`s~hNoP`0&2AQm!`n=>xpNuk@+u<^P!DJLE>>1;O*uvpg
zj3F%L)YyK{BbCscW#2seLQbU;zaCq`lrk5mg<;XF{z*MMkexVFmJKRt&zPN?&PFNx
zI^n<%uX(a6miD#f!t@j8SH?z!%U(#q>Ur^H4`8`KrbAo#`68BwU5cu;Ox2OGq2Ic`
z;%G}))WW{V$*@KoUeO-XwW9;7nF10Rmo@TvLJ~EEQU(qfzj@HL%0CU1FT(zwj%x`B
z!F@5{bV$^+v~*axZN^<*d`P-h;uYZSy{!76T$bl+_)nUP6P&HjC)x^bm}xy26vK;s
zEJ_$N`+6gAeUyVe_cyC9<6_gqkioSsAMC0Zqt8eYljiItrf2=pI&A&2<Lkb@8R&N=
zoqsgi7;B+VJx9EaMCn0=6>vemhp(yZZ2epeFK6&*DWD2}5c>{oR6qMbw`+y`yG~CL
zcRTziuHni7YFPfB9%soauO`c|1ugHY8#*0+?M;8E`IGYUIsQ7ZJq2=!b0Kbplz#ez
z>s6$gL4EtXrI|#-$}!6hu=6@H@eN{kqUy2qp7PsXtZ;=%pdjxwe#2_V8Hj)DR6u~D
zB$M|WsZrY@pib;$U>CN4H1wSo2kjzMZQ(P?dpPp>8V-k3kh(sQBd8KIs=ec{I1bQF
zd3EtRZ_v$GX%fvG>|79w*~C}cka1uX(><jd-QGF!w{dkrq3SAksh&z#bBOz`BCeor
z_k~_<<WU)eXPcXWiRub!S)f*P^{{(f(<4l6t_Jjvj>C8a)%Z$voBCNol$_f`s$Q0K
z9r+%OE|HGb5`T4iAZ*BM!MMeaZvim|9oZ}UJ|QomWlXLid#EDbr$3U)Lu6H2=S017
z>yur9**}sB??bjz9|_e6?5u$m#v@_elT?>P(M&(0el6_xq3O;aD7kDZ>4g-$`sn+<
zydTZOps?+;l$%S_4`LIQWQ@+(HPgX}??R-0ExKSU`<3i>ZE>j6CfA3*{@OEakE3Ur
z{BF!e*+VkenhW3Z`MnJadiO9NwCEf3WtHLYLy(;gUiO=q)XeyJZp*_rtz2JtwrMA$
z1;>lC4+Dp3Y#FcAG}W8WHzwQZ{9V?VqZ{Df<3FBrr2bL*-N8|(_O#jaOL(N<jq5M8
z8-#UmpVqq0P6B<_nG!ocAucq!WJwO$w0n*{>yi+ijO?DEvK%qy8>D+|`<8mdLTWj`
z+{Hyb`3!LhN>D@#(nftot%nuAt!8wY&gkBwdp@KCZZ*6>59G>qc61GchN#IVzrXvl
zh)OPI*68++m{gZ0>b{Yf^^}Ne?>Kr^4<?NoftyX1H4T=nm`blB*LVp1f?Ko9+Izn{
z_j2-6taN%=4S8J@(yls%7Z%f&vqN~=?tbMH(^zC4@I=nbv85Ovft2XIy8HY-Z{Rw~
zM(T4${Xq6f%7WV`2q`@i`jKjo^^IP*0Jp2k&5W2UJ9qC218cg~%yTSCb<<;-YOpSX
z%g@e+&GorAtbRUtZdzzrYqKF4yOO@3+*mDhtJ1&UuwS;~wSys!$L>JoRT12}J?vgp
zm1|KYzjv%XJjPlsGHk@*FEHfz3NJ(Q?OB%`bS|ofOq|r&YF(Ip35xG-K!@w3pq)xS
zxYNGqOQ5s%;6@OKI5t1y&b|@9dX}zOS#&gZ5HQaRF3DQHY+_|Ybw3X<3Rx<WRryXY
zy)>V8w@!+q+C(1IIooO}HEaPCrJ?ElaYu|!Choljo2P4Fpn#Gmxrf$WrPj^8ubz8+
zMCLcVx{_D&!qwYP@H#b{ukNc^Pui-A-xC>nIl7m}Ff{Z*{nx^UjF9U^LsT3rOXf@}
zgUizCvAbRVs1h&dvy&|%T(piicdFSBhm#r*WtL-AH(|p3sF%Hw<|8-ENuP2I%|2x-
zE@O7ea!pq1Y4}@2_mOJb&N52y%v{?8pw|8gIT)E8-C+H*JB4}-Xv=p$TYu~VTh$M9
zn4j`-Fdo;{J`Ad;&!w6#Z5S>}c+4+GKNC+wZkn?0>0|*h3^NVHV<~HMe>%Rw67Q)G
za+SHlMg9Hr{gEOH-AU{2BY6hODAAwjpc1b}QCaJ`YhR9|n5e^}A6*hGFuLDNJL5Ic
zaGIX?`FHf=Rr?!R@%O&-7aQqFar66*hkUpo8YDQ)_)|t(^`;s3wdEhxOf@<FNR*Qz
zzlelgf#>=m{{3<C!@tw}$Hr-h4BETT6xbuk9Oc(o3Q0JzaC#x^CBHKotHL|#DIu=u
zg;lz&B~hU<MN1zyovP)M)1o|~3?q`ey1u?_6;jL^7Did(mPHoQtkx)@JuQGsa&e60
zO%EUKdK||ZyRtXcRSSB9;ebd0XM+FnW}P10Z2c0TLs+`*75rPSI!o-;$9lZXZKje!
z%@3PH#<ghVQ(n5dzWHSaDeNL*p6|LSvA;bw(uRNbvt`mV6R4`HXw{gqV^@BHVZ0F+
zK17wi3k<Q3x!)%{tX0R-SQ?%M0z7p%-b?Y9Z!xk6W%t)mH<@{=b%}wKRo{<m<hFUZ
zmC@^hn$B~UOs#wkeNE9%Wj8MJFli(y|EyS^sLGUzr`Nq1mAu{mWwMlh5*l7tPs{e^
zo?rjlSpKA|PZ|2et|%7wrp-Rs#LnP~xUxK#?TX}FB0rqTK5>9WE5+)>#!yAsH_599
z6+1VSUF`UB(EUTD`^$m+*PXA>3N{*+N_sfpMxz1Hd04h4eUTKnwZBg2I&?^4;YtR9
z)Yx-+KFUc-e{?9y9oVPihN`HI-kKFYe0?p4osQ)o?|Ayd#vk9SUu9uFl9qP&^8$<*
z3&py)n|3@DElnkPnFdM>nWq)PiS^iehR1w*>_U$&*miGTi5PTcR*YY~1W&em9gH}=
zy_M6Rc-Xu}NO*8fqvHp92i!`(X&bzKvIMQQF=j*w_ud@IqLE9wz`i{Be7RvTna4aQ
z&&S}UKvSM;=IymB@k9GnRdd^nB7*thx{RYw-c$mWe@XC2U0CjCEgDL^)<rz|^m1`Y
zyUdy!E<LBD^l0PZQy$GZD$Wi=sbYBE(|U8s-Rs=C+)BfIcYJ1y^IC9^T<`2T9>ha)
zUU`M89{f7T>{s^N1+rf^`xw=qEW+A)ce+4mCY^?ZzWWQOW8kx!XABH6mDP=wQJE4Q
zx83T-S(|=Px2Y}LvQp8D+DHgqq>dcG_l5N-bP^*=ZtZ^;fK3P<TvNdVYll5Op2__d
z_AbdBTvV31t10}GSt2Yfy7C>LY>6hIw*UTngjgEX>!+?8=0)KFVy#6h;fg?~q<2YR
z`cY(gg-@ML=qn3T0@a45&o>l*UtIa3(D{r|us^bA-Rn?wCG|3wK65Q_5s=-F`Wz&m
zplPPAO^>CE)}5W0>S+8kdmgJwJi<M0{f_72?bk9pdh?pwEFWt4QTRq>gRzS|eKD7&
znhG^FJJC)n&mi(5`ZK$p^slAnvbTj+yV}TXMUk^pgiZK0df9?fS*@o9vhPDUUyP|#
zY4`sU`I;ggWh#-~sN67QfHMjvtq8b3`qC)neg3p+du7q#en?r;X0j_vC$vIhdA55D
zEX-zDC{gvz-~_pO#<=!UN=i!f`3a|oP(0_*QT>=^@n3r-&D-Zso^h>%!eVX-XYZq&
zIE$`vYp&McL_D!HzuZ9=x@_}>C{!f0q43sp;=vpG3&L4=Ip-p^a80q265xH3v^I}v
zy=v~ZE7P&!Gg(mIv-Y!_hy@qlQmYfF{OWmVS)p=l`_(Jz-$9UsBQj|(Fs!(FJi6xH
z(c%Ix&LClvh`Mv~Mxc`0@deeNc}XdO{ZdgE=4%sN6&I`|mW9Q&tz^%WVpS@r^<(^n
zXBrnCKdlj4+B?{NZPQGYj+$xHW4Rbg?S&FG*?w_u=Lx*%_5;tY$Q-aLcU7$nfru{#
z$@{R$AAUK8)dgCbF5FNy4@(xHZ?wLD+A*?i=fXG4T^XsNjI3ikPtVJXvHpx>P*pq-
zTwGdGuxU-my)b=Y{+oQ7^_{RqVH8lrmP(HlMfWh@>jO8-pLp9?)3~xei<Sw}sRC(a
zj(YX&3tjK!oN8{{*GXgzmiORGH+Ys<B0NyQzEsl7F3hTv3QKZONZs7Ak6g#mcE|VE
zuCDRQ@@#b*JN9B`=}XKx5hvnzyNgkxAwACKv)HlByM$^KsUy(IQ*JN5o5PMM!=__a
z4!Q^a#!NR!^^9NdY5Jlrl{?POU$WjYXFgXWrLGJ2u&Y)Eo!WT;?eA%vG#wCelk*x+
zLzjp3W{*%eyf5{d=*A-CX_tbe(*;qQFSBXlsoCgL*8;J4WmPI3>WiLzsHx4b422!$
zlC<TVQUjl8J^L$Gc{@>iCzJZYDjJnNWjt;-qWV_)0k2y#Ec(pZ>ZFG_=z|<uPWQ^F
zH9<<E026%{FWxhOt`n*6@uHP68zI@VDs{G6yi?$y5Ijq!p;Sy(^md~`n+*Zu8p!aB
zQ?*wD!!-^sQI(P2&+NqP^~(?ylc#w{8x)Z1ME9+)zaI)#FS;(Iu#bqM7nc^h?~i#<
z0#tvk$jM2P;C7QrUL>TIvR5wspiVW*aCx=icDs3%eQ`Jae!}&XGSy*+<t;pPD?Gn>
zPpf}?qmb>rL=>y}8}TL<2h~qZT=Yy!2&`jr*H_|b@ld<OLE#gb5M$IPiRs1eg22-B
zAV5-6A57Q$F#9WcGZm@&MLM?ErP$i~^^;fXB5{DKqWmT1<@=3q7#=?7zZ5nQDV@Oj
zJA6>YWqx})`}J~n8rLUm%Cmc$UvBiKb$7dy=G=Gg8ZVo77+bzsd35Dr{%a}Gi+zmV
ze8+;jV?u_)W6>sKs>+JzKQmQnf7gG&OmJN5n_{l~Oh$3@fq!Spzx45y`6Q?H=&He4
zAD8Xc#y11i&uuoY^70Bx&#}tY>p8FMq;JH>!p2HwW_m_qCm<g3ETI+AR?hA3_==35
z*s-+&j7@IAep)uh|D?PB^{60(T99#MB>i=Zyk$Cv(2w6c8NO^y7ou}L=v!g-oK{LW
zwu(fklLADqkI$f7^=#qpBY%{*fiJ;IZe{K<ETPuDrM9}JL5-2y#;_mx6(thwO2=X;
z6m*P2Z{9hj*ZXpb>s#XkJH(Yr!@y<G8-_qngf%Xr=6U441qj_#b6ZwjDD(E^*bGn<
z{%g4@SB?~D<sdiYuZWRkv0IhL%FK2>9e|qg>Yc~Ho{#r5Wcb$&S^rS+s*L`M^A)R1
z)SLZG7){T+X^@!o*IS?Id-ouRL0dsr!>xw%V!u!FpRNggLQ~)PK@Sc+M9dg5aH0ly
zf7NDy{gpKYeEhw#0<LwwZ-hMUSnuw{rRw7%;vZz~u;Pu4P*+&a*<QWMNVjjQ{8g>`
zmP)7hNvHX9(wDDqT?GQTgt+`gV)N|MT7?<2gz^OEC!*eIkE_JCG3eTMbU*h0d>rx8
znuo4=10I67z+o80+mC#_dG;%qkjIfPxT(4)tj!aPXDv<mJSe9p7yT^t7J^UpX!QA0
z-1ODNdiGH1{xDhdkU4jGOMPw0cXJ%*CILpx$jBbt+B5u9>JX49tsH-^M*aOO>_$;i
zMT(j<x+`fr+QEsF!iw_(umW1gq(?T9=5&%TvH+#${j0$q_)|oIEbAq`hxnu36smV_
zs-fM}EN6R}U3gsQ>1ui&Lh51W=<W{jTcVec1N$m5&wO`v@_L{Oy|o2cU;J+xw?<T(
zbMW*9Xr#~r5V!0zdcR{;TQKnS*k~Lz#V0I8KPO$9^kznm)yLw=%MC`9BU69RsYqFj
zojIe6lG6k+ot7gGF_X`eC5r^2dsIo!$lVRqB-_SmTGS<vX6cc;K_^;PTYtQ9lMF(e
zXQ*vZd0=NELXhh6dRa2_(rYt4F2h%s_&qpno|N|37QBQ6%yBr?3-kKwsF%|c*^Pca
z2(^B=cUAQ*pqn)^{*}ruB=uI3g2p%J38vj!%vUqA3@?U!lc4OT)S%-pVN|E;yoDL^
zat!jqo-wopZ@bocEi2sOLfvEP5f<DzK<i{Swi@l!OP}&X-{=E)flvlqKIy=q<3RCR
zf8%hWjAg%a+AWi@-;XkrvFP#sTG@sNgrY09JP<p*%*USweRy8eOB&sK;(gKIaM{A*
zvQpZDIHyQmIMWF_$V@nZldLT~RS`4ztLnNfX7G7i`EoGoTkscWSE4}Ixvy3VdP4v3
z_-F0@aFbH)b$5uexGRk`tPR3&Zz5VCJ{`N@>l6lK+d3v_?~m98<GVJAwo4vcc-V+g
z2R4k1zv-UD!Hc;oASv+r#xJXBs*)JBghZ1hqaDt69#%~;or*sP(_t4mmDQhUDy!9p
zHj6U2eRGw5c6mC0{jWB=Zq-HIx=&r7x_(FmlcAl`y1j5XKy6kqTs^bIB;Neqjxym#
z$dAOS;6vGr%W9*KK2^pT|F-TKy2nr+){#2*kOLRkm;7VzZV>wY*E)snug`UgZT|kf
z9eY3a(e*Ulro{_v!Zbh@{%LUgvcnw=_qd#a2OHb>QPfVFgL~SQYbXBoGjvUy50YrX
zZzLC1viN)uZIe#hpSA+X9OSX!A$Ghw`FpU@t@I)}^$*^iVUbR8Eu8ObtvWvMFS32f
zeFk44uLrC6S^b>#5B_yl)3O;rMqiT=>?}W>HRyWBL2n1FmX|yJ%^7SLB0()f>xOiv
zy5ilI@^P-;f^y_crK6><S*u|i>iqGYJLLqL#oois+1p1(W}cdcmhJ-m75-P^evV$=
z&h8&yiM!joIKK7qwh*`Tdh6s&d2K50<L+^hiaPQ~DFY+d#Y<-5AAQ~2=9rjSSlKyW
z>YLngbqw&fq@@2VX)gZO&Cc7qkPSdn$N``Q(3yU;``~Em{MP;BEcay|Ud#W=|Gj+m
z-$zGpD}579=eItT2H1H86!GxA(l;^qPdjWlIrL4QI|ev9sQ<4yGXjF9UheKb6vxTM
zFLwLB!lNg;#%~<nIk~uf^!5*mO3p8={M*(4uiKQaQvWxly86HL|B^xHw=xf?s94(7
zDW~z||KA5mjwCXZNauv(qhtITk(5MaB@uB)2WwmV=wmDf8$qN#JC7hTkO+rIL^SLy
zghY3S-Y1Ykh_ojsN9SQgev0IjOgJQxh{RI@iG<z9{(Cw(!xGOzh)g6Lf=D_?pP%6X
zM0Wh~840(8qGZCKoDq%yL_yN&!5N8!#-ARc2<N9b0tRyg+1Nin$KeRa=OILT<O%5v
zk30vUxsI@SEQWwNKx~5{=cKdaa}t2ah(nSHIOGX-4}gAjgu!Btv4?y6kOLU$9D9C7
zB%Wg^&A{&yusdip27^4ppwWkW;C&n%MJ5~_Q(B3}qtHiiEP5FQKnFuGhbT1qU>&$m
z*d-DPcrp<W$HLJl7zPDKQYzR!K*P~!)c)cYMI{N3g_Dm!Na)ca1dZA~pvXaM$M78t
z8nL#6Bpi{>uyF_s0s_Y#ZXKY(>;F`*AE1}v7|aS3agHGo3E`DU<j%nfat(Y0+Mp;1
zMj%mW=oG~Q<M4A7#fS+BQz#&%=FMFc2t+9eg<{7lhW8H-XLb$|WFj#=t$c5DABfr5
zI)H*82S@wcfAwN&5DQ@7_QnB4o|zdxy}iGJ+*>-@$3qYHkO#TODeJ3ai%{eWj511@
znX$#IuqoIP48M;;9UVQ|gXj9Ukr$`ej*vV1dl*t?W?V$*#MsKwVQq0Mh;(*_gY=+J
z=O=d{b0=8%J}NssI{ri4-|;;Rj6^&G5Q9l%GX8L4abgN~PNMw(A}lj5E<7n~Yz>9n
zJ2|I}2jwEK4{n0C@gySY?8G%CB`z{1VR#vIi1^oGJb_F`PfRWyfp(70NyPK$*o^q-
z;OMl5i7n^>ig>=)4munipI<t_fOg@ODsn>8Q<GB?qdm+V3+BNG=j8javeJRM(dCu>
zgKgL@iU@Ft&Pvb9%t(2w|G>FvdJ95XNfp+wfk8W{4e%ZWKI-d{6_P3V-Opd|fzjCT
zT;<r(Z1?ascw>JF1m1%qXMMu60hz(sk<MQFPXZQZ-At>2hkLU#2;|J#0SE>^SdL80
z$jr#hwD-3%)Jerw-+$mc3ELiDKLE||BcX6OV(Le1Qc^-1z#`1Vz&OD3y|wg5(B#C_
zDh!MS<KS@U;$Tu_d~8gbgH@QBo{p!Fjl5F%{N&`+=oS{aMUk(~G{t=5jgQNSF|&_&
zr?0E0EvNBub*is2Gh&$t0l)>f7bf$*MW$qB``Z|N4u5W-^WdZY_ZFvs0^jlT)Bm!K
z$Dq)-^M7o!|6?0EHMe_sghf#h3MJB<<If_9oFoF`h<E@zBa=y_GZe+P03sa;aRB=d
z;CKXqOgJF@5Ab8iF_}og8iybeLWlw+97S@DBoZh*o#U}*q~jF?iL{U0C!9e31Nc4#
z@IxHo0CGYkpz&xFW^)00eu_e$!0{CM`QZua6uW;0gF*JuCny*W1B0ytLFeQ%IR2DE
z_z9APKY~$g0e}V{z)&y>Q@arG9+-5#hySM$eR6($3?d+xpimfM_h1hKp_B*XAV~5F
zbdN|PpmF<%!)+vV3<8Djt-*F7PzZE+e)kka>B142h=ZYld(bV|?%Xb=f`x4;@Lz_B
zr4!@{`DkyCj9!OrAi?WU$m|Xj8Vp|=-`iS*LBY$Lh|?o70h)YxxVs6&fERY4lQS?V
z6x;)ZPi(+ov(Wu>G>L?Xs@dON0Uhs7F7HiGP&9z2$96U;!FYWD`j2o@V&WKN0fd51
zPs3(LSK+YD*`ccZUn?N+*z$h~Pc7M=1#QBnd)6igM}dKRz>zASqJsXB<&CwaeG1|k
z8407aJF^hr-?53Unb9@a)UU**&5qVdFme`18K;bl_`->ezRkUb;ePP$=HmSHpTU*W
z!M5e&gH6y5hD<3R8Q#-AzPD5Gy>a8@2mu0bA&|W-Yg+@@<DFepW_nzLUtCSw4s08M
z@jX7qo}8d}x7&LDbWnx}yN8R&h);-2N^hEh?XE$OjwwOp_~>M&ZenQ}N0}sNXrJVi
zgs9lWu90;x7=}Hj{FK1qU~PZ;_U4E7C==>DE-pPWCM+(ac3^%D1U)|9Y1ja_H1`f~
z!-v~vuw-IZL|Q5!`C***E623K70L$aR#rxBd-LS%&Q4E9FN7TK7n7Nmk&&L_Xsr0Q
zq<d(jt-U(w$K3kH8g#C=t7E46b3kZ@V7A|9qlfyxn%c5jy8GJuRyJpV(@VYGodXSl
z-!cIif>}{+zD7D9o7<dC@|NNIQ+<QegLA<C&Ys?ps6;@zc}9j)pslHX=-77!CBMnd
z(aQRs!Lc3KTu;|>S7uyNa$;JzUHD5AvyW~r_V+#vmK2pX^epYJ;d;8q2kR4~<KyGf
z{G7uqjP-p#*(<ALR27$$l+GMN06mWe2U{!RqT>@X;y-ysIveX7y-<4Q)L8ocTjaOd
z^ZA~hzM+;snK9AH85wc0ufIeZnCK~aT4m)J*{1~#;7R|7HyVRGCy^qERHSeJMI1J>
z06|g^#}Y|lMC$($esDxYZ2uqOg#Qo@UD^C!2q%#72mcqsDTGtz=E>RygnarR!vBTv
zL*jpU`xnBGmk}f~WO<cvvikppa0HI9zk5Q&|A+8(3gHCA;mPXe{|G1iBOJQBhr*(u
z6vClvz@2l-+1eJ6LOAx2gu_t6<R$<@zYj%056}ky@cn;;Z*Hysm++$_5aDnU0)ZmH
z`|#aeC~OUkha8fz%RB#KIBx&oaOV&@27m;^S0UhC$S!1g?mvW|U??#hhTQr`ICyrK
zQo%eBvPH=Noml)wIC}Abj9Q1TAA;5(yVKhg-?2Cj-&}-3K>q;8knxK-$V1S^78*3a
z4H=(-LLi{7E!g-56goozoU)EVB{l4WmUfQ8lS}Z)aWEtp0-hKGuJ^)VYXgvTB*luU
zDP!Py5E3#u37Z^RhCw%`yUX%wmO&s2;s0WET5>6HdWS-I=gL^`&=!1aurjLRd-pH}
z@Ws7<^0btZnVq>^VB65>>iED4biAp!XZ>&6BnUaPMR8yhdGYxAz$SdQw+jed37(#v
zZ2B=v82C#ed;_$NCa0yP$0hf5jKjBcv+GyT2-w#8IBdW7&-&Kj@$ohol}@Q4BCWQ4
z2fB55h(J=7AZWz)dV61cCuNARdneIpscEq(-<xMBUT^0RiTrn=CL1P~mi|LHDk3>8
zEiN&$dw3ND0;7;-$o&Hh2Hf600H5xLQV>5)icd>Ric8J=H88ij14be@>z21$Tl<EA
zu)g}ye=aIEB`q~2E&Z#VTjs#>GW=*YGozN`!DhFCe}4Y~k>jG`DLx=gAoZiw6PL1{
z{(-iR+Qj_%jjc7vOj}dqctvbvYDk)3=9lm{&tBFx|H=K+)8F2=x;3>iwb<7DyRAAl
zHXV>=lOE&$)!NMacbmuSA1m<v$?op4f!WQ!jV-MsN%5(v6f^mSyV_cP8_HLI5;V2e
zQ&`o}Ke`Q@YH6D5$xKR4O-+w;i+gKh=j-R=`pByzD?PWSV-dW9Z)qMFY)DH<0;HMx
zyT?1)SOx*yw4S9DWM*X-%pkyREiE0rtv^#zC}v7<`H<jk{o4A~6GM;MoTQ+L)VcGi
lmX<#~zuU9Yl9SRhg5JLgPqebJ(E4nhl%{W;5!sI?{XdLQVo?A9

diff --git a/QtCustomStyleEx/images/icon.ico b/QtCustomStyleEx/images/icon.ico
deleted file mode 100644
index 7213a9dace8875b2fdba3a0a834187695a174c03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4286
zcmc&&>vL4~8BYI!PCxat-)d(%9jDXLI@W4O#a650t<s7XRMe?rMd%2n2pAwSH<Iio
z0SpNcFDMEUNJ0`Wxj~Z6Z8ssC-Ob+bm$Uav_LA(==l5F|^QF^|J<Q>EIOptn-sgRu
z_kDjuMa7T!=dQad#NQQXe^OEL(~63UyLs|f#lt+seR=TN=#NWh=|)9G-*5oEJclPd
z7`S0X|CI%tJJ*k<x*DiIslw6PTBw?vp>8_{b(0!9Yu?5yyPn6sT|3ao=kILUjK4np
z1h%}e5wAY?41Ry_udwB%=do?`OK562gRd?dv3vh%Y<;s52M@L4$cOKty{!$2)G7*v
zJS6^5028w=3|!Tsw?~7PW))P`hfCNE4N%urqqXe>4pr{L-(KH<>Vx}nXzw24J&mm|
zK8H6qZ^COYZp2^y^anipz<t>8z`b~T>+87CV?kTj3_ksGp6e_Q)qjUm?PoDHK8sww
z2$NNj_<ciu%r81HbYl@G+rL0#RV5nh$h+|<)HPM)-3ZmuI&9nWG^+OR!@iw6u<6Oi
z@!FrC#l}Y-#Gd!xVT?60rawOP03QDJJ?QA_MaMUbXgxhGV>t2I6h8lU3F8wsL}Pil
zJz<Pb+0k>|hwI}CthON9R2^t&Y(i606I3cSRAOcB+m3&Vz1z28&p+Np<-c}Io?FTH
z&6i(BXU8C_4m9B9jZfjlCmzFnzxWyU@7WFQQV3_xFQAqDk9SR@yVr^vqfuz4t*|=+
zFfDtqvXY_p3a;Jq<FvW~l?Oh8`q*)(TifoOEyqrvvA!1XZ{3XQkN4x1XP?3wn_j>s
zVzsyTVs^fOjuU5b|1a;xQ;$A^GaaX3w>jVsgkZG#@y#U-z9aVFPz1LoeYkpU95%Zj
zUT=h&d(bl+MC0LVe7y5*v>tE2gDYZCwY1`R`$_Ei;C&q4yBi<8^#)!c&nF-H4eDyo
zpnuRrziROJ*SBHU_MP<36qfW(_<dnG98T!8^O%~};ikreDQz6O1v4flbj*DegCh=H
zy6(r(%ELJH-m5rDpS6&?z%27uwbJu#$0h!O4|n3p-`$S~@A)~lzqJDc1B>XnG>X1~
zWqf<?CT@-zF*ahtmEK8oefBj525-P>@xkK`La$$j#pZ{>V8_C33$Bj3(K{59`1O^0
zQT^|K66b`}TrKd4sZzJ#SZgb)K0b&o^!Veyy${c9*nrw9HEvwfVr*;y)7l_(dIck6
zdi0U|sg8@NZ|Feh=_{C-Ho&lCgUMhct_?na0!EV)10(btu`dpKpwar!%v!6jsX>dV
z@5V+nF%M0`_w_Zh26r&$AH4f6YLC>QyL%W*1~-<?URYfTM3P0UtO5qJhrd6A&dzVq
zeQ}a?q{rp%31}wu&}t3TJ3#yxuHSUv!l0j?cf;z809Zp!<ws~HS2exfLflUd?qgp$
zf@ap;`LEAmXjlV-$pwow2$wqohcgIYD24b65M>WB(@PgF_QM;BBeAlEp`kfkx;T!}
zkwx6Rxd@ZVk4Pkg$r&fU>2qOx&d1)vAM;pU75E2A-0SP0YN$tTHL-c!)!xopUBc9q
zk=P!1yfIkG!y8N@o&mY95`PWhL;<N>k=RAV(nUTiV0c7_E7arKpibu9WM++zS>X*N
zB<EtWD6!Yp)}-H5s%EsXe>B$CprNK(_MXpApTm{D8Rpu7Ao)6+VJw*xxC2?qTVRV*
z#35o3s}dK_ip)s>=g$pea$*@qqZb;D9=Ti=0#9&WTPvbiTtkX^kX~bdYh{hsR~<&>
zj%_$~vJ00li5%(>2qt9SEjBk2<gLUC2*pY`0zaNvliU*-@+UpJI}3+5MGxrc(*<0+
zIwyPj?5v6XCM)w^C=}rHg%D4qS!?v2N`;n&Ivm-z2cLb~iMcrodN1FkU)@l`8S3vt
zebZ^yXD2Rn_rT)tAxR0t$pUrHW7(F0+2zN$wFjP10P!?1N!@xbO=DhXMm(Ot@Q{`~
z0_0zSo2$(pLMRj_|6^!Tt8tWh?;jX~e#y_?=py$ycztp9u{fsZ{1}~F#ppx?zF-;-
zPYil<3N!ObXcxTD>cY6((}80n+c7qGR&t!xn(2WV=;jU7FNA!)Krh;43^sd^c~z*x
zD!q4{{k{>M>~luekydMilU#JHn-IC{^>*|QSm@sbX6C}wHp^=d#wHZT89*=?#f&b7
zzV0vZ#nFxE|LOqTUIzxR>CxXehl%kym@O{mAj<dcSk&8?)2P&6_@R~f^{n~P(Fr+&
zbPIO&#{kS`8^4{wty{M_H{7t<6!vcqhFQb6G+xdS1tBHHJO+8+f%Dyy?4yt2Y{z~a
zYwtq;bw$?S!h#KUyO%wPUZkF;WsA&@z!ql{Ywl$G3Fbv%oIdh(ArOdgMkb}_HPaT(
zW<O(zV{%$xyI?X0n7<_TNw7A(?CWmsUsiDD>pAB06h8m*2Idz6(zhOO0=I7)S;u<z
zfjE8VLt%AQVhjAbLkFRqouNiaS>JktllW1j(ktW~V(l!!Vi9-=Xl5LknY9r&CcWYD
z#^LcOm|KWpWFpR-#ARGpuTJuQRMx(mUKwT&Thf~(??@yfy&!skz`xRcL9PxbdkeoS
zdY#7`Mw0ku;x2GziFqZk#wTr<pI;_MO7<h+Pw|`ULl$}~KwXoVo-uI7IOIElKnk}P
zZPe9HP9b`qJu4bRp7kg23x!pzWLPXbtX8+=B6_vm5k!IowruwEzMnOaq$i`8)w<zw
zDUz4yhawJx(Jgfrb!u~j=wGvZUWzSF-OX^=o&23&Vn(7-*@J*0eEdz>2TCYHjTQK*
zvz4<l8cj2f5a)QXgzt=!mwR3AV|+Ks{Mf$NCnaMQxe~KZ<jd!eat2y3J*{W0N169L
zS4Hv_xiEQ?ckt7x3=)YrlBq279YQRYl6w@lI|L;nVo{)(GB6f?Tjssg8w^GlV=DDX
zw}<_K*n+#bb~@es%@Y0UK{l7820_H)afvT#Kb|c0WT8bin?p1ra<htbCc|@uex=Uz
zm(WY}q4@=?%!SCkh$9k7P?xauu6Qo}NZtZlQ6j7*v&><XzR&QRR_@Ezh$V9GRnoBf
zf8Z~0!^9Wwi6h1)nqYh$)}`pz;`_pnKELoBPp%;)L9Ce6O4N^tNeQPAp~qY<-}hQN
zkxr-CPaK>#C9lOeybaXe!dY3?U*te=R+KQqE6N(l<v44^Tu-DJS6*@z_=2aXM}_%`
zb10?KoH_JoDwX5DJ}YO7=!-VHhZ=a;BU}ix=ar5kob>Z@Iu953E@gbNiWo$FBsed`
zA@1c_BmO`bMPA1fD>4r*cMM79M(C1bUl)Baoz6*~!C;u*5E_J7dloD&JLJE`_wu<s
zW6e?PJWReMEZjV;$1h(8gP}V*h?tV}W;~u0pP()o>Xf36rFcaRi`kM+r(}MGR;#>c
zT6VMFI_}I|p{3EE!XnQE^OR?9P3(<j%<?Mmgcl;~ydZD|r?P&+yXE%<p3qm+R_Q1r
zsKn)*6VJpUV$EfV7h)Z)7GY!GU_!Yk`9c5k_rxk<5UcQl@REo}93D@Qc`tcLyi<Np
ztm4SA#=Ks?oa^hKuku^M^MP<0OVKQD2h!A1>_tjA>#^5gi*E{UF~%V3!sk^mqcOtE
zn#|Cv1?F9F6u5~*0%6u%I$f%t_1`I9i@jGUx+2dkxr;qm`PqM4MGS&VHp@L1HE=oo
lFfQ3)vv5z!IUS9}WQ<wvt;9F}H>XnlmvdMCe}Mnj`X9zA(Ix-@

diff --git a/QtCustomStyleEx/main.cpp b/QtCustomStyleEx/main.cpp
deleted file mode 100644
index 89d89ff..0000000
--- a/QtCustomStyleEx/main.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C)  2019 ~ 2019 touwoyimuli.  All rights reserved.
- *
- * Author:  touwoyimuli <touwoyimuli@gmai.com>
- *
- * github:  https://github.com/touwoyimuli
- * blogs:   https://touwoyimuli.github.io/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://touwoyimuli.github.io/>.
- */
-#include "Example.h"
-#include <QApplication>
-#include <QStyleFactory>
-#include <QDebug>
-
-int main(int argc, char *argv[])
-{
-    QApplication a(argc, argv);
-
-    //若为系统自带的QStyle，则qApp->setStyle("系统自带风格");
-    //若为自定义新的QStyle，则qApp->setStyle(QStyleFactory::create("自定义风格"）)
-    QStringList listStyle = QStyleFactory::keys();
-    foreach(QString val, listStyle)     //打印当前系统支持的系统风格
-        qDebug()<<val<<"  ";
-
-    qApp->setStyle("chameleon");  //Windows/Fusion/...
-    Example *w = new Example();
-    w->resize(1000, 700);
-    w->init();
-    w->show();
-
-    return a.exec();
-}
diff --git a/QtMyStyleEx/Example.cpp b/QtMyStyleEx/Example.cpp
deleted file mode 100644
index 3adc101..0000000
--- a/QtMyStyleEx/Example.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "Example.h"
-
-Example::Example(QWidget *parent)
-    : QWidget(parent)
-{
-}
-
-Example::~Example()
-{
-}
-
diff --git a/QtMyStyleEx/Example.h b/QtMyStyleEx/Example.h
deleted file mode 100644
index 754764f..0000000
--- a/QtMyStyleEx/Example.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef EXAMPLE_H
-#define EXAMPLE_H
-
-#include <QWidget>
-
-class Example : public QWidget
-{
-    Q_OBJECT
-
-public:
-    Example(QWidget *parent = nullptr);
-    ~Example();
-};
-#endif // EXAMPLE_H
diff --git a/QtMyStyleEx/QtExample03/QtStyleEx/mystyle.cpp b/QtMyStyleEx/QtExample03/QtStyleEx/mystyle.cpp
index c5c77ae..6f6b913 100644
--- a/QtMyStyleEx/QtExample03/QtStyleEx/mystyle.cpp
+++ b/QtMyStyleEx/QtExample03/QtStyleEx/mystyle.cpp
@@ -65,31 +65,11 @@ QRect MyStyle::subElementRect(MyStyle::SubElement subElement, const QStyleOption
     return proxy()->subElementRect(static_cast<QStyle::SubElement>(subElement), option, widget);
 }
 
-//void MyStyle::drawComplexControl(MyStyle::ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget) const
-//{
-
-//}
-
-//QRect MyStyle::subControlRect(MyStyle::ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const
-//{
-//    return QRect();
-//}
-
 int MyStyle::pixelMetric(MyStyle::PixelMetric metric, const QStyleOption *option, const QWidget *widget) const
 {
     return proxy()->pixelMetric(static_cast<QStyle::PixelMetric>(metric), option, widget);
 }
 
-//QSize MyStyle::sizeFromContents(MyStyle::ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const
-//{
-//    return QSize();
-//}
-
-//int MyStyle::styleHint(MyStyle::StyleHint stylehint, const QStyleOption *opt, const QWidget *widget, QStyleHintReturn *returnData) const
-//{
-//    return 0;
-//}
-
 void MyStyle::polish(QWidget *widget)
 {
     QCommonStyle::polish(widget);
diff --git a/QtMyStyleEx/QtExample03/QtStyleEx/mystyle.h b/QtMyStyleEx/QtExample03/QtStyleEx/mystyle.h
index 53b8312..f57b658 100644
--- a/QtMyStyleEx/QtExample03/QtStyleEx/mystyle.h
+++ b/QtMyStyleEx/QtExample03/QtStyleEx/mystyle.h
@@ -64,22 +64,14 @@ public:
     static void drawPrimitive(const QStyle *style, MyStyle::PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w = nullptr);
     static void drawControl(const QStyle *style, MyStyle::ControlElement element, const QStyleOption *opt, QPainter *p, const QWidget *w);
     static QRect subElementRect(const QStyle *style, MyStyle::SubElement subElement, const QStyleOption *option, const QWidget *widget);
-//    static void drawComplexControl(const QStyle *style, MyStyle::ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget) const;
-//    static QRect subControlRect(const QStyle *style, MyStyle::ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const;
     static int pixelMetric(const QStyle *style, MyStyle::PixelMetric metric, const QStyleOption *option, const QWidget *widget);
-//    static QSize sizeFromContents(const QStyle *style, MyStyle::ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const;
-//    static int styleHint(const QStyle *style, MyStyle::StyleHint stylehint, const QStyleOption *opt, const QWidget *widget, QStyleHintReturn *returnData) const;
 
     //新增加的枚举属 MyStyle:: , 之能够在此内敛函数里面调用
     //[主要用来绘画 自定义新增 的控件枚举 --> 实际调用在 下面的 virtual 里面绘画]
     inline void drawPrimitive(MyStyle::PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w = nullptr) const;
     inline void drawControl(MyStyle::ControlElement element, const QStyleOption *opt, QPainter *p, const QWidget *w) const;
     inline QRect subElementRect(MyStyle::SubElement subElement, const QStyleOption *option, const QWidget *widget) const;
-//    inline void drawComplexControl(MyStyle::ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget) const;
-//    inline QRect subControlRect(MyStyle::ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const;
     inline int pixelMetric(MyStyle::PixelMetric metric, const QStyleOption *option, const QWidget *widget) const;
-//    inline QSize sizeFromContents(MyStyle::ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const;
-//    inline int styleHint(MyStyle::StyleHint stylehint, const QStyleOption *opt, const QWidget *widget, QStyleHintReturn *returnData) const;
 
     //这里的快捷方式创建的枚举,都是不带QStyle:: ; 但是快捷方式的定义是带是QStyle:: , 此处声明的地方必须加上 QStyle:: /*后面改写更复杂的得写上MyStyle:: 因添加自定义的枚举*/
     //这里 override 的虚函数，只能够调用旧有的  QStyle:: 的函数
@@ -135,10 +127,10 @@ public:
     MyStylePainter(QWidget* w);
     ~MyStylePainter() {}
 
-    /*inline*/ void drawPrimitive(MyStyle::PrimitiveElement pe, const QStyleOption *opt);
-    /*inline*/ void drawPrimitive(QStyle::PrimitiveElement pe, const QStyleOption *opt);
-    /*inline*/ void drawControl(MyStyle::ControlElement element, const QStyleOption *opt);
-    /*inline*/ void drawControl(QStyle::ControlElement element, const QStyleOption *opt);
+    void drawPrimitive(MyStyle::PrimitiveElement pe, const QStyleOption *opt);
+    void drawPrimitive(QStyle::PrimitiveElement pe, const QStyleOption *opt);
+    void drawControl(MyStyle::ControlElement element, const QStyleOption *opt);
+    void drawControl(QStyle::ControlElement element, const QStyleOption *opt);
 
 private:
     QWidget* m_widget;
diff --git a/QtMyStyleEx/QtExample03/QtStyleEx/myswitchbutton.cpp b/QtMyStyleEx/QtExample03/QtStyleEx/myswitchbutton.cpp
index 158b369..351d241 100644
--- a/QtMyStyleEx/QtExample03/QtStyleEx/myswitchbutton.cpp
+++ b/QtMyStyleEx/QtExample03/QtStyleEx/myswitchbutton.cpp
@@ -67,7 +67,7 @@ void MySwitchButtonPrivate::init()
     check = false;
     q->setObjectName("MySwitchButton");
     q->setChecked(true);
-    q->setCheckable(true); //clicked  toggled douxuyaokauqi
+    q->setCheckable(true); //clicked  toggled 都需要开启
     q->connect(q, SIGNAL(clicked(bool)), q, SLOT(setChecked(bool)));
 }
 
diff --git a/QtMyStyleEx/QtMyStyleEx.pro b/QtMyStyleEx/QtMyStyleEx.pro
deleted file mode 100644
index 7381416..0000000
--- a/QtMyStyleEx/QtMyStyleEx.pro
+++ /dev/null
@@ -1,28 +0,0 @@
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-CONFIG += c++11
-
-# The following define makes your compiler emit warnings if you use
-# any Qt feature that has been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-SOURCES += \
-    main.cpp \
-    Example.cpp
-
-HEADERS += \
-    Example.h
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
diff --git a/QtMyStyleEx/main.cpp b/QtMyStyleEx/main.cpp
deleted file mode 100644
index 6f3c24c..0000000
--- a/QtMyStyleEx/main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "Example.h"
-
-#include <QApplication>
-
-int main(int argc, char *argv[])
-{
-    QApplication a(argc, argv);
-    Example w;
-    w.show();
-    return a.exec();
-}