From 2e99b4d76eff041f59e82aafaaa214fd45353662 Mon Sep 17 00:00:00 2001 From: teamcons Date: Tue, 3 Feb 2026 22:35:39 +0100 Subject: [PATCH 01/11] use ellie-commons on this branch --- .github/workflows/CI.yml | 2 +- README.md | 16 +++++++-------- data/icons/classic/128.svg | 2 +- data/icons/classic/16.svg | 2 +- data/icons/classic/24.svg | 2 +- data/icons/classic/32.svg | 2 +- data/icons/classic/48.svg | 2 +- data/icons/classic/64.svg | 2 +- data/icons/classic/scalable.svg | 2 +- data/jorts.desktop.in | 8 ++++---- data/jorts.gresource.xml | 2 +- data/jorts.gschema.xml | 2 +- data/jorts.metainfo.xml.in | 20 +++++++++---------- ... io.github.ellie_commons.jorts.flathub.yml | 7 ++++--- meson.build | 2 +- po/README.md | 2 +- po/bn.po | 4 ++-- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/es.po | 2 +- po/extra/bn.po | 4 ++-- po/extra/cs.po | 2 +- po/extra/de.po | 2 +- po/extra/es.po | 2 +- po/extra/fi.po | 2 +- po/extra/fil.po | 4 ++-- po/extra/fr.po | 2 +- po/extra/hi.po | 4 ++-- po/extra/it.po | 2 +- po/extra/nb.po | 2 +- po/extra/nl.po | 2 +- po/extra/no.po | 2 +- po/extra/pt.po | 2 +- po/extra/pt_br.po | 2 +- po/extra/ru.po | 2 +- po/extra/sk.po | 2 +- po/extra/sv.po | 2 +- po/extra/zh.po | 2 +- po/fi.po | 2 +- po/fil.po | 4 ++-- po/fr.po | 2 +- po/hi.po | 4 ++-- ....pot => io.github.ellie_commons.jorts.pot} | 4 ++-- po/it.po | 2 +- po/ja.po | 2 +- po/lt.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/no.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_br.po | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sv.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/vi.po | 4 ++-- po/zh.po | 2 +- src/Application.vala | 4 ++-- src/Constants.vala | 2 +- src/Utils/Libportal.vala | 4 ++-- windows/Jorts-Installer.nsi | 20 +++++++++---------- windows/deploy.sh | 14 ++++++------- 66 files changed, 113 insertions(+), 112 deletions(-) rename io.github.elly_code.jorts.flathub.yml => io.github.ellie_commons.jorts.flathub.yml (93%) rename po/{io.github.elly_code.jorts.pot => io.github.ellie_commons.jorts.pot} (99%) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e9a08304..b8b711c4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -25,7 +25,7 @@ jobs: uses: flatpak/flatpak-github-actions/flatpak-builder@v6 with: bundle: jorts.flatpak - manifest-path: io.github.elly_code.jorts.yml + manifest-path: io.github.ellie_commons.jorts.yml run-tests: true repository-name: appcenter repository-url: https://flatpak.elementary.io/repo.flatpakrepo diff --git a/README.md b/README.md index 08274b33..eb8ac2ee 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@

Neither jeans nor shorts, just like jorts. A sticky notes app for elementary OS

