update

Author: jksdou

src/build.spec

@@ -3,7 +3,7 @@
 BLOCK_CIPHER = None
 APP_NAME = 'Pythub'
 APP_APP = 'Pythub.app'
-APP_VERSION = '0.0.2'
+APP_VERSION = '0.0.3'
 SCRIPTS = ['pythub.py']
 BINARIES = []
 DATAS = []

src/pythub.py

@@ -11,19 +11,17 @@
 class App(View):
     def __init__(self, master=None):
         super(App, self).__init__()
-        master.title('Pythub')
-        master.resizable(False, False)
 
     def fn_build(self):
         '''生成可执行文件'''
         if not self.status_build:
-            thread_build = Thread(target=self.thread)
+            thread_build = Thread(target=self.fn_thread)
             thread_build.setDaemon(True)
             thread_build.start()
         else:
             self.label_status['text'] = '正在打包，请稍后再操作！'
 
-    def thread(self):
+    def fn_thread(self):
         '''线程执行生成动作'''
         if len(self.entry_value_list[0].get()) == 0:
             self.label_status['text'] = '请选择源文件'
@@ -41,5 +39,7 @@ def thread(self):
 
 if __name__ == '__main__':
     root = Tk()
+    root.title('Pythub')
     App(root)
+    set_window_center(root)
     root.mainloop()

src/utils.py

@@ -2,16 +2,38 @@
 # utils functions
 
 
-def set_window_center(window, width, height):
+def set_window_center(window, width=None, height=None, minsize=True, resize=False):
     """设置窗口宽高及居中"""
-    # 获取屏幕 宽、高
+    # 获取窗口宽高
+    if width == None or height == None:
+        # 宽高为 None 时取窗口自身大小
+        window.update_idletasks() # 更新
+        window.withdraw() # 隐藏重绘
+        # window.update() # 获取窗口宽高之前需要先刷新窗口
+    if width is None:
+        width = window.winfo_width()
+    if height is None:
+        height = window.winfo_height()
+
+    # 获取屏幕宽高
     w_s = window.winfo_screenwidth()
     h_s = window.winfo_screenheight()
+
     # 计算 x, y 位置
     x_co = (w_s - width) / 2
-    y_co = (h_s - height) / 2 - 50
+    y_co = (h_s - height) / 2
+
+    # 设置窗口宽高和居中定位
     window.geometry("%dx%d+%d+%d" % (width, height, x_co, y_co))
-    window.minsize(width, height)
+    window.deiconify() # 显示
+    # 是否设置窗口最小尺寸
+    if minsize:
+        window.minsize(width, height)
+    # 是否可调整大小
+    if resize:
+        window.resizable(True, True)
+    else:
+        window.resizable(False, False)
 
 
 def get_screen_size(window):
@@ -21,7 +43,8 @@ def get_screen_size(window):
 
 def get_window_size(window):
     """获取窗口 宽、高"""
-    return window.winfo_reqwidth(), window.winfo_reqheight()
+    window.update()
+    return window.winfo_width(), window.winfo_height()
 
 
 def treeview_sort_column(tv, col, reverse):

src/view.py

@@ -3,16 +3,14 @@
 import os.path
 from tkinter import (Button, Checkbutton, Entry, IntVar, Label, LabelFrame, StringVar, filedialog)
 
-from utils import set_window_center
-
 
 class View(object):
     def __init__(self, master=None):
         self.root = master
         self.status_build = False
-        self.init_frame()
+        self.init_view()
 
-    def init_frame(self):
+    def init_view(self):
         '''基本框架'''
         self.frm_project = LabelFrame(self.root, text='项目')
         self.frm_config = LabelFrame(self.root, text='配置')
@@ -65,11 +63,11 @@ def init_project(self):
 
     def init_config(self):
         '''配置选项'''
-        # 定义变量
-        self.cfg_onefile = IntVar()
-        self.cfg_onedir = IntVar()
-        self.cfg_noconsole = IntVar()
-        self.cfg_clean = IntVar()
+        # 定义变量，并初始化
+        self.cfg_onefile = IntVar(value=1)
+        self.cfg_onedir = IntVar(value=0)
+        self.cfg_noconsole = IntVar(value=1)
+        self.cfg_clean = IntVar(value=1)
         self.cfg_rename = IntVar()
         self.cfg_exe_name = StringVar()
         # 子配置框架
@@ -88,25 +86,35 @@ def init_config(self):
         self.btn_clean = Checkbutton(
             self.frm_config_base, text='构建前清理', variable=self.cfg_clean)
         self.btn_isonefile = Checkbutton(
-            self.frm_config_exe, text='单个执行文件', variable=self.cfg_onefile)
+            self.frm_config_exe, text='独立执行文件', variable=self.cfg_onefile)
         self.btn_isonedir = Checkbutton(
-            self.frm_config_exe, text='文件夹包', variable=self.cfg_onedir)
+            self.frm_config_exe, text='文件夹包含', variable=self.cfg_onedir)
         self.btn_rename = Checkbutton(
             self.frm_config_other, text='修改执行文件名', variable=self.cfg_rename)
         self.entry_rename = Entry(
             self.frm_config_other, textvariable=self.cfg_exe_name)
+
         # 放置按钮
         self.btn_isonefile.pack(side='left', fill='x')
         self.btn_isonedir.pack(side='left', fill='x')
         self.btn_noconsole.pack(side='left', fill='x')
         self.btn_clean.pack(side='left', fill='x')
         self.btn_rename.pack(side='left', fill='x')
         self.entry_rename.pack(fill='x')
-        # 初始化默认值
-        self.cfg_onefile.set(1)
-        self.cfg_onedir.set(0)
-        self.cfg_noconsole.set(1)
-        self.cfg_clean.set(1)
+
+        # 变量自动切换操作
+        self.cfg_onefile.trace('w', self.cfg_onefile_trace)
+        self.cfg_onedir.trace('w', self.cfg_onedir_trace)
+
+    def cfg_onefile_trace(self, *args):
+        '''cfg_onefile 与 cfg_onedir 可以同时不选，但不能同时选中，选中独立执行文件时不能选中文件夹包'''
+        if self.cfg_onefile.get() == 1:
+            self.cfg_onedir.set(0)
+
+    def cfg_onedir_trace(self, *args):
+        '''cfg_onefile 与 cfg_onedir 可以同时不选，但不能同时选中，选中文件夹包含时不能选中独立执行文件'''
+        if self.cfg_onedir.get() == 1:
+            self.cfg_onefile.set(0)
 
     def init_operate(self):
         '''操作命令'''
@@ -224,3 +232,9 @@ def fn_build_cmd(self):
             cmds.append(self.entry_value_list[0].get())
 
         return ' '.join(cmds)
+
+if __name__ == '__main__':
+    from tkinter import Tk
+    root = Tk()
+    View(root)
+    root.mainloop()