Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui: migrating from GdHeaderBar to GtkHeaderBar

Browse Source
This commit is contained in:
Erick Pérez Castellanos
2014-12-04 17:10:20 -05:00
parent d2a5b20d9d
commit dd969cf14d
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-application.c
+1 -1
View File
@@ -157,7 +157,7 @@ gcal_application_activate (GApplication *application)
G_SETTINGS_BIND_SET | G_SETTINGS_BIND_GET); G_SETTINGS_BIND_SET | G_SETTINGS_BIND_GET);
gtk_window_set_title (GTK_WINDOW (priv->window), _("Calendar")); gtk_window_set_title (GTK_WINDOW (priv->window), _("Calendar"));
gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (priv->window), gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (priv->window),
TRUE); FALSE);
variant = g_settings_get_value (priv->settings, "window-size"); variant = g_settings_get_value (priv->settings, "window-size");
size = g_variant_get_fixed_array (variant, &n_elements, sizeof (gint32)); size = g_variant_get_fixed_array (variant, &n_elements, sizeof (gint32));
src/gcal-window.c
+18 -16
View File
@@ -249,7 +249,7 @@ gcal_window_constructed (GObject *object)
GTK_ORIENTATION_VERTICAL); GTK_ORIENTATION_VERTICAL);
/* header_bar */ /* header_bar */
priv->header_bar = gd_header_bar_new (); priv->header_bar = gtk_header_bar_new ();
/* header_bar: new */ /* header_bar: new */
priv->new_button = gd_header_simple_button_new (); priv->new_button = gd_header_simple_button_new ();
@@ -259,7 +259,7 @@ gcal_window_constructed (GObject *object)
gtk_widget_get_style_context (priv->new_button), gtk_widget_get_style_context (priv->new_button),
"suggested-action"); "suggested-action");
/* FIXME: gtk_actionable_set_action_name (GTK_ACTIONABLE (forward_button), "win.new-event"); */ /* FIXME: gtk_actionable_set_action_name (GTK_ACTIONABLE (forward_button), "win.new-event"); */
gd_header_bar_pack_start (GD_HEADER_BAR (priv->header_bar), priv->new_button); gtk_header_bar_pack_start (GTK_HEADER_BAR (priv->header_bar), priv->new_button);
/* header_bar: views. Temporarily, since this will be made of GdStackSwitcher */ /* header_bar: views. Temporarily, since this will be made of GdStackSwitcher */
priv->views_switcher = gtk_image_new_from_icon_name ("face-wink-symbolic", GTK_ICON_SIZE_MENU); priv->views_switcher = gtk_image_new_from_icon_name ("face-wink-symbolic", GTK_ICON_SIZE_MENU);
@@ -269,7 +269,7 @@ gcal_window_constructed (GObject *object)
search_button = gd_header_toggle_button_new (); search_button = gd_header_toggle_button_new ();
gd_header_button_set_symbolic_icon_name (GD_HEADER_BUTTON (search_button), gd_header_button_set_symbolic_icon_name (GD_HEADER_BUTTON (search_button),
"edit-find-symbolic"); "edit-find-symbolic");
gd_header_bar_pack_end (GD_HEADER_BAR (priv->header_bar), search_button); gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->header_bar), search_button);
/* header_bar: menu */ /* header_bar: menu */
menu_button = gd_header_menu_button_new (); menu_button = gd_header_menu_button_new ();
@@ -277,10 +277,10 @@ gcal_window_constructed (GObject *object)
_("Settings")); _("Settings"));
gd_header_button_set_symbolic_icon_name (GD_HEADER_BUTTON (menu_button), gd_header_button_set_symbolic_icon_name (GD_HEADER_BUTTON (menu_button),
"emblem-system-symbolic"); "emblem-system-symbolic");
gd_header_bar_pack_end (GD_HEADER_BAR (priv->header_bar), menu_button); gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->header_bar), menu_button);
gtk_widget_set_hexpand (priv->header_bar, TRUE); gtk_widget_set_hexpand (priv->header_bar, TRUE);
gtk_container_add (GTK_CONTAINER (priv->main_box), priv->header_bar); /* gtk_container_add (GTK_CONTAINER (priv->main_box), priv->header_bar); */
/* search_bar */ /* search_bar */
priv->search_entry = gtk_search_entry_new (); priv->search_entry = gtk_search_entry_new ();
@@ -328,9 +328,11 @@ gcal_window_constructed (GObject *object)
gtk_container_add (GTK_CONTAINER (object), priv->main_box); gtk_container_add (GTK_CONTAINER (object), priv->main_box);
gtk_widget_show_all (priv->main_box); gtk_widget_show_all (priv->main_box);
/* FIXME: hack to ensure proper working of gd_header_bar */ /* FIXME: hack to ensure proper working of gtk_header_bar */
gd_header_bar_set_custom_title (GD_HEADER_BAR (priv->header_bar), gtk_header_bar_set_custom_title (GTK_HEADER_BAR (priv->header_bar),
priv->views_switcher); priv->views_switcher);
gtk_window_set_titlebar (GTK_WINDOW (object), priv->header_bar);
} }
static void static void
@@ -412,8 +414,8 @@ gcal_window_search_toggled (GObject *object,
/* update headder_bar widget */ /* update headder_bar widget */
gtk_widget_hide (priv->new_button); gtk_widget_hide (priv->new_button);
gd_header_bar_set_custom_title (GD_HEADER_BAR (priv->header_bar), gtk_header_bar_set_custom_title (GTK_HEADER_BAR (priv->header_bar),
NULL); NULL);
/* _prepare_for_search */ /* _prepare_for_search */
} }
else else
@@ -421,8 +423,8 @@ gcal_window_search_toggled (GObject *object,
g_debug ("Leaving search mode"); g_debug ("Leaving search mode");
/* update header_bar */ /* update header_bar */
gtk_widget_show (priv->new_button); gtk_widget_show (priv->new_button);
gd_header_bar_set_custom_title (GD_HEADER_BAR (priv->header_bar), gtk_header_bar_set_custom_title (GTK_HEADER_BAR (priv->header_bar),
priv->views_switcher); priv->views_switcher);
/* return to last active_view */ /* return to last active_view */
gd_stack_set_visible_child (GD_STACK (priv->views_stack), gd_stack_set_visible_child (GD_STACK (priv->views_stack),
priv->views[priv->active_view]); priv->views[priv->active_view]);
@@ -450,13 +452,13 @@ gcal_window_search_changed (GtkEditable *editable,
{ {
title = g_strdup_printf ("Results for \"%s\"", title = g_strdup_printf ("Results for \"%s\"",
gtk_entry_get_text (GTK_ENTRY (entry))); gtk_entry_get_text (GTK_ENTRY (entry)));
gd_header_bar_set_title (GD_HEADER_BAR (priv->header_bar), gtk_header_bar_set_title (GTK_HEADER_BAR (priv->header_bar),
title); title);
} }
else else
{ {
gd_header_bar_set_title (GD_HEADER_BAR (priv->header_bar), gtk_header_bar_set_title (GTK_HEADER_BAR (priv->header_bar),
""); "");
} }
} }
} }