R-YaTian/TWLMagician
1
Fork 0
mirror of https://github.com/R-YaTian/TWLMagician.git synced 2025-06-18 11:05:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove .idea files, tk86t.dll files, update icons and some minor tweak

Browse Source
This commit is contained in:
fangrong 2024-12-30 17:53:05 +08:00
parent 50a88877f3
commit 474a1e851b
23 changed files with 12 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,6 +8,7 @@ __pycache__/
# Distribution / packaging
.Python
.idea/
build/
develop-eggs/
dist/

6
.idea/.gitignore generated vendored
View File

@ -1,6 +0,0 @@
/shelf/
/workspace.xml
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

1
.idea/.name generated
View File

@ -1 +0,0 @@
TWLMagician.py

8
.idea/TWLMagician-main.iml generated
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="Python 3.7" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

56
.idea/inspectionProfiles/Custom.xml generated
View File

@ -1,56 +0,0 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Custom" />
<inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
<Languages>
<language minSize="60" name="Python" />
</Languages>
</inspection_tool>
<inspection_tool class="PyBroadExceptionInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoredPackages">
<value>
<list size="2">
<item index="0" class="java.lang.String" itemvalue="tkinter" />
<item index="1" class="java.lang.String" itemvalue="certifi" />
</list>
</value>
</option>
</inspection_tool>
<inspection_tool class="PyPep8Inspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
<option name="ignoredErrors">
<list>
<option value="E722" />
</list>
</option>
</inspection_tool>
<inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
<option name="ignoredErrors">
<list>
<option value="N806" />
<option value="N802" />
</list>
</option>
</inspection_tool>
<inspection_tool class="PyProtectedMemberInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="PyShadowingNamesInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="PyUnboundLocalVariableInspection" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoredIdentifiers">
<list>
<option value="TWLMagician._" />
<option value="distutils.dir_util._path_created" />
<option value="ssl._create_unverified_context" />
<option value="tkinter.Toplevel._w" />
<option value="tkinter.Tk._w" />
</list>
</option>
</inspection_tool>
<inspection_tool class="RegExpRedundantEscape" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
<option name="processCode" value="true" />
<option name="processLiterals" value="true" />
<option name="processComments" value="true" />
</inspection_tool>
</profile>
</component>

6
.idea/inspectionProfiles/profiles_settings.xml generated
View File

@ -1,6 +0,0 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="PROJECT_PROFILE" value="Custom" />
<version value="1.0" />
</settings>
</component>

7
.idea/misc.xml generated
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Black">
<option name="sdkName" value="Python 3.7" />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
</project>

8
.idea/modules.xml generated
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/TWLMagician-main.iml" filepath="$PROJECT_DIR$/.idea/TWLMagician-main.iml" />
</modules>
</component>
</project>

10
.idea/vcs.xml generated
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$/py_langs" vcs="Git" />
<mapping directory="$PROJECT_DIR$/rmdot_files" vcs="Git" />
<mapping directory="$PROJECT_DIR$/tk_tooltip" vcs="Git" />
<mapping directory="$PROJECT_DIR$/tkinter_tooltips" vcs="Git" />
</component>
</project>

0
patches/OTA.exe → Res/OTA.exe
View File

0
unlaunch.zip → Res/unlaunch.zip
View File

BIN
Res/version.bin Normal file
View File

Binary file not shown.

17
TWLMagician.py
View File

