From dc56df0acaa5c5087240984eca8e2af361f5e442 Mon Sep 17 00:00:00 2001 From: liugang Date: Mon, 21 Sep 2020 10:18:33 +0800 Subject: [PATCH] =?UTF-8?q?#=20=E4=BF=AE=E5=A4=8D=E6=95=85=E9=9A=9C=20I1VY?= =?UTF-8?q?VO=20=E7=A8=8B=E5=BA=8F=E5=90=AF=E5=8A=A8=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=90=8E,=E5=85=B3=E9=97=AD=E5=90=AF=E5=8A=A8=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyminer2/pmappmodern.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pyminer2/pmappmodern.py b/pyminer2/pmappmodern.py index 9f315c63..42243f1a 100644 --- a/pyminer2/pmappmodern.py +++ b/pyminer2/pmappmodern.py @@ -103,9 +103,10 @@ class PMToolBarHome(PMGToolBar): super().__init__() zh_locale = {'New\nScript': '新建\n脚本', 'New': '新建', 'Open': '打开', 'Search': '查找文件', - 'Compare': '文件比较', 'Import\nData': '导入\n数据','Import\nDatabase': '导入\n数据库', + 'Compare': '文件比较', 'Import\nData': '导入\n数据', 'Import\nDatabase': '导入\n数据库', 'Save\nWorkspace': '保存\n工作区', 'New Var': '新建变量', - 'Open Var': '打开变量', 'Clear': '清除工作区', 'Settings': '设置', 'AppStore': '应用\n商店','Help': '帮助', 'View': '视图'} + 'Open Var': '打开变量', 'Clear': '清除工作区', 'Settings': '设置', 'AppStore': '应用\n商店', 'Help': '帮助', + 'View': '视图'} pmlocale.add_locale('zh_CN', zh_locale) self.add_tool_button( @@ -186,8 +187,10 @@ class PMToolBarHome(PMGToolBar): self.get_control_widget('button_search_for_files').clicked.connect(lambda: print('查找文件：未做')) self.get_control_widget('button_compare_files').clicked.connect(lambda: print('比较文件：未做')) - self.get_control_widget('button_import_data').clicked.connect(lambda: get_main_window().main_open_data_chooseFile()) - self.get_control_widget('button_import_database').clicked.connect(lambda: get_main_window().import_database_display()) + self.get_control_widget('button_import_data').clicked.connect( + lambda: get_main_window().main_open_data_chooseFile()) + self.get_control_widget('button_import_database').clicked.connect( + lambda: get_main_window().import_database_display()) self.get_control_widget('button_save_workspace').clicked.connect(lambda: print('保存工作区：未做')) self.get_control_widget('button_new_variable').clicked.connect(lambda: print('新建变量：未做')) self.get_control_widget('button_open_variable').clicked.connect(lambda: print('打开变量：未做')) @@ -216,7 +219,7 @@ class MainWindow(BaseMainWindow): def __init__(self, parent=None): super().__init__(parent) - self.resize(1500,850) + self.resize(1500, 850) self.setIconSize(QSize(40, 40)) self.load_settings() @@ -352,13 +355,13 @@ class MainWindow(BaseMainWindow): self.boot_timer.start(50) self.boot_timer.timeout.connect(self.on_boot_timer_timeout) self.layouts_ready_signal.emit() - + def import_database_display(self): """ 显示"从数据库导入"窗口 """ self.import_database = sample.ImportDatabase() - #self.import_database.signal_data_change.connect(self.slot_dataset_reload) + # self.import_database.signal_data_change.connect(self.slot_dataset_reload) self.import_database.show() def main_appstore_dispaly(self): @@ -369,13 +372,12 @@ class MainWindow(BaseMainWindow): # self.import_database.signal_data_change.connect(self.slot_dataset_reload) self.appstore.show() - def main_option_display(self): """ 显示"选项"窗口 """ self.main_option = base.OptionForm() - #self.import_database.signal_data_change.connect(self.slot_dataset_reload) + # self.import_database.signal_data_change.connect(self.slot_dataset_reload) self.main_option.show() def main_open_data_chooseFile(self): @@ -525,6 +527,7 @@ def load_translator(app): app.trans.load(os.path.join(os.path.dirname(__file__), 'translations', 'qt_{0}.qm'.format(QLocale.system().name()))) app.installTranslator(app.trans) + def main(): from pyminer2 import pmutil app = QApplication(sys.argv) @@ -547,5 +550,6 @@ def main(): f = QFont(app.default_font, 10) app.setFont(f) demo = MainWindow() + splash.finish(demo) # 修复故障 I1VYVO 程序启动完成后,关闭启动界面 liugang 20200921 id(demo) sys.exit(app.exec_()) -- Gitee