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

window: move arrow buttons to headerbar

Browse Source 
This is part of the ongoing efforts to fit Calendar with the latest designs.
This commit is contained in:
Georges Basile Stavracas Neto
2014-12-04 17:10:54 -05:00
committed by Erick Pérez Castellanos
parent 52fc61a1a5
commit 2970729324
5 changed files with 77 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-nav-bar.c
-20
View File
@@ -87,8 +87,6 @@ gcal_nav_bar_class_init (GcalNavBarClass *klass)
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/nav_bar.ui");
/* Bind internals widgets */
gtk_widget_class_bind_template_child_private (widget_class, GcalNavBar, back_button);
gtk_widget_class_bind_template_child_private (widget_class, GcalNavBar, forward_button);
gtk_widget_class_bind_template_child_private (widget_class, GcalNavBar, left_label);
gtk_widget_class_bind_template_child_private (widget_class, GcalNavBar, right_label);
}
@@ -164,21 +162,3 @@ gcal_nav_bar_new (void)
{
return g_object_new (GCAL_TYPE_NAV_BAR, NULL);
}
GtkWidget*
gcal_nav_bar_get_prev_button (GcalNavBar *nav_bar)
{
GcalNavBarPrivate *priv;
priv = gcal_nav_bar_get_instance_private (nav_bar);
return priv->back_button;
}
GtkWidget*
gcal_nav_bar_get_next_button (GcalNavBar *nav_bar)
{
GcalNavBarPrivate *priv;
priv = gcal_nav_bar_get_instance_private (nav_bar);
return priv->forward_button;
}
src/gcal-nav-bar.h
-4
View File
@@ -48,10 +48,6 @@ GType gcal_nav_bar_get_type (void);
GtkWidget* gcal_nav_bar_new (void);
GtkWidget* gcal_nav_bar_get_prev_button (GcalNavBar *nav_bar);
GtkWidget* gcal_nav_bar_get_next_button (GcalNavBar *nav_bar);
G_END_DECLS
#endif /* __GCAL_NAV_BAR_H__ */
src/gcal-window.c
+5 -6
View File
@@ -70,7 +70,9 @@ typedef struct
GtkWidget *menu_button;
GtkWidget *search_button;
GtkWidget *search_entry;
GtkWidget *back_button;
GtkWidget *today_button;
GtkWidget *forward_button;
GtkWidget *views_switcher;
/* day, week, month, year, list, search */
@@ -235,7 +237,7 @@ date_updated (GtkButton *button,
priv = gcal_window_get_instance_private (GCAL_WINDOW (user_data));
move_today = priv->today_button == (GtkWidget*) button;
move_back = gcal_nav_bar_get_prev_button (GCAL_NAV_BAR (priv->nav_bar)) == (GtkWidget*) button;
move_back = priv->back_button == (GtkWidget*) button;
if (move_today)
{
@@ -974,7 +976,9 @@ gcal_window_class_init(GcalWindowClass *klass)
gtk_widget_class_bind_template_child_private (widget_class, GcalWindow, search_bar);
gtk_widget_class_bind_template_child_private (widget_class, GcalWindow, search_button);
gtk_widget_class_bind_template_child_private (widget_class, GcalWindow, search_entry);
gtk_widget_class_bind_template_child_private (widget_class, GcalWindow, back_button);
gtk_widget_class_bind_template_child_private (widget_class, GcalWindow, today_button);
gtk_widget_class_bind_template_child_private (widget_class, GcalWindow, forward_button);
gtk_widget_class_bind_template_child_private (widget_class, GcalWindow, views_overlay);
gtk_widget_class_bind_template_child_private (widget_class, GcalWindow, views_stack);
gtk_widget_class_bind_template_child_private (widget_class, GcalWindow, views_switcher);
@@ -1109,11 +1113,6 @@ gcal_window_constructed (GObject *object)
G_CALLBACK (event_activated), object);
}
}
g_signal_connect (gcal_nav_bar_get_prev_button (GCAL_NAV_BAR (priv->nav_bar)),
"clicked", G_CALLBACK (date_updated), object);
g_signal_connect (gcal_nav_bar_get_next_button (GCAL_NAV_BAR (priv->nav_bar)),
"clicked", G_CALLBACK (date_updated), object);
}
static void