misc improvements

data/ui/figure_settings.blp

@@ -179,19 +179,16 @@ template $GraphsFigureSettingsWindow : Adw.Window {
                     }
                   }
 
-                  Adw.ActionRow style_row {
+                  Adw.ActionRow {
                     title: _("Style");
-                    activatable-widget: styles;
                     hexpand: true;
-
-                    Button styles {
-                      tooltip-text: _("Choose Style");
-                      valign: center;
-                      clicked => $choose_style();
-                      styles ["flat"]
-                      Image {
-                        icon-name: "right-symbolic";
-                      }
+                    activatable: true;
+                    activated => $choose_style();
+                    [suffix]
+                    Label style_name {}
+                    [suffix]
+                    Image {
+                      icon-name: "go-next-symbolic";
                     }
                   }
                 }

src/export_figure.py

@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 import contextlib
-import io
 from gettext import gettext as _
 from pathlib import Path
 
@@ -40,16 +39,13 @@ def on_accept(self, _button):
         def on_response(dialog, response):
             with contextlib.suppress(GLib.GError):
                 file = dialog.save_finish(response)
-                buffer = io.BytesIO()
+                wrapper = file_io.FileLikeWrapper.new_for_file_replace(file)
                 self._canvas.figure.savefig(
-                    buffer, format=file_suffixes[0],
+                    wrapper, format=file_suffixes[0],
                     dpi=int(self.dpi.get_value()),
                     transparent=self.transparent.get_active(),
                 )
-                stream = file_io.get_write_stream(file)
-                stream.write(buffer.getvalue())
-                buffer.close()
-                stream.close()
+                wrapper.close()
                 self.get_application().get_window().add_toast_string(
                     _("Exported Figure"))
                 self.destroy()

src/figure_settings.py

@@ -20,7 +20,7 @@ def _on_bind(_factory, item, window):
     widget = item.get_child()
     style = item.get_item()
     widget.style = style
-    if style.mutable:
+    if style.get_mutable():
         widget.edit_button.set_visible(True)
         widget.edit_button.connect("clicked", window.edit_style, style)
 
@@ -58,25 +58,30 @@ class FigureSettingsWindow(Adw.Window):
     navigation_view = Gtk.Template.Child()
     grid_view = Gtk.Template.Child()
     toast_overlay = Gtk.Template.Child()
+    style_name = Gtk.Template.Child()
 
     figure_settings = GObject.Property(type=Graphs.FigureSettings)
 
     def __init__(self, application, highlighted=None):
+        figure_settings = application.get_data().get_figure_settings()
         super().__init__(
             application=application, transient_for=application.get_window(),
-            figure_settings=application.get_data().get_figure_settings(),
+            figure_settings=figure_settings,
         )
 
-        ignorelist = [
-            "custom_style", "min_selected", "max_selected", "use_custom_style",
-        ]
+        notifiers = ("custom_style", "use_custom_style")
+        for prop in notifiers:
+            figure_settings.connect(
+                "notify::" + prop.replace("_", "-"),
+                getattr(self, "_on_" + prop),
+            )
+
+        ignorelist = list(notifiers) + ["min_selected", "max_selected"]
         for direction in _DIRECTIONS:
             ignorelist.append(f"min_{direction}")
             ignorelist.append(f"max_{direction}")
 
-        ui.bind_values_to_object(
-            self.props.figure_settings, self, ignorelist=ignorelist,
-        )
+        ui.bind_values_to_object(figure_settings, self, ignorelist=ignorelist)
         self.set_axes_entries()
         self.no_data_message.set_visible(
             self.get_application().get_data().is_empty(),
@@ -86,31 +91,43 @@ def __init__(self, application, highlighted=None):
 
         self.style_editor = styles.StyleEditor(self)
         self.grid_view.set_factory(_get_widget_factory(self))
-        selection_model = self.grid_view.get_model()
-        selection_model.set_model(
+        self.grid_view.get_model().set_model(
             application.get_figure_style_manager().get_style_model(),
         )
-        if self.props.figure_settings.get_use_custom_style():
-            stylename = self.props.figure_settings.get_custom_style()
+        self._on_use_custom_style(figure_settings, None)
+        self.present()
+
+    def _on_use_custom_style(self, figure_settings, _a) -> None:
+        if figure_settings.get_use_custom_style():
+            self._on_custom_style(figure_settings, None)
+        else:
+            self.style_name.set_text(_("System"))
+            self.grid_view.get_model().set_selected(0)
+
+    def _on_custom_style(self, figure_settings, _a) -> None:
+        if figure_settings.get_use_custom_style():
+            selection_model = self.grid_view.get_model()
+            stylename = figure_settings.get_custom_style()
+            self.style_name.set_text(stylename)
             for index, style in enumerate(selection_model):
-                if index > 0 and style.name == stylename:
+                if index > 0 and style.get_name() == stylename:
                     selection_model.set_selected(index)
                     break
-        else:
-            selection_model.set_selected(0)
-        self.present()
 
     @Gtk.Template.Callback()
     def on_select(self, model, _pos, _n_items):
         figure_settings = self.props.figure_settings
         selected_item = model.get_selected_item()
         # Don't trigger unneccesary reloads
-        if selected_item.file is None:  # System style
+        if selected_item.get_file() is None:  # System style
             if figure_settings.get_use_custom_style():
                 figure_settings.set_use_custom_style(False)
+                self.style_name.set_text(_("System"))
         else:
-            if selected_item.name != figure_settings.get_custom_style():
-                figure_settings.set_custom_style(selected_item.name)
+            stylename = selected_item.get_name()
+            if stylename != figure_settings.get_custom_style():
+                figure_settings.set_custom_style(stylename)
+                self.style_name.set_text(stylename)
             if not figure_settings.get_use_custom_style():
                 figure_settings.set_use_custom_style(True)
 
@@ -141,7 +158,7 @@ def edit_style(self, _button, style):
         figure_settings = \
             self.props.application.get_data().get_figure_settings()
         if figure_settings.get_use_custom_style() \
-                and figure_settings.get_custom_style() == style.name:
+                and figure_settings.get_custom_style() == style.get_name():
             self.grid_view.get_model().set_selected(0)
         self.style_editor.load_style(style)
         self.navigation_view.push(self.style_editor)

src/file_io.py

@@ -1,8 +1,80 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
+import io
 import json
 from xml.dom import minidom
 
-from gi.repository import GLib
+from gi.repository import GLib, Gio
+
+
+class FileLikeWrapper(io.BufferedIOBase):
+    def __init__(self, read_stream=None, write_stream=None):
+        self._read_stream, self._write_stream = read_stream, write_stream
+
+    @classmethod
+    def new_for_file_replace(cls, file: Gio.File):
+        if file.query_exists(None):
+            file.delete(None)
+        return cls(write_stream=file.create(0, None))
+
+    @classmethod
+    def new_for_file(cls, file: Gio.File):
+        return cls.new_for_io_stream(file.open_readwrite(None))
+
+    @classmethod
+    def new_for_file_readonly(cls, file: Gio.File):
+        return cls(read_stream=file.read(None))
+
+    @classmethod
+    def new_for_io_stream(cls, io_stream: Gio.IOStream):
+        return cls(
+            read_stream=io_stream.get_input_stream(),
+            write_stream=io_stream.get_output_stream(),
+        )
+
+    @property
+    def closed(self) -> bool:
+        return self._read_stream is None and self._write_stream is None
+
+    def close(self) -> None:
+        if self._read_stream is not None:
+            self._read_stream.close()
+            self._read_stream = None
+        if self._write_stream is not None:
+            self._write_stream.close()
+            self._write_stream = None
+
+    def writable(self) -> bool:
+        return self._write_stream is not None
+
+    def write(self, b) -> int:
+        if self._write_stream is None:
+            raise OSError()
+        elif b is None or b == b"":
+            return 0
+        return self._write_stream.write_bytes(GLib.Bytes(b))
+
+    def readable(self) -> bool:
+        return self._read_stream is not None
+
+    def read(self, size=-1):
+        if self._read_stream is None:
+            raise OSError()
+        elif size == 0:
+            return b""
+        elif size > 0:
+            return self._read_stream.read_bytes(size, None).get_data()
+        buffer = io.BytesIO()
+        while True:
+            chunk = self._read_stream.read_bytes(4096, None)
+            if chunk.get_size() == 0:
+                break
+            buffer.write(chunk.get_data())
+        return buffer.getvalue()
+
+    read1 = read
+
+    def wrap_text(self, **kwargs) -> io.TextIOWrapper:
+        return io.TextIOWrapper(self, **kwargs)
 
 
 def save_item(file, item_):
@@ -18,7 +90,9 @@ def save_item(file, item_):
 
 
 def parse_json(file):
-    return json.loads(file.load_bytes(None)[0].get_data())
+    wrapper = FileLikeWrapper.new_for_file_readonly(file)
+    return json.load(wrapper)
+    wrapper.close()
 
 
 def write_json(file, json_object, pretty_print=True):
@@ -30,7 +104,7 @@ def write_json(file, json_object, pretty_print=True):
 
 
 def parse_xml(file):
-    return minidom.parseString(read_file(file))
+    return minidom.parse(FileLikeWrapper.new_for_file_readonly(file))
 
 
 def get_write_stream(file):
@@ -41,8 +115,3 @@ def get_write_stream(file):
 
 def write_string(stream, line, encoding="utf-8"):
     stream.write_bytes(GLib.Bytes(line.encode(encoding)), None)
-
-
-def read_file(file, encoding="utf-8"):
-    content = file.load_bytes(None)[0].get_data()
-    return content if encoding is None else content.decode(encoding)

src/item.py

@@ -34,9 +34,9 @@ class DataItem(Graphs.Item):
     markerstyle = GObject.Property(type=int, default=0)
     markersize = GObject.Property(type=float, default=7)
 
-    @staticmethod
-    def new(params, xdata=None, ydata=None, **kwargs):
-        return DataItem(
+    @classmethod
+    def new(cls, params, xdata=None, ydata=None, **kwargs):
+        return cls(
             linestyle=misc.LINESTYLES.index(params["lines.linestyle"]),
             linewidth=params["lines.linewidth"],
             markerstyle=misc.MARKERSTYLES.index(params["lines.marker"]),
@@ -68,9 +68,9 @@ class TextItem(Graphs.Item):
     size = GObject.Property(type=float, default=12)
     rotation = GObject.Property(type=int, default=0, minimum=0, maximum=360)
 
-    @staticmethod
-    def new(params, xanchor=0, yanchor=0, text="", **kwargs):
-        return TextItem(
+    @classmethod
+    def new(cls, params, xanchor=0, yanchor=0, text="", **kwargs):
+        return cls(
             size=params["font.size"], color=params["text.color"],
             xanchor=xanchor, yanchor=yanchor, text=text, **kwargs,
         )
@@ -85,9 +85,9 @@ class FillItem(Graphs.Item):
 
     data = GObject.Property(type=object)
 
-    @staticmethod
-    def new(_params, data, **kwargs):
-        return FillItem(data=data, **kwargs)
+    @classmethod
+    def new(cls, _params, data, **kwargs):
+        return cls(data=data, **kwargs)
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)