Merge branch 'master' into fix-select-highlight-plugin

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y exuberant-ctags libeditorconfig-dev libgail-3-dev libgee-0.8-dev libgit2-glib-1.0-dev libgranite-dev libgtk-3-dev libgtksourceview-4-dev libgtkspell3-3-dev libhandy-1-dev libpeas-dev libsoup2.4-dev libvala-dev libvte-2.91-dev meson valac
+        apt install -y exuberant-ctags libeditorconfig-dev libgail-3-dev libgee-0.8-dev libgit2-glib-1.0-dev libgranite-dev libgtk-3-dev libgtksourceview-4-dev libgtkspell3-3-dev libhandy-1-dev libpeas-dev libsoup2.4-dev libvala-dev libvte-2.91-dev meson valac polkitd libpolkit-gobject-1-dev
     - name: Build
       env:
         DESTDIR: out

po/extra/fr.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: scratch\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-06-18 08:10+0000\n"
-"PO-Revision-Date: 2023-06-23 07:45+0000\n"
-"Last-Translator: Benjamin <[email protected]>\n"
+"PO-Revision-Date: 2023-06-25 07:07+0000\n"
+"Last-Translator: Corentin Noël <[email protected]>\n"
 "Language-Team: French <https://l10n.elementary.io/projects/code/extra/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -194,8 +194,8 @@ msgid ""
 "The system style is now followed by the symbol outline and when launched "
 "without open documents"
 msgstr ""
-"Le thème du système est maintenant respecté par le contour du symbole, ainsi "
-"que lors du lancement sans documents ouverts"
+"Le thème du système est maintenant respecté par le détecteur de symboles, "
+"ainsi que lors du lancement sans documents ouverts"
 
 #: data/code.metainfo.xml.in:82
 msgid "Mixed case sensitive search now works as expected"
@@ -293,17 +293,17 @@ msgid ""
 "The symbol outline pane is now shown to the right of the source view and can "
 "be shown and hidden with the keyboard shortcut \"Alt + \\\""
 msgstr ""
-"Le volet de contour des symboles est désormais affiché à droite de la vue du "
-"code source et peut être affiché et masqué à l'aide du raccourci clavier "
-"« Alt + \\ »"
+"Le volet de détecteur de symboles est désormais affiché à droite de la vue "
+"du code source et peut être affiché et masqué à l'aide du raccourci clavier «"
+" Alt + \\ »"
 
 #: data/code.metainfo.xml.in:127
 msgid ""
 "Terminal, Symbol outline, and the Strip Trailing Whitespace plugins are now "
 "part of the main codebase"
 msgstr ""
-"Les modules Terminal, Contour de symbole et Suppression des espaces blancs "
-"de fin de ligne font désormais partie intégrante de l'application"
+"Les modules terminal, détecteur de symboles et suppression des espaces "
+"blancs de fin de ligne font désormais partie intégrante de l'application"
 
 #: data/code.metainfo.xml.in:128
 msgid ""

po/extra/pl.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: scratch\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-06-18 08:10+0000\n"
-"PO-Revision-Date: 2023-04-10 09:59+0000\n"
+"PO-Revision-Date: 2023-06-25 07:07+0000\n"
 "Last-Translator: Marcin Serwin <[email protected]>\n"
 "Language-Team: Polish <https://l10n.elementary.io/projects/code/extra/pl/>\n"
 "Language: pl\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.16.4\n"
+"X-Generator: Weblate 4.17\n"
 "X-Launchpad-Export-Date: 2017-05-03 06:04+0000\n"
 
 #: data/code.metainfo.xml.in:9
@@ -196,13 +196,10 @@ msgstr ""
 "oczekiwaniami gdy litery są różnej wielkości"
 
 #: data/code.metainfo.xml.in:83
-#, fuzzy
-#| msgid ""
-#| "The search results no longer change unexpectedly when focussing a document"
 msgid ""
 "The search results no longer change unexpectedly when focusing a document"
 msgstr ""
-"Wyniki wyszukiwania nie zmieniają się niespodziewanie przy fokusowaniu na "
+"Wyniki wyszukiwania nie zmieniają się niespodziewanie przy skupianiu się na "
 "dokumencie"
 
 #: data/code.metainfo.xml.in:84

po/fi.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: scratch\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-06-18 08:10+0000\n"
-"PO-Revision-Date: 2023-06-13 12:07+0000\n"
+"PO-Revision-Date: 2023-07-03 13:07+0000\n"
 "Last-Translator: Jiri Grönroos <[email protected]>\n"
 "Language-Team: Finnish <https://l10n.elementary.io/projects/code/code/fi/>\n"
 "Language: fi\n"
@@ -489,7 +489,7 @@ msgstr ""
 
 #: src/Services/Document.vala:950
 msgid "Save Duplicate…"
-msgstr ""
+msgstr "Tallenna kaksoiskappale…"
 
 #: src/Services/TemplateManager.vala:198
 msgid "Templates"

src/Services/Document.vala

@@ -180,10 +180,11 @@ namespace Scratch.Services {
             source_map.set_view (source_view);
 
             hide_info_bar ();
+            set_minimap ();
+            set_strip_trailing_whitespace ();
+            settings.changed["show-mini-map"].connect (set_minimap);
+            settings.changed["strip-trailing-on-save"].connect (set_strip_trailing_whitespace);
 
-            restore_settings ();
-
-            settings.changed.connect (restore_settings);
             /* Block user editing while working */
             notify["working"].connect (() => {
                 source_view.sensitive = !working;
@@ -647,7 +648,7 @@ namespace Scratch.Services {
             return true;
         }
 
-        private void restore_settings () {
+        private void set_minimap () {
             if (Scratch.settings.get_boolean ("show-mini-map")) {
                 source_map.show ();
                 scroll.vscrollbar_policy = Gtk.PolicyType.EXTERNAL;
@@ -656,7 +657,9 @@ namespace Scratch.Services {
                 source_map.no_show_all = true;
                 scroll.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
             }
+        }
 
+        private void set_strip_trailing_whitespace () {
             if (Scratch.settings.get_boolean ("strip-trailing-on-save")) {
                 strip_trailing_spaces ();
             }

src/Widgets/FormatBar.vala

@@ -210,8 +210,8 @@ public class Code.FormatBar : Gtk.Box {
         buffer.get_iter_at_offset (out iter, position);
         var line = iter.get_line () + 1;
 
-        line_menubutton.text = "%d.%d".printf (line, iter.get_line_offset ());
-        goto_entry.text = "%d.%d".printf (line, iter.get_line_offset ());
+        line_menubutton.text = "%d.%d".printf (line, iter.get_line_offset () + 1);
+        goto_entry.text = "%d.%d".printf (line, iter.get_line_offset () + 1);
     }
 
     private void create_line_popover () {
@@ -235,12 +235,12 @@ public class Code.FormatBar : Gtk.Box {
 
         // We need to connect_after because otherwise, the text isn't parsed into the "value" property and we only get the previous value
         goto_entry.activate.connect_after (() => {
-            int line, offset;
+            int line, column;
 
             goto_entry.text = goto_entry.text.replace (":", ".");
 
-            goto_entry.text.scanf ("%i.%i", out line, out offset);
-            doc.source_view.go_to_line (line, offset);
+            goto_entry.text.scanf ("%i.%i", out line, out column);
+            doc.source_view.go_to_line (line, column - 1);
             // Focuses parent to the source view, so that the cursor, which indicates line and column is actually visible.
             doc.source_view.grab_focus ();
         });