From d35ca11ee2434bc25e43165d44f5f28114ab483c Mon Sep 17 00:00:00 2001
From: feiyangqingyun <feiyangqingyun@163.com>
Date: Mon, 30 Jan 2023 11:41:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 control/devicesizetable/devicesizetable.cpp   |   2 +-
 control/navbutton/iconhelper.cpp              |   8 +++----
 control/savelog/savelog.cpp                   |   2 +-
 control/saveruntime/saveruntime.cpp           |   6 +++---
 control/smoothcurve/smoothcurve.cpp           |   6 +++---
 control/zhtopy/zhtopy.cpp                     |   2 +-
 third/3rd_qcustomplot/smoothcurve.cpp         |   6 +++---
 .../qcustomplotdemo/frmcustom/iconhelper.cpp  |   8 +++----
 third/qcustomplotdemo/qrc/font/iconfont.ttf   | Bin 153400 -> 155620 bytes
 ui/core_base/iconhelper.cpp                   |   8 +++----
 ui/core_base/qrc/font/iconfont.ttf            | Bin 153400 -> 155620 bytes
 ui/iconhelper/font/iconfont.ttf               | Bin 153400 -> 155620 bytes
 ui/iconhelper/iconhelper.cpp                  |   8 +++----
 ui/iconhelper/panelwidget.cpp                 |  11 +++++++---
 ui/iconhelper/panelwidget.h                   |   3 +++
 video/playffmpeg/ffmpeg/ffmpeg.cpp            |  11 +++++++++-
 video/playffmpeg/readme.md                    |   2 +-
 video/playffmpeg/widget.cpp                   |   2 +-
 video/plaympv/readme.md                       |   2 +-
 video/videobox/videobox.cpp                   |  20 +++++++++---------
 video/videopanel/videobox.cpp                 |  20 +++++++++---------
 video/videowindow/font/iconfont.ttf           | Bin 153400 -> 155620 bytes
 video/videowindow/videowindow.cpp             |   6 +++---
 .../framelesscore/framelessdialog.cpp         |   2 +-
 .../framelesscore/framelessmainwindow.cpp     |   2 +-
 .../framelesscore/framelesswidget.cpp         |   2 +-
 widget/framelesswidget/framelesswidget2.cpp   |   2 +-
 .../lunarcalendarwidget.cpp                   |   2 +-
 widget/maskwidget/maskwidget.cpp              |   4 ++--
 widget/movewidget/movewidget.cpp              |   6 +++---
 30 files changed, 85 insertions(+), 68 deletions(-)

diff --git a/control/devicesizetable/devicesizetable.cpp b/control/devicesizetable/devicesizetable.cpp
index a5a5528..9c08120 100644
--- a/control/devicesizetable/devicesizetable.cpp
+++ b/control/devicesizetable/devicesizetable.cpp
@@ -218,7 +218,7 @@ void DeviceSizeTable::checkSize(const QString &result, const QString &name)
     QStringList list = result.split(" ");
     int index = 0;
 
