Add about widget

KangLin · Nov 16, 2016 · 8492152 · 8492152
1 parent cd3db2f
commit 8492152
Show file tree

Hide file tree

Showing 30 changed files with 2,708 additions and 645 deletions.
diff --git a/Authors.txt b/Authors.txt
@@ -1,2 +1,2 @@
-康林(QQ:16614119 MSN、email:kl222@126.com)
-缪正伟(email:393758926@qq.com)
+康林(QQ:16614119 email:kl222@126.com)
+
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,2 +1,2 @@
-版本：0.1.0
+版本：0.0.1
 --------------
diff --git a/mainwindow.cpp → Mainwindow.cpp b/mainwindow.cpp → Mainwindow.cpp
@@ -10,6 +10,7 @@
 #include "GpxModel/gpx_model.h"
 #include "Global/Global.h"
 #include "Common/Tool.h"
+#include "Widgets/DlgAbout/DlgAbout.h"
 
 #include <osgEarthAnnotation/FeatureNode>
 #include <osgEarthFeatures/Feature>
@@ -562,3 +563,9 @@ int MainWindow::InitToolbar()
     ui->mainToolBar->addAction(ui->actionMeasure_the_distance_M);
     return 0;
 }
+
+void MainWindow::on_actionAbout_A_triggered()
+{
+    CDlgAbout about(this);
+    about.exec();
+}
diff --git a/mainwindow.h → Mainwindow.h b/mainwindow.h → Mainwindow.h
@@ -62,6 +62,8 @@ private slots:
 
     void on_actionToolBar_triggered();
 
+    void on_actionAbout_A_triggered();
+
 private:
     int LoadMap(QString szFile);
 

diff --git a/mainwindow.ui → Mainwindow.ui b/mainwindow.ui → Mainwindow.ui
diff --git a/README.md b/README.md
@@ -4,10 +4,10 @@
 
 =============================================================================
 
-* Author：KangLin（msn、email:kl222@126.com ; QQ:16614119)
+* Author：KangLin（email:kl222@126.com ; QQ:16614119)
 * Project：https://github.com/KangLin/rabbitGIS  
 
-|[<img src="Resource/png/china.png" alt="Chinese" title="Chinese" width="16" height="16" />Chinese](README_ZH.md)|
+|[<img src="Resource/png/China.png" alt="Chinese" title="Chinese" width="16" height="16" />Chinese](README_ZH.md)|
 
 -----------------------------------------------------------------------------
 ## Build

diff --git a/README_ZH.md b/README_ZH.md
@@ -4,7 +4,7 @@
 
 =============================================================================
 
-* 作者：康林（msn、email:kl222@126.com ; QQ:16614119)
+* 作者：康林（email:kl222@126.com ; QQ:16614119)
 * 项目位置：https://github.com/KangLin/rabbitGIS  
 
 

diff --git a/RabbitGIS.pro b/RabbitGIS.pro
@@ -44,7 +44,8 @@ CONFIG += link_prl
 include(pri/ThirdLibraryConfig.pri)
 include(pri/ThirdLibrary.pri)
 include(pri/ThirdLibraryJoin.pri)
-include(pri/RabbitGISFiles.pri)
+include(pri/Files.pri)
+include(pri/Version.pri)
 
 # Rules for creating/updating {ts|qm}-files
 include(Resource/translations/translations.pri)
@@ -56,7 +57,8 @@ OTHER_FILES += \
     .gitignore \
     appveyor.yml \
     ci/* \
-    Data/*
+    Data/* \
+    Version.h.template
 
 DISTFILES += \
     LICENSE.md \

diff --git a/Resource/Resource.qrc b/Resource/Resource.qrc
@@ -2,14 +2,14 @@
     <qresource prefix="/icon">
         <file alias="AppIcon">png/AppIcon.png</file>
         <file alias="Language">png/Language.jpg</file>
-        <file alias="China">png/china.png</file>
         <file alias="English">png/English.png</file>
         <file alias="Setting">png/settings16x16.png</file>
         <file alias="Map">png/map.jpg</file>
         <file alias="Track">png/track.png</file>
         <file alias="Close">png/close.png</file>
         <file alias="Stype">png/stype.png</file>
         <file alias="Measure">png/Measure.png</file>
+        <file alias="China">png/China.png</file>
     </qresource>
     <qresource prefix="/sink">
         <file alias="Blue">sink/blue.qss</file>

diff --git a/Resource/png/china.png → Resource/png/China.png b/Resource/png/china.png → Resource/png/China.png