diff --git a/build-aux/io.github.alainm23.planify.Devel.flatpak b/build-aux/io.github.alainm23.planify.Devel.flatpak deleted file mode 100644 index c013a2271..000000000 Binary files a/build-aux/io.github.alainm23.planify.Devel.flatpak and /dev/null differ diff --git a/build-aux/io.github.alainm23.planify.Devel.json b/build-aux/io.github.alainm23.planify.Devel.json index c1e33b6e8..b01c7af4c 100644 --- a/build-aux/io.github.alainm23.planify.Devel.json +++ b/build-aux/io.github.alainm23.planify.Devel.json @@ -1,9 +1,10 @@ { - "app-id": "io.github.alainm23.planify", + "app-id": "io.github.alainm23.planify.Devel", "runtime": "org.gnome.Platform", "runtime-version": "45", "sdk": "org.gnome.Sdk", - "command": "io.github.alainm23.planify", + "command": "io.github.alainm23.planify.Devel", + "tags": ["devel"], "finish-args": [ "--device=dri", "--share=ipc", @@ -152,6 +153,7 @@ "name": "planify", "builddir": true, "buildsystem": "meson", + "config-opts": ["-Dtracing=true", "-Dprofile=development"], "sources": [ { "type": "dir", @@ -160,4 +162,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/core/QuickAdd.vala b/core/QuickAdd.vala index 529d98078..d43be82f6 100644 --- a/core/QuickAdd.vala +++ b/core/QuickAdd.vala @@ -54,7 +54,7 @@ public class Layouts.QuickAdd : Adw.Bin { content_entry = new Gtk.Entry () { hexpand = true, placeholder_text = _("To-do name"), - css_classes = { "flat" } + css_classes = { "flat", "font-bold" } }; var content_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6) { @@ -79,7 +79,8 @@ public class Layouts.QuickAdd : Adw.Bin { description_textview.remove_css_class ("view"); item_labels = new Widgets.ItemLabels (item) { - margin_start = 12 + margin_start = 6, + top_margin = 12 }; schedule_button = new Widgets.ScheduleButton (); @@ -90,9 +91,7 @@ public class Layouts.QuickAdd : Adw.Bin { label_button.backend_type = item.project.backend_type; var action_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 12) { - margin_start = 3, - margin_top = 6, - margin_bottom = 3 + margin_top = 6 }; var action_box_right = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0) { @@ -159,7 +158,7 @@ public class Layouts.QuickAdd : Adw.Bin { var footer_content = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6) { hexpand = true, margin_bottom = 12, - margin_start = 6, + margin_start = 12, margin_end = 12 }; diff --git a/core/Widgets/ItemLabels.vala b/core/Widgets/ItemLabels.vala index 11ff4128c..62d4ba80c 100644 --- a/core/Widgets/ItemLabels.vala +++ b/core/Widgets/ItemLabels.vala @@ -39,6 +39,12 @@ public class Widgets.ItemLabels : Adw.Bin { ); } + public int top_margin { + set { + flowbox.margin_top = value; + } + } + construct { flowbox = new Gtk.FlowBox () { column_spacing = 6, diff --git a/data/io.github.alainm23.planify.appdata.xml.in.in b/data/io.github.alainm23.planify.appdata.xml.in.in index 0b1fa1c18..a5208cd8f 100644 --- a/data/io.github.alainm23.planify.appdata.xml.in.in +++ b/data/io.github.alainm23.planify.appdata.xml.in.in @@ -63,6 +63,18 @@ https://www.patreon.com/alainm23 @appid@.desktop + + +
    +
  • Improved design and new UI icons.
  • +
  • It is now possible to mark a task as Pinned from the context menu.
  • +
  • Fixed bug that improves CalDAV sync.
  • +
  • Spanish translations added thanks to @haggen88.
  • +
  • French translation update thanks to @rene-coty.
  • +
+
+
+
    diff --git a/data/io.github.alainm23.planify.gresource.xml b/data/io.github.alainm23.planify.gresource.xml index cd310e084..decb9c0cf 100644 --- a/data/io.github.alainm23.planify.gresource.xml +++ b/data/io.github.alainm23.planify.gresource.xml @@ -9,6 +9,7 @@ resources/stylesheet/sidebar.css resources/stylesheet/typography.css + resources/stylesheet/index.css resources/ui/shortcuts.ui diff --git a/meson.build b/meson.build index f9fc9fd4e..6d2926cbb 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'io.github.alainm23.planify', 'vala', 'c', - version: '4.5.2' + version: '4.5.4' ) gnome = import('gnome') diff --git a/quick-add/MainWindow.vala b/quick-add/MainWindow.vala index 2b5d05b6a..c7bbffa39 100644 --- a/quick-add/MainWindow.vala +++ b/quick-add/MainWindow.vala @@ -14,7 +14,7 @@ public class MainWindow : Adw.ApplicationWindow { static construct { weak Gtk.IconTheme default_theme = Gtk.IconTheme.get_for_display (Gdk.Display.get_default ()); - default_theme.add_resource_path ("/io/github/alainm23/planify"); + default_theme.add_resource_path ("/io/github/alainm23/planify/"); } construct { diff --git a/src/App.vala b/src/App.vala index dccdadc77..7b7208532 100644 --- a/src/App.vala +++ b/src/App.vala @@ -32,7 +32,7 @@ public class Planify : Adw.Application { } } - private static bool run_in_background = false; + // private static bool run_in_background = false; private static bool version = false; private static bool clear_database = false; private static string lang = ""; @@ -42,7 +42,7 @@ public class Planify : Adw.Application { private const OptionEntry[] OPTIONS = { { "version", 'v', 0, OptionArg.NONE, ref version, "Display version number", null }, { "reset", 'r', 0, OptionArg.NONE, ref clear_database, "Reset Planify", null }, - { "background", 'b', 0, OptionArg.NONE, out run_in_background, "Run the Application in background", null }, + // { "background", 'b', 0, OptionArg.NONE, out run_in_background, "Run the Application in background", null }, { "lang", 'l', 0, OptionArg.STRING, ref lang, "Open Planify in a specific language", "LANG" }, { null } }; @@ -86,9 +86,7 @@ public class Planify : Adw.Application { main_window.maximize (); } - if (!run_in_background) { - main_window.show (); - } + main_window.show (); Services.Settings.get_default ().settings.bind ("window-maximized", main_window, "maximized", SettingsBindFlags.SET); diff --git a/src/Dialogs/WhatsNew.vala b/src/Dialogs/WhatsNew.vala index 1258ef3ae..d6b2300fe 100644 --- a/src/Dialogs/WhatsNew.vala +++ b/src/Dialogs/WhatsNew.vala @@ -116,13 +116,8 @@ public class Dialogs.WhatsNew : Adw.Window { }); add_feature ( - _("Nextcloud integration is available"), - _("Synchronise your task lists from Nextcloud.") - ); - - add_feature ( - _("Option to migrate from Planner"), - _("Planner is no longer available, migrate your tasks from the Backups option in the preferences..") + _("New look"), + _("The design has been improved and new icons have been added making the user interface simpler to understand and use..") ); } diff --git a/src/Layouts/ItemBoard.vala b/src/Layouts/ItemBoard.vala index 642e0ffeb..ff0a50169 100644 --- a/src/Layouts/ItemBoard.vala +++ b/src/Layouts/ItemBoard.vala @@ -410,13 +410,13 @@ public class Layouts.ItemBoard : Layouts.ItemBase { } private void open_detail () { - Services.EventBus.get_default ().open_item (item); - // if (item.parent_id == "") { - // var dialog = new Dialogs.ItemView (item); - // dialog.show (); - // } else { - // Services.EventBus.get_default ().push_item (item); - // } + // Services.EventBus.get_default ().open_item (item); + if (item.parent_id == "") { + var dialog = new Dialogs.ItemView (item); + dialog.show (); + } else { + Services.EventBus.get_default ().push_item (item); + } } public override void checked_toggled (bool active, uint? time = null) { diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 920274d33..638fb82fb 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -42,7 +42,7 @@ public class MainWindow : Adw.ApplicationWindow { static construct { weak Gtk.IconTheme default_theme = Gtk.IconTheme.get_for_display (Gdk.Display.get_default ()); - default_theme.add_resource_path ("/io/github/alainm23/planify"); + default_theme.add_resource_path ("/io/github/alainm23/planify/"); } construct {