Max/LorenEteval_Furious
1
0
Fork 0
mirror of https://github.com/LorenEteval/Furious.git synced 2026-10-07 14:28:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Modify menu order in app mainWindow

Browse Source 
Signed-off-by: Loren Eteval <loren.eteval@proton.me>
This commit is contained in:
Loren Eteval
2024-04-29 10:26:03 +08:00
parent 26c86e1dd6
commit 42683b8bb6
1 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Furious/Window/AppMainWindow.py
+43 -43
View File
@@ -177,6 +177,36 @@ class AppMainWindow(AppQMainWindow):
self.mainTab = AppQTabWidget()
self.mainTab.addTab(self.userServersQTableWidget, _('Server'))
logActions = [
AppQAction(
_('Show Furious Log'),
callback=lambda: APP().logViewerWindowApp_.showMaximized(),
shortcut=QtCore.QKeyCombination(
QtCore.Qt.KeyboardModifier.ControlModifier
| QtCore.Qt.KeyboardModifier.ShiftModifier,
QtCore.Qt.Key.Key_F,
),
),
AppQAction(
_('Show Core Log'),
callback=lambda: APP().logViewerWindowCore.showMaximized(),
shortcut=QtCore.QKeyCombination(
QtCore.Qt.KeyboardModifier.ControlModifier
| QtCore.Qt.KeyboardModifier.ShiftModifier,
QtCore.Qt.Key.Key_C,
),
),
AppQAction(
_('Show Tun2socks Log'),
callback=lambda: APP().logViewerWindowTun_.showMaximized(),
shortcut=QtCore.QKeyCombination(
QtCore.Qt.KeyboardModifier.ControlModifier
| QtCore.Qt.KeyboardModifier.ShiftModifier,
QtCore.Qt.Key.Key_T,
),
),
]
serverActions = [
AppQAction(
_('Add VMess Server...'),
@@ -242,36 +272,6 @@ class AppMainWindow(AppQMainWindow):
),
]
logActions = [
AppQAction(
_('Show Furious Log'),
callback=lambda: APP().logViewerWindowApp_.showMaximized(),
shortcut=QtCore.QKeyCombination(
QtCore.Qt.KeyboardModifier.ControlModifier
| QtCore.Qt.KeyboardModifier.ShiftModifier,
QtCore.Qt.Key.Key_F,
),
),
AppQAction(
_('Show Core Log'),
callback=lambda: APP().logViewerWindowCore.showMaximized(),
shortcut=QtCore.QKeyCombination(
QtCore.Qt.KeyboardModifier.ControlModifier
| QtCore.Qt.KeyboardModifier.ShiftModifier,
QtCore.Qt.Key.Key_C,
),
),
AppQAction(
_('Show Tun2socks Log'),
callback=lambda: APP().logViewerWindowTun_.showMaximized(),
shortcut=QtCore.QKeyCombination(
QtCore.Qt.KeyboardModifier.ControlModifier
| QtCore.Qt.KeyboardModifier.ShiftModifier,
QtCore.Qt.Key.Key_T,
),
),
]
toolsActions = [
AppQAction(
_('Manage Xray-core Asset File...'),
@@ -281,6 +281,13 @@ class AppMainWindow(AppQMainWindow):
if hasattr(AppQAction, 'setMenu'):
self.toolbar = AppQToolBar(
AppQAction(
_('Log'),
icon=bootstrapIcon('pin-angle.svg'),
menu=AppQMenu(*logActions),
useActionGroup=False,
checkable=False,
),
AppQSeperator(),
AppQAction(
_('Server'),
@@ -297,13 +304,6 @@ class AppMainWindow(AppQMainWindow):
useActionGroup=False,
checkable=False,
),
AppQAction(
_('Log'),
icon=bootstrapIcon('pin-angle.svg'),
menu=AppQMenu(*logActions),
useActionGroup=False,
checkable=False,
),
AppQSeperator(),
AppQAction(
_('Tools'),
@@ -334,6 +334,11 @@ class AppMainWindow(AppQMainWindow):
self.addToolBar(self.toolbar)
else:
# Menu actions
logMenu = {
'name': 'Log',
'actions': [*logActions],
}
serverMenu = {
'name': 'Server',
'actions': [*serverActions],
@@ -344,11 +349,6 @@ class AppMainWindow(AppQMainWindow):
'actions': [*subsActions],
}
logMenu = {
'name': 'Log',
'actions': [*logActions],
}
toolsMenu = {
'name': 'Tools',
'actions': [*toolsActions],
@@ -374,7 +374,7 @@ class AppMainWindow(AppQMainWindow):
}
# Menus
for menuDict in (serverMenu, subsMenu, logMenu, toolsMenu, helpMenu):
for menuDict in (logMenu, serverMenu, subsMenu, toolsMenu, helpMenu):
menuName = menuDict['name']
menuObjName = f'_{menuName}Menu'
menu = AppQMenu(