yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix formatting

Browse Source
This commit is contained in:
Johannes Kirschbauer
2023-12-16 13:05:17 +01:00
parent 08bf197120
commit da592935f5
4 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/clan-vm-manager/clan_vm_manager/app.py
View File

@@ -1,7 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import argparse import argparse
from dataclasses import dataclass from dataclasses import dataclass
from typing import Optional
import gi import gi
@@ -17,8 +16,9 @@ from .windows.overview import OverviewWindow
@dataclass @dataclass
class ClanWindows: class ClanWindows:
join: type[JoinWindow] join: type[JoinWindow]
overview: type[OverviewWindow] overview: type[OverviewWindow]
@dataclass @dataclass
class ClanConfig: class ClanConfig:
@@ -35,11 +35,14 @@ class Application(Gtk.Application):
self.windows = windows self.windows = windows
initial = windows.__dict__[config.initial_window] initial = windows.__dict__[config.initial_window]
if(issubclass(initial,JoinWindow)): if issubclass(initial, JoinWindow):
# see JoinWindow constructor # see JoinWindow constructor
self.window = initial(initial_values=InitialJoinValues(url=config.url or ""), cbs=Callbacks(show_list=self.show_list, show_join=self.show_join)) self.window = initial(
initial_values=InitialJoinValues(url=config.url or ""),
cbs=Callbacks(show_list=self.show_list, show_join=self.show_join),
)
if(issubclass(initial,OverviewWindow)): if issubclass(initial, OverviewWindow):
# see OverviewWindow constructor # see OverviewWindow constructor
self.window = initial() self.window = initial()
@@ -49,8 +52,7 @@ class Application(Gtk.Application):
self.do_activate() self.do_activate()
prev.hide() prev.hide()
def show_join(self, initial_values: InitialJoinValues) -> None:
def show_join(self,initial_values: InitialJoinValues) -> None:
prev = self.window prev = self.window
self.window = self.windows.__dict__["join"]() self.window = self.windows.__dict__["join"]()
self.do_activate() self.do_activate()
@@ -79,7 +81,10 @@ class Application(Gtk.Application):
def show_join(args: argparse.Namespace) -> None: def show_join(args: argparse.Namespace) -> None:
print(f"Joining clan {args.clan_uri}") print(f"Joining clan {args.clan_uri}")
app = Application(windows=ClanWindows(join=JoinWindow, overview=OverviewWindow), config=ClanConfig(url=args.clan_uri, initial_window="join") ) app = Application(
windows=ClanWindows(join=JoinWindow, overview=OverviewWindow),
config=ClanConfig(url=args.clan_uri, initial_window="join"),
)
return app.run() return app.run()
@@ -89,7 +94,10 @@ def register_join_parser(parser: argparse.ArgumentParser) -> None:
def show_overview(args: argparse.Namespace) -> None: def show_overview(args: argparse.Namespace) -> None:
app = Application(windows=ClanWindows(join=JoinWindow, overview=OverviewWindow), config=ClanConfig(url=None, initial_window="overview") ) app = Application(
windows=ClanWindows(join=JoinWindow, overview=OverviewWindow),
config=ClanConfig(url=None, initial_window="overview"),
)
return app.run() return app.run()

4
pkgs/clan-vm-manager/clan_vm_manager/interfaces.py
View File

@@ -11,5 +11,5 @@ class InitialJoinValues:
@dataclass @dataclass
class Callbacks: class Callbacks:
show_list: Callable[[],None] show_list: Callable[[], None]
show_join: Callable[[InitialJoinValues],None] show_join: Callable[[InitialJoinValues], None]

9
pkgs/clan-vm-manager/clan_vm_manager/windows/join.py
View File

@@ -10,7 +10,7 @@ from gi.repository import Gio, Gtk
class JoinWindow(Gtk.ApplicationWindow): class JoinWindow(Gtk.ApplicationWindow):
def __init__(self, initial_values: InitialJoinValues, cbs: Callbacks ) -> None: def __init__(self, initial_values: InitialJoinValues, cbs: Callbacks) -> None:
super().__init__() super().__init__()
# Initialize the main wincbsdow # Initialize the main wincbsdow
self.cbs = cbs self.cbs = cbs
@@ -28,8 +28,9 @@ class JoinWindow(Gtk.ApplicationWindow):
vbox.add(self.stack) vbox.add(self.stack)
vbox.add(Gtk.Entry(text=str(initial_values.url))) vbox.add(Gtk.Entry(text=str(initial_values.url)))
button = Gtk.Button(
button = Gtk.Button(label="To List", ) label="To List",
)
button.connect("clicked", self.switch) button.connect("clicked", self.switch)
vbox.add(button) vbox.add(button)
@@ -41,5 +42,3 @@ class JoinWindow(Gtk.ApplicationWindow):
def on_quit(self, *args: Any) -> None: def on_quit(self, *args: Any) -> None:
Gio.Application.quit(self.get_application()) Gio.Application.quit(self.get_application())

1
pkgs/clan-vm-manager/clan_vm_manager/windows/overview.py
View File

@@ -84,4 +84,3 @@ class OverviewWindow(Gtk.ApplicationWindow):
def on_quit(self, *args: Any) -> None: def on_quit(self, *args: Any) -> None:
Gio.Application.quit(self.get_application()) Gio.Application.quit(self.get_application())