summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2011-03-10 16:59:47 +1100
committerRobert Ancell <robert.ancell@canonical.com>2011-03-10 16:59:47 +1100
commit7869d98065ab57bfda52404c5f335cf15ab8cd7a (patch)
treefcd59b51d5312ec4c2b175c9931ee0ada8157e4f
parent9d24a54cb775837cd78d13ebf5c2758292a61448 (diff)
downloaddconf-7869d98065ab57bfda52404c5f335cf15ab8cd7a.tar.gz
Fix description word wrap (Bug #641292)
-rw-r--r--editor/dconf-editor.ui7
-rw-r--r--editor/dconf-editor.vala2
2 files changed, 5 insertions, 4 deletions
diff --git a/editor/dconf-editor.ui b/editor/dconf-editor.ui
index 84ea5c5..6dbdc8f 100644
--- a/editor/dconf-editor.ui
+++ b/editor/dconf-editor.ui
@@ -142,6 +142,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
+ <property name="wrap">True</property>
<property name="selectable">True</property>
</object>
<packing>
@@ -149,7 +150,7 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="x_options">GTK_SHRINK | GTK_FILL</property>
<property name="y_options">GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
@@ -159,15 +160,15 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
+ <property name="wrap">True</property>
<property name="selectable">True</property>
- <property name="single_line_mode">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="x_options">GTK_SHRINK | GTK_FILL</property>
<property name="y_options">GTK_SHRINK | GTK_FILL</property>
</packing>
</child>
diff --git a/editor/dconf-editor.vala b/editor/dconf-editor.vala
index eb64233..7b1356d 100644
--- a/editor/dconf-editor.vala
+++ b/editor/dconf-editor.vala
@@ -157,7 +157,7 @@ class ConfigurationEditor
}
schema_label.set_text(schema_name);
- summary_label.set_text(summary);
+ summary_label.set_text(summary.strip());
description_label.set_text(description.strip());
type_label.set_text(type);
default_label.set_text(default_value);