From af2d14e3b62b403f102a7cd0a6b13a040a35203f Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Wed, 30 Sep 2009 11:58:08 +0000
Subject: Control panel resizing issue (for non en_US languages) #308

---
diff --git a/extensions/cpsection/keyboard/view.py b/extensions/cpsection/keyboard/view.py
index 5527cc8..dd62a85 100644
--- a/extensions/cpsection/keyboard/view.py
+++ b/extensions/cpsection/keyboard/view.py
@@ -74,6 +74,7 @@ class LayoutCombo(gtk.HBox):
             self._klang_combo.connect('changed', self._klang_combo_changed_cb)
         cell = gtk.CellRendererText()
         cell.props.ellipsize = pango.ELLIPSIZE_MIDDLE
+        cell.props.ellipsize_set = True
         self._klang_combo.pack_start(cell)
         self._klang_combo.add_attribute(cell, 'text', 1)
         self.pack_start(self._klang_combo, expand=True, fill = True)
@@ -85,6 +86,7 @@ class LayoutCombo(gtk.HBox):
                                 self._kvariant_combo_changed_cb)
         cell = gtk.CellRendererText()
         cell.props.ellipsize = pango.ELLIPSIZE_MIDDLE
+        cell.props.ellipsize_set = True
         self._kvariant_combo.pack_start(cell)
         self._kvariant_combo.add_attribute(cell, 'text', 1)
         self.pack_start(self._kvariant_combo, expand=True, fill = True)
@@ -200,6 +202,8 @@ class Keyboard(SectionView):
 
         kmodel_combo = gtk.ComboBox(model = kmodel_store)
         cell = gtk.CellRendererText()
+        cell.props.ellipsize = pango.ELLIPSIZE_MIDDLE
+        cell.props.ellipsize_set = True
         kmodel_combo.pack_start(cell)
         kmodel_combo.add_attribute(cell, 'text', 1)
 
@@ -257,6 +261,8 @@ class Keyboard(SectionView):
 
         group_option_combo = gtk.ComboBox(model = group_option_store)
         cell = gtk.CellRendererText()
+        cell.props.ellipsize = pango.ELLIPSIZE_MIDDLE
+        cell.props.ellipsize_set = True
         group_option_combo.pack_start(cell)
         group_option_combo.add_attribute(cell, 'text', 1)
 
diff --git a/extensions/cpsection/language/view.py b/extensions/cpsection/language/view.py
index 4489b15..d1a49cf 100644
--- a/extensions/cpsection/language/view.py
+++ b/extensions/cpsection/language/view.py
@@ -63,10 +63,15 @@ class Language(SectionView):
         self.pack_start(self._text, False)
         self._text.show()
 
+        scrolled = gtk.ScrolledWindow()
+        scrolled.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+        scrolled.show()
+        self.pack_start(scrolled, expand=True)
+
         self._table = gtk.Table(rows=1, columns=3, homogeneous=False)
         self._table.set_border_width(style.DEFAULT_SPACING * 2)        
-        self.pack_start(self._table, False)
         self._table.show()
+        scrolled.add_with_viewport(self._table)
 
         self._lang_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
         self.pack_start(self._lang_alert_box, False)
--
cgit v0.9.1