mirror of
https://github.com/aclist/dztui.git
synced 2026-11-19 00:02:04 +01:00
Merge branch 'dzgui7' into change/enum-dataclasses
This commit is contained in:
86 files changed
+497
-469
No files matched your search
+1
-2
@@ -1,8 +1,7 @@
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
gi.require_version("Gdk", "3.0")
|
||||
from gi.repository import Gtk, Gdk # noqa E402
|
||||
from gi.repository import Gtk, Gdk
|
||||
|
||||
|
||||
def copy_clipboard(text: str) -> None:
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ from dzgui.const.constants import APP_NAME_LOWER, CSS_PATH
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, Gdk # noqa E402
|
||||
from gi.repository import Gtk, Gdk
|
||||
|
||||
|
||||
def add_class(widget: Gtk.Widget, label: str) -> None:
|
||||
|
||||
+2
-7
@@ -7,11 +7,6 @@ from dzgui.const.constants import APP_NAME
|
||||
from dzgui.util.ip import get_coords
|
||||
from dzgui.util.localize import number
|
||||
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from queue import Queue
|
||||
from dzgui.const.enum import ServerTab
|
||||
@@ -59,7 +54,7 @@ class CalcDist:
|
||||
self,
|
||||
addr: str,
|
||||
enum: "ServerTab",
|
||||
result_queue: "Queue",
|
||||
result_queue: "Queue[tuple[str, Haversine | None, ServerTab]]",
|
||||
controller: "Controller",
|
||||
cache: dict[str, Haversine],
|
||||
) -> None:
|
||||
@@ -72,7 +67,7 @@ class CalcDist:
|
||||
self.ip = self.addr
|
||||
|
||||
dist = self.compare(self.ip)
|
||||
self.result_queue.put([self.addr, dist, self.enum])
|
||||
self.result_queue.put((self.addr, dist, self.enum))
|
||||
|
||||
def compare(self, remote_ip: str) -> Haversine | None:
|
||||
prefs = self.controller.get_prefs()
|
||||
|
||||
@@ -1,12 +1,16 @@
|
||||
import logging
|
||||
import subprocess
|
||||
|
||||
from typing import TYPE_CHECKING
|
||||
from dzgui.const.constants import APP_NAME, FLATPAK_APPID, GTK_APP_ID, TMP_PATH
|
||||
|
||||
logger = logging.getLogger(APP_NAME)
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from pathlib import Path
|
||||
|
||||
def apply_overrides(xdg: dict[str, str]) -> None:
|
||||
|
||||
def apply_overrides(xdg: dict[str, "Path"]) -> None:
|
||||
try:
|
||||
# NOTE: D-Bus registration required for sandbox
|
||||
args = [
|
||||
@@ -19,7 +23,7 @@ def apply_overrides(xdg: dict[str, str]) -> None:
|
||||
subprocess.run([*args], capture_output=True)
|
||||
|
||||
paths: list[str] = []
|
||||
paths.extend([*xdg.values()])
|
||||
paths.extend([str(path) for path in xdg.values()])
|
||||
paths.append(TMP_PATH)
|
||||
|
||||
for path in paths:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import re
|
||||
from typing import Any
|
||||
|
||||
from dzgui.util.localize import number
|
||||
from dzgui.strings.generic import selectable_tree
|
||||
@@ -7,7 +8,7 @@ from dzgui.util.strings import no_mods, no_servers, workshop
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
def format_pango(text: str) -> str:
|
||||
@@ -60,7 +61,7 @@ def format_server_mods(mods: int) -> str:
|
||||
return f"Found {mods:n} {plural}. {workshop}"
|
||||
|
||||
|
||||
def format_player_count(model: Gtk.TreeModel | None, control: list) -> str:
|
||||
def format_player_count(model: Gtk.TreeModel | None, control: list[Any]) -> str:
|
||||
players = 0
|
||||
hits: int
|
||||
status: str
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ class ReservedIPError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
def ip2list(ip: str) -> list:
|
||||
def ip2list(ip: str) -> list[int]:
|
||||
return [int(digit) for digit in ip.split(".")]
|
||||
|
||||
|
||||
|
||||
+4
-1
@@ -1,6 +1,8 @@
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gdk # noqa E402
|
||||
from gi.repository import Gdk
|
||||
|
||||
|
||||
def is_navkey(key: int) -> bool:
|
||||
nav_keys = [
|
||||
@@ -18,6 +20,7 @@ def is_navkey(key: int) -> bool:
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def is_ctrl_mask(event: Gdk.EventKey) -> bool:
|
||||
if event.state is Gdk.ModifierType.CONTROL_MASK:
|
||||
return True
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk # noqa E402
|
||||
from gi.repository import Gtk
|
||||
|
||||
|
||||
def set_surrounding_margins(widget: Gtk.Widget, margin: int) -> None:
|
||||
"""
|
||||
|
||||
@@ -4,7 +4,7 @@ from typing import cast, TYPE_CHECKING
|
||||
import gi
|
||||
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gtk, Gdk, GLib # noqa E402
|
||||
from gi.repository import Gdk, GLib
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from dzgui.controllers.mc import Controller
|
||||
|
||||
@@ -118,6 +118,7 @@ servers = {
|
||||
"0": "toggle filter 10",
|
||||
"Minus": "toggle filter 11",
|
||||
"Backslash": "toggle filter 12",
|
||||
"Apostrophe": "toggle filter 13",
|
||||
}
|
||||
vim = {
|
||||
"j": "Move down a row/scroll up",
|
||||
@@ -159,9 +160,6 @@ filter_unofficial = "Unofficial"
|
||||
filter_modded = "Modded"
|
||||
filter_unmodded = "Unmodded"
|
||||
|
||||
# maps
|
||||
all_maps = "All maps"
|
||||
|
||||
# state
|
||||
unknown = "Unknown"
|
||||
none_provided = "None provided"
|
||||
|
||||
Reference in new issue
Block a user