Expand list function

teamcons · teamcons · commit c3e4b65c7653 · 2025-11-15T23:55:13.000+01:00
diff --git a/src/Application.vala b/src/Application.vala
@@ -100,6 +100,7 @@ public class Jorts.Application : Gtk.Application {
         set_accels_for_action ("win.action_toggle_mono", {"<Control>m"});
         set_accels_for_action ("win.action_focus_title", {"<Control>L"});
         set_accels_for_action ("win.action_show_emoji", {"<Control>period"});
+        set_accels_for_action ("win.action_toggle_list", {"<Shift>F12"});
         set_accels_for_action ("win.action_show_menu", {"<Control>G", "<Control>O"});
 
         set_accels_for_action ("win.action_theme_1", {"<Alt>1"});
diff --git a/src/Views/PreferencesView.vala b/src/Views/PreferencesView.vala
@@ -33,31 +33,6 @@
                 valign = Gtk.Align.START
             };
 
-                /*************************************************/
-                /*              scribbly Toggle                  */
-                /*************************************************/
-
-                debug ("Built UI. Lets do connects and binds");
-
-                var scribbly_box = new Jorts.SettingsSwitch (
-                    _("Make unfocused notes unreadable"),
-                    _("If enabled, unfocused sticky notes become unreadable to protect their content from peeking eyes (Ctrl+H)"),
-                    "scribbly-mode-active");
-
-                settingsbox.append (scribbly_box);
-
-
-                /*************************************************/
-                /*               hidebar Toggle                  */
-                /*************************************************/
-
-                var hidebar_box = new Jorts.SettingsSwitch (
-                    _("Hide buttons"),
-                    _("If enabled, hides the bottom bar in sticky notes. Keyboard shortcuts will still function (Ctrl+T)"),
-                    "hide-bar");
-
-                settingsbox.append (hidebar_box);
-
 
                 /***************************************/
                 /*               lists                 */
@@ -69,12 +44,13 @@
                     halign = Gtk.Align.END,
                     hexpand = false,
                     valign = Gtk.Align.CENTER,
-                    width_request = 15
+                    max_width_chars = 5
                 };
 
                 var list_label = new Granite.HeaderLabel (_("List item symbol")) {
                     mnemonic_widget = list_entry,
-                    secondary_text = _("Symbol by which to begin each list item")
+                    secondary_text = _("Prefix by which to begin each item in a list"),
+                    hexpand = true
                 };
 
                 lists_box.append (list_label);
@@ -89,6 +65,31 @@
                 settingsbox.append (lists_box);
 
 
+                /*************************************************/
+                /*              scribbly Toggle                  */
+                /*************************************************/
+
+                debug ("Built UI. Lets do connects and binds");
+
+                var scribbly_box = new Jorts.SettingsSwitch (
+                    _("Make unfocused notes unreadable"),
+                    _("If enabled, unfocused sticky notes become unreadable to protect their content from peeking eyes (Ctrl+H)"),
+                    "scribbly-mode-active");
+
+                settingsbox.append (scribbly_box);
+
+
+                /*************************************************/
+                /*               hidebar Toggle                  */
+                /*************************************************/
+
+                var hidebar_box = new Jorts.SettingsSwitch (
+                    _("Hide buttons"),
+                    _("If enabled, hides the bottom bar in sticky notes. Keyboard shortcuts will still function (Ctrl+T)"),
+                    "hide-bar");
+
+                settingsbox.append (hidebar_box);
+
 
                 /****************************************************/
                 /*               Autostart Request                  */
@@ -142,10 +143,10 @@
             var actionbar = new Gtk.CenterBox () {
                 margin_start = 5,
                 margin_end = 5,
-                valign = Gtk.Align.END
+                valign = Gtk.Align.END,
+                hexpand = true,
+                vexpand = false
             };
-            actionbar.set_hexpand (true);
-            actionbar.set_vexpand (false);
 
             // Monies?
             var support_button = new Gtk.LinkButton.with_label (
@@ -162,13 +163,17 @@
                     _("Close preferences")
                 )
             };
-            actionbar.end_widget = close_button;
 
-            var reset = new Gtk.Button.from_icon_name ("system-reboot") {
-                tooltip_markup = _("Reset all settings to defaults")
+            var reset = new Gtk.Button.from_icon_name ("system-reboot-symbolic") {
+                tooltip_markup = _("Reset all settings to defaults"),
+                valign = Gtk.Align.CENTER
             };
             reset.clicked.connect (on_reset);
 
+            var end_box = new Gtk.Box (HORIZONTAL, 5);
+            end_box.append (reset);
+            end_box.append (close_button);
+            actionbar.end_widget = end_box;
 
             append (settingsbox);
             append (actionbar);
@@ -177,13 +182,14 @@
     private void on_reset () {
         debug ("Resetting settings…");
 
-        string[] keys = {"scribbly-mode-active", "hide-bar"};
+        string[] keys = {"scribbly-mode-active", "hide-bar", "list-item-start"};
         foreach (var key in keys) {
             Application.gsettings.reset (key);
         }
 
 #if !WINDOWS
         Jorts.Utils.autostart_remove ();
+        toast.send_notification ();
 #endif
     }
 }
diff --git a/src/Widgets/ActionBar.vala b/src/Widgets/ActionBar.vala
@@ -50,12 +50,12 @@
             width_request = 32,
             height_request = 32,
             tooltip_markup = Granite.markup_accel_tooltip (
-                {"<Control>w"},
+                {"<Shift>F12"},
                 _("Toggle list")
             )
         };
         list_button.add_css_class ("themedbutton");
-        list_button.action_name = StickyNoteWindow.ACTION_PREFIX + StickyNoteWindow.ACTION_LIST;
+        list_button.action_name = StickyNoteWindow.ACTION_PREFIX + StickyNoteWindow.ACTION_TOGGLE_LIST;
 
 
         emojichooser_popover = new Gtk.EmojiChooser ();
diff --git a/src/Widgets/TextView.vala b/src/Widgets/TextView.vala
@@ -44,25 +44,89 @@ public class Jorts.TextView : Granite.HyperTextView {
         });
     }
 
-    public void list () {
+    public void toggle_list () {
         Gtk.TextIter start, end;
         buffer.get_selection_bounds (out start, out end);
 
         var first_line = (uint8)start.get_line ();
         var last_line = (uint8)end.get_line ();
         debug ("got " + first_line.to_string () + " to " + last_line.to_string ());
 
-        Gtk.TextIter startline;
         var list_item_start = Application.gsettings.get_string ("list-item-start");
+        var selected_is_list = this.is_list (first_line, last_line, list_item_start);
 
         buffer.begin_user_action ();
-        for (uint8 i = first_line; i <= last_line; i++) {
+        if (selected_is_list)
+        {
+            this.remove_list (first_line, last_line, list_item_start);
 
-            debug ("doing line " + i.to_string ());
-            buffer.get_iter_at_line_index (out startline, i, 0);
-            buffer.insert (ref startline, list_item_start, -1);
+        } else {
+            this.set_list (first_line, last_line, list_item_start);
         }
         buffer.end_user_action ();
+    }
+
+    /**
+     * Add the list prefix only to lines who hasnt it already
+     */
+    private bool has_prefix (uint8 line_number, string list_item_start) {
+        Gtk.TextIter start, end;
+        buffer.get_iter_at_line_offset (out start, line_number, 0);
+
+        end = start.copy ();
+        end.forward_to_line_end ();
+
+        var text_in_line = buffer.get_slice (start, end, false);
+
+        return text_in_line.has_prefix (list_item_start);
+    }
+
+    /**
+     * Checks whether Line x to Line y are all bulleted.
+     */
+    private bool is_list (uint8 first_line, uint8 last_line, string list_item_start) {
+
+        for (uint8 line_number = first_line; line_number <= last_line; line_number++) {
+            debug ("doing line " + line_number.to_string ());
+
+            if (!this.has_prefix (line_number, list_item_start)) {
+                return false;
+            }
+        }
 
+        return true;
     }
+
+    /**
+     * Add the list prefix only to lines who hasnt it already
+     */
+    private void set_list (uint8 first_line, uint8 last_line, string list_item_start) {
+        Gtk.TextIter line_start;
+        for (uint8 line_number = first_line; line_number <= last_line; line_number++) {
+
+            debug ("doing line " + line_number.to_string ());
+            if (!this.has_prefix (line_number, list_item_start)) {
+                buffer.get_iter_at_line_offset (out line_start, line_number, 0);
+                buffer.insert (ref line_start, list_item_start, -1);
+            }
+        }
+    }
+
+    /**
+     * Remove list prefix from line x to line y. Presuppose it is there
+     */
+    private void remove_list (uint8 first_line, uint8 last_line, string list_item_start) {
+        Gtk.TextIter line_start, prefix_end;
+        var remove_range = list_item_start.length;
+
+        for (uint8 line_number = first_line; line_number <= last_line; line_number++) {
+
+            debug ("doing line " + line_number.to_string ());
+            buffer.get_iter_at_line_offset (out line_start, line_number, 0);
+            buffer.get_iter_at_line_offset (out prefix_end, line_number, remove_range);
+            buffer.delete (ref line_start, ref prefix_end);
+        }
+    }
+
+
 }
diff --git a/src/Windows/StickyNoteWindow.vala b/src/Windows/StickyNoteWindow.vala
@@ -41,7 +41,7 @@ public class Jorts.StickyNoteWindow : Gtk.Window {
     public const string ACTION_ZOOM_IN = "action_zoom_in";
     public const string ACTION_TOGGLE_MONO = "action_toggle_mono";
     public const string ACTION_DELETE = "action_delete";
-    public const string ACTION_LIST = "action_list";
+    public const string ACTION_TOGGLE_LIST = "action_toggle_list";
 
     public const string ACTION_THEME_1 = "action_theme_1";
     public const string ACTION_THEME_2 = "action_theme_2";
@@ -64,7 +64,7 @@ public class Jorts.StickyNoteWindow : Gtk.Window {
         { ACTION_ZOOM_OUT, action_zoom_out},
         { ACTION_ZOOM_DEFAULT, action_zoom_default},
         { ACTION_TOGGLE_MONO, action_toggle_mono},
-        { ACTION_LIST, action_list},
+        { ACTION_TOGGLE_LIST, action_toggle_list},
         { ACTION_ZOOM_IN, action_zoom_in},
         { ACTION_THEME_1, action_theme_1},
         { ACTION_THEME_2, action_theme_2},
@@ -244,7 +244,7 @@ public class Jorts.StickyNoteWindow : Gtk.Window {
     private void action_show_menu () {view.menu_button.activate ();}
     private void action_delete () {((Jorts.Application)this.application).manager.delete_note (this);}
     private void action_toggle_mono () {popover.monospace = !popover.monospace;}
-    private void action_list () {view.textview.list ();}
+    private void action_toggle_list () {view.textview.toggle_list ();}
 
     private void action_zoom_out () {zoomcontroller.zoom_out ();}
     private void action_zoom_default () {zoomcontroller.zoom_default ();}
