Flag task

src/application.rs

@@ -7,6 +7,8 @@ use agenda::Msg::Edit as AgendaEdit;
 use done::Msg::Complete as DoneComplete;
 use done::Msg::Edit as DoneEdit;
 use edit::Msg::{Cancel, Done};
+use flag::Msg::Complete as FlagComplete;
+use flag::Msg::Edit as FlagEdit;
 use inbox::Msg::Complete as InboxComplete;
 use inbox::Msg::Edit as InboxEdit;
 use search::Msg::Complete as SearchComplete;
@@ -22,6 +24,7 @@ enum Page {
     Projects,
     Contexts,
     Agenda,
+    Flag,
     Done,
     Search,
 }
@@ -35,8 +38,9 @@ impl ::std::convert::From<u32> for Page
             1 => Page::Projects,
             2 => Page::Contexts,
             3 => Page::Agenda,
-            4 => Page::Done,
-            5 => Page::Search,
+            4 => Page::Flag,
+            5 => Page::Done,
+            6 => Page::Search,
             _ => panic!("Invalid page {}", n),
         }
     }
@@ -173,6 +177,7 @@ impl Widget
             Page::Projects => "projects",
             Page::Contexts => "contexts",
             Page::Agenda => "agenda",
+            Page::Flag => "flag",
             Page::Done => "done",
             Page::Search => "search",
         };
@@ -323,6 +328,7 @@ impl Widget
         self.contexts.emit(::widgets::tags::Msg::Update(list.clone(), defered, done));
         self.agenda.emit(::agenda::Msg::Update(list.clone(), defered, done));
         self.done.emit(::done::Msg::Update(list.clone(), defered, done));
+        self.flag.emit(::flag::Msg::Update(list.clone(), defered, done));
         self.search.emit(::search::Msg::Update(list.clone(), defered, done));
 
         self.model.list = list;
@@ -452,6 +458,11 @@ impl ::relm::Widget for Widget
                             AgendaComplete(ref task) => Msg::Complete(task.clone()),
                             AgendaEdit(ref task) => Msg::Edit(task.clone()),
                         },
