[gnome-control-center] project: Switch to the new shell
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] project: Switch to the new shell
- Date: Wed, 9 Aug 2017 17:38:17 +0000 (UTC)
commit d5c4436869d7d153679fda6d759ecb864400d6d5
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Thu Aug 3 18:24:27 2017 +0100
project: Switch to the new shell
This is the bomb dropping commit. It does so simply by
changing the compiled files, and adjusting the build
projects proper.
shell/Makefile.am | 2 +
shell/alt/Makefile.am | 2 -
shell/alt/cc-window.c | 1167 ++++++++++++++++++++++++++++++++-------
shell/{alt => }/cc-panel-list.c | 0
shell/{alt => }/cc-panel-list.h | 0
shell/cc-panel-loader.c | 18 +-
shell/cc-shell-model.h | 8 +-
shell/cc-window.c | 1167 +++++++--------------------------------
8 files changed, 1182 insertions(+), 1182 deletions(-)
---
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 6af3199..8099330 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -55,6 +55,8 @@ common_sources = \
gnome_control_center_SOURCES = \
$(common_sources) \
+ cc-panel-list.c \
+ cc-panel-list.h \
cc-window.c \
cc-window.h
diff --git a/shell/alt/Makefile.am b/shell/alt/Makefile.am
index 8e84811..d740d51 100644
--- a/shell/alt/Makefile.am
+++ b/shell/alt/Makefile.am
@@ -12,8 +12,6 @@ AM_CPPFLAGS = \
noinst_LTLIBRARIES = libshell_alt.la
libshell_alt_la_SOURCES = \
- cc-panel-list.c \
- cc-panel-list.h \
cc-window.c \
cc-window.h
diff --git a/shell/alt/cc-window.c b/shell/alt/cc-window.c
index 9f29c55..94e0573 100644
--- a/shell/alt/cc-window.c
+++ b/shell/alt/cc-window.c
@@ -1,7 +1,6 @@
/*
* Copyright (c) 2009, 2010 Intel, Inc.
* Copyright (c) 2010 Red Hat, Inc.
- * Copyright (c) 2016 Endless, Inc.
*
* The Control Center is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by the
@@ -37,25 +36,41 @@
#include "cc-shell.h"
#include "cc-shell-category-view.h"
#include "cc-shell-model.h"
-#include "cc-panel-list.h"
#include "cc-panel-loader.h"
#include "cc-util.h"
+/* Use a fixed width for the shell, since resizing horizontally is more awkward
+ * for the user than resizing vertically
+ * Both sizes are defined in https://live.gnome.org/Design/SystemSettings/ */
+#define FIXED_WIDTH 740
+#define FIXED_HEIGHT 636
+#define SMALL_SCREEN_FIXED_HEIGHT 400
+
+#define MIN_ICON_VIEW_HEIGHT 300
+
#define MOUSE_BACK_BUTTON 8
+#define DEFAULT_WINDOW_TITLE N_("All Settings")
#define DEFAULT_WINDOW_ICON_NAME "preferences-system"
+#define SEARCH_PAGE "_search"
+#define OVERVIEW_PAGE "_overview"
+
+typedef enum {
+ SMALL_SCREEN_UNSET,
+ SMALL_SCREEN_TRUE,
+ SMALL_SCREEN_FALSE
+} CcSmallScreen;
+
struct _CcWindow
{
GtkApplicationWindow parent;
GtkWidget *stack;
GtkWidget *header;
- GtkWidget *header_box;
- GtkWidget *list_scrolled;
- GtkWidget *panel_headerbar;
+ GtkWidget *main_vbox;
+ GtkWidget *scrolled_window;
GtkWidget *search_scrolled;
- GtkWidget *panel_list;
GtkWidget *previous_button;
GtkWidget *top_right_box;
GtkWidget *search_button;
@@ -73,7 +88,15 @@ struct _CcWindow
GtkListStore *store;
+ GtkTreeModel *search_filter;
+ GtkWidget *search_view;
+ gchar *filter_string;
+ gchar **filter_terms;
+
CcPanel *active_panel;
+
+ int monitor_num;
+ CcSmallScreen small_screen;
};
static void cc_shell_iface_init (CcShellInterface *iface);
@@ -92,6 +115,8 @@ static gboolean cc_window_set_active_panel_from_id (CcShell *shell,
GVariant *parameters,
GError **err);
+static gint get_monitor_height (CcWindow *self);
+
static const gchar *
get_icon_name_from_g_icon (GIcon *gicon)
{
@@ -149,12 +174,12 @@ activate_panel (CcWindow *self,
icon_name = get_icon_name_from_g_icon (gicon);
gtk_window_set_role (GTK_WINDOW (self), id);
- gtk_header_bar_set_title (GTK_HEADER_BAR (self->panel_headerbar), name);
+ gtk_header_bar_set_title (GTK_HEADER_BAR (self->header), name);
gtk_window_set_default_icon_name (icon_name);
gtk_window_set_icon_name (GTK_WINDOW (self), icon_name);
title_widget = cc_panel_get_title_widget (CC_PANEL (self->current_panel));
- gtk_header_bar_set_custom_title (GTK_HEADER_BAR (self->panel_headerbar), title_widget);
+ gtk_header_bar_set_custom_title (GTK_HEADER_BAR (self->header), title_widget);
self->current_panel_box = box;
@@ -197,7 +222,7 @@ add_current_panel_to_history (CcShell *shell,
static void
shell_show_overview_page (CcWindow *self)
{
- cc_panel_list_set_view (CC_PANEL_LIST (self->panel_list), CC_PANEL_LIST_MAIN);
+ gtk_stack_set_visible_child_name (GTK_STACK (self->stack), OVERVIEW_PAGE);
if (self->current_panel_box)
gtk_container_remove (GTK_CONTAINER (self->stack), self->current_panel_box);
@@ -210,6 +235,8 @@ shell_show_overview_page (CcWindow *self)
self->previous_panels = g_queue_new ();
/* clear the search text */
+ g_free (self->filter_string);
+ self->filter_string = g_strdup ("");
gtk_entry_set_text (GTK_ENTRY (self->search_entry), "");
if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (self->search_bar)))
gtk_widget_grab_focus (self->search_entry);
@@ -218,6 +245,8 @@ shell_show_overview_page (CcWindow *self)
/* reset window title and icon */
gtk_window_set_role (GTK_WINDOW (self), NULL);
+ gtk_header_bar_set_title (GTK_HEADER_BAR (self->header), _(DEFAULT_WINDOW_TITLE));
+ gtk_header_bar_set_custom_title (GTK_HEADER_BAR (self->header), NULL);
gtk_window_set_default_icon_name (DEFAULT_WINDOW_ICON_NAME);
gtk_window_set_icon_name (GTK_WINDOW (self), DEFAULT_WINDOW_ICON_NAME);
@@ -244,122 +273,610 @@ cc_window_set_search_item (CcWindow *center,
}
static void
-show_panel_cb (CcPanelList *panel_list,
- const gchar *panel_id,
- CcWindow *self)
+item_activated_cb (CcShellCategoryView *view,
+ gchar *name,
+ gchar *id,
+ CcWindow *shell)
{
- if (panel_id)
- cc_window_set_active_panel_from_id (CC_SHELL (self), panel_id, NULL, NULL);
- else
- shell_show_overview_page (self);
+ cc_window_set_active_panel_from_id (CC_SHELL (shell), id, NULL, NULL);
}
-static void
-update_list_title (CcWindow *self)
+static gboolean
+category_focus_out (GtkWidget *view,
+ GdkEventFocus *event,
+ CcWindow *shell)
{
- CcPanelListView view;
- const gchar *title;
+ gtk_icon_view_unselect_all (GTK_ICON_VIEW (view));
- view = cc_panel_list_get_view (CC_PANEL_LIST (self->panel_list));
+ return FALSE;
+}
+
+static gboolean
+category_focus_in (GtkWidget *view,
+ GdkEventFocus *event,
+ CcWindow *shell)
+{
+ GtkTreePath *path;
- switch (view)
+ if (!gtk_icon_view_get_cursor (GTK_ICON_VIEW (view), &path, NULL))
{
- case CC_PANEL_LIST_DETAILS:
- title = _("Details");
- break;
+ path = gtk_tree_path_new_from_indices (0, -1);
+ gtk_icon_view_set_cursor (GTK_ICON_VIEW (view), path, NULL, FALSE);
+ }
- case CC_PANEL_LIST_DEVICES:
- title = _("Devices");
- break;
+ gtk_icon_view_select_path (GTK_ICON_VIEW (view), path);
+ gtk_tree_path_free (path);
- case CC_PANEL_LIST_MAIN:
- title = _("Settings");
- break;
+ return FALSE;
+}
- case CC_PANEL_LIST_SEARCH:
- title = NULL;
- break;
+static GList *
+get_item_views (CcWindow *shell)
+{
+ GList *list, *l;
+ GList *res;
+
+ list = gtk_container_get_children (GTK_CONTAINER (shell->main_vbox));
+ res = NULL;
+ for (l = list; l; l = l->next)
+ {
+ if (!CC_IS_SHELL_CATEGORY_VIEW (l->data))
+ continue;
+ res = g_list_append (res, cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (l->data)));
}
- if (title)
- gtk_header_bar_set_title (GTK_HEADER_BAR (self->header), title);
+ g_list_free (list);
+
+ return res;
}
-static void
-panel_list_view_changed_cb (CcPanelList *panel_list,
- GParamSpec *pspec,
- CcWindow *self)
+static gboolean
+is_prev_direction (GtkWidget *widget,
+ GtkDirectionType direction)
+{
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR &&
+ direction == GTK_DIR_LEFT)
+ return TRUE;
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL &&
+ direction == GTK_DIR_RIGHT)
+ return TRUE;
+ return FALSE;
+}
+
+static gboolean
+is_next_direction (GtkWidget *widget,
+ GtkDirectionType direction)
+{
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR &&
+ direction == GTK_DIR_RIGHT)
+ return TRUE;
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL &&
+ direction == GTK_DIR_LEFT)
+ return TRUE;
+ return FALSE;
+}
+
+static GtkTreePath *
+get_first_path (GtkIconView *view)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ model = gtk_icon_view_get_model (view);
+ if (!gtk_tree_model_get_iter_first (model, &iter))
+ return NULL;
+ return gtk_tree_model_get_path (model, &iter);
+}
+
+static GtkTreePath *
+get_last_path (GtkIconView *view)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GtkTreePath *path;
+ gboolean ret;
+
+ model = gtk_icon_view_get_model (view);
+ if (!gtk_tree_model_get_iter_first (model, &iter))
+ return NULL;
+
+ ret = TRUE;
+ path = NULL;
+
+ while (ret)
+ {
+ g_clear_pointer (&path, gtk_tree_path_free);
+ path = gtk_tree_model_get_path (model, &iter);
+ ret = gtk_tree_model_iter_next (model, &iter);
+ }
+ return path;
+}
+
+static gboolean
+categories_keynav_failed (GtkIconView *current_view,
+ GtkDirectionType direction,
+ CcWindow *shell)
+{
+ GList *views, *v;
+ GtkIconView *new_view;
+ GtkTreePath *path;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gint col, c, dist, d;
+ GtkTreePath *sel;
+ gboolean res;
+
+ res = FALSE;
+
+ views = get_item_views (shell);
+
+ for (v = views; v; v = v->next)
+ {
+ if (v->data == current_view)
+ break;
+ }
+
+ new_view = NULL;
+
+ if (direction == GTK_DIR_DOWN && v != NULL && v->next != NULL)
+ {
+ new_view = v->next->data;
+
+ if (gtk_icon_view_get_cursor (current_view, &path, NULL))
+ {
+ col = gtk_icon_view_get_item_column (current_view, path);
+ gtk_tree_path_free (path);
+
+ sel = NULL;
+ dist = 1000;
+ model = gtk_icon_view_get_model (new_view);
+ g_assert (gtk_tree_model_get_iter_first (model, &iter));
+ do {
+ path = gtk_tree_model_get_path (model, &iter);
+ c = gtk_icon_view_get_item_column (new_view, path);
+ d = ABS (c - col);
+ if (d < dist)
+ {
+ if (sel)
+ gtk_tree_path_free (sel);
+ sel = path;
+ dist = d;
+ }
+ else
+ gtk_tree_path_free (path);
+ } while (gtk_tree_model_iter_next (model, &iter));
+
+ gtk_icon_view_set_cursor (new_view, sel, NULL, FALSE);
+ gtk_tree_path_free (sel);
+ }
+
+ gtk_widget_grab_focus (GTK_WIDGET (new_view));
+
+ res = TRUE;
+ }
+
+ if (direction == GTK_DIR_UP && v != NULL && v->prev != NULL)
+ {
+ new_view = v->prev->data;
+
+ if (gtk_icon_view_get_cursor (current_view, &path, NULL))
+ {
+ col = gtk_icon_view_get_item_column (current_view, path);
+ gtk_tree_path_free (path);
+
+ sel = NULL;
+ dist = 1000;
+ model = gtk_icon_view_get_model (new_view);
+ g_assert (gtk_tree_model_get_iter_first (model, &iter));
+ do {
+ path = gtk_tree_model_get_path (model, &iter);
+ c = gtk_icon_view_get_item_column (new_view, path);
+ d = ABS (c - col);
+ if (d <= dist)
+ {
+ if (sel)
+ gtk_tree_path_free (sel);
+ sel = path;
+ dist = d;
+ }
+ else
+ gtk_tree_path_free (path);
+ } while (gtk_tree_model_iter_next (model, &iter));
+
+ gtk_icon_view_set_cursor (new_view, sel, NULL, FALSE);
+ gtk_tree_path_free (sel);
+ }
+
+ gtk_widget_grab_focus (GTK_WIDGET (new_view));
+
+ res = TRUE;
+ }
+
+ if (is_prev_direction (GTK_WIDGET (current_view), direction) && v != NULL)
+ {
+ if (gtk_icon_view_get_cursor (current_view, &path, NULL))
+ {
+ if (v->prev)
+ new_view = v->prev->data;
+
+ if (gtk_tree_path_prev (path))
+ {
+ new_view = current_view;
+ }
+ else if (new_view != NULL)
+ {
+ path = get_last_path (new_view);
+ }
+ else
+ {
+ goto out;
+ }
+
+ gtk_icon_view_set_cursor (new_view, path, NULL, FALSE);
+ gtk_icon_view_select_path (new_view, path);
+ gtk_tree_path_free (path);
+ gtk_widget_grab_focus (GTK_WIDGET (new_view));
+
+ res = TRUE;
+ }
+ }
+
+ if (is_next_direction (GTK_WIDGET (current_view), direction) && v != NULL)
+ {
+ if (gtk_icon_view_get_cursor (current_view, &path, NULL))
+ {
+ GtkTreeIter iter;
+
+ if (v->next)
+ new_view = v->next->data;
+
+ gtk_tree_path_next (path);
+ model = gtk_icon_view_get_model (current_view);
+
+ if (gtk_tree_model_get_iter (model, &iter, path))
+ {
+ new_view = current_view;
+ }
+ else if (new_view != NULL)
+ {
+ path = get_first_path (new_view);
+ }
+ else
+ {
+ goto out;
+ }
+
+ gtk_icon_view_set_cursor (new_view, path, NULL, FALSE);
+ gtk_icon_view_select_path (new_view, path);
+ gtk_tree_path_free (path);
+ gtk_widget_grab_focus (GTK_WIDGET (new_view));
+
+ res = TRUE;
+ }
+ }
+
+out:
+ g_list_free (views);
+
+ return res;
+}
+
+static gboolean
+model_filter_func (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ CcWindow *self)
{
- gboolean is_main_view;
+ char **t;
+ gboolean matches = FALSE;
- is_main_view = cc_panel_list_get_view (panel_list) == CC_PANEL_LIST_MAIN;
+ if (!self->filter_string || !self->filter_terms)
+ return FALSE;
- gtk_widget_set_visible (self->previous_button, !is_main_view);
- gtk_widget_set_visible (self->search_button, is_main_view);
+ for (t = self->filter_terms; *t; t++)
+ {
+ matches = cc_shell_model_iter_matches_search (CC_SHELL_MODEL (model),
+ iter,
+ *t);
+ if (!matches)
+ break;
+ }
- update_list_title (self);
+ return matches;
+}
+
+static gboolean
+category_filter_func (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ CcPanelCategory filter)
+{
+ guint category;
+
+ gtk_tree_model_get (model, iter, COL_CATEGORY, &category, -1);
+
+ return (category == filter);
}
static void
-search_entry_activate_cb (GtkEntry *entry,
- CcWindow *self)
+search_entry_changed_cb (GtkEntry *entry,
+ CcWindow *self)
{
- gboolean changed;
+ char *str;
+
+ /* if the entry text was set manually (not by the user) */
+ if (!g_strcmp0 (self->filter_string, gtk_entry_get_text (entry)))
+ {
+ cc_shell_model_set_sort_terms (CC_SHELL_MODEL (self->store), NULL);
+ return;
+ }
- changed = cc_panel_list_activate (CC_PANEL_LIST (self->panel_list));
+ /* Don't re-filter for added trailing or leading spaces */
+ str = cc_util_normalize_casefold_and_unaccent (gtk_entry_get_text (entry));
+ g_strstrip (str);
+ if (!g_strcmp0 (str, self->filter_string))
+ {
+ g_free (str);
+ return;
+ }
+
+ g_free (self->filter_string);
+ self->filter_string = str;
- gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->search_bar), !changed);
+ g_strfreev (self->filter_terms);
+ self->filter_terms = g_strsplit (self->filter_string, " ", -1);
+
+ cc_shell_model_set_sort_terms (CC_SHELL_MODEL (self->store), self->filter_terms);
+
+ if (!g_strcmp0 (self->filter_string, ""))
+ {
+ shell_show_overview_page (self);
+ }
+ else
+ {
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (self->search_filter));
+ gtk_stack_set_visible_child_name (GTK_STACK (self->stack), SEARCH_PAGE);
+ }
}
+static gboolean
+search_entry_key_press_event_cb (GtkEntry *entry,
+ GdkEventKey *event,
+ CcWindow *self)
+{
+ if (event->keyval == GDK_KEY_Return &&
+ g_strcmp0 (self->filter_string, "") != 0)
+ {
+ GtkTreePath *path;
+ GtkTreeSelection *selection;
+
+ path = gtk_tree_path_new_first ();
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->search_view));
+ gtk_tree_selection_select_path (selection, path);
+
+ if (!gtk_tree_selection_path_is_selected (selection, path))
+ {
+ gtk_tree_path_free (path);
+ return FALSE;
+ }
+
+ gtk_tree_view_row_activated (GTK_TREE_VIEW (self->search_view), path,
+ gtk_tree_view_get_column (GTK_TREE_VIEW (self->search_view), 0));
+ gtk_tree_path_free (path);
+ return TRUE;
+ }
+
+ if (event->keyval == GDK_KEY_Escape)
+ {
+ gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->search_bar), FALSE);
+ gtk_entry_set_text (entry, "");
+ return TRUE;
+ }
+
+ return FALSE;
+}
static void
-setup_model (CcWindow *shell)
+on_search_row_activated (GtkTreeView *treeview,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ CcWindow *shell)
{
+ GtkTreeSelection *selection;
GtkTreeModel *model;
- GtkTreeIter iter;
- gboolean valid;
+ GtkTreeIter iter;
+ char *id = NULL;
- shell->store = (GtkListStore *) cc_shell_model_new ();
- model = GTK_TREE_MODEL (shell->store);
+ selection = gtk_tree_view_get_selection (treeview);
- cc_panel_loader_fill_model (CC_SHELL_MODEL (shell->store));
+ if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+ return;
- /* Create a row for each panel */
- valid = gtk_tree_model_get_iter_first (model, &iter);
+ gtk_tree_model_get (model, &iter,
+ COL_ID, &id,
+ -1);
- while (valid)
+ if (id)
+ cc_window_set_active_panel_from_id (CC_SHELL (shell), id, NULL, NULL);
+
+ gtk_tree_selection_unselect_all (selection);
+
+ g_free (id);
+}
+
+static gboolean
+on_search_button_press_event (GtkTreeView *treeview,
+ GdkEventButton *event,
+ CcWindow *shell)
+{
+ if (event->type == GDK_BUTTON_PRESS && event->button == 1)
{
- CcPanelCategory category;
- GIcon *icon;
- gchar *name, *description, *id, *symbolic_icon;
- const gchar *icon_name;
+ GtkTreePath *path = NULL;
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ /* We don't check for the position being blank,
+ * it could be the dead space between columns */
+ gtk_tree_view_is_blank_at_pos (treeview,
+ event->x, event->y,
+ &path,
+ NULL,
+ NULL,
+ NULL);
+ if (path == NULL)
+ return FALSE;
+
+ model = gtk_tree_view_get_model (treeview);
+ if (gtk_tree_model_get_iter (model, &iter, path) == FALSE)
+ {
+ gtk_tree_path_free (path);
+ return FALSE;
+ }
- gtk_tree_model_get (model, &iter,
- COL_CATEGORY, &category,
- COL_DESCRIPTION, &description,
- COL_GICON, &icon,
- COL_ID, &id,
- COL_NAME, &name,
- -1);
+ selection = gtk_tree_view_get_selection (treeview);
+ gtk_tree_selection_select_iter (selection, &iter);
+
+ on_search_row_activated (treeview, NULL, NULL, shell);
+
+ gtk_tree_path_free (path);
+
+ return TRUE;
+ }
- icon_name = get_icon_name_from_g_icon (icon);
- symbolic_icon = g_strdup_printf ("%s-symbolic", icon_name);
+ return FALSE;
+}
- cc_panel_list_add_panel (CC_PANEL_LIST (shell->panel_list),
- category,
- id,
- name,
- description,
- symbolic_icon);
+static void
+setup_search (CcWindow *self)
+{
+ GtkWidget *search_view;
+ GtkCellRenderer *renderer;
+ GtkTreeViewColumn *column;
+
+ g_return_if_fail (self->store != NULL);
+
+ /* create the search filter */
+ self->search_filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (self->store),
+ NULL);
+
+ gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (self->search_filter),
+ (GtkTreeModelFilterVisibleFunc)
+ model_filter_func,
+ self, NULL);
+
+ /* set up the search view */
+ self->search_view = search_view = gtk_tree_view_new ();
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (search_view), FALSE);
+ gtk_tree_view_set_enable_search (GTK_TREE_VIEW (search_view), FALSE);
+ gtk_tree_view_set_model (GTK_TREE_VIEW (search_view),
+ GTK_TREE_MODEL (self->search_filter));
+ /* This needs to happen after setting the model, otherwise
+ * the search column will be the first string column */
+ gtk_tree_view_set_search_column (GTK_TREE_VIEW (search_view), -1);
+
+ renderer = gtk_cell_renderer_pixbuf_new ();
+ g_object_set (renderer,
+ "xpad", 15,
+ "ypad", 10,
+ "stock-size", GTK_ICON_SIZE_DIALOG,
+ "follow-state", TRUE,
+ NULL);
+ column = gtk_tree_view_column_new_with_attributes ("Icon", renderer,
+ "gicon", COL_GICON,
+ NULL);
+ gtk_tree_view_column_set_expand (column, FALSE);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (self->search_view), column);
+
+ renderer = gtk_cell_renderer_text_new ();
+ g_object_set (renderer,
+ "xpad", 0,
+ NULL);
+ column = gtk_tree_view_column_new_with_attributes ("Name", renderer,
+ "text", COL_NAME,
+ NULL);
+ gtk_tree_view_column_set_expand (column, FALSE);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (self->search_view), column);
+
+ renderer = gd_styled_text_renderer_new ();
+ gd_styled_text_renderer_add_class (GD_STYLED_TEXT_RENDERER (renderer), "dim-label");
+ g_object_set (renderer,
+ "xpad", 15,
+ "ellipsize", PANGO_ELLIPSIZE_END,
+ NULL);
+ column = gtk_tree_view_column_new_with_attributes ("Description", renderer,
+ "text", COL_DESCRIPTION,
+ NULL);
+ gtk_tree_view_column_set_expand (column, TRUE);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (self->search_view), column);
+
+ gtk_container_add (GTK_CONTAINER (self->search_scrolled), search_view);
+
+ g_signal_connect (self->search_view, "row-activated",
+ G_CALLBACK (on_search_row_activated), self);
+ g_signal_connect (self->search_view, "button-press-event",
+ G_CALLBACK (on_search_button_press_event), self);
+
+ self->filter_string = g_strdup ("");
+
+ gtk_widget_show (self->search_view);
+}
- valid = gtk_tree_model_iter_next (model, &iter);
+static void
+add_category_view (CcWindow *shell,
+ CcPanelCategory category,
+ const char *name)
+{
+ GtkTreeModel *filter;
+ GtkWidget *categoryview;
- g_clear_pointer (&symbolic_icon, g_free);
- g_clear_pointer (&description, g_free);
- g_clear_pointer (&name, g_free);
- g_clear_pointer (&id, g_free);
- g_clear_object (&icon);
+ if (category > 0)
+ {
+ GtkWidget *separator;
+ separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_widget_set_margin_top (separator, 11);
+ gtk_widget_set_margin_bottom (separator, 10);
+ gtk_box_pack_start (GTK_BOX (shell->main_vbox), separator, FALSE, FALSE, 0);
+ gtk_widget_show (separator);
}
+
+ /* create new category view for this category */
+ filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (shell->store),
+ NULL);
+ gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter),
+ (GtkTreeModelFilterVisibleFunc) category_filter_func,
+ GINT_TO_POINTER (category), NULL);
+
+ categoryview = cc_shell_category_view_new (name, filter);
+ gtk_box_pack_start (GTK_BOX (shell->main_vbox), categoryview, FALSE, TRUE, 0);
+
+ g_signal_connect (cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (categoryview)),
+ "desktop-item-activated",
+ G_CALLBACK (item_activated_cb), shell);
+
+ gtk_widget_show (categoryview);
+
+ g_signal_connect (cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (categoryview)),
+ "focus-in-event",
+ G_CALLBACK (category_focus_in), shell);
+ g_signal_connect (cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (categoryview)),
+ "focus-out-event",
+ G_CALLBACK (category_focus_out), shell);
+ g_signal_connect (cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (categoryview)),
+ "keynav-failed",
+ G_CALLBACK (categories_keynav_failed), shell);
+}
+
+static void
+setup_model (CcWindow *shell)
+{
+ shell->store = (GtkListStore *) cc_shell_model_new ();
+
+ /* Add categories */
+ add_category_view (shell, CC_CATEGORY_PERSONAL, C_("category", "Personal"));
+ add_category_view (shell, CC_CATEGORY_HARDWARE, C_("category", "Hardware"));
+ add_category_view (shell, CC_CATEGORY_SYSTEM, C_("category", "System"));
+
+ cc_panel_loader_fill_model (CC_SHELL_MODEL (shell->store));
}
static void
@@ -367,21 +884,68 @@ previous_button_clicked_cb (GtkButton *button,
CcWindow *shell)
{
g_debug ("Num previous panels? %d", g_queue_get_length (shell->previous_panels));
-
- /* When in search, simply unsed the search mode */
- if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (shell->search_bar)))
- gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (shell->search_bar), FALSE);
- else
- cc_panel_list_set_view (CC_PANEL_LIST (shell->panel_list), CC_PANEL_LIST_MAIN);
+ if (g_queue_is_empty (shell->previous_panels)) {
+ shell_show_overview_page (shell);
+ } else {
+ char *panel_name;
+
+ panel_name = g_queue_pop_head (shell->previous_panels);
+ g_debug ("About to go to previous panel '%s'", panel_name);
+ cc_window_set_active_panel_from_id (CC_SHELL (shell), panel_name, NULL, NULL);
+ g_free (panel_name);
+ }
}
static void
-sidelist_size_allocate_cb (GtkWidget *box,
- GdkRectangle *allocation,
- CcWindow *self)
+stack_page_notify_cb (GtkStack *stack,
+ GParamSpec *spec,
+ CcWindow *self)
{
- /* Keep the sidelist and the first headerbar synchronized */
- gtk_widget_set_size_request (self->header, allocation->width, -1);
+ int nat_height;
+ const char *id;
+
+ id = gtk_stack_get_visible_child_name (stack);
+
+ /* make sure the home button is shown on all pages except the overview page */
+
+ if (g_strcmp0 (id, OVERVIEW_PAGE) == 0 || g_strcmp0 (id, SEARCH_PAGE) == 0)
+ {
+ gint header_height, maximum_height;
+
+ gtk_widget_hide (self->previous_button);
+ gtk_widget_show (self->search_button);
+ gtk_widget_show (self->search_bar);
+ gtk_widget_hide (self->lock_button);
+
+ gtk_widget_get_preferred_height_for_width (GTK_WIDGET (self->main_vbox),
+ FIXED_WIDTH, NULL, &nat_height);
+ gtk_widget_get_preferred_height_for_width (GTK_WIDGET (self->header),
+ FIXED_WIDTH, NULL, &header_height);
+
+ /* find the maximum height by using the monitor height minus an allowance
+ * for title bar, etc. */
+ maximum_height = get_monitor_height (self) - 100;
+
+ if (maximum_height > 0 && nat_height + header_height > maximum_height)
+ nat_height = maximum_height - header_height;
+
+ gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (self->scrolled_window),
+ self->small_screen == SMALL_SCREEN_TRUE ?
SMALL_SCREEN_FIXED_HEIGHT : nat_height);
+ }
+ else
+ {
+ gtk_widget_show (self->previous_button);
+ gtk_widget_hide (self->search_button);
+ gtk_widget_hide (self->search_bar);
+ /* set the scrolled window small so that it doesn't force
+ the window to be larger than this panel */
+ gtk_widget_get_preferred_height_for_width (GTK_WIDGET (self),
+ FIXED_WIDTH, NULL, &nat_height);
+ gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (self->scrolled_window),
MIN_ICON_VIEW_HEIGHT);
+ gtk_window_resize (GTK_WINDOW (self),
+ FIXED_WIDTH,
+ nat_height);
+ }
}
/* CcShell implementation */
@@ -477,8 +1041,6 @@ cc_window_set_active_panel_from_id (CcShell *shell,
if (old_panel)
gtk_container_remove (GTK_CONTAINER (self->stack), old_panel);
-
- cc_panel_list_set_active_panel (CC_PANEL_LIST (self->panel_list), start_id);
}
g_free (name);
@@ -504,39 +1066,6 @@ _shell_get_toplevel (CcShell *shell)
return GTK_WIDGET (shell);
}
-static void
-gdk_window_set_cb (GObject *object,
- GParamSpec *pspec,
- CcWindow *self)
-{
- GdkWindow *window;
- gchar *str;
-
- if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
- return;
-
- window = gtk_widget_get_window (GTK_WIDGET (self));
-
- if (!window)
- return;
-
- str = g_strdup_printf ("%u", (guint) GDK_WINDOW_XID (window));
- g_setenv ("GNOME_CONTROL_CENTER_XID", str, TRUE);
- g_free (str);
-}
-
-static gboolean
-window_map_event_cb (GtkWidget *widget,
- GdkEvent *event,
- CcWindow *self)
-{
- /* If focus ends up in a category icon view one of the items is
- * immediately selected which looks odd when we are starting up, so
- * we explicitly unset the focus here. */
- gtk_window_set_focus (GTK_WINDOW (self), NULL);
- return GDK_EVENT_PROPAGATE;
-}
-
/* GObject Implementation */
static void
cc_window_get_property (GObject *object,
@@ -604,6 +1133,14 @@ cc_window_dispose (GObject *object)
{
CcWindow *self = CC_WINDOW (object);
+ /* Avoid receiving notifications about the pages changing
+ * when destroying the children one-by-one */
+ if (self->stack)
+ {
+ g_signal_handlers_disconnect_by_func (self->stack, stack_page_notify_cb, object);
+ self->stack = NULL;
+ }
+
g_free (self->current_panel_id);
self->current_panel_id = NULL;
@@ -614,7 +1151,15 @@ cc_window_dispose (GObject *object)
}
g_clear_object (&self->store);
+ g_clear_object (&self->search_filter);
g_clear_object (&self->active_panel);
+ g_clear_object (&self->header_sizegroup);
+
+ if (self->previous_panels)
+ {
+ g_queue_free_full (self->previous_panels, g_free);
+ self->previous_panels = NULL;
+ }
G_OBJECT_CLASS (cc_window_parent_class)->dispose (object);
}
@@ -624,11 +1169,8 @@ cc_window_finalize (GObject *object)
{
CcWindow *self = CC_WINDOW (object);
- if (self->previous_panels)
- {
- g_queue_free_full (self->previous_panels, g_free);
- self->previous_panels = NULL;
- }
+ g_free (self->filter_string);
+ g_strfreev (self->filter_terms);
G_OBJECT_CLASS (cc_window_parent_class)->finalize (object);
}
@@ -644,7 +1186,6 @@ cc_shell_iface_init (CcShellInterface *iface)
static void
cc_window_class_init (CcWindowClass *klass)
{
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->get_property = cc_window_get_property;
@@ -653,28 +1194,6 @@ cc_window_class_init (CcWindowClass *klass)
object_class->finalize = cc_window_finalize;
g_object_class_override_property (object_class, PROP_ACTIVE_PANEL, "active-panel");
-
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/gtk/window.ui");
-
- 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_sizegroup);
- gtk_widget_class_bind_template_child (widget_class, CcWindow, list_scrolled);
- gtk_widget_class_bind_template_child (widget_class, CcWindow, lock_button);
- gtk_widget_class_bind_template_child (widget_class, CcWindow, panel_headerbar);
- gtk_widget_class_bind_template_child (widget_class, CcWindow, previous_button);
- gtk_widget_class_bind_template_child (widget_class, CcWindow, search_bar);
- gtk_widget_class_bind_template_child (widget_class, CcWindow, search_button);
- gtk_widget_class_bind_template_child (widget_class, CcWindow, search_entry);
- 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_callback (widget_class, previous_button_clicked_cb);
- gtk_widget_class_bind_template_callback (widget_class, gdk_window_set_cb);
- gtk_widget_class_bind_template_callback (widget_class, search_entry_activate_cb);
- gtk_widget_class_bind_template_callback (widget_class, sidelist_size_allocate_cb);
- gtk_widget_class_bind_template_callback (widget_class, update_list_title);
- gtk_widget_class_bind_template_callback (widget_class, window_map_event_cb);
}
static gboolean
@@ -696,8 +1215,10 @@ window_key_press_event (GtkWidget *win,
GdkKeymap *keymap;
gboolean retval;
GdkModifierType state;
- CcPanelListView view;
gboolean is_rtl;
+ gboolean overview;
+ gboolean search;
+ const gchar *id;
retval = GDK_EVENT_PROPAGATE;
state = event->state;
@@ -705,14 +1226,14 @@ window_key_press_event (GtkWidget *win,
gdk_keymap_add_virtual_modifiers (keymap, &state);
state = state & gtk_accelerator_get_default_mod_mask ();
is_rtl = gtk_widget_get_direction (win) == GTK_TEXT_DIR_RTL;
- view = cc_panel_list_get_view (CC_PANEL_LIST (self->panel_list));
- /* The search only happens when we're in the MAIN view */
- if (view == CC_PANEL_LIST_MAIN &&
+ id = gtk_stack_get_visible_child_name (GTK_STACK (self->stack));
+ overview = g_str_equal (id, OVERVIEW_PAGE);
+ search = g_str_equal (id, SEARCH_PAGE);
+
+ if ((overview || search) &&
gtk_search_bar_handle_event (GTK_SEARCH_BAR (self->search_bar), (GdkEvent*) event) == GDK_EVENT_STOP)
- {
- return GDK_EVENT_STOP;
- }
+ return GDK_EVENT_STOP;
if (state == GDK_CONTROL_MASK)
{
@@ -722,13 +1243,8 @@ window_key_press_event (GtkWidget *win,
case GDK_KEY_S:
case GDK_KEY_f:
case GDK_KEY_F:
- /* The search only happens when we're in the MAIN view */
- if (view != CC_PANEL_LIST_MAIN &&
- view != CC_PANEL_LIST_SEARCH)
- {
- break;
- }
-
+ if (!overview && !search)
+ break;
retval = !gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (self->search_bar));
gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->search_bar), retval);
if (retval)
@@ -737,13 +1253,25 @@ window_key_press_event (GtkWidget *win,
break;
case GDK_KEY_Q:
case GDK_KEY_q:
+ gtk_widget_destroy (GTK_WIDGET (self));
+ retval = GDK_EVENT_STOP;
+ break;
case GDK_KEY_W:
case GDK_KEY_w:
- gtk_widget_destroy (GTK_WIDGET (self));
+ if (!overview)
+ shell_show_overview_page (self);
+ else
+ gtk_widget_destroy (GTK_WIDGET (self));
retval = GDK_EVENT_STOP;
break;
}
}
+ else if (state == GDK_MOD1_MASK && event->keyval == GDK_KEY_Up)
+ {
+ if (!overview)
+ shell_show_overview_page (self);
+ retval = GDK_EVENT_STOP;
+ }
else if ((!is_rtl && state == GDK_MOD1_MASK && event->keyval == GDK_KEY_Left) ||
(is_rtl && state == GDK_MOD1_MASK && event->keyval == GDK_KEY_Right) ||
event->keyval == GDK_KEY_Back)
@@ -751,61 +1279,295 @@ window_key_press_event (GtkWidget *win,
previous_button_clicked_cb (NULL, self);
retval = GDK_EVENT_STOP;
}
-
return retval;
}
+static gint
+get_monitor_height (CcWindow *self)
+{
+ GdkScreen *screen;
+ GdkRectangle rect;
+
+ if (self->monitor_num < 0)
+ return 0;
+
+ /* We cannot use workarea here, as this wouldn't
+ * be updated when we read it after a monitors-changed signal */
+ screen = gtk_widget_get_screen (GTK_WIDGET (self));
+ gdk_screen_get_monitor_geometry (screen, self->monitor_num, &rect);
+
+ return rect.height;
+}
+
+static gboolean
+update_monitor_number (CcWindow *self)
+{
+ gboolean changed = FALSE;
+ GtkWidget *widget;
+ GdkScreen *screen;
+ GdkWindow *window;
+ int monitor;
+
+ widget = GTK_WIDGET (self);
+
+ window = gtk_widget_get_window (widget);
+ screen = gtk_widget_get_screen (widget);
+ monitor = gdk_screen_get_monitor_at_window (screen, window);
+ if (self->monitor_num != monitor)
+ {
+ self->monitor_num = monitor;
+ changed = TRUE;
+ }
+
+ return changed;
+}
+
+static CcSmallScreen
+is_small (CcWindow *self)
+{
+ if (get_monitor_height (self) <= FIXED_HEIGHT)
+ return SMALL_SCREEN_TRUE;
+ return SMALL_SCREEN_FALSE;
+}
+
static void
-create_window (CcWindow *self)
+update_small_screen_settings (CcWindow *self)
+{
+ CcSmallScreen small;
+
+ update_monitor_number (self);
+ small = is_small (self);
+
+ if (small == SMALL_SCREEN_TRUE)
+ {
+ gtk_window_set_resizable (GTK_WINDOW (self), TRUE);
+
+ if (self->small_screen != small)
+ gtk_window_maximize (GTK_WINDOW (self));
+ }
+ else
+ {
+ if (self->small_screen != small)
+ gtk_window_unmaximize (GTK_WINDOW (self));
+
+ gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
+ }
+
+ self->small_screen = small;
+
+ /* And update the minimum sizes */
+ stack_page_notify_cb (GTK_STACK (self->stack), NULL, self);
+}
+
+static gboolean
+main_window_configure_cb (GtkWidget *widget,
+ GdkEvent *event,
+ CcWindow *self)
+{
+ update_small_screen_settings (self);
+ return FALSE;
+}
+
+static void
+application_set_cb (GObject *object,
+ GParamSpec *pspec,
+ CcWindow *self)
+{
+ /* update small screen settings now - to avoid visible resizing, we want
+ * to do it before showing the window, and GtkApplicationWindow cannot be
+ * realized unless its application property has been set */
+ if (gtk_window_get_application (GTK_WINDOW (self)))
+ {
+ gtk_widget_realize (GTK_WIDGET (self));
+ update_small_screen_settings (self);
+ }
+}
+
+static void
+monitors_changed_cb (GdkScreen *screen,
+ CcWindow *self)
+{
+ /* We reset small_screen_set to make sure that the
+ * window gets maximised if need be, in update_small_screen_settings() */
+ self->small_screen = SMALL_SCREEN_UNSET;
+ update_small_screen_settings (self);
+}
+
+static void
+gdk_window_set_cb (GObject *object,
+ GParamSpec *pspec,
+ CcWindow *self)
+{
+ GdkWindow *window;
+ gchar *str;
+
+ if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
+ return;
+
+ window = gtk_widget_get_window (GTK_WIDGET (self));
+
+ if (!window)
+ return;
+
+ str = g_strdup_printf ("%u", (guint) GDK_WINDOW_XID (window));
+ g_setenv ("GNOME_CONTROL_CENTER_XID", str, TRUE);
+ g_free (str);
+}
+
+static gboolean
+window_map_event_cb (GtkWidget *widget,
+ GdkEvent *event,
+ CcWindow *self)
+{
+ /* If focus ends up in a category icon view one of the items is
+ * immediately selected which looks odd when we are starting up, so
+ * we explicitly unset the focus here. */
+ gtk_window_set_focus (GTK_WINDOW (self), NULL);
+ return GDK_EVENT_PROPAGATE;
+}
+
+static void
+create_main_page (CcWindow *self)
+{
+ GtkStyleContext *context;
+
+ self->scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ context = gtk_widget_get_style_context (self->scrolled_window);
+ gtk_style_context_add_class (context, "view");
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self->scrolled_window),
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_stack_add_named (GTK_STACK (self->stack), self->scrolled_window, OVERVIEW_PAGE);
+
+ self->main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_set_margin_top (self->main_vbox, 8);
+ gtk_widget_set_margin_bottom (self->main_vbox, 8);
+ gtk_widget_set_margin_start (self->main_vbox, 12);
+ gtk_widget_set_margin_end (self->main_vbox, 12);
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (self->main_vbox),
+ gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW
(self->scrolled_window)));
+ gtk_container_add (GTK_CONTAINER (self->scrolled_window), self->main_vbox);
+
+ gtk_widget_set_size_request (self->scrolled_window, FIXED_WIDTH, -1);
+
+ /* load the available settings panels */
+ setup_model (self);
+}
+
+static void
+create_search_page (CcWindow *self)
+{
+ self->search_scrolled = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self->search_scrolled),
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_stack_add_named (GTK_STACK (self->stack), self->search_scrolled, SEARCH_PAGE);
+
+ /* setup search functionality */
+ setup_search (self);
+}
+
+static void
+create_header (CcWindow *self)
{
+ GtkWidget *image;
AtkObject *accessible;
+ self->header = gtk_header_bar_new ();
+ gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (self->header), TRUE);
+
+ self->header_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
+
/* previous button */
+ self->previous_button = gtk_button_new_from_icon_name ("go-previous-symbolic", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_valign (self->previous_button, GTK_ALIGN_CENTER);
+ gtk_widget_set_no_show_all (self->previous_button, TRUE);
accessible = gtk_widget_get_accessible (self->previous_button);
atk_object_set_name (accessible, _("All Settings"));
+ gtk_header_bar_pack_start (GTK_HEADER_BAR (self->header), self->previous_button);
+ g_signal_connect (self->previous_button, "clicked", G_CALLBACK (previous_button_clicked_cb), self);
+ gtk_size_group_add_widget (self->header_sizegroup, self->previous_button);
+
+ /* toggle search button */
+ self->search_button = gtk_toggle_button_new ();
+ image = gtk_image_new_from_icon_name ("edit-find-symbolic", GTK_ICON_SIZE_MENU);
+ gtk_button_set_image (GTK_BUTTON (self->search_button), image);
+ gtk_widget_set_valign (self->search_button, GTK_ALIGN_CENTER);
+ gtk_style_context_add_class (gtk_widget_get_style_context (self->search_button),
+ "image-button");
+ gtk_header_bar_pack_end (GTK_HEADER_BAR (self->header), self->search_button);
+
+ self->top_right_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ gtk_header_bar_pack_end (GTK_HEADER_BAR (self->header), self->top_right_box);
+
+ self->lock_button = gtk_lock_button_new (NULL);
+ gtk_style_context_add_class (gtk_widget_get_style_context (self->lock_button),
+ "text-button");
+ gtk_widget_set_valign (self->lock_button, GTK_ALIGN_CENTER);
+ gtk_widget_set_no_show_all (self->lock_button, TRUE);
+ gtk_container_add (GTK_CONTAINER (self->top_right_box), self->lock_button);
+ gtk_size_group_add_widget (self->header_sizegroup, self->lock_button);
+}
- gtk_window_set_titlebar (GTK_WINDOW (self), self->header_box);
- gtk_widget_show_all (self->header_box);
-
- /*
- * We have to create the listbox here because declaring it in window.ui
- * and letting GtkBuilder handle it would hit the bug where the focus is
- * not tracked.
- */
- self->panel_list = cc_panel_list_new ();
-
- g_signal_connect (self->panel_list, "show-panel", G_CALLBACK (show_panel_cb), self);
- g_signal_connect (self->panel_list, "notify::view", G_CALLBACK (panel_list_view_changed_cb), self);
+static void
+create_window (CcWindow *self)
+{
+ GtkWidget *box;
+ GdkScreen *screen;
- g_object_bind_property (self->search_bar,
- "search-mode-enabled",
- self->panel_list,
- "search-mode",
+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_container_add (GTK_CONTAINER (self), box);
+
+ create_header (self);
+ gtk_window_set_titlebar (GTK_WINDOW (self), self->header);
+ gtk_header_bar_set_title (GTK_HEADER_BAR (self->header), _(DEFAULT_WINDOW_TITLE));
+ gtk_widget_show_all (self->header);
+
+ /* search bar */
+ self->search_bar = gtk_search_bar_new ();
+ self->search_entry = gtk_search_entry_new ();
+ gtk_entry_set_width_chars (GTK_ENTRY (self->search_entry), 30);
+ g_signal_connect (self->search_entry, "search-changed", G_CALLBACK (search_entry_changed_cb), self);
+ g_signal_connect (self->search_entry, "key-press-event", G_CALLBACK (search_entry_key_press_event_cb),
self);
+ gtk_container_add (GTK_CONTAINER (self->search_bar), self->search_entry);
+ gtk_container_add (GTK_CONTAINER (box), self->search_bar);
+
+ g_object_bind_property (self->search_button, "active",
+ self->search_bar, "search-mode-enabled",
G_BINDING_BIDIRECTIONAL);
- g_object_bind_property (self->search_entry,
- "text",
- self->panel_list,
- "search-query",
- G_BINDING_DEFAULT);
+ self->stack = gtk_stack_new ();
+ gtk_stack_set_homogeneous (GTK_STACK (self->stack), TRUE);
+ gtk_stack_set_transition_type (GTK_STACK (self->stack), GTK_STACK_TRANSITION_TYPE_CROSSFADE);
+ gtk_box_pack_start (GTK_BOX (box), self->stack, TRUE, TRUE, 0);
- gtk_container_add (GTK_CONTAINER (self->list_scrolled), self->panel_list);
- gtk_widget_show (self->panel_list);
-
- setup_model (self);
+ create_main_page (self);
+ create_search_page (self);
/* connect various signals */
+ screen = gtk_widget_get_screen (GTK_WIDGET (self));
+ g_signal_connect (screen, "monitors-changed", G_CALLBACK (monitors_changed_cb), self);
+
+ g_signal_connect (self, "configure-event", G_CALLBACK (main_window_configure_cb), self);
+ g_signal_connect (self, "notify::application", G_CALLBACK (application_set_cb), self);
g_signal_connect_after (self, "key_press_event",
G_CALLBACK (window_key_press_event), self);
gtk_widget_add_events (GTK_WIDGET (self), GDK_BUTTON_RELEASE_MASK);
g_signal_connect (self, "button-release-event",
G_CALLBACK (window_button_release_event), self);
+ g_signal_connect (self, "map-event", G_CALLBACK (window_map_event_cb), self);
+
+ g_signal_connect (self, "notify::window", G_CALLBACK (gdk_window_set_cb), self);
+
+ g_signal_connect (self->stack, "notify::visible-child",
+ G_CALLBACK (stack_page_notify_cb), self);
+
+ gtk_widget_show_all (box);
}
static void
cc_window_init (CcWindow *self)
{
- gtk_widget_init_template (GTK_WIDGET (self));
+ self->monitor_num = -1;
+ self->small_screen = SMALL_SCREEN_UNSET;
create_window (self);
@@ -814,8 +1576,7 @@ cc_window_init (CcWindow *self)
/* keep a list of custom widgets to unload on panel change */
self->custom_widgets = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
- /* After everything is loaded, select the first visible panel */
- cc_panel_list_activate (CC_PANEL_LIST (self->panel_list));
+ stack_page_notify_cb (GTK_STACK (self->stack), NULL, self);
}
CcWindow *
diff --git a/shell/alt/cc-panel-list.c b/shell/cc-panel-list.c
similarity index 100%
rename from shell/alt/cc-panel-list.c
rename to shell/cc-panel-list.c
diff --git a/shell/alt/cc-panel-list.h b/shell/cc-panel-list.h
similarity index 100%
rename from shell/alt/cc-panel-list.h
rename to shell/cc-panel-list.h
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
index 14b9782..fc235fe 100644
--- a/shell/cc-panel-loader.c
+++ b/shell/cc-panel-loader.c
@@ -135,6 +135,15 @@ parse_categories (GDesktopAppInfo *app)
#define const_strv(s) ((const gchar* const*) s)
#ifdef CC_ENABLE_ALT_CATEGORIES
+ if (g_strv_contains (const_strv (split), "X-GNOME-Hidden"))
+ retval = CC_CATEGORY_HIDDEN;
+ else if (g_strv_contains (const_strv (split), "HardwareSettings"))
+ retval = CC_CATEGORY_HARDWARE;
+ else if (g_strv_contains (const_strv (split), "X-GNOME-PersonalSettings"))
+ retval = CC_CATEGORY_PERSONAL;
+ else if (g_strv_contains (const_strv (split), "X-GNOME-SystemSettings"))
+ retval = CC_CATEGORY_SYSTEM;
+#else
if (g_strv_contains (const_strv (split), "X-GNOME-AltHidden"))
retval = CC_CATEGORY_HIDDEN;
else if (g_strv_contains (const_strv (split), "X-GNOME-ConnectivitySettings"))
@@ -149,15 +158,6 @@ parse_categories (GDesktopAppInfo *app)
retval = CC_CATEGORY_DETAILS;
else if (g_strv_contains (const_strv (split), "HardwareSettings"))
retval = CC_CATEGORY_HARDWARE;
-#else
- if (g_strv_contains (const_strv (split), "X-GNOME-Hidden"))
- retval = CC_CATEGORY_HIDDEN;
- else if (g_strv_contains (const_strv (split), "HardwareSettings"))
- retval = CC_CATEGORY_HARDWARE;
- else if (g_strv_contains (const_strv (split), "X-GNOME-PersonalSettings"))
- retval = CC_CATEGORY_PERSONAL;
- else if (g_strv_contains (const_strv (split), "X-GNOME-SystemSettings"))
- retval = CC_CATEGORY_SYSTEM;
#endif
#undef const_strv
diff --git a/shell/cc-shell-model.h b/shell/cc-shell-model.h
index ca0e913..8c0ff28 100644
--- a/shell/cc-shell-model.h
+++ b/shell/cc-shell-model.h
@@ -54,16 +54,16 @@ typedef struct _CcShellModelPrivate CcShellModelPrivate;
typedef enum {
#ifdef CC_ENABLE_ALT_CATEGORIES
+ CC_CATEGORY_PERSONAL,
+ CC_CATEGORY_SYSTEM,
+ CC_CATEGORY_HARDWARE,
+#else
CC_CATEGORY_CONNECTIVITY,
CC_CATEGORY_PERSONALIZATION,
CC_CATEGORY_ACCOUNT,
CC_CATEGORY_HARDWARE,
CC_CATEGORY_DEVICES,
CC_CATEGORY_DETAILS,
-#else
- CC_CATEGORY_PERSONAL,
- CC_CATEGORY_SYSTEM,
- CC_CATEGORY_HARDWARE,
#endif
CC_CATEGORY_HIDDEN,
diff --git a/shell/cc-window.c b/shell/cc-window.c
index 94e0573..9f29c55 100644
--- a/shell/cc-window.c
+++ b/shell/cc-window.c
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2009, 2010 Intel, Inc.
* Copyright (c) 2010 Red Hat, Inc.
+ * Copyright (c) 2016 Endless, Inc.
*
* The Control Center is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by the
@@ -36,41 +37,25 @@
#include "cc-shell.h"
#include "cc-shell-category-view.h"
#include "cc-shell-model.h"
+#include "cc-panel-list.h"
#include "cc-panel-loader.h"
#include "cc-util.h"
-/* Use a fixed width for the shell, since resizing horizontally is more awkward
- * for the user than resizing vertically
- * Both sizes are defined in https://live.gnome.org/Design/SystemSettings/ */
-#define FIXED_WIDTH 740
-#define FIXED_HEIGHT 636
-#define SMALL_SCREEN_FIXED_HEIGHT 400
-
-#define MIN_ICON_VIEW_HEIGHT 300
-
#define MOUSE_BACK_BUTTON 8
-#define DEFAULT_WINDOW_TITLE N_("All Settings")
#define DEFAULT_WINDOW_ICON_NAME "preferences-system"
-#define SEARCH_PAGE "_search"
-#define OVERVIEW_PAGE "_overview"
-
-typedef enum {
- SMALL_SCREEN_UNSET,
- SMALL_SCREEN_TRUE,
- SMALL_SCREEN_FALSE
-} CcSmallScreen;
-
struct _CcWindow
{
GtkApplicationWindow parent;
GtkWidget *stack;
GtkWidget *header;
- GtkWidget *main_vbox;
- GtkWidget *scrolled_window;
+ GtkWidget *header_box;
+ GtkWidget *list_scrolled;
+ GtkWidget *panel_headerbar;
GtkWidget *search_scrolled;
+ GtkWidget *panel_list;
GtkWidget *previous_button;
GtkWidget *top_right_box;
GtkWidget *search_button;
@@ -88,15 +73,7 @@ struct _CcWindow
GtkListStore *store;
- GtkTreeModel *search_filter;
- GtkWidget *search_view;
- gchar *filter_string;
- gchar **filter_terms;
-
CcPanel *active_panel;
-
- int monitor_num;
- CcSmallScreen small_screen;
};
static void cc_shell_iface_init (CcShellInterface *iface);
@@ -115,8 +92,6 @@ static gboolean cc_window_set_active_panel_from_id (CcShell *shell,
GVariant *parameters,
GError **err);
-static gint get_monitor_height (CcWindow *self);
-
static const gchar *
get_icon_name_from_g_icon (GIcon *gicon)
{
@@ -174,12 +149,12 @@ activate_panel (CcWindow *self,
icon_name = get_icon_name_from_g_icon (gicon);
gtk_window_set_role (GTK_WINDOW (self), id);
- gtk_header_bar_set_title (GTK_HEADER_BAR (self->header), name);
+ gtk_header_bar_set_title (GTK_HEADER_BAR (self->panel_headerbar), name);
gtk_window_set_default_icon_name (icon_name);
gtk_window_set_icon_name (GTK_WINDOW (self), icon_name);
title_widget = cc_panel_get_title_widget (CC_PANEL (self->current_panel));
- gtk_header_bar_set_custom_title (GTK_HEADER_BAR (self->header), title_widget);
+ gtk_header_bar_set_custom_title (GTK_HEADER_BAR (self->panel_headerbar), title_widget);
self->current_panel_box = box;
@@ -222,7 +197,7 @@ add_current_panel_to_history (CcShell *shell,
static void
shell_show_overview_page (CcWindow *self)
{
- gtk_stack_set_visible_child_name (GTK_STACK (self->stack), OVERVIEW_PAGE);
+ cc_panel_list_set_view (CC_PANEL_LIST (self->panel_list), CC_PANEL_LIST_MAIN);
if (self->current_panel_box)
gtk_container_remove (GTK_CONTAINER (self->stack), self->current_panel_box);
@@ -235,8 +210,6 @@ shell_show_overview_page (CcWindow *self)
self->previous_panels = g_queue_new ();
/* clear the search text */
- g_free (self->filter_string);
- self->filter_string = g_strdup ("");
gtk_entry_set_text (GTK_ENTRY (self->search_entry), "");
if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (self->search_bar)))
gtk_widget_grab_focus (self->search_entry);
@@ -245,8 +218,6 @@ shell_show_overview_page (CcWindow *self)
/* reset window title and icon */
gtk_window_set_role (GTK_WINDOW (self), NULL);
- gtk_header_bar_set_title (GTK_HEADER_BAR (self->header), _(DEFAULT_WINDOW_TITLE));
- gtk_header_bar_set_custom_title (GTK_HEADER_BAR (self->header), NULL);
gtk_window_set_default_icon_name (DEFAULT_WINDOW_ICON_NAME);
gtk_window_set_icon_name (GTK_WINDOW (self), DEFAULT_WINDOW_ICON_NAME);
@@ -273,610 +244,122 @@ cc_window_set_search_item (CcWindow *center,
}
static void
-item_activated_cb (CcShellCategoryView *view,
- gchar *name,
- gchar *id,
- CcWindow *shell)
-{
- cc_window_set_active_panel_from_id (CC_SHELL (shell), id, NULL, NULL);
-}
-
-static gboolean
-category_focus_out (GtkWidget *view,
- GdkEventFocus *event,
- CcWindow *shell)
-{
- gtk_icon_view_unselect_all (GTK_ICON_VIEW (view));
-
- return FALSE;
-}
-
-static gboolean
-category_focus_in (GtkWidget *view,
- GdkEventFocus *event,
- CcWindow *shell)
-{
- GtkTreePath *path;
-
- if (!gtk_icon_view_get_cursor (GTK_ICON_VIEW (view), &path, NULL))
- {
- path = gtk_tree_path_new_from_indices (0, -1);
- gtk_icon_view_set_cursor (GTK_ICON_VIEW (view), path, NULL, FALSE);
- }
-
- gtk_icon_view_select_path (GTK_ICON_VIEW (view), path);
- gtk_tree_path_free (path);
-
- return FALSE;
-}
-
-static GList *
-get_item_views (CcWindow *shell)
-{
- GList *list, *l;
- GList *res;
-
- list = gtk_container_get_children (GTK_CONTAINER (shell->main_vbox));
- res = NULL;
- for (l = list; l; l = l->next)
- {
- if (!CC_IS_SHELL_CATEGORY_VIEW (l->data))
- continue;
- res = g_list_append (res, cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (l->data)));
- }
-
- g_list_free (list);
-
- return res;
-}
-
-static gboolean
-is_prev_direction (GtkWidget *widget,
- GtkDirectionType direction)
-{
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR &&
- direction == GTK_DIR_LEFT)
- return TRUE;
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL &&
- direction == GTK_DIR_RIGHT)
- return TRUE;
- return FALSE;
-}
-
-static gboolean
-is_next_direction (GtkWidget *widget,
- GtkDirectionType direction)
-{
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR &&
- direction == GTK_DIR_RIGHT)
- return TRUE;
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL &&
- direction == GTK_DIR_LEFT)
- return TRUE;
- return FALSE;
-}
-
-static GtkTreePath *
-get_first_path (GtkIconView *view)
-{
- GtkTreeModel *model;
- GtkTreeIter iter;
-
- model = gtk_icon_view_get_model (view);
- if (!gtk_tree_model_get_iter_first (model, &iter))
- return NULL;
- return gtk_tree_model_get_path (model, &iter);
-}
-
-static GtkTreePath *
-get_last_path (GtkIconView *view)
+show_panel_cb (CcPanelList *panel_list,
+ const gchar *panel_id,
+ CcWindow *self)
{
- GtkTreeModel *model;
- GtkTreeIter iter;
- GtkTreePath *path;
- gboolean ret;
-
- model = gtk_icon_view_get_model (view);
- if (!gtk_tree_model_get_iter_first (model, &iter))
- return NULL;
-
- ret = TRUE;
- path = NULL;
-
- while (ret)
- {
- g_clear_pointer (&path, gtk_tree_path_free);
- path = gtk_tree_model_get_path (model, &iter);
- ret = gtk_tree_model_iter_next (model, &iter);
- }
- return path;
+ if (panel_id)
+ cc_window_set_active_panel_from_id (CC_SHELL (self), panel_id, NULL, NULL);
+ else
+ shell_show_overview_page (self);
}
-static gboolean
-categories_keynav_failed (GtkIconView *current_view,
- GtkDirectionType direction,
- CcWindow *shell)
+static void
+update_list_title (CcWindow *self)
{
- GList *views, *v;
- GtkIconView *new_view;
- GtkTreePath *path;
- GtkTreeModel *model;
- GtkTreeIter iter;
- gint col, c, dist, d;
- GtkTreePath *sel;
- gboolean res;
-
- res = FALSE;
-
- views = get_item_views (shell);
-
- for (v = views; v; v = v->next)
- {
- if (v->data == current_view)
- break;
- }
-
- new_view = NULL;
-
- if (direction == GTK_DIR_DOWN && v != NULL && v->next != NULL)
- {
- new_view = v->next->data;
-
- if (gtk_icon_view_get_cursor (current_view, &path, NULL))
- {
- col = gtk_icon_view_get_item_column (current_view, path);
- gtk_tree_path_free (path);
-
- sel = NULL;
- dist = 1000;
- model = gtk_icon_view_get_model (new_view);
- g_assert (gtk_tree_model_get_iter_first (model, &iter));
- do {
- path = gtk_tree_model_get_path (model, &iter);
- c = gtk_icon_view_get_item_column (new_view, path);
- d = ABS (c - col);
- if (d < dist)
- {
- if (sel)
- gtk_tree_path_free (sel);
- sel = path;
- dist = d;
- }
- else
- gtk_tree_path_free (path);
- } while (gtk_tree_model_iter_next (model, &iter));
-
- gtk_icon_view_set_cursor (new_view, sel, NULL, FALSE);
- gtk_tree_path_free (sel);
- }
-
- gtk_widget_grab_focus (GTK_WIDGET (new_view));
+ CcPanelListView view;
+ const gchar *title;
- res = TRUE;
- }
+ view = cc_panel_list_get_view (CC_PANEL_LIST (self->panel_list));
- if (direction == GTK_DIR_UP && v != NULL && v->prev != NULL)
+ switch (view)
{
- new_view = v->prev->data;
-
- if (gtk_icon_view_get_cursor (current_view, &path, NULL))
- {
- col = gtk_icon_view_get_item_column (current_view, path);
- gtk_tree_path_free (path);
-
- sel = NULL;
- dist = 1000;
- model = gtk_icon_view_get_model (new_view);
- g_assert (gtk_tree_model_get_iter_first (model, &iter));
- do {
- path = gtk_tree_model_get_path (model, &iter);
- c = gtk_icon_view_get_item_column (new_view, path);
- d = ABS (c - col);
- if (d <= dist)
- {
- if (sel)
- gtk_tree_path_free (sel);
- sel = path;
- dist = d;
- }
- else
- gtk_tree_path_free (path);
- } while (gtk_tree_model_iter_next (model, &iter));
-
- gtk_icon_view_set_cursor (new_view, sel, NULL, FALSE);
- gtk_tree_path_free (sel);
- }
-
- gtk_widget_grab_focus (GTK_WIDGET (new_view));
+ case CC_PANEL_LIST_DETAILS:
+ title = _("Details");
+ break;
- res = TRUE;
- }
+ case CC_PANEL_LIST_DEVICES:
+ title = _("Devices");
+ break;
- if (is_prev_direction (GTK_WIDGET (current_view), direction) && v != NULL)
- {
- if (gtk_icon_view_get_cursor (current_view, &path, NULL))
- {
- if (v->prev)
- new_view = v->prev->data;
-
- if (gtk_tree_path_prev (path))
- {
- new_view = current_view;
- }
- else if (new_view != NULL)
- {
- path = get_last_path (new_view);
- }
- else
- {
- goto out;
- }
-
- gtk_icon_view_set_cursor (new_view, path, NULL, FALSE);
- gtk_icon_view_select_path (new_view, path);
- gtk_tree_path_free (path);
- gtk_widget_grab_focus (GTK_WIDGET (new_view));
-
- res = TRUE;
- }
- }
+ case CC_PANEL_LIST_MAIN:
+ title = _("Settings");
+ break;
- if (is_next_direction (GTK_WIDGET (current_view), direction) && v != NULL)
- {
- if (gtk_icon_view_get_cursor (current_view, &path, NULL))
- {
- GtkTreeIter iter;
-
- if (v->next)
- new_view = v->next->data;
-
- gtk_tree_path_next (path);
- model = gtk_icon_view_get_model (current_view);
-
- if (gtk_tree_model_get_iter (model, &iter, path))
- {
- new_view = current_view;
- }
- else if (new_view != NULL)
- {
- path = get_first_path (new_view);
- }
- else
- {
- goto out;
- }
-
- gtk_icon_view_set_cursor (new_view, path, NULL, FALSE);
- gtk_icon_view_select_path (new_view, path);
- gtk_tree_path_free (path);
- gtk_widget_grab_focus (GTK_WIDGET (new_view));
-
- res = TRUE;
- }
+ case CC_PANEL_LIST_SEARCH:
+ title = NULL;
+ break;
}
-out:
- g_list_free (views);
-
- return res;
+ if (title)
+ gtk_header_bar_set_title (GTK_HEADER_BAR (self->header), title);
}
-static gboolean
-model_filter_func (GtkTreeModel *model,
- GtkTreeIter *iter,
- CcWindow *self)
+static void
+panel_list_view_changed_cb (CcPanelList *panel_list,
+ GParamSpec *pspec,
+ CcWindow *self)
{
- char **t;
- gboolean matches = FALSE;
+ gboolean is_main_view;
- if (!self->filter_string || !self->filter_terms)
- return FALSE;
+ is_main_view = cc_panel_list_get_view (panel_list) == CC_PANEL_LIST_MAIN;
- for (t = self->filter_terms; *t; t++)
- {
- matches = cc_shell_model_iter_matches_search (CC_SHELL_MODEL (model),
- iter,
- *t);
- if (!matches)
- break;
- }
+ gtk_widget_set_visible (self->previous_button, !is_main_view);
+ gtk_widget_set_visible (self->search_button, is_main_view);
- return matches;
-}
-
-static gboolean
-category_filter_func (GtkTreeModel *model,
- GtkTreeIter *iter,
- CcPanelCategory filter)
-{
- guint category;
-
- gtk_tree_model_get (model, iter, COL_CATEGORY, &category, -1);
-
- return (category == filter);
+ update_list_title (self);
}
static void
-search_entry_changed_cb (GtkEntry *entry,
- CcWindow *self)
+search_entry_activate_cb (GtkEntry *entry,
+ CcWindow *self)
{
- char *str;
-
- /* if the entry text was set manually (not by the user) */
- if (!g_strcmp0 (self->filter_string, gtk_entry_get_text (entry)))
- {
- cc_shell_model_set_sort_terms (CC_SHELL_MODEL (self->store), NULL);
- return;
- }
+ gboolean changed;
- /* Don't re-filter for added trailing or leading spaces */
- str = cc_util_normalize_casefold_and_unaccent (gtk_entry_get_text (entry));
- g_strstrip (str);
- if (!g_strcmp0 (str, self->filter_string))
- {
- g_free (str);
- return;
- }
-
- g_free (self->filter_string);
- self->filter_string = str;
+ changed = cc_panel_list_activate (CC_PANEL_LIST (self->panel_list));
- g_strfreev (self->filter_terms);
- self->filter_terms = g_strsplit (self->filter_string, " ", -1);
-
- cc_shell_model_set_sort_terms (CC_SHELL_MODEL (self->store), self->filter_terms);
-
- if (!g_strcmp0 (self->filter_string, ""))
- {
- shell_show_overview_page (self);
- }
- else
- {
- gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (self->search_filter));
- gtk_stack_set_visible_child_name (GTK_STACK (self->stack), SEARCH_PAGE);
- }
+ gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->search_bar), !changed);
}
-static gboolean
-search_entry_key_press_event_cb (GtkEntry *entry,
- GdkEventKey *event,
- CcWindow *self)
-{
- if (event->keyval == GDK_KEY_Return &&
- g_strcmp0 (self->filter_string, "") != 0)
- {
- GtkTreePath *path;
- GtkTreeSelection *selection;
-
- path = gtk_tree_path_new_first ();
-
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->search_view));
- gtk_tree_selection_select_path (selection, path);
-
- if (!gtk_tree_selection_path_is_selected (selection, path))
- {
- gtk_tree_path_free (path);
- return FALSE;
- }
-
- gtk_tree_view_row_activated (GTK_TREE_VIEW (self->search_view), path,
- gtk_tree_view_get_column (GTK_TREE_VIEW (self->search_view), 0));
- gtk_tree_path_free (path);
- return TRUE;
- }
-
- if (event->keyval == GDK_KEY_Escape)
- {
- gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->search_bar), FALSE);
- gtk_entry_set_text (entry, "");
- return TRUE;
- }
-
- return FALSE;
-}
static void
-on_search_row_activated (GtkTreeView *treeview,
- GtkTreePath *path,
- GtkTreeViewColumn *column,
- CcWindow *shell)
+setup_model (CcWindow *shell)
{
- GtkTreeSelection *selection;
GtkTreeModel *model;
- GtkTreeIter iter;
- char *id = NULL;
-
- selection = gtk_tree_view_get_selection (treeview);
-
- if (!gtk_tree_selection_get_selected (selection, &model, &iter))
- return;
+ GtkTreeIter iter;
+ gboolean valid;
- gtk_tree_model_get (model, &iter,
- COL_ID, &id,
- -1);
+ shell->store = (GtkListStore *) cc_shell_model_new ();
+ model = GTK_TREE_MODEL (shell->store);
- if (id)
- cc_window_set_active_panel_from_id (CC_SHELL (shell), id, NULL, NULL);
+ cc_panel_loader_fill_model (CC_SHELL_MODEL (shell->store));
- gtk_tree_selection_unselect_all (selection);
+ /* Create a row for each panel */
+ valid = gtk_tree_model_get_iter_first (model, &iter);
- g_free (id);
-}
-
-static gboolean
-on_search_button_press_event (GtkTreeView *treeview,
- GdkEventButton *event,
- CcWindow *shell)
-{
- if (event->type == GDK_BUTTON_PRESS && event->button == 1)
+ while (valid)
{
- GtkTreePath *path = NULL;
- GtkTreeSelection *selection;
- GtkTreeModel *model;
- GtkTreeIter iter;
-
- /* We don't check for the position being blank,
- * it could be the dead space between columns */
- gtk_tree_view_is_blank_at_pos (treeview,
- event->x, event->y,
- &path,
- NULL,
- NULL,
- NULL);
- if (path == NULL)
- return FALSE;
-
- model = gtk_tree_view_get_model (treeview);
- if (gtk_tree_model_get_iter (model, &iter, path) == FALSE)
- {
- gtk_tree_path_free (path);
- return FALSE;
- }
-
- selection = gtk_tree_view_get_selection (treeview);
- gtk_tree_selection_select_iter (selection, &iter);
+ CcPanelCategory category;
+ GIcon *icon;
+ gchar *name, *description, *id, *symbolic_icon;
+ const gchar *icon_name;
- on_search_row_activated (treeview, NULL, NULL, shell);
-
- gtk_tree_path_free (path);
-
- return TRUE;
- }
+ gtk_tree_model_get (model, &iter,
+ COL_CATEGORY, &category,
+ COL_DESCRIPTION, &description,
+ COL_GICON, &icon,
+ COL_ID, &id,
+ COL_NAME, &name,
+ -1);
- return FALSE;
-}
+ icon_name = get_icon_name_from_g_icon (icon);
+ symbolic_icon = g_strdup_printf ("%s-symbolic", icon_name);
-static void
-setup_search (CcWindow *self)
-{
- GtkWidget *search_view;
- GtkCellRenderer *renderer;
- GtkTreeViewColumn *column;
-
- g_return_if_fail (self->store != NULL);
-
- /* create the search filter */
- self->search_filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (self->store),
- NULL);
-
- gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (self->search_filter),
- (GtkTreeModelFilterVisibleFunc)
- model_filter_func,
- self, NULL);
-
- /* set up the search view */
- self->search_view = search_view = gtk_tree_view_new ();
- gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (search_view), FALSE);
- gtk_tree_view_set_enable_search (GTK_TREE_VIEW (search_view), FALSE);
- gtk_tree_view_set_model (GTK_TREE_VIEW (search_view),
- GTK_TREE_MODEL (self->search_filter));
- /* This needs to happen after setting the model, otherwise
- * the search column will be the first string column */
- gtk_tree_view_set_search_column (GTK_TREE_VIEW (search_view), -1);
-
- renderer = gtk_cell_renderer_pixbuf_new ();
- g_object_set (renderer,
- "xpad", 15,
- "ypad", 10,
- "stock-size", GTK_ICON_SIZE_DIALOG,
- "follow-state", TRUE,
- NULL);
- column = gtk_tree_view_column_new_with_attributes ("Icon", renderer,
- "gicon", COL_GICON,
- NULL);
- gtk_tree_view_column_set_expand (column, FALSE);
- gtk_tree_view_append_column (GTK_TREE_VIEW (self->search_view), column);
-
- renderer = gtk_cell_renderer_text_new ();
- g_object_set (renderer,
- "xpad", 0,
- NULL);
- column = gtk_tree_view_column_new_with_attributes ("Name", renderer,
- "text", COL_NAME,
- NULL);
- gtk_tree_view_column_set_expand (column, FALSE);
- gtk_tree_view_append_column (GTK_TREE_VIEW (self->search_view), column);
-
- renderer = gd_styled_text_renderer_new ();
- gd_styled_text_renderer_add_class (GD_STYLED_TEXT_RENDERER (renderer), "dim-label");
- g_object_set (renderer,
- "xpad", 15,
- "ellipsize", PANGO_ELLIPSIZE_END,
- NULL);
- column = gtk_tree_view_column_new_with_attributes ("Description", renderer,
- "text", COL_DESCRIPTION,
- NULL);
- gtk_tree_view_column_set_expand (column, TRUE);
- gtk_tree_view_append_column (GTK_TREE_VIEW (self->search_view), column);
-
- gtk_container_add (GTK_CONTAINER (self->search_scrolled), search_view);
-
- g_signal_connect (self->search_view, "row-activated",
- G_CALLBACK (on_search_row_activated), self);
- g_signal_connect (self->search_view, "button-press-event",
- G_CALLBACK (on_search_button_press_event), self);
-
- self->filter_string = g_strdup ("");
-
- gtk_widget_show (self->search_view);
-}
+ cc_panel_list_add_panel (CC_PANEL_LIST (shell->panel_list),
+ category,
+ id,
+ name,
+ description,
+ symbolic_icon);
-static void
-add_category_view (CcWindow *shell,
- CcPanelCategory category,
- const char *name)
-{
- GtkTreeModel *filter;
- GtkWidget *categoryview;
+ valid = gtk_tree_model_iter_next (model, &iter);
- if (category > 0)
- {
- GtkWidget *separator;
- separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_widget_set_margin_top (separator, 11);
- gtk_widget_set_margin_bottom (separator, 10);
- gtk_box_pack_start (GTK_BOX (shell->main_vbox), separator, FALSE, FALSE, 0);
- gtk_widget_show (separator);
+ g_clear_pointer (&symbolic_icon, g_free);
+ g_clear_pointer (&description, g_free);
+ g_clear_pointer (&name, g_free);
+ g_clear_pointer (&id, g_free);
+ g_clear_object (&icon);
}
-
- /* create new category view for this category */
- filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (shell->store),
- NULL);
- gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter),
- (GtkTreeModelFilterVisibleFunc) category_filter_func,
- GINT_TO_POINTER (category), NULL);
-
- categoryview = cc_shell_category_view_new (name, filter);
- gtk_box_pack_start (GTK_BOX (shell->main_vbox), categoryview, FALSE, TRUE, 0);
-
- g_signal_connect (cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (categoryview)),
- "desktop-item-activated",
- G_CALLBACK (item_activated_cb), shell);
-
- gtk_widget_show (categoryview);
-
- g_signal_connect (cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (categoryview)),
- "focus-in-event",
- G_CALLBACK (category_focus_in), shell);
- g_signal_connect (cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (categoryview)),
- "focus-out-event",
- G_CALLBACK (category_focus_out), shell);
- g_signal_connect (cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (categoryview)),
- "keynav-failed",
- G_CALLBACK (categories_keynav_failed), shell);
-}
-
-static void
-setup_model (CcWindow *shell)
-{
- shell->store = (GtkListStore *) cc_shell_model_new ();
-
- /* Add categories */
- add_category_view (shell, CC_CATEGORY_PERSONAL, C_("category", "Personal"));
- add_category_view (shell, CC_CATEGORY_HARDWARE, C_("category", "Hardware"));
- add_category_view (shell, CC_CATEGORY_SYSTEM, C_("category", "System"));
-
- cc_panel_loader_fill_model (CC_SHELL_MODEL (shell->store));
}
static void
@@ -884,68 +367,21 @@ previous_button_clicked_cb (GtkButton *button,
CcWindow *shell)
{
g_debug ("Num previous panels? %d", g_queue_get_length (shell->previous_panels));
- if (g_queue_is_empty (shell->previous_panels)) {
- shell_show_overview_page (shell);
- } else {
- char *panel_name;
-
- panel_name = g_queue_pop_head (shell->previous_panels);
- g_debug ("About to go to previous panel '%s'", panel_name);
- cc_window_set_active_panel_from_id (CC_SHELL (shell), panel_name, NULL, NULL);
- g_free (panel_name);
- }
+
+ /* When in search, simply unsed the search mode */
+ if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (shell->search_bar)))
+ gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (shell->search_bar), FALSE);
+ else
+ cc_panel_list_set_view (CC_PANEL_LIST (shell->panel_list), CC_PANEL_LIST_MAIN);
}
static void
-stack_page_notify_cb (GtkStack *stack,
- GParamSpec *spec,
- CcWindow *self)
+sidelist_size_allocate_cb (GtkWidget *box,
+ GdkRectangle *allocation,
+ CcWindow *self)
{
- int nat_height;
- const char *id;
-
- id = gtk_stack_get_visible_child_name (stack);
-
- /* make sure the home button is shown on all pages except the overview page */
-
- if (g_strcmp0 (id, OVERVIEW_PAGE) == 0 || g_strcmp0 (id, SEARCH_PAGE) == 0)
- {
- gint header_height, maximum_height;
-
- gtk_widget_hide (self->previous_button);
- gtk_widget_show (self->search_button);
- gtk_widget_show (self->search_bar);
- gtk_widget_hide (self->lock_button);
-
- gtk_widget_get_preferred_height_for_width (GTK_WIDGET (self->main_vbox),
- FIXED_WIDTH, NULL, &nat_height);
- gtk_widget_get_preferred_height_for_width (GTK_WIDGET (self->header),
- FIXED_WIDTH, NULL, &header_height);
-
- /* find the maximum height by using the monitor height minus an allowance
- * for title bar, etc. */
- maximum_height = get_monitor_height (self) - 100;
-
- if (maximum_height > 0 && nat_height + header_height > maximum_height)
- nat_height = maximum_height - header_height;
-
- gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (self->scrolled_window),
- self->small_screen == SMALL_SCREEN_TRUE ?
SMALL_SCREEN_FIXED_HEIGHT : nat_height);
- }
- else
- {
- gtk_widget_show (self->previous_button);
- gtk_widget_hide (self->search_button);
- gtk_widget_hide (self->search_bar);
- /* set the scrolled window small so that it doesn't force
- the window to be larger than this panel */
- gtk_widget_get_preferred_height_for_width (GTK_WIDGET (self),
- FIXED_WIDTH, NULL, &nat_height);
- gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (self->scrolled_window),
MIN_ICON_VIEW_HEIGHT);
- gtk_window_resize (GTK_WINDOW (self),
- FIXED_WIDTH,
- nat_height);
- }
+ /* Keep the sidelist and the first headerbar synchronized */
+ gtk_widget_set_size_request (self->header, allocation->width, -1);
}
/* CcShell implementation */
@@ -1041,6 +477,8 @@ cc_window_set_active_panel_from_id (CcShell *shell,
if (old_panel)
gtk_container_remove (GTK_CONTAINER (self->stack), old_panel);
+
+ cc_panel_list_set_active_panel (CC_PANEL_LIST (self->panel_list), start_id);
}
g_free (name);
@@ -1066,6 +504,39 @@ _shell_get_toplevel (CcShell *shell)
return GTK_WIDGET (shell);
}
+static void
+gdk_window_set_cb (GObject *object,
+ GParamSpec *pspec,
+ CcWindow *self)
+{
+ GdkWindow *window;
+ gchar *str;
+
+ if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
+ return;
+
+ window = gtk_widget_get_window (GTK_WIDGET (self));
+
+ if (!window)
+ return;
+
+ str = g_strdup_printf ("%u", (guint) GDK_WINDOW_XID (window));
+ g_setenv ("GNOME_CONTROL_CENTER_XID", str, TRUE);
+ g_free (str);
+}
+
+static gboolean
+window_map_event_cb (GtkWidget *widget,
+ GdkEvent *event,
+ CcWindow *self)
+{
+ /* If focus ends up in a category icon view one of the items is
+ * immediately selected which looks odd when we are starting up, so
+ * we explicitly unset the focus here. */
+ gtk_window_set_focus (GTK_WINDOW (self), NULL);
+ return GDK_EVENT_PROPAGATE;
+}
+
/* GObject Implementation */
static void
cc_window_get_property (GObject *object,
@@ -1133,14 +604,6 @@ cc_window_dispose (GObject *object)
{
CcWindow *self = CC_WINDOW (object);
- /* Avoid receiving notifications about the pages changing
- * when destroying the children one-by-one */
- if (self->stack)
- {
- g_signal_handlers_disconnect_by_func (self->stack, stack_page_notify_cb, object);
- self->stack = NULL;
- }
-
g_free (self->current_panel_id);
self->current_panel_id = NULL;
@@ -1151,15 +614,7 @@ cc_window_dispose (GObject *object)
}
g_clear_object (&self->store);
- g_clear_object (&self->search_filter);
g_clear_object (&self->active_panel);
- g_clear_object (&self->header_sizegroup);
-
- if (self->previous_panels)
- {
- g_queue_free_full (self->previous_panels, g_free);
- self->previous_panels = NULL;
- }
G_OBJECT_CLASS (cc_window_parent_class)->dispose (object);
}
@@ -1169,8 +624,11 @@ cc_window_finalize (GObject *object)
{
CcWindow *self = CC_WINDOW (object);
- g_free (self->filter_string);
- g_strfreev (self->filter_terms);
+ if (self->previous_panels)
+ {
+ g_queue_free_full (self->previous_panels, g_free);
+ self->previous_panels = NULL;
+ }
G_OBJECT_CLASS (cc_window_parent_class)->finalize (object);
}
@@ -1186,6 +644,7 @@ cc_shell_iface_init (CcShellInterface *iface)
static void
cc_window_class_init (CcWindowClass *klass)
{
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->get_property = cc_window_get_property;
@@ -1194,6 +653,28 @@ cc_window_class_init (CcWindowClass *klass)
object_class->finalize = cc_window_finalize;
g_object_class_override_property (object_class, PROP_ACTIVE_PANEL, "active-panel");
+
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/gtk/window.ui");
+
+ 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_sizegroup);
+ gtk_widget_class_bind_template_child (widget_class, CcWindow, list_scrolled);
+ gtk_widget_class_bind_template_child (widget_class, CcWindow, lock_button);
+ gtk_widget_class_bind_template_child (widget_class, CcWindow, panel_headerbar);
+ gtk_widget_class_bind_template_child (widget_class, CcWindow, previous_button);
+ gtk_widget_class_bind_template_child (widget_class, CcWindow, search_bar);
+ gtk_widget_class_bind_template_child (widget_class, CcWindow, search_button);
+ gtk_widget_class_bind_template_child (widget_class, CcWindow, search_entry);
+ 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_callback (widget_class, previous_button_clicked_cb);
+ gtk_widget_class_bind_template_callback (widget_class, gdk_window_set_cb);
+ gtk_widget_class_bind_template_callback (widget_class, search_entry_activate_cb);
+ gtk_widget_class_bind_template_callback (widget_class, sidelist_size_allocate_cb);
+ gtk_widget_class_bind_template_callback (widget_class, update_list_title);
+ gtk_widget_class_bind_template_callback (widget_class, window_map_event_cb);
}
static gboolean
@@ -1215,10 +696,8 @@ window_key_press_event (GtkWidget *win,
GdkKeymap *keymap;
gboolean retval;
GdkModifierType state;
+ CcPanelListView view;
gboolean is_rtl;
- gboolean overview;
- gboolean search;
- const gchar *id;
retval = GDK_EVENT_PROPAGATE;
state = event->state;
@@ -1226,14 +705,14 @@ window_key_press_event (GtkWidget *win,
gdk_keymap_add_virtual_modifiers (keymap, &state);
state = state & gtk_accelerator_get_default_mod_mask ();
is_rtl = gtk_widget_get_direction (win) == GTK_TEXT_DIR_RTL;
+ view = cc_panel_list_get_view (CC_PANEL_LIST (self->panel_list));
- id = gtk_stack_get_visible_child_name (GTK_STACK (self->stack));
- overview = g_str_equal (id, OVERVIEW_PAGE);
- search = g_str_equal (id, SEARCH_PAGE);
-
- if ((overview || search) &&
+ /* The search only happens when we're in the MAIN view */
+ if (view == CC_PANEL_LIST_MAIN &&
gtk_search_bar_handle_event (GTK_SEARCH_BAR (self->search_bar), (GdkEvent*) event) == GDK_EVENT_STOP)
- return GDK_EVENT_STOP;
+ {
+ return GDK_EVENT_STOP;
+ }
if (state == GDK_CONTROL_MASK)
{
@@ -1243,8 +722,13 @@ window_key_press_event (GtkWidget *win,
case GDK_KEY_S:
case GDK_KEY_f:
case GDK_KEY_F:
- if (!overview && !search)
- break;
+ /* The search only happens when we're in the MAIN view */
+ if (view != CC_PANEL_LIST_MAIN &&
+ view != CC_PANEL_LIST_SEARCH)
+ {
+ break;
+ }
+
retval = !gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (self->search_bar));
gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->search_bar), retval);
if (retval)
@@ -1253,25 +737,13 @@ window_key_press_event (GtkWidget *win,
break;
case GDK_KEY_Q:
case GDK_KEY_q:
- gtk_widget_destroy (GTK_WIDGET (self));
- retval = GDK_EVENT_STOP;
- break;
case GDK_KEY_W:
case GDK_KEY_w:
- if (!overview)
- shell_show_overview_page (self);
- else
- gtk_widget_destroy (GTK_WIDGET (self));
+ gtk_widget_destroy (GTK_WIDGET (self));
retval = GDK_EVENT_STOP;
break;
}
}
- else if (state == GDK_MOD1_MASK && event->keyval == GDK_KEY_Up)
- {
- if (!overview)
- shell_show_overview_page (self);
- retval = GDK_EVENT_STOP;
- }
else if ((!is_rtl && state == GDK_MOD1_MASK && event->keyval == GDK_KEY_Left) ||
(is_rtl && state == GDK_MOD1_MASK && event->keyval == GDK_KEY_Right) ||
event->keyval == GDK_KEY_Back)
@@ -1279,295 +751,61 @@ window_key_press_event (GtkWidget *win,
previous_button_clicked_cb (NULL, self);
retval = GDK_EVENT_STOP;
}
- return retval;
-}
-
-static gint
-get_monitor_height (CcWindow *self)
-{
- GdkScreen *screen;
- GdkRectangle rect;
-
- if (self->monitor_num < 0)
- return 0;
-
- /* We cannot use workarea here, as this wouldn't
- * be updated when we read it after a monitors-changed signal */
- screen = gtk_widget_get_screen (GTK_WIDGET (self));
- gdk_screen_get_monitor_geometry (screen, self->monitor_num, &rect);
-
- return rect.height;
-}
-
-static gboolean
-update_monitor_number (CcWindow *self)
-{
- gboolean changed = FALSE;
- GtkWidget *widget;
- GdkScreen *screen;
- GdkWindow *window;
- int monitor;
-
- widget = GTK_WIDGET (self);
-
- window = gtk_widget_get_window (widget);
- screen = gtk_widget_get_screen (widget);
- monitor = gdk_screen_get_monitor_at_window (screen, window);
- if (self->monitor_num != monitor)
- {
- self->monitor_num = monitor;
- changed = TRUE;
- }
-
- return changed;
-}
-
-static CcSmallScreen
-is_small (CcWindow *self)
-{
- if (get_monitor_height (self) <= FIXED_HEIGHT)
- return SMALL_SCREEN_TRUE;
- return SMALL_SCREEN_FALSE;
-}
-
-static void
-update_small_screen_settings (CcWindow *self)
-{
- CcSmallScreen small;
-
- update_monitor_number (self);
- small = is_small (self);
-
- if (small == SMALL_SCREEN_TRUE)
- {
- gtk_window_set_resizable (GTK_WINDOW (self), TRUE);
-
- if (self->small_screen != small)
- gtk_window_maximize (GTK_WINDOW (self));
- }
- else
- {
- if (self->small_screen != small)
- gtk_window_unmaximize (GTK_WINDOW (self));
-
- gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
- }
-
- self->small_screen = small;
-
- /* And update the minimum sizes */
- stack_page_notify_cb (GTK_STACK (self->stack), NULL, self);
-}
-
-static gboolean
-main_window_configure_cb (GtkWidget *widget,
- GdkEvent *event,
- CcWindow *self)
-{
- update_small_screen_settings (self);
- return FALSE;
-}
-
-static void
-application_set_cb (GObject *object,
- GParamSpec *pspec,
- CcWindow *self)
-{
- /* update small screen settings now - to avoid visible resizing, we want
- * to do it before showing the window, and GtkApplicationWindow cannot be
- * realized unless its application property has been set */
- if (gtk_window_get_application (GTK_WINDOW (self)))
- {
- gtk_widget_realize (GTK_WIDGET (self));
- update_small_screen_settings (self);
- }
-}
-
-static void
-monitors_changed_cb (GdkScreen *screen,
- CcWindow *self)
-{
- /* We reset small_screen_set to make sure that the
- * window gets maximised if need be, in update_small_screen_settings() */
- self->small_screen = SMALL_SCREEN_UNSET;
- update_small_screen_settings (self);
-}
-
-static void
-gdk_window_set_cb (GObject *object,
- GParamSpec *pspec,
- CcWindow *self)
-{
- GdkWindow *window;
- gchar *str;
-
- if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
- return;
-
- window = gtk_widget_get_window (GTK_WIDGET (self));
-
- if (!window)
- return;
-
- str = g_strdup_printf ("%u", (guint) GDK_WINDOW_XID (window));
- g_setenv ("GNOME_CONTROL_CENTER_XID", str, TRUE);
- g_free (str);
-}
-
-static gboolean
-window_map_event_cb (GtkWidget *widget,
- GdkEvent *event,
- CcWindow *self)
-{
- /* If focus ends up in a category icon view one of the items is
- * immediately selected which looks odd when we are starting up, so
- * we explicitly unset the focus here. */
- gtk_window_set_focus (GTK_WINDOW (self), NULL);
- return GDK_EVENT_PROPAGATE;
-}
-
-static void
-create_main_page (CcWindow *self)
-{
- GtkStyleContext *context;
-
- self->scrolled_window = gtk_scrolled_window_new (NULL, NULL);
- context = gtk_widget_get_style_context (self->scrolled_window);
- gtk_style_context_add_class (context, "view");
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self->scrolled_window),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_stack_add_named (GTK_STACK (self->stack), self->scrolled_window, OVERVIEW_PAGE);
-
- self->main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_widget_set_margin_top (self->main_vbox, 8);
- gtk_widget_set_margin_bottom (self->main_vbox, 8);
- gtk_widget_set_margin_start (self->main_vbox, 12);
- gtk_widget_set_margin_end (self->main_vbox, 12);
- gtk_container_set_focus_vadjustment (GTK_CONTAINER (self->main_vbox),
- gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW
(self->scrolled_window)));
- gtk_container_add (GTK_CONTAINER (self->scrolled_window), self->main_vbox);
-
- gtk_widget_set_size_request (self->scrolled_window, FIXED_WIDTH, -1);
-
- /* load the available settings panels */
- setup_model (self);
-}
-
-static void
-create_search_page (CcWindow *self)
-{
- self->search_scrolled = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self->search_scrolled),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_stack_add_named (GTK_STACK (self->stack), self->search_scrolled, SEARCH_PAGE);
- /* setup search functionality */
- setup_search (self);
+ return retval;
}
static void
-create_header (CcWindow *self)
+create_window (CcWindow *self)
{
- GtkWidget *image;
AtkObject *accessible;
- self->header = gtk_header_bar_new ();
- gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (self->header), TRUE);
-
- self->header_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
-
/* previous button */
- self->previous_button = gtk_button_new_from_icon_name ("go-previous-symbolic", GTK_ICON_SIZE_MENU);
- gtk_widget_set_valign (self->previous_button, GTK_ALIGN_CENTER);
- gtk_widget_set_no_show_all (self->previous_button, TRUE);
accessible = gtk_widget_get_accessible (self->previous_button);
atk_object_set_name (accessible, _("All Settings"));
- gtk_header_bar_pack_start (GTK_HEADER_BAR (self->header), self->previous_button);
- g_signal_connect (self->previous_button, "clicked", G_CALLBACK (previous_button_clicked_cb), self);
- gtk_size_group_add_widget (self->header_sizegroup, self->previous_button);
-
- /* toggle search button */
- self->search_button = gtk_toggle_button_new ();
- image = gtk_image_new_from_icon_name ("edit-find-symbolic", GTK_ICON_SIZE_MENU);
- gtk_button_set_image (GTK_BUTTON (self->search_button), image);
- gtk_widget_set_valign (self->search_button, GTK_ALIGN_CENTER);
- gtk_style_context_add_class (gtk_widget_get_style_context (self->search_button),
- "image-button");
- gtk_header_bar_pack_end (GTK_HEADER_BAR (self->header), self->search_button);
-
- self->top_right_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_header_bar_pack_end (GTK_HEADER_BAR (self->header), self->top_right_box);
-
- self->lock_button = gtk_lock_button_new (NULL);
- gtk_style_context_add_class (gtk_widget_get_style_context (self->lock_button),
- "text-button");
- gtk_widget_set_valign (self->lock_button, GTK_ALIGN_CENTER);
- gtk_widget_set_no_show_all (self->lock_button, TRUE);
- gtk_container_add (GTK_CONTAINER (self->top_right_box), self->lock_button);
- gtk_size_group_add_widget (self->header_sizegroup, self->lock_button);
-}
-static void
-create_window (CcWindow *self)
-{
- GtkWidget *box;
- GdkScreen *screen;
+ gtk_window_set_titlebar (GTK_WINDOW (self), self->header_box);
+ gtk_widget_show_all (self->header_box);
- box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_container_add (GTK_CONTAINER (self), box);
-
- create_header (self);
- gtk_window_set_titlebar (GTK_WINDOW (self), self->header);
- gtk_header_bar_set_title (GTK_HEADER_BAR (self->header), _(DEFAULT_WINDOW_TITLE));
- gtk_widget_show_all (self->header);
-
- /* search bar */
- self->search_bar = gtk_search_bar_new ();
- self->search_entry = gtk_search_entry_new ();
- gtk_entry_set_width_chars (GTK_ENTRY (self->search_entry), 30);
- g_signal_connect (self->search_entry, "search-changed", G_CALLBACK (search_entry_changed_cb), self);
- g_signal_connect (self->search_entry, "key-press-event", G_CALLBACK (search_entry_key_press_event_cb),
self);
- gtk_container_add (GTK_CONTAINER (self->search_bar), self->search_entry);
- gtk_container_add (GTK_CONTAINER (box), self->search_bar);
-
- g_object_bind_property (self->search_button, "active",
- self->search_bar, "search-mode-enabled",
+ /*
+ * We have to create the listbox here because declaring it in window.ui
+ * and letting GtkBuilder handle it would hit the bug where the focus is
+ * not tracked.
+ */
+ self->panel_list = cc_panel_list_new ();
+
+ g_signal_connect (self->panel_list, "show-panel", G_CALLBACK (show_panel_cb), self);
+ g_signal_connect (self->panel_list, "notify::view", G_CALLBACK (panel_list_view_changed_cb), self);
+
+ g_object_bind_property (self->search_bar,
+ "search-mode-enabled",
+ self->panel_list,
+ "search-mode",
G_BINDING_BIDIRECTIONAL);
- self->stack = gtk_stack_new ();
- gtk_stack_set_homogeneous (GTK_STACK (self->stack), TRUE);
- gtk_stack_set_transition_type (GTK_STACK (self->stack), GTK_STACK_TRANSITION_TYPE_CROSSFADE);
- gtk_box_pack_start (GTK_BOX (box), self->stack, TRUE, TRUE, 0);
+ g_object_bind_property (self->search_entry,
+ "text",
+ self->panel_list,
+ "search-query",
+ G_BINDING_DEFAULT);
- create_main_page (self);
- create_search_page (self);
+ gtk_container_add (GTK_CONTAINER (self->list_scrolled), self->panel_list);
+ gtk_widget_show (self->panel_list);
- /* connect various signals */
- screen = gtk_widget_get_screen (GTK_WIDGET (self));
- g_signal_connect (screen, "monitors-changed", G_CALLBACK (monitors_changed_cb), self);
+ setup_model (self);
- g_signal_connect (self, "configure-event", G_CALLBACK (main_window_configure_cb), self);
- g_signal_connect (self, "notify::application", G_CALLBACK (application_set_cb), self);
+ /* connect various signals */
g_signal_connect_after (self, "key_press_event",
G_CALLBACK (window_key_press_event), self);
gtk_widget_add_events (GTK_WIDGET (self), GDK_BUTTON_RELEASE_MASK);
g_signal_connect (self, "button-release-event",
G_CALLBACK (window_button_release_event), self);
- g_signal_connect (self, "map-event", G_CALLBACK (window_map_event_cb), self);
-
- g_signal_connect (self, "notify::window", G_CALLBACK (gdk_window_set_cb), self);
-
- g_signal_connect (self->stack, "notify::visible-child",
- G_CALLBACK (stack_page_notify_cb), self);
-
- gtk_widget_show_all (box);
}
static void
cc_window_init (CcWindow *self)
{
- self->monitor_num = -1;
- self->small_screen = SMALL_SCREEN_UNSET;
+ gtk_widget_init_template (GTK_WIDGET (self));
create_window (self);
@@ -1576,7 +814,8 @@ cc_window_init (CcWindow *self)
/* keep a list of custom widgets to unload on panel change */
self->custom_widgets = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
- stack_page_notify_cb (GTK_STACK (self->stack), NULL, self);
+ /* After everything is loaded, select the first visible panel */
+ cc_panel_list_activate (CC_PANEL_LIST (self->panel_list));
}
CcWindow *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
