改进结构

QWidgetDemo.pro

@@ -25,7 +25,7 @@ SUBDIRS += battery          #电池电量控件
 SUBDIRS += lineeditnext     #文本框回车焦点下移
 SUBDIRS += zhtopy           #汉字转拼音
 SUBDIRS += qwtdemo          #qwt的源码版本，无需插件，直接源码集成到你的项目即可
-SUBDIRS += buttondefence    #通用按钮地图效果
+SUBDIRS += devicebutton     #设备按钮地图效果
 SUBDIRS += mouseline        #鼠标定位十字线
 SUBDIRS += emailtool        #邮件发送工具
 SUBDIRS += ntpclient        #NTP服务器时间同步

core_qui/core_qui.pri

@@ -22,3 +22,11 @@ SOURCES += \
     $$PWD/quistyle.cpp \
     $$PWD/quitipbox.cpp \
     $$PWD/quiwidget.cpp
+
+!contains(DEFINES, no_qui_qm) {
+RESOURCES += $$PWD/source/qm.qrc
+}
+
+!contains(DEFINES, no_qui_ttf) {
+RESOURCES += $$PWD/source/ttf.qrc
+}

core_qui/quiconfig.h

@@ -14,6 +14,7 @@ public:
     static QChar IconNormal;        //还原图标
     static QChar IconClose;         //关闭图标
 
+    //全局字体
     static QString FontName;        //全局字体名称
     static int FontSize;            //全局字体大小
 

core_qui/quidateselect.cpp

@@ -194,8 +194,8 @@ void QUIDateSelect::initControl()
     labTitle->setText("日期时间选择");
     labStart->setText("开始时间");
     labEnd->setText("结束时间");
-    btnOk->setText("确定");
+    btnOk->setText("确 定");
-    btnClose->setText("关闭");
+    btnClose->setText("关 闭");
 
     dateStart->setDate(QDate::currentDate());
     dateEnd->setDate(QDate::currentDate().addDays(1));

core_qui/quihelper.cpp

@@ -1076,7 +1076,11 @@ void QUIHelper::showMessageBoxInfo(const QString &info, int closeSec, bool exec)
             QUIMessageBox::Instance()->show();
         }
     } else {
-        QMessageBox::information(0, "提示", info, QMessageBox::Ok);
+        QMessageBox box(QMessageBox::Information, "提示", info);
+        box.setStandardButtons(QMessageBox::Yes);
+        box.setButtonText(QMessageBox::Yes, QString("确 定"));
+        box.exec();
+        //QMessageBox::information(0, "提示", info, QMessageBox::Yes);
     }
 }
 
@@ -1092,7 +1096,11 @@ void QUIHelper::showMessageBoxError(const QString &info, int closeSec, bool exec
             QUIMessageBox::Instance()->show();
         }
     } else {
-        QMessageBox::critical(0, "错误", info, QMessageBox::Ok);
+        QMessageBox box(QMessageBox::Critical, "错误", info);
+        box.setStandardButtons(QMessageBox::Yes);
+        box.setButtonText(QMessageBox::Yes, QString("确 定"));
+        box.exec();
+        //QMessageBox::critical(0, "错误", info, QMessageBox::Yes);
     }
 }
 
@@ -1103,7 +1111,12 @@ int QUIHelper::showMessageBoxQuestion(const QString &info)
         msg.setMessage(info, 1);
         return msg.exec();
     } else {
-        return QMessageBox::question(0, "询问", info, QMessageBox::Yes | QMessageBox::No);
+        QMessageBox box(QMessageBox::Question, "询问", info);
+        box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+        box.setButtonText(QMessageBox::Yes, QString("确 定"));
+        box.setButtonText(QMessageBox::No, QString("取 消"));
+        return box.exec();
+        //return QMessageBox::question(0, "询问", info, QMessageBox::Yes | QMessageBox::No);
     }
 }
 

core_qui/quiinputbox.cpp

@@ -160,8 +160,8 @@ void QUIInputBox::initControl()
     QWidget::setTabOrder(btnOk, btnCancel);
 
     labTitle->setText("输入框");
-    btnOk->setText("确定");
+    btnOk->setText("确 定");
-    btnCancel->setText("取消");
+    btnCancel->setText("取 消");
 
     connect(btnOk, SIGNAL(clicked()), this, SLOT(on_btnOk_clicked()));
     connect(btnCancel, SIGNAL(clicked()), this, SLOT(on_btnMenu_Close_clicked()));

core_qui/quimessagebox.cpp

@@ -202,8 +202,8 @@ void QUIMessageBox::initControl()
     widgetMain->raise();
     frame->raise();
 
-    btnOk->setText("确定");
+    btnOk->setText("确 定");
-    btnCancel->setText("取消");
+    btnCancel->setText("取 消");
 
     connect(btnOk, SIGNAL(clicked()), this, SLOT(on_btnOk_clicked()));
     connect(btnCancel, SIGNAL(clicked()), this, SLOT(on_btnMenu_Close_clicked()));

core_qui/source/qm.qrc

@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>image/qt_zh_CN.qm</file>
+        <file>image/widgets.qm</file>
+    </qresource>
+</RCC>

core_qui/source/ttf.qrc

@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>image/fontawesome-webfont.ttf</file>
+        <file>image/iconfont.ttf</file>
+    </qresource>
+</RCC>

netserver/other/main.qrc

@@ -1,7 +1,5 @@
 <RCC>
     <qresource prefix="/">
         <file>main.ico</file>
-        <file>qt_zh_CN.qm</file>
-        <file>widgets.qm</file>
     </qresource>
 </RCC>

nettool/other/main.qrc

@@ -1,7 +1,5 @@
 <RCC>
     <qresource prefix="/">
         <file>main.ico</file>
-        <file>qt_zh_CN.qm</file>
-        <file>widgets.qm</file>
     </qresource>
 </RCC>