[evolution] I#478 - Support STATUS for Events and Memos

[Milan Crha <mcrha src gnome org>]

commit b8a59745bcc532db036ab63de8c72e24cd4f7ff1
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jun 7 16:11:35 2019 +0200

    I#478 - Support STATUS for Events and Memos
    
    Closes https://gitlab.gnome.org/GNOME/evolution/issues/478

 src/calendar/gui/e-comp-editor-event.c | 11 +++++++++--
 src/calendar/gui/e-comp-editor-memo.c  | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/src/calendar/gui/e-comp-editor-event.c b/src/calendar/gui/e-comp-editor-event.c
index abb7bca702..201dd56c80 100644
--- a/src/calendar/gui/e-comp-editor-event.c
+++ b/src/calendar/gui/e-comp-editor-event.c
@@ -906,12 +906,19 @@ e_comp_editor_event_constructed (GObject *object)
        /* Transparency checkbox is not shown in the page, even it's packed there */
        gtk_widget_hide (widget);
 
-       part = e_comp_editor_property_part_categories_new (focus_tracker);
+       part = e_comp_editor_property_part_status_new ();
        e_comp_editor_page_add_property_part (page, part, 0, 7, 3, 1);
+
+       widget = e_comp_editor_property_part_get_edit_widget (part);
+       gtk_widget_set_halign (widget, GTK_ALIGN_START);
+       gtk_widget_set_hexpand (widget, FALSE);
+
+       part = e_comp_editor_property_part_categories_new (focus_tracker);
+       e_comp_editor_page_add_property_part (page, part, 0, 8, 3, 1);
        event_editor->priv->categories = part;
 
        part = e_comp_editor_property_part_description_new (focus_tracker);
-       e_comp_editor_page_add_property_part (page, part, 0, 8, 3, 1);
+       e_comp_editor_page_add_property_part (page, part, 0, 9, 3, 1);
        event_editor->priv->description = part;
 
        widget = e_comp_editor_property_part_get_edit_widget (event_editor->priv->timezone);
diff --git a/src/calendar/gui/e-comp-editor-memo.c b/src/calendar/gui/e-comp-editor-memo.c
index a025c44e44..c72e27a905 100644
--- a/src/calendar/gui/e-comp-editor-memo.c
+++ b/src/calendar/gui/e-comp-editor-memo.c
@@ -211,12 +211,19 @@ e_comp_editor_memo_constructed (GObject *object)
        gtk_widget_set_halign (edit_widget, GTK_ALIGN_START);
        gtk_widget_set_hexpand (edit_widget, FALSE);
 
-       part = e_comp_editor_property_part_categories_new (focus_tracker);
+       part = e_comp_editor_property_part_status_new ();
        e_comp_editor_page_add_property_part (page, part, 0, 5, 2, 1);
+
+       edit_widget = e_comp_editor_property_part_get_edit_widget (part);
+       gtk_widget_set_halign (edit_widget, GTK_ALIGN_START);
+       gtk_widget_set_hexpand (edit_widget, FALSE);
+
+       part = e_comp_editor_property_part_categories_new (focus_tracker);
+       e_comp_editor_page_add_property_part (page, part, 0, 6, 2, 1);
        memo_editor->priv->categories = part;
 
        part = e_comp_editor_property_part_description_new (focus_tracker);
-       e_comp_editor_page_add_property_part (page, part, 0, 6, 2, 1);
+       e_comp_editor_page_add_property_part (page, part, 0, 7, 2, 1);
        memo_editor->priv->description = part;
 
        e_comp_editor_add_page (comp_editor, C_("ECompEditorPage", "General"), page);