fix formatting
This commit is contained in:
parent
e7fa998241
commit
09cf4a9ff4
@ -1,7 +1,6 @@
|
||||
#!/usr/bin/env python3
|
||||
import argparse
|
||||
from dataclasses import dataclass
|
||||
from typing import Optional
|
||||
|
||||
import gi
|
||||
|
||||
@ -17,14 +16,15 @@ from .windows.overview import OverviewWindow
|
||||
|
||||
@dataclass
|
||||
class ClanWindows:
|
||||
join: type[JoinWindow]
|
||||
overview: type[OverviewWindow]
|
||||
join: type[JoinWindow]
|
||||
overview: type[OverviewWindow]
|
||||
|
||||
|
||||
@dataclass
|
||||
class ClanConfig:
|
||||
initial_window: str
|
||||
url: ClanURI | None
|
||||
|
||||
|
||||
|
||||
class Application(Gtk.Application):
|
||||
def __init__(self, windows: ClanWindows, config: ClanConfig) -> None:
|
||||
@ -34,23 +34,25 @@ class Application(Gtk.Application):
|
||||
self.init_style()
|
||||
self.windows = windows
|
||||
initial = windows.__dict__[config.initial_window]
|
||||
|
||||
if(issubclass(initial,JoinWindow)):
|
||||
# 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))
|
||||
|
||||
if(issubclass(initial,OverviewWindow)):
|
||||
if issubclass(initial, JoinWindow):
|
||||
# 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),
|
||||
)
|
||||
|
||||
if issubclass(initial, OverviewWindow):
|
||||
# see OverviewWindow constructor
|
||||
self.window = initial()
|
||||
|
||||
def show_list(self) -> None:
|
||||
def show_list(self) -> None:
|
||||
prev = self.window
|
||||
self.window = self.windows.__dict__["overview"]()
|
||||
self.do_activate()
|
||||
prev.hide()
|
||||
|
||||
|
||||
def show_join(self,initial_values: InitialJoinValues) -> None:
|
||||
def show_join(self, initial_values: InitialJoinValues) -> None:
|
||||
prev = self.window
|
||||
self.window = self.windows.__dict__["join"]()
|
||||
self.do_activate()
|
||||
@ -79,7 +81,10 @@ class Application(Gtk.Application):
|
||||
|
||||
def show_join(args: argparse.Namespace) -> None:
|
||||
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()
|
||||
|
||||
|
||||
@ -89,7 +94,10 @@ def register_join_parser(parser: argparse.ArgumentParser) -> 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()
|
||||
|
||||
|
||||
|
@ -11,5 +11,5 @@ class InitialJoinValues:
|
||||
|
||||
@dataclass
|
||||
class Callbacks:
|
||||
show_list: Callable[[],None]
|
||||
show_join: Callable[[InitialJoinValues],None]
|
||||
show_list: Callable[[], None]
|
||||
show_join: Callable[[InitialJoinValues], None]
|
||||
|
@ -10,7 +10,7 @@ from gi.repository import Gio, Gtk
|
||||
|
||||
|
||||
class JoinWindow(Gtk.ApplicationWindow):
|
||||
def __init__(self, initial_values: InitialJoinValues, cbs: Callbacks ) -> None:
|
||||
def __init__(self, initial_values: InitialJoinValues, cbs: Callbacks) -> None:
|
||||
super().__init__()
|
||||
# Initialize the main wincbsdow
|
||||
self.cbs = cbs
|
||||
@ -28,18 +28,17 @@ class JoinWindow(Gtk.ApplicationWindow):
|
||||
vbox.add(self.stack)
|
||||
vbox.add(Gtk.Entry(text=str(initial_values.url)))
|
||||
|
||||
|
||||
button = Gtk.Button(label="To List", )
|
||||
button = Gtk.Button(
|
||||
label="To List",
|
||||
)
|
||||
button.connect("clicked", self.switch)
|
||||
vbox.add(button)
|
||||
|
||||
# Must be called AFTER all components were added
|
||||
self.show_all()
|
||||
|
||||
def switch(self, widget: Gtk.Widget) -> None:
|
||||
def switch(self, widget: Gtk.Widget) -> None:
|
||||
self.cbs.show_list()
|
||||
|
||||
def on_quit(self, *args: Any) -> None:
|
||||
Gio.Application.quit(self.get_application())
|
||||
|
||||
|
||||
|
@ -84,4 +84,3 @@ class OverviewWindow(Gtk.ApplicationWindow):
|
||||
|
||||
def on_quit(self, *args: Any) -> None:
|
||||
Gio.Application.quit(self.get_application())
|
||||
|
Loading…
Reference in New Issue
Block a user