Use generic alias types instead of deprecated typing aliases (#15)

* refactor: replace deprecated `typing` type aliases to generic alias types

* fix: make some string translatable again
- change return type in `create_status_page` to `Adw.StatusPage`

Author: tfuxu

gradia/graphics/gradient.py

@@ -17,22 +17,23 @@
 
 import ctypes
 from ctypes import c_int, c_double, c_uint8, POINTER, CDLL
-from typing import Dict, Tuple, List, Optional, Callable, Union
+from collections.abc import Callable
+from typing import Optional
 from PIL import Image
 from gi.repository import Gtk, Gdk, Adw
 
 
 HexColor = str
-RGBTuple = Tuple[int, int, int]
-CacheKey = Tuple[str, str, int, int, int]
-GradientPreset = Tuple[str, str, int]
-CacheInfo = Dict[str, Union[int, List[CacheKey], bool]]
+RGBTuple = tuple[int, int, int]
+CacheKey = tuple[str, str, int, int, int]
+GradientPreset = tuple[str, str, int]
+CacheInfo = dict[str, int | list[CacheKey] | bool]
 
 
 class GradientBackground:
     _MAX_CACHE_SIZE: int = 100
-    _gradient_cache: Dict[CacheKey, Image.Image] = {}
-    _c_lib: Optional[Union[CDLL, bool]] = None
+    _gradient_cache: dict[CacheKey, Image.Image] = {}
+    _c_lib: Optional[CDLL | bool] = None
 
     @classmethod
     def _load_c_lib(cls) -> None:
@@ -119,7 +120,7 @@ def get_cache_info(cls) -> CacheInfo:
 
 
 class GradientSelector:
-    PREDEFINED_GRADIENTS: List[GradientPreset] = [
+    PREDEFINED_GRADIENTS: list[GradientPreset] = [
         ("#36d1dc", "#5b86e5", 90),
         ("#ff5f6d", "#ffc371", 45),
         ("#453383", "#5494e8", 0),

gradia/graphics/image_processor.py

@@ -17,7 +17,7 @@
 
 import os
 import io
-from typing import Optional, Tuple, Union
+from typing import Optional
 from PIL import Image, ImageDraw, ImageChops, ImageFilter, ImageOps
 from gi.repository import GdkPixbuf
 
@@ -32,7 +32,7 @@ def __init__(
         image_path: Optional[str] = None,
         background: Optional[object] = None,
         padding: int = 5,
-        aspect_ratio: Optional[Union[str, float]] = None,
+        aspect_ratio: Optional[str | float] = None,
         corner_radius: int = 2,
         shadow_strength: float = 0.0
     ) -> None:
@@ -98,7 +98,7 @@ def _load_and_downscale_image(self, image_path: str) -> Image.Image:
 
         return source_img
 
-    def _compress_image_with_size(self, image: Image.Image, quality: int) -> Tuple[Image.Image, int]:
+    def _compress_image_with_size(self, image: Image.Image, quality: int) -> tuple[Image.Image, int]:
         buffer = io.BytesIO()
         image.save(buffer, format='PNG', optimize=True, quality=quality)
         size = buffer.tell()
@@ -131,7 +131,7 @@ def _crop_image(self, image: Image.Image) -> Image.Image:
         offset_y = (height - crop_h) // 2
         return image.crop((offset_x, offset_y, offset_x + crop_w, offset_y + crop_h))
 
-    def _calculate_final_dimensions(self, width: int, height: int) -> Tuple[int, int]:
+    def _calculate_final_dimensions(self, width: int, height: int) -> tuple[int, int]:
         if self.padding >= 0:
             smaller_dimension = min(width, height)
             padding_percentage = self._get_percentage(self.padding)
@@ -144,7 +144,7 @@ def _calculate_final_dimensions(self, width: int, height: int) -> Tuple[int, int
 
         return width, height
 
-    def _adjust_for_aspect_ratio(self, width: int, height: int) -> Tuple[int, int]:
+    def _adjust_for_aspect_ratio(self, width: int, height: int) -> tuple[int, int]:
         try:
             ratio = self._parse_aspect_ratio()
             current = width / height
@@ -189,7 +189,7 @@ def _create_background(self, width: int, height: int) -> Image.Image:
             return self.background.prepare_image(width, height)
         return Image.new("RGBA", (width, height), (0, 0, 0, 0))
 
-    def _create_shadow(self, image: Image.Image, offset: Tuple[int, int] = (10, 10), shadow_strength: float = 1.0) -> Tuple[Image.Image, Tuple[int, int]]:
+    def _create_shadow(self, image: Image.Image, offset: tuple[int, int] = (10, 10), shadow_strength: float = 1.0) -> tuple[Image.Image, tuple[int, int]]:
         shadow_strength = max(0.0, min(shadow_strength, 1.0))
         blur_radius = int(10 * shadow_strength)
         shadow_alpha = int(150 * shadow_strength)
@@ -211,7 +211,7 @@ def _create_shadow(self, image: Image.Image, offset: Tuple[int, int] = (10, 10),
         shadow_canvas = shadow_canvas.filter(ImageFilter.GaussianBlur(blur_radius))
         return shadow_canvas, (shadow_x, shadow_y)
 
-    def _get_paste_position(self, img_w: int, img_h: int, bg_w: int, bg_h: int) -> Tuple[int, int]:
+    def _get_paste_position(self, img_w: int, img_h: int, bg_w: int, bg_h: int) -> tuple[int, int]:
         if self.padding >= 0:
             x = (bg_w - img_w) // 2
             y = (bg_h - img_h) // 2

gradia/main.py

@@ -19,7 +19,7 @@
 import tempfile
 import shutil
 
-from typing import Sequence
+from collections.abc import Sequence
 
 from gi.repository import Adw, Gio
 

gradia/ui/drawing_actions.py

@@ -16,7 +16,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from gi.repository import Gtk, Gdk, Gio, cairo, Pango, PangoCairo
-from typing import Tuple, List, Optional, Union
 from enum import Enum
 import math
 import re

gradia/ui/drawing_overlay.py

@@ -16,7 +16,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from gi.repository import Gtk, Gdk, Gio, cairo, Pango, PangoCairo
-from typing import Tuple, List, Optional, Union
 from enum import Enum
 from gradia.ui.drawing_actions import *
 import math
@@ -218,7 +217,7 @@ def _show_text_entry(self, x, y):
         hbox.add_css_class("linked")
 
         entry = Gtk.Entry()
-        entry.set_placeholder_text("Enter text...")
+        entry.set_placeholder_text(_("Enter text…"))
         entry.set_width_chars(12)
         entry.connect("activate", self._on_text_entry_activate)
         entry.connect("changed", self._on_text_entry_changed)

gradia/ui/image_exporters.py

@@ -16,11 +16,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
-from typing import Tuple
+
 from gi.repository import Gtk, Gio, GdkPixbuf
 from gradia.clipboard import copy_file_to_clipboard, save_pixbuff_to_path
 
-ExportFormat = Tuple[str, str, str]
+ExportFormat = tuple[str, str, str]
 
 class BaseImageExporter:
     """Base class for image export handlers"""

gradia/ui/image_loaders.py

@@ -17,11 +17,12 @@
 
 
 import os
-from typing import Optional, Tuple
+from typing import Optional
+
 from gi.repository import Gtk, Gio, Gdk, GLib, Xdp
 from gradia.clipboard import save_texture_to_file
 
-ImportFormat = Tuple[str, str]
+ImportFormat = tuple[str, str]
 
 class BaseImageLoader:
     """Base class for image loading handlers"""

gradia/ui/ui_parts.py

@@ -15,7 +15,8 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from typing import Callable, Dict, Optional, Tuple, Union
+from collections.abc import Callable
+from typing import Optional
 from gi.repository import Gtk, Gio, Adw, Gdk, GLib
 
 from gradia.ui.drawing_actions import DrawingMode
@@ -77,7 +78,7 @@ def create_header_bar() -> Adw.HeaderBar:
     return header_bar
 
 
-def create_image_stack() -> Tuple[Gtk.Stack, Gtk.Picture, Adw.Spinner, 'DrawingOverlay']:
+def create_image_stack() -> tuple[Gtk.Stack, Gtk.Picture, Adw.Spinner, 'DrawingOverlay']:
     stack = Gtk.Stack.new()
     stack.set_vexpand(True)
     stack.set_hexpand(True)
@@ -110,7 +111,7 @@ def create_image_overlay(picture: Gtk.Picture, drawing_overlay: 'DrawingOverlay'
 
     return overlay
 
-def create_controls_overlay() -> Gtk.Widget:
+def create_controls_overlay() -> Gtk.Box:
     undo_btn = Gtk.Button.new_from_icon_name("edit-undo-symbolic")
     undo_btn.set_tooltip_text(_("Undo the last action"))
 
@@ -156,7 +157,7 @@ def create_drawing_overlay(picture: Gtk.Picture) -> 'DrawingOverlay':
     drawing_overlay.set_picture_reference(picture)
     return drawing_overlay
 
-def create_spinner_widget() -> Gtk.Widget:
+def create_spinner_widget() -> tuple[Gtk.Box, Adw.Spinner]:
     spinner = Adw.Spinner.new()
     spinner.set_size_request(48, 48)
 
@@ -173,8 +174,8 @@ def create_spinner_widget() -> Gtk.Widget:
     spinner_box.append(spinner)
     return spinner_box, spinner
 
-def create_status_page() -> Gtk.Widget:
-    screenshot_btn = Gtk.Button.new_with_label("_Take a screenshot…")
+def create_status_page() -> Adw.StatusPage:
+    screenshot_btn = Gtk.Button.new_with_label(_("_Take a screenshot…"))
     screenshot_btn.set_use_underline(True)
     screenshot_btn.set_halign(Gtk.Align.CENTER)
 
@@ -185,7 +186,7 @@ def create_status_page() -> Gtk.Widget:
 
     screenshot_btn.set_action_name("app.screenshot")
 
-    open_status_btn = Gtk.Button.new_with_label("_Open Image…")
+    open_status_btn = Gtk.Button.new_with_label(_("_Open Image…"))
     open_status_btn.set_use_underline(True)
     open_status_btn.set_halign(Gtk.Align.CENTER)
 
@@ -202,8 +203,8 @@ def create_status_page() -> Gtk.Widget:
 
     status_page = Adw.StatusPage.new()
     status_page.set_icon_name("image-x-generic-symbolic")
-    status_page.set_title("No Image Loaded")
-    status_page.set_description("Drag and drop one here")
+    status_page.set_title(_("No Image Loaded"))
+    status_page.set_description(_("Drag and drop one here"))
     status_page.set_child(button_box)
 
     return status_page
@@ -223,14 +224,12 @@ def on_file_dropped(_target: Gtk.DropTarget, value: Gio.File, _x: int, _y: int)
     drop_target.connect("drop", on_file_dropped)
     stack.add_controller(drop_target)
 
-
-
 def create_image_options_group(
     on_padding_changed: Callable[[Adw.SpinRow], None],
     on_aspect_ratio_changed: Callable[[Gtk.Entry], None],
     on_corner_radius_changed: Callable[[Adw.SpinRow], None],
     on_shadow_strength_changed: Callable[[Gtk.Scale], None]
-) -> Tuple[Adw.PreferencesGroup, Adw.SpinRow, Gtk.Entry]:
+) -> tuple[Adw.PreferencesGroup, Adw.SpinRow, Gtk.Entry]:
     padding_group = Adw.PreferencesGroup(title=_("Image Options"))
 
     padding_adjustment = Gtk.Adjustment(value=5, lower=-25, upper=75, step_increment=5, page_increment=5)
@@ -267,12 +266,12 @@ def create_image_options_group(
 
     return padding_group, padding_row, aspect_ratio_entry
 
-def create_file_info_group() -> Tuple[Adw.PreferencesGroup, Adw.ActionRow, Adw.ActionRow, Adw.ActionRow]:
-    file_info_group = Adw.PreferencesGroup(title="Current File")
+def create_file_info_group() -> tuple[Adw.PreferencesGroup, Adw.ActionRow, Adw.ActionRow, Adw.ActionRow]:
+    file_info_group = Adw.PreferencesGroup(title=_("Current File"))
 
     filename_row = Adw.ActionRow(title=_("Name"), subtitle=_("No file loaded"))
     location_row = Adw.ActionRow(title=_("Location"), subtitle=_("No file loaded"))
-    processed_size_row = Adw.ActionRow(title=_("Modified image size"), subtitle="N/A")
+    processed_size_row = Adw.ActionRow(title=_("Modified image size"), subtitle=_("N/A"))
 
     file_info_group.add(filename_row)
     file_info_group.add(location_row)
@@ -407,7 +406,7 @@ def create_sidebar_ui(
     on_corner_radius_changed: Callable[[Adw.SpinRow], None],
     on_aspect_ratio_changed: Callable[[Gtk.Entry], None],
     on_shadow_strength_changed: Callable[[Gtk.Scale], None],
-) -> Dict[str, Union[Gtk.Widget, Adw.ActionRow, Adw.SpinRow, Gtk.Entry]]:
+) -> dict[str, Gtk.Widget | Adw.ActionRow | Adw.SpinRow | Gtk.Entry]:
     sidebar_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
     settings_scroll = Gtk.ScrolledWindow(vexpand=True)
     controls_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=20,

gradia/ui/window.py

@@ -17,7 +17,8 @@
 
 import os
 import threading
-from typing import Optional, Callable, Any, Union
+from collections.abc import Callable
+from typing import Optional, Any
 
 from gi.repository import Gtk, Gio, Adw, Gdk, GLib
 from gradia.graphics.image_processor import ImageProcessor