forked from Support/sp-hydra-veil-gui
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
ac51a01dd9
4 changed files with 16 additions and 17 deletions
|
|
@ -13,7 +13,7 @@ from core.services.prepare_tickets.ticket_tracker import delete_ticket_data
|
||||||
|
|
||||||
from gui.v2.ui.pages.Page import Page
|
from gui.v2.ui.pages.Page import Page
|
||||||
from gui.v2.ui.popups.message_box import style_message_box, mark_confirm_button
|
from gui.v2.ui.popups.message_box import style_message_box, mark_confirm_button
|
||||||
from gui.v2.actions.menu_tasks import enable_profile as enable_profile_action
|
from gui.v2.actions.menu_tasks import enable_profile
|
||||||
|
|
||||||
|
|
||||||
HOW_MANY_PROFILES_DEFAULT = 6
|
HOW_MANY_PROFILES_DEFAULT = 6
|
||||||
|
|
@ -50,7 +50,7 @@ class IdPage(Page):
|
||||||
}
|
}
|
||||||
menu_page = self.find_menu_page()
|
menu_page = self.find_menu_page()
|
||||||
if menu_page:
|
if menu_page:
|
||||||
self.profile_enable_worker = enable_profile_action(
|
self.profile_enable_worker = enable_profile(
|
||||||
profile_data, menu_page.handle_task_result, allow_uninstalled_tor=True,
|
profile_data, menu_page.handle_task_result, allow_uninstalled_tor=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,9 +12,8 @@ from PyQt6.QtWidgets import (
|
||||||
|
|
||||||
from gui.v2.actions.menu_profiles import find_verification_icon, get_profile_details, load_menu_profiles, menu_icons
|
from gui.v2.actions.menu_profiles import find_verification_icon, get_profile_details, load_menu_profiles, menu_icons
|
||||||
from gui.v2.actions.menu_tasks import (
|
from gui.v2.actions.menu_tasks import (
|
||||||
continue_menu_task, create_profile as create_profile_action,
|
continue_menu_task, create_profile, delete_profile, disable_profile,
|
||||||
delete_profile as delete_profile_action, disable_profile as disable_profile_action,
|
download_update, edit_profile, enable_profile,
|
||||||
download_update, edit_profile as edit_profile_action, enable_profile as enable_profile_action,
|
|
||||||
)
|
)
|
||||||
from gui.v2.actions.menu_results import MenuResult
|
from gui.v2.actions.menu_results import MenuResult
|
||||||
from gui.v2.ui.pages.Page import Page
|
from gui.v2.ui.pages.Page import Page
|
||||||
|
|
@ -138,7 +137,7 @@ class MenuPage(Page):
|
||||||
|
|
||||||
def delete_profile(self):
|
def delete_profile(self):
|
||||||
self._set_task_busy(True)
|
self._set_task_busy(True)
|
||||||
self.worker = delete_profile_action(self.reverse_id, self.handle_task_result)
|
self.worker = delete_profile(self.reverse_id, self.handle_task_result)
|
||||||
|
|
||||||
def refresh_profiles_data(self):
|
def refresh_profiles_data(self):
|
||||||
self.refresh_menu_buttons()
|
self.refresh_menu_buttons()
|
||||||
|
|
@ -518,17 +517,17 @@ class MenuPage(Page):
|
||||||
def connect(self):
|
def connect(self):
|
||||||
self._set_task_busy(True)
|
self._set_task_busy(True)
|
||||||
self.update_status.update_status("Attempting to connect...")
|
self.update_status.update_status("Attempting to connect...")
|
||||||
self.worker = enable_profile_action({"id": self.reverse_id}, self.handle_task_result)
|
self.worker = enable_profile({"id": self.reverse_id}, self.handle_task_result)
|
||||||
|
|
||||||
def disconnect(self):
|
def disconnect(self):
|
||||||
self._set_task_busy(True)
|
self._set_task_busy(True)
|
||||||
self.update_status.update_status("Disconnecting...")
|
self.update_status.update_status("Disconnecting...")
|
||||||
self.worker = disable_profile_action(self.reverse_id, self.connection_manager.get_connected_profiles(),
|
self.worker = disable_profile(self.reverse_id, self.connection_manager.get_connected_profiles(),
|
||||||
self.handle_task_result)
|
self.handle_task_result)
|
||||||
|
|
||||||
def create_prof(self):
|
def create_prof(self):
|
||||||
self._set_task_busy(True)
|
self._set_task_busy(True)
|
||||||
self.worker = create_profile_action(getattr(self.update_status, "gui_config_file", None),
|
self.worker = create_profile(getattr(self.update_status, "gui_config_file", None),
|
||||||
self.connection_manager.is_synced(), self.handle_task_result)
|
self.connection_manager.is_synced(), self.handle_task_result)
|
||||||
|
|
||||||
def update_button_visibility(self, is_connected, is_session_profile):
|
def update_button_visibility(self, is_connected, is_session_profile):
|
||||||
|
|
@ -552,7 +551,7 @@ class MenuPage(Page):
|
||||||
|
|
||||||
def edit_prof(self):
|
def edit_prof(self):
|
||||||
self._set_task_busy(True)
|
self._set_task_busy(True)
|
||||||
self.worker = edit_profile_action(getattr(self.update_status, "gui_config_file", None),
|
self.worker = edit_profile(getattr(self.update_status, "gui_config_file", None),
|
||||||
self.connection_manager.is_synced(), self.handle_task_result)
|
self.connection_manager.is_synced(), self.handle_task_result)
|
||||||
|
|
||||||
def settings_gui(self):
|
def settings_gui(self):
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ from core.controllers.ProfileController import ProfileController
|
||||||
from core.controllers.tickets.UseTicketController import get_unused_tickets
|
from core.controllers.tickets.UseTicketController import get_unused_tickets
|
||||||
|
|
||||||
from gui.v2.actions.locations import location_candidates
|
from gui.v2.actions.locations import location_candidates
|
||||||
from gui.v2.actions.menu_tasks import enable_profile as enable_profile_action
|
from gui.v2.actions.menu_tasks import enable_profile
|
||||||
from gui.v2.infrastructure.setup_observers import ticket_observer
|
from gui.v2.infrastructure.setup_observers import ticket_observer
|
||||||
from gui.v2.ui.pages.Page import Page
|
from gui.v2.ui.pages.Page import Page
|
||||||
|
|
||||||
|
|
@ -109,7 +109,7 @@ class TicketOrBillingChoicePage(Page):
|
||||||
menu_page = self.custom_window.navigator.get_cached("menu")
|
menu_page = self.custom_window.navigator.get_cached("menu")
|
||||||
if menu_page:
|
if menu_page:
|
||||||
self.update_status.update_status(f"Using ticket #{which_ticket}...")
|
self.update_status.update_status(f"Using ticket #{which_ticket}...")
|
||||||
self.profile_enable_worker = enable_profile_action(
|
self.profile_enable_worker = enable_profile(
|
||||||
profile_data, menu_page.handle_task_result, allow_uninstalled_tor=True,
|
profile_data, menu_page.handle_task_result, allow_uninstalled_tor=True,
|
||||||
)
|
)
|
||||||
self.custom_window.navigator.navigate("menu")
|
self.custom_window.navigator.navigate("menu")
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ from PyQt6.QtWidgets import QLabel, QPushButton
|
||||||
from PyQt6 import QtCore
|
from PyQt6 import QtCore
|
||||||
|
|
||||||
from gui.v2.infrastructure.setup_observers import ticket_observer
|
from gui.v2.infrastructure.setup_observers import ticket_observer
|
||||||
from gui.v2.actions.menu_tasks import enable_profile as enable_profile_action
|
from gui.v2.actions.menu_tasks import enable_profile
|
||||||
from gui.v2.ui.pages.Page import Page
|
from gui.v2.ui.pages.Page import Page
|
||||||
from gui.v2.ui.widgets.terminal_widget import TerminalWidget
|
from gui.v2.ui.widgets.terminal_widget import TerminalWidget
|
||||||
from gui.v2.workers.ticketing_worker_thread import TicketingWorkerThread
|
from gui.v2.workers.ticketing_worker_thread import TicketingWorkerThread
|
||||||
|
|
@ -115,6 +115,6 @@ class TicketPrepPage(Page):
|
||||||
self.update_status.update_status("Tickets ready. Random ticket use is ON.")
|
self.update_status.update_status("Tickets ready. Random ticket use is ON.")
|
||||||
return
|
return
|
||||||
self.update_status.update_status("Applying random ticket to profile...")
|
self.update_status.update_status("Applying random ticket to profile...")
|
||||||
self.profile_enable_worker = enable_profile_action(
|
self.profile_enable_worker = enable_profile(
|
||||||
{'id': int(profile_id)}, menu_page.handle_task_result, allow_uninstalled_tor=True,
|
{'id': int(profile_id)}, menu_page.handle_task_result, allow_uninstalled_tor=True,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue