bug fixes, update translation template

po/POTFILES

@@ -1,5 +1,15 @@
 data/io.github.nokse22.asciidraw.desktop.in
 data/io.github.nokse22.asciidraw.metainfo.xml.in
-src/gtk/help-overlay.ui
+data/ui/window.ui
 src/main.py
 src/window.py
+src/tools/eraser.py
+src/tools/filled_rectangle.py
+src/tools/freehand.py
+src/tools/line.py
+src/tools/picker.py
+src/tools/rectangle.py
+src/tools/select.py
+src/tools/table.py
+src/tools/text.py
+src/tools/tree.py

po/template.pot

@@ -0,0 +1,224 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-01-16 10:50+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: data/io.github.nokse22.asciidraw.desktop.in:3
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:3 src/main.py:166
+msgid "ASCII Draw"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.desktop.in:9
+msgid "GNOME;GTK;Draw;Graphics;Art;"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:7
+msgid "Draw using ASCII characters"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:9
+msgid ""
+"This app lets you draw diagrams, tables, treeview and more using ASCII "
+"characters. There are many stiles to choose from and multiple tools "
+"available to use:"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:12
+msgid "Freehand Brush"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:13 src/tools/line.py:107
+msgid "Freehand Line"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:14
+msgid "Straight Line"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:15
+msgid "Straight Arrow"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:16
+#: src/tools/rectangle.py:119
+msgid "Rectangle"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:17
+#: src/tools/filled_rectangle.py:119
+msgid "Filled Rectangle"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:18
+msgid "Text with FIGlet fonts"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:19 src/tools/table.py:107
+msgid "Table"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:20
+msgid "Tree View"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:21 src/tools/eraser.py:84
+msgid "Eraser"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:22
+msgid "Character Picker"
+msgstr ""
+
+#: data/io.github.nokse22.asciidraw.metainfo.xml.in:26
+msgid "Nokse"
+msgstr ""
+
+#: data/ui/window.ui:94 data/ui/window.ui:205 data/ui/window.ui:249
+msgid "Enter"
+msgstr ""
+
+#: data/ui/window.ui:188
+msgid "First line divided"
+msgstr ""
+
+#: data/ui/window.ui:189
+msgid "Divide each row"
+msgstr ""
+
+#: data/ui/window.ui:190
+msgid "Not divided"
+msgstr ""
+
+#: data/ui/window.ui:321
+msgid "Cartesian"
+msgstr ""
+
+#: data/ui/window.ui:322
+msgid "Step"
+msgstr ""
+
+#: data/ui/window.ui:323 src/tools/freehand.py:85
+msgid "Freehand"
+msgstr ""
+
+#: data/ui/window.ui:350
+msgid "Line"
+msgstr ""
+
+#: data/ui/window.ui:416
+msgid "Extended latin"
+msgstr ""
+
+#: data/ui/window.ui:596 src/window.py:492
+msgid "Save"
+msgstr ""
+
+#: data/ui/window.ui:660
+msgid "Change size"
+msgstr ""
+
+#: data/ui/window.ui:816
+msgid "Clear Canvas"
+msgstr ""
+
+#: data/ui/window.ui:822
+msgid "New Palette"
+msgstr ""
+
+#: data/ui/window.ui:826
+msgid "New Palette From Canvas"
+msgstr ""
+
+#: data/ui/window.ui:832
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: data/ui/window.ui:836
+msgid "About ASCII Draw"
+msgstr ""
+
+#: data/ui/window.ui:850
+msgid "Save As"
+msgstr ""
+
+#: data/ui/window.ui:856
+msgid "Open"
+msgstr ""
+
+#: data/ui/window.ui:860
+msgid "New Canvas"
+msgstr ""
+
+#: src/main.py:119
+msgid "Clear"
+msgstr ""
+
+#: src/main.py:176
+msgid "translator-credits"
+msgstr ""
+
+#: src/window.py:442
+msgid "Open File"
+msgstr ""
+
+#: src/window.py:483
+msgid "Save Changes?"
+msgstr ""
+
+#: src/window.py:484
+msgid "You have unsaved changes, do you want to save them?"
+msgstr ""
+
+#: src/window.py:490
+msgid "Cancel"
+msgstr ""
+
+#: src/window.py:491
+msgid "Discard"
+msgstr ""
+
+#: src/window.py:513
+msgid "Save File"
+msgstr ""
+
+#: src/window.py:514
+msgid "drawing.txt"
+msgstr ""
+
+#: src/window.py:541
+msgid "Saved successfully"
+msgstr ""
+
+#: src/window.py:649
+msgid "Undo"
+msgstr ""
+
+#: src/tools/line.py:160
+msgid "Cartesian Line"
+msgstr ""
+
+#: src/tools/line.py:163
+msgid "Step Line"
+msgstr ""
+
+#: src/tools/select.py:104
+msgid "Move"
+msgstr ""
+
+#: src/tools/text.py:144
+msgid "Text"
+msgstr ""

src/canvas.py

@@ -69,6 +69,7 @@ def __init__(self, _styles, _flip):
 
         self.drag_gesture = Gtk.GestureDrag()
         self.drag_gesture.set_propagation_phase(Gtk.PropagationPhase.CAPTURE)
+        self.drag_gesture.set_button(0)
         self.drawing_area.add_controller(self.drag_gesture)
 
         self.click_gesture = Gtk.GestureClick()
@@ -219,6 +220,11 @@ def get_selected_char(self):
             return self.primary_char
         return self.secondary_char
 
+    def get_unselected_char(self):
+        if not self._primary_selected:
+            return self.primary_char
+        return self.secondary_char
+
     def draw_text(self, start_x, start_y, text, transparent, draw):
         if text == "": return
         _layer = self.drawing if draw else self.preview
@@ -304,6 +310,13 @@ def draw_at(self, x, y):
         self.undo_changes[0].add_change(x, y, prev_char)
         self.drawing[int(y)][int(x)] = self.get_selected_char()
 
+    def draw_inverted_at(self, x, y):
+        if y >= len(self.drawing) or x >= len(self.drawing[0]) or x < 0 or y < 0:
+            return
+        prev_char = self.get_char_at(x, y)
+        self.undo_changes[0].add_change(x, y, prev_char)
+        self.drawing[int(y)][int(x)] = self.get_unselected_char()
+
     def draw_primary_at(self, x, y, draw):
         _layer = self.drawing if draw else self.preview
 

src/main.py

@@ -36,7 +36,7 @@ def __init__(self):
         super().__init__(application_id='io.github.nokse22.asciidraw',
                          flags=Gio.ApplicationFlags.DEFAULT_FLAGS)
 
-        self.create_action('quit', lambda *_: self.quit(), ['<primary>q'])
+        # self.create_action('quit', self.on_quit, ['<primary>q'])
         self.create_action('about', self.on_about_action)
         self.create_action('preferences', self.on_preferences_action)
 
@@ -116,7 +116,7 @@ def on_new_palette_action(self, *args):
         self.win.show_new_palette_window()
 
     def on_clear_canvas_action(self, *args):
-        self.win.canvas.add_undo_action("Clear")
+        self.win.canvas.add_undo_action(_("Clear"))
         self.win.canvas.clear_canvas()
 
     def on_open_palette_folder_action(self, *args):
@@ -196,29 +196,33 @@ def create_action(self, name, callback, shortcuts=None):
             self.set_accels_for_action(f"app.{name}", shortcuts)
 
     def on_shutdown(self, *args):
-        print("help")
-        dialog = Adw.MessageDialog(
-            heading="Login",
-            body="A valid password is needed to continue",
-            close_response="cancel",
+        dialog = Gtk.MessageDialog(
+            # heading=_("Save Changes"),
+            # body="A valid password is needed to continue",
+            # close_response="cancel",
             modal=True,
             transient_for=self.win,
         )
 
-        dialog.add_response("cancel", "Cancel")
-        dialog.add_response("login", "Login")
+        # dialog.add_response("cancel", _("Cancel"))
+        # dialog.add_response("discard", _("Discard"))
+        # dialog.add_response("save", _("Save"))
 
-        dialog.set_response_appearance("login", Adw.ResponseAppearance.SUGGESTED)
+        # dialog.set_response_appearance("discard", Adw.ResponseAppearance.DESTRUCTIVE)
+        # dialog.set_response_appearance("save", Adw.ResponseAppearance.SUGGESTED)
 
-        entry = Gtk.PasswordEntry(show_peek_icon=True)
-        dialog.set_extra_child(entry)
+        # entry = Gtk.Entry()
+        # dialog.set_extra_child(entry)
 
-        dialog.choose(None, self.on_response_selected_advanced)
+        # dialog.choose(None, self.on_response_selected_advanced)
+        # dialog.choose_finish(task)
 
-        dialog.show()
+        dialog.run()
 
-    def on_response_selected_advanced(self, *args):
-        pass
+        print(quit)
+
+    def on_response_selected_advanced(self, dialog, task, *args):
+        response = dialog.choose_finish(task)
 
     def select_rectangle_tool(self, widget, _):
         self.win.select_rectangle_tool()

src/tools/__init__.py

@@ -5,7 +5,6 @@
 from .text import Text
 from .table import Table
 from .select import Select
-from .freehand_line import FreehandLine
 from .picker import Picker
 from .eraser import Eraser
 from .tree import Tree

src/tools/eraser.py

@@ -81,7 +81,7 @@ def on_drag_begin(self, gesture, start_x, start_y):
         self.start_x = start_x
         self.start_y = start_y
 
-        self.canvas.add_undo_action("Ereser")
+        self.canvas.add_undo_action(_("Eraser"))
 
     def on_drag_follow(self, gesture, end_x, end_y):
         if not self._active: return