优化版本号显示
This commit is contained in:
parent
5ee4c50314
commit
964088bab3
3 changed files with 9 additions and 9 deletions
|
@ -1,13 +1,12 @@
|
||||||
import platform
|
import platform
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
__version__ = "ng"
|
|
||||||
|
|
||||||
|
|
||||||
__rootdir__ = Path(__file__).parent.resolve()
|
__rootdir__ = Path(__file__).parent.resolve()
|
||||||
|
|
||||||
from mower.utils.git_rev import revision_info
|
from mower.utils.git_rev import revision_info
|
||||||
|
|
||||||
__version__ += "+" + revision_info()[:7]
|
branch, commit = revision_info()
|
||||||
|
|
||||||
|
__version__ = f"{branch}+{commit[:10]}"
|
||||||
|
|
||||||
__system__ = platform.system().lower()
|
__system__ = platform.system().lower()
|
||||||
|
|
|
@ -146,7 +146,8 @@ def git_rev(repo):
|
||||||
with head_path.open("r") as fd:
|
with head_path.open("r") as fd:
|
||||||
commit = fd.read().strip()
|
commit = fd.read().strip()
|
||||||
|
|
||||||
return commit
|
branch_name = head_ref.split("/")[-1]
|
||||||
|
return branch_name, commit
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|
|
@ -23,7 +23,7 @@ def splash_screen(queue: mp.Queue):
|
||||||
title_font = Font(size=24)
|
title_font = Font(size=24)
|
||||||
title_label = tk.Label(
|
title_label = tk.Label(
|
||||||
container,
|
container,
|
||||||
text="arknights-mower",
|
text="mower-ng",
|
||||||
font=title_font,
|
font=title_font,
|
||||||
)
|
)
|
||||||
title_label.pack()
|
title_label.pack()
|
||||||
|
@ -52,7 +52,7 @@ def splash_screen(queue: mp.Queue):
|
||||||
from tkinter import messagebox
|
from tkinter import messagebox
|
||||||
|
|
||||||
root.withdraw()
|
root.withdraw()
|
||||||
messagebox.showerror("arknights-mower", msg["data"])
|
messagebox.showerror("mower-ng", msg["data"])
|
||||||
root.destroy()
|
root.destroy()
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
@ -78,7 +78,7 @@ def start_tray(queue: mp.Queue, global_space, port, url):
|
||||||
webbrowser.open(url)
|
webbrowser.open(url)
|
||||||
|
|
||||||
icon = Icon(
|
icon = Icon(
|
||||||
name="arknights-mower",
|
name="mower-ng",
|
||||||
icon=img,
|
icon=img,
|
||||||
menu=Menu(
|
menu=Menu(
|
||||||
MenuItem(
|
MenuItem(
|
||||||
|
@ -134,7 +134,7 @@ def webview_window(child_conn, global_space, host, port, url, tray):
|
||||||
height = h
|
height = h
|
||||||
|
|
||||||
window = webview.create_window(
|
window = webview.create_window(
|
||||||
f"arknights-mower {__version__} (http://{host}:{port})",
|
f"mower-ng {__version__} (http://{host}:{port})",
|
||||||
url,
|
url,
|
||||||
text_select=True,
|
text_select=True,
|
||||||
confirm_close=not tray,
|
confirm_close=not tray,
|
||||||
|
|
Loading…
Add table
Reference in a new issue