Add updater

KangLin · Jul 10, 2020 · 35f08cf · 35f08cf
1 parent 79da8b7
commit 35f08cf
Show file tree

Hide file tree

Showing 13 changed files with 158 additions and 180 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+Src/Resource/Translations/RabbitCommon_zh_*.ts
 pri/NUL
 Translations.qrc
 Plugin/PluginStatic.cpp

diff --git a/App/Resource/Translations/RabbitImApp_zh_CN.ts b/App/Resource/Translations/RabbitImApp_zh_CN.ts
@@ -12,7 +12,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../main.cpp" line="40"/>
+        <location filename="../../main.cpp" line="51"/>
         <source>Rabbit immediate communicate</source>
         <translation>玉兔即时通讯</translation>
     </message>

diff --git a/App/Resource/Translations/RabbitImApp_zh_TW.ts b/App/Resource/Translations/RabbitImApp_zh_TW.ts
@@ -12,7 +12,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../main.cpp" line="40"/>
+        <location filename="../../main.cpp" line="51"/>
         <source>Rabbit immediate communicate</source>
         <translation>玉兔即時通訊</translation>
     </message>

diff --git a/App/main.cpp b/App/main.cpp
@@ -7,8 +7,12 @@
 #include <QTranslator>
 #include <QSsl>
 #include <QSslSocket>
-#include "RabbitCommonTools.h"
-#include "RabbitCommonDir.h"
+
+#ifdef RABBITCOMMON
+    #include "RabbitCommonTools.h"
+    #include "RabbitCommonDir.h"
+    #include "FrmUpdater/FrmUpdater.h"
+#endif
 
 int main(int argc, char *argv[])
 {
@@ -30,7 +34,14 @@ int main(int argc, char *argv[])
 
     app.setApplicationName("RabbitIm");
     app.setOrganizationName("KangLin studio");
+
+#ifdef RABBITCOMMON
     RabbitCommon::CTools::Instance()->Init();
+    CFrmUpdater *pUpdate = new CFrmUpdater();
+    pUpdate->SetTitle(QImage(":/icon/AppIcon"));
+    if(!pUpdate->GenerateUpdateXml())
+        return 0;
+#endif
 
     QTranslator translator;
     translator.load(RabbitCommon::CDir::Instance()->GetDirTranslations()

diff --git a/Src/MainWindow.cpp b/Src/MainWindow.cpp
@@ -12,7 +12,11 @@
 #include "Widgets/FrmSendFile/DlgSendManage.h"
 #include "Widgets/DlgUservCard/DlgUservCard.h"
 #include "Global/Global.h"
-#include "RabbitCommonDir.h"
+
+#ifdef RABBITCOMMON
+    #include "RabbitCommonDir.h"
+    #include "FrmUpdater/FrmUpdater.h"
+#endif
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent
@@ -54,6 +58,10 @@ MainWindow::MainWindow(QWidget *parent) :
     check = connect(ui->actionAbout_A, SIGNAL(triggered()),
             SLOT(slotAbout()));
     Q_ASSERT(check);
+#ifdef RABBITCOMMON  
+    CFrmUpdater updater;
+    ui->actionUpdate->setIcon(updater.windowIcon());
+#endif
 
     LoadStyle();
     LoadTranslate();
@@ -887,6 +895,7 @@ void MainWindow::on_actionScan_qrencode_S_triggered()
 void MainWindow::slotAbout()
 {
     LOG_MODEL_DEBUG("MainWindow", "MainWindow::About");
+#ifdef RABBITCOMMON
     CDlgAbout about(this);
     about.m_AppIcon = QImage(":/icon/AppIcon");    
     about.m_szCopyrightStartTime = "2013";
@@ -895,6 +904,20 @@ void MainWindow::slotAbout()
         about.showMaximized();
 #endif
         about.exec();
+#endif
+}
+
+void MainWindow::on_actionUpdate_triggered()
+{
+#ifdef RABBITCOMMON
+    CFrmUpdater* pfrmUpdater = new CFrmUpdater();
+    pfrmUpdater->SetTitle(QImage(":/icon/AppIcon"));
+    #if defined (Q_OS_ANDROID)
+        pfrmUpdater->showMaximized();
+    #else
+        pfrmUpdater->show();
+    #endif
+#endif
 }
 
 void MainWindow::slotActionGroupStyleTriggered(QAction* act)

diff --git a/Src/MainWindow.h b/Src/MainWindow.h
@@ -172,6 +172,7 @@ private slots:
     void slotCheckShowWindows();
     void slotAnimationFinished();
 #endif
+    void on_actionUpdate_triggered();
 };
 
 #endif // MAINWINDOW_H
diff --git a/Src/MainWindow.ui b/Src/MainWindow.ui
@@ -34,7 +34,7 @@
      <x>0</x>
      <y>0</y>
      <width>250</width>
-     <height>25</height>
+     <height>28</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuOperator_O">
@@ -48,6 +48,7 @@
      <string>Help(&amp;H)</string>
     </property>
     <addaction name="actionAbout_A"/>
+    <addaction name="actionUpdate"/>
    </widget>
    <widget class="QMenu" name="menuTool_T">
     <property name="title">
@@ -62,7 +63,7 @@
   </widget>
   <action name="actionAbout_A">
    <property name="icon">
-    <iconset resource="Resource/Resource.qrc">
+    <iconset resource="../Resource/Resource.qrc">
      <normaloff>:/icon/Information</normaloff>:/icon/Information</iconset>
    </property>
    <property name="text">
@@ -81,7 +82,7 @@
   </action>
   <action name="actionOptions_O">
    <property name="icon">
-    <iconset resource="Resource/Resource.qrc">
+    <iconset resource="../Resource/Resource.qrc">
      <normaloff>:/icon/Options</normaloff>:/icon/Options</iconset>
    </property>
    <property name="text">
@@ -90,17 +91,22 @@
   </action>
   <action name="actionScan_qrencode_S">
    <property name="icon">
-    <iconset resource="Resource/Resource.qrc">
+    <iconset resource="../Resource/Resource.qrc">
      <normaloff>:/icon/Scan</normaloff>:/icon/Scan</iconset>
    </property>
    <property name="text">
     <string>Scan QR code(&amp;S)</string>
    </property>
   </action>
+  <action name="actionUpdate">
+   <property name="text">
+    <string>Update</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="Resource/Resource.qrc"/>
+  <include location="../Resource/Resource.qrc"/>
  </resources>
  <connections/>
 </ui>