Merge pull request #8 from luleyleo/prepare-v1.1

Prepare v1.1

.gitignore

@@ -13,7 +13,10 @@ debian/*
 !debian/rules
 !debian/source
 
+repo/
 flatpak/
+flatpak-build/
 .flatpak-builder/
+
 assets/locale/
 build-aux/Makefile

assets/de.leopoldluley.Clapgrep.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Clapgrep
-Comment=One app to search through all your files, powered by ripgrep
+Comment=One app to search through all your files
 Exec=clapgrep %u
 Terminal=false
 Type=Application

assets/de.leopoldluley.Clapgrep.metainfo.xml

@@ -2,7 +2,7 @@
 <component type="desktop-application">
   <id>de.leopoldluley.Clapgrep</id>
   <name>Clapgrep</name>
-  <summary>One app to search through all your files, powered by ripgrep</summary>
+  <summary>Search through all your files</summary>
   <url type="homepage">https://github.com/luleyleo/clapgrep</url>
   <url type="bugtracker">https://github.com/luleyleo/clapgrep/issues</url>
   <url type="vcs-browser">https://github.com/luleyleo/clapgrep</url>
@@ -18,7 +18,7 @@
   </description>
   <screenshots>
     <screenshot type="default">
-      <image type="source">https://raw.githubusercontent.com/luleyleo/clapgrep/main/assets/screenshot-1.png</image>
+      <image type="source">https://raw.githubusercontent.com/luleyleo/clapgrep/3c043148f9d189be407119358e751dc2f5b96d7e/assets/screenshot-1.png</image>
     </screenshot>
   </screenshots>
   <categories>
@@ -32,6 +32,19 @@
     <color type="primary" scheme_preference="dark">#575243</color>
   </branding>
   <releases>
+    <release version="1.1" date="2024-10-02">
+      <description>
+        <p>New features:</p>
+        <ul>
+          <li>The app will remember its window size and maximized state.</li>
+        </ul>
+        <p>New translations:</p>
+        <ul>
+          <li>Italian</li>
+          <li>Czech</li>
+        </ul>
+      </description>
+    </release>
     <release version="1.0" date="2024-09-10">
       <description>
         <p>Initial release, with the following features:</p>

gnome/src/about.rs

@@ -0,0 +1,14 @@
+use gtk::License;
+
+pub fn dialog() -> adw::AboutDialog {
+    adw::AboutDialog::builder()
+        .application_name("Clapgrep")
+        .version("1.1")
+        .application_icon(crate::APP_ID)
+        .developer_name("Leopold Luley")
+        .website("https://github.com/luleyleo/clapgrep")
+        .issue_url("https://github.com/luleyleo/clapgrep/issues")
+        .license_type(License::Gpl30)
+        .copyright("© 2024 Leopold Luley")
+        .build()
+}

gnome/src/main.rs

@@ -1,10 +1,11 @@
 use adw::prelude::*;
+use gtk::gio::SimpleAction;
 use gtk::gio::{self, ApplicationFlags};
 use gtk::glib::{self, clone};
-use gtk::{gio::SimpleAction, License};
 use gtk_blueprint::include_blp;
 use std::path::PathBuf;
 
+mod about;
 mod config;
 mod error_window;
 mod search_match;
@@ -59,19 +60,7 @@ fn start(app: &adw::Application, files: &[gio::File]) {
     about_action.connect_activate(clone!(
         #[weak]
         window,
-        move |_, _| {
-            adw::AboutDialog::builder()
-                .application_name("Clapgrep")
-                .version("1.0")
-                .application_icon("de.leopoldluley.Clapgrep")
-                .developer_name("Leopold Luley")
-                .website("https://github.com/luleyleo/clapgrep")
-                .issue_url("https://github.com/luleyleo/clapgrep/issues")
-                .license_type(License::Gpl30)
-                .copyright("© 2024 Leopold Luley")
-                .build()
-                .present(Some(&window));
-        }
+        move |_, _| about::dialog().present(Some(&window))
     ));
     app.add_action(&about_action);
 

gnome/src/search_window/search_window.blp

@@ -240,7 +240,7 @@ menu menu_app {
     }
 
     item {
-      label: _("About My App");
+      label: _("About Clapgrep");
       action: "app.about";
     }
   }

justfile

@@ -73,7 +73,7 @@ make-makefile target='build-aux/Makefile':
 make-cargo-sources:
   python3 build-aux/flatpak-cargo-generator.py ./Cargo.lock -o build-aux/cargo-sources.json
 
-install-flatpak: setup-flatpak-repos make-makefile make-cargo-sources
+install-flatpak: setup-flatpak-repos make-makefile
   flatpak-builder flatpak-build build-aux/{{appid}}.json --force-clean --install --user
 
 setup-flatpak-repos:
@@ -103,3 +103,9 @@ build-translations:
     mkdir -p assets/locale/$lang/LC_MESSAGES; \
     msgfmt -o assets/locale/$lang/LC_MESSAGES/{{appid}}.mo po/$lang.po; \
   done
+
+prepare-release:
+  just make-cargo-sources
+  just release=true make-makefile makefile
+  flatpak-builder --force-clean --repo=repo flatpak build-aux/de.leopoldluley.Clapgrep.json
+  flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo

po/cs.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-06 12:26+0200\n"
+"POT-Creation-Date: 2024-10-02 14:53+0200\n"
 "PO-Revision-Date: 2024-09-26 23:16+0200\n"
 "Last-Translator: Amerey <[email protected]>\n"
 "Language-Team: \n"
@@ -18,89 +18,89 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.4.4\n"
 
-#: gnome/src/search_window/search_window.blp:7
+#: gnome/src/search_window/search_window.blp:5
 msgid "Clapgrep"
 msgstr "Clapgrep"
 
-#: gnome/src/search_window/search_window.blp:11
+#: gnome/src/search_window/search_window.blp:9
 msgid "Search Settings"
 msgstr "Nastavení vyhledávání"
 
-#: gnome/src/search_window/search_window.blp:30
+#: gnome/src/search_window/search_window.blp:28
 msgid "Search Pattern"
 msgstr "Vzor vyhledávání"
 
-#: gnome/src/search_window/search_window.blp:35 gnome/src/shortcuts.blp:28
+#: gnome/src/search_window/search_window.blp:33 gnome/src/shortcuts.blp:28
 msgid "Start Search"
 msgstr "Spustit vyhledávání"
 
-#: gnome/src/search_window/search_window.blp:43
+#: gnome/src/search_window/search_window.blp:41
 msgid "Search Path"
 msgstr "Cesta vyhledávání"
 
-#: gnome/src/search_window/search_window.blp:61
+#: gnome/src/search_window/search_window.blp:59
 msgid "Search Options"
 msgstr "Možnosti vyhledávání"
 
-#: gnome/src/search_window/search_window.blp:64
+#: gnome/src/search_window/search_window.blp:62
 msgid "Case Sensitive"
 msgstr "Rozlišovat malá a velká písmena"
 
-#: gnome/src/search_window/search_window.blp:69
+#: gnome/src/search_window/search_window.blp:67
 msgid "Disable Regex"
 msgstr "Zakázat Regex"
 
-#: gnome/src/search_window/search_window.blp:74
+#: gnome/src/search_window/search_window.blp:72
 msgid "Include Hidden"
 msgstr "Zahrnout skryté"
 
-#: gnome/src/search_window/search_window.blp:79
+#: gnome/src/search_window/search_window.blp:77
 msgid "Include Ignored"
 msgstr "Zahrnout ignorované"
 
-#: gnome/src/search_window/search_window.blp:85
+#: gnome/src/search_window/search_window.blp:83
 msgid "Extra File Formats"
 msgstr "Extra formáty souborů"
 
-#: gnome/src/search_window/search_window.blp:88
+#: gnome/src/search_window/search_window.blp:86
 msgid "PDF files"
 msgstr "PDF soubory"
 
-#: gnome/src/search_window/search_window.blp:93
+#: gnome/src/search_window/search_window.blp:91
 msgid "Office files"
 msgstr "Soubory Office"
 
-#: gnome/src/search_window/search_window.blp:99
+#: gnome/src/search_window/search_window.blp:97
 msgid "Current Search"
 msgstr "Aktuální vyhledávání"
 
-#: gnome/src/search_window/search_window.blp:104
+#: gnome/src/search_window/search_window.blp:102
 msgid "Searched Files"
 msgstr "Hledané soubory"
 
-#: gnome/src/search_window/search_window.blp:113
+#: gnome/src/search_window/search_window.blp:111
 msgid "Number of Matches"
 msgstr "Počet shod"
 
-#: gnome/src/search_window/search_window.blp:122
+#: gnome/src/search_window/search_window.blp:120
 msgid "Errors Encountered"
 msgstr "Zjištěné chyby"
 
-#: gnome/src/search_window/search_window.blp:135
+#: gnome/src/search_window/search_window.blp:133
 msgid "Cancel Search"
 msgstr "Zrušit vyhledávání"
 
-#: gnome/src/search_window/search_window.blp:150
+#: gnome/src/search_window/search_window.blp:148
 msgid "Search Results"
 msgstr "Výsledky vyhledávání"
 
-#: gnome/src/search_window/search_window.blp:240
+#: gnome/src/search_window/search_window.blp:238
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové zkratky"
 
-#: gnome/src/search_window/search_window.blp:245
-msgid "About My App"
-msgstr "O mé aplikaci"
+#: gnome/src/search_window/search_window.blp:243
+msgid "About Clapgrep"
+msgstr "O Clapgrep"
 
 #: gnome/src/error_window/error_window.blp:7
 msgid "Search Errors"

po/de.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-06 12:24+0200\n"
+"POT-Creation-Date: 2024-10-02 14:53+0200\n"
 "PO-Revision-Date: 2024-09-03 22:00+0200\n"
 "Last-Translator: Leopold Luley <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -17,88 +17,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnome/src/search_window/search_window.blp:7
+#: gnome/src/search_window/search_window.blp:5
 msgid "Clapgrep"
 msgstr "Clapgrep"
 
-#: gnome/src/search_window/search_window.blp:11
+#: gnome/src/search_window/search_window.blp:9
 msgid "Search Settings"
 msgstr "Sucheinstellungen"
 
-#: gnome/src/search_window/search_window.blp:30
+#: gnome/src/search_window/search_window.blp:28
 msgid "Search Pattern"
 msgstr "Suchmaske"
 
-#: gnome/src/search_window/search_window.blp:35 gnome/src/shortcuts.blp:28
+#: gnome/src/search_window/search_window.blp:33 gnome/src/shortcuts.blp:28
 msgid "Start Search"
 msgstr "Suche beginnen"
 
-#: gnome/src/search_window/search_window.blp:43
+#: gnome/src/search_window/search_window.blp:41
 msgid "Search Path"
 msgstr "Suchpfad"
 
-#: gnome/src/search_window/search_window.blp:61
+#: gnome/src/search_window/search_window.blp:59
 msgid "Search Options"
 msgstr "Suchoptionen"
 
-#: gnome/src/search_window/search_window.blp:64
+#: gnome/src/search_window/search_window.blp:62
 msgid "Case Sensitive"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: gnome/src/search_window/search_window.blp:69
+#: gnome/src/search_window/search_window.blp:67
 msgid "Disable Regex"
 msgstr "Regex deaktivieren"
 
-#: gnome/src/search_window/search_window.blp:74
+#: gnome/src/search_window/search_window.blp:72
 msgid "Include Hidden"
 msgstr "Versteckte Dateien hinzunehmen"
 
-#: gnome/src/search_window/search_window.blp:79
+#: gnome/src/search_window/search_window.blp:77
 msgid "Include Ignored"
 msgstr "Ignorierte Dateien hinzunehmen"
 
-#: gnome/src/search_window/search_window.blp:85
+#: gnome/src/search_window/search_window.blp:83
 msgid "Extra File Formats"
 msgstr "Zusätzliche Dateiformate"
 
-#: gnome/src/search_window/search_window.blp:88
+#: gnome/src/search_window/search_window.blp:86
 msgid "PDF files"
 msgstr "PDF Dateien"
 
-#: gnome/src/search_window/search_window.blp:93
+#: gnome/src/search_window/search_window.blp:91
 msgid "Office files"
 msgstr "Office Dateien"
 
-#: gnome/src/search_window/search_window.blp:99
+#: gnome/src/search_window/search_window.blp:97
 msgid "Current Search"
 msgstr "Aktuelle Suche"
 
-#: gnome/src/search_window/search_window.blp:104
+#: gnome/src/search_window/search_window.blp:102
 msgid "Searched Files"
 msgstr "Durchsuchte Dateien"
 
-#: gnome/src/search_window/search_window.blp:113
+#: gnome/src/search_window/search_window.blp:111
 msgid "Number of Matches"
 msgstr "Anzahl Treffer"
 
-#: gnome/src/search_window/search_window.blp:122
+#: gnome/src/search_window/search_window.blp:120
 msgid "Errors Encountered"
 msgstr "Fehler"
 
-#: gnome/src/search_window/search_window.blp:135
+#: gnome/src/search_window/search_window.blp:133
 msgid "Cancel Search"
 msgstr "Suche abbrechen"
 
-#: gnome/src/search_window/search_window.blp:150
+#: gnome/src/search_window/search_window.blp:148
 msgid "Search Results"
 msgstr "Suchergebnisse"
 
-#: gnome/src/search_window/search_window.blp:240
+#: gnome/src/search_window/search_window.blp:238
 msgid "Keyboard Shortcuts"
 msgstr "Tastenbindungen"
 
-#: gnome/src/search_window/search_window.blp:245
-msgid "About My App"
+#: gnome/src/search_window/search_window.blp:243
+msgid "About Clapgrep"
 msgstr "Über Clapgrep"
 
 #: gnome/src/error_window/error_window.blp:7