git-svn-id: file:///srv/xfl/svn/SVN/wzx/SpeedNumCube@23860 2e29f1fe-100b-dc43-ad61-23effca57775

publish/product/app.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SpeedNumCube>
-<versioninfo minver="7.8.3" maxver="7.8.5">极速号码魔方</versioninfo>
+<versioninfo minver="7.8.5" maxver="7.8.6">极速号码魔方</versioninfo>
 <download_server>
 <url>http://app.iyoogo.com:86/product/</url>
 </download_server>
@@ -25,10 +25,10 @@
 <zipfile createtime="2013-06-28 04:15:22" lastupdatetime="2013-06-28 04:15:22">QtXml4.zip</zipfile>
 <zipfile createtime="2018-12-13 18:38:58" lastupdatetime="2018-12-13 18:38:58">SetupSegment.zip</zipfile>
 <zipfile createtime="2020-12-15 15:34:22" lastupdatetime="2020-12-15 15:34:22">SNCCore.zip</zipfile>
-<zipfile createtime="2020-06-29 13:07:34" lastupdatetime="2020-06-29 13:07:34">SNCCube.zip</zipfile>
-<zipfile createtime="2021-01-18 14:16:16" lastupdatetime="2021-01-18 14:16:16">SNCDataBase.zip</zipfile>
+<zipfile createtime="2021-01-21 17:02:29" lastupdatetime="2021-01-21 17:02:29">SNCCube.zip</zipfile>
+<zipfile createtime="2021-01-21 17:12:18" lastupdatetime="2021-01-21 17:12:18">SNCDataBase.zip</zipfile>
 <zipfile createtime="2018-12-18 14:31:00" lastupdatetime="2018-12-18 14:31:00">SNCHelpMe.zip</zipfile>
-<zipfile createtime="2020-01-07 15:00:54" lastupdatetime="2020-01-07 15:00:54">SNCMain.zip</zipfile>
+<zipfile createtime="2021-01-21 16:58:05" lastupdatetime="2021-01-21 16:58:05">SNCMain.zip</zipfile>
 <zipfile createtime="2015-01-25 22:21:41" lastupdatetime="2015-01-25 22:21:41">SNCNum.zip</zipfile>
 <zipfile createtime="2018-12-18 14:34:17" lastupdatetime="2018-12-18 14:34:17">SNCNumCheck.zip</zipfile>
 <zipfile createtime="2018-12-18 14:34:32" lastupdatetime="2018-12-18 14:34:32">sncrec.zip</zipfile>

publish/speednumcube.iss

@@ -7,7 +7,7 @@ Name: "cn"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
 
 [Setup]
 AppName=极速号码魔方
-AppVersion=7.8.5
+AppVersion=7.8.6
 AppPublisher=佰意兴网络科技有限公司
 AppPublisherURL=http://www.iyoogo.com:86/
 DisableDirPage = yes

publish/test/app.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SpeedNumCube>
-<versioninfo minver="7.8.3" maxver="7.8.5">极速号码魔方</versioninfo>
+<versioninfo minver="7.8.5" maxver="7.8.6">极速号码魔方</versioninfo>
 <download_server>
 <url>http://app.iyoogo.com:86/test/</url>
 </download_server>
@@ -25,10 +25,10 @@
 <zipfile createtime="2013-06-28 04:15:22" lastupdatetime="2013-06-28 04:15:22">QtXml4.zip</zipfile>
 <zipfile createtime="2018-12-13 18:38:58" lastupdatetime="2018-12-13 18:38:58">SetupSegment.zip</zipfile>
 <zipfile createtime="2020-12-15 15:34:22" lastupdatetime="2020-12-15 15:34:22">SNCCore.zip</zipfile>
-<zipfile createtime="2020-06-29 13:07:34" lastupdatetime="2020-06-29 13:07:34">SNCCube.zip</zipfile>
-<zipfile createtime="2021-01-18 14:16:16" lastupdatetime="2021-01-18 14:16:16">SNCDataBase.zip</zipfile>
+<zipfile createtime="2021-01-21 17:02:29" lastupdatetime="2021-01-21 17:02:29">SNCCube.zip</zipfile>
+<zipfile createtime="2021-01-21 17:12:18" lastupdatetime="2021-01-21 17:12:18">SNCDataBase.zip</zipfile>
 <zipfile createtime="2018-12-18 14:31:00" lastupdatetime="2018-12-18 14:31:00">SNCHelpMe.zip</zipfile>
