diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-10-10 05:48:50 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-10-10 06:25:25 +0800 |
| commit | 2b46866a5c311283f2d67cbf00802e47b308ec16 (patch) | |
| tree | 23fd68d164e05048f959a29e4f79687cb996d8a1 | |
| parent | 4483209dba2d421d814fae5dc31e5597fcacd612 (diff) | |
| download | gsoc2013-evolution-2b46866a5c311283f2d67cbf00802e47b308ec16.tar.gz gsoc2013-evolution-2b46866a5c311283f2d67cbf00802e47b308ec16.tar.zst gsoc2013-evolution-2b46866a5c311283f2d67cbf00802e47b308ec16.zip | |
Bug 685675 - Fix packing of spell check language options
Word-wrapped GtkLabels and GtkTables just don't seem to get along.
The vertical allocation for the GtkLabel was way too big. Replace
the GtkTable with a GtkGrid.
| -rw-r--r-- | mail/mail-config.ui | 74 | ||||
| -rw-r--r-- | modules/mail/em-composer-prefs.c | 12 |
2 files changed, 39 insertions, 47 deletions
diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 00a47c2736..cef8453de7 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> + <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="add-custom-junk-header"> <property name="width_request">400</property> <property name="can_focus">False</property> @@ -659,47 +659,16 @@ <property name="can_focus">False</property> <property name="left_padding">12</property> <child> - <object class="GtkTable" id="languages-table"> + <object class="GtkGrid" id="languages-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">6</property> <property name="row_spacing">6</property> <child> - <object class="GtkImage" id="pixmapSpellInfo"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="yalign">0</property> - <property name="stock">gtk-dialog-info</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="languages-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">The list of languages here reflects only the languages for which you have a dictionary installed.</property> - <property name="wrap">True</property> - </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"></property> - </packing> - </child> - <child> <object class="GtkScrolledWindow" id="languages-scrolled-window"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="listSpellCheckLanguage"> @@ -718,7 +687,40 @@ </child> </object> <packing> - <property name="right_attach">2</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkImage" id="pixmapSpellInfo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="yalign">0</property> + <property name="stock">gtk-dialog-info</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="languages-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">The list of languages here reflects only the languages for which you have a dictionary installed.</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object> diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 3a092efe49..4a7216915b 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -290,17 +290,7 @@ static EMConfigItem emcp_items[] = { { E_CONFIG_PAGE, (gchar *) "20.spellcheck", (gchar *) "vboxSpellChecking", - emcp_widget_glade }, - - { E_CONFIG_SECTION_TABLE, - (gchar *) "20.spellcheck/00.languages", - (gchar *) "languages-table", - emcp_widget_glade }, - - { E_CONFIG_SECTION, - (gchar *) "20.spellcheck/00.options", - (gchar *) "spell-options-vbox", - emcp_widget_glade }, + emcp_widget_glade } }; static void |