@ -2,7 +2,7 @@
# coding=utf-8
# TWLMagician
# Version 1.3.2
# Version 1.3.3
# Author: R-YaTian
# Original "HiyaCFW-Helper" Author: mondul <mondul@huyzona.com>
@ -35,7 +35,7 @@ import ssl
ssl._create_default_https_context = ssl._create_unverified_context
ntime_tmp = None
downloadfile = False
version_number = 130
version_number = 133
# Check Update
@ -43,11 +43,11 @@ def get_version():
if loc == 'zh_cn' or (loca == 'zh_hans' and region == 'cn'):
version_url = 'https://gitee.com/ryatian/mirrors/raw/master/'
else:
version_url = 'https://raw.githubusercontent.com/R-YaTian/TWLMagician/main/'
version_url = 'https://raw.githubusercontent.com/R-YaTian/TWLMagician/main/Res/'
try:
with urlopen(version_url + 'version.bin') as src0, open('version.bin', 'wb') as dst0:
copyfileobj(src0, dst0, show_progress=False)
with open('version.bin', 'r') as ftmp:
with open('version.bin', 'rb') as ftmp:
version_str = ftmp.read()
remove('version.bin')
return int(version_str)
@ -70,6 +70,8 @@ def WriteRestartCmd():
def check_update():
printl(_('检查更新中...'))
if path.isfile('OTA.exe'):
remove('OTA.exe')
new_version = get_version()
if new_version == -1:
printl(_('检查更新失败'))
@ -90,10 +92,8 @@ def check_update():
if loc == 'zh_cn' or (loca == 'zh_hans' and region == 'cn'):
ota_url = 'https://gitee.com/ryatian/mirrors/releases/download/Res/'
else:
ota_url = 'https://raw.githubusercontent.com/R-YaTian/TWLMagician/main/patches/'
ota_url = 'https://raw.githubusercontent.com/R-YaTian/TWLMagician/main/Res/'
try:
if path.isfile('OTA.exe'):
remove('OTA.exe')
with urlopen(ota_url + ota_fname) as src0, open('OTA.exe', 'wb') as dst0:
copyfileobj(src0, dst0)
WriteRestartCmd()
@ -1972,7 +1972,7 @@ class Application(Frame):
) as src, open(filename, 'wb') as dst:
copyfileobj(src, dst)
else:
with urlopen('https://raw.githubusercontent.com/R-YaTian/TWLMagician/main/unlaunch.zip'
with urlopen('https://raw.githubusercontent.com/R-YaTian/TWLMagician/main/Res/unlaunch.zip'
) as src, open(filename, 'wb') as dst:
copyfileobj(src, dst)
except SystemExit:
@ -2458,6 +2458,7 @@ if sysname == 'Linux' and ug is not None and su is True:
check_update()
root = Tk(className="Magician") if sysname == 'Linux' else Tk()
root.iconbitmap("icon.ico")
printl(_('TWLMagician启动中...'))
selfPath = path.dirname(path.abspath(argv[0]))

1
build.bat
View File

@ -23,6 +23,5 @@ del *.pyd
rmdir /S /Q C:\Users\Public\Run_TWLMagician.dist
copy /Y ..\pack\x64\TaskbarLib.dll .\dist\TaskbarLib.dll
copy /Y ..\pack\x64\tk86t.dll .\dist\tk86t.dll
copy /Y ..\pack\x64\api-ms-win-core-path-l1-1-0.dll .\dist\api-ms-win-core-path-l1-1-0.dll
pause

2
build32.bat
View File

@ -10,7 +10,7 @@ call nuitka37.bat --msvc=14.1 --module --no-pyi-file --remove-output --nowarn-mn
call nuitka37.bat --msvc=14.1 --module --no-pyi-file --remove-output --nowarn-mnemonic=old-python-windows-console --output-dir=bootstrap pyutils.py
cd bootstrap
call nuitka37.bat --standalone --onefile --onefile-no-compression --noinclude-dlls=tk86t.dll --include-data-files=../pack/x86/TaskbarLib.dll=TaskbarLib.dll --include-data-files=../pack/x86/tk86t.dll=tk86t.dll --msvc=14.1 --remove-output --enable-plugin=tk-inter --nofollow-import-to=dbm --nofollow-import-to=distutils --nofollow-import-to=py_compile --nofollow-import-to=argparse --nowarn-mnemonic=old-python-windows-console --windows-icon-from-ico=..\icon.ico Run_TWLMagician.py
call nuitka37.bat --standalone --onefile --onefile-no-compression --include-data-files=../pack/x86/TaskbarLib.dll=TaskbarLib.dll --msvc=14.1 --remove-output --enable-plugin=tk-inter --nofollow-import-to=dbm --nofollow-import-to=distutils --nofollow-import-to=py_compile --nofollow-import-to=argparse --nowarn-mnemonic=old-python-windows-console --windows-icon-from-ico=..\icon.ico Run_TWLMagician.py
rename .\Run_TWLMagician.exe TWLMagician.exe
rmdir /S /Q py_langs

BIN
icon.icns
View File

Binary file not shown.

BIN
icon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 96 KiB

BIN
icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 167 KiB

3
pack/after.cmd
View File

@ -1,3 +0,0 @@
@echo off
del OTA.exe
del %0

BIN
pack/x64/tk86t.dll
View File

Binary file not shown.

BIN
pack/x86/tk86t.dll
View File

Binary file not shown.

2
py_langs

@ -1 +1 @@
Subproject commit bacafe5c4f9742332aef767fd7da54df8a713e17
Subproject commit 2ad3e82e63e946dc0b2a1379b55a3a32478dc65b

1
version.bin
View File

@ -1 +0,0 @@
130