- Made for elementary OS + Made for elementary OS - Several colourful sticky notes in a spread. Most are covered in scribbles. One in forefront is blue and has the text 'Lovely little colourful squares for all of your notes! 🥰' + Several colourful sticky notes in a spread. Most are covered in scribbles. One in forefront is blue and has the text 'Lovely little colourful squares for all of your notes! 🥰'
@@ -17,9 +17,9 @@ You can download and install Jorts from various sources: -[![Get it on AppCenter](https://appcenter.elementary.io/badge.svg?new)](https://appcenter.elementary.io/io.github.elly_code.jorts) +[![Get it on AppCenter](https://appcenter.elementary.io/badge.svg?new)](https://appcenter.elementary.io/io.github.ellie_commons.jorts) -[Download on Flathub](https://flathub.org/apps/io.github.elly_code.jorts) +[Download on Flathub](https://flathub.org/apps/io.github.ellie_commons.jorts) On Windows: @@ -28,7 +28,7 @@ Grab the Exe installer in Release ## ❓ Questions, building, etc -[Check the wiki, lol](https://github.com/elly-code/jorts/wiki/%F0%9F%8F%A1Home) +[Check the wiki, lol](https://github.com/ellie-commons/jorts/wiki/%F0%9F%8F%A1Home) @@ -50,12 +50,12 @@ On the right you can donate to various contributors: ## 💾 Notes Storage -Notes are stored in `~/.var/app/io.github.elly_code.jorts/data` +Notes are stored in `~/.var/app/io.github.ellie_commons.jorts/data` You can get it all by entering in a terminal: ```bash -cp ~/.var/app/io.github.elly_code.jorts/data ~/ +cp ~/.var/app/io.github.ellie_commons.jorts/data ~/ ``` "saved_state.json" contains all notes in JSON format. The structure is quite simple, if not pretty. @@ -66,7 +66,7 @@ The app reads from it only during startup (rest of the time it writes in) so you ON WINDOWS: It's in: -YourUserFolder \AppData\Local\io.github.elly_code.jorts +YourUserFolder \AppData\Local\io.github.ellie_commons.jorts AppData is a hidden folder. Either you paste the above path in the path bar, from your user folder Or you do a "Show hidden files" diff --git a/data/icons/classic/128.svg b/data/icons/classic/128.svg index 531746ea..650f560a 100644 --- a/data/icons/classic/128.svg +++ b/data/icons/classic/128.svg @@ -5,7 +5,7 @@ width="128" version="1.1" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" - sodipodi:docname="io.github.elly_code.jorts.svg" + sodipodi:docname="io.github.ellie_commons.jorts.svg" inkscape:export-filename="/home/lains/Documents/Projects/lainsce.github.io/icons/jorts-big.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" diff --git a/data/icons/classic/16.svg b/data/icons/classic/16.svg index 3b581159..2826f2de 100644 --- a/data/icons/classic/16.svg +++ b/data/icons/classic/16.svg @@ -5,7 +5,7 @@ width="16" version="1.1" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" - sodipodi:docname="io.github.elly_code.jorts.svg" + sodipodi:docname="io.github.ellie_commons.jorts.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" diff --git a/data/icons/classic/24.svg b/data/icons/classic/24.svg index 8a26391d..0a7165dc 100644 --- a/data/icons/classic/24.svg +++ b/data/icons/classic/24.svg @@ -5,7 +5,7 @@ height="24" id="svg3426" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" - sodipodi:docname="io.github.elly_code.jorts.svg" + sodipodi:docname="io.github.ellie_commons.jorts.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" diff --git a/data/icons/classic/32.svg b/data/icons/classic/32.svg index dc7539ce..57043362 100644 --- a/data/icons/classic/32.svg +++ b/data/icons/classic/32.svg @@ -5,7 +5,7 @@ width="32" version="1.1" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" - sodipodi:docname="io.github.elly_code.jorts.svg" + sodipodi:docname="io.github.ellie_commons.jorts.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" diff --git a/data/icons/classic/48.svg b/data/icons/classic/48.svg index f10232a6..b6f80982 100644 --- a/data/icons/classic/48.svg +++ b/data/icons/classic/48.svg @@ -5,7 +5,7 @@ width="48" version="1.1" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" - sodipodi:docname="io.github.elly_code.jorts.svg" + sodipodi:docname="io.github.ellie_commons.jorts.svg" inkscape:export-filename="/home/lains/Documents/Dev/jorts/data/icon.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" diff --git a/data/icons/classic/64.svg b/data/icons/classic/64.svg index 9aea1a5d..5aeba521 100644 --- a/data/icons/classic/64.svg +++ b/data/icons/classic/64.svg @@ -5,7 +5,7 @@ width="64" version="1.1" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" - sodipodi:docname="io.github.elly_code.jorts.svg" + sodipodi:docname="io.github.ellie_commons.jorts.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" diff --git a/data/icons/classic/scalable.svg b/data/icons/classic/scalable.svg index 531746ea..650f560a 100644 --- a/data/icons/classic/scalable.svg +++ b/data/icons/classic/scalable.svg @@ -5,7 +5,7 @@ width="128" version="1.1" inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" - sodipodi:docname="io.github.elly_code.jorts.svg" + sodipodi:docname="io.github.ellie_commons.jorts.svg" inkscape:export-filename="/home/lains/Documents/Projects/lainsce.github.io/icons/jorts-big.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" diff --git a/data/jorts.desktop.in b/data/jorts.desktop.in index 0b95141c..f81cf19d 100644 --- a/data/jorts.desktop.in +++ b/data/jorts.desktop.in @@ -4,8 +4,8 @@ Version=1.5 Name=Jorts GenericName=Sticky notes Comment=Write down notes, reminders, random thoughts and other short-term informations -Icon=io.github.elly_code.jorts -Exec=io.github.elly_code.jorts +Icon=io.github.ellie_commons.jorts +Exec=io.github.ellie_commons.jorts Terminal=false Actions=NewNote;Preferences; Categories=Office;GTK; @@ -16,9 +16,9 @@ SingleMainWindow=false [Desktop Action NewNote] Name=New sticky note Icon=list-add -Exec=io.github.elly_code.jorts --new-note +Exec=io.github.ellie_commons.jorts --new-note [Desktop Action Preferences] Name=Show Preferences Icon=open-menu -Exec=io.github.elly_code.jorts --preferences +Exec=io.github.ellie_commons.jorts --preferences diff --git a/data/jorts.gresource.xml b/data/jorts.gresource.xml index 7e5a7ad7..85d6b26a 100644 --- a/data/jorts.gresource.xml +++ b/data/jorts.gresource.xml @@ -1,6 +1,6 @@ - + Application.css Themes.css diff --git a/data/jorts.gschema.xml b/data/jorts.gschema.xml index 694d73cc..b3850c7c 100644 --- a/data/jorts.gschema.xml +++ b/data/jorts.gschema.xml @@ -1,6 +1,6 @@ - + false Change font to an illegible one diff --git a/data/jorts.metainfo.xml.in b/data/jorts.metainfo.xml.in index 7d297654..6e2b6c0c 100644 --- a/data/jorts.metainfo.xml.in +++ b/data/jorts.metainfo.xml.in @@ -1,6 +1,6 @@ - io.github.elly_code.jorts + io.github.ellie_commons.jorts CC0-1.0 GPL-3.0+ @@ -18,20 +18,20 @@

This is a fork of an old version of "Notejot" by lainsce. The community liked it so much, we thought it would be great to revive it!

- io.github.elly_code.jorts.desktop + io.github.ellie_commons.jorts.desktop - io.github.ellie_commons.jorts - io.github.ellie_commons.jorts + io.github.elly_code.jorts + io.github.elly_code.jorts - io.github.ellie_commons.jorts + io.github.elly_code.jorts - + Lainsce + Stella - elly-code + ellie-commons https://github.com/elly-code/jorts https://github.com/elly-code/jorts/issues https://github.com/elly-code/jorts/wiki @@ -40,7 +40,7 @@ https://github.com/elly-code/jorts - io.github.elly_code.jorts + io.github.ellie_commons.jorts #64baff #002e99 @@ -59,7 +59,7 @@ elementary OS - io.github.elly_code.reminduck + io.github.ellie_commons.reminduck com.github.elfenware.badger io.github.xchan14.larawan @@ -100,7 +100,7 @@

Organization change

    -
  • From elly-code to elly-code
    • +
  • From ellie-commons to ellie-commons

😎 Guests stars:

    diff --git a/io.github.elly_code.jorts.flathub.yml b/io.github.ellie_commons.jorts.flathub.yml similarity index 93% rename from io.github.elly_code.jorts.flathub.yml rename to io.github.ellie_commons.jorts.flathub.yml index 7020e385..dd74a484 100644 --- a/io.github.elly_code.jorts.flathub.yml +++ b/io.github.ellie_commons.jorts.flathub.yml @@ -1,11 +1,11 @@ -id: io.github.elly_code.jorts +id: io.github.ellie_commons.jorts # elementary SDK is not available on Flathub, so use the elementary BaseApp instead base: io.elementary.BaseApp base-version: 'circe-25.08' runtime: org.gnome.Platform runtime-version: '49' sdk: org.gnome.Sdk -command: io.github.elly_code.jorts +command: io.github.ellie_commons.jorts finish-args: - '--share=ipc' @@ -53,7 +53,8 @@ modules: - -Dvariant=['default'] sources: - type: git - url: https://github.com/elly-code/jorts.git + url: https://github.com/ellie-commons/jorts.git + branch: legacy-rdnn tag: 4.0.1-5 commit: 0f616bae90c1998c2bb84f0a21390f842d7f4978 x-checker-data: diff --git a/meson.build b/meson.build index 452d019d..4551d7db 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ # Name our project -project('io.github.elly_code.jorts', ['vala', 'c'], +project('io.github.ellie_commons.jorts', ['vala', 'c'], version: '4.0.1' ) diff --git a/po/README.md b/po/README.md index ae0ad58b..0638113d 100644 --- a/po/README.md +++ b/po/README.md @@ -2,7 +2,7 @@ ## First Things First -* Clone this repository by opening the terminal in a folder of your choice and typing ```git clone https://github.com/elly_code/jorts``` +* Clone this repository by opening the terminal in a folder of your choice and typing ```git clone https://github.com/ellie_commons/jorts``` ## Basics diff --git a/po/bn.po b/po/bn.po index 2b1f5a74..8e820aaf 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.elly_code.jorts package. +# This file is distributed under the same license as the io.github.ellie_commons.jorts package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/cs.po b/po/cs.po index 64c1e2b2..132b0d69 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/da.po b/po/da.po index 97378790..5a678785 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/de.po b/po/de.po index 02dba8c2..79e22e9f 100644 --- a/po/de.po +++ b/po/de.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/el.po b/po/el.po index 1514d190..d11c73c3 100644 --- a/po/el.po +++ b/po/el.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: 2025-06-02 19:29+0300\n" diff --git a/po/es.po b/po/es.po index cfefeff4..86c6cde7 100644 --- a/po/es.po +++ b/po/es.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/extra/bn.po b/po/extra/bn.po index 02bc0a21..751b8ef6 100644 --- a/po/extra/bn.po +++ b/po/extra/bn.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.elly_code.jorts package. +# This file is distributed under the same license as the io.github.ellie_commons.jorts package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/extra/cs.po b/po/extra/cs.po index 4bd939fc..183138d9 100644 --- a/po/extra/cs.po +++ b/po/extra/cs.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/extra/de.po b/po/extra/de.po index a5f00968..fe7cdb83 100644 --- a/po/extra/de.po +++ b/po/extra/de.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/extra/es.po b/po/extra/es.po index f002095b..19b469ba 100644 --- a/po/extra/es.po +++ b/po/extra/es.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/extra/fi.po b/po/extra/fi.po index c9dfce72..0e3059c2 100644 --- a/po/extra/fi.po +++ b/po/extra/fi.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/extra/fil.po b/po/extra/fil.po index ae9c7e86..c887a5d6 100644 --- a/po/extra/fil.po +++ b/po/extra/fil.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.elly_code.jorts package. +# This file is distributed under the same license as the io.github.ellie_commons.jorts package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/extra/fr.po b/po/extra/fr.po index 6e6bbfe2..eaa651a3 100644 --- a/po/extra/fr.po +++ b/po/extra/fr.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/extra/hi.po b/po/extra/hi.po index 0e405c14..be8b53de 100644 --- a/po/extra/hi.po +++ b/po/extra/hi.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.elly_code.jorts package. +# This file is distributed under the same license as the io.github.ellie_commons.jorts package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/extra/it.po b/po/extra/it.po index 51c53706..d83d5d9c 100644 --- a/po/extra/it.po +++ b/po/extra/it.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: 2025-12-28 10:16+0100\n" diff --git a/po/extra/nb.po b/po/extra/nb.po index 7925df38..ad4b05b8 100644 --- a/po/extra/nb.po +++ b/po/extra/nb.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/extra/nl.po b/po/extra/nl.po index 2d364dc5..a68b9621 100644 --- a/po/extra/nl.po +++ b/po/extra/nl.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/extra/no.po b/po/extra/no.po index 410484ed..232ffe09 100644 --- a/po/extra/no.po +++ b/po/extra/no.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/extra/pt.po b/po/extra/pt.po index 72810290..4f504bc8 100644 --- a/po/extra/pt.po +++ b/po/extra/pt.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: 2025-02-18 11:43-03\n" diff --git a/po/extra/pt_br.po b/po/extra/pt_br.po index 01254a36..4b08e8f3 100644 --- a/po/extra/pt_br.po +++ b/po/extra/pt_br.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: 2025-02-18 11:43-03\n" diff --git a/po/extra/ru.po b/po/extra/ru.po index 603dcb61..b3c26448 100644 --- a/po/extra/ru.po +++ b/po/extra/ru.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: 2025-04-06 17:08+0400\n" diff --git a/po/extra/sk.po b/po/extra/sk.po index fe56990c..ae354db5 100644 --- a/po/extra/sk.po +++ b/po/extra/sk.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/extra/sv.po b/po/extra/sv.po index 5d50e2b6..e876adc5 100644 --- a/po/extra/sv.po +++ b/po/extra/sv.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: 2025-11-23 13:35+0100\n" diff --git a/po/extra/zh.po b/po/extra/zh.po index f78a3fba..eaff45df 100644 --- a/po/extra/zh.po +++ b/po/extra/zh.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/fi.po b/po/fi.po index f134af8d..10c7fe33 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/fil.po b/po/fil.po index c8e53f1a..9d8c6337 100644 --- a/po/fil.po +++ b/po/fil.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.elly_code.jorts package. +# This file is distributed under the same license as the io.github.ellie_commons.jorts package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/fr.po b/po/fr.po index 0c789805..259e7e6b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/hi.po b/po/hi.po index 054424d4..340fd60a 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.elly_code.jorts package. +# This file is distributed under the same license as the io.github.ellie_commons.jorts package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/io.github.elly_code.jorts.pot b/po/io.github.ellie_commons.jorts.pot similarity index 99% rename from po/io.github.elly_code.jorts.pot rename to po/io.github.ellie_commons.jorts.pot index ddbddf2f..ed0d3699 100644 --- a/po/io.github.elly_code.jorts.pot +++ b/po/io.github.ellie_commons.jorts.pot @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.elly_code.jorts package. +# This file is distributed under the same license as the io.github.ellie_commons.jorts package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/it.po b/po/it.po index 6ca14a65..d75457af 100644 --- a/po/it.po +++ b/po/it.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: 2025-12-27 12:46+0100\n" diff --git a/po/ja.po b/po/ja.po index 488ece97..4e5e4c7e 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: 2025-11-02 11:55+0900\n" diff --git a/po/lt.po b/po/lt.po index e88ef0fa..51b3254f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/nb.po b/po/nb.po index ba4917c4..8793e508 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/nl.po b/po/nl.po index a4425e13..f27e712f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/no.po b/po/no.po index 59a2e63e..8569abab 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/pl.po b/po/pl.po index c2dd41a4..4445e00e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/pt.po b/po/pt.po index d61c3700..bd2d2e6b 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: 2025-02-18 11:43-03\n" diff --git a/po/pt_br.po b/po/pt_br.po index 954d2e42..f996fc3f 100644 --- a/po/pt_br.po +++ b/po/pt_br.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: 2025-02-18 11:43-03\n" diff --git a/po/ru.po b/po/ru.po index 7c5e4f06..26dab269 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: 2025-04-06 17:02+0400\n" diff --git a/po/sk.po b/po/sk.po index b2b54e8a..aac1babe 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/sv.po b/po/sv.po index 283333c6..6db32646 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: 2025-11-23 13:27+0100\n" diff --git a/po/tr.po b/po/tr.po index 8fbc64ae..52456c8e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/uk.po b/po/uk.po index b90609d7..e77002dd 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/po/vi.po b/po/vi.po index 822e4ea6..a50f23bc 100644 --- a/po/vi.po +++ b/po/vi.po @@ -1,9 +1,9 @@ # Vietnamese translation by Vietnam Linux L10n # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the io.github.elly_code.jorts package. +# This file is distributed under the same license as the io.github.ellie_commons.jorts package. msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: 2025-12-14 19:31+0700\n" diff --git a/po/zh.po b/po/zh.po index 79bf262f..2ad52cb8 100644 --- a/po/zh.po +++ b/po/zh.po @@ -1,7 +1,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: io.github.elly_code.jorts\n" +"Project-Id-Version: io.github.ellie_commons.jorts\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-22 14:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/src/Application.vala b/src/Application.vala index 225322d3..06bee34d 100644 --- a/src/Application.vala +++ b/src/Application.vala @@ -137,7 +137,7 @@ Please wait while the app remembers all the things... // build all the stylesheets var app_provider = new Gtk.CssProvider (); - app_provider.load_from_resource ("/io/github/elly_code/jorts/Application.css"); + app_provider.load_from_resource ("/io/github/ellie_commons/jorts/Application.css"); Gtk.StyleContext.add_provider_for_display ( Gdk.Display.get_default (), app_provider, @@ -145,7 +145,7 @@ Please wait while the app remembers all the things... ); var theme_provider = new Gtk.CssProvider (); - theme_provider.load_from_resource ("/io/github/elly_code/jorts/Themes.css"); + theme_provider.load_from_resource ("/io/github/ellie_commons/jorts/Themes.css"); Gtk.StyleContext.add_provider_for_display ( Gdk.Display.get_default (), theme_provider, diff --git a/src/Constants.vala b/src/Constants.vala index c4b44850..f95b8215 100644 --- a/src/Constants.vala +++ b/src/Constants.vala @@ -11,7 +11,7 @@ namespace Jorts.Constants { /*************************************************/ - const string RDNN = "io.github.elly_code.jorts"; + const string RDNN = "io.github.ellie_commons.jorts"; const string DONATE_LINK = "https://ko-fi.com/teamcons"; // signature theme diff --git a/src/Utils/Libportal.vala b/src/Utils/Libportal.vala index 719b1ea2..66fd64ec 100644 --- a/src/Utils/Libportal.vala +++ b/src/Utils/Libportal.vala @@ -9,7 +9,7 @@ namespace Jorts.Utils { public void autostart_remove () { Xdp.Portal portal = new Xdp.Portal (); GenericArray cmd = new GenericArray (); - cmd.add ("io.github.elly_code.jorts"); + cmd.add ("io.github.ellie_commons.jorts"); portal.request_background.begin ( null, @@ -22,7 +22,7 @@ namespace Jorts.Utils { public void autostart_set () { Xdp.Portal portal = new Xdp.Portal (); GenericArray cmd = new GenericArray (); - cmd.add ("io.github.elly_code.jorts"); + cmd.add ("io.github.ellie_commons.jorts"); portal.request_background.begin ( null, diff --git a/windows/Jorts-Installer.nsi b/windows/Jorts-Installer.nsi index b95445e0..fb0ab1bd 100644 --- a/windows/Jorts-Installer.nsi +++ b/windows/Jorts-Installer.nsi @@ -6,8 +6,8 @@ Name Jorts VIAddVersionKey /LANG=0 "ProductName" "Jorts" VIAddVersionKey /LANG=0 "FileVersion" "4.0.0" VIAddVersionKey /LANG=0 "ProductVersion" "4.0.0" -VIAddVersionKey /LANG=0 "FileDescription" "https://github.com/elly-code/jorts" -VIAddVersionKey /LANG=0 "LegalCopyright" "GNU GPL v3 elly-code" +VIAddVersionKey /LANG=0 "FileDescription" "https://github.com/ellie-commons/jorts" +VIAddVersionKey /LANG=0 "LegalCopyright" "GNU GPL v3 ellie-commons" VIProductVersion "4.0.0.0" Outfile "Jorts-Installer.exe" @@ -18,7 +18,7 @@ RequestExecutionLevel user # Set the title of the installer window Caption "Jorts Installer" -BrandingText "Jorts 4.0.0, elly-code 2025" +BrandingText "Jorts 4.0.0, ellie-commons 2025" # Set the title and text on the welcome page !define MUI_WELCOMEPAGE_TITLE "Welcome to Jorts setup" @@ -28,8 +28,8 @@ BrandingText "Jorts 4.0.0, elly-code 2025" !define MUI_UNICON "icons\uninstall.ico" !define MUI_FINISHPAGE_LINK "Source code and wiki" -!define MUI_FINISHPAGE_LINK_LOCATION "https://github.com/elly-code/jorts" -!define MUI_FINISHPAGE_RUN "$INSTDIR\bin\io.github.elly_code.jorts.exe" +!define MUI_FINISHPAGE_LINK_LOCATION "https://github.com/ellie-commons/jorts" +!define MUI_FINISHPAGE_RUN "$INSTDIR\bin\io.github.ellie_commons.jorts.exe" !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_DIRECTORY @@ -109,13 +109,13 @@ Section "Install" SetOutPath "$INSTDIR" ; Start menu - CreateShortCut "$SMPROGRAMS\Jorts\Jorts.lnk" "$INSTDIR\bin\io.github.elly_code.jorts.exe" "" "$INSTDIR\icons\icon-mini.ico" 0 + CreateShortCut "$SMPROGRAMS\Jorts\Jorts.lnk" "$INSTDIR\bin\io.github.ellie_commons.jorts.exe" "" "$INSTDIR\icons\icon-mini.ico" 0 ; Autostart - CreateShortCut "$SMPROGRAMS\Startup\Jorts.lnk" "$INSTDIR\bin\io.github.elly_code.jorts.exe" "" "$INSTDIR\icons\icon-mini.ico" 0 + CreateShortCut "$SMPROGRAMS\Startup\Jorts.lnk" "$INSTDIR\bin\io.github.ellie_commons.jorts.exe" "" "$INSTDIR\icons\icon-mini.ico" 0 ; Preferences - CreateShortCut "$SMPROGRAMS\Jorts\Preferences of Jorts.lnk" "$INSTDIR\bin\io.github.elly_code.jorts.exe" "--preferences" "$INSTDIR\icons\settings-mini.ico" 0 + CreateShortCut "$SMPROGRAMS\Jorts\Preferences of Jorts.lnk" "$INSTDIR\bin\io.github.ellie_commons.jorts.exe" "--preferences" "$INSTDIR\icons\settings-mini.ico" 0 WriteRegStr HKCU "Software\Jorts" "" $INSTDIR WriteUninstaller "$INSTDIR\Uninstall.exe" @@ -125,8 +125,8 @@ Section "Install" WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "DisplayIcon" "$INSTDIR\icons\icon.ico" WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "InstallLocation" "$INSTDIR\" WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "UninstallString" "$INSTDIR\Uninstall.exe" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "Publisher" "elly-code" - WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "URLInfoAbout" "https://github.com/elly-code/jorts" + WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "Publisher" "ellie-commons" + WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "URLInfoAbout" "https://github.com/ellie-commons/jorts" WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Jorts" "EstimatedSize" "0x00028294" ;164,5 MB SectionEnd diff --git a/windows/deploy.sh b/windows/deploy.sh index b9c1ba65..946177ff 100644 --- a/windows/deploy.sh +++ b/windows/deploy.sh @@ -19,10 +19,10 @@ build_dir="builddir" theme_name="io.elementary.stylesheet.blueberry" icon_theme="elementary" version="$(cat meson.build | grep version | cut -d \' -f 2)" -publisher="elly-code" +publisher="ellie-commons" deploy_dir="windows/deploy" -exe_name="io.github.elly_code.jorts.exe" +exe_name="io.github.ellie_commons.jorts.exe" #-------------------------------- # Rebuild and compile the exe as a release build @@ -122,8 +122,8 @@ Name ${app_name} VIAddVersionKey /LANG=0 "ProductName" "${app_name}" VIAddVersionKey /LANG=0 "FileVersion" "${version}" VIAddVersionKey /LANG=0 "ProductVersion" "${version}" -VIAddVersionKey /LANG=0 "FileDescription" "https://github.com/elly-code/jorts" -VIAddVersionKey /LANG=0 "LegalCopyright" "GNU GPL v3 elly-code" +VIAddVersionKey /LANG=0 "FileDescription" "https://github.com/ellie-commons/jorts" +VIAddVersionKey /LANG=0 "LegalCopyright" "GNU GPL v3 ellie-commons" VIProductVersion "${version}.0" Outfile "${app_name}-Installer.exe" @@ -144,8 +144,8 @@ BrandingText "Jorts ${version}, ${publisher} 2025" !define MUI_UNICON "icons\uninstall.ico" !define MUI_FINISHPAGE_LINK "Source code and wiki" -!define MUI_FINISHPAGE_LINK_LOCATION "https://github.com/elly-code/jorts" -!define MUI_FINISHPAGE_RUN "\$INSTDIR\bin\io.github.elly_code.jorts.exe" +!define MUI_FINISHPAGE_LINK_LOCATION "https://github.com/ellie-commons/jorts" +!define MUI_FINISHPAGE_RUN "\$INSTDIR\bin\io.github.ellie_commons.jorts.exe" !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_DIRECTORY @@ -242,7 +242,7 @@ Section "Install" WriteRegStr HKCU "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${app_name}" "InstallLocation" "\$INSTDIR\\" WriteRegStr HKCU "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${app_name}" "UninstallString" "\$INSTDIR\\Uninstall.exe" WriteRegStr HKCU "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${app_name}" "Publisher" "${publisher}" - WriteRegStr HKCU "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${app_name}" "URLInfoAbout" "https://github.com/elly-code/jorts" + WriteRegStr HKCU "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${app_name}" "URLInfoAbout" "https://github.com/ellie-commons/jorts" WriteRegDWORD HKCU "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${app_name}" "EstimatedSize" "0x00028294" ;164,5 MB SectionEnd From 6be5bbe34c8fa47e77977519245bc568bfecf637 Mon Sep 17 00:00:00 2001 From: teamcons Date: Tue, 3 Feb 2026 23:38:50 +0100 Subject: [PATCH 02/11] Update manifest --- ...b.yml => io.github.ellie_commons.jorts.yml | 8 ++- io.github.elly_code.jorts.yml | 54 ------------------- 2 files changed, 3 insertions(+), 59 deletions(-) rename io.github.ellie_commons.jorts.flathub.yml => io.github.ellie_commons.jorts.yml (91%) delete mode 100644 io.github.elly_code.jorts.yml diff --git a/io.github.ellie_commons.jorts.flathub.yml b/io.github.ellie_commons.jorts.yml similarity index 91% rename from io.github.ellie_commons.jorts.flathub.yml rename to io.github.ellie_commons.jorts.yml index dd74a484..fa73e3b2 100644 --- a/io.github.ellie_commons.jorts.flathub.yml +++ b/io.github.ellie_commons.jorts.yml @@ -53,10 +53,8 @@ modules: - -Dvariant=['default'] sources: - type: git - url: https://github.com/ellie-commons/jorts.git - branch: legacy-rdnn - tag: 4.0.1-5 - commit: 0f616bae90c1998c2bb84f0a21390f842d7f4978 + url: https://github.com/elly-code/jorts.git + commit: b0a8091a6a466b59356b02978df7fd77689ff1e6 x-checker-data: type: git - tag-pattern: '^([\d.]+)$' \ No newline at end of file + tag-pattern: '^([\d.]+)$' diff --git a/io.github.elly_code.jorts.yml b/io.github.elly_code.jorts.yml deleted file mode 100644 index a7011277..00000000 --- a/io.github.elly_code.jorts.yml +++ /dev/null @@ -1,54 +0,0 @@ -id: io.github.elly_code.jorts -runtime: io.elementary.Platform -runtime-version: '8.2' -sdk: io.elementary.Sdk -command: io.github.elly_code.jorts - -finish-args: - - '--share=ipc' - - '--device=dri' - - '--socket=fallback-x11' - - '--socket=wayland' - -cleanup: - - '/include' - - '/lib/pkgconfig' - - '/man' - - '/share/gtk-doc' - - '/share/man' - - '/share/pkgconfig' - - '/share/installed-tests' - - '*.la' - - '*.a' - -modules: - # Needed for the Scribbly mode - # It should be present by default on elementary OS, but better not assume it is the case - - name: RedactedScript - buildsystem: simple - build-commands: - - install -Dm0644 RedactedScript-Regular.ttf -t ${FLATPAK_DEST}/share/fonts - - install -Dm0644 OFL.txt -t ${FLATPAK_DEST}/share/doc/redacted-font - - install -Dm0644 AUTHORS.txt -t ${FLATPAK_DEST}/share/doc/redacted-font - - install -Dm0644 README.md -t ${FLATPAK_DEST}/share/doc/redacted-font - sources: - - type: file - url: https://github.com/christiannaths/redacted-font/raw/63e542017bab347ba9be54d7d99b99d4754c3d97/RedactedScript/fonts/ttf/RedactedScript-Regular.ttf - sha256: 1ebaab9642a2f43fa33f449760469903143fd1d08b2433eb6c15e28602d9360d - - type: file - url: https://raw.githubusercontent.com/christiannaths/redacted-font/284dfb0397d1911c3388f72389f08b3c13446134/OFL.txt - sha256: ed836da2ff14b9b2d04001057e03c0531afdd2626bf66a612b17124589f58efa - - type: file - url: https://raw.githubusercontent.com/christiannaths/redacted-font/284dfb0397d1911c3388f72389f08b3c13446134/AUTHORS.txt - sha256: 84977eeb6e582a6d10bea0eda40e1c6dfdc8904309c6011932a9e2632c727043 - - type: file - url: https://raw.githubusercontent.com/christiannaths/redacted-font/284dfb0397d1911c3388f72389f08b3c13446134/README.md - sha256: e594f7f6bf03f7b11897d219184e215466cdfb9a8268b54cb7d5a626482dd722 - - - name: jorts - buildsystem: meson - config-opts: - - -Dvariant=['default'] - sources: - - type: dir - path: . From 08861aac8beec75b44387d610c3398b94a3c93f0 Mon Sep 17 00:00:00 2001 From: teamcons Date: Sun, 15 Feb 2026 23:46:10 +0100 Subject: [PATCH 03/11] ignore --- .github/workflows/CI.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index aabd86a0..f9468a58 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -2,13 +2,12 @@ name: CI on: pull_request: - branches: [ main ] + branches-ignore: + - legacy-rdnn types: - opened - reopened - synchronize - branches-ignore: - - 'legacy-rdnn' jobs: flatpak: From e923288bea7397831b2286c5205fc697ddeab11f Mon Sep 17 00:00:00 2001 From: teamcons Date: Sun, 22 Feb 2026 16:36:15 +0100 Subject: [PATCH 04/11] better in the forms --- .github/ISSUE_TEMPLATE/bug_report.yml | 83 ++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.yml | 32 +++++++++ 2 files changed, 115 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 00000000..2741a5b9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,83 @@ +name: Issue Report +description: Report an unexpected behavior or failure (AKA a bug) +type: "Bug" + +body: + - type: markdown + attributes: + value: | + * Please read these [Tips](https://docs.elementary.io/contributor-guide/feedback/reporting-issues) + * Be sure to search open and closed issues for duplicates + * Do not put [things in brackets] in your report title + + - type: textarea + attributes: + label: What Happened? + description: A detailed description of unexpected behavior will help us address your issue more quickly. Do your best! + validations: + required: true + + - type: textarea + attributes: + label: Steps to Reproduce + description: Explain the exact steps one would take to experience the issue. If applicable, add screenshots or screen recordings. + placeholder: | + 1. Went here + 2. Did this + 3. Clicked that + validations: + required: true + + - type: textarea + attributes: + label: Expected Behavior + description: Explain how what happened is different from what you wanted to happen. + validations: + required: true + + - type: dropdown + attributes: + label: OS Architecture + description: The architecture of elementary OS you are using + options: + - amd64 (on most hardwares) + - arm64 (on Raspberry Pi, Apple Silicon, etc.) + - amd64 and arm64 (I have tested on both) + - Other Architecture (unofficial, community-supported) + validations: + required: true + + - type: dropdown + attributes: + label: Build Version + description: Where you installed the software from + options: + - I installed from Flathub (all Linuxes) + - I installed from Appcenter (elementary OS) + - I built it from sources (with Meson+Ninja) + validations: + required: true + + - type: dropdown + attributes: + label: Software Version + description: The version of the software you are using + options: + - Latest release (I have run all updates) + - Compiled from git + - Older release (I have not run all updates) + validations: + required: true + + - type: textarea + attributes: + label: Log Output + description: | + * Fails without warning? Get and share debug logs by following: https://docs.elementary.io/contributor-guide/feedback/reporting-issues/debug-logs + * Unexpectedly quits or stops? Get and share crash logs by following: https://docs.elementary.io/contributor-guide/feedback/reporting-issues/inspecting-crashes + render: shell + + - type: textarea + attributes: + label: Hardware Info + description: Relevant hardware information such as graphics drivers, unconventional setups, etc. diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml new file mode 100644 index 00000000..2abd26ba --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -0,0 +1,32 @@ +name: Feature Request +description: Suggest a new idea or request a missing feature +labels: ["Priority: Wishlist", "Needs Design"] +type: "Feature" + +body: + - type: markdown + attributes: + value: | + * Please read these [Tips](https://docs.elementary.io/contributor-guide/feedback/creating-feature-requests) + * Be sure to search open and closed issues for duplicates + + - type: textarea + attributes: + label: Problem + description: Describe the problem that this new feature or idea is meant to address + validations: + required: true + + - type: textarea + attributes: + label: Proposal + description: Describe the new feature or idea that you would like to propose and how it solves the problem + validations: + required: true + + - type: textarea + attributes: + label: Prior Art (Optional) + description: List any supporting examples of how others have implemented this feature + validations: + required: false From 37159c6a2ca858044cc16e1a31a07d2faa7ce714 Mon Sep 17 00:00:00 2001 From: teamcons Date: Tue, 3 Feb 2026 22:35:39 +0100 Subject: [PATCH 05/11] use ellie-commons on this branch --- data/jorts.metainfo.xml.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/jorts.metainfo.xml.in b/data/jorts.metainfo.xml.in index 8fbbc1f2..9d09e74a 100644 --- a/data/jorts.metainfo.xml.in +++ b/data/jorts.metainfo.xml.in @@ -100,7 +100,11 @@

    Organization change

      +<<<<<<< HEAD
    • From ellie-commons to elly-code
      • +======= +
    • From ellie-commons to ellie-commons
      • +>>>>>>> 2e99b4d (use ellie-commons on this branch)

    😎 Guests stars:

      From 21d37f08d3c2f9f14f5338294baa2c6b2340050c Mon Sep 17 00:00:00 2001 From: teamcons Date: Sun, 22 Feb 2026 16:38:26 +0100 Subject: [PATCH 06/11] update SPDX --- src/Constants.vala | 6 ++---- src/Objects/NoteData.vala | 2 +- src/Objects/Themes.vala | 2 +- src/Objects/Zoom.vala | 2 +- src/Objects/Zoomkind.vala | 2 +- src/Services/ColorController.vala | 2 +- src/Services/NoteManager.vala | 2 +- src/Services/ScribblyController.vala | 2 +- src/Services/Storage.vala | 2 +- src/Services/ZoomController.vala | 2 +- src/Utils/Libportal.vala | 2 +- src/Utils/Random.vala | 2 +- src/Views/NoteView.vala | 2 +- src/Views/PreferencesView.vala | 2 +- src/Widgets/ActionBar.vala | 2 +- src/Widgets/EditableLabel.vala | 2 +- src/Widgets/Popover.vala | 2 +- src/Widgets/PopoverWidgets/ColorBox.vala | 2 +- src/Widgets/PopoverWidgets/ColorPill.vala | 2 +- src/Widgets/PopoverWidgets/MonospaceBox.vala | 2 +- src/Widgets/PopoverWidgets/ZoomBox.vala | 2 +- src/Widgets/PreferencesWidgets/SettingsSwitch.vala | 2 +- src/Widgets/TextView.vala | 2 +- src/Windows/PreferenceWindow.vala | 2 +- src/Windows/StickyNoteWindow.vala | 2 +- 25 files changed, 26 insertions(+), 28 deletions(-) diff --git a/src/Constants.vala b/src/Constants.vala index f95b8215..d580a7eb 100644 --- a/src/Constants.vala +++ b/src/Constants.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /** @@ -12,13 +12,11 @@ namespace Jorts.Constants { /*************************************************/ const string RDNN = "io.github.ellie_commons.jorts"; - const string DONATE_LINK = "https://ko-fi.com/teamcons"; + const string DONATE_LINK = "https://ko-fi.com/teamcons/tip"; // signature theme #if HALLOWEEN const Jorts.Themes DEFAULT_THEME = Jorts.Themes.ORANGE; -#elif CLASSIC - const Jorts.Themes DEFAULT_THEME = Jorts.Themes.BANANA; #else const Jorts.Themes DEFAULT_THEME = Jorts.Themes.BLUEBERRY; #endif diff --git a/src/Objects/NoteData.vala b/src/Objects/NoteData.vala index bad5f1ca..fd833535 100644 --- a/src/Objects/NoteData.vala +++ b/src/Objects/NoteData.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ diff --git a/src/Objects/Themes.vala b/src/Objects/Themes.vala index ce763565..8c7c5564 100644 --- a/src/Objects/Themes.vala +++ b/src/Objects/Themes.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /*************************************************/ diff --git a/src/Objects/Zoom.vala b/src/Objects/Zoom.vala index 85e42cf2..65562d06 100644 --- a/src/Objects/Zoom.vala +++ b/src/Objects/Zoom.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /*************************************************/ diff --git a/src/Objects/Zoomkind.vala b/src/Objects/Zoomkind.vala index 9c7657c7..fb2d7367 100644 --- a/src/Objects/Zoomkind.vala +++ b/src/Objects/Zoomkind.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /*************************************************/ diff --git a/src/Services/ColorController.vala b/src/Services/ColorController.vala index ab718164..5eca0e22 100644 --- a/src/Services/ColorController.vala +++ b/src/Services/ColorController.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /*************************************************/ diff --git a/src/Services/NoteManager.vala b/src/Services/NoteManager.vala index 714ff51b..2b0eda4b 100644 --- a/src/Services/NoteManager.vala +++ b/src/Services/NoteManager.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /** diff --git a/src/Services/ScribblyController.vala b/src/Services/ScribblyController.vala index 19e7970b..10c2d0db 100644 --- a/src/Services/ScribblyController.vala +++ b/src/Services/ScribblyController.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /*************************************************/ diff --git a/src/Services/Storage.vala b/src/Services/Storage.vala index faeacb3a..6d860218 100644 --- a/src/Services/Storage.vala +++ b/src/Services/Storage.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /** diff --git a/src/Services/ZoomController.vala b/src/Services/ZoomController.vala index 14cd4af7..e5a2eb47 100644 --- a/src/Services/ZoomController.vala +++ b/src/Services/ZoomController.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /*************************************************/ diff --git a/src/Utils/Libportal.vala b/src/Utils/Libportal.vala index 66fd64ec..e19ce301 100644 --- a/src/Utils/Libportal.vala +++ b/src/Utils/Libportal.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ namespace Jorts.Utils { diff --git a/src/Utils/Random.vala b/src/Utils/Random.vala index 8f462642..5518c68d 100644 --- a/src/Utils/Random.vala +++ b/src/Utils/Random.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /* CONTENT diff --git a/src/Views/NoteView.vala b/src/Views/NoteView.vala index d90966a7..60cff3f1 100644 --- a/src/Views/NoteView.vala +++ b/src/Views/NoteView.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ public class Jorts.NoteView : Gtk.Box { diff --git a/src/Views/PreferencesView.vala b/src/Views/PreferencesView.vala index 6d2a59af..59bebf20 100644 --- a/src/Views/PreferencesView.vala +++ b/src/Views/PreferencesView.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ public class Jorts.PreferencesView : Gtk.Box { diff --git a/src/Widgets/ActionBar.vala b/src/Widgets/ActionBar.vala index 5866c08a..0e810248 100644 --- a/src/Widgets/ActionBar.vala +++ b/src/Widgets/ActionBar.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /** diff --git a/src/Widgets/EditableLabel.vala b/src/Widgets/EditableLabel.vala index ae3a48d0..c8e854ff 100644 --- a/src/Widgets/EditableLabel.vala +++ b/src/Widgets/EditableLabel.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /** diff --git a/src/Widgets/Popover.vala b/src/Widgets/Popover.vala index aa8708e4..eef447f4 100644 --- a/src/Widgets/Popover.vala +++ b/src/Widgets/Popover.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /** diff --git a/src/Widgets/PopoverWidgets/ColorBox.vala b/src/Widgets/PopoverWidgets/ColorBox.vala index 3e070eb9..f6776840 100644 --- a/src/Widgets/PopoverWidgets/ColorBox.vala +++ b/src/Widgets/PopoverWidgets/ColorBox.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /** diff --git a/src/Widgets/PopoverWidgets/ColorPill.vala b/src/Widgets/PopoverWidgets/ColorPill.vala index 8892e4d5..94beb0da 100644 --- a/src/Widgets/PopoverWidgets/ColorPill.vala +++ b/src/Widgets/PopoverWidgets/ColorPill.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /* diff --git a/src/Widgets/PopoverWidgets/MonospaceBox.vala b/src/Widgets/PopoverWidgets/MonospaceBox.vala index 6748fd7c..90735ae2 100644 --- a/src/Widgets/PopoverWidgets/MonospaceBox.vala +++ b/src/Widgets/PopoverWidgets/MonospaceBox.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /** diff --git a/src/Widgets/PopoverWidgets/ZoomBox.vala b/src/Widgets/PopoverWidgets/ZoomBox.vala index fb375f87..16979411 100644 --- a/src/Widgets/PopoverWidgets/ZoomBox.vala +++ b/src/Widgets/PopoverWidgets/ZoomBox.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /** diff --git a/src/Widgets/PreferencesWidgets/SettingsSwitch.vala b/src/Widgets/PreferencesWidgets/SettingsSwitch.vala index 25d1d970..8e018dfd 100644 --- a/src/Widgets/PreferencesWidgets/SettingsSwitch.vala +++ b/src/Widgets/PreferencesWidgets/SettingsSwitch.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /** diff --git a/src/Widgets/TextView.vala b/src/Widgets/TextView.vala index c96a9d5a..bde1453b 100644 --- a/src/Widgets/TextView.vala +++ b/src/Widgets/TextView.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ /** diff --git a/src/Windows/PreferenceWindow.vala b/src/Windows/PreferenceWindow.vala index a838f3f7..10afab2c 100644 --- a/src/Windows/PreferenceWindow.vala +++ b/src/Windows/PreferenceWindow.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ diff --git a/src/Windows/StickyNoteWindow.vala b/src/Windows/StickyNoteWindow.vala index 4a76be8a..e9ef4f85 100644 --- a/src/Windows/StickyNoteWindow.vala +++ b/src/Windows/StickyNoteWindow.vala @@ -1,8 +1,8 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2017-2024 Lains - * 2025 Stella & Charlie (teamcons.carrd.co) * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) + * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ From 6d55a2aa4d5276bdc61bc253702ab91b80c986ab Mon Sep 17 00:00:00 2001 From: teamcons Date: Sun, 22 Feb 2026 17:03:50 +0100 Subject: [PATCH 07/11] expand constant usage --- src/Application.vala | 1 - src/Constants.vala | 11 ++++++++++- src/Views/PreferencesView.vala | 7 +++---- src/Widgets/ActionBar.vala | 18 ++++++++++-------- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/Application.vala b/src/Application.vala index 06bee34d..1637a7b0 100644 --- a/src/Application.vala +++ b/src/Application.vala @@ -266,7 +266,6 @@ Please wait while the app remembers all the things... return 0; } - hold (); activate (); return 0; } diff --git a/src/Constants.vala b/src/Constants.vala index d580a7eb..36855027 100644 --- a/src/Constants.vala +++ b/src/Constants.vala @@ -24,11 +24,14 @@ namespace Jorts.Constants { // in ms const int DEBOUNCE = 900; + // CSS + const string STYLE_THEMEDBUTTON = Constants.STYLE_THEMEDBUTTON; + // We need to say stop at some point const int ZOOM_MAX = 300; const int DEFAULT_ZOOM = 100; const int ZOOM_MIN = 20; - const bool DEFAULT_MONO = false; + const bool DEFAULT_MONO = false; // For new stickies const int DEFAULT_WIDTH = 290; @@ -45,6 +48,12 @@ namespace Jorts.Constants { const int DEFAULT_PREF_HEIGHT = 270; #endif + + // Autocomplete save me + const string KEY_SCRIBBLY = "scribbly-mode-active"; + const string KEY_HIDEBAR = "hide-bar"; + const string KEY_LIST = "list-item-start"; + // Used by random_emote () for the emote selection menu const string[] EMOTES = { "face-angel-symbolic", diff --git a/src/Views/PreferencesView.vala b/src/Views/PreferencesView.vala index 59bebf20..0d58e0ad 100644 --- a/src/Views/PreferencesView.vala +++ b/src/Views/PreferencesView.vala @@ -63,8 +63,7 @@ lists_box.append (list_label); lists_box.append (list_entry); - Application.gsettings.bind ( - "list-item-start", + Application.gsettings.bind (Constants.KEY_LIST, list_entry, "text", SettingsBindFlags.DEFAULT); @@ -81,7 +80,7 @@ var scribbly_box = new Jorts.SettingsSwitch ( _("Scribble mode"), _("Scribble text of unfocused notes (Ctrl+H)"), - "scribbly-mode-active"); + Constants.KEY_SCRIBBLY); settingsbox.append (scribbly_box); @@ -94,7 +93,7 @@ ///TRANSLATORS: Instead of bottom bar you can also use "Action bar" or "button bar" _("Hide bottom bar"), _("Keyboard shortcuts will still function (Ctrl+T)"), - "hide-bar"); + Constants.KEY_HIDEBAR); settingsbox.append (hidebar_box); diff --git a/src/Widgets/ActionBar.vala b/src/Widgets/ActionBar.vala index 0e810248..7d92e2b1 100644 --- a/src/Widgets/ActionBar.vala +++ b/src/Widgets/ActionBar.vala @@ -31,7 +31,7 @@ ) }; new_item.action_name = Application.ACTION_PREFIX + Application.ACTION_NEW; - new_item.add_css_class ("themedbutton"); + new_item.add_css_class (Constants.STYLE_THEMEDBUTTON); var delete_item = new Gtk.Button () { icon_name = "edit-delete-symbolic", @@ -42,7 +42,7 @@ _("Delete sticky note") ) }; - delete_item.add_css_class ("themedbutton"); + delete_item.add_css_class (Constants.STYLE_THEMEDBUTTON); delete_item.action_name = StickyNoteWindow.ACTION_PREFIX + StickyNoteWindow.ACTION_DELETE; /* **** RIGHT **** */ @@ -55,7 +55,7 @@ _("Toggle list") ) }; - list_button.add_css_class ("themedbutton"); + list_button.add_css_class (Constants.STYLE_THEMEDBUTTON); list_button.action_name = StickyNoteWindow.ACTION_PREFIX + StickyNoteWindow.ACTION_TOGGLE_LIST; emojichooser_popover = new Gtk.EmojiChooser (); @@ -69,7 +69,7 @@ _("Insert emoji") ) }; - emoji_button.add_css_class ("themedbutton"); + emoji_button.add_css_class (Constants.STYLE_THEMEDBUTTON); emoji_button.popover = emojichooser_popover; menu_button = new Gtk.MenuButton () { @@ -82,7 +82,7 @@ ) }; menu_button.direction = Gtk.ArrowType.UP; - menu_button.add_css_class ("themedbutton"); + menu_button.add_css_class (Constants.STYLE_THEMEDBUTTON); /* **** Widget **** */ actionbar = new Gtk.ActionBar () { @@ -106,7 +106,7 @@ // Hide the list button if user has specified no list item symbol on_prefix_changed (); - Application.gsettings.changed["list-item-start"].connect (on_prefix_changed); + Application.gsettings.changed[Constants.KEY_LIST].connect (on_prefix_changed); } @@ -115,7 +115,9 @@ * StickyNoteWindow will decide itself whether to show immediately or not */ public void reveal_bind () { - Application.gsettings.bind ("hide-bar", this.actionbar, "revealed", SettingsBindFlags.INVERT_BOOLEAN); + Application.gsettings.bind (Constants.KEY_HIDEBAR, + this.actionbar, "revealed", + SettingsBindFlags.INVERT_BOOLEAN); } // Skip the current icon to avoid picking it twice @@ -130,6 +132,6 @@ } private void on_prefix_changed () { - list_button.visible = (Application.gsettings.get_string ("list-item-start") != ""); + list_button.visible = (Application.gsettings.get_string (Constants.KEY_LIST) != ""); } } From 45e773a105e209262ddc8e991c245c7c85838a48 Mon Sep 17 00:00:00 2001 From: teamcons Date: Tue, 24 Feb 2026 16:27:43 +0100 Subject: [PATCH 08/11] update workflows --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/workflows/CI.yml | 6 +++--- .github/workflows/lint.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 2741a5b9..262f7e0e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -54,7 +54,7 @@ body: options: - I installed from Flathub (all Linuxes) - I installed from Appcenter (elementary OS) - - I built it from sources (with Meson+Ninja) + - I built it from sources (with Meson+Ninja, or from AUR) validations: required: true diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f9468a58..77e79a9b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -15,15 +15,15 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/elementary/flatpak-platform/runtime:8 + image: ghcr.io/elementary/flatpak-platform/runtime:8.2 options: --privileged steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Build - uses: flatpak/flatpak-github-actions/flatpak-builder@v6 + uses: flatpak/flatpak-github-actions/flatpak-builder@v6.6 with: bundle: jorts.flatpak manifest-path: io.github.ellie_commons.jorts.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 55dc6216..f652d38a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,4 +1,4 @@ -name: "CI: Lint" +name: "Lint" on: pull_request: From c45041b97d076665758681df4034c5cb4069a602 Mon Sep 17 00:00:00 2001 From: teamcons Date: Tue, 24 Feb 2026 17:23:21 +0100 Subject: [PATCH 09/11] linter skip constants --- src/Constants.vala | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Constants.vala b/src/Constants.vala index 36855027..5f472355 100644 --- a/src/Constants.vala +++ b/src/Constants.vala @@ -4,6 +4,7 @@ * 2025 Contributions from the ellie_Commons community (github.com/ellie-commons/) * 2025-2026 Stella & Charlie (teamcons.carrd.co) */ +//vala-lint=skip-file /** * I just dump all my constants here From 55054fad389ce6e3495d0655f46eb60f1a78a0e4 Mon Sep 17 00:00:00 2001 From: teamcons Date: Tue, 24 Feb 2026 18:07:43 +0100 Subject: [PATCH 10/11] gate gtk in meson for flathub and future gtk versions --- meson.build | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 650af395..869a339a 100644 --- a/meson.build +++ b/meson.build @@ -39,7 +39,7 @@ if flathub vala_flags += ['--define', 'FLATHUB'] endif -add_project_arguments(vala_flags, language: 'vala') + #================================ # Import the stylesheet @@ -64,12 +64,25 @@ gresource = gnome.compile_resources( #================================ # dependencies + + +gtk422 = dependency('gtk4', version: '>= 4.22', required: false) + +if gtk422.found() + gtk_dep = gtk422 + vala_flags = ['--define', 'HAS_GTK422'] + +else + gtk_dep = dependency('gtk4') +endif + +add_project_arguments(vala_flags, language: 'vala') dependencies = [ dependency('granite-7'), dependency('gobject-2.0'), dependency('json-glib-1.0'), dependency('gee-0.8'), - dependency('gtk4'), + gtk_dep, ] # We need to compile an icon into the exe to avoid "missing icon" icon at every turn From 1f9252b27dcd4e5a092c3d3f3cce43d697a5f315 Mon Sep 17 00:00:00 2001 From: teamcons Date: Tue, 3 Feb 2026 22:35:39 +0100 Subject: [PATCH 11/11] use ellie-commons on this branch --- io.github.ellie_commons.jorts.flathub.yml | 62 +++++++++++++++++++++++ src/Constants.vala | 2 +- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 io.github.ellie_commons.jorts.flathub.yml diff --git a/io.github.ellie_commons.jorts.flathub.yml b/io.github.ellie_commons.jorts.flathub.yml new file mode 100644 index 00000000..dd74a484 --- /dev/null +++ b/io.github.ellie_commons.jorts.flathub.yml @@ -0,0 +1,62 @@ +id: io.github.ellie_commons.jorts +# elementary SDK is not available on Flathub, so use the elementary BaseApp instead +base: io.elementary.BaseApp +base-version: 'circe-25.08' +runtime: org.gnome.Platform +runtime-version: '49' +sdk: org.gnome.Sdk +command: io.github.ellie_commons.jorts + +finish-args: + - '--share=ipc' + - '--device=dri' + - '--socket=fallback-x11' + - '--socket=wayland' + +cleanup: + - '/include' + - '/lib/pkgconfig' + - '/man' + - '/share/gtk-doc' + - '/share/man' + - '/share/pkgconfig' + - '/share/installed-tests' + - '*.la' + - '*.a' + +modules: + # Needed for the Scribbly mode + - name: RedactedScript + buildsystem: simple + build-commands: + - install -Dm0644 RedactedScript-Regular.ttf -t ${FLATPAK_DEST}/share/fonts + - install -Dm0644 OFL.txt -t ${FLATPAK_DEST}/share/doc/redacted-font + - install -Dm0644 AUTHORS.txt -t ${FLATPAK_DEST}/share/doc/redacted-font + - install -Dm0644 README.md -t ${FLATPAK_DEST}/share/doc/redacted-font + sources: + - type: file + url: https://github.com/christiannaths/redacted-font/raw/63e542017bab347ba9be54d7d99b99d4754c3d97/RedactedScript/fonts/ttf/RedactedScript-Regular.ttf + sha256: 1ebaab9642a2f43fa33f449760469903143fd1d08b2433eb6c15e28602d9360d + - type: file + url: https://raw.githubusercontent.com/christiannaths/redacted-font/284dfb0397d1911c3388f72389f08b3c13446134/OFL.txt + sha256: ed836da2ff14b9b2d04001057e03c0531afdd2626bf66a612b17124589f58efa + - type: file + url: https://raw.githubusercontent.com/christiannaths/redacted-font/284dfb0397d1911c3388f72389f08b3c13446134/AUTHORS.txt + sha256: 84977eeb6e582a6d10bea0eda40e1c6dfdc8904309c6011932a9e2632c727043 + - type: file + url: https://raw.githubusercontent.com/christiannaths/redacted-font/284dfb0397d1911c3388f72389f08b3c13446134/README.md + sha256: e594f7f6bf03f7b11897d219184e215466cdfb9a8268b54cb7d5a626482dd722 + + - name: jorts + buildsystem: meson + config-opts: + - -Dvariant=['default'] + sources: + - type: git + url: https://github.com/ellie-commons/jorts.git + branch: legacy-rdnn + tag: 4.0.1-5 + commit: 0f616bae90c1998c2bb84f0a21390f842d7f4978 + x-checker-data: + type: git + tag-pattern: '^([\d.]+)$' \ No newline at end of file diff --git a/src/Constants.vala b/src/Constants.vala index 5f472355..2a5dc126 100644 --- a/src/Constants.vala +++ b/src/Constants.vala @@ -79,4 +79,4 @@ namespace Jorts.Constants { "face-wink-symbolic", "face-worried-symbolic" }; -} \ No newline at end of file +}