Add selection mode button and selection toolbar
This commit is contained in:
parent
e0b4d30b07
commit
f44c5b8c86
@ -17,8 +17,9 @@
|
|||||||
|
|
||||||
struct _AgWindowPrivate {
|
struct _AgWindowPrivate {
|
||||||
GtkWidget *header_bar;
|
GtkWidget *header_bar;
|
||||||
GtkWidget *menubutton_revealer;
|
GtkWidget *menubutton_stack;
|
||||||
GtkWidget *new_back_stack;
|
GtkWidget *new_back_stack;
|
||||||
|
GtkWidget *selection_toolbar;
|
||||||
GtkWidget *stack;
|
GtkWidget *stack;
|
||||||
GtkWidget *name;
|
GtkWidget *name;
|
||||||
GtkWidget *north_lat;
|
GtkWidget *north_lat;
|
||||||
@ -1003,11 +1004,23 @@ ag_window_tab_changed_cb(GtkStack *stack, GParamSpec *pspec, AgWindow *window)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (strcmp("list", active_tab_name) == 0) {
|
if (strcmp("list", active_tab_name) == 0) {
|
||||||
gtk_revealer_set_reveal_child(GTK_REVEALER(priv->menubutton_revealer), FALSE);
|
gtk_stack_set_visible_child_name(
|
||||||
gtk_stack_set_visible_child_name(GTK_STACK(priv->new_back_stack), "new");
|
GTK_STACK(priv->menubutton_stack),
|
||||||
|
"list"
|
||||||
|
);
|
||||||
|
gtk_stack_set_visible_child_name(
|
||||||
|
GTK_STACK(priv->new_back_stack),
|
||||||
|
"new"
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
gtk_revealer_set_reveal_child(GTK_REVEALER(priv->menubutton_revealer), TRUE);
|
gtk_stack_set_visible_child_name(
|
||||||
gtk_stack_set_visible_child_name(GTK_STACK(priv->new_back_stack), "back");
|
GTK_STACK(priv->menubutton_stack),
|
||||||
|
"chart"
|
||||||
|
);
|
||||||
|
gtk_stack_set_visible_child_name(
|
||||||
|
GTK_STACK(priv->new_back_stack),
|
||||||
|
"back"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Note that priv->current_tab is actually the previously selected tab, not
|
// Note that priv->current_tab is actually the previously selected tab, not
|
||||||
@ -1083,6 +1096,58 @@ ag_window_refresh_action(GSimpleAction *action,
|
|||||||
ag_window_load_chart_list(AG_WINDOW(user_data));
|
ag_window_load_chart_list(AG_WINDOW(user_data));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
ag_window_selection_mode_action(GSimpleAction *action,
|
||||||
|
GVariant *parameter,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
GVariant *state;
|
||||||
|
gboolean new_state;
|
||||||
|
GtkStyleContext *style;
|
||||||
|
AgWindow *window = AG_WINDOW(user_data);
|
||||||
|
AgWindowPrivate *priv = ag_window_get_instance_private(window);
|
||||||
|
|
||||||
|
state = g_action_get_state(G_ACTION(action));
|
||||||
|
new_state = !g_variant_get_boolean(state);
|
||||||
|
g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
|
||||||
|
g_variant_unref(state);
|
||||||
|
|
||||||
|
style = gtk_widget_get_style_context(priv->header_bar);
|
||||||
|
|
||||||
|
if (new_state) {
|
||||||
|
gtk_header_bar_set_show_close_button(
|
||||||
|
GTK_HEADER_BAR(priv->header_bar),
|
||||||
|
FALSE
|
||||||
|
);
|
||||||
|
gtk_style_context_add_class(style, "selection-mode");
|
||||||
|
gd_main_view_set_selection_mode(GD_MAIN_VIEW(priv->tab_list), TRUE);
|
||||||
|
gtk_widget_hide(priv->new_back_stack);
|
||||||
|
gtk_stack_set_visible_child_name(
|
||||||
|
GTK_STACK(priv->menubutton_stack),
|
||||||
|
"selection"
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
gtk_header_bar_set_show_close_button(
|
||||||
|
GTK_HEADER_BAR(priv->header_bar),
|
||||||
|
TRUE
|
||||||
|
);
|
||||||
|
gtk_style_context_remove_class(style, "selection-mode");
|
||||||
|
gd_main_view_set_selection_mode(GD_MAIN_VIEW(priv->tab_list), FALSE);
|
||||||
|
gtk_widget_show_all(priv->new_back_stack);
|
||||||
|
gtk_stack_set_visible_child_name(
|
||||||
|
GTK_STACK(priv->menubutton_stack),
|
||||||
|
"list"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
ag_window_delete_action(GSimpleAction *action,
|
||||||
|
GVariant *parameter,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
static GActionEntry win_entries[] = {
|
static GActionEntry win_entries[] = {
|
||||||
{ "close", ag_window_close_action, NULL, NULL, NULL },
|
{ "close", ag_window_close_action, NULL, NULL, NULL },
|
||||||
{ "save", ag_window_save_action, NULL, NULL, NULL },
|
{ "save", ag_window_save_action, NULL, NULL, NULL },
|
||||||
@ -1094,6 +1159,8 @@ static GActionEntry win_entries[] = {
|
|||||||
{ "new-chart", ag_window_new_chart_action, NULL, NULL, NULL },
|
{ "new-chart", ag_window_new_chart_action, NULL, NULL, NULL },
|
||||||
{ "back", ag_window_back_action, NULL, NULL, NULL },
|
{ "back", ag_window_back_action, NULL, NULL, NULL },
|
||||||
{ "refresh", ag_window_refresh_action, NULL, NULL, NULL },
|
{ "refresh", ag_window_refresh_action, NULL, NULL, NULL },
|
||||||
|
{ "selection", ag_window_selection_mode_action, NULL, "false", NULL },
|
||||||
|
{ "delete", ag_window_delete_action, NULL, NULL, NULL },
|
||||||
};
|
};
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -1349,7 +1416,7 @@ ag_window_class_init(AgWindowClass *klass)
|
|||||||
gtk_widget_class_bind_template_child_private(
|
gtk_widget_class_bind_template_child_private(
|
||||||
widget_class,
|
widget_class,
|
||||||
AgWindow,
|
AgWindow,
|
||||||
menubutton_revealer
|
menubutton_stack
|
||||||
);
|
);
|
||||||
gtk_widget_class_bind_template_child_private(
|
gtk_widget_class_bind_template_child_private(
|
||||||
widget_class,
|
widget_class,
|
||||||
@ -1442,6 +1509,11 @@ ag_window_class_init(AgWindowClass *klass)
|
|||||||
AgWindow,
|
AgWindow,
|
||||||
note_buffer
|
note_buffer
|
||||||
);
|
);
|
||||||
|
gtk_widget_class_bind_template_child_private(
|
||||||
|
widget_class,
|
||||||
|
AgWindow,
|
||||||
|
selection_toolbar
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
@ -236,10 +236,31 @@
|
|||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkRevealer" id="menubutton_revealer">
|
<object class="GtkStack" id="menubutton_stack">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="reveal_child">False</property>
|
<property name="homogeneous">False</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkToggleButton">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="valign">center</property>
|
||||||
|
<property name="action_name">win.selection</property>
|
||||||
|
<style>
|
||||||
|
<class name="image-button"/>
|
||||||
|
</style>
|
||||||
|
<child>
|
||||||
|
<object class="GtkImage">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="icon_size">1</property>
|
||||||
|
<property name="icon_name">object-select-symbolic</property>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="name">list</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkBox" id="menubutton_box">
|
<object class="GtkBox" id="menubutton_box">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
@ -291,6 +312,26 @@
|
|||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="name">chart</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox" id="selection_mode_box">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkButton">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="action_name">win.selection</property>
|
||||||
|
<property name="label" translatable="yes">Cancel</property>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="name">selection</property>
|
||||||
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
@ -299,6 +340,9 @@
|
|||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="orientation">vertical</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkStack" id="stack">
|
<object class="GtkStack" id="stack">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
@ -752,5 +796,40 @@
|
|||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkRevealer" id="selection_toolbar">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="reveal_child">False</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkButton">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="action_name">win.delete</property>
|
||||||
|
<style>
|
||||||
|
<class name="image-button"/>
|
||||||
|
<class name="destructive-action"/>
|
||||||
|
</style>
|
||||||
|
<child>
|
||||||
|
<object class="GtkImage">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="icon_size">1</property>
|
||||||
|
<property name="icon_name">user-trash-symbolic</property>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="pack_type">end</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
</template>
|
</template>
|
||||||
</interface>
|
</interface>
|
||||||
|
Loading…
Reference in New Issue
Block a user