-    for (int i = 0; i < list.count(); ++i) {
+    for (int i = 0; i < list.size(); ++i) {
         QString s = list.at(i).trimmed();
         if (s.isEmpty()) {
             continue;
diff --git a/control/navbutton/iconhelper.cpp b/control/navbutton/iconhelper.cpp
index 88795dc..cb3762c 100644
--- a/control/navbutton/iconhelper.cpp
+++ b/control/navbutton/iconhelper.cpp
@@ -136,7 +136,7 @@ IconHelper::IconHelper(const QString &fontFile, const QString &fontName, QObject
     if (!fontDb.families().contains(fontName) && QFile(fontFile).exists()) {
         int fontId = fontDb.addApplicationFont(fontFile);
         QStringList listName = fontDb.applicationFontFamilies(fontId);
-        if (listName.count() == 0) {
+        if (listName.size() == 0) {
             qDebug() << QString("load %1 error").arg(fontName);
         }
     }
@@ -265,8 +265,8 @@ void IconHelper::setStyle1(QWidget *widget, QList<QToolButton *> btns, QList<int
 
 void IconHelper::setStyle1(QWidget *widget, QList<QAbstractButton *> btns, QList<int> icons, const IconHelper::StyleColor &styleColor)
 {
-    int btnCount = btns.count();
-    int iconCount = icons.count();
+    int btnCount = btns.size();
+    int iconCount = icons.size();
     if (btnCount <= 0 || iconCount <= 0 || btnCount != iconCount) {
         return;
     }
@@ -329,7 +329,7 @@ void IconHelper::setStyle1(QWidget *widget, QList<QAbstractButton *> btns, QList
 
     //可能会重复调用设置所以先要移除上一次的
     for (int i = 0; i < btnCount; ++i) {
-        for (int j = 0; j < this->btns.count(); j++) {
+        for (int j = 0; j < this->btns.size(); j++) {
             if (this->btns.at(j) == btns.at(i)) {
                 disconnect(btns.at(i), SIGNAL(toggled(bool)), this, SLOT(toggled(bool)));
                 this->btns.at(j)->removeEventFilter(this);
diff --git a/control/savelog/savelog.cpp b/control/savelog/savelog.cpp
index 210016f..483a579 100644
--- a/control/savelog/savelog.cpp
+++ b/control/savelog/savelog.cpp
@@ -114,7 +114,7 @@ SaveLog::SaveLog(QObject *parent) : QObject(parent)
     //默认取应用程序可执行文件名称
     QString str = qApp->applicationFilePath();
     QStringList list = str.split("/");
-    name = list.at(list.count() - 1).split(".").at(0);
+    name = list.at(list.size() - 1).split(".").at(0);
     fileName = "";
 
     //默认所有类型都输出
diff --git a/control/saveruntime/saveruntime.cpp b/control/saveruntime/saveruntime.cpp
index 0411fe5..8883c57 100644
--- a/control/saveruntime/saveruntime.cpp
+++ b/control/saveruntime/saveruntime.cpp
@@ -28,7 +28,7 @@ SaveRunTime::SaveRunTime(QObject *parent) : QObject(parent)
     path = qApp->applicationDirPath();
     QString str = qApp->applicationFilePath();
     QStringList list = str.split("/");
-    name = list.at(list.count() - 1).split(".").at(0);
+    name = list.at(list.size() - 1).split(".").at(0);
 
     saveInterval = 1 * 60 * 1000;
     startTime = QDateTime::currentDateTime();
@@ -187,7 +187,7 @@ void SaveRunTime::saveLog()
         //重新清空文件
         file.resize(0);
         //如果行数小于2则返回
-        if (content.count() < 2) {
+        if (content.size() < 2) {
             file.close();
             return;
         }
@@ -206,7 +206,7 @@ void SaveRunTime::saveLog()
         lastLine = list.join("\t");
 
         //重新替换最后一行并写入新的数据
-        content[content.count() - 1] = lastLine;
+        content[content.size() - 1] = lastLine;
 
         QTextStream stream(&file);
         stream << content.join("") << "\n";
diff --git a/control/smoothcurve/smoothcurve.cpp b/control/smoothcurve/smoothcurve.cpp
index 0977868..98e3fcf 100644
--- a/control/smoothcurve/smoothcurve.cpp
+++ b/control/smoothcurve/smoothcurve.cpp
@@ -24,13 +24,13 @@ QPainterPath SmoothCurve::createSmoothCurve(const QVector<QPointF> &points)
 QPainterPath SmoothCurve::createSmoothCurve2(const QVector<QPointF> &points)
 {
     //采用Qt原生方法不做任何处理
-    int count = points.count();
-    if (count == 0) {
+    int size = points.size();
+    if (size == 0) {
         return QPainterPath();
     }
 
     QPainterPath path(points.at(0));
-    for (int i = 0; i < count - 1; ++i) {
+    for (int i = 0; i < size - 1; ++i) {
         //控制点的 x 坐标为 sp 与 ep 的 x 坐标和的一半
         //第一个控制点 c1 的 y 坐标为起始点 sp 的 y 坐标
         //第二个控制点 c2 的 y 坐标为结束点 ep 的 y 坐标
diff --git a/control/zhtopy/zhtopy.cpp b/control/zhtopy/zhtopy.cpp
index d09a52f..c702878 100644
--- a/control/zhtopy/zhtopy.cpp
+++ b/control/zhtopy/zhtopy.cpp
@@ -250,7 +250,7 @@ void ZhToPY::loadPY(const QString &fileName)
 
 QString ZhToPY::zhToPY(const QString &chinese)
 {
-    if (listPY.count() == 0) {
+    if (listPY.size() == 0) {
         return "";
     }
 
diff --git a/third/3rd_qcustomplot/smoothcurve.cpp b/third/3rd_qcustomplot/smoothcurve.cpp
index 0977868..98e3fcf 100644
--- a/third/3rd_qcustomplot/smoothcurve.cpp
+++ b/third/3rd_qcustomplot/smoothcurve.cpp
@@ -24,13 +24,13 @@ QPainterPath SmoothCurve::createSmoothCurve(const QVector<QPointF> &points)
 QPainterPath SmoothCurve::createSmoothCurve2(const QVector<QPointF> &points)
 {
     //采用Qt原生方法不做任何处理
-    int count = points.count();
-    if (count == 0) {
+    int size = points.size();
+    if (size == 0) {
         return QPainterPath();
     }
 
     QPainterPath path(points.at(0));
-    for (int i = 0; i < count - 1; ++i) {
+    for (int i = 0; i < size - 1; ++i) {
         //控制点的 x 坐标为 sp 与 ep 的 x 坐标和的一半
         //第一个控制点 c1 的 y 坐标为起始点 sp 的 y 坐标
         //第二个控制点 c2 的 y 坐标为结束点 ep 的 y 坐标
diff --git a/third/qcustomplotdemo/frmcustom/iconhelper.cpp b/third/qcustomplotdemo/frmcustom/iconhelper.cpp
index 88795dc..cb3762c 100644
--- a/third/qcustomplotdemo/frmcustom/iconhelper.cpp
+++ b/third/qcustomplotdemo/frmcustom/iconhelper.cpp
@@ -136,7 +136,7 @@ IconHelper::IconHelper(const QString &fontFile, const QString &fontName, QObject
     if (!fontDb.families().contains(fontName) && QFile(fontFile).exists()) {
         int fontId = fontDb.addApplicationFont(fontFile);
         QStringList listName = fontDb.applicationFontFamilies(fontId);
-        if (listName.count() == 0) {
+        if (listName.size() == 0) {
             qDebug() << QString("load %1 error").arg(fontName);
         }
     }
@@ -265,8 +265,8 @@ void IconHelper::setStyle1(QWidget *widget, QList<QToolButton *> btns, QList<int
 
 void IconHelper::setStyle1(QWidget *widget, QList<QAbstractButton *> btns, QList<int> icons, const IconHelper::StyleColor &styleColor)
 {
-    int btnCount = btns.count();
-    int iconCount = icons.count();
+    int btnCount = btns.size();
+    int iconCount = icons.size();
     if (btnCount <= 0 || iconCount <= 0 || btnCount != iconCount) {
         return;
     }
@@ -329,7 +329,7 @@ void IconHelper::setStyle1(QWidget *widget, QList<QAbstractButton *> btns, QList
 
     //可能会重复调用设置所以先要移除上一次的
     for (int i = 0; i < btnCount; ++i) {
-        for (int j = 0; j < this->btns.count(); j++) {
+        for (int j = 0; j < this->btns.size(); j++) {
             if (this->btns.at(j) == btns.at(i)) {
                 disconnect(btns.at(i), SIGNAL(toggled(bool)), this, SLOT(toggled(bool)));
                 this->btns.at(j)->removeEventFilter(this);
diff --git a/third/qcustomplotdemo/qrc/font/iconfont.ttf b/third/qcustomplotdemo/qrc/font/iconfont.ttf
index 6759435c8c0fbbf3cbc1c4289869cd25677d6e8e..4757471a25bd8665ad203234c8cfef9bf5e8aa38 100644
GIT binary patch
delta 2892
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

delta 643
zcmXYvT}V@57{~w5bKJ){Tbgd`bIemL(u=}M@*<;wU6fFy5JUxI)od5ejas(4$bm!!
zT?8w#E@C%b1QF4wGlCj{;0m*}X_|skYd7mAsjHy%oY@P%_y2sJ_u)NnDX-?9sJHZ?
zlEeBHus;Q~iL?Ee`ZDiF4gni}f!Fs&!l5(X@$NqW9t*o85>O3mS?rSFk3<v6pIdv5
z0CXL&we-hMhiGZ^HsDH$pNNK%ab*wvki1>$^?^_{yg%PJ2W~$AD86{?{7_<fbhsJZ
z5doS%f}~6sTsL(u*wFbKjyeedv+Zr)OkK>(bXAwD+bw0~k+^nnt)teXq^c>Lw0xI*
z!BYMoH=AmUa%O}UXbDGa0hV2Zmi1A$&4&R5s(+zEm#Tnd0(gO!)hh1b6awj@ecKju
z5Jm6{Vk-~CGpF^7YBj%3xtwlMFOnynQ5We|Hl<m(b)JeeNmKNRrfG&g(=5%=7b?&g
zoYD+io4Lyx$&Neo)`RmvMZRi6MNyfuBB#-$s6~*IXj)X7D=x9$in>>zf~aQ&8cQE@
zH)k)neYT!AU^NKVd_n>2xB+(V666oBx(cqBORT>FZa5BJod7rX3Ln5tufeVfu%{8c
z<|cUUJ9!Zf^HmJ%-fOy-4BgAmtj6<Je%NH3=wv&24kLy^gb|fn3*(&J=1%M|l6!d*
V(}Hn-ALkS!-o+go?`{rq{vQfnm{9-#

diff --git a/ui/core_base/iconhelper.cpp b/ui/core_base/iconhelper.cpp
index 88795dc..cb3762c 100644
--- a/ui/core_base/iconhelper.cpp
+++ b/ui/core_base/iconhelper.cpp
@@ -136,7 +136,7 @@ IconHelper::IconHelper(const QString &fontFile, const QString &fontName, QObject
     if (!fontDb.families().contains(fontName) && QFile(fontFile).exists()) {
         int fontId = fontDb.addApplicationFont(fontFile);
         QStringList listName = fontDb.applicationFontFamilies(fontId);
-        if (listName.count() == 0) {
+        if (listName.size() == 0) {
             qDebug() << QString("load %1 error").arg(fontName);
         }
     }
@@ -265,8 +265,8 @@ void IconHelper::setStyle1(QWidget *widget, QList<QToolButton *> btns, QList<int
 
 void IconHelper::setStyle1(QWidget *widget, QList<QAbstractButton *> btns, QList<int> icons, const IconHelper::StyleColor &styleColor)
 {
-    int btnCount = btns.count();
-    int iconCount = icons.count();
+    int btnCount = btns.size();
+    int iconCount = icons.size();
     if (btnCount <= 0 || iconCount <= 0 || btnCount != iconCount) {
         return;
     }
@@ -329,7 +329,7 @@ void IconHelper::setStyle1(QWidget *widget, QList<QAbstractButton *> btns, QList
 
     //可能会重复调用设置所以先要移除上一次的
     for (int i = 0; i < btnCount; ++i) {
-        for (int j = 0; j < this->btns.count(); j++) {
+        for (int j = 0; j < this->btns.size(); j++) {
             if (this->btns.at(j) == btns.at(i)) {
                 disconnect(btns.at(i), SIGNAL(toggled(bool)), this, SLOT(toggled(bool)));
                 this->btns.at(j)->removeEventFilter(this);
diff --git a/ui/core_base/qrc/font/iconfont.ttf b/ui/core_base/qrc/font/iconfont.ttf
index 6759435c8c0fbbf3cbc1c4289869cd25677d6e8e..4757471a25bd8665ad203234c8cfef9bf5e8aa38 100644
GIT binary patch
delta 2892
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

delta 643
zcmXYvT}V@57{~w5bKJ){Tbgd`bIemL(u=}M@*<;wU6fFy5JUxI)od5ejas(4$bm!!
zT?8w#E@C%b1QF4wGlCj{;0m*}X_|skYd7mAsjHy%oY@P%_y2sJ_u)NnDX-?9sJHZ?
zlEeBHus;Q~iL?Ee`ZDiF4gni}f!Fs&!l5(X@$NqW9t*o85>O3mS?rSFk3<v6pIdv5
z0CXL&we-hMhiGZ^HsDH$pNNK%ab*wvki1>$^?^_{yg%PJ2W~$AD86{?{7_<fbhsJZ
z5doS%f}~6sTsL(u*wFbKjyeedv+Zr)OkK>(bXAwD+bw0~k+^nnt)teXq^c>Lw0xI*
z!BYMoH=AmUa%O}UXbDGa0hV2Zmi1A$&4&R5s(+zEm#Tnd0(gO!)hh1b6awj@ecKju
z5Jm6{Vk-~CGpF^7YBj%3xtwlMFOnynQ5We|Hl<m(b)JeeNmKNRrfG&g(=5%=7b?&g
zoYD+io4Lyx$&Neo)`RmvMZRi6MNyfuBB#-$s6~*IXj)X7D=x9$in>>zf~aQ&8cQE@
zH)k)neYT!AU^NKVd_n>2xB+(V666oBx(cqBORT>FZa5BJod7rX3Ln5tufeVfu%{8c
z<|cUUJ9!Zf^HmJ%-fOy-4BgAmtj6<Je%NH3=wv&24kLy^gb|fn3*(&J=1%M|l6!d*
V(}Hn-ALkS!-o+go?`{rq{vQfnm{9-#

diff --git a/ui/iconhelper/font/iconfont.ttf b/ui/iconhelper/font/iconfont.ttf
index 6759435c8c0fbbf3cbc1c4289869cd25677d6e8e..4757471a25bd8665ad203234c8cfef9bf5e8aa38 100644
GIT binary patch
delta 2892
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

delta 643
zcmXYvT}V@57{~w5bKJ){Tbgd`bIemL(u=}M@*<;wU6fFy5JUxI)od5ejas(4$bm!!
zT?8w#E@C%b1QF4wGlCj{;0m*}X_|skYd7mAsjHy%oY@P%_y2sJ_u)NnDX-?9sJHZ?
zlEeBHus;Q~iL?Ee`ZDiF4gni}f!Fs&!l5(X@$NqW9t*o85>O3mS?rSFk3<v6pIdv5
z0CXL&we-hMhiGZ^HsDH$pNNK%ab*wvki1>$^?^_{yg%PJ2W~$AD86{?{7_<fbhsJZ
z5doS%f}~6sTsL(u*wFbKjyeedv+Zr)OkK>(bXAwD+bw0~k+^nnt)teXq^c>Lw0xI*
z!BYMoH=AmUa%O}UXbDGa0hV2Zmi1A$&4&R5s(+zEm#Tnd0(gO!)hh1b6awj@ecKju
z5Jm6{Vk-~CGpF^7YBj%3xtwlMFOnynQ5We|Hl<m(b)JeeNmKNRrfG&g(=5%=7b?&g
zoYD+io4Lyx$&Neo)`RmvMZRi6MNyfuBB#-$s6~*IXj)X7D=x9$in>>zf~aQ&8cQE@
zH)k)neYT!AU^NKVd_n>2xB+(V666oBx(cqBORT>FZa5BJod7rX3Ln5tufeVfu%{8c
z<|cUUJ9!Zf^HmJ%-fOy-4BgAmtj6<Je%NH3=wv&24kLy^gb|fn3*(&J=1%M|l6!d*
V(}Hn-ALkS!-o+go?`{rq{vQfnm{9-#

diff --git a/ui/iconhelper/iconhelper.cpp b/ui/iconhelper/iconhelper.cpp
index 88795dc..cb3762c 100644
--- a/ui/iconhelper/iconhelper.cpp
+++ b/ui/iconhelper/iconhelper.cpp
@@ -136,7 +136,7 @@ IconHelper::IconHelper(const QString &fontFile, const QString &fontName, QObject
     if (!fontDb.families().contains(fontName) && QFile(fontFile).exists()) {
         int fontId = fontDb.addApplicationFont(fontFile);
         QStringList listName = fontDb.applicationFontFamilies(fontId);
-        if (listName.count() == 0) {
+        if (listName.size() == 0) {
             qDebug() << QString("load %1 error").arg(fontName);
         }
     }
@@ -265,8 +265,8 @@ void IconHelper::setStyle1(QWidget *widget, QList<QToolButton *> btns, QList<int
 
 void IconHelper::setStyle1(QWidget *widget, QList<QAbstractButton *> btns, QList<int> icons, const IconHelper::StyleColor &styleColor)
 {
-    int btnCount = btns.count();
-    int iconCount = icons.count();
+    int btnCount = btns.size();
+    int iconCount = icons.size();
     if (btnCount <= 0 || iconCount <= 0 || btnCount != iconCount) {
         return;
     }
@@ -329,7 +329,7 @@ void IconHelper::setStyle1(QWidget *widget, QList<QAbstractButton *> btns, QList
 
     //可能会重复调用设置所以先要移除上一次的
     for (int i = 0; i < btnCount; ++i) {
-        for (int j = 0; j < this->btns.count(); j++) {
+        for (int j = 0; j < this->btns.size(); j++) {
             if (this->btns.at(j) == btns.at(i)) {
                 disconnect(btns.at(i), SIGNAL(toggled(bool)), this, SLOT(toggled(bool)));
                 this->btns.at(j)->removeEventFilter(this);
diff --git a/ui/iconhelper/panelwidget.cpp b/ui/iconhelper/panelwidget.cpp
index bb2283a..39aba2c 100644
--- a/ui/iconhelper/panelwidget.cpp
+++ b/ui/iconhelper/panelwidget.cpp
@@ -30,6 +30,9 @@ PanelWidget::PanelWidget(QWidget *parent) : QWidget(parent)
     scrollArea->setWidget(scrollAreaContents);
     frame->setStyleSheet("QFrame#frameMain{border-width:0px;}");
 
+    hSpacer = new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum);
+    vSpacer = new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
     margin = 0;
     space = 0;
     autoWidth = false;
@@ -133,12 +136,16 @@ void PanelWidget::loadWidgets()
     int column = 0;
     int index = 0;
 
-    //先把之前的所有移除并不可见
+    //先把之前的所有移除并不可见    
     foreach (QWidget *widget, widgets) {
         gridLayout->removeWidget(widget);
         widget->setVisible(false);
     }
 
+    //移除所有弹簧
+    gridLayout->removeItem(hSpacer);
+    gridLayout->removeItem(vSpacer);
+
     //重新添加到布局中并可见
     foreach (QWidget *widget, widgets) {
         gridLayout->addWidget(widget, row, column);
@@ -156,13 +163,11 @@ void PanelWidget::loadWidgets()
 
     //设置右边弹簧
     if (!autoWidth) {
-        QSpacerItem *hSpacer = new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Minimum);
         gridLayout->addItem(hSpacer, 0, gridLayout->columnCount());
     }
 
     //设置底边弹簧
     if (!autoHeight) {
-        QSpacerItem *vSpacer = new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
         gridLayout->addItem(vSpacer, row, 0);
     }
 }
diff --git a/ui/iconhelper/panelwidget.h b/ui/iconhelper/panelwidget.h
index 195d054..f0544f8 100644
--- a/ui/iconhelper/panelwidget.h
+++ b/ui/iconhelper/panelwidget.h
@@ -16,6 +16,7 @@ class QScrollArea;
 class QFrame;
 class QVBoxLayout;
 class QGridLayout;
+class QSpacerItem;
 
 #ifdef quc
 class Q_DECL_EXPORT PanelWidget : public QWidget
@@ -43,6 +44,8 @@ private:
     QFrame *frame;                  //放置设备的框架,自动变宽变高
     QVBoxLayout *verticalLayout;    //设备面板总布局
     QGridLayout *gridLayout;        //设备表格布局
+    QSpacerItem *hSpacer;           //横向弹簧
+    QSpacerItem *vSpacer;           //垂直弹簧
 
     int margin;                     //边距
     int space;                      //设备之间的间隔
diff --git a/video/playffmpeg/ffmpeg/ffmpeg.cpp b/video/playffmpeg/ffmpeg/ffmpeg.cpp
index 6a4f0ea..c455b87 100644
--- a/video/playffmpeg/ffmpeg/ffmpeg.cpp
+++ b/video/playffmpeg/ffmpeg/ffmpeg.cpp
@@ -253,7 +253,7 @@ void FFmpegThread::run()
                     continue;
                 }
 
-                frameFinish = avcodec_receive_frame(videoCodec, avFrame2);                
+                frameFinish = avcodec_receive_frame(videoCodec, avFrame2);
                 if (frameFinish < 0) {
                     continue;
                 }
@@ -383,7 +383,16 @@ void FFmpegWidget::paintEvent(QPaintEvent *)
 
     //qDebug() << TIMEMS << "paintEvent" << objectName();
     QPainter painter(this);
+#if 0
+    //image = image.scaled(this->size(), Qt::KeepAspectRatio);
+    //按照比例自动居中绘制
+    int pixX = rect().center().x() - image.width() / 2;
+    int pixY = rect().center().y() - image.height() / 2;
+    QPoint point(pixX, pixY);
+    painter.drawImage(point, image);
+#else
     painter.drawImage(this->rect(), image);
+#endif
 }
 
 void FFmpegWidget::updateImage(const QImage &image)
diff --git a/video/playffmpeg/readme.md b/video/playffmpeg/readme.md
index 582272d..6e1e78e 100644
--- a/video/playffmpeg/readme.md
+++ b/video/playffmpeg/readme.md
@@ -1,7 +1,7 @@
 ### 特别说明
 1. 编译完成以后记得将动态库文件复制到可执行文件同一目录。
 2. 动态库地址：[https://pan.baidu.com/s/13LDRu6mXC6gaADtrGprNVA](https://pan.baidu.com/s/13LDRu6mXC6gaADtrGprNVA) 提取码: ujm7
-3. 收费增强版：[https://qtchina.blog.csdn.net/article/details/103946731](https://qtchina.blog.csdn.net/article/details/103946731)
+3. 收费增强版：[https://qtchina.blog.csdn.net/article/details/103946067](https://qtchina.blog.csdn.net/article/details/103946067)
 
 ### 其他说明
 1. 作品大全：[https://qtchina.blog.csdn.net/article/details/97565652](https://qtchina.blog.csdn.net/article/details/97565652)
diff --git a/video/playffmpeg/widget.cpp b/video/playffmpeg/widget.cpp
index ccf8763..bc99ab9 100644
--- a/video/playffmpeg/widget.cpp
+++ b/video/playffmpeg/widget.cpp
@@ -7,7 +7,7 @@ Widget::Widget(QWidget *parent) : QWidget(parent), ui(new Ui::Widget)
     ui->setupUi(this);
 
     QStringList urls;
-    urls << "https://hls01open.ys7.com/openlive/6e0b2be040a943489ef0b9bb344b96b8.hd.m3u8";
+    urls << "f:/1.mp4";
     urls << "rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov";
     urls << "http://vfx.mtime.cn/Video/2019/02/04/mp4/190204084208765161.mp4";
     urls << "rtsp://admin:Admin123456@192.168.0.15:554/media/video1";
diff --git a/video/plaympv/readme.md b/video/plaympv/readme.md
index 15a7253..d65e1a8 100644
--- a/video/plaympv/readme.md
+++ b/video/plaympv/readme.md
@@ -1,7 +1,7 @@
 ### 特别说明
 1. 编译完成以后记得将dll文件复制到可执行文件同一目录。
 2. 动态库地址：[https://pan.baidu.com/s/13LDRu6mXC6gaADtrGprNVA](https://pan.baidu.com/s/13LDRu6mXC6gaADtrGprNVA) 提取码: ujm7
-3. 收费增强版：[https://qtchina.blog.csdn.net/article/details/107972067](https://qtchina.blog.csdn.net/article/details/107972067)
+3. 收费增强版：[https://qtchina.blog.csdn.net/article/details/103946067](https://qtchina.blog.csdn.net/article/details/103946067)
 
 ### 其他说明
 1. 作品大全：[https://qtchina.blog.csdn.net/article/details/97565652](https://qtchina.blog.csdn.net/article/details/97565652)
diff --git a/video/videobox/videobox.cpp b/video/videobox/videobox.cpp
index 7f71563..d5a72ac 100644
--- a/video/videobox/videobox.cpp
+++ b/video/videobox/videobox.cpp
@@ -37,7 +37,7 @@ void VideoBox::addMenu(QMenu *menu, int type)
 
     //超过一个子元素则添加子菜单
     QMenu *menuSub;
-    if (flags.count() > 1) {
+    if (flags.size() > 1) {
         menuSub = menu->addMenu(name);
     } else {
         menuSub = menu;
@@ -50,7 +50,7 @@ void VideoBox::addMenu(QMenu *menu, int type)
 
         //对应菜单文本
         QString text = QString("%1%2-%1%3").arg(actionFlag).arg(start).arg(end);
-        if (flags.count() == 1) {
+        if (flags.size() == 1) {
             text = name;
         }
 
@@ -76,7 +76,7 @@ void VideoBox::setLayout(QGridLayout *gridLayout)
 void VideoBox::setWidgets(QWidgetList widgets)
 {
     this->widgets = widgets;
-    this->videoCount = widgets.count();
+    this->videoCount = widgets.size();
 }
 
 void VideoBox::setMenuFlag(const QString &menuFlag)
@@ -97,7 +97,7 @@ void VideoBox::setTypes(const QMap<int, QStringList> &types)
 void VideoBox::initMenu(QMenu *menu, const QList<bool> &enable)
 {
     //通过菜单是否可见设置每个菜单可见与否
-    if (enable.count() < 9) {
+    if (enable.size() < 9) {
         return;
     }
 
@@ -209,7 +209,7 @@ void VideoBox::change_video_normal(int index, int flag)
 {
     //首先隐藏所有通道
     hide_video_all();
-    int count = 0;
+    int size = 0;
     int row = 0;
     int column = 0;
 
@@ -221,7 +221,7 @@ void VideoBox::change_video_normal(int index, int flag)
             gridLayout->addWidget(widgets.at(i), row, column);
             widgets.at(i)->setVisible(true);
 
-            count++;
+            size++;
             column++;
             if (column == flag) {
                 row++;
@@ -229,7 +229,7 @@ void VideoBox::change_video_normal(int index, int flag)
             }
         }
 
-        if (count == (flag * flag)) {
+        if (size == (flag * flag)) {
             break;
         }
     }
@@ -255,7 +255,7 @@ void VideoBox::change_video_custom(int index, int type)
 void VideoBox::change_video_6(const QList<int> &indexs)
 {
     //过滤防止索引越界
-    if (indexs.count() < 6) {
+    if (indexs.size() < 6) {
         return;
     }
 
@@ -277,7 +277,7 @@ void VideoBox::change_video_6(const QList<int> &indexs)
 void VideoBox::change_video_8(const QList<int> &indexs)
 {
     //过滤防止索引越界
-    if (indexs.count() < 8) {
+    if (indexs.size() < 8) {
         return;
     }
 
@@ -301,7 +301,7 @@ void VideoBox::change_video_8(const QList<int> &indexs)
 void VideoBox::change_video_13(const QList<int> &indexs)
 {
     //过滤防止索引越界
-    if (indexs.count() < 13) {
+    if (indexs.size() < 13) {
         return;
     }
 
diff --git a/video/videopanel/videobox.cpp b/video/videopanel/videobox.cpp
index 7f71563..d5a72ac 100644
--- a/video/videopanel/videobox.cpp
+++ b/video/videopanel/videobox.cpp
@@ -37,7 +37,7 @@ void VideoBox::addMenu(QMenu *menu, int type)
 
     //超过一个子元素则添加子菜单
     QMenu *menuSub;
-    if (flags.count() > 1) {
+    if (flags.size() > 1) {
         menuSub = menu->addMenu(name);
     } else {
         menuSub = menu;
@@ -50,7 +50,7 @@ void VideoBox::addMenu(QMenu *menu, int type)
 
         //对应菜单文本
         QString text = QString("%1%2-%1%3").arg(actionFlag).arg(start).arg(end);
-        if (flags.count() == 1) {
+        if (flags.size() == 1) {
             text = name;
         }
 
@@ -76,7 +76,7 @@ void VideoBox::setLayout(QGridLayout *gridLayout)
 void VideoBox::setWidgets(QWidgetList widgets)
 {
     this->widgets = widgets;
-    this->videoCount = widgets.count();
+    this->videoCount = widgets.size();
 }
 
 void VideoBox::setMenuFlag(const QString &menuFlag)
@@ -97,7 +97,7 @@ void VideoBox::setTypes(const QMap<int, QStringList> &types)
 void VideoBox::initMenu(QMenu *menu, const QList<bool> &enable)
 {
     //通过菜单是否可见设置每个菜单可见与否
-    if (enable.count() < 9) {
+    if (enable.size() < 9) {
         return;
     }
 
@@ -209,7 +209,7 @@ void VideoBox::change_video_normal(int index, int flag)
 {
     //首先隐藏所有通道
     hide_video_all();
-    int count = 0;
+    int size = 0;
     int row = 0;
     int column = 0;
 
@@ -221,7 +221,7 @@ void VideoBox::change_video_normal(int index, int flag)
             gridLayout->addWidget(widgets.at(i), row, column);
             widgets.at(i)->setVisible(true);
 
-            count++;
+            size++;
             column++;
             if (column == flag) {
                 row++;
@@ -229,7 +229,7 @@ void VideoBox::change_video_normal(int index, int flag)
             }
         }
 
-        if (count == (flag * flag)) {
+        if (size == (flag * flag)) {
             break;
         }
     }
@@ -255,7 +255,7 @@ void VideoBox::change_video_custom(int index, int type)
 void VideoBox::change_video_6(const QList<int> &indexs)
 {
     //过滤防止索引越界
-    if (indexs.count() < 6) {
+    if (indexs.size() < 6) {
         return;
     }
 
@@ -277,7 +277,7 @@ void VideoBox::change_video_6(const QList<int> &indexs)
 void VideoBox::change_video_8(const QList<int> &indexs)
 {
     //过滤防止索引越界
-    if (indexs.count() < 8) {
+    if (indexs.size() < 8) {
         return;
     }
 
@@ -301,7 +301,7 @@ void VideoBox::change_video_8(const QList<int> &indexs)
 void VideoBox::change_video_13(const QList<int> &indexs)
 {
     //过滤防止索引越界
-    if (indexs.count() < 13) {
+    if (indexs.size() < 13) {
         return;
     }
 
diff --git a/video/videowindow/font/iconfont.ttf b/video/videowindow/font/iconfont.ttf
index 6759435c8c0fbbf3cbc1c4289869cd25677d6e8e..4757471a25bd8665ad203234c8cfef9bf5e8aa38 100644
GIT binary patch
delta 2892
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

delta 643
zcmXYvT}V@57{~w5bKJ){Tbgd`bIemL(u=}M@*<;wU6fFy5JUxI)od5ejas(4$bm!!
zT?8w#E@C%b1QF4wGlCj{;0m*}X_|skYd7mAsjHy%oY@P%_y2sJ_u)NnDX-?9sJHZ?
zlEeBHus;Q~iL?Ee`ZDiF4gni}f!Fs&!l5(X@$NqW9t*o85>O3mS?rSFk3<v6pIdv5
z0CXL&we-hMhiGZ^HsDH$pNNK%ab*wvki1>$^?^_{yg%PJ2W~$AD86{?{7_<fbhsJZ
z5doS%f}~6sTsL(u*wFbKjyeedv+Zr)OkK>(bXAwD+bw0~k+^nnt)teXq^c>Lw0xI*
z!BYMoH=AmUa%O}UXbDGa0hV2Zmi1A$&4&R5s(+zEm#Tnd0(gO!)hh1b6awj@ecKju
z5Jm6{Vk-~CGpF^7YBj%3xtwlMFOnynQ5We|Hl<m(b)JeeNmKNRrfG&g(=5%=7b?&g
zoYD+io4Lyx$&Neo)`RmvMZRi6MNyfuBB#-$s6~*IXj)X7D=x9$in>>zf~aQ&8cQE@
zH)k)neYT!AU^NKVd_n>2xB+(V666oBx(cqBORT>FZa5BJod7rX3Ln5tufeVfu%{8c
z<|cUUJ9!Zf^HmJ%-fOy-4BgAmtj6<Je%NH3=wv&24kLy^gb|fn3*(&J=1%M|l6!d*
V(}Hn-ALkS!-o+go?`{rq{vQfnm{9-#

diff --git a/video/videowindow/videowindow.cpp b/video/videowindow/videowindow.cpp
index 5f23894..a0770b5 100644
--- a/video/videowindow/videowindow.cpp
+++ b/video/videowindow/videowindow.cpp
@@ -109,7 +109,7 @@ void VideoWindow::initFlowPanel()
     if (!fontDb.families().contains("iconfont")) {
         int fontId = fontDb.addApplicationFont(":/font/iconfont.ttf");
         QStringList fontName = fontDb.applicationFontFamilies(fontId);
-        if (fontName.count() == 0) {
+        if (fontName.size() == 0) {
             qDebug() << "load iconfont.ttf error";
         }
     }
@@ -124,7 +124,7 @@ void VideoWindow::initFlowPanel()
 #endif
 
     //循环添加顶部按钮
-    for (int i = 0; i < btns.count(); ++i) {
+    for (int i = 0; i < btns.size(); ++i) {
         QPushButton *btn = new QPushButton;
         //绑定按钮单击事件,用来发出信号通知
         connect(btn, SIGNAL(clicked(bool)), this, SLOT(btnClicked()));
@@ -208,7 +208,7 @@ void VideoWindow::dropEvent(QDropEvent *event)
         url = event->mimeData()->urls().first().toLocalFile();
     } else if (event->mimeData()->hasFormat("application/x-qabstractitemmodeldatalist")) {
         QTreeWidget *treeWidget = (QTreeWidget *)event->source();
-        if (treeWidget != 0) {
+        if (treeWidget) {
             url = treeWidget->currentItem()->data(0, Qt::UserRole).toString();
         }
     }
diff --git a/widget/framelesswidget/framelesscore/framelessdialog.cpp b/widget/framelesswidget/framelesscore/framelessdialog.cpp
index e5c81bc..9d8f875 100644
--- a/widget/framelesswidget/framelesscore/framelessdialog.cpp
+++ b/widget/framelesswidget/framelesscore/framelessdialog.cpp
@@ -319,7 +319,7 @@ bool FramelessDialog::nativeEvent(const QByteArray &eventType, void *message, lo
             }
 
             //识别标题栏拖动产生半屏全屏效果
-            if (titleBar != 0 && titleBar->rect().contains(pos)) {
+            if (titleBar && titleBar->rect().contains(pos)) {
                 QWidget *child = titleBar->childAt(pos);
                 if (!child) {
                     *result = HTCAPTION;
diff --git a/widget/framelesswidget/framelesscore/framelessmainwindow.cpp b/widget/framelesswidget/framelesscore/framelessmainwindow.cpp
index c685cdd..2cc91cf 100644
--- a/widget/framelesswidget/framelesscore/framelessmainwindow.cpp
+++ b/widget/framelesswidget/framelesscore/framelessmainwindow.cpp
@@ -319,7 +319,7 @@ bool FramelessMainWindow::nativeEvent(const QByteArray &eventType, void *message
             }
 
             //识别标题栏拖动产生半屏全屏效果
-            if (titleBar != 0 && titleBar->rect().contains(pos)) {
+            if (titleBar && titleBar->rect().contains(pos)) {
                 QWidget *child = titleBar->childAt(pos);
                 if (!child) {
                     *result = HTCAPTION;
diff --git a/widget/framelesswidget/framelesscore/framelesswidget.cpp b/widget/framelesswidget/framelesscore/framelesswidget.cpp
index 4e99e43..8382588 100644
--- a/widget/framelesswidget/framelesscore/framelesswidget.cpp
+++ b/widget/framelesswidget/framelesscore/framelesswidget.cpp
@@ -319,7 +319,7 @@ bool FramelessWidget::nativeEvent(const QByteArray &eventType, void *message, lo
             }
 
             //识别标题栏拖动产生半屏全屏效果
-            if (titleBar != 0 && titleBar->rect().contains(pos)) {
+            if (titleBar && titleBar->rect().contains(pos)) {
                 QWidget *child = titleBar->childAt(pos);
                 if (!child) {
                     *result = HTCAPTION;
diff --git a/widget/framelesswidget/framelesswidget2.cpp b/widget/framelesswidget/framelesswidget2.cpp
index f871975..9939c5d 100644
--- a/widget/framelesswidget/framelesswidget2.cpp
+++ b/widget/framelesswidget/framelesswidget2.cpp
@@ -26,7 +26,7 @@ FramelessWidget2::FramelessWidget2(QObject *parent) : QObject(parent)
 
 bool FramelessWidget2::eventFilter(QObject *watched, QEvent *event)
 {
-    if (widget != 0 && watched == widget) {
+    if (widget && watched == widget) {
         if (event->type() == QEvent::WindowStateChange) {
             //解决mac系统上无边框最小化失效的bug
 #ifdef Q_OS_MACOS
diff --git a/widget/lunarcalendarwidget/lunarcalendarwidget.cpp b/widget/lunarcalendarwidget/lunarcalendarwidget.cpp
index 2a102cf..cf9d1e1 100644
--- a/widget/lunarcalendarwidget/lunarcalendarwidget.cpp
+++ b/widget/lunarcalendarwidget/lunarcalendarwidget.cpp
@@ -17,7 +17,7 @@ LunarCalendarWidget::LunarCalendarWidget(QWidget *parent) : QWidget(parent)
     if (!fontDb.families().contains("FontAwesome")) {
         int fontId = fontDb.addApplicationFont(":/font/fontawesome-webfont.ttf");
         QStringList fontName = fontDb.applicationFontFamilies(fontId);
-        if (fontName.count() == 0) {
+        if (fontName.size() == 0) {
             qDebug() << "load fontawesome-webfont.ttf error";
         }
     }
diff --git a/widget/maskwidget/maskwidget.cpp b/widget/maskwidget/maskwidget.cpp
index 0f1c047..cd1098a 100644
--- a/widget/maskwidget/maskwidget.cpp
+++ b/widget/maskwidget/maskwidget.cpp
@@ -71,7 +71,7 @@ void MaskWidget::setBgColor(const QColor &bgColor)
 
 void MaskWidget::showEvent(QShowEvent *)
 {
-    if (mainWidget != 0) {
+    if (mainWidget) {
         this->setGeometry(mainWidget->geometry());
     }
 }
@@ -91,7 +91,7 @@ bool MaskWidget::eventFilter(QObject *obj, QEvent *event)
         }
     } else if (event->type() == QEvent::WindowActivate) {
         //当主窗体激活时,同时激活遮罩层
-        if (mainWidget != 0) {
+        if (mainWidget) {
             if (obj->objectName() == mainWidget->objectName()) {
                 if (this->isVisible()) {
                     this->activateWindow();
diff --git a/widget/movewidget/movewidget.cpp b/widget/movewidget/movewidget.cpp
index a7eeb8f..c22ab89 100644
--- a/widget/movewidget/movewidget.cpp
+++ b/widget/movewidget/movewidget.cpp
@@ -13,7 +13,7 @@ MoveWidget::MoveWidget(QObject *parent) : QObject(parent)
 
 bool MoveWidget::eventFilter(QObject *watched, QEvent *event)
 {
-    if (widget != 0 && watched == widget) {
+    if (widget && watched == widget) {
         QMouseEvent *mouseEvent = (QMouseEvent *)event;
         if (mouseEvent->type() == QEvent::MouseButtonPress) {
             //如果限定了只能鼠标左键拖动则判断当前是否是鼠标左键
@@ -38,7 +38,7 @@ bool MoveWidget::eventFilter(QObject *watched, QEvent *event)
                 bool xyOut = (x + widget->width() < offset || y + widget->height() < offset);
                 bool whOut = false;
                 QWidget *w = (QWidget *)widget->parent();
-                if (w != 0) {
+                if (w) {
                     whOut = (w->width() - x < offset || w->height() - y < offset);
                 }
                 if (xyOut || whOut) {
@@ -71,4 +71,4 @@ void MoveWidget::setWidget(QWidget *widget)
         this->widget = widget;
         this->widget->installEventFilter(this);
     }
-}
\ No newline at end of file
+}