update icon, add alipay

sxn0508 · Nov 2, 2017 · dfb025a · dfb025a
1 parent a49ab7a
commit dfb025a
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 11 deletions.
diff --git a/docs/dev_log.html b/docs/dev_log.html
@@ -264,7 +264,6 @@ <h4>V5.5Beta3 2017.11.01</h4>
 <h4>TODO LIST</h4>
 <ol>
     <li>全局piid，按piid传递信号</li>
-    <li>报文深入解析</li>
     <li>读取、设置、操作面板搭建、功能实现</li>
 </ol>
 

diff --git a/imgs/698.ico b/imgs/698.ico
diff --git a/imgs/698_o.ico b/imgs/698_o.ico
diff --git a/imgs/698_v5.ico b/imgs/698_v5.ico
diff --git a/imgs/698_v5.png b/imgs/698_v5.png
diff --git a/imgs/698_v5_b.png b/imgs/698_v5_b.png
diff --git a/imgs/698_v5_o.png b/imgs/698_v5_o.png
diff --git a/imgs/alipay.jpg b/imgs/alipay.jpg
diff --git a/imgs/logo_v5.psd b/imgs/logo_v5.psd
diff --git a/master/UI/about_ui.py b/master/UI/about_ui.py
@@ -21,11 +21,12 @@ def setup_ui(self):
         self.setWindowIcon(QtGui.QIcon(os.path.join(config.SORTWARE_PATH, config.MASTER_ICO_PATH)))
 
         self.head_img = QtGui.QLabel()
-        self.head_img.setText('<img src="{logopath}" height="70" width="70"></img>'\
-                            .format(logopath=os.path.join(config.SORTWARE_PATH, config.MASTER_ICO_PATH)))
+        self.head_img.setText('<img src="{master_logo}" height="72"></img><span> </span><img src="{trans_logo}" height="72"></img>'\
+                            .format(master_logo=os.path.join(config.SORTWARE_PATH, config.MASTER_ICO_PATH),\
+                                    trans_logo=os.path.join(config.SORTWARE_PATH, config.TRANS_ICO_PATH)))
         self.head_ver = QtGui.QLabel()
         self.head_ver.setText('<p style="font-family: 微软雅黑; font-size: 16px;" align="center">\
-                                <b>698后台_{version}<br>{dt}</b></p>'\
+                                <b>698后台/698日志解析<br>{version}({dt})</b></p>'\
                                 .format(version=config.MASTER_SOFTWARE_VERSION, dt=config.MASTER_SOFTWARE_DT))
         self.head_hbox = QtGui.QHBoxLayout()
         self.head_hbox.addStretch(1)
@@ -35,7 +36,9 @@ def setup_ui(self):
 
         self.about_box = QtGui.QTextBrowser()
         with open(os.path.join(config.SORTWARE_PATH, 'docs/dev_log.html'), encoding='utf-8') as dev_log:
-            self.about_box.setText(dev_log.read())
+            text = dev_log.read() + '<h3>如果您喜欢我的作品，希望您能支持我:</h3>' +\
+                    '<center><img src="{alipay}" height="350"></center>'.format(alipay=os.path.join(config.SORTWARE_PATH, config.ALIPAY_IMG))
+            self.about_box.setText(text)
 
         self.foot_text = QtGui.QLabel()
         self.foot_text.setText('<p align="center">Designed by Kay. Powered by Qt Company.')

diff --git a/master/UI/trans_ui_setup.py b/master/UI/trans_ui_setup.py
@@ -15,7 +15,7 @@ def __init__(self):
     def setup_ui(self):
         """set layout"""
         self.setWindowTitle('698日志解析工具_{ver}'.format(ver=config.TRANS_WINDOW_TITLE_ADD))
-        self.setWindowIcon(QtGui.QIcon(os.path.join(config.SORTWARE_PATH, 'imgs/698_o.png')))
+        self.setWindowIcon(QtGui.QIcon(os.path.join(config.SORTWARE_PATH, config.TRANS_ICO_PATH)))
         self.menubar = self.menuBar()
         self.file_menu = self.menubar.addMenu('&文件')
         self.open_action = QtGui.QAction('&打开...', self)

diff --git a/master/config.py b/master/config.py
@@ -3,14 +3,15 @@
 import sys
 
 
-MASTER_SOFTWARE_VERSION = 'V5.5Beta2'
+MASTER_SOFTWARE_VERSION = 'V5.5Beta3'
 MASTER_SOFTWARE_DT = '2017.10'
 MASTER_WINDOW_TITLE_ADD = '_%s(%s)'%(MASTER_SOFTWARE_VERSION, MASTER_SOFTWARE_DT)
-MASTER_ICO_PATH = 'imgs/698_v5.png'
-TRANS_SOFTWARE_VERSION = 'VT1.2Beta2'
-TRANS_SOFTWARE_DT = '2017.08'
+MASTER_ICO_PATH = 'imgs/698_v5_b.png'
+TRANS_SOFTWARE_VERSION = MASTER_SOFTWARE_VERSION
+TRANS_SOFTWARE_DT = MASTER_SOFTWARE_DT
 TRANS_WINDOW_TITLE_ADD = '_%s(%s)'%(TRANS_SOFTWARE_VERSION, TRANS_SOFTWARE_DT)
-TRANS_ICO_PATH = 'imgs/698_o.png'
+TRANS_ICO_PATH = 'imgs/698_v5_o.png'
+ALIPAY_IMG = 'imgs/alipay.jpg'
 
 TRANS_WINDOW = None
 ABOUT_WINDOW = None