-<zipfile createtime="2020-01-07 15:00:54" lastupdatetime="2020-01-07 15:00:54">SNCMain.zip</zipfile>
+<zipfile createtime="2021-01-21 16:58:05" lastupdatetime="2021-01-21 16:58:05">SNCMain.zip</zipfile>
 <zipfile createtime="2015-01-25 22:21:41" lastupdatetime="2015-01-25 22:21:41">SNCNum.zip</zipfile>
 <zipfile createtime="2018-12-18 14:34:17" lastupdatetime="2018-12-18 14:34:17">SNCNumCheck.zip</zipfile>
 <zipfile createtime="2018-12-18 14:34:32" lastupdatetime="2018-12-18 14:34:32">sncrec.zip</zipfile>

sncprojects/lib/SNCCube/formcube.cpp

@@ -1007,11 +1007,14 @@ bool FormCube::checkThreadFinished()
     threadsFinished = false;
     return true;
 }
+
 void FormCube::displayStatistics()
 {
+    //ui->sourcecounterLabel->setText("当前原始号码："+number2Thousandth(sourceModel->getCount())+"个");
+    //ui->destcounterLabel->setText("当前目标号码："+number2Thousandth(destModel->getCount())+"个");
+    ui->sourcecounterLabel->setText(QString::fromLocal8Bit(("当前原始号码："+number2Thousandth(sourceModel->getCount())+"个").toLocal8Bit()));
+    ui->destcounterLabel->setText(QString::fromLocal8Bit(("当前目标号码："+number2Thousandth(destModel->getCount())+"个").toLocal8Bit()));
 
-    ui->sourcecounterLabel->setText("当前原始号码："+number2Thousandth(sourceModel->getCount())+"个");
-    ui->destcounterLabel->setText("当前目标号码："+number2Thousandth(destModel->getCount())+"个");
     if(destModel->getCount()<=0)
     {
         this->cacheViewDest->setVisible(true);
@@ -1202,9 +1205,9 @@ void FormCube::initButton()
         QPushButton *button = new QPushButton();
         buttons.append(button);
         if(i%2==0)
-            button->setText("↑");
+            button->setText(QString::fromLocal8Bit("↑"));
         else
-            button->setText("↓");
+            button->setText(QString::fromLocal8Bit("↓"));
         button->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
         button->setFixedWidth(28);
         button->setFixedHeight(23);

sncprojects/lib/SNCDataBase/sncdatabase.cpp

@@ -694,12 +694,12 @@ QMap<QString,QStringList> SNCDataBase::getLocalClientConfigs()
 }
 QString SNCDataBase::getAppVersion()
 {
-    return "7.8.5";//±ØÐëÊÇ7.1.0Èý¶Î
+    return "7.8.6";//±ØÐëÊÇ7.1.0Èý¶Î
 }
 
 QString SNCDataBase::getAppVersion2()
 {
-    return "7.8.5";
+    return "7.8.6";
 }
 QString SNCDataBase::getSegVersion()
 {

sncprojects/lib/SNCMain/mainwindow.cpp

@@ -90,7 +90,8 @@ void MainWindow::initVariables()
     {
         QToolButton *button = new QToolButton();
         button->setIcon(QIcon(btnIcons.at(i)));
-        button->setText(btnNames.at(i));
+        //button->setText(btnNames.at(i));
+        button->setText(QString::fromLocal8Bit(btnNames.at(i).toLocal8Bit()));    //mod by wzx ½â¾öÖÐÎijöÏÖÂÒÂëÎÊÌâ
         button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         button->setCheckable(true);
         button->setMinimumWidth(120);

sncprojects/sncprojects.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.6.1, 2021-01-19T11:11:04. -->
+<!-- Written by Qt Creator 2.6.1, 2021-01-22T10:25:15. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>