...
 
Commits (2)
...@@ -57,11 +57,13 @@ struct _CcWindow ...@@ -57,11 +57,13 @@ struct _CcWindow
GtkWidget *stack; GtkWidget *stack;
GtkWidget *header; GtkWidget *header;
GtkWidget *header_box; GtkWidget *header_box;
GtkWidget *main_leaflet;
GtkWidget *list_scrolled; GtkWidget *list_scrolled;
GtkWidget *panel_headerbar; GtkWidget *panel_headerbar;
GtkWidget *search_scrolled; GtkWidget *search_scrolled;
GtkWidget *panel_list; GtkWidget *panel_list;
GtkWidget *previous_button; GtkWidget *previous_button;
GtkWidget *back_revealer;
GtkWidget *top_right_box; GtkWidget *top_right_box;
GtkWidget *search_button; GtkWidget *search_button;
GtkWidget *search_bar; GtkWidget *search_bar;
...@@ -80,6 +82,8 @@ struct _CcWindow ...@@ -80,6 +82,8 @@ struct _CcWindow
CcPanel *active_panel; CcPanel *active_panel;
GSettings *settings; GSettings *settings;
CcPanelListView previous_list_view;
}; };
static void cc_shell_iface_init (CcShellInterface *iface); static void cc_shell_iface_init (CcShellInterface *iface);
...@@ -155,6 +159,13 @@ remove_all_custom_widgets (CcWindow *self) ...@@ -155,6 +159,13 @@ remove_all_custom_widgets (CcWindow *self)
CC_EXIT; CC_EXIT;
} }
static void
on_sidebar_activated_cb (CcPanel *panel,
CcWindow *self)
{
hdy_leaflet_set_visible_child_name (HDY_LEAFLET (self->main_leaflet), "panel");
}
static gboolean static gboolean
activate_panel (CcWindow *self, activate_panel (CcWindow *self,
const gchar *id, const gchar *id,
...@@ -186,6 +197,8 @@ activate_panel (CcWindow *self, ...@@ -186,6 +197,8 @@ activate_panel (CcWindow *self,
/* Begin the profile */ /* Begin the profile */
g_timer_start (timer); g_timer_start (timer);
if (self->current_panel)
g_signal_handlers_disconnect_by_data (self->current_panel, self);
self->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters)); self->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters));
cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (self->current_panel)); cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (self->current_panel));
gtk_widget_show (self->current_panel); gtk_widget_show (self->current_panel);
...@@ -205,6 +218,10 @@ activate_panel (CcWindow *self, ...@@ -205,6 +218,10 @@ activate_panel (CcWindow *self,
sidebar_widget = cc_panel_get_sidebar_widget (CC_PANEL (self->current_panel)); sidebar_widget = cc_panel_get_sidebar_widget (CC_PANEL (self->current_panel));
cc_panel_list_add_sidebar_widget (CC_PANEL_LIST (self->panel_list), sidebar_widget); cc_panel_list_add_sidebar_widget (CC_PANEL_LIST (self->panel_list), sidebar_widget);
/* Ensure we show the panel when when the leaflet is folded and a sidebar
* widget's row is activated.
*/
g_signal_connect_object (self->current_panel, "sidebar-activated", G_CALLBACK (on_sidebar_activated_cb), self, 0);
/* Finish profiling */ /* Finish profiling */
g_timer_stop (timer); g_timer_stop (timer);
...@@ -405,6 +422,7 @@ set_active_panel_from_id (CcShell *shell, ...@@ -405,6 +422,7 @@ set_active_panel_from_id (CcShell *shell,
const gchar *start_id, const gchar *start_id,
GVariant *parameters, GVariant *parameters,
gboolean add_to_history, gboolean add_to_history,
gboolean force_moving_to_the_panel,
GError **error) GError **error)
{ {
g_autoptr(GIcon) gicon = NULL; g_autoptr(GIcon) gicon = NULL;
...@@ -413,17 +431,22 @@ set_active_panel_from_id (CcShell *shell, ...@@ -413,17 +431,22 @@ set_active_panel_from_id (CcShell *shell,
GtkTreeIter iter; GtkTreeIter iter;
GtkWidget *old_panel; GtkWidget *old_panel;
CcWindow *self; CcWindow *self;
CcPanelListView view;
gboolean activated; gboolean activated;
gboolean found; gboolean found;
CC_ENTRY; CC_ENTRY;
self = CC_WINDOW (shell); self = CC_WINDOW (shell);
view = cc_panel_list_get_view (CC_PANEL_LIST (self->panel_list));
/* When loading the same panel again, just set its parameters */ /* When loading the same panel again, just set its parameters */
if (g_strcmp0 (self->current_panel_id, start_id) == 0) if (g_strcmp0 (self->current_panel_id, start_id) == 0)
{ {
g_object_set (G_OBJECT (self->current_panel), "parameters", parameters, NULL); g_object_set (G_OBJECT (self->current_panel), "parameters", parameters, NULL);
if (force_moving_to_the_panel || self->previous_list_view == view)
hdy_leaflet_set_visible_child_name (HDY_LEAFLET (self->main_leaflet), "panel");
self->previous_list_view = view;
CC_RETURN (TRUE); CC_RETURN (TRUE);
} }
...@@ -457,6 +480,9 @@ set_active_panel_from_id (CcShell *shell, ...@@ -457,6 +480,9 @@ set_active_panel_from_id (CcShell *shell,
if (add_to_history) if (add_to_history)
add_current_panel_to_history (shell, start_id); add_current_panel_to_history (shell, start_id);
if (force_moving_to_the_panel)
hdy_leaflet_set_visible_child_name (HDY_LEAFLET (self->main_leaflet), "panel");
g_free (self->current_panel_id); g_free (self->current_panel_id);
self->current_panel_id = g_strdup (start_id); self->current_panel_id = g_strdup (start_id);
...@@ -506,12 +532,39 @@ switch_to_previous_panel (CcWindow *self) ...@@ -506,12 +532,39 @@ switch_to_previous_panel (CcWindow *self)
g_debug ("Going to previous panel (%s)", previous_panel_id); g_debug ("Going to previous panel (%s)", previous_panel_id);
set_active_panel_from_id (CC_SHELL (self), previous_panel_id, NULL, FALSE, NULL); set_active_panel_from_id (CC_SHELL (self), previous_panel_id, NULL, FALSE, FALSE, NULL);
CC_EXIT; CC_EXIT;
} }
/* Callbacks */ /* Callbacks */
static void
update_fold_state (CcWindow *shell)
{
GtkWidget *header_child = hdy_leaflet_get_visible_child (HDY_LEAFLET (shell->header_box));
HdyFold fold = hdy_leaflet_get_fold (HDY_LEAFLET (shell->header_box));
hdy_header_group_set_focus (shell->header_group, fold == HDY_FOLD_FOLDED ? GTK_HEADER_BAR (header_child) : NULL);
gtk_revealer_set_reveal_child (GTK_REVEALER (shell->back_revealer), fold == HDY_FOLD_FOLDED);
}
static void
notify_header_visible_child_cb (HdyLeaflet *leaflet,
GParamSpec *pspec,
CcWindow *shell)
{
update_fold_state (shell);
}
static void
notify_fold_cb (HdyLeaflet *leaflet,
GParamSpec *pspec,
CcWindow *shell)
{
update_fold_state (shell);
}
static void static void
show_panel_cb (CcPanelList *panel_list, show_panel_cb (CcPanelList *panel_list,
const gchar *panel_id, const gchar *panel_id,
...@@ -520,7 +573,7 @@ show_panel_cb (CcPanelList *panel_list, ...@@ -520,7 +573,7 @@ show_panel_cb (CcPanelList *panel_list,
if (!panel_id) if (!panel_id)
return; return;
set_active_panel_from_id (CC_SHELL (self), panel_id, NULL, TRUE, NULL); set_active_panel_from_id (CC_SHELL (self), panel_id, NULL, TRUE, FALSE, NULL);
} }
static void static void
...@@ -534,6 +587,13 @@ search_entry_activate_cb (GtkEntry *entry, ...@@ -534,6 +587,13 @@ search_entry_activate_cb (GtkEntry *entry,
gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->search_bar), !changed); gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->search_bar), !changed);
} }
static void
back_button_clicked_cb (GtkButton *button,
CcWindow *shell)
{
hdy_leaflet_set_visible_child_name (HDY_LEAFLET (shell->main_leaflet), "sidebar");
}
static void static void
previous_button_clicked_cb (GtkButton *button, previous_button_clicked_cb (GtkButton *button,
CcWindow *shell) CcWindow *shell)
...@@ -668,7 +728,7 @@ cc_window_set_active_panel_from_id (CcShell *shell, ...@@ -668,7 +728,7 @@ cc_window_set_active_panel_from_id (CcShell *shell,
GVariant *parameters, GVariant *parameters,
GError **error) GError **error)
{ {
return set_active_panel_from_id (shell, start_id, parameters, TRUE, error); return set_active_panel_from_id (shell, start_id, parameters, TRUE, TRUE, error);
} }
static void static void
...@@ -842,12 +902,14 @@ cc_window_class_init (CcWindowClass *klass) ...@@ -842,12 +902,14 @@ cc_window_class_init (CcWindowClass *klass)
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/gtk/cc-window.ui"); gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/gtk/cc-window.ui");
gtk_widget_class_bind_template_child (widget_class, CcWindow, back_revealer);
gtk_widget_class_bind_template_child (widget_class, CcWindow, development_warning_dialog); gtk_widget_class_bind_template_child (widget_class, CcWindow, development_warning_dialog);
gtk_widget_class_bind_template_child (widget_class, CcWindow, header); gtk_widget_class_bind_template_child (widget_class, CcWindow, header);
gtk_widget_class_bind_template_child (widget_class, CcWindow, header_box); gtk_widget_class_bind_template_child (widget_class, CcWindow, header_box);
gtk_widget_class_bind_template_child (widget_class, CcWindow, header_group); gtk_widget_class_bind_template_child (widget_class, CcWindow, header_group);
gtk_widget_class_bind_template_child (widget_class, CcWindow, header_sizegroup); gtk_widget_class_bind_template_child (widget_class, CcWindow, header_sizegroup);
gtk_widget_class_bind_template_child (widget_class, CcWindow, list_scrolled); gtk_widget_class_bind_template_child (widget_class, CcWindow, list_scrolled);
gtk_widget_class_bind_template_child (widget_class, CcWindow, main_leaflet);
gtk_widget_class_bind_template_child (widget_class, CcWindow, panel_headerbar); gtk_widget_class_bind_template_child (widget_class, CcWindow, panel_headerbar);
gtk_widget_class_bind_template_child (widget_class, CcWindow, panel_list); gtk_widget_class_bind_template_child (widget_class, CcWindow, panel_list);
gtk_widget_class_bind_template_child (widget_class, CcWindow, previous_button); gtk_widget_class_bind_template_child (widget_class, CcWindow, previous_button);
...@@ -857,7 +919,10 @@ cc_window_class_init (CcWindowClass *klass) ...@@ -857,7 +919,10 @@ cc_window_class_init (CcWindowClass *klass)
gtk_widget_class_bind_template_child (widget_class, CcWindow, stack); gtk_widget_class_bind_template_child (widget_class, CcWindow, stack);
gtk_widget_class_bind_template_child (widget_class, CcWindow, top_right_box); gtk_widget_class_bind_template_child (widget_class, CcWindow, top_right_box);
gtk_widget_class_bind_template_callback (widget_class, back_button_clicked_cb);
gtk_widget_class_bind_template_callback (widget_class, gdk_window_set_cb); gtk_widget_class_bind_template_callback (widget_class, gdk_window_set_cb);
gtk_widget_class_bind_template_callback (widget_class, notify_header_visible_child_cb);
gtk_widget_class_bind_template_callback (widget_class, notify_fold_cb);
gtk_widget_class_bind_template_callback (widget_class, on_development_warning_dialog_responded_cb); gtk_widget_class_bind_template_callback (widget_class, on_development_warning_dialog_responded_cb);
gtk_widget_class_bind_template_callback (widget_class, previous_button_clicked_cb); gtk_widget_class_bind_template_callback (widget_class, previous_button_clicked_cb);
gtk_widget_class_bind_template_callback (widget_class, search_entry_activate_cb); gtk_widget_class_bind_template_callback (widget_class, search_entry_activate_cb);
...@@ -879,10 +944,13 @@ cc_window_init (CcWindow *self) ...@@ -879,10 +944,13 @@ cc_window_init (CcWindow *self)
self->settings = g_settings_new ("org.gnome.ControlCenter"); self->settings = g_settings_new ("org.gnome.ControlCenter");
self->custom_widgets = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); self->custom_widgets = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
self->previous_panels = g_queue_new (); self->previous_panels = g_queue_new ();
self->previous_list_view = cc_panel_list_get_view (CC_PANEL_LIST (self->panel_list));
/* Add a custom CSS class on development builds */ /* Add a custom CSS class on development builds */
if (in_flatpak_sandbox ()) if (in_flatpak_sandbox ())
add_development_build_css (self); add_development_build_css (self);
update_fold_state (self);
} }
CcWindow * CcWindow *
......
...@@ -10,9 +10,11 @@ ...@@ -10,9 +10,11 @@
<signal name="map-event" handler="window_map_event_cb" object="CcWindow" swapped="no" /> <signal name="map-event" handler="window_map_event_cb" object="CcWindow" swapped="no" />
<signal name="key-press-event" handler="window_key_press_event_cb" object="CcWindow" swapped="no" after="yes" /> <signal name="key-press-event" handler="window_key_press_event_cb" object="CcWindow" swapped="no" after="yes" />
<child> <child>
<object class="GtkBox" id="main_hbox"> <object class="HdyLeaflet" id="main_leaflet">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="mode-transition-type">slide</property>
<property name="child-transition-type">slide</property>
<child> <child>
<object class="GtkBox" id="sidebar_box"> <object class="GtkBox" id="sidebar_box">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -74,9 +76,7 @@ ...@@ -74,9 +76,7 @@
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="name">sidebar</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -88,11 +88,6 @@ ...@@ -88,11 +88,6 @@
<class name="sidebar"/> <class name="sidebar"/>
</style> </style>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkStack" id="stack"> <object class="GtkStack" id="stack">
...@@ -101,14 +96,13 @@ ...@@ -101,14 +96,13 @@
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="transition_type">crossfade</property> <property name="transition_type">crossfade</property>
<property name="width_request">300</property>
<style> <style>
<class name="background"/> <class name="background"/>
</style> </style>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="name">panel</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing> </packing>
</child> </child>
</object> </object>
...@@ -118,10 +112,17 @@ ...@@ -118,10 +112,17 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<object class="GtkBox" id="header_box"> <object class="HdyLeaflet" id="header_box">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">horizontal</property> <property name="orientation">horizontal</property>
<property name="mode-transition-type" bind-source="main_leaflet" bind-property="mode-transition-type" bind-flags="bidirectional|sync-create"/>
<property name="mode-transition-duration" bind-source="main_leaflet" bind-property="mode-transition-duration" bind-flags="bidirectional|sync-create"/>
<property name="child-transition-type" bind-source="main_leaflet" bind-property="child-transition-type" bind-flags="bidirectional|sync-create"/>
<property name="child-transition-duration" bind-source="main_leaflet" bind-property="child-transition-duration" bind-flags="bidirectional|sync-create"/>
<property name="visible-child-name" bind-source="main_leaflet" bind-property="visible-child-name" bind-flags="bidirectional|sync-create"/>
<signal name="notify::visible-child" handler="notify_header_visible_child_cb" swapped="no"/>
<signal name="notify::fold" handler="notify_fold_cb" object="CcWindow" after="yes" swapped="no"/>
<child> <child>
<object class="GtkHeaderBar" id="header"> <object class="GtkHeaderBar" id="header">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -199,6 +200,9 @@ ...@@ -199,6 +200,9 @@
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="name">sidebar</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkSeparator" id="header_separator"> <object class="GtkSeparator" id="header_separator">
...@@ -216,6 +220,40 @@ ...@@ -216,6 +220,40 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="show_close_button">True</property> <property name="show_close_button">True</property>
<child>
<object class="GtkRevealer" id="back_revealer">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="transition-type">crossfade</property>
<property name="transition-duration" bind-source="main_leaflet" bind-property="mode-transition-duration" bind-flags="bidirectional|sync-create"/>
<child>
<object class="GtkButton" id="back">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
<property name="use-underline">True</property>
<signal name="clicked" handler="back_button_clicked_cb" object="CcWindow" swapped="no" />
<style>
<class name="image-button"/>
</style>
<child internal-child="accessible">
<object class="AtkObject" id="a11y-back">
<property name="accessible-name" translatable="yes">Back</property>
</object>
</child>
<child>
<object class="GtkImage" id="back_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">go-previous-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child> <child>
<object class="GtkBox" id="top_right_box"> <object class="GtkBox" id="top_right_box">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -226,6 +264,9 @@ ...@@ -226,6 +264,9 @@
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="name">panel</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
...@@ -257,6 +298,15 @@ ...@@ -257,6 +298,15 @@
</widgets> </widgets>
</object> </object>
<!-- Synchronize separators -->
<object class="GtkSizeGroup">
<property name="mode">horizontal</property>
<widgets>
<widget name="header_separator"/>
<widget name="panel_separator"/>
</widgets>
</object>
<!-- Synchronize right header and panel --> <!-- Synchronize right header and panel -->
<object class="GtkSizeGroup"> <object class="GtkSizeGroup">
<property name="mode">horizontal</property> <property name="mode">horizontal</property>
......