Merge pull request #5 from xfz329/new_ui

change license

common/config.py

@@ -44,7 +44,7 @@ class Config(QConfig):
 
 YEAR = "2004-2020"
 AUTHOR = "Jiang Feng"
-VERSION = "0.1.4.b"
+VERSION = "0.1.4.c"
 KERNEL_VERSION = "0.1.4"
 HELP_URL = "https://xfz329-pk4adi-tutorial.readthedocs.io/en/latest/"
 REPO_URL = "https://github.com/xfz329/pk4adi_gui"

nsis/output.cmd → nsis/output.bat

@@ -1,5 +1,5 @@
-pyinstaller.exe  -i D:\UrgeData\Documents\Codes\Github\pk_gui\figures\pk.ico -Dw main.py -n PK4ADI
-pyinstaller.exe  -i D:\UrgeData\Documents\Codes\Github\pk_gui\resource\images\logo.ico -Dw pk4adi_demo.py -n PK4ADI
+pyinstaller.exe  -i D:\UrgeData\Documents\Codes\Github\pk_gui\resource\images\logo.ico -Dw pk4adi_demo.py -n PK4ADI --noconfirm
 cp -r D:\UrgeData\Documents\Codes\Github\pk_gui\resource\ D:\UrgeData\Documents\Codes\Github\pk_gui\dist\PK4ADI\resource
 cp -r D:\UrgeData\Documents\Codes\Github\pk_gui\nsis\logs D:\UrgeData\Documents\Codes\Github\pk_gui\dist\PK4ADI
-cp -r D:\UrgeData\Documents\Codes\Github\pk_gui\license D:\UrgeData\Documents\Codes\Github\pk_gui\dist\PK4ADI
+md D:\UrgeData\Documents\Codes\Github\pk_gui\dist\PK4ADI\license
+cp D:\UrgeData\Documents\Codes\Github\pk_gui\LICENSE D:\UrgeData\Documents\Codes\Github\pk_gui\dist\PK4ADI\license\LICENSE

nsis/output.nsi

@@ -2,7 +2,7 @@
 
 ; 安装程序初始定义常量
 !define PRODUCT_NAME "PK4ADI计算器"
-!define PRODUCT_VERSION "0.1.4.b"
+!define PRODUCT_VERSION "0.1.4.c"
 !define PRODUCT_PUBLISHER "浙江大学生仪学院"
 !define PRODUCT_WEB_SITE "http://www.cbeis.zju.edu.cn/main.htm"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -21,7 +21,7 @@ SetCompressor lzma
 ; 欢迎页面
 !insertmacro MUI_PAGE_WELCOME
 ; 许可协议页面
-!insertmacro MUI_PAGE_LICENSE "D:\UrgeData\Documents\Codes\Github\pk_gui\license\license.txt"
+!insertmacro MUI_PAGE_LICENSE "D:\UrgeData\Documents\Codes\Github\pk_gui\LICENSE"
 ; 安装目录选择页面
 !insertmacro MUI_PAGE_DIRECTORY
 ; 安装过程页面
@@ -41,7 +41,7 @@ SetCompressor lzma
 ; ------ MUI 现代界面定义结束 ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "D:\UrgeData\Documents\Codes\Github\pk_gui\nsis\PK4ADI_0.1.4.b_x64-setup.exe"
+OutFile "D:\UrgeData\Documents\Codes\Github\pk_gui\nsis\PK4ADI_0.1.4.c_x64-setup.exe"
 InstallDir "$PROGRAMFILES\PK4ADI"
 ShowInstDetails show
 ShowUnInstDetails show

qms/setting_interface.py.ts

@@ -125,8 +125,8 @@
     </message>
     <message>
         <location filename="../view/setting_interface.py" line="125"/>
-        <source>MIT</source>
-        <translation>基于MIT协议</translation>
+        <source>GPLv3</source>
+        <translation>基于GPLv3协议</translation>
     </message>
     <message>
         <location filename="../view/setting_interface.py" line="132"/>

requirements.txt

@@ -1,5 +1,5 @@
 openpyxl
-pk4adi >=0.1.4
+pk4adi>=0.1.4
 pandas
 PyQt5-Frameless-Window>=0.2.7
-PyQt_Fluent_Widgets
+PyQt_Fluent_Widgets>=1.1.3

resource/i18n/pk4adi_calculator.zh_CN.ts

@@ -768,8 +768,8 @@
     </message>
     <message>
         <location filename="../../view/setting_interface.py" line="125"/>
-        <source>MIT</source>
-        <translation>基于MIT协议</translation>
+        <source>GPLv3</source>
+        <translation>基于GPLv3协议</translation>
     </message>
     <message>
         <location filename="../../view/setting_interface.py" line="132"/>

view/setting_interface.py

@@ -126,7 +126,7 @@ def __init__(self, parent=None):
             self.tr('Show license'),
             FIF.DICTIONARY,
             self.tr('License'),
-            self.tr('MIT'),
+            self.tr('GPLv3'),
             self.aboutGroup
         )
         self.authorsCard = PrimaryPushSettingCard(
@@ -257,23 +257,18 @@ def show_authors(self):
     def show_license(self):
         w = MessageBox(
             self.tr('License'),
-            "The MIT License (MIT) \n"
-            "Copyright (c) 2023 Zhejiang University.\n"
-            "Permission is hereby granted, free of charge, to any person obtaining a copy "
-            "of this software and associated documentation files (the \"Software\"), to deal "
-            "in the Software without restriction, including without limitation the rights "
-            "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell "
-            "copies of the Software, and to permit persons to whom the Software is "
-            "furnished to do so, subject to the following conditions:\n"
-            "The above copyright notice and this permission notice shall be included in all "
-            "copies or substantial portions of the Software.\n"
-            "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR "
-            "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, "
-            "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE "
-            "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER "
-            "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, "
-            "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE "
-            "SOFTWARE.",
+            "The GNU General Public License v3.0 (GPLv3) \n\n"
+            "Copyright (C) 2023 Zhejiang University.\n\n"
+            "This program is free software: you can redistribute it and/or modify "
+            "it under the terms of the GNU General Public License as published by "
+            "the Free Software Foundation, either version 3 of the License, or "
+            "(at your option) any later version.\n\n" 
+            "This program is distributed in the hope that it will be useful, "
+            "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+            "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
+            "GNU General Public License for more details.\n\n"    
+            "You should have received a copy of the GNU General Public License "
+            "along with this program.  If not, see <https://www.gnu.org/licenses/>.",
             self
         )
         w.exec()