Merge branch 'master' into danirabbit/sourcedialog

Author: danirabbit

po/POTFILES

@@ -49,6 +49,5 @@ src/Widgets/DateTimePicker.vala
 src/Widgets/DynamicSpinner.vala
 src/Widgets/DeleteDialog.vala
 src/Widgets/EventMenu.vala
-src/Widgets/HeaderBar.vala
 src/Widgets/SourcePopover.vala
 src/Widgets/SourceRow.vala

src/Grid/CalendarView.vala

@@ -29,7 +29,11 @@ public class Maya.View.CalendarView : Gtk.Box {
     public signal void on_event_add (DateTime date);
     public signal void selection_changed (DateTime new_date);
 
-    public Hdy.HeaderBar header_bar { get; construct; }
+    public Gtk.SearchEntry search_bar;
+    private Calendar.Widgets.DateSwitcher month_switcher;
+    private Calendar.Widgets.DateSwitcher year_switcher;
+
+    public Hdy.HeaderBar header_bar { get; private set; }
     public DateTime? selected_date { get; private set; }
 
     private WeekLabels weeks { get; private set; }
@@ -67,7 +71,49 @@ public class Maya.View.CalendarView : Gtk.Box {
 
         var info_bar = new Calendar.Widgets.ConnectivityInfoBar ();
 
-        header_bar = new Calendar.Widgets.HeaderBar ();
+        var application_instance = ((Gtk.Application) GLib.Application.get_default ());
+
+        var button_today = new Gtk.Button.from_icon_name ("calendar-go-today", Gtk.IconSize.LARGE_TOOLBAR) {
+            action_name = Maya.MainWindow.ACTION_PREFIX + Maya.MainWindow.ACTION_SHOW_TODAY
+        };
+        button_today.tooltip_markup = Granite.markup_accel_tooltip (
+            application_instance.get_accels_for_action (button_today.action_name),
+            _("Go to today's date")
+        );
+
+        month_switcher = new Calendar.Widgets.DateSwitcher (10) {
+            valign = CENTER
+        };
+        year_switcher = new Calendar.Widgets.DateSwitcher (-1) {
+            valign = CENTER
+        };
+
+        var calmodel = Calendar.EventStore.get_default ();
+        set_switcher_date (calmodel.month_start);
+
+        var spinner = new Maya.View.Widgets.DynamicSpinner ();
+
+        var contractor = new Maya.View.Widgets.ContractorButtonWithMenu (_("Export or Share the default Calendar"));
+
+        var source_popover = new Calendar.Widgets.SourcePopover ();
+
+        var menu_button = new Gtk.MenuButton () {
+            image = new Gtk.Image.from_icon_name ("open-menu", Gtk.IconSize.LARGE_TOOLBAR),
+            popover = source_popover,
+            tooltip_text = _("Manage Calendars")
+        };
+
+        header_bar = new Hdy.HeaderBar () {
+            show_close_button = true
+        };
+        header_bar.pack_start (month_switcher);
+        header_bar.pack_start (year_switcher);
+        header_bar.pack_start (button_today);
+        header_bar.pack_end (menu_button);
+        header_bar.pack_end (contractor);
+        header_bar.pack_end (spinner);
+
+        header_bar.get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);
 
         stack = new Gtk.Stack ();
         stack.expand = true;
@@ -115,6 +161,19 @@ public class Maya.View.CalendarView : Gtk.Box {
                 return false;
             });
         });
