fix #1409

alainm23 · Aug 28, 2024 · 82800ed · 82800ed
1 parent 76f0099
commit 82800ed
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 20 deletions.
diff --git a/core/Objects/Label.vala b/core/Objects/Label.vala
@@ -201,7 +201,7 @@ public class Objects.Label : Objects.BaseObject {
  return generator.to_data (null);
  }
 
- public void delete_label (Gtk.Window window) {
+ public async void delete_label (Gtk.Window window) {
  var dialog = new Adw.AlertDialog (
  _("Delete Label %s".printf (name)),
  _("This can not be undone")
@@ -220,6 +220,18 @@ public class Objects.Label : Objects.BaseObject {
  Services.Todoist.get_default ().delete.end (res);
  Services.Store.instance ().delete_label (this);
  });
+ } else if (source_type == SourceType.CALDAV) {
+ loading = true;
+ foreach (Objects.Item item in Services.Store.instance ().get_items_by_label (this, false)) {
+ item.delete_item_label (id);
+ Services.CalDAV.Core.get_default ().add_task.begin (item, true, (obj, res) => {
+ if (Services.CalDAV.Core.get_default ().add_task.end (res).status) {
+ Services.Store.instance ().update_item (item);
+ }
+ });
+ }
+
+ Services.Store.instance ().delete_label (this);
  } else {
  Services.Store.instance ().delete_label (this);
  }

diff --git a/core/Services/CalDAV/Core.vala b/core/Services/CalDAV/Core.vala
@@ -288,6 +288,11 @@ public class Services.CalDAV.Core : GLib.Object {
  }
 
  public async void sync_tasklist (Objects.Project project) {
+ if (project.is_deck) {
+ return;
+ }
+
+ project.loading = true;
  yield update_tasklist_detail (project);
 
  var url = "%s/calendars/%s/%s".printf (project.source.caldav_data.server_url, project.source.caldav_data.username, project.id);
@@ -367,6 +372,8 @@ public class Services.CalDAV.Core : GLib.Object {
  } catch (Error e) {
  debug (e.message);
  }
+
+ project.loading = false;
  }
 
  private async string? get_vtodo_by_url (Objects.Project project, string task_ics) {

diff --git a/data/resources/stylesheet/stylesheet.css b/data/resources/stylesheet/stylesheet.css
@@ -555,6 +555,10 @@ checkbutton.theme-selector radio:checked {
  border-radius: 1px;
 }
 
+.icon-color {
+ color: @colorAccent;
+}
+
 .drop-area {
  background-color: alpha(#1e63ec, 0.25);
  border-radius: 6px;

diff --git a/src/Layouts/LabelRow.vala b/src/Layouts/LabelRow.vala
@@ -26,7 +26,7 @@ public class Layouts.LabelRow : Gtk.ListBoxRow {
  private Gtk.Label count_label;
  private Gtk.Revealer count_revealer;
  private Gtk.Revealer main_revealer;
- private Gtk.Grid widget_color;
+ private Gtk.Image widget_color;
  private Gtk.Box handle_grid;
 
  public LabelRow (Objects.Label label) {
@@ -36,13 +36,11 @@ public class Layouts.LabelRow : Gtk.ListBoxRow {
  }
 
  construct {
- css_classes = { "selectable-item", "transition" };
-
- widget_color = new Gtk.Grid () {
+ css_classes = { "row", "transition", "no-padding" };
+
+ widget_color = new Gtk.Image.from_icon_name ("tag-outline-symbolic") {
+ css_classes = { "icon-color" },
  valign = Gtk.Align.CENTER,
- height_request = 19,
- width_request = 19,
- css_classes = { "circle-color" }
  };
 
  name_label = new Gtk.Label (label.name) {
@@ -122,6 +120,10 @@ public class Layouts.LabelRow : Gtk.ListBoxRow {
  label.loading_change.connect (() => {
  loading_button.is_loading = label.loading;
  });
+
+ loading_button.clicked.connect (() => {
+ Services.EventBus.get_default ().pane_selected (PaneType.LABEL, label.id);
+ });
  }
 
  public void update_request () {

diff --git a/src/Layouts/ProjectRow.vala b/src/Layouts/ProjectRow.vala
@@ -685,7 +685,7 @@ public class Layouts.ProjectRow : Gtk.ListBoxRow {
  menu_box.append (duplicate_item);
  menu_box.append (new Widgets.ContextMenu.MenuSeparator ());
 
- if (project.source_type == SourceType.CALDAV) {
+ if (project.source_type == SourceType.CALDAV && !project.is_deck) {
  menu_box.append (refresh_item);
  menu_box.append (new Widgets.ContextMenu.MenuSeparator ());
  }
@@ -728,12 +728,7 @@ public class Layouts.ProjectRow : Gtk.ListBoxRow {
 
  refresh_item.clicked.connect (() => {
  menu_popover.popdown ();
-
- if (project.sync_id == "") {
- is_loading = true;
- } else {
- sync_project ();
- }
+ sync_project ();
  });
 
  delete_item.clicked.connect (() => {
@@ -763,11 +758,7 @@ public class Layouts.ProjectRow : Gtk.ListBoxRow {
  }
 
  private void sync_project () {
- is_loading = true;
- Services.CalDAV.Core.get_default ().sync_tasklist.begin (project, (obj, res) => {
- Services.CalDAV.Core.get_default ().sync_tasklist.end (res);
- is_loading = false;
- });
+ Services.CalDAV.Core.get_default ().sync_tasklist.begin (project);
  }
 
  private void update_listbox_revealer () {