Merge lp:~tintou/maya/3.10 into lp:~elementary-apps/maya/trunk

[Corentin Noël]

Now using Gtk HeaderBar, Popovers and multilib

Now uses Gtk HeaderBar
Fixed some icons to make more sense (for example add events and no calendar when it should)
Fixed CMake to take advantage of GNUInstallDirs

[Cody Garver (codygarver)]

I can only go backwards in years using the arrows in the headerbar.

Codestyle diff lines 406 and 419: needs a space

review: Needs Fixing

[Cody Garver (codygarver)]

Need a space on diff line 28 too. It could/should also instead become:

install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/${CMAKE_PROJECT_NAME}-calendar.desktop DESTINATION "${DATADIR}/applications")

review: Needs Fixing

[Danielle Foré (danrabbit)]

I can confirm Cody's bug with the year selector.

I'm also not sure I agree with using the new event icon for managing calendars since you can do more than just adding more calendars from this view.

Additionally the whole headerbar is hidden with the "fullscreen" button in the gear menu.

review: Needs Fixing

[Cody Garver (codygarver)]

The reason it can only go backwards is because

year_switcher.right_clicked.connect (() => {change_year (-1);});

should really be

year_switcher.right_clicked.connect (() => {change_year (1);});

[lp:~tintou/maya/3.10]

498. By Corentin Noël on 2013-12-21

Fixed the year switcher and the calendar icon

[Danielle Foré (danrabbit)]

I can confirm the year switcher and calendar icon are now okay.

I think we should comment out the "fullscreen" menu item until we have a discoverable method for un-fullscreen. It seems like such a rarely used feature to be blocking this branch from being merged

[lp:~tintou/maya/3.10]

499. By Corentin Noël on 2013-12-23

New Source seletion popover

[Danielle Foré (danrabbit)]

I'm getting this error a lot:

Failed to set text from markup due to error parsing markup: Error on line 1: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity - escape ampersand as &

[Danielle Foré (danrabbit)]

With the popover:

1. It seems the submenus must be the same width as the main menu in order to avoid a rendering error with the arrow
2. The "Add New Calendar" button should probably be full width to make it behave more like a menu item. And we may want to experiment with giving it the css class of ".menuitem"
3. The icons for edit and delete should be only 16px because right now they're being stretched out.
4. When deleting an item, the popover doesn't shrink vertically after the undo message is dismissed.
5. The Add New Calendar item only allows me to add a local calendar, not a google or caldav. The combobox for "type" seems to be missing.
6. If possible, I would like the separator item to be the full width of the popover like how separators are in menus

review: Needs Fixing

[Corentin Noël (tintou)]

1. I think It should not be fixed in Maya but in Granite
2. You're right, with that class, the button is also more discoverable
3. I can only set their size according to the Gtk.IconSize parameter (http://valadoc.org/#!api=gtk+-3.0/Gtk.IconSize) currently it's Gtk.IconSize.SMALL_TOOLBAR
4. You're right, I've added some changes to really remove the grid from the container.
5. This is also a bug with the Granite popover and Gtk3.10, combobox doesn't show (and triggers crash). bu it is still possible to scroll inside to see the other views.
6. By default, Granite's popover has 5 extra pixels of margin to the border, I think it shouldn't have them, they have to be set in the application side.

[Danielle Foré (danrabbit)]

1. I agree it should be fixed in granite, but I don't think it would hurt to make the other pages wider just to workaround the issue for now
3. Can we use Gtk.IconSize.MENU ?
5. Hrm, I think we'll have to still workaround this until the bug is fixed. Can we show instead the selection with buttons as another page? Like 3 buttons in a vertical list "Google" "CalDAV" "On This Device" ?
6. So is this something we can override in the app then or is this a granite bug?

[lp:~tintou/maya/3.10]

500. By Corentin Noël on 2014-01-18

Fixed the popover

501. By Corentin Noël on 2014-01-18

Fixed some wrong behaviors

[Danielle Foré (danrabbit)]

Hrm, I'm getting this message a lot: [Gtk] Failed to set text from markup due to error parsing markup: Error on line 1: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity - escape ampersand as &

Popover seems to be working great now :)

The first time that I add a new calendar, events pop up in the calendar view but selecting them doesn't show any additional information on the right-side pane

Hitting "Cancel" after editing an event is giving me a segfault: http://snippi.com/s/z2q22nw

review: Needs Fixing

[lp:~tintou/maya/3.10]

502. By Corentin Noël on 2014-01-18

Fixed the markup parsing

[Danielle Foré (danrabbit)]

Okay, it sounds like the big remaining issues are from what's in trunk and not being introduced by this branch. Anything else are paper cuts in the new UI that we can fix before release. I think it's worth merging the branch to get wider testing/interest on calendar syncing

review: Approve

[Cody Garver (codygarver)]

Review: Approve

Sent from my iPhone

On Jan 18, 2014, at 3:40 PM, Daniel Fore <email address hidden> wrote:

> Review: Approve
>
> Okay, it sounds like the big remaining issues are from what's in trunk and not being introduced by this branch. Anything else are paper cuts in the new UI that we can fix before release. I think it's worth merging the branch to get wider testing/interest on calendar syncing
> --
> https://code.launchpad.net/~tintou/maya/3.10/+merge/199365
> You are reviewing the proposed merge of lp:~tintou/maya/3.10 into lp:maya.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-12-09 11:43:54 +0000
+++ CMakeLists.txt	2014-01-18 21:06:28 +0000
@@ -7,14 +7,16 @@
 #
 # Base bits
 #
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-set (PKGDATADIR "${DATADIR}/maya-calendar")
+include (GNUInstallDirs)
+set (DATADIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}")
+set (SRC_TARGET ${CMAKE_PROJECT_NAME}-calendar)
+set (PKGDATADIR "${DATADIR}/${SRC_TARGET}")
 set (GETTEXT_PACKAGE "maya")
+set (APP_NAME "Maya")
 set (RELEASE_NAME "Fast and connected.")
 set (VERSION "0.2.2")
 set (VERSION_INFO "Release")
-set (SRC_TARGET ${CMAKE_PROJECT_NAME}-calendar)
-set (PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_PROJECT_NAME}/plugins)
+set (PLUGIN_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PROJECT_NAME}/plugins)
 
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 add_definitions ("-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"")
@@ -61,7 +63,7 @@
 file (GLOB _datafiles "${CMAKE_CURRENT_SOURCE_DIR}/data/style/*")
 install (FILES ${_datafiles} DESTINATION ${PKGDATADIR}/style)
 
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/maya-calendar.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/${SRC_TARGET}.desktop DESTINATION "${DATADIR}/applications")
 
 #
 # i18n
@@ -92,7 +94,7 @@
     glib-2.0
     gio-2.0
     gee-1.0
-    gtk+-3.0
+    gtk+-3.0>=3.10
     granite
     libecal-1.2>=3.8.0
     libical
@@ -112,9 +114,9 @@
 
 find_package (Vala REQUIRED)
 include (ValaVersion)
-ensure_vala_version ("0.18.0" MINIMUM)
+ensure_vala_version ("0.22.0" MINIMUM)
 include (ValaPrecompile)
 
 add_subdirectory (src)
 add_subdirectory (plugins)
-add_subdirectory (schemas)
+add_subdirectory (schemas)
 \ No newline at end of file
 
=== modified file 'cmake/Translations.cmake' (properties changed: -x to +x)
--- cmake/Translations.cmake	2013-05-09 20:32:54 +0000
+++ cmake/Translations.cmake	2014-01-18 21:06:28 +0000
@@ -20,47 +20,23 @@
     add_custom_target (pot COMMENT “Building translation catalog.”)
     find_program (XGETTEXT_EXECUTABLE xgettext)
 
+
     set(C_SOURCE "")
-    set(VALA_SOURCE "")
-    set(GLADE_SOURCE "")
 
     foreach(FILES_INPUT ${ARGN})
