mirror of
https://github.com/HIllya51/LunaTranslator.git
synced 2024-12-29 16:44:13 +08:00
argv
This commit is contained in:
parent
31d2aef8ad
commit
37a577c69b
@ -28,7 +28,7 @@ from myutils.utils import (
|
|||||||
)
|
)
|
||||||
from myutils.wrapper import threader
|
from myutils.wrapper import threader
|
||||||
from gui.showword import searchwordW
|
from gui.showword import searchwordW
|
||||||
from myutils.hwnd import getpidexe, ListProcess, getExeIcon
|
from myutils.hwnd import getpidexe, ListProcess, getExeIcon, getcurrexe
|
||||||
from textsource.copyboard import copyboard
|
from textsource.copyboard import copyboard
|
||||||
from textsource.texthook import texthook
|
from textsource.texthook import texthook
|
||||||
from textsource.ocrtext import ocrtext
|
from textsource.ocrtext import ocrtext
|
||||||
@ -1131,7 +1131,7 @@ class MAINUI:
|
|||||||
trayMenu.addAction(quitAction)
|
trayMenu.addAction(quitAction)
|
||||||
self.tray = QSystemTrayIcon()
|
self.tray = QSystemTrayIcon()
|
||||||
|
|
||||||
icon = getExeIcon(sys.argv[0]) #'./LunaTranslator.exe')# QIcon()
|
icon = getExeIcon(getcurrexe()) #'./LunaTranslator.exe')# QIcon()
|
||||||
self.tray.setIcon(icon)
|
self.tray.setIcon(icon)
|
||||||
|
|
||||||
self.tray.activated.connect(self.translation_ui.leftclicktray)
|
self.tray.activated.connect(self.translation_ui.leftclicktray)
|
||||||
|
@ -64,9 +64,7 @@ def overridepathexists():
|
|||||||
|
|
||||||
|
|
||||||
def testuseqwebengine():
|
def testuseqwebengine():
|
||||||
return os.path.exists(
|
return os.path.exists("./LunaTranslator/runtime/PyQt5/Qt5/bin/Qt5WebEngineCore.dll")
|
||||||
"./LunaTranslator/runtime/PyQt5/Qt5/bin/Qt5WebEngineCore.dll"
|
|
||||||
) or (len(sys.argv) and sys.argv[-1] == "test")
|
|
||||||
|
|
||||||
|
|
||||||
serverindex = 0
|
serverindex = 0
|
||||||
|
@ -3,6 +3,7 @@ import platform, functools, sys
|
|||||||
import winsharedutils, queue
|
import winsharedutils, queue
|
||||||
from myutils.config import globalconfig, static_data, _TR
|
from myutils.config import globalconfig, static_data, _TR
|
||||||
from myutils.wrapper import threader, tryprint
|
from myutils.wrapper import threader, tryprint
|
||||||
|
from myutils.hwnd import getcurrexe
|
||||||
from myutils.utils import makehtml, getlanguse, dynamiclink
|
from myutils.utils import makehtml, getlanguse, dynamiclink
|
||||||
import requests
|
import requests
|
||||||
import shutil, gobject
|
import shutil, gobject
|
||||||
@ -158,7 +159,7 @@ def versioncheckthread(self):
|
|||||||
else:
|
else:
|
||||||
sversion = _version[0]
|
sversion = _version[0]
|
||||||
self.versiontextsignal.emit(sversion)
|
self.versiontextsignal.emit(sversion)
|
||||||
version = winsharedutils.queryversion(sys.argv[0])
|
version = winsharedutils.queryversion(getcurrexe())
|
||||||
need = (
|
need = (
|
||||||
version
|
version
|
||||||
and _version
|
and _version
|
||||||
@ -288,7 +289,7 @@ def setTab_aboutlazy(self, basel):
|
|||||||
|
|
||||||
|
|
||||||
def setTab_update(self, basel):
|
def setTab_update(self, basel):
|
||||||
version = winsharedutils.queryversion(sys.argv[0])
|
version = winsharedutils.queryversion(getcurrexe())
|
||||||
if version is None:
|
if version is None:
|
||||||
versionstring = "unknown"
|
versionstring = "unknown"
|
||||||
else:
|
else:
|
||||||
|
@ -18,7 +18,7 @@ from myutils.utils import (
|
|||||||
makehtml,
|
makehtml,
|
||||||
loadpostsettingwindowmethod_maybe,
|
loadpostsettingwindowmethod_maybe,
|
||||||
)
|
)
|
||||||
from myutils.hwnd import mouseselectwindow, grabwindow, getExeIcon, getpidexe
|
from myutils.hwnd import mouseselectwindow, grabwindow, getExeIcon, getpidexe, getcurrexe
|
||||||
from gui.setting_about import doupdate
|
from gui.setting_about import doupdate
|
||||||
from gui.dialog_memory import dialog_memory
|
from gui.dialog_memory import dialog_memory
|
||||||
from gui.textbrowser import Textbrowser
|
from gui.textbrowser import Textbrowser
|
||||||
@ -846,7 +846,7 @@ class QUnFrameWindow(resizableframeless):
|
|||||||
| Qt.WindowType.WindowMinimizeButtonHint,
|
| Qt.WindowType.WindowMinimizeButtonHint,
|
||||||
poslist=globalconfig["transuigeo"],
|
poslist=globalconfig["transuigeo"],
|
||||||
) # 设置为顶级窗口,无边框
|
) # 设置为顶级窗口,无边框
|
||||||
icon = getExeIcon(sys.argv[0]) #'./LunaTranslator.exe')# QIcon()
|
icon = getExeIcon(getcurrexe()) #'./LunaTranslator.exe')# QIcon()
|
||||||
# icon.addPixmap(QPixmap('./files/luna.png'), QIcon.Normal, QIcon.On)
|
# icon.addPixmap(QPixmap('./files/luna.png'), QIcon.Normal, QIcon.On)
|
||||||
self.setWindowIcon(icon)
|
self.setWindowIcon(icon)
|
||||||
self.firstshow = True
|
self.firstshow = True
|
||||||
|
@ -103,6 +103,10 @@ def getpidexe(pid):
|
|||||||
return name_
|
return name_
|
||||||
|
|
||||||
|
|
||||||
|
def getcurrexe():
|
||||||
|
return os.environ.get("LUNA_EXE_NAME", "")
|
||||||
|
|
||||||
|
|
||||||
def test_injectable_1(pid):
|
def test_injectable_1(pid):
|
||||||
return bool(
|
return bool(
|
||||||
windows.AutoHandle(
|
windows.AutoHandle(
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
python.exe -B LunaTranslator\LunaTranslator_main.py test
|
|
||||||
pause
|
|
@ -278,7 +278,7 @@ const auto init_script =
|
|||||||
L" sys.stderr = fp\n"
|
L" sys.stderr = fp\n"
|
||||||
L" attached = False\n"
|
L" attached = False\n"
|
||||||
#endif
|
#endif
|
||||||
L"sys.argv = [os.environ['LUNA_EXE_NAME'] ,sys.argv[0], PYSTAND_SCRIPT] + sys.argv[1:]\n"
|
L"sys.argv = [PYSTAND_SCRIPT] + sys.argv[1:]\n"
|
||||||
L"text = open(PYSTAND_SCRIPT, 'rb').read()\n"
|
L"text = open(PYSTAND_SCRIPT, 'rb').read()\n"
|
||||||
L"environ = {'__file__': PYSTAND_SCRIPT, '__name__': '__main__'}\n"
|
L"environ = {'__file__': PYSTAND_SCRIPT, '__name__': '__main__'}\n"
|
||||||
L"environ['__package__'] = None\n"
|
L"environ['__package__'] = None\n"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user