Merge branch 'master' into master

rene-coty · Dec 19, 2023 · 91d7c2e · 91d7c2e
2 parents cb38b13 + 6458fd0
commit 91d7c2e
Show file tree

Hide file tree

Showing 16 changed files with 1,677 additions and 742 deletions.
diff --git a/core/Constants.vala b/core/Constants.vala
@@ -12,4 +12,7 @@ namespace Constants {
     public const int PRIORITY_2 = 3;
     public const int PRIORITY_3 = 2;
     public const int PRIORITY_4 = 1;
+    public const string TWITTER_URL = "https://twitter.com/useplanify";
+    public const string CONTACT_US = "[email protected]";
+    public const string TELEGRAM_GROUP = "https://t.me/+cArNTCbdT3xmOTcx";
 }
diff --git a/core/Util.vala b/core/Util.vala
@@ -729,7 +729,7 @@ public class Util : GLib.Object {
                 _dynamic_icons.set ("planner-bell", true);
                 _dynamic_icons.set ("sidebar-left", true);
                 _dynamic_icons.set ("sidebar-right", true);
-                _dynamic_icons.set ("planner-mail", true);
+                _dynamic_icons.set ("mail", true);
                 _dynamic_icons.set ("planner-note", true);
                 _dynamic_icons.set ("planner-settings-sliders", true);
                 _dynamic_icons.set ("planner-list", true);

diff --git a/data/io.github.alainm23.planify.gresource.xml b/data/io.github.alainm23.planify.gresource.xml
@@ -47,6 +47,7 @@
     <file alias="light-bulb.svg">resources/icons/settings/light-bulb.svg</file>
     <file alias="archive-plus.svg">resources/icons/settings/archive-plus.svg</file>
     <file alias="sidebar.svg">resources/icons/settings/sidebar.svg</file>
+    <file alias="telegram.svg">resources/icons/settings/telegram.svg</file>
 
     <file alias="planner-calendar-light.svg">resources/icons/planner-calendar-light.svg</file>
     <file alias="planner-calendar-dark.svg">resources/icons/planner-calendar-dark.svg</file>
@@ -80,8 +81,8 @@
     <file alias="sidebar-left-light.svg">resources/icons/sidebar-left-light.svg</file>
     <file alias="sidebar-right-dark.svg">resources/icons/sidebar-right-dark.svg</file>
     <file alias="sidebar-right-light.svg">resources/icons/sidebar-right-light.svg</file>
-    <file alias="planner-mail-light.svg">resources/icons/planner-mail-light.svg</file>
-    <file alias="planner-mail-dark.svg">resources/icons/planner-mail-dark.svg</file>
+    <file alias="mail-light.svg">resources/icons/mail-light.svg</file>
+    <file alias="mail-dark.svg">resources/icons/mail-dark.svg</file>
     <file alias="planner-note-light.svg">resources/icons/planner-note-light.svg</file>
     <file alias="planner-note-dark.svg">resources/icons/planner-note-dark.svg</file>
     <file alias="planner-settings-sliders-dark.svg">resources/icons/planner-settings-sliders-dark.svg</file>

diff --git a/data/resources/icons/planner-mail-dark.svg → data/resources/icons/mail-dark.svg b/data/resources/icons/planner-mail-dark.svg → data/resources/icons/mail-dark.svg
diff --git a/data/resources/icons/planner-mail-light.svg → data/resources/icons/mail-light.svg b/data/resources/icons/planner-mail-light.svg → data/resources/icons/mail-light.svg
diff --git a/data/resources/icons/settings/telegram.svg b/data/resources/icons/settings/telegram.svg
diff --git a/po/POTFILES b/po/POTFILES
@@ -148,4 +148,6 @@ src/Dialogs/Preferences/Pages/Sidebar.vala
 
 quick-add/App.vala
 quick-add/MainWindow.vala
-quick-add/Services/DBusClient.vala
+quick-add/Services/DBusClient.vala
+
+data/resources/ui/shortcuts.ui