diff options
| author | Kalev Lember <kalevlember@gmail.com> | 2013-09-29 23:11:01 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2014-08-15 14:45:31 +0200 |
| commit | c5c870a558d58f42792413294cd2238c8b3d0417 (patch) | |
| tree | 872e5d686aa45d1864e648f5ba2516f165de9a16 /panels/keyboard | |
| parent | c3d2631a9a078d877d41caf760e6c65ef7b4ef23 (diff) | |
| download | gnome-control-center-c5c870a558d58f42792413294cd2238c8b3d0417.tar.gz | |
keyboard: Port shortcuts tab to GtkGrid
https://bugzilla.gnome.org/show_bug.cgi?id=709057
Diffstat (limited to 'panels/keyboard')
| -rw-r--r-- | panels/keyboard/gnome-keyboard-panel.ui | 29 | ||||
| -rw-r--r-- | panels/keyboard/keyboard-shortcuts.c | 5 |
2 files changed, 9 insertions, 25 deletions
diff --git a/panels/keyboard/gnome-keyboard-panel.ui b/panels/keyboard/gnome-keyboard-panel.ui index dbbfb0a69..ccb1f593c 100644 --- a/panels/keyboard/gnome-keyboard-panel.ui +++ b/panels/keyboard/gnome-keyboard-panel.ui @@ -588,11 +588,9 @@ <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkTable" id="shortcuts_table"> + <object class="GtkGrid" id="shortcuts_grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> <property name="column_spacing">5</property> <child> <object class="GtkScrolledWindow" id="sections_swindow"> @@ -612,14 +610,17 @@ </child> </object> <packing> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="height">2</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="actions_swindow"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="hscrollbar_policy">never</property> <property name="shadow_type">in</property> <child> @@ -636,7 +637,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="top_attach">0</property> </packing> </child> <child> @@ -679,23 +680,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"> </property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options">GTK_FILL</property> </packing> </child> </object> diff --git a/panels/keyboard/keyboard-shortcuts.c b/panels/keyboard/keyboard-shortcuts.c index ea0e04a4c..38aa04fae 100644 --- a/panels/keyboard/keyboard-shortcuts.c +++ b/panels/keyboard/keyboard-shortcuts.c @@ -1685,7 +1685,6 @@ setup_dialog (CcPanel *panel, GtkBuilder *builder) GtkWidget *widget; GtkTreeView *treeview; GtkTreeSelection *selection; - GtkTable *table; GList *focus_chain; CcShell *shell; GtkListStore *model; @@ -1808,8 +1807,8 @@ setup_dialog (CcPanel *panel, GtkBuilder *builder) focus_chain = g_list_append (focus_chain, WID (builder, "actions_swindow")); focus_chain = g_list_append (focus_chain, WID (builder, "shortcut-toolbar")); - table = GTK_TABLE (gtk_builder_get_object (builder, "shortcuts_table")); - gtk_container_set_focus_chain (GTK_CONTAINER (table), focus_chain); + widget = GTK_WIDGET (gtk_builder_get_object (builder, "shortcuts_grid")); + gtk_container_set_focus_chain (GTK_CONTAINER (widget), focus_chain); g_list_free (focus_chain); /* set up the dialog */ |