diff --git a/.gitignore b/.gitignore index 9a69835..5efb456 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,10 @@ debian/* !debian/rules !debian/source +repo/ flatpak/ +flatpak-build/ .flatpak-builder/ + assets/locale/ build-aux/Makefile diff --git a/assets/de.leopoldluley.Clapgrep.desktop b/assets/de.leopoldluley.Clapgrep.desktop index 221d8e1..442be0b 100644 --- a/assets/de.leopoldluley.Clapgrep.desktop +++ b/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 diff --git a/assets/de.leopoldluley.Clapgrep.metainfo.xml b/assets/de.leopoldluley.Clapgrep.metainfo.xml index d841dc9..e6c851c 100644 --- a/assets/de.leopoldluley.Clapgrep.metainfo.xml +++ b/assets/de.leopoldluley.Clapgrep.metainfo.xml @@ -2,7 +2,7 @@ de.leopoldluley.Clapgrep Clapgrep - One app to search through all your files, powered by ripgrep + Search through all your files https://github.com/luleyleo/clapgrep https://github.com/luleyleo/clapgrep/issues https://github.com/luleyleo/clapgrep @@ -18,7 +18,7 @@ - https://raw.githubusercontent.com/luleyleo/clapgrep/main/assets/screenshot-1.png + https://raw.githubusercontent.com/luleyleo/clapgrep/3c043148f9d189be407119358e751dc2f5b96d7e/assets/screenshot-1.png @@ -32,6 +32,19 @@ #575243 + + +

New features:

+
    +
  • The app will remember its window size and maximized state.
  • +
+

New translations:

+
    +
  • Italian
  • +
  • Czech
  • +
+
+

Initial release, with the following features:

diff --git a/gnome/src/about.rs b/gnome/src/about.rs new file mode 100644 index 0000000..c878a5c --- /dev/null +++ b/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() +} diff --git a/gnome/src/main.rs b/gnome/src/main.rs index 7fcf1f0..3de6a60 100644 --- a/gnome/src/main.rs +++ b/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); diff --git a/gnome/src/search_window/search_window.blp b/gnome/src/search_window/search_window.blp index 031fe8d..3d023a8 100644 --- a/gnome/src/search_window/search_window.blp +++ b/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"; } } diff --git a/justfile b/justfile index 5339406..c3af8b3 100644 --- a/justfile +++ b/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 diff --git a/po/cs.po b/po/cs.po index e2b9fe7..5a59b49 100644 --- a/po/cs.po +++ b/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 \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" diff --git a/po/de.po b/po/de.po index 0e8ca87..e6bba2c 100644 --- a/po/de.po +++ b/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 \n" "Language-Team: German \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 diff --git a/po/it.po b/po/it.po index 5ec96c3..5fbd3b4 100644 --- a/po/it.po +++ b/po/it.po @@ -7,98 +7,98 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 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-24 20:41+0100\n" "Last-Translator: Albano Battistella \n" "Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=U\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\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 "Impostazioni di ricerca" -#: gnome/src/search_window/search_window.blp:30 +#: gnome/src/search_window/search_window.blp:28 msgid "Search Pattern" msgstr "Modello di ricerca" -#: 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 "Avvia ricerca" -#: gnome/src/search_window/search_window.blp:43 +#: gnome/src/search_window/search_window.blp:41 msgid "Search Path" msgstr "Percorso di ricerca" -#: gnome/src/search_window/search_window.blp:61 +#: gnome/src/search_window/search_window.blp:59 msgid "Search Options" msgstr "Opzioni di ricerca" -#: gnome/src/search_window/search_window.blp:64 +#: gnome/src/search_window/search_window.blp:62 msgid "Case Sensitive" msgstr "Maiuscole e minuscole" -#: gnome/src/search_window/search_window.blp:69 +#: gnome/src/search_window/search_window.blp:67 msgid "Disable Regex" msgstr "Disabilita Regex" -#: gnome/src/search_window/search_window.blp:74 +#: gnome/src/search_window/search_window.blp:72 msgid "Include Hidden" msgstr "Includi nascosti" -#: gnome/src/search_window/search_window.blp:79 +#: gnome/src/search_window/search_window.blp:77 msgid "Include Ignored" msgstr "Includi ignorati" -#: gnome/src/search_window/search_window.blp:85 +#: gnome/src/search_window/search_window.blp:83 msgid "Extra File Formats" msgstr "Formati di file extra" -#: gnome/src/search_window/search_window.blp:88 +#: gnome/src/search_window/search_window.blp:86 msgid "PDF files" msgstr "File PDF" -#: gnome/src/search_window/search_window.blp:93 +#: gnome/src/search_window/search_window.blp:91 msgid "Office files" msgstr "File di ufficio" -#: gnome/src/search_window/search_window.blp:99 +#: gnome/src/search_window/search_window.blp:97 msgid "Current Search" msgstr "Ricerca corrente" -#: gnome/src/search_window/search_window.blp:104 +#: gnome/src/search_window/search_window.blp:102 msgid "Searched Files" msgstr "File ricercati" -#: gnome/src/search_window/search_window.blp:113 +#: gnome/src/search_window/search_window.blp:111 msgid "Number of Matches" msgstr "Numero di corrispondenze" -#: gnome/src/search_window/search_window.blp:122 +#: gnome/src/search_window/search_window.blp:120 msgid "Errors Encountered" msgstr "Errori riscontrati" -#: gnome/src/search_window/search_window.blp:135 +#: gnome/src/search_window/search_window.blp:133 msgid "Cancel Search" msgstr "Annulla ricerca" -#: gnome/src/search_window/search_window.blp:150 +#: gnome/src/search_window/search_window.blp:148 msgid "Search Results" msgstr "Risultati della ricerca" -#: gnome/src/search_window/search_window.blp:240 +#: gnome/src/search_window/search_window.blp:238 msgid "Keyboard Shortcuts" msgstr "Scorciatoie da tastiera" -#: gnome/src/search_window/search_window.blp:245 -msgid "About My App" -msgstr "Informazioni sulla mia app" +#: gnome/src/search_window/search_window.blp:243 +msgid "About Clapgrep" +msgstr "Informazioni sulla Clapgrep" #: gnome/src/error_window/error_window.blp:7 msgid "Search Errors" diff --git a/po/messages.pot b/po/messages.pot index 435e834..8670d2f 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 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: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,88 +17,88 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: gnome/src/search_window/search_window.blp:7 +#: gnome/src/search_window/search_window.blp:5 msgid "Clapgrep" msgstr "" -#: gnome/src/search_window/search_window.blp:11 +#: gnome/src/search_window/search_window.blp:9 msgid "Search Settings" msgstr "" -#: gnome/src/search_window/search_window.blp:30 +#: gnome/src/search_window/search_window.blp:28 msgid "Search Pattern" msgstr "" -#: 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 "" -#: gnome/src/search_window/search_window.blp:43 +#: gnome/src/search_window/search_window.blp:41 msgid "Search Path" msgstr "" -#: gnome/src/search_window/search_window.blp:61 +#: gnome/src/search_window/search_window.blp:59 msgid "Search Options" msgstr "" -#: gnome/src/search_window/search_window.blp:64 +#: gnome/src/search_window/search_window.blp:62 msgid "Case Sensitive" msgstr "" -#: gnome/src/search_window/search_window.blp:69 +#: gnome/src/search_window/search_window.blp:67 msgid "Disable Regex" msgstr "" -#: gnome/src/search_window/search_window.blp:74 +#: gnome/src/search_window/search_window.blp:72 msgid "Include Hidden" msgstr "" -#: gnome/src/search_window/search_window.blp:79 +#: gnome/src/search_window/search_window.blp:77 msgid "Include Ignored" msgstr "" -#: gnome/src/search_window/search_window.blp:85 +#: gnome/src/search_window/search_window.blp:83 msgid "Extra File Formats" msgstr "" -#: gnome/src/search_window/search_window.blp:88 +#: gnome/src/search_window/search_window.blp:86 msgid "PDF files" msgstr "" -#: gnome/src/search_window/search_window.blp:93 +#: gnome/src/search_window/search_window.blp:91 msgid "Office files" msgstr "" -#: gnome/src/search_window/search_window.blp:99 +#: gnome/src/search_window/search_window.blp:97 msgid "Current Search" msgstr "" -#: gnome/src/search_window/search_window.blp:104 +#: gnome/src/search_window/search_window.blp:102 msgid "Searched Files" msgstr "" -#: gnome/src/search_window/search_window.blp:113 +#: gnome/src/search_window/search_window.blp:111 msgid "Number of Matches" msgstr "" -#: gnome/src/search_window/search_window.blp:122 +#: gnome/src/search_window/search_window.blp:120 msgid "Errors Encountered" msgstr "" -#: gnome/src/search_window/search_window.blp:135 +#: gnome/src/search_window/search_window.blp:133 msgid "Cancel Search" msgstr "" -#: gnome/src/search_window/search_window.blp:150 +#: gnome/src/search_window/search_window.blp:148 msgid "Search Results" msgstr "" -#: gnome/src/search_window/search_window.blp:240 +#: gnome/src/search_window/search_window.blp:238 msgid "Keyboard Shortcuts" msgstr "" -#: gnome/src/search_window/search_window.blp:245 -msgid "About My App" +#: gnome/src/search_window/search_window.blp:243 +msgid "About Clapgrep" msgstr "" #: gnome/src/error_window/error_window.blp:7