wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Add buttons to the statusbar to show/hide the panels

This commit is contained in:
JosephMcc 2016-12-26 23:43:42 -08:00
parent 3a6de664e1
commit c78bf46d38
3 changed files with 113 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xed/xed-statusbar.c
View File

@ -179,10 +179,6 @@ xed_statusbar_init (XedStatusbar *statusbar)
gtk_box_pack_start (GTK_BOX (statusbar), gtk_box_pack_start (GTK_BOX (statusbar),
statusbar->priv->error_frame, statusbar->priv->error_frame,
FALSE, TRUE, 0); FALSE, TRUE, 0);
gtk_box_reorder_child (GTK_BOX (statusbar),
statusbar->priv->error_frame,
0);
} }
/** /**

103
xed/xed-window-private.h
View File

@ -43,75 +43,78 @@ G_BEGIN_DECLS
struct _XedWindowPrivate struct _XedWindowPrivate
{ {
GtkWidget *notebook; GtkWidget *notebook;
GtkWidget *side_panel; GtkWidget *side_panel;
GtkWidget *bottom_panel; GtkWidget *bottom_panel;
GtkWidget *hpaned; GtkWidget *hpaned;
GtkWidget *vpaned; GtkWidget *vpaned;
GtkWidget *tab_width_combo; GtkWidget *tab_width_combo;
GtkWidget *language_combo; GtkWidget *language_combo;
GtkWidget *show_side_pane_button;
GtkWidget *show_bottom_pane_button;
GtkWidget *bottom_pane_button_revealer;
XedMessageBus *message_bus; XedMessageBus *message_bus;
PeasExtensionSet *extensions; PeasExtensionSet *extensions;
/* Widgets for fullscreen mode */ /* Widgets for fullscreen mode */
GtkWidget *fullscreen_controls; GtkWidget *fullscreen_controls;
GtkWidget *fullscreen_controls_container; GtkWidget *fullscreen_controls_container;
guint fullscreen_animation_timeout_id; guint fullscreen_animation_timeout_id;
gboolean fullscreen_animation_enter; gboolean fullscreen_animation_enter;
/* statusbar and context ids for statusbar messages */ /* statusbar and context ids for statusbar messages */
GtkWidget *statusbar; GtkWidget *statusbar;
GtkWidget *searchbar; GtkWidget *searchbar;
guint generic_message_cid; guint generic_message_cid;
guint tip_message_cid; guint tip_message_cid;
guint tab_width_id; guint tab_width_id;
guint spaces_instead_of_tabs_id; guint spaces_instead_of_tabs_id;
guint language_changed_id; guint language_changed_id;
/* Menus & Toolbars */ /* Menus & Toolbars */
GtkUIManager *manager; GtkUIManager *manager;
GtkActionGroup *action_group; GtkActionGroup *action_group;
GtkActionGroup *always_sensitive_action_group; GtkActionGroup *always_sensitive_action_group;
GtkActionGroup *close_action_group; GtkActionGroup *close_action_group;
GtkActionGroup *quit_action_group; GtkActionGroup *quit_action_group;
GtkActionGroup *panes_action_group; GtkActionGroup *panes_action_group;
GtkActionGroup *languages_action_group; GtkActionGroup *languages_action_group;
GtkActionGroup *documents_list_action_group; GtkActionGroup *documents_list_action_group;
guint documents_list_menu_ui_id; guint documents_list_menu_ui_id;
GtkWidget *toolbar; GtkWidget *toolbar;
GtkWidget *menubar; GtkWidget *menubar;
/* recent files */ /* recent files */
GtkActionGroup *recents_action_group; GtkActionGroup *recents_action_group;
guint recents_menu_ui_id; guint recents_menu_ui_id;
gulong recents_handler_id; gulong recents_handler_id;
XedTab *active_tab; XedTab *active_tab;
gint num_tabs; gint num_tabs;
gint num_tabs_with_error; gint num_tabs_with_error;
gint width; gint width;
gint height; gint height;
GdkWindowState window_state; GdkWindowState window_state;
gint side_panel_size; gint side_panel_size;
gint bottom_panel_size; gint bottom_panel_size;
XedWindowState state; XedWindowState state;
gint bottom_panel_item_removed_handler_id; gint bottom_panel_item_removed_handler_id;
GtkWindowGroup *window_group; GtkWindowGroup *window_group;
GFile *default_location; GFile *default_location;
gboolean removing_tabs : 1; gboolean removing_tabs : 1;
gboolean dispose_has_run : 1; gboolean dispose_has_run : 1;
}; };
G_END_DECLS G_END_DECLS