+
+        month_switcher.left_clicked.connect (() => Calendar.EventStore.get_default ().change_month (-1));
+        month_switcher.right_clicked.connect (() => Calendar.EventStore.get_default ().change_month (1));
+        year_switcher.left_clicked.connect (() => Calendar.EventStore.get_default ().change_year (-1));
+        year_switcher.right_clicked.connect (() => Calendar.EventStore.get_default ().change_year (1));
+        calmodel.parameters_changed.connect (() => {
+            set_switcher_date (calmodel.month_start);
+        });
+    }
+
+    private void set_switcher_date (DateTime date) {
+        month_switcher.text = date.format ("%OB");
+        year_switcher.text = date.format ("%Y");
     }
 
     public override bool scroll_event (Gdk.EventScroll event) {

src/Widgets/CalendarChooser.vala

@@ -17,7 +17,7 @@
  * Authored by: Corentin Noël <corentin@elementaryos.org>
  */
 
-public class Maya.View.Widgets.CalendarChooser : Gtk.Grid {
+public class Maya.View.Widgets.CalendarChooser : Gtk.Box {
 
     /** A searchable list of calendars for the user to choose from.
     *
@@ -45,10 +45,13 @@ public class Maya.View.Widgets.CalendarChooser : Gtk.Grid {
 
         current_source = registry.default_calendar;
 
-        search_entry = new Gtk.SearchEntry ();
-        search_entry.margin = 12;
-        search_entry.margin_bottom = 6;
-        search_entry.placeholder_text = _("Search Calendars");
+        search_entry = new Gtk.SearchEntry () {
+            margin_top = 12,
+            margin_end = 12,
+            margin_bottom = 6,
+            margin_start = 12,
+            placeholder_text = _("Search Calendars")
+        };
 
         var placeholder = new Granite.Widgets.AlertView (
             _("No Results"),
@@ -57,19 +60,22 @@ public class Maya.View.Widgets.CalendarChooser : Gtk.Grid {
         );
         placeholder.show_all ();
 
-        var list_box = new Gtk.ListBox ();
-        list_box.activate_on_single_click = true;
+        var list_box = new Gtk.ListBox () {
+            activate_on_single_click = true
+        };
         list_box.set_placeholder (placeholder);
 
-        var scrolled = new Gtk.ScrolledWindow (null, null);
-        scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER;
-        scrolled.add (list_box);
-        scrolled.max_content_height = 300;
-        scrolled.propagate_natural_height = true;
+        var scrolled = new Gtk.ScrolledWindow (null, null) {
+            child = list_box,
+            hscrollbar_policy = NEVER,
+            max_content_height = 300,
+            propagate_natural_height = true
+        };
 
         margin_bottom = 6;
-        attach (search_entry, 0, 0);
-        attach (scrolled, 0, 1);
+        orientation = VERTICAL;
+        add (search_entry);
+        add (scrolled);
         show_all ();
 
         list_box.set_filter_func (filter_function);
@@ -125,12 +131,16 @@ public class Maya.View.Widgets.CalendarChooser : Gtk.Grid {
 
         // Populate list_box
         foreach (var source in sources) {
-            var calrow = new CalendarRow (source);
-            calrow.margin = 6;
-            calrow.margin_start = 12;
-
-            var row = new Gtk.ListBoxRow ();
-            row.add (calrow);
+            var calrow = new CalendarRow (source) {
+                margin_top = 6,
+                margin_end = 6,
+                margin_bottom = 6,
+                margin_start = 12
+            };
+
+            var row = new Gtk.ListBoxRow () {
+                child = calrow
+            };
             row.show_all ();
 
             list_box.add (row);
@@ -163,9 +173,11 @@ public class Maya.View.Widgets.CalendarChooser : Gtk.Grid {
             }
         }
 
-        var header = new Granite.HeaderLabel (row_location);
-        header.margin = 6;
-        header.margin_bottom = 0;
+        var header = new Granite.HeaderLabel (row_location) {
+            margin_top = 6,
+            margin_end = 6,
+            margin_start = 6
+        };
 
         row.set_header (header);
 

src/Widgets/HeaderBar.vala

@@ -35,7 +35,6 @@ calendar_files = files(
     'Widgets/DeleteDialog.vala',
     'Widgets/DynamicSpinner.vala',
     'Widgets/EventMenu.vala',
-    'Widgets/HeaderBar.vala',
     'Widgets/SourcePopover.vala',
     'Widgets/SourceRow.vala',
     'Widgets/ConnectivityInfoBar.vala'