gergely/astrognome
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Succesfully changed to the GdStack framework from the GtkNotebook

Browse Source 
This will be further transitioned to GtkStack when Gtk 3.10 goes stable
This commit is contained in:
Gergely Polonkai 2013-09-13 22:42:44 +02:00
parent 5ced97c53b
commit d3457b0161
2 changed files with 33 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/ag-window.c
View File

@ -10,7 +10,8 @@
struct _AgWindowPrivate { struct _AgWindowPrivate {
GtkWidget *grid; GtkWidget *grid;
GtkWidget *header_bar; GtkWidget *header_bar;
GtkWidget *notebook; GtkWidget *stack;
GtkWidget *stack_switcher;
GtkWidget *name; GtkWidget *name;
GtkWidget *north_lat; GtkWidget *north_lat;
GtkWidget *south_lat; GtkWidget *south_lat;
@ -26,11 +27,11 @@ struct _AgWindowPrivate {
GtkWidget *second; GtkWidget *second;
GtkBuilder *builder; GtkBuilder *builder;
gint tab_chart; GtkWidget *tab_chart;
gint tab_aspects; GtkWidget *tab_aspects;
gint tab_points; GtkWidget *tab_points;
gint tab_edit; GtkWidget *tab_edit;
gint current_tab; GtkWidget *current_tab;
GsweTimestamp *timestamp; GsweTimestamp *timestamp;
GsweMoment *moment; GsweMoment *moment;
@ -105,47 +106,28 @@ recalculate_chart(AgWindow *window)
} }
static void static void
set_tab_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data) tab_changed_cb(GdStack *stack, GParamSpec *pspec, AgWindow *window)
{ {
AgWindow *window = AG_WINDOW(user_data); const gchar *active_tab_name = gd_stack_get_visible_child_name(stack);
const gchar *target = g_variant_get_string(parameter, NULL);
gint target_tab = 0;
g_action_change_state(G_ACTION(action), parameter); g_debug("Active tab changed: %s", active_tab_name);
if (strcmp(target, "chart") == 0) {
target_tab = window->priv->tab_chart;
} else if (strcmp(target, "aspects") == 0) {
target_tab = window->priv->tab_aspects;
} else if (strcmp(target, "points") == 0) {
target_tab = window->priv->tab_points;
} else if (strcmp(target, "edit") == 0) {
target_tab = window->priv->tab_edit;
} else {
g_warning("Unknown tab!");
if (active_tab_name == NULL) {
return; return;
} }
if ((window->priv->current_tab == window->priv->tab_edit) && (target_tab != window->priv->tab_edit)) { // Note that priv->current_tab is actually the previously selected tab, not the real active one!
if (window->priv->current_tab == window->priv->tab_edit) {
g_debug("Recalculating chart data");
recalculate_chart(window); recalculate_chart(window);
} }
window->priv->current_tab = target_tab; window->priv->current_tab = gd_stack_get_visible_child(stack);
gtk_notebook_set_current_page(GTK_NOTEBOOK(window->priv->notebook), target_tab);
}
static void
change_tab_cb(GSimpleAction *action, GVariant *state, gpointer user_data)
{
g_simple_action_set_state(action, state);
} }
static GActionEntry win_entries[] = { static GActionEntry win_entries[] = {
{ "close", close_cb, NULL, NULL, NULL }, { "close", close_cb, NULL, NULL, NULL },
{ "gear-menu", gear_menu_cb, NULL, "false", NULL }, { "gear-menu", gear_menu_cb, NULL, "false", NULL },
{ "tab-change", set_tab_cb, "s", "'edit'", change_tab_cb },
}; };
static void static void
@ -287,8 +269,6 @@ window_populate(AgWindow *window)
AgWindowPrivate *priv = window->priv; AgWindowPrivate *priv = window->priv;
GtkWidget *menu_button; GtkWidget *menu_button;
GObject *menu; GObject *menu;
GtkWidget *placeholder;
GtkWidget *tab;
priv->header_bar = gd_header_bar_new(); priv->header_bar = gd_header_bar_new();
menu_button = gd_header_menu_button_new(); menu_button = gd_header_menu_button_new();
@ -302,24 +282,30 @@ window_populate(AgWindow *window)
menu = gtk_builder_get_object(priv->builder, "window-menu"); menu = gtk_builder_get_object(priv->builder, "window-menu");
gtk_menu_button_set_menu_model(GTK_MENU_BUTTON(menu_button), G_MENU_MODEL(menu)); gtk_menu_button_set_menu_model(GTK_MENU_BUTTON(menu_button), G_MENU_MODEL(menu));
priv->notebook = gtk_notebook_new(); priv->stack = gd_stack_new();
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(priv->notebook), FALSE); gtk_grid_attach(GTK_GRID(priv->grid), priv->stack, 0, 1, 1, 1);
gtk_grid_attach(GTK_GRID(priv->grid), priv->notebook, 0, 1, 1, 1); g_signal_connect(priv->stack, "notify::visible-child", G_CALLBACK(tab_changed_cb), window);
tab = notebook_edit(window); priv->stack_switcher = gd_stack_switcher_new();
priv->tab_edit = gtk_notebook_append_page(GTK_NOTEBOOK(priv->notebook), tab, NULL); gd_stack_switcher_set_stack(GD_STACK_SWITCHER(priv->stack_switcher), GD_STACK(priv->stack));
placeholder = gtk_label_new("PLACEHOLDER FOR THE CHART WEBKIT"); priv->tab_edit = notebook_edit(window);
priv->tab_chart = gtk_notebook_append_page(GTK_NOTEBOOK(priv->notebook), placeholder, NULL); gd_stack_add_titled(GD_STACK(priv->stack), priv->tab_edit, "edit", _("Edit"));
placeholder = gtk_label_new("PLACEHOLDER FOR THE ASPECTS TABLE"); priv->tab_chart = gtk_label_new("PLACEHOLDER FOR THE CHART WEBKIT");
priv->tab_aspects = gtk_notebook_append_page(GTK_NOTEBOOK(priv->notebook), placeholder, NULL); gd_stack_add_titled(GD_STACK(priv->stack), priv->tab_chart, "chart", _("Chart"));
placeholder = gtk_label_new("PLACEHOLDER FOR THE POINTS TABLES"); priv->tab_aspects = gtk_label_new("PLACEHOLDER FOR THE ASPECTS TABLE");
priv->tab_points = gtk_notebook_append_page(GTK_NOTEBOOK(priv->notebook), placeholder, NULL); gd_stack_add_titled(GD_STACK(priv->stack), priv->tab_aspects, "aspects", _("Aspects"));
priv->tab_points = gtk_label_new("PLACEHOLDER FOR THE POINTS TABLES");
gd_stack_add_titled(GD_STACK(priv->stack), priv->tab_points, "points", _("Points"));
/* TODO: change to the Chart tab if we are opening an existing chart! */ /* TODO: change to the Chart tab if we are opening an existing chart! */
gtk_notebook_set_current_page(GTK_NOTEBOOK(priv->notebook), priv->tab_edit); gd_stack_set_visible_child_name(GD_STACK(priv->stack), "edit");
priv->current_tab = priv->tab_edit;
gd_header_bar_set_custom_title(GD_HEADER_BAR(priv->header_bar), priv->stack_switcher);
gtk_widget_show_all(priv->grid); gtk_widget_show_all(priv->grid);
} }

26
src/astrognome.ui
View File

@ -29,31 +29,5 @@
</section> </section>
</menu> </menu>
<menu id="window-menu"> <menu id="window-menu">
<section>
<item>
<attribute name="label" translatable="yes">Chart</attribute>
<attribute name="action">win.tab-change</attribute>
<attribute name="target">chart</attribute>
<attribute name="accel">F5</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Aspects</attribute>
<attribute name="action">win.tab-change</attribute>
<attribute name="target">aspects</attribute>
<attribute name="accel">F9</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Points</attribute>
<attribute name="action">win.tab-change</attribute>
<attribute name="target">points</attribute>
<attribute name="accel">F8</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Edit chart</attribute>
<attribute name="action">win.tab-change</attribute>
<attribute name="target">edit</attribute>
<attribute name="accel">&lt;Shift&gt;F3</attribute>
</item>
</section>
</menu> </menu>
</interface> </interface>