全部支持Qt4-Qt6

3rd_qextserialport/3rd_qextserialport.pri

@@ -1,11 +1,9 @@
-HEADERS += $$PWD/qextserialport.h
+HEADERS += \
-HEADERS += $$PWD/qextserialport_global.h
+    $$PWD/qextserialport.h \
-HEADERS += $$PWD/qextserialport_p.h
+    $$PWD/qextserialport_global.h \
+    $$PWD/qextserialport_p.h
            
 SOURCES += $$PWD/qextserialport.cpp
-win32 {
+
-SOURCES += $$PWD/qextserialport_win.cpp
+win32:SOURCES += $$PWD/qextserialport_win.cpp
-}
+unix:SOURCES += $$PWD/qextserialport_unix.cpp
-unix {
-SOURCES += $$PWD/qextserialport_unix.cpp
-}

3rd_qextserialport/qextserialport_win.cpp

@@ -35,13 +35,20 @@
 #include <QtCore/QReadWriteLock>
 #include <QtCore/QMutexLocker>
 #include <QtCore/QDebug>
-#include <QtCore/QRegExp>
 #include <QtCore/QMetaType>
+
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#  include <QtCore/QWinEventNotifier>
+#include <QtCore/QWinEventNotifier>
 #else
-#  include <QtCore/private/qwineventnotifier_p.h>
+#include <QtCore/private/qwineventnotifier_p.h>
 #endif
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QtCore5Compat/QRegExp>
+#else
+#include <QtCore/QRegExp>
+#endif
+
 void QextSerialPortPrivate::platformSpecificInit()
 {
     handle = INVALID_HANDLE_VALUE;
@@ -68,8 +75,7 @@ static QString fullPortNameWin(const QString &name)
 {
     QRegExp rx(QLatin1String("^COM(\\d+)"));
     QString fullName(name);
-
+    if (rx.indexIn(fullName) >= 0) {
-	if (fullName.contains(rx)) {
         fullName.prepend(QLatin1String("\\\\.\\"));
     }
 

3rd_smtpclient/3rd_smtpclient.pri

@@ -11,8 +11,7 @@ HEADERS += \
     $$PWD/mimetext.h \
     $$PWD/quotedprintable.h \
     $$PWD/smtpclient.h \
-    $$PWD/smtpmime.h \
+    $$PWD/smtpmime.h
-    $$PWD/sendemailthread.h
            
 SOURCES += \
     $$PWD/emailaddress.cpp \
@@ -26,5 +25,4 @@ SOURCES += \
     $$PWD/mimepart.cpp \
     $$PWD/mimetext.cpp \
     $$PWD/quotedprintable.cpp \
-    $$PWD/smtpclient.cpp \
+    $$PWD/smtpclient.cpp
-    $$PWD/sendemailthread.cpp

3rd_smtpclient/mimemessage.cpp

@@ -0,0 +1,223 @@
+#include "mimemessage.h"
+
+#include <QDateTime>
+#include "quotedprintable.h"
+#include <typeinfo>
+
+MimeMessage::MimeMessage(bool createAutoMimeContent) :
+    hEncoding(MimePart::_8Bit)
+{
+    if (createAutoMimeContent) {
+        this->content = new MimeMultiPart();
+    }
+}
+
+MimeMessage::~MimeMessage()
+{
+}
+
+MimePart &MimeMessage::getContent()
+{
+    return *content;
+}
+
+void MimeMessage::setContent(MimePart *content)
+{
+    this->content = content;
+}
+
+void MimeMessage::setSender(EmailAddress *e)
+{
+    this->sender = e;
+}
+
+void MimeMessage::addRecipient(EmailAddress *rcpt, RecipientType type)
+{
+    switch (type) {
+        case To:
+            recipientsTo << rcpt;
+            break;
+
+        case Cc:
+            recipientsCc << rcpt;
+            break;
+
+        case Bcc:
+            recipientsBcc << rcpt;
+            break;
+    }
+}
+
+void MimeMessage::addTo(EmailAddress *rcpt)
+{
+    this->recipientsTo << rcpt;
+}
+
+void MimeMessage::addCc(EmailAddress *rcpt)
+{
+    this->recipientsCc << rcpt;
+}
+
+void MimeMessage::addBcc(EmailAddress *rcpt)
+{
+    this->recipientsBcc << rcpt;
+}
+
+void MimeMessage::setSubject(const QString &subject)
+{
+    this->subject = subject;
+}
+
+void MimeMessage::addPart(MimePart *part)
+{
+    if (typeid(*content) == typeid(MimeMultiPart)) {
+        ((MimeMultiPart *) content)->addPart(part);
+    };
+}
+
+void MimeMessage::setHeaderEncoding(MimePart::Encoding hEnc)
+{
+    this->hEncoding = hEnc;
+}
+
+const EmailAddress &MimeMessage::getSender() const
+{
+    return *sender;
+}
+
+const QList<EmailAddress *> &MimeMessage::getRecipients(RecipientType type) const
+{
+    switch (type) {
+        default:
+        case To:
+            return recipientsTo;
+
+        case Cc:
+            return recipientsCc;
+
+        case Bcc:
+            return recipientsBcc;
+    }
+}
+
+const QString &MimeMessage::getSubject() const
+{
+    return subject;
+}
+
+const QList<MimePart *> &MimeMessage::getParts() const
+{
+    if (typeid(*content) == typeid(MimeMultiPart)) {
+        return ((MimeMultiPart *) content)->getParts();
+    } else {
+        QList<MimePart *> *res = new QList<MimePart *>();
+        res->append(content);
+        return *res;
+    }
+}
+
+QString MimeMessage::toString()
+{
+    QString mime;
+    mime = "From:";
+
+    QByteArray name = sender->getName().toUtf8();
+    if (name != "") {
+        switch (hEncoding) {
+            case MimePart::Base64:
+                mime += " =?utf-8?B?" + QByteArray().append(name).toBase64() + "?=";
+                break;
+
+            case MimePart::QuotedPrintable:
+                mime += " =?utf-8?Q?" + QuotedPrintable::encode(QByteArray().append(name)).replace(' ', "_").replace(':', "=3A") + "?=";
+                break;
+
+            default:
+                mime += " " + name;
+        }
+    }
+
+    mime += " <" + sender->getAddress() + ">\r\n";
+
+    mime += "To:";
+    QList<EmailAddress *>::iterator it;
+    int i;
+
+    for (i = 0, it = recipientsTo.begin(); it != recipientsTo.end(); ++it, ++i) {
+        if (i != 0) {
+            mime += ",";
+        }
+
+        QByteArray name = (*it)->getName().toUtf8();
+        if (name != "") {
+            switch (hEncoding) {
+                case MimePart::Base64:
+                    mime += " =?utf-8?B?" + QByteArray().append(name).toBase64() + "?=";
+                    break;
+
+                case MimePart::QuotedPrintable:
+                    mime += " =?utf-8?Q?" + QuotedPrintable::encode(QByteArray().append(name)).replace(' ', "_").replace(':', "=3A") + "?=";
+                    break;
+
+                default:
+                    mime += " " + name;
+            }
+        }
+
+        mime += " <" + (*it)->getAddress() + ">";
+    }
+
+    mime += "\r\n";
+    if (recipientsCc.size() != 0) {
+        mime += "Cc:";
+    }
+
+    for (i = 0, it = recipientsCc.begin(); it != recipientsCc.end(); ++it, ++i) {
+        if (i != 0) {
+            mime += ",";
+        }
+
+        QByteArray name = (*it)->getName().toUtf8();
+        if (name != "") {
+            switch (hEncoding) {
+                case MimePart::Base64:
+                    mime += " =?utf-8?B?" + QByteArray().append(name).toBase64() + "?=";
+                    break;
+
+                case MimePart::QuotedPrintable:
+                    mime += " =?utf-8?Q?" + QuotedPrintable::encode(QByteArray().append(name)).replace(' ', "_").replace(':', "=3A") + "?=";
+                    break;
+
+                default:
+                    mime += " " + name;
+            }
+        }
+
+        mime += " <" + (*it)->getAddress() + ">";
+    }
+
+    if (recipientsCc.size() != 0) {
+        mime += "\r\n";
+    }
+
+    mime += "Subject: ";
+
+    switch (hEncoding) {
+        case MimePart::Base64:
+            mime += "=?utf-8?B?" + QByteArray().append(subject.toUtf8()).toBase64() + "?=";
+            break;
+
+        case MimePart::QuotedPrintable:
+            mime += "=?utf-8?Q?" + QuotedPrintable::encode(QByteArray().append(subject.toUtf8())).replace(' ', "_").replace(':', "=3A") + "?=";
+            break;
+
+        default:
+            mime += subject;
+    }
+
+    mime += "\r\n";
+    mime += "MIME-Version: 1.0\r\n";
+
+    mime += content->toString();
+    return mime;
+}

3rd_smtpclient/mimemultipart.cpp

@@ -0,0 +1,66 @@
+#include "mimemultipart.h"
+#include "stdlib.h"
+#include <QTime>
+#include <QCryptographicHash>
+
+const QString MULTI_PART_NAMES[] = {
+    "multipart/mixed",         //    Mixed
+    "multipart/digest",        //    Digest
+    "multipart/alternative",   //    Alternative
+    "multipart/related",       //    Related
+    "multipart/report",        //    Report
+    "multipart/signed",        //    Signed
+    "multipart/encrypted"      //    Encrypted
+};
+
+MimeMultiPart::MimeMultiPart(MultiPartType type)
+{
+    this->type = type;
+    this->cType = MULTI_PART_NAMES[this->type];
+    this->cEncoding = _8Bit;
+
+    QCryptographicHash md5(QCryptographicHash::Md5);
+    md5.addData(QByteArray().append(rand()));
+    cBoundary = md5.result().toHex();
+}
+
+MimeMultiPart::~MimeMultiPart()
+{
+
+}
+
+void MimeMultiPart::addPart(MimePart *part)
+{
+    parts.append(part);
+}
+
+const QList<MimePart *> &MimeMultiPart::getParts() const
+{
+    return parts;
+}
+
+void MimeMultiPart::prepare()
+{
+    QList<MimePart *>::iterator it;
+    content = "";
+
+    for (it = parts.begin(); it != parts.end(); it++) {
+        content += "--" + cBoundary.toUtf8() + "\r\n";
+        (*it)->prepare();
+        content += (*it)->toString().toUtf8();
+    };
+
+    content += "--" + cBoundary.toUtf8() + "--\r\n";
+    MimePart::prepare();
+}
+
+void MimeMultiPart::setMimeType(const MultiPartType type)
+{
+    this->type = type;
+    this->cType = MULTI_PART_NAMES[type];
+}
+
+MimeMultiPart::MultiPartType MimeMultiPart::getMimeType() const
+{
+    return type;
+}

3rd_smtpclient/mimepart.cpp

@@ -142,7 +142,7 @@ void MimePart::prepare()
 			break;
 	}
 
-	if (cId != 0) {
+    if (cId.toInt() != 0) {
 		mimeString.append("Content-ID: <").append(cId).append(">\r\n");
 	}
 

3rd_smtpclient/mimetext.cpp

@@ -23,6 +23,6 @@ const QString &MimeText::getText() const
 void MimeText::prepare()
 {
 	this->content.clear();
-	this->content.append(text);
+    this->content.append(text.toUtf8());
 	MimePart::prepare();
 }

3rd_smtpclient/smtpclient.cpp

@@ -222,7 +222,7 @@ bool SmtpClient::login(const QString &user, const QString &password, AuthMethod
 	try {
 		if (method == AuthPlain) {
 			// Sending command: AUTH PLAIN base64('\0' + username + '\0' + password)
-			sendMessage("AUTH PLAIN " + QByteArray().append((char) 0).append(user).append((char) 0).append(password).toBase64());
+            sendMessage("AUTH PLAIN " + QByteArray().append((char) 0).append(user.toUtf8()).append((char) 0).append(password.toUtf8()).toBase64());
 
 			// Wait for the server's response
 			waitForResponse();
@@ -245,7 +245,7 @@ bool SmtpClient::login(const QString &user, const QString &password, AuthMethod
 			}
 
 			// Send the username in base64
-			sendMessage(QByteArray().append(user).toBase64());
+            sendMessage(QByteArray().append(user.toUtf8()).toBase64());
 
 			// Wait for 334
 			waitForResponse();
@@ -256,7 +256,7 @@ bool SmtpClient::login(const QString &user, const QString &password, AuthMethod
 			}
 
 			// Send the password in base64
-			sendMessage(QByteArray().append(password).toBase64());
+            sendMessage(QByteArray().append(password.toUtf8()).toBase64());
 
 			// Wait for the server's responce
 			waitForResponse();
@@ -354,7 +354,7 @@ void SmtpClient::quit()
 	sendMessage("QUIT");
 }
 
-void SmtpClient::waitForResponse() throw (ResponseTimeoutException)
+void SmtpClient::waitForResponse()
 {
 	do {
 		if (!socket->waitForReadyRead(responseTimeout)) {

3rd_smtpclient/smtpclient.h

@@ -92,7 +92,7 @@ protected:
 	int responseCode;
 
 	class ResponseTimeoutException {};
-	void waitForResponse() throw (ResponseTimeoutException);
+    void waitForResponse();
 	void sendMessage(const QString &text);
 
 signals:

QWidgetDemo.pro

@@ -24,7 +24,6 @@ SUBDIRS += maskwidget       #遮罩层窗体
 SUBDIRS += battery          #电池电量控件
 SUBDIRS += lineeditnext     #文本框回车焦点下移
 SUBDIRS += zhtopy           #汉字转拼音
-SUBDIRS += qwtdemo          #qwt的源码版本，无需插件，直接源码集成到你的项目即可
 SUBDIRS += devicebutton     #设备按钮地图效果
 SUBDIRS += mouseline        #鼠标定位十字线
 SUBDIRS += emailtool        #邮件发送工具
@@ -46,5 +45,12 @@ SUBDIRS += miniblink        #miniblink示例
 
 #如果你电脑对应的Qt版本有webkit或者webengine组件可以自行打开
 #SUBDIRS += echartgauge      #echart仪表盘含交互支持webkit及webengine
-#designer项目只支持Qt4,如果是Qt4可以自行打开
+
+lessThan(QT_MAJOR_VERSION, 4) {
 #SUBDIRS += designer         #QtDesigner4源码
+}
+
+#qwt项目需要等官方适配了qwt组件才能适配
+lessThan(QT_MAJOR_VERSION, 6) {
+SUBDIRS += qwtdemo          #qwt的源码版本，无需插件，直接源码集成到你的项目即可
+}

README.md

@@ -2,6 +2,7 @@
 1. **可以选择打开QWidgetDemo.pro一次性编译所有的，也可以进入到目录下打开pro进行编译**
 2. **如果发现有些子项目没有加载请打开QWidgetDemo.pro仔细看里面的注释**
 3. **编译好的可执行文件在源码同级目录下的bin目录**
+4. 亲测Qt4.6到Qt6.1所有版本，亲测win、linux、mac、uos等系统。
 
 | 编号 | 文件夹 | 描述 |
 | ------ | ------ | ------ |

base64/base64.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = base64
 TEMPLATE    = app

battery/battery.cpp

@@ -128,11 +128,13 @@ void Battery::updateValue()
     if (isForward) {
         currentValue -= step;
         if (currentValue <= value) {
+            currentValue = value;
             timer->stop();
         }
     } else {
         currentValue += step;
         if (currentValue >= value) {
+            currentValue = value;
             timer->stop();
         }
     }

battery/battery.h

@@ -21,6 +21,7 @@ class Battery : public QWidget
 
 {
     Q_OBJECT
+
     Q_PROPERTY(double minValue READ getMinValue WRITE setMinValue)
     Q_PROPERTY(double maxValue READ getMaxValue WRITE setMaxValue)
     Q_PROPERTY(double value READ getValue WRITE setValue)

battery/battery.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = battery
 TEMPLATE    = app

bgdemo/bgdemo.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = bgdemo
 TEMPLATE    = app

colorwidget/colorwidget.cpp

@@ -6,13 +6,18 @@
 #include "qlabel.h"
 #include "qlineedit.h"
 #include "qapplication.h"
-#include "qdesktopwidget.h"
 #include "qtimer.h"
 #include "qevent.h"
 #include "qdebug.h"
 
-#if (QT_VERSION > QT_VERSION_CHECK(5,0,0))
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
 #include "qscreen.h"
+#define deskGeometry qApp->primaryScreen()->geometry()
+#define deskGeometry2 qApp->primaryScreen()->availableGeometry()
+#else
+#include "qdesktopwidget.h"
+#define deskGeometry qApp->desktop()->geometry()
+#define deskGeometry2 qApp->desktop()->availableGeometry()
 #endif
 
 ColorWidget *ColorWidget::instance = 0;
@@ -130,11 +135,11 @@ void ColorWidget::showColorValue()
     int y = QCursor::pos().y();
     txtPoint->setText(tr("x:%1  y:%2").arg(x).arg(y));
 
-#if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
+#if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
-    QPixmap pixmap = QPixmap::grabWindow(QApplication::desktop()->winId(), x, y, 2, 2);
+    QPixmap pixmap = QPixmap::grabWindow(qApp->desktop()->winId(), x, y, 2, 2);
 #else
-    QScreen *screen = QApplication::primaryScreen();
+    QScreen *screen = qApp->primaryScreen();
-    QPixmap pixmap = screen->grabWindow(QApplication::desktop()->winId(), x, y, 2, 2);
+    QPixmap pixmap = screen->grabWindow(0, x, y, 2, 2);
 #endif
 
     int red, green, blue;

colorwidget/colorwidget.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = colorwidget
 TEMPLATE    = app

colorwidget/main.cpp

@@ -9,7 +9,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     a.setFont(QFont("Microsoft Yahei", 9));
 
-#if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
+#if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
 #if _MSC_VER
     QTextCodec *codec = QTextCodec::codecForName("gbk");
 #else

comtool/comtool.pro

@@ -7,6 +7,7 @@
 QT       += core gui network
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = comtool
 TEMPLATE    = app

comtool/head.h

@@ -6,6 +6,9 @@
 #include <QtWidgets>
 #endif
 
-#include "appconfig.h"
+#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
+#include <QtCore5Compat>
+#endif
 
 #pragma execution_character_set("utf-8")
+#include "appconfig.h"

core_qui/iconfont.cpp

@@ -34,21 +34,21 @@ IconFont::IconFont(QObject *parent) : QObject(parent)
     }
 }
 
-void IconFont::setIcon(QLabel *lab, const QChar &icon, quint32 size)
+void IconFont::setIcon(QLabel *lab, int icon, quint32 size)
 {
     iconFont.setPixelSize(size);
     lab->setFont(iconFont);
-    lab->setText(icon);
+    lab->setText((QChar)icon);
 }
 
-void IconFont::setIcon(QAbstractButton *btn, const QChar &icon, quint32 size)
+void IconFont::setIcon(QAbstractButton *btn, int icon, quint32 size)
 {
     iconFont.setPixelSize(size);
     btn->setFont(iconFont);
-    btn->setText(icon);
+    btn->setText((QChar)icon);
 }
 
-QPixmap IconFont::getPixmap(const QColor &color, const QChar &icon, quint32 size,
+QPixmap IconFont::getPixmap(const QColor &color, int icon, quint32 size,
                             quint32 pixWidth, quint32 pixHeight, int flags)
 {
     QPixmap pix(pixWidth, pixHeight);
@@ -61,7 +61,7 @@ QPixmap IconFont::getPixmap(const QColor &color, const QChar &icon, quint32 size
 
     iconFont.setPixelSize(size);
     painter.setFont(iconFont);
-    painter.drawText(pix.rect(), flags, icon);
+    painter.drawText(pix.rect(), flags, (QChar)icon);
     painter.end();
 
     return pix;
@@ -115,7 +115,7 @@ void IconFont::setStyle(QWidget *widget, const QString &type, int borderWidth, c
     widget->setStyleSheet(qss.join(""));
 }
 
-void IconFont::setStyle(QWidget *widget, QList<QToolButton *> btns, QList<QChar> icons,
+void IconFont::setStyle(QWidget *widget, QList<QToolButton *> btns, QList<int> icons,
                         quint32 iconSize, quint32 iconWidth, quint32 iconHeight,
                         const QString &type, int borderWidth, const QString &borderColor,
                         const QString &normalBgColor, const QString &darkBgColor,
@@ -168,10 +168,11 @@ void IconFont::setStyle(QWidget *widget, QList<QToolButton *> btns, QList<QChar>
 
     widget->setStyleSheet(qss.join(""));
 
-    for (int i = 0; i < btnCount; i++) {
     //存储对应按钮对象,方便鼠标移上去的时候切换图片
-        QPixmap pixNormal = getPixmap(normalTextColor, icons.at(i), iconSize, iconWidth, iconHeight);
+    for (int i = 0; i < btnCount; i++) {
-        QPixmap pixDark = getPixmap(darkTextColor, icons.at(i), iconSize, iconWidth, iconHeight);
+        int icon = icons.at(i);
+        QPixmap pixNormal = getPixmap(normalTextColor, icon, iconSize, iconWidth, iconHeight);
+        QPixmap pixDark = getPixmap(darkTextColor, icon, iconSize, iconWidth, iconHeight);
 
         btns.at(i)->setIcon(QIcon(pixNormal));
         btns.at(i)->setIconSize(QSize(iconWidth, iconHeight));
@@ -183,7 +184,7 @@ void IconFont::setStyle(QWidget *widget, QList<QToolButton *> btns, QList<QChar>
     }
 }
 
-void IconFont::setStyle(QFrame *frame, QList<QToolButton *> btns, QList<QChar> icons,
+void IconFont::setStyle(QFrame *frame, QList<QToolButton *> btns, QList<int> icons,
                         quint32 iconSize, quint32 iconWidth, quint32 iconHeight,
                         const QString &normalBgColor, const QString &darkBgColor,
                         const QString &normalTextColor, const QString &darkTextColor)
@@ -203,10 +204,11 @@ void IconFont::setStyle(QFrame *frame, QList<QToolButton *> btns, QList<QChar> i
 
     frame->setStyleSheet(qss.join(""));
 
-    for (int i = 0; i < btnCount; i++) {
     //存储对应按钮对象,方便鼠标移上去的时候切换图片
-        QPixmap pixNormal = getPixmap(normalTextColor, icons.at(i), iconSize, iconWidth, iconHeight);
+    for (int i = 0; i < btnCount; i++) {        
-        QPixmap pixDark = getPixmap(darkTextColor, icons.at(i), iconSize, iconWidth, iconHeight);
+        int icon = icons.at(i);
+        QPixmap pixNormal = getPixmap(normalTextColor, icon, iconSize, iconWidth, iconHeight);
+        QPixmap pixDark = getPixmap(darkTextColor, icon, iconSize, iconWidth, iconHeight);
 
         btns.at(i)->setIcon(QIcon(pixNormal));
         btns.at(i)->setIconSize(QSize(iconWidth, iconHeight));

core_qui/iconfont.h

@@ -3,7 +3,7 @@
 
 #include <QtCore>
 #include <QtGui>
-#if (QT_VERSION > QT_VERSION_CHECK(5,0,0))
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
 #include <QtWidgets>
 #endif
 
@@ -20,9 +20,9 @@ public:
     static IconFont *Instance();
     explicit IconFont(QObject *parent = 0);
 
-    void setIcon(QLabel *lab, const QChar &icon, quint32 size = 12);
+    void setIcon(QLabel *lab, int icon, quint32 size = 12);
-    void setIcon(QAbstractButton *btn, const QChar &icon, quint32 size = 12);
+    void setIcon(QAbstractButton *btn, int icon, quint32 size = 12);
-    QPixmap getPixmap(const QColor &color, const QChar &icon, quint32 size = 12,
+    QPixmap getPixmap(const QColor &color, int icon, quint32 size = 12,
                       quint32 pixWidth = 15, quint32 pixHeight = 15,
                       int flags = Qt::AlignCenter);
 
@@ -38,7 +38,7 @@ public:
                          const QString &darkTextColor = "#FDFDFD");
 
     //指定导航面板样式,带图标和效果切换
-    void setStyle(QWidget *widget, QList<QToolButton *> btns, QList<QChar> icons,
+    void setStyle(QWidget *widget, QList<QToolButton *> btns, QList<int> icons,
                   quint32 iconSize = 12, quint32 iconWidth = 15, quint32 iconHeight = 15,
                   const QString &type = "left", int borderWidth = 3,
                   const QString &borderColor = "#029FEA",
@@ -48,7 +48,7 @@ public:
                   const QString &darkTextColor = "#FDFDFD");
 
     //指定导航按钮样式,带图标和效果切换
-    void setStyle(QFrame *frame, QList<QToolButton *> btns, QList<QChar> icons,
+    void setStyle(QFrame *frame, QList<QToolButton *> btns, QList<int> icons,
                   quint32 iconSize = 12, quint32 iconWidth = 15, quint32 iconHeight = 15,
                   const QString &normalBgColor = "#2FC5A2",
                   const QString &darkBgColor = "#3EA7E9",

core_qui/iconhelper.cpp

@@ -39,21 +39,21 @@ QFont IconHelper::getIconFont()
     return this->iconFont;
 }
 
-void IconHelper::setIcon(QLabel *lab, const QChar &icon, quint32 size)
+void IconHelper::setIcon(QLabel *lab, int icon, quint32 size)
 {
     iconFont.setPixelSize(size);
     lab->setFont(iconFont);
-    lab->setText(icon);
+    lab->setText((QChar)icon);
 }
 
-void IconHelper::setIcon(QAbstractButton *btn, const QChar &icon, quint32 size)
+void IconHelper::setIcon(QAbstractButton *btn, int icon, quint32 size)
 {
     iconFont.setPixelSize(size);
     btn->setFont(iconFont);
-    btn->setText(icon);
+    btn->setText((QChar)icon);
 }
 
-QPixmap IconHelper::getPixmap(const QColor &color, const QChar &icon, quint32 size,
+QPixmap IconHelper::getPixmap(const QColor &color, int icon, quint32 size,
                               quint32 pixWidth, quint32 pixHeight, int flags)
 {
     QPixmap pix(pixWidth, pixHeight);
@@ -66,7 +66,7 @@ QPixmap IconHelper::getPixmap(const QColor &color, const QChar &icon, quint32 si
 
     iconFont.setPixelSize(size);
     painter.setFont(iconFont);
-    painter.drawText(pix.rect(), flags, icon);
+    painter.drawText(pix.rect(), flags, (QChar)icon);
     painter.end();
 
     return pix;
@@ -106,7 +106,7 @@ QPixmap IconHelper::getPixmap(QToolButton *btn, int type)
     return pix;
 }
 
-void IconHelper::setStyle(QFrame *frame, QList<QToolButton *> btns, QList<QChar> icons,
+void IconHelper::setStyle(QFrame *frame, QList<QToolButton *> btns, QList<int> icons,
                           quint32 iconSize, quint32 iconWidth, quint32 iconHeight,
                           const QString &normalBgColor, const QString &darkBgColor,
                           const QString &normalTextColor, const QString &darkTextColor)
@@ -127,8 +127,9 @@ void IconHelper::setStyle(QFrame *frame, QList<QToolButton *> btns, QList<QChar>
 
     //存储对应按钮对象,方便鼠标移上去的时候切换图片
     for (int i = 0; i < btnCount; i++) {
-        QPixmap pixNormal = getPixmap(normalTextColor, icons.at(i), iconSize, iconWidth, iconHeight);
+        int icon = icons.at(i);
-        QPixmap pixDark = getPixmap(darkTextColor, icons.at(i), iconSize, iconWidth, iconHeight);
+        QPixmap pixNormal = getPixmap(normalTextColor, icon, iconSize, iconWidth, iconHeight);
+        QPixmap pixDark = getPixmap(darkTextColor, icon, iconSize, iconWidth, iconHeight);
 
         QToolButton *btn = btns.at(i);
         btn->setIcon(QIcon(pixNormal));
@@ -194,7 +195,7 @@ void IconHelper::removeStyle(QList<QToolButton *> btns)
     }
 }
 
-void IconHelper::setStyle(QWidget *widget, QList<QToolButton *> btns, QList<QChar> icons,
+void IconHelper::setStyle(QWidget *widget, QList<QToolButton *> btns, QList<int> icons,
                           quint32 iconSize, quint32 iconWidth, quint32 iconHeight,
                           const QString &type, int borderWidth, const QString &borderColor,
                           const QString &normalBgColor, const QString &darkBgColor,
@@ -247,8 +248,9 @@ void IconHelper::setStyle(QWidget *widget, QList<QToolButton *> btns, QList<QCha
 
     //存储对应按钮对象,方便鼠标移上去的时候切换图片
     for (int i = 0; i < btnCount; i++) {
-        QPixmap pixNormal = getPixmap(normalTextColor, icons.at(i), iconSize, iconWidth, iconHeight);
+        int icon = icons.at(i);
-        QPixmap pixDark = getPixmap(darkTextColor, icons.at(i), iconSize, iconWidth, iconHeight);
+        QPixmap pixNormal = getPixmap(normalTextColor, icon, iconSize, iconWidth, iconHeight);
+        QPixmap pixDark = getPixmap(darkTextColor, icon, iconSize, iconWidth, iconHeight);
 
         QToolButton *btn = btns.at(i);
         btn->setIcon(QIcon(pixNormal));
@@ -264,7 +266,7 @@ void IconHelper::setStyle(QWidget *widget, QList<QToolButton *> btns, QList<QCha
     }
 }
 
-void IconHelper::setStyle(QWidget *widget, QList<QToolButton *> btns, QList<QChar> icons, const IconHelper::StyleColor &styleColor)
+void IconHelper::setStyle(QWidget *widget, QList<QToolButton *> btns, QList<int> icons, const IconHelper::StyleColor &styleColor)
 {
     int btnCount = btns.count();
     int charCount = icons.count();
@@ -320,10 +322,11 @@ void IconHelper::setStyle(QWidget *widget, QList<QToolButton *> btns, QList<QCha
 
     //存储对应按钮对象,方便鼠标移上去的时候切换图片
     for (int i = 0; i < btnCount; i++) {
-        QPixmap pixNormal = getPixmap(styleColor.normalTextColor, icons.at(i), iconSize, iconWidth, iconHeight);
+        int icon = icons.at(i);
-        QPixmap pixHover = getPixmap(styleColor.hoverTextColor, icons.at(i), iconSize, iconWidth, iconHeight);
+        QPixmap pixNormal = getPixmap(styleColor.normalTextColor, icon, iconSize, iconWidth, iconHeight);
-        QPixmap pixPressed = getPixmap(styleColor.pressedTextColor, icons.at(i), iconSize, iconWidth, iconHeight);
+        QPixmap pixHover = getPixmap(styleColor.hoverTextColor, icon, iconSize, iconWidth, iconHeight);
-        QPixmap pixChecked = getPixmap(styleColor.checkedTextColor, icons.at(i), iconSize, iconWidth, iconHeight);
+        QPixmap pixPressed = getPixmap(styleColor.pressedTextColor, icon, iconSize, iconWidth, iconHeight);
+        QPixmap pixChecked = getPixmap(styleColor.checkedTextColor, icon, iconSize, iconWidth, iconHeight);
 
         QToolButton *btn = btns.at(i);
         btn->setIcon(QIcon(pixNormal));

core_qui/iconhelper.h

@@ -3,7 +3,7 @@
 
 #include <QtCore>
 #include <QtGui>
-#if (QT_VERSION > QT_VERSION_CHECK(5,0,0))
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
 #include <QtWidgets>
 #endif
 
@@ -24,12 +24,12 @@ public:
     QFont getIconFont();
 
     //设置图形字体到标签
-    void setIcon(QLabel *lab, const QChar &icon, quint32 size = 12);
+    void setIcon(QLabel *lab, int icon, quint32 size = 12);
     //设置图形字体到按钮
-    void setIcon(QAbstractButton *btn, const QChar &icon, quint32 size = 12);
+    void setIcon(QAbstractButton *btn, int icon, quint32 size = 12);
 
     //获取指定图形字体,可以指定文字大小,图片宽高,文字对齐
-    QPixmap getPixmap(const QColor &color, const QChar &icon, quint32 size = 12,
+    QPixmap getPixmap(const QColor &color, int icon, quint32 size = 12,
                       quint32 pixWidth = 15, quint32 pixHeight = 15,
                       int flags = Qt::AlignCenter);
 
@@ -38,7 +38,7 @@ public:
     QPixmap getPixmap(QToolButton *btn, int type);
 
     //指定QFrame导航按钮样式,带图标
-    void setStyle(QFrame *frame, QList<QToolButton *> btns, QList<QChar> icons,
+    void setStyle(QFrame *frame, QList<QToolButton *> btns, QList<int> icons,
                   quint32 iconSize = 12, quint32 iconWidth = 15, quint32 iconHeight = 15,
                   const QString &normalBgColor = "#2FC5A2",
                   const QString &darkBgColor = "#3EA7E9",
@@ -57,7 +57,7 @@ public:
     void removeStyle(QList<QToolButton *> btns);
 
     //指定QWidget导航面板样式,带图标和效果切换
-    void setStyle(QWidget *widget, QList<QToolButton *> btns, QList<QChar> icons,
+    void setStyle(QWidget *widget, QList<QToolButton *> btns, QList<int> icons,
                   quint32 iconSize = 12, quint32 iconWidth = 15, quint32 iconHeight = 15,
                   const QString &type = "left", int borderWidth = 3,
                   const QString &borderColor = "#029FEA",
@@ -101,7 +101,7 @@ public:
     };
 
     //指定QWidget导航面板样式,带图标和效果切换+悬停颜色+按下颜色+选中颜色
-    void setStyle(QWidget *widget, QList<QToolButton *> btns, QList<QChar> icons, const StyleColor &styleColor);
+    void setStyle(QWidget *widget, QList<QToolButton *> btns, QList<int> icons, const StyleColor &styleColor);
 
 protected:
     bool eventFilter(QObject *watched, QEvent *event);

core_qui/quiconfig.cpp

@@ -1,11 +1,11 @@
 #include "quiconfig.h"
 
-QChar QUIConfig::IconMain = 0xf072;
+int QUIConfig::IconMain = 0xf072;
-QChar QUIConfig::IconMenu = 0xf0d7;
+int QUIConfig::IconMenu = 0xf0d7;
-QChar QUIConfig::IconMin = 0xf068;
+int QUIConfig::IconMin = 0xf068;
-QChar QUIConfig::IconMax = 0xf2d2;
+int QUIConfig::IconMax = 0xf2d2;
-QChar QUIConfig::IconNormal = 0xf2d0;
+int QUIConfig::IconNormal = 0xf2d0;
-QChar QUIConfig::IconClose = 0xf00d;
+int QUIConfig::IconClose = 0xf00d;
 
 #ifdef __arm__
 QString QUIConfig::FontName = "WenQuanYi Micro Hei";

core_qui/quiconfig.h

@@ -7,12 +7,12 @@ class QUIConfig
 {
 public:
     //全局图标
-    static QChar IconMain;          //标题栏左上角图标
+    static int IconMain;            //标题栏左上角图标
-    static QChar IconMenu;          //下拉菜单图标
+    static int IconMenu;            //下拉菜单图标
-    static QChar IconMin;           //最小化图标
+    static int IconMin;             //最小化图标
-    static QChar IconMax;           //最大化图标
+    static int IconMax;             //最大化图标
-    static QChar IconNormal;        //还原图标
+    static int IconNormal;          //还原图标
-    static QChar IconClose;         //关闭图标
+    static int IconClose;           //关闭图标
 
     //全局字体
     static QString FontName;        //全局字体名称

core_qui/quidateselect.cpp

@@ -256,7 +256,7 @@ QString QUIDateSelect::getEndDateTime() const
     return this->endDateTime;
 }
 
-void QUIDateSelect::setIconMain(const QChar &icon, quint32 size)
+void QUIDateSelect::setIconMain(int icon, quint32 size)
 {
     IconHelper::Instance()->setIcon(this->labIco, icon, size);
 }

core_qui/quidateselect.h

@@ -57,7 +57,7 @@ public:
     QString getEndDateTime()    const;
 
 public Q_SLOTS:
-    void setIconMain(const QChar &icon, quint32 size = 12);
+    void setIconMain(int icon, quint32 size = 12);
     void setFormat(const QString &format);
 };
 

core_qui/quihelper.cpp

@@ -1,23 +1,24 @@
 #include "quihelper.h"
 
-QString QUIHelper::getUuid()
-{
-    QString uuid = QUuid::createUuid().toString();
-    uuid = uuid.replace("{", "");
-    uuid = uuid.replace("}", "");
-    return uuid;
-}
-
 int QUIHelper::getScreenIndex()
 {
     //需要对多个屏幕进行处理
-    int screenIndex = -1;
+    int screenIndex = 0;
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
+    int screenCount = qApp->screens().count();
+#else
     int screenCount = qApp->desktop()->screenCount();
+#endif
+
     if (screenCount > 1) {
         //找到当前鼠标所在屏幕
         QPoint pos = QCursor::pos();
         for (int i = 0; i < screenCount; ++i) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
+            if (qApp->screens().at(i)->geometry().contains(pos)) {
+#else
             if (qApp->desktop()->screenGeometry(i).contains(pos)) {
+#endif
                 screenIndex = i;
                 break;
             }
@@ -26,18 +27,50 @@ int QUIHelper::getScreenIndex()
     return screenIndex;
 }
 
+QRect QUIHelper::getScreenRect(bool available)
+{
+    QRect rect;
+    int screenIndex = QUIHelper::getScreenIndex();
+    if (available) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
+        rect = qApp->screens().at(screenIndex)->availableGeometry();
+#else
+        rect = qApp->desktop()->availableGeometry(screenIndex);
+#endif
+    } else {
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
+        rect = qApp->screens().at(screenIndex)->geometry();
+#else
+        rect = qApp->desktop()->screenGeometry(screenIndex);
+#endif
+    }
+    return rect;
+}
+
 int QUIHelper::deskWidth()
 {
-    int screenIndex = QUIHelper::getScreenIndex();
+    return getScreenRect().width();
-    int width = qApp->desktop()->availableGeometry(screenIndex).width();
-    return width;
 }
 
 int QUIHelper::deskHeight()
 {
-    int screenIndex = QUIHelper::getScreenIndex();
+    return getScreenRect().height();
-    int height = qApp->desktop()->availableGeometry(screenIndex).height();
+}
-    return height;
+
+void QUIHelper::setFormInCenter(QWidget *form)
+{
+    int formWidth = form->width();
+    int formHeight = form->height();
+    QRect rect = getScreenRect();
+    int deskWidth = rect.width();
+    int deskHeight = rect.height();
+    QPoint movePoint(deskWidth / 2 - formWidth / 2 + rect.x(), deskHeight / 2 - formHeight / 2);
+    form->move(movePoint);
+
+    //其他系统自动最大化
+#ifndef Q_OS_WIN
+    QTimer::singleShot(100, form, SLOT(showMaximized()));
+#endif
 }
 
 QString QUIHelper::appName()
@@ -64,11 +97,98 @@ QString QUIHelper::appPath()
 #endif
 }
 
+QString QUIHelper::getUuid()
+{
+    QString uuid = QUuid::createUuid().toString();
+    uuid = uuid.replace("{", "");
+    uuid = uuid.replace("}", "");
+    return uuid;
+}
+
 void QUIHelper::initRand()
 {
     //初始化随机数种子
     QTime t = QTime::currentTime();
-    qsrand(t.msec() + t.second() * 1000);
+    srand(t.msec() + t.second() * 1000);
+}
+
+void QUIHelper::newDir(const QString &dirName)
+{
+    QString strDir = dirName;
+
+    //如果路径中包含斜杠字符则说明是绝对路径
+    //linux系统路径字符带有 /  windows系统 路径字符带有 :/
+    if (!strDir.startsWith("/") && !strDir.contains(":/")) {
+        strDir = QString("%1/%2").arg(QUIHelper::appPath()).arg(strDir);
+    }
+
+    QDir dir(strDir);
+    if (!dir.exists()) {
+        dir.mkpath(strDir);
+    }
+}
+
+void QUIHelper::sleep(int msec)
+{
+    if (msec > 0) {
+#if (QT_VERSION < QT_VERSION_CHECK(5,7,0))
+        QTime endTime = QTime::currentTime().addMSecs(msec);
+        while (QTime::currentTime() < endTime) {
+            QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
+        }
+#else
+        QThread::msleep(msec);
+#endif
+    }
+}
+
+void QUIHelper::setCode(bool utf8)
+{
+#if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
+#if _MSC_VER
+    QTextCodec *codec = QTextCodec::codecForName("gbk");
+#else
+    QTextCodec *codec = QTextCodec::codecForName("utf-8");
+#endif
+    QTextCodec::setCodecForLocale(codec);
+    QTextCodec::setCodecForCStrings(codec);
+    QTextCodec::setCodecForTr(codec);
+#else
+    //如果想要控制台打印信息中文正常就注释掉这个设置
+    if (utf8) {
+        QTextCodec *codec = QTextCodec::codecForName("utf-8");
+        QTextCodec::setCodecForLocale(codec);
+    }
+#endif
+}
+
+void QUIHelper::setFont(const QString &ttfFile, const QString &fontName, int fontSize)
+{
+    QFont font;
+    font.setFamily(fontName);
+    font.setPixelSize(fontSize);
+
+    //如果存在字体文件则设备字体文件中的字体
+    //安卓版本和网页版本需要字体文件一起打包单独设置字体
+    if (!ttfFile.isEmpty()) {
+        QFontDatabase fontDb;
+        int fontId = fontDb.addApplicationFont(ttfFile);
+        if (fontId != -1) {
+            QStringList androidFont = fontDb.applicationFontFamilies(fontId);
+            if (androidFont.size() != 0) {
+                font.setFamily(androidFont.at(0));
+                font.setPixelSize(fontSize);
+            }
+        }
+    }
+    qApp->setFont(font);
+}
+
+void QUIHelper::setTranslator(const QString &qmFile)
+{
+    QTranslator *translator = new QTranslator(qApp);
+    translator->load(qmFile);
+    qApp->installTranslator(translator);
 }
 
 void QUIHelper::initDb(const QString &dbName)
@@ -122,14 +242,14 @@ bool QUIHelper::checkIniFile(const QString &iniFile)
     return true;
 }
 
-void QUIHelper::setIconBtn(QAbstractButton *btn, const QString &png, const QChar &str)
+void QUIHelper::setIconBtn(QAbstractButton *btn, const QString &png, int icon)
 {
     int size = 16;
     int width = 18;
     int height = 18;
     QPixmap pix;
     if (QPixmap(png).isNull()) {
-        pix = IconHelper::Instance()->getPixmap(QUIConfig::TextColor, str, size, width, height);
+        pix = IconHelper::Instance()->getPixmap(QUIConfig::TextColor, icon, size, width, height);
     } else {
         pix = QPixmap(png);
     }
@@ -138,22 +258,6 @@ void QUIHelper::setIconBtn(QAbstractButton *btn, const QString &png, const QChar
     btn->setIcon(QIcon(pix));
 }
 
-void QUIHelper::newDir(const QString &dirName)
-{
-    QString strDir = dirName;
-
-    //如果路径中包含斜杠字符则说明是绝对路径
-    //linux系统路径字符带有 /  windows系统 路径字符带有 :/
-    if (!strDir.startsWith("/") && !strDir.contains(":/")) {
-        strDir = QString("%1/%2").arg(QUIHelper::appPath()).arg(strDir);
-    }
-
-    QDir dir(strDir);
-    if (!dir.exists()) {
-        dir.mkpath(strDir);
-    }
-}
-
 void QUIHelper::writeInfo(const QString &info, bool needWrite, const QString &filePath)
 {
     if (!needWrite) {
@@ -231,80 +335,6 @@ void QUIHelper::setFramelessForm(QWidget *widgetMain, QWidget *widgetTitle,
     IconHelper::Instance()->setIcon(btnClose, QUIConfig::IconClose, QUIConfig::FontSize);
 }
 
-void QUIHelper::setFormInCenter(QWidget *frm)
-{
-    //增加了多屏幕的判断在哪个屏幕就显示在哪个屏幕
-    int screenIndex = QUIHelper::getScreenIndex();
-    int frmX = frm->width();
-    int frmY = frm->height();
-    QDesktopWidget w;
-    QRect rect = w.availableGeometry(screenIndex);
-    int deskWidth = rect.width();
-    int deskHeight = rect.height();
-    QPoint movePoint(deskWidth / 2 - frmX / 2 + rect.x(), deskHeight / 2 - frmY / 2);
-    frm->move(movePoint);
-}
-
-void QUIHelper::setTranslator(const QString &qmFile)
-{
-    QTranslator *translator = new QTranslator(qApp);
-    translator->load(qmFile);
-    qApp->installTranslator(translator);
-}
-
-void QUIHelper::setCode()
-{
-#if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
-#if _MSC_VER
-    QTextCodec *codec = QTextCodec::codecForName("gbk");
-#else
-    QTextCodec *codec = QTextCodec::codecForName("utf-8");
-#endif
-    QTextCodec::setCodecForLocale(codec);
-    QTextCodec::setCodecForCStrings(codec);
-    QTextCodec::setCodecForTr(codec);
-#else
-    QTextCodec *codec = QTextCodec::codecForName("utf-8");
-    QTextCodec::setCodecForLocale(codec);
-#endif
-}
-
-void QUIHelper::setFont(const QString &ttfFile, const QString &fontName, int fontSize)
-{
-    QFont font;
-    font.setFamily(fontName);
-    font.setPixelSize(fontSize);
-
-    //如果存在字体文件则设备字体文件中的字体
-    //安卓版本和网页版本需要字体文件一起打包单独设置字体
-    if (!ttfFile.isEmpty()) {
-        QFontDatabase fontDb;
-        int fontId = fontDb.addApplicationFont(ttfFile);
-        if (fontId != -1) {
-            QStringList androidFont = fontDb.applicationFontFamilies(fontId);
-            if (androidFont.size() != 0) {
-                font.setFamily(androidFont.at(0));
-                font.setPixelSize(fontSize);
-            }
-        }
-    }
-    qApp->setFont(font);
-}
-
-void QUIHelper::sleep(int msec)
-{
-    if (msec > 0) {
-#if (QT_VERSION < QT_VERSION_CHECK(5,7,0))
-        QTime endTime = QTime::currentTime().addMSecs(msec);
-        while (QTime::currentTime() < endTime) {
-            QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
-        }
-#else
-        QThread::msleep(msec);
-#endif
-    }
-}
-
 void QUIHelper::setSystemDateTime(const QString &year, const QString &month, const QString &day, const QString &hour, const QString &min, const QString &sec)
 {
 #ifdef Q_OS_WIN
@@ -340,8 +370,10 @@ QString QUIHelper::getIP(const QString &url)
 {
     //取出IP地址
     QRegExp regExp("((?:(?:25[0-5]|2[0-4]\\d|[01]?\\d?\\d)\\.){3}(?:25[0-5]|2[0-4]\\d|[01]?\\d?\\d))");
-    regExp.indexIn(url);
+    int start = regExp.indexIn(url);
-    return url.mid(url.indexOf(regExp), regExp.matchedLength());
+    int length = regExp.matchedLength();
+    QString ip = url.mid(start, length);
+    return ip;
 }
 
 bool QUIHelper::isIP(const QString &ip)
@@ -1180,7 +1212,7 @@ void QUIHelper::initTableView(QTableView *tableView, int rowHeight, bool headVis
     tableView->setSelectionMode(QAbstractItemView::SingleSelection);
 
     //表头不可单击
-#if (QT_VERSION > QT_VERSION_CHECK(5,0,0))
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
     tableView->horizontalHeader()->setSectionsClickable(false);
 #else
     tableView->horizontalHeader()->setClickable(false);

core_qui/quihelper.h

@@ -6,21 +6,32 @@
 class QUIHelper
 {
 public:
-    //获取uuid
+    //获取当前鼠标所在屏幕索引+尺寸
-    static QString getUuid();
-    //获取当前鼠标所在屏幕
     static int getScreenIndex();
+    static QRect getScreenRect(bool available = true);
 
-    //桌面宽度高度
+    //获取桌面宽度高度+居中显示
     static int deskWidth();
     static int deskHeight();
+    static void setFormInCenter(QWidget *form);
 
     //程序文件名称+当前所在路径
     static QString appName();
     static QString appPath();
 
-    //初始化随机数种子
+    //获取uuid+初始化随机数种子+新建目录+延时
+    static QString getUuid();
     static void initRand();
+    static void newDir(const QString &dirName);
+    static void sleep(int msec);
+
+    //设置编码
+    static void setCode(bool utf8 = true);
+    //设置字体
+    static void setFont(const QString &ttfFile = ":/image/DroidSansFallback.ttf",
+                        const QString &fontName = "Microsoft Yahei", int fontSize = 12);
+    //设置翻译文件
+    static void setTranslator(const QString &qmFile = ":/image/qt_zh_CN.qm");
 
     //初始化数据库
     static void initDb(const QString &dbName);
@@ -31,10 +42,7 @@ public:
     static bool checkIniFile(const QString &iniFile);
 
     //设置图标到按钮
-    static void setIconBtn(QAbstractButton *btn, const QString &png, const QChar &str);
+    static void setIconBtn(QAbstractButton *btn, const QString &png, int icon);
-
-    //新建目录
-    static void newDir(const QString &dirName);
 
     //写入消息到额外的的消息日志文件
     static void writeInfo(const QString &info, bool needWrite = false, const QString &filePath = "log");
@@ -47,18 +55,6 @@ public:
                                  QLabel *labIco, QPushButton *btnClose,
                                  bool tool = true, bool top = true, bool menu = false);
 
-    //设置窗体居中显示
-    static void setFormInCenter(QWidget *frm);
-    //设置翻译文件
-    static void setTranslator(const QString &qmFile = ":/image/qt_zh_CN.qm");
-    //设置编码
-    static void setCode();
-    //设置字体
-    static void setFont(const QString &ttfFile = ":/image/DroidSansFallback.ttf",
-                        const QString &fontName = "Microsoft Yahei", int fontSize = 12);
-
-    //设置延时
-    static void sleep(int msec);
     //设置系统时间
     static void setSystemDateTime(const QString &year, const QString &month, const QString &day,
                                   const QString &hour, const QString &min, const QString &sec);

core_qui/quiinputbox.cpp

@@ -285,7 +285,7 @@ void QUIInputBox::on_btnMenu_Close_clicked()
     close();
 }
 
-void QUIInputBox::setIconMain(const QChar &icon, quint32 size)
+void QUIInputBox::setIconMain(int icon, quint32 size)
 {
     IconHelper::Instance()->setIcon(this->labIco, icon, size);
 }

core_qui/quiinputbox.h

@@ -59,7 +59,7 @@ public:
     QString getValue()const;
 
 public Q_SLOTS:
-    void setIconMain(const QChar &icon, quint32 size = 12);
+    void setIconMain(int icon, quint32 size = 12);
     void setParameter(const QString &title, int type = 0, int closeSec = 0,
                       QString placeholderText = QString(), bool pwd = false,
                       const QString &defaultValue = QString());

core_qui/quimessagebox.cpp

@@ -262,17 +262,17 @@ void QUIMessageBox::on_btnMenu_Close_clicked()
     close();
 }
 
-void QUIMessageBox::setIconMain(const QChar &icon, quint32 size)
+void QUIMessageBox::setIconMain(int icon, quint32 size)
 {
     IconHelper::Instance()->setIcon(this->labIco, icon, size);
 }
 
-void QUIMessageBox::setIconMsg(const QString &png, const QChar &str)
+void QUIMessageBox::setIconMsg(const QString &png, int icon)
 {
     //图片存在则取图片,不存在则取图形字体
     int size = this->labIcoMain->size().height();
     if (QImage(png).isNull()) {
-        IconHelper::Instance()->setIcon(this->labIcoMain, str, size);
+        IconHelper::Instance()->setIcon(this->labIcoMain, icon, size);
     } else {
         this->labIcoMain->setStyleSheet(QString("border-image:url(%1);").arg(png));
     }

core_qui/quimessagebox.h

@@ -56,8 +56,8 @@ private slots:
     void on_btnMenu_Close_clicked();
 
 public Q_SLOTS:
-    void setIconMain(const QChar &icon, quint32 size = 12);
+    void setIconMain(int icon, quint32 size = 12);
-    void setIconMsg(const QString &png, const QChar &str);
+    void setIconMsg(const QString &png, int icon);
     void setMessage(const QString &msg, int type, int closeSec = 0);
 };
 

core_qui/quitipbox.cpp

@@ -198,7 +198,7 @@ void QUITipBox::on_btnMenu_Close_clicked()
     close();
 }
 
-void QUITipBox::setIconMain(const QChar &icon, quint32 size)
+void QUITipBox::setIconMain(int icon, quint32 size)
 {
     IconHelper::Instance()->setIcon(this->labIco, icon, size);
 }
@@ -216,8 +216,7 @@ void QUITipBox::setTip(const QString &title, const QString &tip, bool fullScreen
     this->labInfo->setAlignment(center ? Qt::AlignCenter : Qt::AlignLeft);
     this->setWindowTitle(this->labTitle->text());
 
-    int screenIndex = QUIHelper::getScreenIndex();
+    QRect rect = QUIHelper::getScreenRect(!fullScreen);
-    QRect rect = fullScreen ? qApp->desktop()->screenGeometry(screenIndex) : qApp->desktop()->availableGeometry(screenIndex);
     int width = rect.width();
     int height = rect.height();
     int x = width - this->width() + rect.x();
@@ -235,8 +234,7 @@ void QUITipBox::setTip(const QString &title, const QString &tip, bool fullScreen
 
 void QUITipBox::hide()
 {
-    int screenIndex = QUIHelper::getScreenIndex();
+    QRect rect = QUIHelper::getScreenRect(!fullScreen);
-    QRect rect = fullScreen ? qApp->desktop()->screenGeometry(screenIndex) : qApp->desktop()->availableGeometry(screenIndex);
     int width = rect.width();
     int height = rect.height();
     int x = width - this->width() + rect.x();
@@ -245,7 +243,7 @@ void QUITipBox::hide()
     //启动动画
     animation->stop();
     animation->setStartValue(QPoint(x, y));
-    animation->setEndValue(QPoint(x, qApp->desktop()->geometry().height()));
+    animation->setEndValue(QPoint(x, QUIHelper::getScreenRect(false).height()));
     animation->start();
 }
 

core_qui/quitipbox.h

@@ -49,7 +49,7 @@ private slots:
     void on_btnMenu_Close_clicked();
 
 public Q_SLOTS:
-    void setIconMain(const QChar &icon, quint32 size = 12);
+    void setIconMain(int icon, quint32 size = 12);
     void setTip(const QString &title, const QString &tip, bool fullScreen = false, bool center = true, int closeSec = 0);
     void hide();
 };

core_qui/quiwidget.cpp

@@ -271,7 +271,7 @@ void QUIWidget::changeStyle()
     emit changeStyle(qssFile);
 }
 
-void QUIWidget::setIcon(QUIWidget::Widget widget, const QChar &icon, quint32 size)
+void QUIWidget::setIcon(QUIWidget::Widget widget, int icon, quint32 size)
 {
     if (widget == QUIWidget::Lab_Ico) {
         setIconMain(icon, size);
@@ -293,7 +293,7 @@ void QUIWidget::setIcon(QUIWidget::Widget widget, const QChar &icon, quint32 siz
     }
 }
 
-void QUIWidget::setIconMain(const QChar &icon, quint32 size)
+void QUIWidget::setIconMain(int icon, quint32 size)
 {
     QUIConfig::IconMain = icon;
     IconHelper::Instance()->setIcon(this->labIco, icon, size);
@@ -418,8 +418,7 @@ void QUIWidget::on_btnMenu_Max_clicked()
         setIcon(QUIWidget::BtnMenu_Normal, QUIConfig::IconNormal);
     } else {
         location = this->geometry();
-        int screenIndex = QUIHelper::getScreenIndex();
+        this->setGeometry(QUIHelper::getScreenRect());
-        this->setGeometry(qApp->desktop()->availableGeometry(screenIndex));
         setIcon(QUIWidget::BtnMenu_Max, QUIConfig::IconMax);
     }
 

core_qui/quiwidget.h

@@ -77,8 +77,8 @@ private slots:
 
 public Q_SLOTS:
     //设置部件图标
-    void setIcon(QUIWidget::Widget widget, const QChar &icon, quint32 size = 12);
+    void setIcon(QUIWidget::Widget widget, int icon, quint32 size = 12);
-    void setIconMain(const QChar &icon, quint32 size = 12);
+    void setIconMain(int icon, quint32 size = 12);
     //设置部件图片
     void setPixmap(QUIWidget::Widget widget, const QString &file, const QSize &size = QSize(16, 16));
     //设置部件是否可见

countcode/countcode.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = countcode
 TEMPLATE    = app

dbpage/dbpage.cpp

@@ -39,7 +39,7 @@ QVariant SqlQueryModel::data(const QModelIndex &index, int role) const
         if (row == index.row()) {
             if (role == Qt::BackgroundRole) {
                 value = QColor(property("hoverBgColor").toString());
-            } else if (role == Qt::TextColorRole) {
+            } else if (role == Qt::ForegroundRole) {
                 value = QColor(property("hoverTextColor").toString());
             }
         }

dbpage/dbpage.pro

@@ -7,6 +7,7 @@
 QT       += core gui sql
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = dbpage
 TEMPLATE    = app

devicebutton/devicebutton.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = devicebutton
 TEMPLATE    = app

devicesizetable/devicesizetable.h

@@ -21,6 +21,7 @@ class DeviceSizeTable : public QTableWidget
 
 {
     Q_OBJECT
+
     Q_PROPERTY(QColor bgColor READ getBgColor WRITE setBgColor)
     Q_PROPERTY(QColor chunkColor1 READ getChunkColor1 WRITE setChunkColor1)
     Q_PROPERTY(QColor chunkColor2 READ getChunkColor2 WRITE setChunkColor2)

devicesizetable/devicesizetable.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = devicesizetable
 TEMPLATE    = app

emailtool/emailtool.pro

@@ -4,9 +4,10 @@
 #
 #-------------------------------------------------
 
-QT       += core gui network sql xml
+QT       += core gui network
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = emailtool
 TEMPLATE    = app
@@ -14,10 +15,10 @@ DESTDIR     = $$PWD/../bin
 CONFIG      += warn_off
 
 SOURCES     += main.cpp
-SOURCES     += frmemailtool.cpp
+SOURCES     += frmemailtool.cpp sendemailthread.cpp
-HEADERS     += frmemailtool.h
+HEADERS     += frmemailtool.h sendemailthread.h
 FORMS       += frmemailtool.ui
 
-include ($$PWD/sendemail/sendemail.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/sendemail
+INCLUDEPATH += $$PWD/../3rd_smtpclient
+include ($$PWD/../3rd_smtpclient/3rd_smtpclient.pri)

emailtool/frmemailtool.ui

@@ -13,58 +13,87 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
     <layout class="QGridLayout" name="gridLayout">
-   <property name="leftMargin">
+     <item row="2" column="4">
-    <number>6</number>
+      <widget class="QPushButton" name="btnSend">
+       <property name="cursor">
+        <cursorShape>PointingHandCursor</cursorShape>
        </property>
-   <property name="topMargin">
-    <number>6</number>
-   </property>
-   <property name="rightMargin">
-    <number>6</number>
-   </property>
-   <property name="bottomMargin">
-    <number>6</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QLabel" name="labSenderAddr">
        <property name="text">
-      <string>用户名:</string>
+        <string>发送</string>
        </property>
       </widget>
      </item>
-   <item row="0" column="1">
+     <item row="1" column="3">
-    <widget class="QLineEdit" name="txtSenderAddr">
+      <widget class="QComboBox" name="cboxPort">
+       <item>
         <property name="text">
-      <string>feiyangqingyun@126.com</string>
+         <string>25</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>465</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>587</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="1" column="4">
+      <widget class="QCheckBox" name="ckSSL">
+       <property name="text">
+        <string>SSL</string>
        </property>
       </widget>
      </item>
-   <item row="0" column="2">
+     <item row="1" column="2">
-    <widget class="QLabel" name="labSenderPwd">
+      <widget class="QLabel" name="labPort">
        <property name="text">
-      <string>密码:</string>
+        <string>服务端口</string>
        </property>
       </widget>
      </item>
-   <item row="0" column="3">
+     <item row="3" column="4">
-    <widget class="QLineEdit" name="txtSenderPwd">
+      <widget class="QPushButton" name="btnSelect">
-     <property name="text">
+       <property name="cursor">
-      <string/>
+        <cursorShape>PointingHandCursor</cursorShape>
        </property>
-     <property name="echoMode">
+       <property name="text">
-      <enum>QLineEdit::Password</enum>
+        <string>浏览</string>
        </property>
       </widget>
      </item>
-   <item row="0" column="4">
+     <item row="2" column="3">
-    <widget class="QLabel" name="labServer">
+      <widget class="QLineEdit" name="txtReceiverAddr">
        <property name="text">
-      <string>服务器:</string>
+        <string>feiyangqingyun@163.com;517216493@qq.com</string>
        </property>
       </widget>
      </item>
-   <item row="0" column="5">
+     <item row="3" column="1" colspan="3">
+      <widget class="QLineEdit" name="txtFileName"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="labTitle">
+       <property name="text">
+        <string>邮件标题</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="txtTitle">
+       <property name="text">
+        <string>测试邮件</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
       <widget class="QComboBox" name="cboxServer">
        <item>
         <property name="text">
@@ -103,84 +132,61 @@
        </item>
       </widget>
      </item>
-   <item row="0" column="6">
+     <item row="2" column="2">
-    <widget class="QLabel" name="labPort">
+      <widget class="QLabel" name="labReceiverAddr">
        <property name="text">
-      <string>端口:</string>
+        <string>收件地址</string>
        </property>
       </widget>
      </item>
-   <item row="0" column="7">
+     <item row="3" column="0">
-    <widget class="QComboBox" name="cboxPort">
+      <widget class="QLabel" name="labFileName">
-     <item>
        <property name="text">
-       <string>25</string>
+        <string>选择附件</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>465</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>587</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="0" column="8">
-    <widget class="QCheckBox" name="ckSSL">
-     <property name="text">
-      <string>SSL</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="9">
-    <widget class="QPushButton" name="btnSend">
-     <property name="cursor">
-      <cursorShape>PointingHandCursor</cursorShape>
-     </property>
-     <property name="text">
-      <string>发送</string>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
-    <widget class="QLabel" name="labTitle">
+      <widget class="QLabel" name="labServer">
        <property name="text">
-      <string>标  题:</string>
+        <string>服务地址</string>
        </property>
       </widget>
      </item>
-   <item row="4" column="0">
+     <item row="0" column="0">
-    <widget class="QLabel" name="labFileName">
+      <widget class="QLabel" name="labSenderAddr">
        <property name="text">
-      <string>附  件:</string>
+        <string>用户名称</string>
        </property>
       </widget>
      </item>
-   <item row="5" column="0">
+     <item row="0" column="1">
-    <widget class="QLabel" name="labContent">
+      <widget class="QLineEdit" name="txtSenderAddr">
        <property name="text">
-      <string>正  文:</string>
+        <string>feiyangqingyun@126.com</string>
        </property>
       </widget>
      </item>
-   <item row="4" column="9">
+     <item row="0" column="2">
-    <widget class="QPushButton" name="btnSelect">
+      <widget class="QLabel" name="labSenderPwd">
-     <property name="cursor">
-      <cursorShape>PointingHandCursor</cursorShape>
-     </property>
        <property name="text">
-      <string>浏览</string>
+        <string>用户密码</string>
        </property>
       </widget>
      </item>
-   <item row="4" column="1" colspan="8">
+     <item row="0" column="3">
-    <widget class="QLineEdit" name="txtFileName"/>
+      <widget class="QLineEdit" name="txtSenderPwd">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="echoMode">
+        <enum>QLineEdit::Password</enum>
+       </property>
+      </widget>
      </item>
-   <item row="5" column="1" colspan="9">
+    </layout>
+   </item>
+   <item>
     <widget class="QTextBrowser" name="txtContent">
      <property name="readOnly">
       <bool>false</bool>
@@ -189,35 +195,27 @@
       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'宋体'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'SimSun'; font-size:9.07563pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;1&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、最短的爱情哲理小说：“&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;你应该嫁给我啦？&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;” “ &lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;不&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;” &lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;于是他俩又继续幸福地生活在一起&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;！&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;2&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、近年来中国最精彩的写实小说，全文八个字：&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:16pt; font-weight:600; font-style:italic; color:#ff007f;&quot;&gt;此地钱多人傻速来&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;  据说是发自杭州市宝石山下一出租房的汇款单上的简短附言，是该按摩女给家乡妹妹汇 款时随手涂鸦的，令无数专业作家汗颜！&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;3&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、最短的幽默小说 《夜》 男：疼么？女：恩！男：算了？女：别！&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'宋体'; font-size:11pt;&quot;&gt;1&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、最短的爱情哲理小说：“&lt;/span&gt;&lt;span style=&quot; font-family:'宋体'; font-size:11pt;&quot;&gt;你应该嫁给我啦？&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;” “ &lt;/span&gt;&lt;span style=&quot; font-family:'宋体'; font-size:11pt;&quot;&gt;不&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;” &lt;/span&gt;&lt;span style=&quot; font-family:'宋体'; font-size:11pt;&quot;&gt;于是他俩又继续幸福地生活在一起&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;！&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'宋体'; font-size:11pt;&quot;&gt;2&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、近年来中国最精彩的写实小说，全文八个字：&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:16pt; font-weight:600; font-style:italic; color:#ff007f;&quot;&gt;此地钱多人傻速来&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;  据说是发自杭州市宝石山下一出租房的汇款单上的简短附言，是该按摩女给家乡妹妹汇 款时随手涂鸦的，令无数专业作家汗颜！&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'宋体'; font-size:11pt;&quot;&gt;3&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、最短的幽默小说 《夜》 男：疼么？女：恩！男：算了？女：别！&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;4&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、最短的荒诞小说：有一个面包走在街上，它觉得自己很饿，就把自己吃了。&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;5&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、世界最短言情小说：他死的那天，孩子出生了。&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;6&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、世界最短武侠小说：&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt; font-weight:600; color:#00aa00;&quot;&gt;高手被豆腐砸死了&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;。&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;7&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、世界最短科幻小说：最后一个地球人坐在家里，突然响起了敲门声。&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;8&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、世界最短悬疑小说：生，死，生。&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;9&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、世界最短推理小说：他死了，一定曾经活过。 &lt;br /&gt;1&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;0&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、世界最短恐怖小说：惊醒，身边躺着自己的尸体。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'宋体'; font-size:11pt;&quot;&gt;4&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、最短的荒诞小说：有一个面包走在街上，它觉得自己很饿，就把自己吃了。&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'宋体'; font-size:11pt;&quot;&gt;5&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、世界最短言情小说：他死的那天，孩子出生了。&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'宋体'; font-size:11pt;&quot;&gt;6&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、世界最短武侠小说：&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt; font-weight:600; color:#00aa00;&quot;&gt;高手被豆腐砸死了&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;。&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'宋体'; font-size:11pt;&quot;&gt;7&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、世界最短科幻小说：最后一个地球人坐在家里，突然响起了敲门声。&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'宋体'; font-size:11pt;&quot;&gt;8&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、世界最短悬疑小说：生，死，生。&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'宋体'; font-size:11pt;&quot;&gt;9&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、世界最短推理小说：他死了，一定曾经活过。 &lt;br /&gt;1&lt;/span&gt;&lt;span style=&quot; font-family:'宋体'; font-size:11pt;&quot;&gt;0&lt;/span&gt;&lt;span style=&quot; font-family:'Times New Roman'; font-size:11pt;&quot;&gt;、世界最短恐怖小说：惊醒，身边躺着自己的尸体。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" colspan="3">
-    <widget class="QLineEdit" name="txtTitle">
-     <property name="text">
-      <string>测试邮件</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="4">
-    <widget class="QLabel" name="labReceiverAddr">
-     <property name="text">
-      <string>收件人:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="5" colspan="5">
-    <widget class="QLineEdit" name="txtReceiverAddr">
-     <property name="text">
-      <string>feiyangqingyun@163.com;517216493@qq.com</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>txtSenderAddr</tabstop>
+  <tabstop>txtSenderPwd</tabstop>
+  <tabstop>cboxServer</tabstop>
+  <tabstop>cboxPort</tabstop>
+  <tabstop>ckSSL</tabstop>
+  <tabstop>txtTitle</tabstop>
+  <tabstop>txtReceiverAddr</tabstop>
+  <tabstop>btnSend</tabstop>
+  <tabstop>txtFileName</tabstop>
+  <tabstop>btnSelect</tabstop>
+  <tabstop>txtContent</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

emailtool/main.cpp

@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
 #endif
 
     frmEmailTool w;
-    w.setWindowTitle("邮件发送工具");
+    w.setWindowTitle("串口调试助手 V2021 (QQ: 517216493 WX: feiyangqingyun)");
     w.show();
 
     return a.exec();

emailtool/sendemail/mimemessage.cpp

@@ -1,222 +0,0 @@
-#include "mimemessage.h"
-
-#include <QDateTime>
-#include "quotedprintable.h"
-#include <typeinfo>
-
-MimeMessage::MimeMessage(bool createAutoMimeContent) :
-	hEncoding(MimePart::_8Bit)
-{
-	if (createAutoMimeContent) {
-		this->content = new MimeMultiPart();
-	}
-}
-
-MimeMessage::~MimeMessage()
-{
-}
-
-MimePart &MimeMessage::getContent()
-{
-	return *content;
-}
-
-void MimeMessage::setContent(MimePart *content)
-{
-	this->content = content;
-}
-
-void MimeMessage::setSender(EmailAddress *e)
-{
-	this->sender = e;
-}
-
-void MimeMessage::addRecipient(EmailAddress *rcpt, RecipientType type)
-{
-	switch (type) {
-		case To:
-			recipientsTo << rcpt;
-			break;
-
-		case Cc:
-			recipientsCc << rcpt;
-			break;
-
-		case Bcc:
-			recipientsBcc << rcpt;
-			break;
-	}
-}
-
-void MimeMessage::addTo(EmailAddress *rcpt)
-{
-	this->recipientsTo << rcpt;
-}
-
-void MimeMessage::addCc(EmailAddress *rcpt)
-{
-	this->recipientsCc << rcpt;
-}
-
-void MimeMessage::addBcc(EmailAddress *rcpt)
-{
-	this->recipientsBcc << rcpt;
-}
-
-void MimeMessage::setSubject(const QString &subject)
-{
-	this->subject = subject;
-}
-
-void MimeMessage::addPart(MimePart *part)
-{
-	if (typeid(*content) == typeid(MimeMultiPart)) {
-		((MimeMultiPart *) content)->addPart(part);
-	};
-}
-
-void MimeMessage::setHeaderEncoding(MimePart::Encoding hEnc)
-{
-	this->hEncoding = hEnc;
-}
-
-const EmailAddress &MimeMessage::getSender() const
-{
-	return *sender;
-}
-
-const QList<EmailAddress *> &MimeMessage::getRecipients(RecipientType type) const
-{
-	switch (type) {
-		default:
-		case To:
-			return recipientsTo;
-
-		case Cc:
-			return recipientsCc;
-
-		case Bcc:
-			return recipientsBcc;
-	}
-}
-
-const QString &MimeMessage::getSubject() const
-{
-	return subject;
-}
-
-const QList<MimePart *> &MimeMessage::getParts() const
-{
-	if (typeid(*content) == typeid(MimeMultiPart)) {
-		return ((MimeMultiPart *) content)->getParts();
-	} else {
-		QList<MimePart *> *res = new QList<MimePart *>();
-		res->append(content);
-		return *res;
-	}
-}
-
-QString MimeMessage::toString()
-{
-	QString mime;
-
-	mime = "From:";
-
-	if (sender->getName() != "") {
-		switch (hEncoding) {
-			case MimePart::Base64:
-				mime += " =?utf-8?B?" + QByteArray().append(sender->getName()).toBase64() + "?=";
-				break;
-
-			case MimePart::QuotedPrintable:
-				mime += " =?utf-8?Q?" + QuotedPrintable::encode(QByteArray().append(sender->getName())).replace(' ', "_").replace(':', "=3A") + "?=";
-				break;
-
-			default:
-				mime += " " + sender->getName();
-		}
-	}
-
-	mime += " <" + sender->getAddress() + ">\r\n";
-
-	mime += "To:";
-	QList<EmailAddress *>::iterator it;
-	int i;
-
-	for (i = 0, it = recipientsTo.begin(); it != recipientsTo.end(); ++it, ++i) {
-		if (i != 0) {
-			mime += ",";
-		}
-
-		if ((*it)->getName() != "") {
-			switch (hEncoding) {
-				case MimePart::Base64:
-					mime += " =?utf-8?B?" + QByteArray().append((*it)->getName()).toBase64() + "?=";
-					break;
-
-				case MimePart::QuotedPrintable:
-					mime += " =?utf-8?Q?" + QuotedPrintable::encode(QByteArray().append((*it)->getName())).replace(' ', "_").replace(':', "=3A") + "?=";
-					break;
-
-				default:
-					mime += " " + (*it)->getName();
-			}
-		}
-
-		mime += " <" + (*it)->getAddress() + ">";
-	}
-
-	mime += "\r\n";
-
-	if (recipientsCc.size() != 0) {
-		mime += "Cc:";
-	}
-
-	for (i = 0, it = recipientsCc.begin(); it != recipientsCc.end(); ++it, ++i) {
-		if (i != 0) {
-			mime += ",";
-		}
-
-		if ((*it)->getName() != "") {
-			switch (hEncoding) {
-				case MimePart::Base64:
-					mime += " =?utf-8?B?" + QByteArray().append((*it)->getName()).toBase64() + "?=";
-					break;
-
-				case MimePart::QuotedPrintable:
-					mime += " =?utf-8?Q?" + QuotedPrintable::encode(QByteArray().append((*it)->getName())).replace(' ', "_").replace(':', "=3A") + "?=";
-					break;
-
-				default:
-					mime += " " + (*it)->getName();
-			}
-		}
-
-		mime += " <" + (*it)->getAddress() + ">";
-	}
-
-	if (recipientsCc.size() != 0) {
-		mime += "\r\n";
-	}
-
-	mime += "Subject: ";
-
-	switch (hEncoding) {
-		case MimePart::Base64:
-			mime += "=?utf-8?B?" + QByteArray().append(subject).toBase64() + "?=";
-			break;
-
-		case MimePart::QuotedPrintable:
-			mime += "=?utf-8?Q?" + QuotedPrintable::encode(QByteArray().append(subject)).replace(' ', "_").replace(':', "=3A") + "?=";
-			break;
-
-		default:
-			mime += subject;
-	}
-
-	mime += "\r\n";
-	mime += "MIME-Version: 1.0\r\n";
-
-	mime += content->toString();
-	return mime;
-}

emailtool/sendemail/mimemultipart.cpp

@@ -1,67 +0,0 @@
-#include "mimemultipart.h"
-#include <QTime>
-#include <QCryptographicHash>
-
-const QString MULTI_PART_NAMES[] = {
-	"multipart/mixed",         //    Mixed
-	"multipart/digest",        //    Digest
-	"multipart/alternative",   //    Alternative
-	"multipart/related",       //    Related
-	"multipart/report",        //    Report
-	"multipart/signed",        //    Signed
-	"multipart/encrypted"      //    Encrypted
-};
-
-MimeMultiPart::MimeMultiPart(MultiPartType type)
-{
-	this->type = type;
-	this->cType = MULTI_PART_NAMES[this->type];
-	this->cEncoding = _8Bit;
-
-	QCryptographicHash md5(QCryptographicHash::Md5);
-	md5.addData(QByteArray().append(qrand()));
-	cBoundary = md5.result().toHex();
-}
-
-MimeMultiPart::~MimeMultiPart()
-{
-
-}
-
-void MimeMultiPart::addPart(MimePart *part)
-{
-	parts.append(part);
-}
-
-const QList<MimePart *> &MimeMultiPart::getParts() const
-{
-	return parts;
-}
-
-void MimeMultiPart::prepare()
-{
-	QList<MimePart *>::iterator it;
-
-	content = "";
-
-	for (it = parts.begin(); it != parts.end(); it++) {
-		content += "--" + cBoundary + "\r\n";
-		(*it)->prepare();
-		content += (*it)->toString();
-	};
-
-	content += "--" + cBoundary + "--\r\n";
-
-	MimePart::prepare();
-}
-
-void MimeMultiPart::setMimeType(const MultiPartType type)
-{
-	this->type = type;
-	this->cType = MULTI_PART_NAMES[type];
-}
-
-MimeMultiPart::MultiPartType MimeMultiPart::getMimeType() const
-{
-	return type;
-}

emailtool/sendemailthread.cpp

@@ -1,5 +1,5 @@
 #include "sendemailthread.h"
-#include "sendemail/smtpmime.h"
+#include "smtpmime.h"
 
 #pragma execution_character_set("utf-8")
 #define TIMEMS qPrintable(QTime::currentTime().toString("hh:mm:ss zzz"))

ffmpegdemo/ffmpegdemo.pro

@@ -1,6 +1,13 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2019-02-16T15:08:47
+#
+#-------------------------------------------------
+
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 android {QT += androidextras}
 
 TARGET      = ffmpegdemo

ffmpegdemo/main.cpp

@@ -1,9 +1,7 @@
 #pragma execution_character_set("utf-8")
 #include "widget.h"
-
 #include <QApplication>
 #include <QTextCodec>
-#include <QDesktopWidget>
 
 int main(int argc, char *argv[])
 {
@@ -35,12 +33,5 @@ int main(int argc, char *argv[])
     w.setWindowTitle("视频流播放ffmpeg内核 (QQ: 517216493)");
     w.show();
 
-    //居中显示窗体
-    QDesktopWidget deskWidget;
-    int deskWidth = deskWidget.availableGeometry().width();
-    int deskHeight = deskWidget.availableGeometry().height();
-    QPoint movePoint(deskWidth / 2 - w.width() / 2, deskHeight / 2 - w.height() / 2);
-    w.move(movePoint);
-
     return a.exec();
 }

flatui/flatui.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = flatui
 TEMPLATE    = app

flatui/frmflatui.cpp

@@ -4,7 +4,6 @@
 #include "ui_frmflatui.h"
 #include "flatui.h"
 #include "qdebug.h"
-#include "qdesktopwidget.h"
 #include "qdatetime.h"
 
 frmFlatUI::frmFlatUI(QWidget *parent) : QWidget(parent), ui(new Ui::frmFlatUI)
@@ -58,7 +57,7 @@ void frmFlatUI::initForm()
     FlatUI::setScrollBarQss(ui->verticalScrollBar, 8, 120, 20, "#606060", "#34495E", "#1ABC9C", "#E74C3C");
 
     //设置列数和列宽
-    int width = qApp->desktop()->availableGeometry().width() - 120;
+    int width = 1920;
     ui->tableWidget->setColumnCount(5);
     ui->tableWidget->setColumnWidth(0, width * 0.06);
     ui->tableWidget->setColumnWidth(1, width * 0.10);
@@ -82,7 +81,6 @@ void frmFlatUI::initForm()
 
     for (int i = 0; i < 300; i++) {
         ui->tableWidget->setRowHeight(i, 24);
-
         QTableWidgetItem *itemDeviceID = new QTableWidgetItem(QString::number(i + 1));
         QTableWidgetItem *itemDeviceName = new QTableWidgetItem(QString("测试设备%1").arg(i + 1));
         QTableWidgetItem *itemDeviceAddr = new QTableWidgetItem(QString::number(i + 1));
@@ -95,5 +93,4 @@ void frmFlatUI::initForm()
         ui->tableWidget->setItem(i, 3, itemContent);
         ui->tableWidget->setItem(i, 4, itemTime);
     }
-
 }

flatui/main.cpp

@@ -9,7 +9,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     a.setFont(QFont("Microsoft Yahei", 9));
 
-#if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
+#if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
 #if _MSC_VER
     QTextCodec *codec = QTextCodec::codecForName("gbk");
 #else

framelesswidget/framelesswidget.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = framelesswidget
 TEMPLATE    = app

framelesswidget/frmframelesswidget.cpp

@@ -36,7 +36,7 @@ void frmFramelessWidget::initWidget(QWidget *w)
 
     //设置下背景颜色区别看
     QPalette palette = w->palette();
-    palette.setBrush(QPalette::Background, QColor(162, 121, 197));
+    palette.setBrush(QPalette::Window, QColor(162, 121, 197));
     w->setPalette(palette);
 
     QPushButton *btn = new QPushButton(w);

framelesswidget/main.cpp

@@ -9,7 +9,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     a.setFont(QFont("Microsoft Yahei", 9));
 
-#if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
+#if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
 #if _MSC_VER
     QTextCodec *codec = QTextCodec::codecForName("gbk");
 #else

gifwidget/gifwidget.cpp

@@ -13,13 +13,19 @@
 #include "qtimer.h"
 #include "qdatetime.h"
 #include "qapplication.h"
-#include "qdesktopwidget.h"
 #include "qdesktopservices.h"
 #include "qfiledialog.h"
 #include "qurl.h"
 #include "qdebug.h"
-#if (QT_VERSION > QT_VERSION_CHECK(5,0,0))
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
 #include "qscreen.h"
+#define deskGeometry qApp->primaryScreen()->geometry()
+#define deskGeometry2 qApp->primaryScreen()->availableGeometry()
+#else
+#include "qdesktopwidget.h"
+#define deskGeometry qApp->desktop()->geometry()
+#define deskGeometry2 qApp->desktop()->availableGeometry()
 #endif
 
 QScopedPointer<GifWidget> GifWidget::self;
@@ -267,7 +273,7 @@ void GifWidget::saveImage()
         return;
     }
 
-#if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
+#if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
     //由于qt4没有RGBA8888,采用最接近RGBA8888的是ARGB32,颜色会有点偏差
     QPixmap pix = QPixmap::grabWindow(0, x() + rectGif.x(), y() + rectGif.y(), rectGif.width(), rectGif.height());
     QImage image = pix.toImage().convertToFormat(QImage::Format_ARGB32);

gifwidget/gifwidget.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = gifwidget
 TEMPLATE    = app

gifwidget/main.cpp

@@ -11,7 +11,7 @@ int main(int argc, char *argv[])
     a.setFont(QFont("Microsoft Yahei", 9));
     a.setWindowIcon(QIcon(":/image/gifwidget.ico"));
 
-#if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
+#if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
 #if _MSC_VER
     QTextCodec *codec = QTextCodec::codecForName("gbk");
 #else

imageswitch/imageswitch.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = imageswitch
 TEMPLATE    = app

ipaddress/ipaddress.h

@@ -24,6 +24,7 @@ class IPAddress : public QWidget
 
 {
     Q_OBJECT
+
     Q_PROPERTY(QString ip READ getIP WRITE setIP)
 
 public:

ipaddress/ipaddress.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = ipaddress
 TEMPLATE    = app

lightbutton/lightbutton.h

@@ -25,6 +25,7 @@ class LightButton : public QWidget
 
 {
     Q_OBJECT
+
     Q_PROPERTY(QString text READ getText WRITE setText)
     Q_PROPERTY(QColor textColor READ getTextColor WRITE setTextColor)
     Q_PROPERTY(QColor alarmColor READ getAlarmColor WRITE setAlarmColor)

lightbutton/lightbutton.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = lightbutton
 TEMPLATE    = app

lineeditnext/lineeditnext.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = lineeditnext
 TEMPLATE    = app

live/livetool/trayicon.cpp

@@ -4,14 +4,13 @@
 #include "qmutex.h"
 #include "qmenu.h"
 #include "qapplication.h"
-#include "qdesktopwidget.h"
 #include "qdebug.h"
 
 QScopedPointer<TrayIcon> TrayIcon::self;
 TrayIcon *TrayIcon::Instance()
 {
     if (self.isNull()) {
-        QMutex mutex;
+        static QMutex mutex;
         QMutexLocker locker(&mutex);
         if (self.isNull()) {
             self.reset(new TrayIcon);
@@ -27,7 +26,7 @@ TrayIcon::TrayIcon(QObject *parent) : QObject(parent)
     trayIcon = new QSystemTrayIcon(this);
     connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
             this, SLOT(iconIsActived(QSystemTrayIcon::ActivationReason)));
-    menu = new QMenu(QApplication::desktop());
+    menu = new QMenu;
     exitDirect = true;
 }
 

live/livetool/trayicon.h

@@ -3,10 +3,10 @@
 
 /**
  * 托盘图标控件 作者:feiyangqingyun(QQ:517216493) 2017-1-8
- * 1:可设置托盘图标对应所属主窗体
+ * 1. 可设置托盘图标对应所属主窗体
- * 2:可设置托盘图标
+ * 2. 可设置托盘图标
- * 3:可设置提示信息
+ * 3. 可设置提示信息
- * 4:自带右键菜单
+ * 4. 自带右键菜单
  */
 
 #include <QObject>
@@ -15,13 +15,7 @@
 class QMenu;
 
 #ifdef quc
-#if (QT_VERSION < QT_VERSION_CHECK(5,7,0))
+class Q_DECL_EXPORT TrayIcon : public QObject
-#include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
-
-class QDESIGNER_WIDGET_EXPORT TrayIcon : public QObject
 #else
 class TrayIcon : public QObject
 #endif

lunarcalendarwidget/lunarcalendarinfo.cpp

@@ -641,7 +641,7 @@ void LunarCalendarInfo::getLunarCalendarInfo(int year, int month, int day,
     //记录大小月的天数 29或30
     int monthCount = 0;
 
-    if(((lunarCalendarTable.at(year - 1901) & 0x0060) >> 5) == 1) {
+    if (((lunarCalendarTable.at(year - 1901) & 0x0060) >> 5) == 1) {
         springOffset = (lunarCalendarTable.at(year - 1901) & 0x001F) - 1;
     } else {
         springOffset = (lunarCalendarTable.at(year - 1901) & 0x001F) - 1 + 31;
@@ -649,7 +649,7 @@ void LunarCalendarInfo::getLunarCalendarInfo(int year, int month, int day,
 
     //如果是不闰年且不是2月份 +1
     newYearOffset = monthAdd.at(month - 1) + day - 1;
-    if((!(year % 4)) && (month > 2)) {
+    if ((!(year % 4)) && (month > 2)) {
         newYearOffset++;
     }
 
@@ -665,7 +665,7 @@ void LunarCalendarInfo::getLunarCalendarInfo(int year, int month, int day,
         index = 1;
         flag = 0;
 
-        if((lunarCalendarTable.at(year - 1901) & (0x80000 >> (index - 1))) == 0) {
+        if ((lunarCalendarTable.at(year - 1901) & (0x80000 >> (index - 1))) == 0) {
             monthCount = 29;
         } else {
             monthCount = 30;
@@ -674,7 +674,7 @@ void LunarCalendarInfo::getLunarCalendarInfo(int year, int month, int day,
         while (newYearOffset >= monthCount) {
             newYearOffset -= monthCount;
             index++;
-            if (month == ((lunarCalendarTable.at(year - 1901) & 0xF00000) >> 20) ) {
+            if (month == ((lunarCalendarTable.at(year - 1901) & 0xF00000) >> 20)) {
                 flag = ~flag;
                 if (flag == 0) {
                     month++;
@@ -713,11 +713,11 @@ void LunarCalendarInfo::getLunarCalendarInfo(int year, int month, int day,
             springOffset -= monthCount;
             index--;
 
-            if(flag == 0) {
+            if (flag == 0) {
                 month--;
             }
 
-            if(month == ((lunarCalendarTable.at(year - 1901) & 0xF00000) >> 20)) {
+            if (month == ((lunarCalendarTable.at(year - 1901) & 0xF00000) >> 20)) {
                 flag = ~flag;
             }
 

lunarcalendarwidget/lunarcalendarwidget.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET          = lunarcalendarwidget
 TEMPLATE        = app

maskwidget/main.cpp

@@ -9,7 +9,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     a.setFont(QFont("Microsoft Yahei", 9));
 
-#if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
+#if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
 #if _MSC_VER
     QTextCodec *codec = QTextCodec::codecForName("gbk");
 #else

maskwidget/maskwidget.cpp

@@ -2,10 +2,19 @@
 
 #include "maskwidget.h"
 #include "qmutex.h"
-#include "qdesktopwidget.h"
 #include "qapplication.h"
 #include "qdebug.h"
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0))
+#include "qscreen.h"
+#define deskGeometry qApp->primaryScreen()->geometry()
+#define deskGeometry2 qApp->primaryScreen()->availableGeometry()
+#else
+#include "qdesktopwidget.h"
+#define deskGeometry qApp->desktop()->geometry()
+#define deskGeometry2 qApp->desktop()->availableGeometry()
+#endif
+
 QScopedPointer<MaskWidget> MaskWidget::self;
 MaskWidget *MaskWidget::Instance()
 {
@@ -27,7 +36,7 @@ MaskWidget::MaskWidget(QWidget *parent) : QWidget(parent)
     setBgColor(QColor(0, 0, 0));
 
     //不设置主窗体则遮罩层大小为默认桌面大小
-    this->setGeometry(qApp->desktop()->geometry());
+    this->setGeometry(deskGeometry);
     this->setWindowFlags(Qt::FramelessWindowHint | Qt::Tool);
 
     //绑定全局事件,过滤弹窗窗体进行处理

maskwidget/maskwidget.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = maskwidget
 TEMPLATE    = app

miniblink/miniblink.pro

@@ -1,5 +1,13 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2019-02-16T15:08:47
+#
+#-------------------------------------------------
+
 QT       += core gui
+
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = miniblink
 TEMPLATE    = app

mouseline/mouseline.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = mouseline
 TEMPLATE    = app

movewidget/main.cpp

@@ -9,7 +9,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     a.setFont(QFont("Microsoft Yahei", 9));
 
-#if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
+#if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
 #if _MSC_VER
     QTextCodec *codec = QTextCodec::codecForName("gbk");
 #else

movewidget/movewidget.pro

@@ -7,6 +7,7 @@
 QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
 TARGET      = movewidget
 TEMPLATE    = app

mpvdemo/main.cpp

@@ -1,9 +1,7 @@
 #pragma execution_character_set("utf-8")
 #include "widget.h"
-
 #include <QApplication>
 #include <QTextCodec>
-#include <QDesktopWidget>
 
 int main(int argc, char *argv[])
 {
@@ -32,12 +30,5 @@ int main(int argc, char *argv[])
     w.setWindowTitle("视频流播放mpv内核 (QQ: 517216493)");
     w.show();   
 
-    //居中显示窗体
-    QDesktopWidget deskWidget;
-    int deskWidth = deskWidget.availableGeometry().width();
-    int deskHeight = deskWidget.availableGeometry().height();
-    QPoint movePoint(deskWidth / 2 - w.width() / 2, deskHeight / 2 - w.height() / 2);
-    w.move(movePoint);
-
     return a.exec();
 }