conduit r1178 - in trunk: . conduit/gtkui data

[jstowers svn gnome org]

Author: jstowers
Date: Thu Jan 10 02:38:12 2008
New Revision: 1178
URL: http://svn.gnome.org/viewvc/conduit?rev=1178&view=rev

Log:
Ensure when collapsed, the conflict expander moves out of the way

Modified:
   trunk/ChangeLog
   trunk/conduit/gtkui/ConflictResolver.py
   trunk/data/conduit.glade

Modified: trunk/conduit/gtkui/ConflictResolver.py
==============================================================================
--- trunk/conduit/gtkui/ConflictResolver.py	(original)
+++ trunk/conduit/gtkui/ConflictResolver.py	Thu Jan 10 02:38:12 2008
@@ -51,6 +51,7 @@
         #this is the scrolled window in the bottom of the main gui
         self.expander = widgets.get_widget("conflictExpander")
         self.expander.connect("activate", self.on_expand)
+        self.vpane = widgets.get_widget("vpaned1")
         self.expander.set_sensitive(False)
         self.fullscreenButton = widgets.get_widget("conflictFullscreenButton")
         self.fullscreenButton.connect("toggled", self.on_fullscreen_toggled)
@@ -163,7 +164,7 @@
     def _set_conflict_titles(self):
         self.expander.set_label(_("Conflicts (%s)") % self.numConflicts)
         self.standalone.set_title(_("Conflicts (%s)") % self.numConflicts)
-
+        
     def _conflict_resolved(self, sender, rowref):
         """
         Callback when a ConflictResolveThread finishes. Deletes the 
@@ -217,7 +218,8 @@
         #self._set_conflict_titles()
 
     def on_expand(self, sender):
-        pass
+        #Force the vpane to move to the bottom
+        self.vpane.set_position(-1)
 
     def on_fullscreen_toggled(self, sender):
         #switches between showing the conflicts in a standalone window.

Modified: trunk/data/conduit.glade
==============================================================================
--- trunk/data/conduit.glade	(original)
+++ trunk/data/conduit.glade	Thu Jan 10 02:38:12 2008
@@ -374,7 +374,7 @@
                   </widget>
                   <packing>
                     <property name="resize">False</property>
-                    <property name="shrink">True</property>
+                    <property name="shrink">False</property>
                   </packing>
                 </child>
               </widget>