From 1016a218ce8beab0b05488fd86d377575c908559 Mon Sep 17 00:00:00 2001
From: WRD1145 <1640884306@qq.com>
Date: Tue, 23 Dec 2025 23:37:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E5=86=85=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __pycache__/conf_ui.cpython-311.pyc     | Bin 4916 -> 4596 bytes
 __pycache__/updater_gui.cpython-311.pyc | Bin 19137 -> 18918 bytes
 _version.py                             |   1 +
 conf_ui.py                              |  25 +++++----------------
 config.ini                              |   3 ---
 main.py                                 |  28 ++----------------------
 6 files changed, 9 insertions(+), 48 deletions(-)
 create mode 100644 _version.py

diff --git a/__pycache__/conf_ui.cpython-311.pyc b/__pycache__/conf_ui.cpython-311.pyc
index 073f255769a5bdc6ad1506730f49e006bf614459..0c8fd0e0a36a753e2849808c6d4e38e9eb152a16 100644
GIT binary patch
delta 1671
zcmZ`(UuauZ7(eI!&;64>H%%AYrfU<4W}?F?o1zYMv!!;Hp%(E9USdzWCS=*X$(YD6
z9adIh;Oa-24?`kCeb|GJP4LMFAN0wQ$-ojA6nxuLbQ44n{7!mrmW$oV&F_5Ye&6>y
zzw@1Q&-MJhT=Z+p(h0V2ufJ0MQ(cdy>G$i89L}CF9g`A9nNqc!Xs?esae<V~Qeu-5
za)p8=jX%%SodIXy%}EMmhA?fFut-VR6fqG0JIxtl`YLf!OnIFYjMEeAn>l!l&NU0P
zBONO?mghe(>ZL}bTsvNW;&gd2NaMZW5AGg7<2<=UO2nazIKmoPqKvL;j>rV$mY9er
zGYL^)GNQUh-lvX+Gb)|fv{yV)s+Q{YH_J74^2{QxgOCxQTf?4fy?Y07gI*#H3Pm9e
z3&IN``rsQOQ<VMKP}eZ;4;kG=tycoQ<ScR3z<ZWd`gV)Y_P^Fh!lXDnQ85A!6POq#
zJVluVH>@#eigKz?SLsV=S<saB&?sCLN9T5zJ07qT!sIYJ%8dtJl-svk3HVo<2n$of
zsVGc^_rzqXpH#5}DqmERi+Vr}9}Qwrlon=2QK`U-qWX4gICwkQ?^eS|m@rhsK3!!`
zK;z3zbGZw<*KjI`MY(#I9pwf`3b((~w=1JTj?X`a{AraD{x!_QoN|t4;1^}@sOB!r
zy3?~qU+zSf@SGlAE?1eSV6qp5sQNZdKt<h0hhRhflBVIHmQkYUtbYuSHfG<}j0^h4
zGoQb4Q_J4cvTZF3pJ|KYc4iX((cbd=QK(0z#qE)C_#tvR&IO3`UX0JcHxJJ1$IKk3
z<gh|+!|!@66va0dJ~WP)c^;MVqiz_NbDT@^xp<V9L?}oeKXcxb91`%OdBiNBS?3=!
z(qFT!{nQ%FOu<HUFMJpM%6y#1z0-@^0v0RM2>cX#Sn$&DSM1p)KlL65i-&!L@b?Nb
z?)<ufEx$y&<N>&k$_Kin4+@nJ@}UokAis#Y1E`6zi*E)oGdQ?!d;5E`pdDvAUlpA%
z2%ZVGL^eKyo~O80UJqW`R$@{g?x?QIPA<AG{G6CII_fFB46EgLJsoU2JK51(cd1-0
zxo#(NrrcO|Yj}xy{8;st?#;k+_Q*r8;h0}%^*ab%ky5%v@@<mehI4iXKDABw!p=9-
zZ4!F6$VfYQw#ZOBc(#q$+S3=cPYzu;^qZ0U)yTD8y=hF{GNx9vu9Bm?5WC~W<A3x#
U_Xhn(sX${`Oq%N90Q5@r9|PAm0{{R3

delta 2019
zcmZ`(TTC2P7(QoqW_Nb>Ua(8KuFznpa<S2(M4MPh3(+7|thy!wGTRn{KxWz47!sC-
zTN|*DBbOH1EEFLr;gXbKVSzsRXaWfjhBU@RW_H(@xTZY#rvKU9Sy(D(GT*s>|M&mr
z{AWLBIoCXEG6@Ju*M4S$APkvP@QtBYO5brBL@aVmMyDxKo1GR0T|%O^3yC@xGowLh
z4*qCyT1CDKIc*~MG0M|>ZVo9qU;XaADF`9&z2MVcM{R3e+jVz=<Z`!oq<UAaL%!_`
zZfrO{sc<MGy?g$Zzt;PMi+=geNTJ+wSML5H)IAW`Sddp&<ms-!V2`}+RVLPgy^rL<
z#gO+_XmXXZ6Fq*vqq1HVL2D+~d0qmIUNnka$caVdWJK)L^r5R*WV(1KD{4S3C$fNA
zkpt9Gznpv@x`CZ~@Ikk0xhU0r?P_wl-Jdozi!I-HD5Em!3vR9|lRd$OP0$y3G+Hj-
zc?jYI{vmncUc{g8X2Bm&zW4OLJU<q71k~2!m^51P@YCQuXIX@X@hED;#Kxo$j(L|n
zFxoq2VDVghLpz!Qzvfim5Jv6Dr=>hcOPl#%L}U_owWAtpHd5MAW4!IttE2InY-%j8
zwb|o+)M!-OqDEvBd0XL@kZognDwTCW+h|g^_{^kGW5*WqFOz!V7~KwaF@hVG$Pc=0
z>MR(r4fSVMAFEB5xEHkXiLs1`jPo@nsmw8v$yDSA$A~<mE(VeML_;9*q&f>C<87av
z%xfIS$5Ke7NsMKjr7=b2j>$YlWnMW(<{Ro_kZDNd2bpQ=EXa(v8`IU%n1Kv1kdiDS
zNCji%w+6SXt*xQ?n!CW$Kz6uJoJp=|v$DBJR`2p^TJP$wLaLNrZ)g%FdOal*8PtA(
zt>jPb8JtAyx=Cy&tGWy=jlX-CJkzD8%e<jq7=H8n^S=D;q@taqqNUT@eDMxnyu}w2
zfv@MnT9lbhTKUi8tuzwgFVbFG7AewC<ZD1A>!Bfvrkta!s=^UV(B&z4eYilPX(3qv
zD#<f_m60B#I|smvWb&5K{31nFRkcI$^@gTm2^^!K!Yj#&P-ZNk6d5rJtzqIb7F2Ma
zA{ddEdK?G)mCh-7dSLI#TF5^ZT$qN3K^b3GMwWt`1l~D#N)Ay=Cn$d&D`i40y-vYO
zelnC9&qC9E4gdr{e#uyftE1*hVJPbKi!UU#<Xcq+7U03$domxmy`p$Kl^^}^^eTNL
zfmwg(?sW7;jVVYbmrYr?lC+v08jGpHFCzwjBU$D;ERas~X~V9rrbcY3uc?vjWY+w4
zhXGbd6lj3mw*da}g2w3g3tP6umWA1q+yxv)$KY9pI~PWA;2Ex%c4NS6xc6Z1Arx4y
z21cTobGUP~Efq$@k#>t%g5hu&&#N$?jBN&{*P^#WUR(_>-iITAP=&_)^5lcS__Ex$
zBzHd!jm{TT<}s3i{9(zqmcz#L@Vn``&^wcEeOY@#qR}UptQCxOii}&cb&*I&<>Xgu
zYR-o+M;~za&j4W!#yHGqFblo_2nc_Kw}{P_OG<3HI-@u8kycyE<*+s%QwRSa2e17d
Tnb|))UyC)^LWz$;Bm(~d*kTbQ

diff --git a/__pycache__/updater_gui.cpython-311.pyc b/__pycache__/updater_gui.cpython-311.pyc
index 70f5fdcccb787d0702b72112e64c5eb8b1db3264..acb275f86da7e522c4008c2c358c0b67b417706a 100644
GIT binary patch
delta 592
zcmZ9IziSjh6vyYy?%t2R?B3pwz1#DWTw;vLC8q`im4F~<E><?_o{hz<V4P<W?PI{s
zDlEY^g`7wN3e#BFh=qTE1jW`MmO&ymg1(!>B7WiVeQ!Q9Z|2Rr9r%_(_#y~=!J7Qk
zzxSuR9VVMUK!|5T2?bi<$N|CD5~Xzq9qTT-);;vB=P<`Eb)E`XfZ<t37s*H8=AcVh
z;x$)~QGfx37*ZL_6k%k!rz=#&+f}Mzjp|sZ7-MQ+gPPc+1QTju%Wll+Q`E+`&GUMk
zCUC;$1wBa}?0}FW?F@LRz2Rh5IF(NAPG?)WxK&jCerX_?a*PCm>FFW8I;H{@?w1D+
zbB>X4Mn!mryUwOkRaEsP-H4bJQn`LMgJL6jFmB7a0srG3$4I;L+`gXOxfI^QZrWX6
z_y=%NidCU%PlT$c!O70pvn*!TNdLPP&nZ|F-KIH|A0^D2H{Ov8J@e9kD`Cdm4c<G@
zHw%?l5uo`p{k#aT&F12<3m?p*rN?<V%zj?pfv@K2mHQG7%&+C&9=PWC+OmY2xp4hE
pK+7a65@5x&`+0!#rnh<n;sbv6aHfYB`SXq(0Qf9QX8Y!n{0mv~fI|QP

delta 803
zcmZ8eUr1A76u;+gbM9`=&HZsx(>tq~tG1#CL4qPIU+SfZ;6M!X-sIZ-ocM>R7X{6%
zrCC!W3mj!@py<N|v)qV?UV908h+Zo1cC81OL{B~R?T#Mo2j}}8zTe?@IOpUN@MZ?=
z&nqf8hQi;_CT)lA*?mL5fngpn0)vbI0xJW8&MdMz8_=M$5sf;V(4=!2mg#IpGi8HZ
zPAq7FqK8rDh!w4R&dN5l(La-1LF{NJl~_p}=pasX>Ux<Rts*XT5jVPt2R+1#UQ&(K
z#D_lOM?a~-8okgg*OEG{)AMq97pcd3J-5gWghw72mJ#_B9c-~Uoem6$fn;OiXVBy4
z1nZJ5#Zr|<3BXWwcj8Nv_o!eODwiB71C?o%fO`Zd?xm(d(I8X_uAOS1gDMu$(A|_6
zhFX_J+?S$TT%=J#vN_=lHV$D(40Z4S_lXBsrkxSoqm1AY?K=(epssnTRxSS548sC@
zj%oG{W~mc5*ei4lh<(wnK`GpOjZ<&WYa`jM%-qIWT+3$p>ryZOb?iQ`J%6eWO~&<n
z^Wg$7$GZCYAm175xh!>sr5=e_7iQHP>CKU}mKw`Hnk`k{oKUA$I9`Vqf3~r<o=?Zs
zS9i51i|Rx&Kb_vnj9-v?gxJ;ot<0@rqx|%IZhT5zU)5gE^OrgXcx`kp_jpNNzLTpO
zpDKB8tW9o~oRxa^0}Byl+gLEd5#^gD!$L?&+TI%Aj3PKz9MGY-0}B>-p}Y+JGQxXh
zIWla9ABjlI418DKwOnE0vvRogj|r?w_;@P|HHvgX1K^djZ7jfP<@`xAaFI{uXjF)G
oMx)BbQ*99VNH<qJPX94_|AGMk3S~wx7MSA0F<?_x+YhmS0UYD;3IG5A

diff --git a/_version.py b/_version.py
new file mode 100644
index 0000000..9e2406e
--- /dev/null
+++ b/_version.py
@@ -0,0 +1 @@
+__version__ = "1.3.0"
\ No newline at end of file
diff --git a/conf_ui.py b/conf_ui.py
index aba22de..885eba4 100644
--- a/conf_ui.py
+++ b/conf_ui.py
@@ -1,65 +1,52 @@
-"""设置界面（Qt）相关逻辑。
-
-通过 `paths.resource` 加载 UI 文件，读取/写入配置并处理开机自启选项。
-"""
+"""设置界面（Qt）相关逻辑"""
 
 from PyQt6.QtWidgets import QDialog, QLineEdit, QPushButton, QComboBox, QCheckBox
 from PyQt6 import uic
 from PyQt6.QtCore import Qt
-import paths
+from pathlib import Path
 import conf_file as config
 import shortcut as a
 
+_UI_FILE = Path(__file__).with_name('settings.ui')   
 
-class FramelessWindow(QDialog):
-    """无边框设置窗口，绑定 UI 控件并保存配置。"""
 
+class FramelessWindow(QDialog):
     def __init__(self):
         super().__init__()
-        # 使用 paths.resource 加载 UI 文件（兼容打包与源码）
-        uic.loadUi(paths.resource('settings.ui'), self)
+        uic.loadUi(_UI_FILE, self)   
 
-        # 绑定 DPI 组合框
         self.opt1_Combo = self.findChild(QComboBox, 'opt1_Combo')
         self.opt1_Combo.setCurrentIndex(int(config.read_conf('General', 'DPI') or 0))
         self.opt1_Combo.currentIndexChanged.connect(self.opt1_Save)
 
-        # 绑定 PPT 标题输入框
         self.opt2_LineEdit = self.findChild(QLineEdit, 'opt2_LineEdit')
         self.opt2_LineEdit.setText(config.read_conf('General', 'PPT_Title') or 'PowerPoint 幻灯片放映')
         self.opt2_LineEdit.textChanged.connect(self.opt2_Save)
 
-        # 绑定开机自启复选框
         self.opt3_checkBox = self.findChild(QCheckBox, 'opt3_checkBox')
         self.opt3_checkBox.setChecked(int(config.read_conf('General', 'auto_startup') or 0))
         self.opt3_checkBox.stateChanged.connect(self.opt3_Save)
 
-        # 重置按钮
         self.opt2_Reset = self.findChild(QPushButton, 'opt2Reset')
         self.opt2_Reset.clicked.connect(self.opt2_ResetToDefault)
 
-    # ---------- 配置保存相关方法 ----------
+    
     def opt1_Save(self, idx):
-        """保存 DPI 设置索引."""
         config.write_conf('General', 'DPI', str(idx))
 
     def opt2_Save(self, txt):
-        """保存 PPT 标题配置."""
         config.write_conf('General', 'PPT_Title', txt)
 
     def opt2_ResetToDefault(self):
-        """将 PPT 标题恢复为默认并更新输入框."""
         config.write_conf('General', 'PPT_Title', 'PowerPoint 幻灯片放映')
         self.opt2_LineEdit.setText('PowerPoint 幻灯片放映')
 
     def opt3_Save(self, state):
-        """保存开机自启选项并根据选中状态添加或移除自启."""
         checked = state == Qt.CheckState.Checked.value
         config.write_conf('General', 'auto_startup', str(int(checked)))
         (a.add_to_startup if checked else a.remove_from_startup)('PowerPoint_TouchAssist.exe')
 
 
 def main():
-    """显示设置对话框并阻塞直到关闭."""
     dlg = FramelessWindow()
     dlg.exec()
\ No newline at end of file
diff --git a/config.ini b/config.ini
index 0e21b2f..7bdf8d2 100644
--- a/config.ini
+++ b/config.ini
@@ -6,6 +6,3 @@ auto_startup = 0
 [Miscellaneous]
 initialstartup = 0
 ver = 1.1
-
-[About]
-version = 1.3.0
\ No newline at end of file
diff --git a/main.py b/main.py
index 9c10822..176e3b6 100644
--- a/main.py
+++ b/main.py
@@ -16,6 +16,7 @@
 import conf_ui
 from configparser import ConfigParser
 
+from _version import __version__  as versi
 # --------------------------------------------------
 # ① 更新窗口模块（同级目录）
 # --------------------------------------------------
@@ -39,33 +40,8 @@
 「钟表的指针周而复始，就像人的困惑、烦恼、软弱…摇摆不停。但最终，人们依旧要前进，就像你的指针，永远落在前方。」
 
 """)
-try:
-    conf = ConfigParser()
-    conf.read('config.ini', encoding='utf-8')
-    version = conf['About']['version']
-except KeyError as e:
-    logger.bug(f"读取 config.ini 出错（缺少 {e}）,重新创建")
-    conf = ConfigParser()
-
-    conf['General'] = {
-        'dpi': '0',
-        'ppt_title': 'PowerPoint 幻灯片放映',
-        'auto_startup': '0'
-    }
-
-    conf['Miscellaneous'] = {
-        'initialstartup': '0',
-        'ver': '1.1'
-    }
-
-    conf['About'] = {
-        'version': '1.2.0'
-    }
-
-    with open('config.ini', 'w', encoding='utf-8') as f:
-        conf.write(f)
-
 
+version = versi
 # --------------------------------------------------
 # ③ PathManager & 日志
 # --------------------------------------------------