forked from clan/clan-core
Merge pull request 'UI: Fixed incorrect display of cLAN icon in window switcher' (#830) from Qubasa-main into main
This commit is contained in:
commit
6af8423f1e
@ -16,7 +16,6 @@ from clan_vm_manager.models.interfaces import ClanConfig
|
|||||||
from clan_vm_manager.models.use_join import GLib, GObject
|
from clan_vm_manager.models.use_join import GLib, GObject
|
||||||
from clan_vm_manager.models.use_vms import VMS
|
from clan_vm_manager.models.use_vms import VMS
|
||||||
|
|
||||||
from .constants import constants
|
|
||||||
from .windows.main_window import MainWindow
|
from .windows.main_window import MainWindow
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
@ -30,7 +29,6 @@ class MainApplication(Adw.Application):
|
|||||||
def __init__(self, *args: Any, **kwargs: Any) -> None:
|
def __init__(self, *args: Any, **kwargs: Any) -> None:
|
||||||
super().__init__(
|
super().__init__(
|
||||||
*args,
|
*args,
|
||||||
application_id=constants["APPID"],
|
|
||||||
flags=Gio.ApplicationFlags.HANDLES_COMMAND_LINE,
|
flags=Gio.ApplicationFlags.HANDLES_COMMAND_LINE,
|
||||||
**kwargs,
|
**kwargs,
|
||||||
)
|
)
|
||||||
@ -49,7 +47,6 @@ class MainApplication(Adw.Application):
|
|||||||
self.connect("activate", self.show_window)
|
self.connect("activate", self.show_window)
|
||||||
|
|
||||||
def do_command_line(self, command_line: Any) -> int:
|
def do_command_line(self, command_line: Any) -> int:
|
||||||
log.info("Do command line executed")
|
|
||||||
options = command_line.get_options_dict()
|
options = command_line.get_options_dict()
|
||||||
# convert GVariantDict -> GVariant -> dict
|
# convert GVariantDict -> GVariant -> dict
|
||||||
options = options.end().unpack()
|
options = options.end().unpack()
|
||||||
@ -83,6 +80,8 @@ class MainApplication(Adw.Application):
|
|||||||
self.init_style()
|
self.init_style()
|
||||||
self.win = MainWindow(config=ClanConfig(initial_view="list"))
|
self.win = MainWindow(config=ClanConfig(initial_view="list"))
|
||||||
self.win.set_application(self)
|
self.win.set_application(self)
|
||||||
|
icon_path = assets.loc / "clan_black.png"
|
||||||
|
self.win.set_default_icon_name(str(icon_path))
|
||||||
self.win.present()
|
self.win.present()
|
||||||
|
|
||||||
# TODO: For css styling
|
# TODO: For css styling
|
||||||
|
@ -1,7 +0,0 @@
|
|||||||
constants = {
|
|
||||||
"APPID": "clan.lol",
|
|
||||||
"APPVERSION": "2.0.0-beta",
|
|
||||||
"APPNAME": "clan-vm-manager",
|
|
||||||
"SYSNAME": "clan-manager",
|
|
||||||
"RESOURCEID": "/git.clan.lol/clan/clan-core",
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user