intermediate commit to work away from home

ellie-commons · Feb 4, 2025 · 9ad41fc · 9ad41fc
1 parent 0590114
commit 9ad41fc
Show file tree

Hide file tree

Showing 42 changed files with 5,815 additions and 1,342 deletions.
diff --git a/data/Application.css b/data/Application.css
@@ -18,14 +18,18 @@
 * Boston, MA 02110-1301 USA
 */
 
-/*
-There is only the generate_css() command, but it is a beefy one
-At startup it is used several times to generate each theme.
-Then notes are themed by removing CSS theme classes and then slapping a new one
-*/
-
 @define-color textColorPrimary #323232;
 
+
+/* The variant exists in granite, but not built */
+@define-color LATTE_100 #efdfc4;
+@define-color LATTE_300 #e7c591;
+@define-color LATTE_500 #cfa25e;
+@define-color LATTE_700 #b6802e;
+@define-color LATTE_900 #804b00;
+
+
+
 window {
     transition: background-color 800ms cubic-bezier(0.4, 0, 0.2, 1);
 }
@@ -152,11 +156,17 @@ entry.flat {
 .color-button.grape {background-color: @GRAPE_300;}
 .color-button.grape:hover {border: 1px solid @GRAPE_900;}
 
+.color-button.latte {background-color: @LATTE_300;}
+.color-button.latte:hover {border: 1px solid @LATTE_900;}
+
 .color-button.cocoa {background-color: @COCOA_300;}
-.color-button.cocoa {border: 1px solid @COCOA_900;}
+.color-button.cocoa:hover {border: 1px solid @COCOA_900;}
 
 .color-button.slate {background-color: @SLATE_300;}
 .color-button.slate:hover {border: 1px solid @SLATE_900;}
 
 .color-button.silver {background-color: @SILVER_300;}
 .color-button.silver:hover {border: 1px solid @SILVER_900;}
+
+.color-button.auto {background-color: @accent_color_300;}
+.color-button.auto:hover {border: 1px solid @accent_color_900;}
diff --git a/data/io.github.ellie_commons.jorts.desktop.in b/data/io.github.ellie_commons.jorts.desktop.in
@@ -12,4 +12,7 @@ Actions=NewNote;
 
 [Desktop Action NewNote]
 Exec=io.github.ellie_commons.jorts --new-note
-Name=New note…
+Name=New sticky note
+
+
+
diff --git a/data/io.github.ellie_commons.jorts.metainfo.xml.in b/data/io.github.ellie_commons.jorts.metainfo.xml.in
@@ -8,9 +8,9 @@
     <description>
         <p>A colourful little sticky notes utility, for your thoughts</p>
         <ul>
-            <li>🎨 Ten good looking themes with soft transitions</li>
-            <li>💻 Striving to keep it cute, pretty, simple, modern, light</li>
-            <li>⌨️ Supports Undo, Redo (Ctrl+Z, Ctrl+Shift+Z)</li>
+            <li>Ten good looking themes with soft transitions</li>
+            <li>Striving to keep it cute, pretty, simple, modern, light</li>
+            <li>Supports Undo, Redo (Ctrl+Z, Ctrl+Shift+Z)</li>
         </ul>
     </description>
     <provides>
@@ -33,18 +33,20 @@
       <control>touch</control>
     </recommends>
     <releases>
-        <release version="2.0.0" date="2025-01-01">
+        <release version="2.0.0" date="2025-02-01">
             <description>
                 <p>Release: Slate And Bubblegum</p>
                 <ul>
                     <li>Old Notejot version and UI revived in a new project</li>
-                    <li>The app is now named Jorts. It is not a jean, it is not a short</li>
+                    <li>The app is now named Jorts. You however cannot wear it</li>
                     <li>It builds for flatpak now</li>
                     <li>Closer to current elementary OS Stylesheet and named colours</li>
-                    <li>Removal of pinned due to the way wayland works</li>
+                    <li>Also more colors, including Latte and Hatsune Miku</li>
+                    <li>Better adapted to the way Wayland works</li>
                     <li>Smooth transition when changing theme</li>
                     <li>New stickies have random colour</li>
                     <li>New stickies have a random fun little title</li>
+                    <li>Some initial translations :3</li>
                 </ul>
             </description>
         </release>
@@ -284,7 +286,7 @@
         </release>
         <release version="1.2.3" date="2017-10-01">
             <description>
-                <p>Release: Olá, Brasil!</p>
+                <p>Release: Ola, Brasil!</p>
                 <ul>
                     <li>Brazilian Portuguese translation</li>
                 </ul>

diff --git a/data/meson.build b/data/meson.build
@@ -19,19 +19,3 @@ install_data(
     install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
 )
 
-i18n.merge_file(
-    input: meson.project_name() + '.desktop.in',
-    output: meson.project_name() + '.desktop',
-    po_dir: join_paths(meson.source_root(), 'po', 'extra'),
-    type: 'desktop',
-    install: true,
-    install_dir: join_paths(get_option('datadir'), 'applications')
-)
-
-i18n.merge_file(
-    input: meson.project_name() + '.metainfo.xml.in',
-    output: meson.project_name() + '.metainfo.xml',
-    po_dir: join_paths(meson.source_root(), 'po', 'extra'),
-    install: true,
-    install_dir: join_paths(get_option('datadir'), 'metainfo')
-)
diff --git a/meson.build b/meson.build
@@ -22,6 +22,11 @@ i18n = import('i18n')
 # Set our translation domain
 add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format (meson.project_name()), language:'c')
 
