applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: Make the history dialog use a headerbar

Browse source 
In order to start moving towards the new redesigned Network
panel [1], it is necessary to make the dialogs use a headerbar.

Currently, however, they don't, making the dialog sinconsistent
with the rest of the panels, and the GNOME desktop as a whole.

Fix that by setting the headerbar to the History dialog, and
adjusting the elements so hat they match the "Known Wi-Fi Networks"
dialog in the mockup [1].

[1] https://github.com/gnome-design-team/gnome-mockups/blob/master/system-settings/network/aday2/network-wires.png

https://bugzilla.gnome.org/show_bug.cgi?id=779841
This commit is contained in:
Georges Basile Stavracas Neto 2017-03-03 21:10:36 -03:00
parent 9cc065bb04
commit 4ac4f4a04e
1 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

65
panels/network/net-device-wifi.c
View file

@ -1906,7 +1906,10 @@ open_history (NetDeviceWifi *device_wifi)
CcNetworkPanel *panel; CcNetworkPanel *panel;
GtkWidget *button; GtkWidget *button;
GtkWidget *forget; GtkWidget *forget;
GtkWidget *header;
GtkWidget *swin; GtkWidget *swin;
GtkWidget *content_area;
GtkWidget *separator;
GSList *connections; GSList *connections;
GSList *l; GSList *l;
const GPtrArray *aps; const GPtrArray *aps;
@ -1919,40 +1922,36 @@ open_history (NetDeviceWifi *device_wifi)
GtkSizeGroup *rows; GtkSizeGroup *rows;
GtkSizeGroup *icons; GtkSizeGroup *icons;
dialog = gtk_dialog_new (); dialog = g_object_new (GTK_TYPE_DIALOG, "use-header-bar", 1, NULL);
panel = net_object_get_panel (NET_OBJECT (device_wifi)); panel = net_object_get_panel (NET_OBJECT (device_wifi));
window = gtk_widget_get_toplevel (GTK_WIDGET (panel)); window = gtk_widget_get_toplevel (GTK_WIDGET (panel));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window)); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
gtk_window_set_title (GTK_WINDOW (dialog), _("History")); gtk_window_set_title (GTK_WINDOW (dialog), _("Known Wi-Fi Networks"));
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 400); gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
button = gtk_button_new_with_mnemonic (_("_Close")); /* Dialog's header */
gtk_widget_set_can_default (button, TRUE); header = gtk_header_bar_new ();
gtk_widget_show (button); gtk_widget_show (header);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, 0); gtk_header_bar_set_title (GTK_HEADER_BAR (header), _("Known Wi-Fi Networks"));
g_signal_connect_swapped (button, "clicked", gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header), TRUE);
gtk_window_set_titlebar (GTK_WINDOW (dialog), header);
g_signal_connect_swapped (dialog, "response",
G_CALLBACK (gtk_widget_destroy), dialog); G_CALLBACK (gtk_widget_destroy), dialog);
/* translators: This is the label for the "Forget wireless network" functionality */ g_signal_connect_swapped (dialog, "delete-event",
forget = gtk_button_new_with_mnemonic (C_("Wi-Fi Network", "_Forget")); G_CALLBACK (gtk_widget_destroy), dialog);
gtk_widget_show (forget);
gtk_widget_set_sensitive (forget, FALSE); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), forget, 0); gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
g_signal_connect (forget, "clicked",
G_CALLBACK (forget_selected), device_wifi);
gtk_container_child_set (GTK_CONTAINER (gtk_widget_get_parent (forget)), forget, "secondary", TRUE, NULL);
g_object_set_data (G_OBJECT (forget), "net", device_wifi);
swin = gtk_scrolled_window_new (NULL, NULL); swin = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_show (swin); gtk_widget_show (swin);
gtk_widget_set_vexpand (swin, TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin), GTK_SHADOW_IN); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin), GTK_SHADOW_NONE);
gtk_widget_set_margin_start (swin, 50); gtk_container_add (GTK_CONTAINER (content_area), swin);
gtk_widget_set_margin_end (swin, 50);
gtk_widget_set_margin_top (swin, 12);
gtk_widget_set_margin_bottom (swin, 12);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), swin, TRUE, TRUE, 0);
list = GTK_WIDGET (gtk_list_box_new ()); list = GTK_WIDGET (gtk_list_box_new ());
gtk_widget_show (list); gtk_widget_show (list);
@ -1961,6 +1960,26 @@ open_history (NetDeviceWifi *device_wifi)
gtk_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)history_sort, NULL, NULL); gtk_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)history_sort, NULL, NULL);
gtk_container_add (GTK_CONTAINER (swin), list); gtk_container_add (GTK_CONTAINER (swin), list);
/* Horizontal separator */
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_widget_show (separator);
gtk_container_add (GTK_CONTAINER (content_area), separator);
/* translators: This is the label for the "Forget wireless network" functionality */
forget = gtk_button_new_with_mnemonic (C_("Wi-Fi Network", "_Forget"));
gtk_widget_show (forget);
gtk_widget_set_halign (forget, GTK_ALIGN_START);
gtk_widget_set_margin_top (forget, 6);
gtk_widget_set_margin_bottom (forget, 6);
gtk_widget_set_margin_start (forget, 6);
gtk_widget_set_sensitive (forget, FALSE);
gtk_style_context_add_class (gtk_widget_get_style_context (forget), "destructive-action");
g_signal_connect (forget, "clicked",
G_CALLBACK (forget_selected), device_wifi);
g_object_set_data (G_OBJECT (forget), "net", device_wifi);
gtk_container_add (GTK_CONTAINER (content_area), forget);
rows = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL); rows = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
icons = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); icons = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
g_object_set_data_full (G_OBJECT (list), "rows", rows, g_object_unref); g_object_set_data_full (G_OBJECT (list), "rows", rows, g_object_unref);