summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2014-07-01 10:10:04 +0200
committerStefano Karapetsas <[email protected]>2014-07-01 10:10:04 +0200
commit35df29f8e2e098044c315fe840650cce2088aee9 (patch)
treed184824ee9514b375b2867fdbb66a3d53dc1d7a1
parentee13d83b1475cca26ecc8ce2a365bc1cfed0bc9f (diff)
downloadmate-control-center-35df29f8e2e098044c315fe840650cce2088aee9.tar.bz2
mate-control-center-35df29f8e2e098044c315fe840650cce2088aee9.tar.xz
keybindings: GTK3 improvements
-rw-r--r--capplets/keybindings/mate-keybinding-properties.c8
-rw-r--r--capplets/keybindings/mate-keybinding-properties.ui6
2 files changed, 12 insertions, 2 deletions
diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c
index cec18262..6e442552 100644
--- a/capplets/keybindings/mate-keybinding-properties.c
+++ b/capplets/keybindings/mate-keybinding-properties.c
@@ -1889,6 +1889,14 @@ setup_dialog (GtkBuilder *builder, GSettings *marco_settings)
/* set up the dialog */
reload_key_entries (builder);
+#if GTK_CHECK_VERSION(3, 0, 0)
+ widget = _gtk_builder_get_widget (builder, "mate-keybinding-dialog");
+ gtk_window_set_default_size (GTK_WINDOW (widget), 400, 500);
+ widget = _gtk_builder_get_widget (builder, "label-suggest");
+ gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
+ gtk_label_set_max_width_chars (GTK_LABEL (widget), 60);
+#endif
+
widget = _gtk_builder_get_widget (builder, "mate-keybinding-dialog");
capplet_set_icon (widget, "preferences-desktop-keyboard-shortcuts");
gtk_widget_show (widget);
diff --git a/capplets/keybindings/mate-keybinding-properties.ui b/capplets/keybindings/mate-keybinding-properties.ui
index 51090b5a..9d3b703f 100644
--- a/capplets/keybindings/mate-keybinding-properties.ui
+++ b/capplets/keybindings/mate-keybinding-properties.ui
@@ -36,6 +36,7 @@
</object>
<packing>
<property name="position">0</property>
+ <property name="expand">True</property>
</packing>
</child>
<child>
@@ -57,11 +58,11 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label12">
+ <object class="GtkLabel" id="label-suggest">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">To edit a shortcut key, click on the corresponding row and type a new key combination, or press backspace to clear.</property>
- <property name="justify">fill</property>
+ <property name="justify">left</property>
<property name="wrap">True</property>
</object>
<packing>
@@ -82,6 +83,7 @@
</object>
<packing>
<property name="position">1</property>
+ <property name="expand">True</property>
</packing>
</child>
<child internal-child="action_area">