+
+
+
+
+
 # Set this for convenience
 conf = configuration_data()
 
@@ -83,6 +88,9 @@ executable(
 
 
 #================================
+# Add in a post install script
+meson.add_install_script(meson.source_root() + '/meson/post_install.py')
+
 #Translate and install our .desktop file
 i18n.merge_file(
     input: 'data' / 'io.github.ellie_commons.jorts.desktop.in',
@@ -93,19 +101,17 @@ i18n.merge_file(
     install_dir: get_option('datadir') / 'applications'
 )
 
-#Translate and install our .metainfo file
+#Translate and install our .appdata file
 i18n.merge_file(
     input: 'data' / 'io.github.ellie_commons.jorts.metainfo.xml.in',
     output: meson.project_name() + '.metainfo.xml',
     po_dir: meson.project_source_root() / 'po',
     install: true,
-    install_dir: get_option('datadir') / 'sppfsts'
+    install_dir: get_option('datadir') / 'metainfo'
 )
 
 
-#================================
-# Add in a post install script
-meson.add_install_script(meson.source_root() + '/meson/post_install.py')
+
 
 # Add subfolders for Meson to look
 subdir('data')

diff --git a/po/Jorts translation sheet.xlsx b/po/Jorts translation sheet.xlsx
diff --git a/po/LINGUAS b/po/LINGUAS
@@ -1,5 +0,0 @@
-pt
-es
-fr
-de
-it

diff --git a/po/LINGUAS-no b/po/LINGUAS-no
@@ -0,0 +1,8 @@
+cs
+de
+es
+fr
+it
+pt_br
+pt_pt
+sk
diff --git a/po/POTFILES b/po/POTFILES
@@ -1,7 +1,4 @@
-src/Application.vala
 src/MainWindow.vala
-src/Services/NoteManager.vala
-src/Services/Storage.vala
-src/Widgets/ColorButton.vala
-src/Widgets/EditableLabel.vala
 src/Services/Utils.vala
+data/io.github.ellie_commons.jorts.desktop.in
+data/io.github.ellie_commons.jorts.metainfo.xml.in
-Original file line number
+Diff line change
@@ -1,5 +0,0 @@
-    pt
-    es
-    fr
-    de
-    it