From: epage <eopage@byu.net>
Date: Sun, 3 Jan 2010 02:06:43 +0000 (+0000)
Subject: Bump to 1.0.10-3; more stuff to try and work around Fremantle theme limits
X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=commitdiff_plain;h=892b5d07d62f81ca61381dd51d60514c3490186d

Bump to 1.0.10-3; more stuff to try and work around Fremantle theme limits

git-svn-id: file:///svnroot/gc-dialer/trunk@606 c39d3808-3fe2-4d86-a59f-b7f623ee9f21
---

diff --git a/src/constants.py b/src/constants.py
index af9b13b..eb84f53 100644
--- a/src/constants.py
+++ b/src/constants.py
@@ -3,7 +3,7 @@ import os
 __pretty_app_name__ = "DialCentral"
 __app_name__ = "dialcentral"
 __version__ = "1.0.10"
-__build__ = 2
+__build__ = 3
 __app_magic__ = 0xdeadbeef
 _data_path_ = os.path.join(os.path.expanduser("~"), ".dialcentral")
 _user_settings_ = "%s/settings.ini" % _data_path_
diff --git a/src/dc_glade.py b/src/dc_glade.py
index bac9004..7d2a1a2 100755
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -133,12 +133,6 @@ class Dialcentral(object):
 			scrollingWidget = self._widgetTree.get_widget(scrollingWidgetName)
 			assert scrollingWidget is not None, scrollingWidgetName
 			hildonize.hildonize_scrollwindow_with_viewport(scrollingWidget)
-		for pannableTreeViewName in (
-			"messages_view",
-		):
-			view = self._widgetTree.get_widget(pannableTreeViewName)
-			assert view is not None, pannableTreeViewName
-			hildonize.pannable_treeview_theme_workaround(scrollingWidget)
 
 		for buttonName in (
 			"back",
diff --git a/src/dialcentral.glade b/src/dialcentral.glade
index f2e3dbb..7255694 100644
--- a/src/dialcentral.glade
+++ b/src/dialcentral.glade
@@ -174,10 +174,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="c" signal="clicked"/>
-                        <accelerator key="b" signal="clicked"/>
-                        <accelerator key="a" signal="clicked"/>
                         <accelerator key="2" signal="clicked"/>
+                        <accelerator key="a" signal="clicked"/>
+                        <accelerator key="b" signal="clicked"/>
+                        <accelerator key="c" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label10">
                             <property name="visible">True</property>
@@ -200,10 +200,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="f" signal="clicked"/>
-                        <accelerator key="e" signal="clicked"/>
-                        <accelerator key="d" signal="clicked"/>
                         <accelerator key="3" signal="clicked"/>
+                        <accelerator key="d" signal="clicked"/>
+                        <accelerator key="e" signal="clicked"/>
+                        <accelerator key="f" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label11">
                             <property name="visible">True</property>
@@ -226,10 +226,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="i" signal="clicked"/>
-                        <accelerator key="h" signal="clicked"/>
-                        <accelerator key="g" signal="clicked"/>
                         <accelerator key="4" signal="clicked"/>
+                        <accelerator key="g" signal="clicked"/>
+                        <accelerator key="h" signal="clicked"/>
+                        <accelerator key="i" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label13">
                             <property name="visible">True</property>
@@ -252,10 +252,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="l" signal="clicked"/>
-                        <accelerator key="k" signal="clicked"/>
-                        <accelerator key="j" signal="clicked"/>
                         <accelerator key="5" signal="clicked"/>
+                        <accelerator key="j" signal="clicked"/>
+                        <accelerator key="k" signal="clicked"/>
+                        <accelerator key="l" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label14">
                             <property name="visible">True</property>
@@ -280,10 +280,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="o" signal="clicked"/>
-                        <accelerator key="n" signal="clicked"/>
-                        <accelerator key="m" signal="clicked"/>
                         <accelerator key="6" signal="clicked"/>
+                        <accelerator key="m" signal="clicked"/>
+                        <accelerator key="n" signal="clicked"/>
+                        <accelerator key="o" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label15">
                             <property name="visible">True</property>
@@ -308,11 +308,11 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="s" signal="clicked"/>
-                        <accelerator key="r" signal="clicked"/>
-                        <accelerator key="q" signal="clicked"/>
-                        <accelerator key="p" signal="clicked"/>
                         <accelerator key="7" signal="clicked"/>
+                        <accelerator key="p" signal="clicked"/>
+                        <accelerator key="q" signal="clicked"/>
+                        <accelerator key="r" signal="clicked"/>
+                        <accelerator key="s" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label16">
                             <property name="visible">True</property>
@@ -335,10 +335,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="v" signal="clicked"/>
-                        <accelerator key="u" signal="clicked"/>
-                        <accelerator key="t" signal="clicked"/>
                         <accelerator key="8" signal="clicked"/>
+                        <accelerator key="t" signal="clicked"/>
+                        <accelerator key="u" signal="clicked"/>
+                        <accelerator key="v" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label17">
                             <property name="visible">True</property>
@@ -363,11 +363,11 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
-                        <accelerator key="z" signal="clicked"/>
-                        <accelerator key="y" signal="clicked"/>
-                        <accelerator key="x" signal="clicked"/>
-                        <accelerator key="w" signal="clicked"/>
                         <accelerator key="9" signal="clicked"/>
+                        <accelerator key="w" signal="clicked"/>
+                        <accelerator key="x" signal="clicked"/>
+                        <accelerator key="y" signal="clicked"/>
+                        <accelerator key="z" signal="clicked"/>
                         <child>
                           <widget class="GtkLabel" id="label18">
                             <property name="visible">True</property>
@@ -596,12 +596,27 @@
                     <property name="hscrollbar_policy">never</property>
                     <property name="vscrollbar_policy">automatic</property>
                     <child>
-                      <widget class="GtkTreeView" id="messages_view">
+                      <widget class="GtkViewport" id="viewport1">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="rules_hint">True</property>
-                        <property name="enable_grid_lines">horizontal</property>
-                        <property name="enable_tree_lines">True</property>
+                        <property name="resize_mode">queue</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox4">
+                            <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <widget class="GtkTreeView" id="messages_view">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="rules_hint">True</property>
+                                <property name="enable_grid_lines">horizontal</property>
+                                <property name="enable_tree_lines">True</property>
+                              </widget>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
                       </widget>
                     </child>
                   </widget>
diff --git a/src/hildonize.py b/src/hildonize.py
index a6cfa4c..09ee705 100644
--- a/src/hildonize.py
+++ b/src/hildonize.py
@@ -407,27 +407,6 @@ except AttributeError:
 		hildonize_scrollwindow_with_viewport = _null_hildonize_scrollwindow
 
 
-def _fremantle_pannable_treeview_theme_workaround(treeview):
-	scrollWindow = treeview.get_parent()
-	scrollWindow.remove(treeview)
-
-	vbox = gtk.VBox()
-	vbox.add(treeview)
-	viewport = gtk.Viewport()
-	viewport.add(vbox)
-	scrollWindow.add(viewport)
-
-
-def _null_pannable_treeview_theme_workaround(treeview):
-	pass
-
-
-if IS_FREMANTLE_SUPPORTED:
-	pannable_treeview_theme_workaround = _fremantle_pannable_treeview_theme_workaround
-else:
-	pannable_treeview_theme_workaround = _null_pannable_treeview_theme_workaround
-
-
 def _hildon_request_number(parent, title, range, default):
 	spinner = hildon.NumberEditor(*range)
 	spinner.set_value(default)