75
xed/xed-window.c
View File

@ -1619,14 +1619,18 @@ static void
create_statusbar (XedWindow *window, create_statusbar (XedWindow *window,
GtkWidget *main_box) GtkWidget *main_box)
{ {
GtkWidget *image;
GtkWidget *button_box;
GtkAction *action;
xed_debug (DEBUG_WINDOW); xed_debug (DEBUG_WINDOW);
window->priv->statusbar = xed_statusbar_new (); window->priv->statusbar = xed_statusbar_new ();
window->priv->searchbar = xed_searchbar_new (window, TRUE); window->priv->searchbar = xed_searchbar_new (window, TRUE);
window->priv->generic_message_cid = gtk_statusbar_get_context_id (GTK_STATUSBAR(window->priv->statusbar), window->priv->generic_message_cid = gtk_statusbar_get_context_id (GTK_STATUSBAR (window->priv->statusbar),
"generic_message"); "generic_message");
window->priv->tip_message_cid = gtk_statusbar_get_context_id (GTK_STATUSBAR(window->priv->statusbar), window->priv->tip_message_cid = gtk_statusbar_get_context_id (GTK_STATUSBAR (window->priv->statusbar),
"tip_message"); "tip_message");
gtk_box_pack_end (GTK_BOX(main_box), window->priv->statusbar, FALSE, TRUE, 0); gtk_box_pack_end (GTK_BOX(main_box), window->priv->statusbar, FALSE, TRUE, 0);
@ -1649,6 +1653,38 @@ create_statusbar (XedWindow *window,
g_signal_connect(G_OBJECT (window->priv->language_combo), "changed", g_signal_connect(G_OBJECT (window->priv->language_combo), "changed",
G_CALLBACK (language_combo_changed), window); G_CALLBACK (language_combo_changed), window);
button_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_set_margin_top (button_box, 4);
gtk_widget_set_margin_bottom (button_box, 4);
gtk_box_pack_start (GTK_BOX (window->priv->statusbar), button_box, FALSE, FALSE, 0);
window->priv->show_side_pane_button = gtk_toggle_button_new ();
image = gtk_image_new_from_icon_name ("view-left-pane-symbolic", GTK_ICON_SIZE_INVALID);
gtk_image_set_pixel_size (GTK_IMAGE (image), 12);
gtk_container_add (GTK_CONTAINER (window->priv->show_side_pane_button), image);
gtk_box_pack_start (GTK_BOX (button_box), window->priv->show_side_pane_button, FALSE, FALSE, 0);
action = gtk_action_group_get_action (window->priv->panes_action_group, "ViewSidePane");
gtk_activatable_set_related_action (GTK_ACTIVATABLE (window->priv->show_side_pane_button), action);
gtk_widget_set_tooltip_text (window->priv->show_side_pane_button, gtk_action_get_tooltip (action));
window->priv->bottom_pane_button_revealer = gtk_revealer_new ();
gtk_revealer_set_transition_type (GTK_REVEALER (window->priv->bottom_pane_button_revealer),
GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT);
gtk_box_pack_start (GTK_BOX (button_box), window->priv->bottom_pane_button_revealer, FALSE, FALSE, 0);
window->priv->show_bottom_pane_button = gtk_toggle_button_new ();
image = gtk_image_new_from_icon_name ("view-bottom-pane-symbolic", GTK_ICON_SIZE_INVALID);
gtk_image_set_pixel_size (GTK_IMAGE (image), 12);
gtk_container_add (GTK_CONTAINER (window->priv->show_bottom_pane_button), image);
gtk_container_add (GTK_CONTAINER (window->priv->bottom_pane_button_revealer), window->priv->show_bottom_pane_button);
action = gtk_action_group_get_action (window->priv->panes_action_group, "ViewBottomPane");
gtk_activatable_set_related_action (GTK_ACTIVATABLE (window->priv->show_bottom_pane_button), action);
gtk_widget_set_tooltip_text (window->priv->show_bottom_pane_button, gtk_action_get_tooltip (action));
gtk_widget_show_all (button_box);
g_signal_connect_after(G_OBJECT (window->priv->statusbar), "show", g_signal_connect_after(G_OBJECT (window->priv->statusbar), "show",
G_CALLBACK (statusbar_visibility_changed), window); G_CALLBACK (statusbar_visibility_changed), window);
@ -1657,8 +1693,9 @@ create_statusbar (XedWindow *window,
set_statusbar_style (window, NULL); set_statusbar_style (window, NULL);
gtk_box_pack_end (GTK_BOX(main_box), window->priv->searchbar, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (main_box), window->priv->searchbar, FALSE, FALSE, 0);
gtk_box_reorder_child (GTK_BOX (window->priv->statusbar), button_box, 0);
} }
static XedWindow * static XedWindow *
@ -3102,7 +3139,7 @@ bottom_panel_visibility_changed (XedPanel *bottom_panel,
gboolean visible; gboolean visible;
GtkAction *action; GtkAction *action;
visible = gtk_widget_get_visible (GTK_WIDGET(bottom_panel)); visible = gtk_widget_get_visible (GTK_WIDGET (bottom_panel));
if (xed_prefs_manager_bottom_panel_visible_can_set ()) if (xed_prefs_manager_bottom_panel_visible_can_set ())
{ {
@ -3124,21 +3161,23 @@ bottom_panel_visibility_changed (XedPanel *bottom_panel,
} }
static void static void
bottom_panel_item_removed (XedPanel *panel, bottom_panel_item_removed (XedPanel *panel,
GtkWidget *item, GtkWidget *item,
XedWindow *window) XedWindow *window)
{ {
if (xed_panel_get_n_items (panel) == 0) if (xed_panel_get_n_items (panel) == 0)
{ {
GtkAction *action; GtkAction *action;
gtk_widget_hide (GTK_WIDGET(panel));
gtk_widget_hide (GTK_WIDGET (panel));
gtk_revealer_set_reveal_child (GTK_REVEALER (window->priv->bottom_pane_button_revealer), FALSE);
action = gtk_action_group_get_action (window->priv->panes_action_group, "ViewBottomPane"); action = gtk_action_group_get_action (window->priv->panes_action_group, "ViewBottomPane");
gtk_action_set_sensitive (action, FALSE); gtk_action_set_sensitive (action, FALSE);
} }
} }
static void static void
bottom_panel_item_added (XedPanel *panel, bottom_panel_item_added (XedPanel *panel,
GtkWidget *item, GtkWidget *item,
XedWindow *window) XedWindow *window)
{ {
@ -3148,9 +3187,12 @@ bottom_panel_item_added (XedPanel *panel,
{ {
GtkAction *action; GtkAction *action;
gboolean show; gboolean show;
gtk_revealer_set_reveal_child (GTK_REVEALER (window->priv->bottom_pane_button_revealer), TRUE);
action = gtk_action_group_get_action (window->priv->panes_action_group, "ViewBottomPane"); action = gtk_action_group_get_action (window->priv->panes_action_group, "ViewBottomPane");
gtk_action_set_sensitive (action, TRUE); gtk_action_set_sensitive (action, TRUE);
show = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(action)); show = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
if (show) if (show)
{ {
gtk_widget_show (GTK_WIDGET(panel)); gtk_widget_show (GTK_WIDGET(panel));
@ -3163,9 +3205,7 @@ create_bottom_panel (XedWindow *window)
{ {
xed_debug (DEBUG_WINDOW); xed_debug (DEBUG_WINDOW);
window->priv->bottom_panel = xed_panel_new (GTK_ORIENTATION_HORIZONTAL); window->priv->bottom_panel = xed_panel_new (GTK_ORIENTATION_HORIZONTAL);
gtk_paned_pack2 (GTK_PANED(window->priv->vpaned), window->priv->bottom_panel, gtk_paned_pack2 (GTK_PANED (window->priv->vpaned), window->priv->bottom_panel, FALSE, FALSE);
FALSE,
FALSE);
g_signal_connect_after(window->priv->bottom_panel, "show", G_CALLBACK (bottom_panel_visibility_changed), window); g_signal_connect_after(window->priv->bottom_panel, "show", G_CALLBACK (bottom_panel_visibility_changed), window);
g_signal_connect_after(window->priv->bottom_panel, "hide", G_CALLBACK (bottom_panel_visibility_changed), window); g_signal_connect_after(window->priv->bottom_panel, "hide", G_CALLBACK (bottom_panel_visibility_changed), window);
} }
@ -3178,7 +3218,7 @@ init_panels_visibility (XedWindow *window)
/* side pane */ /* side pane */
active_page = xed_prefs_manager_get_side_panel_active_page (); active_page = xed_prefs_manager_get_side_panel_active_page ();
_xed_panel_set_active_item_by_id (XED_PANEL(window->priv->side_panel), active_page); _xed_panel_set_active_item_by_id (XED_PANEL (window->priv->side_panel), active_page);
if (xed_prefs_manager_get_side_pane_visible ()) if (xed_prefs_manager_get_side_pane_visible ())
{ {
@ -3186,7 +3226,7 @@ init_panels_visibility (XedWindow *window)
} }
/* bottom pane, it can be empty */ /* bottom pane, it can be empty */
if (xed_panel_get_n_items (XED_PANEL(window->priv->bottom_panel)) > 0) if (xed_panel_get_n_items (XED_PANEL (window->priv->bottom_panel)) > 0)
{ {
active_page = xed_prefs_manager_get_bottom_panel_active_page (); active_page = xed_prefs_manager_get_bottom_panel_active_page ();
_xed_panel_set_active_item_by_id (XED_PANEL(window->priv->bottom_panel), active_page); _xed_panel_set_active_item_by_id (XED_PANEL(window->priv->bottom_panel), active_page);
@ -3195,17 +3235,22 @@ init_panels_visibility (XedWindow *window)
{ {
gtk_widget_show (window->priv->bottom_panel); gtk_widget_show (window->priv->bottom_panel);
} }
gtk_revealer_set_reveal_child (GTK_REVEALER (window->priv->bottom_pane_button_revealer), TRUE);
} }
else else
{ {
GtkAction *action; GtkAction *action;
action = gtk_action_group_get_action (window->priv->panes_action_group, "ViewBottomPane"); action = gtk_action_group_get_action (window->priv->panes_action_group, "ViewBottomPane");
gtk_action_set_sensitive (action, FALSE); gtk_action_set_sensitive (action, FALSE);
gtk_revealer_set_reveal_child (GTK_REVEALER (window->priv->bottom_pane_button_revealer), FALSE);
} }
/* start track sensitivity after the initial state is set */ /* start track sensitivity after the initial state is set */
window->priv->bottom_panel_item_removed_handler_id = g_signal_connect(window->priv->bottom_panel, "item_removed", window->priv->bottom_panel_item_removed_handler_id =
G_CALLBACK (bottom_panel_item_removed), window); g_signal_connect (window->priv->bottom_panel, "item_removed",
G_CALLBACK (bottom_panel_item_removed), window);
g_signal_connect(window->priv->bottom_panel, "item_added", G_CALLBACK (bottom_panel_item_added), window); g_signal_connect(window->priv->bottom_panel, "item_added", G_CALLBACK (bottom_panel_item_added), window);
} }