-        set(BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT})
-
-        file (GLOB_RECURSE SOURCE_FILES ${BASE_DIRECTORY}/*.c)
-        foreach(C_FILE ${SOURCE_FILES})
-            set(C_SOURCE ${C_SOURCE} ${C_FILE})
-        endforeach()
-
-        file (GLOB_RECURSE SOURCE_FILES ${BASE_DIRECTORY}/*.vala)
-        foreach(VALA_C_FILE ${SOURCE_FILES})
-            set(VALA_SOURCE ${VALA_SOURCE} ${VALA_C_FILE})
-        endforeach()
-
-        file (GLOB_RECURSE SOURCE_FILES ${BASE_DIRECTORY}/*.ui)
-        foreach(GLADE_C_FILE ${SOURCE_FILES})
-            set(GLADE_SOURCE ${GLADE_SOURCE} ${GLADE_C_FILE})
+        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
         endforeach()
     endforeach()
 
-    set(BASE_XGETTEXT_COMMAND
-        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE}
-        -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
-        --keyword="_" --keyword="N_" --from-code=UTF-8)
-
-   set(CONTINUE_FLAG "")
-
-    IF(NOT "${C_SOURCE}" STREQUAL "")
-        add_custom_command(TARGET pot COMMAND ${BASE_XGETTEXT_COMMAND} ${C_SOURCE})
-        set(CONTINUE_FLAG "-j")
-    ENDIF()
-
-    IF(NOT "${VALA_SOURCE}" STREQUAL "")
-        add_custom_command(TARGET pot COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LC\# ${VALA_SOURCE})
-        set(CONTINUE_FLAG "-j")
-    ENDIF()
-
-    IF(NOT "${GLADE_SOURCE}" STREQUAL "")
-        add_custom_command (TARGET pot COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LGlade ${GLADE_SOURCE})
-    ENDIF()  
+    add_custom_command (TARGET pot COMMAND
+        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
+        ${VALA_SOURCE} ${C_SOURCE} --add-comments="/" --keyword="_" --keyword="N_" --keyword="C_:1c,2"
+        --keyword="NC_:1c,2" --keyword="ngettext:1,2" --keyword="N_" --keyword="Q_:1g" --from-code=UTF-8
+        )
 endmacro()
 
=== modified file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	2013-05-01 23:46:37 +0000
+++ cmake/ValaPrecompile.cmake	2014-01-18 21:06:28 +0000
@@ -185,10 +185,21 @@
     endif(ARGS_GENERATE_HEADER)
 
     set(gir_arguments "")
+    set(gircomp_command "")
     if(ARGS_GENERATE_GIR)
         list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir")
         list(APPEND out_files_display "${ARGS_GENERATE_GIR}.gir")
         set(gir_arguments "--gir=${ARGS_GENERATE_GIR}.gir")
+
+        include (FindGirCompiler)
+        find_package(GirCompiler REQUIRED)
+        
+        set(gircomp_command 
+            COMMAND 
+                ${G_IR_COMPILER_EXECUTABLE}
+            ARGS 
+                "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir"
+                -o "${DIRECTORY}/${ARGS_GENERATE_GIR}.typelib")
     endif(ARGS_GENERATE_GIR)
 
     set(symbols_arguments "")
@@ -201,7 +212,7 @@
     # Workaround for a bug that would make valac run twice. This file is written
     # after the vala compiler generates C source code.
     set(OUTPUT_STAMP ${CMAKE_CURRENT_BINARY_DIR}/${target_name}_valac.stamp)
-
+        
     add_custom_command(
     OUTPUT
         ${OUTPUT_STAMP}
@@ -228,6 +239,7 @@
         ${ARGS_CUSTOM_VAPIS}
     COMMENT
         "Generating ${out_files_display}"
+    ${gircomp_command}
     )
 
     # This command will be run twice for some reason (pass a non-empty string to COMMENT
 
=== modified file 'plugins/CalDAV/CalDAV.vala'
--- plugins/CalDAV/CalDAV.vala	2013-11-14 18:20:10 +0000
+++ plugins/CalDAV/CalDAV.vala	2014-01-18 21:06:28 +0000
@@ -57,4 +57,4 @@
     var objmodule = module as Peas.ObjectModule;
     objmodule.register_extension_type (typeof (Peas.Activatable),
                                      typeof (Maya.Plugins.CalDAVPlugin));
-}
+}
 \ No newline at end of file
 
=== modified file 'plugins/CalDAV/CalDAVBackend.vala'
--- plugins/CalDAV/CalDAVBackend.vala	2013-11-14 18:20:10 +0000
+++ plugins/CalDAV/CalDAVBackend.vala	2014-01-18 21:06:28 +0000
@@ -148,7 +148,7 @@
             var list = new List<E.Source> ();
             list.append (new_source);
             registry.create_sources_sync (list);
-            app.calmodel.add_source (new_source);
+            ((Maya.Application)GLib.Application.get_default ()).calmodel.add_source (new_source);
             if (set_default) {
                 registry.default_calendar = new_source;
             }
@@ -190,4 +190,4 @@
             critical (error.message);
         }
     }
-}
+}
 \ No newline at end of file
 
=== modified file 'plugins/Google/GoogleBackend.vala'
--- plugins/Google/GoogleBackend.vala	2013-11-14 18:20:10 +0000
+++ plugins/Google/GoogleBackend.vala	2014-01-18 21:06:28 +0000
@@ -89,7 +89,7 @@
             var list = new List<E.Source> ();
             list.append (new_source);
             registry.create_sources_sync (list);
-            app.calmodel.add_source (new_source);
+            ((Maya.Application)GLib.Application.get_default ()).calmodel.add_source (new_source);
             if (set_default) {
                 registry.default_calendar = new_source;
             }
@@ -132,4 +132,4 @@
             critical (error.message);
         }
     }
-}
+}
 \ No newline at end of file
 
=== modified file 'src/Application.vala'
--- src/Application.vala	2013-12-09 09:03:14 +0000
+++ src/Application.vala	2014-01-18 21:06:28 +0000
@@ -24,10 +24,10 @@
         private static bool PRINT_VERSION = false;
 
     }
-    public Application app;
     public Plugins.Manager plugins_manager;
     public BackendsManager backends_manager;
     public Settings.MayaSettings global_settings;
+    public Settings.SavedState saved_state;
 
     public static int main (string[] args) {
 
@@ -48,7 +48,7 @@
         }
 
         Gtk.init (ref args);
-        app = new Application ();
+        var app = new Application ();
 
         return app.run (args);
 
@@ -71,7 +71,7 @@
             build_version = Build.VERSION;
             build_version_info = Build.VERSION_INFO;
 
-            program_name = "Maya";
+            program_name = Build.APP_NAME;
             exec_name = "maya-calendar";
 
             app_years = "2011-2013";
@@ -109,8 +109,6 @@
             { null }
         };
 
-        Settings.SavedState saved_state;
-
         public Gtk.Window window;
         View.MayaToolbar toolbar;
         View.CalendarView calview;
@@ -213,8 +211,6 @@
 
             create_window ();
 
-            create_toolbar ();
-
             calview = new View.CalendarView (calmodel, saved_state.show_weeks);
             calview.on_event_add.connect ((date) => on_tb_add_clicked (date));
 
@@ -233,15 +229,14 @@
 
             gridcontainer = new Gtk.Grid ();
             hpaned = new Gtk.Paned (Gtk.Orientation.HORIZONTAL);
-            calview.set_vexpand(true);
+            calview.vexpand = true;
             hpaned.pack1 (calview, true, false);
             hpaned.pack2 (sidebar, true, false);
             hpaned.position = saved_state.hpaned_position;
-            gridcontainer.attach (toolbar, 0, 0, 1, 1);
             gridcontainer.attach (hpaned, 0, 2, 1, 1);
             window.add (gridcontainer);
 
-            add_window(window);
+            add_window (window);
 
             if (saved_state.window_state == Settings.WindowState.MAXIMIZED)
                 window.maximize ();
@@ -296,33 +291,18 @@
 
                             break;
                         case Gdk.Key.@F11:
-                            toolbar.menu.fullscreen.active = !toolbar.menu.fullscreen.active;
+                            toolbar.fullscreen.active = !toolbar.fullscreen.active;
                             break;
                         }
 
                         return false;
             });
-        }
-
-        /**
-         * Creates the toolbar and its elements.
-         */
-        void create_toolbar () {
-            toolbar = new View.MayaToolbar (calmodel.month_start);
-            toolbar.button_add.clicked.connect (() => on_tb_add_clicked (calview.grid.selected_date));
-            toolbar.button_calendar_sources.clicked.connect (on_tb_sources_clicked);
-            toolbar.menu.today.activate.connect (on_menu_today_toggled);
-            toolbar.menu.fullscreen.toggled.connect (on_toggle_fullscreen);
-            toolbar.menu.weeknumbers.toggled.connect (on_menu_show_weeks_toggled);
-            toolbar.menu.fullscreen.active = (saved_state.window_state == Settings.WindowState.FULLSCREEN);
-            toolbar.menu.about.activate.connect (() => show_about(window));
-            toolbar.menu.weeknumbers.active = saved_state.show_weeks;
-            toolbar.search_bar.text_changed_pause.connect ((text) => on_search (text));
-
-            toolbar.month_switcher.left_clicked.connect (on_tb_month_switcher_left_clicked);
-            toolbar.month_switcher.right_clicked.connect (on_tb_month_switcher_right_clicked);
-            toolbar.year_switcher.left_clicked.connect (on_tb_year_switcher_left_clicked);
-            toolbar.year_switcher.right_clicked.connect (on_tb_year_switcher_right_clicked);
+            
+            toolbar = new View.MayaToolbar (calmodel);
+            toolbar.add_calendar_clicked.connect (() => on_tb_add_clicked (calview.grid.selected_date));
+            toolbar.on_menu_today_toggled.connect (on_menu_today_toggled);
+            toolbar.on_search.connect ((text) => on_search (text));
+            window.set_titlebar (toolbar);
         }
         
         void on_quit () {
@@ -355,14 +335,6 @@
 
         //--- SIGNAL HANDLERS ---//
 
-        void on_toggle_fullscreen () {
-
-            if (toolbar.menu.fullscreen.active)
-                window.fullscreen ();
-            else
-                window.unfullscreen ();
-        }
-
         void on_event_dialog_response (View.EventDialog dialog, bool response_id, bool add_event)  {
 
             E.CalComponent event = dialog.ecal;
@@ -413,30 +385,6 @@
 
         }
 
-        void on_tb_sources_clicked (Gtk.Widget widget) {
-            var source_selector = new View.SourceSelector ();
-            source_selector.move_to_widget (widget);
-            source_selector.show_all ();
-            source_selector.run ();
-            source_selector.destroy ();
-        }
-
-        void on_tb_month_switcher_left_clicked () {
-            calmodel.month_start = calmodel.month_start.add_months (-1);
-        }
-
-        void on_tb_month_switcher_right_clicked () {
-            calmodel.month_start = calmodel.month_start.add_months (1);
-        }
-
-        void on_tb_year_switcher_left_clicked () {
-            calmodel.month_start = calmodel.month_start.add_years (-1);
-        }
-
-        void on_tb_year_switcher_right_clicked () {
-            calmodel.month_start = calmodel.month_start.add_years (1);
-        }
-
         /**
          * Called when the search_bar is used.
          */
@@ -454,38 +402,6 @@
             calview.today ();
         }
 
-        void on_menu_show_weeks_toggled () {
-            saved_state.show_weeks = toolbar.menu.weeknumbers.active;
-        }
-        
-        public void show_calendar_removed (string calendar_name) {
-            var info_bar = new Gtk.InfoBar ();
-            ((Gtk.Orientable)info_bar.get_action_area ()).orientation = Gtk.Orientation.HORIZONTAL;
-            //warning (info_bar.get_action_area ().name);
-            info_bar.set_message_type (Gtk.MessageType.INFO);
-            info_bar.add_button (Gtk.Stock.UNDO, 0);
-            info_bar.add_button (Gtk.Stock.CLOSE, 1);
-            var message_label = new Gtk.Label (_("Calendar \"%s\" removed.").printf (calendar_name));
-            info_bar.get_content_area ().add (message_label);
-            info_bar.response.connect ((id) => {
-                if (id == 0) {
-                    calmodel.restore_calendar ();
-                    info_bar.hide ();
-                } else {
-                    info_bar.hide ();
-                }
-            });
-            gridcontainer.attach (info_bar, 0, 1, 1, 1);
-            info_bar.show_all ();
-        }
-
-    }
-
-    internal void desktop_translations () {
-        var comment = _("View and schedule events");
-        var generic_name = _("Calendar");
-        var add_event = _("_Add Event");
-        var keywords = _("Maya;Planner;Dates;Days;Events;");
-    }
-
-}
+    }
+
+}
 \ No newline at end of file
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-08-31 15:14:02 +0000
+++ src/CMakeLists.txt	2014-01-18 21:06:28 +0000
@@ -31,7 +31,7 @@
     View/Grid/VAutoHider.vala
     View/EventDialog.vala
     View/SourceDialog.vala
-    View/MayaMenu.vala
+    View/SourceItem.vala
     View/MayaToolbar.vala
     View/SourceSelector.vala
     View/Widgets/ContractorButtonWithMenu.vala
@@ -67,12 +67,12 @@
 target_link_libraries(${EXEC_NAME} ${DEPS_LIBRARIES})
 
 if (BUILD_SHARED_LIBS)
-    install(TARGETS ${CLIENT_LIBRARY_NAME} DESTINATION lib)
+    install(TARGETS ${CLIENT_LIBRARY_NAME} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
     # Install lib stuffs
-    install (FILES ${CMAKE_BINARY_DIR}/src/${CLIENT_VAPI}.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/)
-    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CLIENT_VAPI}.vapi DESTINATION share/vala/vapi/)
-    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CLIENT_VAPI}.deps DESTINATION share/vala/vapi/)
-    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CLIENT_VAPI}.h DESTINATION include/${CLIENT_VAPI}/)
+    install (FILES ${CMAKE_BINARY_DIR}/src/${CLIENT_VAPI}.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig/)
+    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CLIENT_VAPI}.vapi DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/vala/vapi/)
+    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CLIENT_VAPI}.deps DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/vala/vapi/)
+    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CLIENT_VAPI}.h DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${CLIENT_VAPI}/)
 endif ()
 