+                        #[name="flag"]
+                        ::flag::Widget {
+                            FlagComplete(ref task) => Msg::Complete(task.clone()),
+                            FlagEdit(ref task) => Msg::Edit(task.clone()),
+                        },
                         #[name="done"]
                         ::done::Widget {
                             DoneComplete(ref task) => Msg::Complete(task.clone()),

src/edit.rs

@@ -9,6 +9,7 @@ use widgets::repeat::Msg::Updated as RepeatUpdated;
 pub enum Msg {
     Cancel,
     EditKeyword(::std::collections::BTreeMap<String, String>),
+    Flag,
     Done(::tasks::Task),
     Ok,
     Set(::tasks::Task),
@@ -37,6 +38,7 @@ impl Widget
 
         self.subject.set_text(task.subject.as_str());
         self.priority.set_value(f64::from(task.priority));
+        self.flag.set_active(task.flagged);
         self.due.emit(::widgets::calendar::Msg::Set(task.due_date));
         self.threshold.emit(::widgets::calendar::Msg::Set(task.threshold_date));
         if task.create_date.is_some() {
@@ -101,6 +103,11 @@ impl Widget
         self.model.task.tags = keywords.clone();
     }
 
+    fn flag(&mut self)
+    {
+        self.model.task.flagged = self.flag.get_active();
+    }
+
     fn update_date(&mut self, date_type: &DateType, date: &Option<::chrono::NaiveDate>)
     {
         use self::DateType::*;
@@ -152,6 +159,7 @@ impl ::relm::Widget for Widget
             Cancel => (),
             Done(_) => (),
             EditKeyword(ref keywords) => self.edit_keywords(keywords),
+            Flag => self.flag(),
             Ok => self.model.relm.stream().emit(Msg::Done(self.get_task())),
             Set(task) => self.set_task(&task),
             UpdateDate(ref date_type, ref date) => self.update_date(date_type, &date),
@@ -175,9 +183,22 @@ impl ::relm::Widget for Widget
                 },
                 gtk::Frame {
                     label: "Priority",
-                    #[name="priority"]
-                    gtk::SpinButton {
-                        focus_out_event(_, _) => (Msg::UpdatePriority, ::gtk::Inhibit(false)),
+                    gtk::Box {
+                        orientation: ::gtk::Orientation::Horizontal,
+                        homogeneous: true,
+                        #[name="priority"]
+                        gtk::SpinButton {
+                            focus_out_event(_, _) => (Msg::UpdatePriority, ::gtk::Inhibit(false)),
+                        },
+                        #[name="flag"]
+                        gtk::ToggleButton {
+                            packing: {
+                                fill: false,
+                            },
+                            image: &::gtk::Image::new_from_icon_name("emblem-favorite", ::gtk::IconSize::SmallToolbar.into()),
+                            tooltip_text: "Flag",
+                            toggled => Msg::Flag,
+                        },
                     },
                 },
                 gtk::Frame {

src/flag.rs

@@ -0,0 +1,58 @@
+use relm_attributes::widget;
+use widgets::tasks::Msg::{Complete, Edit};
+
+#[derive(Msg)]
+pub enum Msg {
+    Complete(::tasks::Task),
+    Edit(::tasks::Task),
+    Update(::tasks::List, bool, bool),
+}
+
+impl Widget
+{
+    fn update_tasks(&mut self, list: &::tasks::List, defered: bool, done: bool)
+    {
+        let today = ::chrono::Local::now()
+            .date()
+            .naive_local();
+
+        let tasks = list.tasks.iter()
+            .filter(|x| {
+                x.flagged
+                    && (done || !x.finished)
+                    && (defered || x.threshold_date.is_none() || x.threshold_date.unwrap() <= today)
+            })
+            .cloned()
+            .collect();
+
+        self.tasks.emit(::widgets::tasks::Msg::Update(tasks));
+    }
+}
+
+#[widget]
+impl ::relm::Widget for Widget
+{
+    fn model(_: ()) -> ()
+    {
+    }
+
+    fn update(&mut self, event: Msg)
+    {
+        use self::Msg::*;
+
+        match event {
+            Complete(_) => (),
+            Edit(_) => (),
+            Update(list, defered, done) => self.update_tasks(&list, defered, done),
+        }
+    }
+
+    view!
+    {
+        #[name="tasks"]
+        ::widgets::Tasks {
+            Complete(ref task) => Msg::Complete(task.clone()),
+            Edit(ref task) => Msg::Edit(task.clone()),
+        }
+    }
+}

src/main.rs

@@ -28,6 +28,7 @@ mod agenda;
 mod application;
 mod done;
 mod edit;
+mod flag;
 mod inbox;
 mod logger;
 mod search;

src/tasks/task.rs

@@ -4,6 +4,7 @@ pub struct Task {
     pub id: usize,
     pub note: super::Note,
     pub recurrence: Option<super::Recurrence>,
+    pub flagged: bool,
 }
 
 impl Task
@@ -15,6 +16,7 @@ impl Task
             id: 0,
             note: super::Note::None,
             recurrence: None,
+            flagged: false,
         }
     }
 
@@ -88,11 +90,15 @@ impl ::std::str::FromStr for Task
         }
         task.tags.remove(&"rec".to_owned());
 
+        let flagged = task.tags.contains_key(&"f".to_owned());
+        task.tags.remove(&"f".to_owned());
+
         Ok(Self {
             id: 0,
-            note: note,
+            note,
             inner: task,
-            recurrence: recurrence,
+            recurrence,
+            flagged,
         })
     }
 }
@@ -131,6 +137,10 @@ impl ::std::fmt::Display for Task
             f.write_str(format!(" rec:{}", recurrence).as_str())?;
         }
 
+        if self.flagged {
+            f.write_str(" f:1")?;
+        }
+
         Ok(())
     }
 }

src/widgets/circle.rs

@@ -42,6 +42,19 @@ impl Circle
 
         context.stroke();
 
+        if !task.finished && task.flagged {
+            let angle = if task.due_date.is_some() {
+                ::std::f64::consts::PI
+            }
+            else {
+                0.
+            };
+
+            context.set_source_rgb(1., 0.5, 0.3);
+            context.arc(center, center, center - 5., angle, 2. * ::std::f64::consts::PI);
+            context.stroke();
+        }
+
         if task.recurrence.is_some() {
             context.set_line_width(2.);