-install(TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin)
+install(TARGETS ${EXEC_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
 \ No newline at end of file
 
=== modified file 'src/Model/CalendarModel.vala'
--- src/Model/CalendarModel.vala	2013-09-01 23:32:20 +0000
+++ src/Model/CalendarModel.vala	2014-01-18 21:06:28 +0000
@@ -532,11 +532,7 @@
     
     public void do_real_deletion () {
         foreach (var source in calendar_trash) {
-            try {
-                source.remove.begin (null);
-            } catch (Error error) {
-                critical (error.message);
-            }
+            source.remove.begin (null);
         }
     }
 }
 
=== modified file 'src/Settings/LanguagesFormat.vala'
--- src/Settings/LanguagesFormat.vala	2012-03-11 01:51:18 +0000
+++ src/Settings/LanguagesFormat.vala	2014-01-18 21:06:28 +0000
@@ -17,28 +17,24 @@
 
 namespace Maya.Settings {
 
-	public string DateFormat () {
-		return (_("%B %e, %Y"));
-	}
-
-	public string DateFormat_Complete () {
-		return (_("%A, %b %d"));
-	}
-
-	public string TimeFormat () {
-
+    public string DateFormat () {
+        return _("%B %e, %Y");
+    }
+
+    public string DateFormat_Complete () {
+        return _("%A, %b %d");
+    }
+
+    public string TimeFormat () {
         var setting = new GLib.Settings ("org.gnome.desktop.interface");
         string clockformat = setting.get_string ("clock-format");
-        string outputformat;
 
-        if (clockformat == "12h") {
-            outputformat = (_("%l:%M %p"));
+        if (clockformat.contains ("12h")) {
+            return _("%l:%M %p");
         }
         else {
-            outputformat = (_("%H:%M"));
+            return _("%H:%M");
         }
-		return outputformat;
-	}
+    }
 
 }
-
 
=== modified file 'src/View/EventDialog.vala'
--- src/View/EventDialog.vala	2013-09-02 14:58:51 +0000
+++ src/View/EventDialog.vala	2014-01-18 21:06:28 +0000
@@ -443,7 +443,7 @@
 
         Granite.Widgets.TimePicker make_time_picker () {
 
-            var time_picker = new Granite.Widgets.TimePicker.with_format (Maya.Settings.TimeFormat ());
+            var time_picker = new Granite.Widgets.TimePicker ();
             time_picker.width_request = 120;
 
             return time_picker;
@@ -559,4 +559,3 @@
 
 
 }
-
 
=== removed file 'src/View/MayaMenu.vala'
--- src/View/MayaMenu.vala	2012-06-01 20:14:09 +0000
+++ src/View/MayaMenu.vala	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-//
-//  Copyright (C) 2011-2012 Maxwell Barvian
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-namespace Maya.View {
-
-    public class MayaMenu : Gtk.Menu {
-
-        public Gtk.MenuItem today { get; private set; }
-
-        public Gtk.MenuItem import { get; private set; }
-        public Gtk.MenuItem export { get; private set; }
-
-        public Gtk.CheckMenuItem fullscreen { get; private set; }
-        public Gtk.CheckMenuItem weeknumbers { get; private set; }
-
-        public Gtk.MenuItem sync { get; private set; }
-
-        public Gtk.MenuItem about { get; private set; }
-
-        public MayaMenu () {
-
-            // Create everything
-            today = new Gtk.MenuItem.with_label (_("Today"));
-
-            fullscreen = new Gtk.CheckMenuItem.with_label (_("Fullscreen"));
-
-            weeknumbers = new Gtk.CheckMenuItem.with_label (_("Show Week Numbers"));
-
-            import = new Gtk.MenuItem.with_label (_("Import..."));
-
-            sync = new Gtk.MenuItem.with_label (_("Sync..."));
-
-            about = new Gtk.MenuItem.with_label (_("About"));
-
-            // Append in correct order
-            append (today);
-
-            append (new Gtk.SeparatorMenuItem ());
-
-            append (fullscreen);
-            append (weeknumbers);
-
-            /*
-            * TODO : Will be done in Maya 0.2
-            append (new Gtk.SeparatorMenuItem ());
-
-            append (import);
-            append (sync);
-            */
-
-            append (new Gtk.SeparatorMenuItem ());
-
-            append (about);
-        }
-
-    }
-
-}
-
 
=== modified file 'src/View/MayaToolbar.vala'
--- src/View/MayaToolbar.vala	2013-07-17 11:57:59 +0000
+++ src/View/MayaToolbar.vala	2014-01-18 21:06:28 +0000
@@ -17,88 +17,107 @@
 
 namespace Maya.View {
 
-    public class MayaToolbar : Gtk.Toolbar {
-
-        public Gtk.ToolButton button_add { get; private set; }
-
-        public Widgets.DateSwitcher month_switcher { get; private set; }
-        public Widgets.DateSwitcher year_switcher { get; private set; }
-
-        public Granite.Widgets.SearchBar search_bar { get; private set; }
-
-        public Gtk.ToolButton button_calendar_sources { get; private set; }
-
-        public Granite.Widgets.AppMenu app_menu { get; private set; }
-        public MayaMenu menu { get; private set; }
-
-        public Widgets.ContractorButtonWithMenu contractor { get; private set; }
-
-        public MayaToolbar (DateTime target) {
-
-            // Toolbar properties
-            get_style_context ().add_class ("primary-toolbar"); // compliant with elementary HIG
-
-            // Initialize everything
-            button_add = make_toolbutton (Gtk.IconTheme.get_default ().has_icon ("event-new") ? "event-new" : "list-add", _("Create a new event"));
-
-            button_calendar_sources = make_toolbutton ("gtk-index", _("Select calendars to display"), true);
-
+    public class MayaToolbar : Gtk.HeaderBar {
+        
+        // Signals
+        public signal void on_search (string search);
+        public signal void on_menu_today_toggled ();
+        public signal void add_calendar_clicked ();
+        
+        Model.CalendarModel calmodel;
+        
+        // Toolbar items
+        Widgets.DateSwitcher month_switcher;
+        Widgets.DateSwitcher year_switcher;
+        public Gtk.SearchEntry search_bar;
+        
+        // Menu items
+        public Gtk.CheckMenuItem fullscreen;
+        Gtk.CheckMenuItem weeknumbers;
+        View.SourceSelector source_selector;
+        
+        public MayaToolbar (Model.CalendarModel calmodel) {
+            this.calmodel = calmodel;
+            show_close_button = true;
+            
+            var button_add = new Gtk.Button.from_icon_name ("appointment-new", Gtk.IconSize.LARGE_TOOLBAR);
+            button_add.tooltip_text = _("Create a new event");
+            
+            var button_calendar_sources = new Gtk.Button.from_icon_name ("office-calendar", Gtk.IconSize.LARGE_TOOLBAR);
+            button_calendar_sources.tooltip_text = _("Manage Calendars");
+            
             month_switcher = new Widgets.DateSwitcher (10);
             year_switcher = new Widgets.DateSwitcher (-1);
-            set_switcher_date (target);
-
-            search_bar = new Granite.Widgets.SearchBar (_("Search Events"));
+            set_switcher_date (calmodel.month_start);
+            
+            search_bar = new Gtk.SearchEntry ();
+            search_bar.placeholder_text = _("Search Events");
             search_bar.sensitive = false;
-
-            contractor = new Widgets.ContractorButtonWithMenu (_("Export or Share the default Calendar"));
-
-            menu = new MayaMenu ();
-            app_menu = new Granite.Widgets.AppMenu (menu);
-
-            // Insert into appropriate positions
-            insert (button_add, -1);
-
-            insert (make_spacer (), -1);
-
-            insert (make_toolitem_from_widget (Util.set_paddings (month_switcher, 5, 0, 5, 0)), -1);
-            insert (make_toolitem_from_widget (Util.set_paddings (year_switcher, 5, 0, 5, 10)), -1);
-
-            insert (make_spacer (), -1);
-
-            insert (make_toolitem_from_widget (search_bar), -1);
-
-            insert (button_calendar_sources, -1);
-
-            insert (contractor, -1);
-
-            insert (app_menu, -1);
-        }
-
-        private Gtk.ToolButton make_toolbutton (string icon_name, string tooltip_text, bool sensitive = true,  bool can_focus = false) {
-
-            var toolbutton = new Gtk.ToolButton (null, null);
-            toolbutton.icon_name = icon_name;
-            toolbutton.sensitive = sensitive;
-            toolbutton.can_focus = can_focus;
-            toolbutton.tooltip_text = tooltip_text;
-
-            return toolbutton;
-        }
-
-        private Gtk.ToolItem make_spacer () {
-
-            var spacer = new Gtk.ToolItem ();
-            spacer.set_expand (true);
-
-            return spacer;
-        }
-
-        private Gtk.ToolItem make_toolitem_from_widget (Gtk.Widget widget) {
-
-            var toolitem = new Gtk.ToolItem ();
-            toolitem.add (widget);
-
-            return toolitem;
+            
+            var contractor = new Widgets.ContractorButtonWithMenu (_("Export or Share the default Calendar"));
+            
+            var menu = new Gtk.Menu ();
+            var menu_button = new Granite.Widgets.AppMenu (menu);
+            
+            var title_grid = new Gtk.Grid ();
+            title_grid.column_spacing = 6;
+            
+            title_grid.attach (year_switcher, 0, 0, 1, 1);
+            title_grid.attach (month_switcher, 1, 0, 1, 1);
+            this.set_custom_title (title_grid);
+            
+            // Create the menu
+            
+            var today = new Gtk.MenuItem.with_label (_("Today"));
+            fullscreen = new Gtk.CheckMenuItem.with_label (_("Fullscreen"));
+            weeknumbers = new Gtk.CheckMenuItem.with_label (_("Show Week Numbers"));
+            //var import = new Gtk.MenuItem.with_label (_("Import…"));
+            var about = new Gtk.MenuItem.with_label (_("About"));
+            
+            // Append in correct order
+            menu.add (today);
+            menu.add (new Gtk.SeparatorMenuItem ());
+            menu.add (fullscreen);
+            menu.add (weeknumbers);
+            
+            /* TODO : Will be done in Maya 0.2
+            menu.append (new Gtk.SeparatorMenuItem ());
+            menu.append (import);
+            menu.append (sync);
+            */
+            
+            menu.append (new Gtk.SeparatorMenuItem ());
+            menu.append (about);
+            
+            pack_start (button_calendar_sources);
+            pack_start (button_add);
+            
+            pack_end (contractor);
+            pack_end (search_bar);
+            pack_end (menu_button);
+            
+            // Connect to signals
+            
+            button_add.clicked.connect (() => add_calendar_clicked ());
+            button_calendar_sources.clicked.connect (on_tb_sources_clicked);
+            today.activate.connect (() => on_menu_today_toggled);
+            fullscreen.toggled.connect (on_toggle_fullscreen);
+            weeknumbers.toggled.connect (on_menu_show_weeks_toggled);
+            about.activate.connect (() => {
+                var app = ((Maya.Application)GLib.Application.get_default ());
+                app.show_about (app.window);
+            });
+            search_bar.search_changed.connect (() => on_search (search_bar.text));
+
+            month_switcher.left_clicked.connect (() => {change_month (-1);});
+            month_switcher.right_clicked.connect (() => {change_month (1);});
+            year_switcher.left_clicked.connect (() => {change_year (-1);});
+            year_switcher.right_clicked.connect (() => {change_year (1);});
+            
+            button_calendar_sources.size_allocate.connect (button_size_allocate);
+            
+            fullscreen.active = (saved_state.window_state == Settings.WindowState.FULLSCREEN);
+            weeknumbers.active = saved_state.show_weeks;
         }
 
         public void set_switcher_date (DateTime date) {
@@ -106,7 +125,41 @@
             year_switcher.text = date.format ("%Y");
         }
 
+        void on_toggle_fullscreen () {
+            var window = ((Maya.Application)GLib.Application.get_default ()).window;
+            
+            if (fullscreen.active)
+                window.fullscreen ();
+            else
+                window.unfullscreen ();
+        }
+
+        void on_menu_show_weeks_toggled () {
+            saved_state.show_weeks = weeknumbers.active;
+        }
+        
+        void button_size_allocate (Gtk.Allocation allocation) {
+            month_switcher.height_request = allocation.height;
+            year_switcher.height_request = allocation.height;
+        }
+
+        void on_tb_sources_clicked (Gtk.Widget widget) {
+            if (source_selector == null) {
+                source_selector = new View.SourceSelector (calmodel);
+            }
+            source_selector.move_to_widget (widget);
+            source_selector.show ();
+            source_selector.run ();
+        }
+
+        void change_month (int relative) {
+            calmodel.month_start = calmodel.month_start.add_months (relative);
+        }
+
+        void change_year (int relative) {
+            calmodel.month_start = calmodel.month_start.add_years (relative);
+        }
+
     }
 
-}
-
+}
 \ No newline at end of file
 
=== modified file 'src/View/SourceDialog.vala'
--- src/View/SourceDialog.vala	2013-09-01 23:22:22 +0000
+++ src/View/SourceDialog.vala	2014-01-18 21:06:28 +0000
@@ -15,100 +15,62 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#if USE_GRANITE_DECORATED_WINDOW
-public class Maya.View.SourceDialog : Granite.Widgets.LightWindow {
-#else
-public class Maya.View.SourceDialog : Gtk.Window {
-#endif
-
+public class Maya.View.SourceDialog : Gtk.Grid {
     public EventType event_type { get; private set; default=EventType.EDIT;}
-    
+
     private Gtk.Entry name_entry;
     private Gtk.ColorButton color_button;
     private bool set_as_default = false;
     private Backend current_backend;
     private Gee.Collection<PlacementWidget> backend_widgets;
     private Gtk.Grid main_grid;
-    private Gtk.Grid general_grid;
     private Gee.HashMap<string, bool> widgets_checked;
     private Gtk.Button create_button;
-    private E.Source source;
-
-    public SourceDialog (E.Source? source = null) {
+    private Gtk.ComboBox type_combobox;
+    private Gtk.ListStore list_store;
+    private E.Source source = null;
+
+    public signal void go_back ();
+
+    public SourceDialog () {
         widgets_checked = new Gee.HashMap<string, bool> (null, null);
-        
-        if (source == null) {
-            title = _("Add Calendar");
-            event_type = EventType.ADD;
-        } else {
-            title = _("Edit Calendar");
-            this.source = source;
-        }
-
-        // Dialog properties
-        window_position = Gtk.WindowPosition.CENTER_ON_PARENT;
-        type_hint = Gdk.WindowTypeHint.DIALOG;
-        transient_for = app.window;
 
         main_grid = new Gtk.Grid ();
         main_grid.set_row_spacing (6);
         main_grid.set_column_spacing (12);
-        
-        general_grid = new Gtk.Grid ();
-        general_grid.margin_left = 12;
-        general_grid.margin_right = 12;
-        general_grid.margin_top = 12;
-        general_grid.margin_bottom = 12;
-        general_grid.set_row_spacing (6);
-        general_grid.set_column_spacing (12);
-        
+
+        margin_left = 6;
+        margin_right = 6;
+        margin_top = 6;
+        set_row_spacing (6);
+        set_column_spacing (12);
+        expand = true;
+
         // Buttons
-        
+
         var buttonbox = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
         buttonbox.set_layout (Gtk.ButtonBoxStyle.END);
-        
 
-        var cancel_button = new Gtk.Button.from_stock (Gtk.Stock.CANCEL);
-        if (event_type == EventType.ADD) {
-            create_button = new Gtk.Button.with_label (_("Create Calendar"));
-        } else {
-            create_button = new Gtk.Button.from_stock (Gtk.Stock.SAVE);
-        }
+        var cancel_button = new Gtk.Button.with_label (_("Cancel"));
+        create_button = new Gtk.Button.with_label (_("Create"));
 
         create_button.clicked.connect (save);
-        cancel_button.clicked.connect (() => {this.destroy();});
+        cancel_button.clicked.connect (() => go_back ());
 
         buttonbox.pack_end (cancel_button);
         buttonbox.pack_end (create_button);
-        
+
         // Name
-        
         var name_label = new Gtk.Label (_("Name:"));
         name_label.xalign = 1;
         name_entry = new Gtk.Entry ();
         name_entry.placeholder_text = _("Calendar Name");
         name_entry.changed.connect (() => {check_can_validate ();});
-        if (event_type == EventType.EDIT) {
-            name_entry.text = source.display_name;
-        }
-        
+
         // Type Combobox
-        Gtk.ListStore list_store = new Gtk.ListStore (2, typeof (string), typeof (Backend));
-        Gtk.TreeIter iter;
-        int number = 0;
-        int i =0;
-        foreach (var backend in backends_manager.backends) {
-            list_store.append (out iter);
-            list_store.set (iter, 0, backend.get_name (), 1, backend);
-            if (event_type == EventType.EDIT) {
-                if (backend.get_uid () == source.dup_parent ()) {
-                    number = i;
-                }
-            }
-            i++;
-        }
-        
-        var type_combobox = new Gtk.ComboBox.with_model (list_store);
+        list_store = new Gtk.ListStore (2, typeof (string), typeof (Backend));
+
+        type_combobox = new Gtk.ComboBox.with_model (list_store);
 
         Gtk.CellRendererText renderer = new Gtk.CellRendererText ();
         type_combobox.pack_start (renderer, true);
@@ -116,7 +78,6 @@
 
         type_combobox.changed.connect (() => {
             GLib.Value backend;
-            
             Gtk.TreeIter b_iter;
             type_combobox.get_active_iter (out b_iter);
             list_store.get_value (b_iter, 1, out backend);
@@ -125,38 +86,33 @@
             backend_widgets = ((Backend)backend).get_new_calendar_widget (source);
             add_backend_widgets ();
         });
-        
-        type_combobox.set_active (number);
-        
+
         var type_label = new Gtk.Label (_("Type:"));
-        type_label.expand = true;
         type_label.xalign = 1;
-        
-        if (backends_manager.backends.size == 1) {
+
+        Gtk.TreeIter iter;
+        foreach (var backend in backends_manager.backends) {
+            list_store.append (out iter);
+            list_store.set (iter, 0, backend.get_name (), 1, backend);
+        }
+
+        if (backends_manager.backends.size <= 1) {
             type_combobox.no_show_all = true;
             type_label.no_show_all = true;
         }
-        
-        if (event_type == EventType.EDIT) {
-            type_combobox.sensitive = false;
-        }
-        
+
+        type_combobox.set_active (0);
+
         // Color
         var rgba = Gdk.RGBA ();
-        if (event_type == EventType.EDIT) {
-            var cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR);
-            rgba.parse (cal.dup_color ());
-        } else {
-            rgba.red = 0.13;
-            rgba.green = 0.42;
-            rgba.blue = 0.70;
-        }
+        rgba.red = 0.13;
+        rgba.green = 0.42;
+        rgba.blue = 0.70;
         var color_label = new Gtk.Label (_("Color:"));
         color_label.xalign = 1;
         color_button = new Gtk.ColorButton.with_rgba (rgba);
         color_button.use_alpha = false;
-        
-        
+
         var check_button = new Gtk.CheckButton.with_label (_("Mark as default calendar"));
 
         check_button.toggled.connect (() => {
@@ -170,25 +126,67 @@
         main_grid.attach (color_label,   0, 2, 1, 1);
         main_grid.attach (color_button,  1, 2, 1, 1);
         main_grid.attach (check_button,  1, 3, 1, 1);
-        
-        general_grid.attach (main_grid,  0, 0, 2, 1);
-        general_grid.attach (buttonbox,  0, 1, 2, 1);
-        
-        this.add (general_grid);
-        
+
+        attach (main_grid, 0, 0, 2, 1);
+
+        var fake_label = new Gtk.Grid ();
+        fake_label.expand = true;
+        attach (fake_label, 0, 1, 2, 1);
+        attach (buttonbox, 0, 2, 2, 1);
+
         show_all ();
     }
     
+    public void set_source (E.Source? source = null) {
+        this.source = source;
+        if (source == null) {
+            event_type = EventType.ADD;
+            name_entry.text = "";
+            type_combobox.sensitive = true;
+            create_button.set_label (_("Create Calendar"));
+            var rgba = Gdk.RGBA ();
+            rgba.red = 0.13;
+            rgba.green = 0.42;
+            rgba.blue = 0.70;
+            color_button.set_rgba (rgba);
+        } else {
+            create_button.set_label (_("Save"));
+            name_entry.text = source.display_name;
+            type_combobox.sensitive = false;
+            var cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR);
+            var rgba = Gdk.RGBA ();
+            rgba.parse (cal.dup_color ());
+            color_button.set_rgba (rgba);
+            list_store.foreach (tree_foreach);
+        }
+    }
+
+    private bool tree_foreach (Gtk.TreeModel model, Gtk.TreePath path, Gtk.TreeIter iter) {
+        GLib.Value backend;
+        list_store.get_value (iter, 1, out backend);
+        var current_backend = ((Backend)backend);
+        if (current_backend.get_uid () == source.dup_parent ()) {
+            type_combobox.set_active_iter (iter);
+            return true;
+        }
+
+        return false;
+    }
+
     private void remove_backend_widgets () {
         if (backend_widgets == null)
             return;
+
         foreach (var widget in backend_widgets) {
             widget.widget.hide ();
+            widget.widget.destroy ();
         }
+
         backend_widgets.clear ();
     }
-    
+
     private void add_backend_widgets () {
+        widgets_checked.clear ();
         foreach (var widget in backend_widgets) {
             main_grid.attach (widget.widget, widget.column, 4 + widget.row, 1, 1);
             if (widget.needed == true && widget.widget is Gtk.Entry) {
@@ -200,39 +198,33 @@
         }
         check_can_validate ();
     }
-    
+
     private void entry_changed (PlacementWidget widget) {
         widgets_checked.unset (widget.ref_name);
-        widgets_checked.set (widget.ref_name, ((Gtk.Entry)widget.widget).text != "");
+        widgets_checked.set (widget.ref_name, ((Gtk.Entry)widget.widget).text.chug ().char_count () > 0);
         check_can_validate ();
     }
-    
+
     private void check_can_validate () {
-        bool result = true;
         foreach (var valid in widgets_checked.values) {
             if (valid == false) {
-                result = false;
-                break;
+                create_button.sensitive = false;
+                return;
             }
         }
-        if (result == true && name_entry.text != "") {
+
+        if (name_entry.text != "") {
             create_button.sensitive = true;
-        } else {
-            create_button.sensitive = false;
         }
     }
 
-    //--- Public Methods ---//
-    
-    
     public void save () {
-        
         if (event_type == EventType.ADD) {
             current_backend.add_new_calendar (name_entry.text, Util.get_hexa_color (color_button.rgba), set_as_default, backend_widgets);
-            this.destroy();
+            go_back ();
         } else {
             current_backend.modify_calendar (name_entry.text, Util.get_hexa_color (color_button.rgba), set_as_default, backend_widgets, source);
-            this.destroy();
+            go_back ();
         }
     }
-}
+}
 \ No newline at end of file
 
=== added file 'src/View/SourceItem.vala'
--- src/View/SourceItem.vala	1970-01-01 00:00:00 +0000
+++ src/View/SourceItem.vala	2014-01-18 21:06:28 +0000
@@ -0,0 +1,210 @@
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+public class Maya.View.SourceItem : Gtk.EventBox {
+    private E.Source source;
+
+    private Gtk.Revealer revealer;
+    private Gtk.Revealer info_revealer;
+    private Model.CalendarModel calmodel;
+    private Gtk.Grid main_grid;
+
+    private Gtk.Button delete_button;
+    private Gtk.Button edit_button;
+
+    private Gtk.Label calendar_name_label;
+    private Gtk.Label backend_label;
+    private Gtk.Label calendar_color_label;
+    private Gtk.CheckButton visible_checkbutton;
+
+    public signal void remove_request (E.Source source);
+    public signal void edit_request (E.Source source);
+
+    public SourceItem (E.Source source, Model.CalendarModel calmodel) {
+        this.source = source;
+        this.calmodel = calmodel;
+
+        main_grid = new Gtk.Grid ();
+
+        // Source widget
+        E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR);
+        revealer = new Gtk.Revealer ();
+        revealer.set_reveal_child (true);
+
+        var revealer_grid = new Gtk.Grid ();
+        revealer_grid.column_spacing = 6;
+        revealer_grid.row_spacing = 12;
+
+        calendar_name_label = new Gtk.Label (source.dup_display_name ());
+        calendar_name_label.set_markup ("<b>%s</b>".printf (GLib.Markup.escape_text (source.dup_display_name ())));
+        calendar_name_label.xalign = 0;
+
+        Maya.Backend selected_backend = null;
+        foreach (var backend in backends_manager.backends) {
+            if (source.dup_parent () == backend.get_uid ()) {
+                selected_backend = backend;
+                break;
+            }
+        }
+
+        if (selected_backend == null) {
+            backend_label = new Gtk.Label ("");
+        } else {
+            backend_label = new Gtk.Label (selected_backend.get_name ());
+        }
+
+        backend_label.hexpand = true;
+        backend_label.xalign = 0;
+
+        calendar_color_label = new Gtk.Label ("  ");
+        var color = Gdk.RGBA ();
+        color.parse (cal.dup_color());
+        calendar_color_label.override_background_color (Gtk.StateFlags.NORMAL, color);
+
+        visible_checkbutton = new Gtk.CheckButton ();
+        visible_checkbutton.active = cal.selected;
+        visible_checkbutton.toggled.connect (() => {
+            if (visible_checkbutton.active == true) {
+                calmodel.add_source (source);
+            } else {
+                calmodel.remove_source (source);
+            }
+
+            cal.set_selected (visible_checkbutton.active);
+            try {
+                source.write_sync ();
+            } catch (GLib.Error error) {
+                critical (error.message);
+            }
+        });
+
+        delete_button = new Gtk.Button.from_icon_name ("edit-delete-symbolic", Gtk.IconSize.MENU);
+        delete_button.set_tooltip_text (_("Remove"));
+        delete_button.clicked.connect (() => {remove_request (source);});
+        delete_button.relief = Gtk.ReliefStyle.NONE;
+        delete_button.no_show_all = true;
+
+        edit_button = new Gtk.Button.from_icon_name ("document-properties-symbolic", Gtk.IconSize.MENU);
+        edit_button.set_tooltip_text (_("Edit…"));
+        edit_button.clicked.connect (() => {edit_request (source);});
+        edit_button.relief = Gtk.ReliefStyle.NONE;
+        edit_button.no_show_all = true;
+
+        revealer_grid.attach (visible_checkbutton, 0, 0, 1, 2);
+        revealer_grid.attach (calendar_color_label, 1, 0, 1, 2);
+        revealer_grid.attach (calendar_name_label, 2, 0, 1, 1);
+        revealer_grid.attach (backend_label, 3, 0, 1, 1);
+        revealer_grid.attach (delete_button, 4, 0, 1, 2);
+        revealer_grid.attach (edit_button, 5, 0, 1, 2);
+
+        revealer.add (revealer_grid);
+
+        // Info bar
+        info_revealer = new Gtk.Revealer ();
+        info_revealer.no_show_all = true;
+        var info_revealer_grid = new Gtk.Grid ();
+        info_revealer_grid.column_spacing = 6;
+        info_revealer_grid.row_spacing = 12;
+        info_revealer.add (info_revealer_grid);
+        var undo_button = new Gtk.Button.with_label (_("Undo"));
+        undo_button.clicked.connect (() => {
+            revealer.show ();
+            calmodel.restore_calendar ();
+            revealer.set_reveal_child (true);
+            info_revealer.set_reveal_child (false);
+            info_revealer.hide ();
+        });
+
+        var close_button = new Gtk.Button.from_icon_name ("window-close-symbolic", Gtk.IconSize.SMALL_TOOLBAR);
+        close_button.relief = Gtk.ReliefStyle.NONE;
+        close_button.clicked.connect (() => {
+            info_revealer.set_reveal_child (false);
+            info_revealer.hide ();
+            hide ();
+            destroy ();
+        });
+
+        var message_label = new Gtk.Label (_("Calendar \"%s\" removed.").printf (source.display_name));
+        message_label.hexpand = true;
+        message_label.xalign = 0;
+        info_revealer_grid.attach (message_label, 0, 0, 1, 1);
+        info_revealer_grid.attach (undo_button, 1, 0, 1, 1);
+        info_revealer_grid.attach (close_button, 2, 0, 1, 1);
+
+        main_grid.attach (info_revealer, 0, 0, 1, 1);
+        main_grid.attach (revealer, 0, 1, 1, 1);
+        add (main_grid);
+
+        add_events (Gdk.EventMask.ENTER_NOTIFY_MASK|Gdk.EventMask.LEAVE_NOTIFY_MASK);
+        enter_notify_event.connect ((event) => {
+            delete_button.visible = true;
+            edit_button.visible = true;
+            return false;
+        });
+
+        leave_notify_event.connect_after ((event) => {
+            delete_button.visible = false;
+            edit_button.visible = false;
+            return false;
+        });
+    }
+
+    // We need a custom one because the buttons are hidden if the calendar is not shown.
+    public override void get_preferred_width (out int minimum_width, out int natural_width) {
+        base.get_preferred_width (out minimum_width, out natural_width);
+        if (visible == false)
+            return;
+
+        int total_natural_width = 0;
+        int _minimum_width;
+        int _natural_width;
+        if (edit_button.visible == false && info_revealer.visible == false) {
+            edit_button.show ();
+            edit_button.get_preferred_width (out _minimum_width, out _natural_width);
+            edit_button.hide ();
+            // +6 because the grid has a 6px margin between every columns
+            total_natural_width = total_natural_width + _natural_width + 6;
+        }
+
+        if (delete_button.visible == false && info_revealer.visible == false) {
+            delete_button.show ();
+            delete_button.get_preferred_width (out _minimum_width, out _natural_width);
+            delete_button.hide ();
+            // +6 because the grid has a 6px margin between every columns
+            total_natural_width = total_natural_width + _natural_width + 6;
+        }
+
+        minimum_width = minimum_width + total_natural_width;
+        natural_width = natural_width + total_natural_width;
+    }
+
+    public void source_has_changed () {
+        calendar_name_label.set_markup ("<b>%s</b>".printf (GLib.Markup.escape_text (source.dup_display_name ())));
+        E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR);
+
+        var color = Gdk.RGBA ();
+        color.parse (cal.dup_color());
+        calendar_color_label.override_background_color (Gtk.StateFlags.NORMAL, color);
+
+        visible_checkbutton.active = cal.selected;
+    }
+
+    public void show_calendar_removed () {
+        info_revealer.no_show_all = false;
+        info_revealer.show_all ();
+        revealer.set_reveal_child (false);
+        revealer.hide ();
+        info_revealer.set_reveal_child (true);
+    }
+}
 \ No newline at end of file
 
=== modified file 'src/View/SourceSelector.vala'
--- src/View/SourceSelector.vala	2013-09-01 23:22:22 +0000
+++ src/View/SourceSelector.vala	2014-01-18 21:06:28 +0000
@@ -14,131 +14,47 @@
 
 public class Maya.View.SourceSelector : Granite.Widgets.PopOver {
     
-    private Gtk.TreeStore tree_store;
-    private Gtk.TreeView tree_view;
-    private Gee.HashMap<string, Gtk.TreeIter?> iter_map;
-    private Gtk.TreeIter default_iter;
-    
-    private Gtk.ToolButton remove_button;
-    private Gtk.ToolButton edit_button;
-
-    private enum Columns {
-        TOGGLE,
-        TEXT,
-        COLOR,
-        SOURCE,
-        VISIBLE,
-        N_COLUMNS
-    }
-    
-    public SourceSelector () {
-        
-        var main_grid = new Gtk.Grid ();
-        
-        tree_store = new Gtk.TreeStore (Columns.N_COLUMNS, typeof (bool), typeof (string), typeof (string), typeof (E.Source), typeof (bool));
-        tree_view = new Gtk.TreeView.with_model (tree_store);
-        iter_map = new Gee.HashMap<string, Gtk.TreeIter?>();
-
-        var toggle = new Gtk.CellRendererToggle ();
-        toggle.toggled.connect ((toggle, path) => {
-            var tree_path = new Gtk.TreePath.from_string (path);
-            Gtk.TreeIter iter;
-            tree_store.get_iter (out iter, tree_path);
-            tree_store.set (iter, Columns.TOGGLE, !toggle.active);
-            GLib.Value src;
-            tree_store.get_value (iter, 3, out src);
-            E.SourceCalendar cal = (E.SourceCalendar)((E.Source)src).get_extension (E.SOURCE_EXTENSION_CALENDAR);
-            if (!cal.selected == true) {
-                app.calmodel.add_source ((E.Source)src);
-            } else {
-                app.calmodel.remove_source ((E.Source)src);
-            }
-            cal.set_selected (!cal.selected);
-            try {
-                ((E.Source)src).write_sync ();
-            } catch (GLib.Error error) {
-                critical (error.message);
-            }
-        });
-
-        var text = new Gtk.CellRendererText ();
-        var column = new Gtk.TreeViewColumn ();
-        column.pack_start (text, true);
-        column.add_attribute (text, "text", Columns.TEXT);
-        column.add_attribute (text, "cell_background", Columns.COLOR);
-        tree_view.append_column (column);
-
-        column = new Gtk.TreeViewColumn ();
-        column.pack_start (toggle, false);
-        column.add_attribute (toggle, "active", Columns.TOGGLE);
-        column.add_attribute (toggle, "cell_background", Columns.COLOR);
-        column.add_attribute (toggle, "visible", Columns.VISIBLE);
-        tree_view.append_column (column);
- 
-        tree_view.set_headers_visible (false);
-        
-        var backend_map = new Gee.HashMap<string, Gtk.TreeIter?>();
+    private Gee.HashMap<string, SourceItem?> src_map;
+    
+    private Model.CalendarModel calmodel;
+    
+    private Gtk.Stack stack;
+    private SourceDialog src_dialog = null;
+    
+    private Gtk.Grid main_grid;
+    private Gtk.Grid calendar_grid;
+    private int calendar_index = 0;
+    private Gtk.ScrolledWindow scroll;
+    private E.SourceRegistry registry;
+    
+    public SourceSelector (Model.CalendarModel calmodel) {
+        
+        this.calmodel = calmodel;
+        
+        stack = new Gtk.Stack ();
+        
+        calendar_grid = new Gtk.Grid ();
+        calendar_grid.row_spacing = 12;
+        calendar_grid.margin_left = 6;
+        calendar_grid.margin_right = 6;
+        
+        scroll = new Gtk.ScrolledWindow (null, null);
+        scroll.hscrollbar_policy = Gtk.PolicyType.NEVER;
+        scroll.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
+        scroll.expand = true;
+        scroll.add (calendar_grid);
+        
+        main_grid = new Gtk.Grid ();
+        main_grid.row_spacing = 6;
+        main_grid.margin_top = 6;
+        
+        src_map = new Gee.HashMap<string, SourceItem?>();
         
         try {
-            var registry = new E.SourceRegistry.sync (null);
+            registry = new E.SourceRegistry.sync (null);
             var sources = registry.list_sources (E.SOURCE_EXTENSION_CALENDAR);
-            // Do not show sources that are on the trash
-            foreach (var source in app.calmodel.calendar_trash) {
-                foreach (var source2 in sources) {
-                    if (source.dup_uid () == source2.dup_uid ()) {
-                        sources.remove (source2);
-                        break;
-                    }
-                }
-            }
-            
-            var selection = tree_view.get_selection ();
-            selection.mode = Gtk.SelectionMode.BROWSE;
-            selection.set_select_function (select_func);
-            
-            foreach (var backend in backends_manager.backends) {
-                Gtk.TreeIter? b_iter = null;
-                foreach (var src in sources) {
-                    Gtk.TreeIter iter;
-                    if (src.parent == backend.get_uid ()) {
-                        if (b_iter == null) {
-                            tree_store.append (out b_iter, null);
-                            tree_store.set (b_iter, Columns.TEXT, backend.get_name (), Columns.VISIBLE, false);
-                            backend_map.set (backend.get_uid (), b_iter);
-                        }
-                        E.SourceCalendar cal = (E.SourceCalendar)src.get_extension (E.SOURCE_EXTENSION_CALENDAR);
-                        tree_store.append (out iter, b_iter);
-                        tree_store.set (iter, Columns.TOGGLE, cal.selected, Columns.TEXT, src.dup_display_name (), 
-                                               Columns.COLOR, cal.dup_color(), Columns.SOURCE, src, 
-                                               Columns.VISIBLE, true);
-                        iter_map.set (src.dup_uid (), iter);
-                        if (src.get_uid() == registry.default_calendar.uid) {
-                            default_iter = iter;
-                            selection.select_iter (iter);
-                        }
-                    }
-                }
-            }
-            
-            Gtk.TreeIter? other = null;
             foreach (var src in sources) {
-                if (!backend_map.keys.contains (src.parent)) {
-                    if (other == null) {
-                        tree_store.append (out other, null);
-                        tree_store.set (other, Columns.TEXT, _("Other"), Columns.VISIBLE, false);
-                    }
-                    Gtk.TreeIter iter;
-                    E.SourceCalendar cal = (E.SourceCalendar)src.get_extension (E.SOURCE_EXTENSION_CALENDAR);
-                    tree_store.append (out iter, other);
-                    tree_store.set (iter, Columns.TOGGLE, cal.selected, Columns.TEXT, src.dup_display_name (), 
-                                               Columns.COLOR, cal.dup_color(), Columns.SOURCE, src, 
-                                               Columns.VISIBLE, true);
-                    iter_map.set (src.dup_uid (), iter);
-                    if (src.get_uid() == registry.default_calendar.uid) {
-                        default_iter = iter;
-                        selection.select_iter (iter);
-                    }
-                }
+                source_added (src);
             }
             
             registry.source_removed.connect (source_removed);
@@ -150,132 +66,116 @@
             critical (error.message);
         }
         
-        tree_view.expand_all ();
-        
-        var scroll = new Gtk.ScrolledWindow (null, null);
-        scroll.set_size_request (150, 150);
-        scroll.hscrollbar_policy = Gtk.PolicyType.NEVER;
-        scroll.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
-        scroll.shadow_type = Gtk.ShadowType.IN;
-        scroll.expand = true;
-        scroll.add (tree_view);
-
-        var toolbar = new Gtk.Toolbar();
-        toolbar.set_style (Gtk.ToolbarStyle.ICONS);
-        toolbar.get_style_context ().add_class ("inline-toolbar");
-        toolbar.set_icon_size (Gtk.IconSize.SMALL_TOOLBAR);
-        toolbar.set_show_arrow (false);
-        toolbar.hexpand = true;
-
-        scroll.get_style_context ().set_junction_sides (Gtk.JunctionSides.BOTTOM);
-        toolbar.get_style_context ().add_class (Gtk.STYLE_CLASS_INLINE_TOOLBAR);
-        toolbar.get_style_context ().set_junction_sides (Gtk.JunctionSides.TOP);
-        
-        var add_button = new Gtk.ToolButton (null, _("Add…"));
-        add_button.set_tooltip_text (_("Add…"));
-        add_button.set_icon_name ("list-add-symbolic");
-        add_button.clicked.connect (create_source);
-        
-        remove_button = new Gtk.ToolButton (null, _("Remove"));
-        remove_button.set_tooltip_text (_("Remove"));
-        remove_button.set_icon_name ("list-remove-symbolic");
-        remove_button.clicked.connect (remove_source);
-        remove_button.sensitive = false;
-        
-        edit_button = new Gtk.ToolButton (null, _("Edit…"));
-        edit_button.set_tooltip_text (_("Edit…"));
-        edit_button.set_icon_name ("document-properties-symbolic");
-        edit_button.clicked.connect (edit_source);
-        edit_button.sensitive = false;
-        
-        toolbar.insert (add_button, -1);
-        toolbar.insert (remove_button, -1);
-        toolbar.insert (edit_button, -1);
+        var separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL);
+        separator.hexpand = true;
+        
+        var add_calendar_button = new Gtk.Button.with_label (_("Add New Calendar…"));
+        add_calendar_button.relief = Gtk.ReliefStyle.NONE;
+        add_calendar_button.hexpand = true;
+        add_calendar_button.get_style_context ().add_class (Gtk.STYLE_CLASS_MENUITEM);
+        add_calendar_button.get_style_context ().remove_class (Gtk.STYLE_CLASS_BUTTON);
+        add_calendar_button.clicked.connect (create_source);
+        
+        var add_calendar_grid = new Gtk.Grid ();
+        add_calendar_grid.get_style_context ().add_class (Gtk.STYLE_CLASS_MENU);
+        add_calendar_grid.attach (add_calendar_button, 0, 0, 1, 1);
+        
+        main_grid.attach (scroll, 0, 0, 1, 1);
+        main_grid.attach (separator, 0, 1, 1, 1);
+        main_grid.attach (add_calendar_grid, 0, 2, 1, 1);
+        
+        stack.add_named (main_grid, "main");
         
         var container = (Gtk.Container) get_content_area ();
-        container.add (main_grid);
-        main_grid.attach (scroll, 0, 0, 1, 1);
-        main_grid.attach (toolbar, 0, 1, 1, 1);
-    }
-    
-    private bool select_func (Gtk.TreeSelection selection, Gtk.TreeModel model,
-                              Gtk.TreePath path, bool path_currently_selected) {
-        bool selectable = true;
-        Gtk.TreeIter iter;
-        tree_store.get_iter (out iter, path);
-
-        if (tree_store.iter_has_child (iter)) {
-            selectable = false;
-        } else {
-            activate_buttons ();
-        }
-        
-        return selectable;
-    }
-    
-    private void activate_buttons () {
-        edit_button.sensitive = true;
-        remove_button.sensitive = true;
+        container.margin_right = container.margin_right - 5;
+        container.margin_left = container.margin_left - 5;
+        container.add (stack);
+        main_grid.show_all ();
     }
     
     private void source_removed (E.Source source) {
-        if (iter_map.has_key (source.dup_uid ())) {
-            var iter = iter_map.get (source.dup_uid ());
-            tree_store.remove (ref iter);
-            iter_map.unset (source.dup_uid (), null);
-        }
+        var source_item = src_map.get (source.dup_uid ());
+        source_item.hide ();
+        src_map.unset (source.dup_uid ());
+        source_item.destroy ();
     }
     
     private void source_added (E.Source source) {
-        Gtk.TreeIter iter;
-        E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR);
-        tree_store.append (out iter, null);
-        tree_store.set (iter, Columns.TOGGLE, cal.selected, Columns.TEXT, source.dup_display_name ());
-        iter_map.set (source.dup_uid (), iter);
+        var source_item = new SourceItem (source, calmodel);
+        source_item.edit_request.connect (edit_source);
+        source_item.remove_request.connect (remove_source);
+        
+        calendar_grid.attach (source_item, 0, calendar_index, 1, 1);
+        int minimum_height;
+        int natural_height;
+        calendar_index++;
+        calendar_grid.show_all ();
+        calendar_grid.get_preferred_height (out minimum_height, out natural_height);
+        if (natural_height > 150) {
+            scroll.set_size_request (-1, 150);
+        } else {
+            scroll.set_size_request (-1, natural_height);
+        }
+        
+        src_map.set (source.dup_uid (), source_item);
+        
     }
     
     private void source_disabled (E.Source source) {
-        
+        var source_item = src_map.get (source.dup_uid ());
+        source_item.source_has_changed ();
     }
     
     private void source_enabled (E.Source source) {
-        
+        var source_item = src_map.get (source.dup_uid ());
+        source_item.source_has_changed ();
     }
     
     private void source_changed (E.Source source) {
-        
+        var source_item = src_map.get (source.dup_uid ());
+        source_item.source_has_changed ();
     }
     
     private void create_source () {
-        var dialog = new SourceDialog ();
-        this.hide ();
-        dialog.present ();
-    }
-    
-    private void remove_source () {
-        var selection = tree_view.get_selection ();
-        Gtk.TreeModel model;
-        Gtk.TreeIter iter;
-        selection.get_selected (out model, out iter);
-        GLib.Value src;
-        tree_store.get_value (iter, 3, out src);
-        var source = src as E.Source;
-        app.calmodel.delete_calendar (source);
-        app.show_calendar_removed (source.display_name);
-        this.hide ();
-    }
-    
-    private void edit_source () {
-        var selection = tree_view.get_selection ();
-        Gtk.TreeModel model;
-        Gtk.TreeIter iter;
-        selection.get_selected (out model, out iter);
-        GLib.Value src;
-        tree_store.get_value (iter, 3, out src);
-        var source = src as E.Source;
-        var dialog = new SourceDialog (source);
-        this.hide ();
-        dialog.present ();
-    }
-    
-}
+        if (src_dialog == null) {
+            src_dialog = new SourceDialog ();
+            src_dialog.go_back.connect (() => {switch_to_main ();});
+            stack.add_named (src_dialog, "source");
+        }
+        src_dialog.set_source (null);
+        switch_to_source ();
+    }
+    
+    private void remove_source (E.Source source) {
+        calmodel.delete_calendar (source);
+        var source_item = src_map.get (source.dup_uid ());
+        source_item.show_calendar_removed ();
+    }
+    
+    private void edit_source (E.Source source) {
+        if (src_dialog == null) {
+            src_dialog = new SourceDialog ();
+            src_dialog.go_back.connect (() => {switch_to_main ();});
+            stack.add_named (src_dialog, "source");
+        }
+        src_dialog.set_source (source);
+        switch_to_source ();
+    }
+    
+    private void switch_to_main () {
+        main_grid.no_show_all = false;
+        main_grid.show ();
+        stack.set_visible_child_full ("main", Gtk.StackTransitionType.SLIDE_RIGHT);
+        src_dialog.hide ();
+        src_dialog.no_show_all = true;
+    }
+    
+    private void switch_to_source () {
+        src_dialog.no_show_all = false;
+        src_dialog.show ();
+        stack.set_visible_child_full ("source", Gtk.StackTransitionType.SLIDE_LEFT);
+        main_grid.hide ();
+        main_grid.no_show_all = true;
+    }
+    
+}
 \ No newline at end of file
 
=== modified file 'src/View/Widgets/Postler/FlowBox.vala'
--- src/View/Widgets/Postler/FlowBox.vala	2013-11-14 18:05:39 +0000
+++ src/View/Widgets/Postler/FlowBox.vala	2014-01-18 21:06:28 +0000
@@ -11,17 +11,18 @@
 
 namespace Maya.View.Widgets {
     public class FlowBox : Gtk.Container {
-        List<Gtk.Widget> children;
+        Gee.LinkedList<Gtk.Widget> children;
         int last_row_count;
         int last_row_height;
 
         public FlowBox () {
+            children = new Gee.LinkedList<Gtk.Widget> ();
             set_has_window (false);
             set_resize_mode (Gtk.ResizeMode.QUEUE);
         }
 
         public override void add (Gtk.Widget widget) {
-            children.append (widget);
+            children.add (widget);
             widget.set_parent (this);
             if (get_realized ())
                 widget.realize ();
@@ -42,9 +43,9 @@
                 callback (child);
         }
 
-        public void reorder_child (Gtk.Widget widget, int position) {
+        public void add_child (Gtk.Widget widget) {
             children.remove (widget);
-            children.insert (widget, position);
+            children.add (widget);
             queue_resize ();
         }
 
@@ -115,4 +116,4 @@
         }
 
     }
-}
+}
 \ No newline at end of file
 
=== modified file 'src/View/Widgets/Postler/GuestEntry.vala'
--- src/View/Widgets/Postler/GuestEntry.vala	2013-08-31 15:14:02 +0000
+++ src/View/Widgets/Postler/GuestEntry.vala	2014-01-18 21:06:28 +0000
@@ -139,7 +139,7 @@
             });
             button.show_all ();
             add (button);
-            reorder_child (entry, -1);
+            add_child (entry);
             empty = false;
         }
 
@@ -188,4 +188,4 @@
             }
         }
     }
-}
+}
 \ No newline at end of file
 
=== modified file 'src/config.vala.cmake'
--- src/config.vala.cmake	2013-08-29 17:04:35 +0000
+++ src/config.vala.cmake	2014-01-18 21:06:28 +0000
@@ -6,4 +6,5 @@
     public const string RELEASE_NAME = "@RELEASE_NAME@";
     public const string VERSION = "@VERSION@";
     public const string VERSION_INFO = "@VERSION_INFO@";
+    public const string APP_NAME = "@APP_NAME@";
 }