conduit r1360 - in trunk: . conduit conduit/gtkui data

[jstowers svn gnome org]

Author: jstowers
Date: Sun Mar  9 09:45:28 2008
New Revision: 1360
URL: http://svn.gnome.org/viewvc/conduit?rev=1360&view=rev

Log:
2008-03-09  John Stowers  <john stowers gmail com>

	* NEWS:
	* conduit/Settings.py: Restore expanded treeview columns by default.
	
	* conduit/gtkui/Tree.py: Remove unused unworking DND cancel code.

	* data/conduit.glade: Fix warning about unknown radio button groups



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/conduit/Settings.py
   trunk/conduit/gtkui/Tree.py
   trunk/data/conduit.glade

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Mar  9 09:45:28 2008
@@ -2,6 +2,7 @@
 ==============
 * You can now specify your own labels when saving emails
 * Removed the build dependency on dbus, just check for python-dbus > 0.80.0
+* Restore the expanded columns in the data provider pane
 
 NEW in 0.3.8:
 ==============

Modified: trunk/conduit/Settings.py
==============================================================================
--- trunk/conduit/Settings.py	(original)
+++ trunk/conduit/Settings.py	Sun Mar  9 09:45:28 2008
@@ -86,7 +86,7 @@
         'default_policy_conflict'   :   "ask",          #Default conflict policy for new Conduits, ask,replace,skip
         'default_policy_deleted'    :   "ask",          #Default deleted policy for new Conduits, ask,replace,skip
         'gui_expanded_rows'         :   [],             #list of expanded column paths in the treeview
-        'gui_restore_expanded_rows' :   False,          #Shoud we expand columns at startup
+        'gui_restore_expanded_rows' :   True,           #Shoud we expand columns at startup
         'gui_hpane_postion'         :   250,            #The hpane seperating the canvas and treeview position
         'gui_window_size'           :   [],             #W,H
         'gui_minimize_to_tray'      :   False,          #Behaviour when one minimizes the main window, should it iconify?

Modified: trunk/conduit/gtkui/Tree.py
==============================================================================
--- trunk/conduit/gtkui/Tree.py	(original)
+++ trunk/conduit/gtkui/Tree.py	Sun Mar  9 09:45:28 2008
@@ -76,6 +76,13 @@
     def _get_category_by_name(self, category_name):
         idx = self._get_category_index_by_name(category_name)
         return self.cats[idx]
+        
+    def _rebuild_path_mappings(self):
+        self.pathMappings = {}
+        for i, cat in enumerate(self.cats):
+            self.pathMappings[cat] = (i, )
+            for j, dp in enumerate(self.dataproviders[i]):
+                self.pathMappings[dp] = (i, j)
 
     def add_dataproviders(self, dpw=[]):
         """
@@ -150,14 +157,6 @@
         
         self._rebuild_path_mappings()
 
-    def _rebuild_path_mappings(self):
-        self.pathMappings = {}
-
-        for i, cat in enumerate(self.cats):
-            self.pathMappings[cat] = (i, )
-            for j, dp in enumerate(self.dataproviders[i]):
-                self.pathMappings[dp] = (i, j)
-
     def on_get_flags(self):
         """
         on_get_flags(
@@ -358,7 +357,6 @@
         self.drag_source_set(           gtk.gdk.BUTTON1_MASK | gtk.gdk.BUTTON3_MASK,
                                         DND_TARGETS,
                                         gtk.gdk.ACTION_COPY | gtk.gdk.ACTION_LINK)
-        #self.connect('drag-begin', self.on_drag_begin)
         self.connect('drag-data-get', self.on_drag_data_get)
         self.connect('drag-data-delete', self.on_drag_data_delete)
         
@@ -392,15 +390,6 @@
         if gtk.pygtk_version >= (2,10,0):
             gtk.TreeView.expand_all(self)
         
-    def on_drag_begin(self, treeview, context):
-        pass
-        #treeselection = treeview.get_selection()
-        #model, iter = treeselection.get_selected()
-        #categoryHeading = model.get_value(iter, 4)
-        #if categoryHeading:
-        #    log.debug("Aborting DND")
-        #    context.drag_abort()
-
     def on_drag_data_get(self, treeview, context, selection, target_id, etime):
         """
         Get the data to be dropped by on_drag_data_received().

Modified: trunk/data/conduit.glade
==============================================================================
--- trunk/data/conduit.glade	(original)
+++ trunk/data/conduit.glade	Sun Mar  9 09:45:28 2008
@@ -526,7 +526,6 @@
                 <property name="label" translatable="yes">Ask Me What to do</property>
                 <property name="use_underline">True</property>
                 <property name="draw_as_radio">True</property>
-                <property name="group">conflict_ask</property>
               </widget>
             </child>
             <child>
@@ -570,7 +569,6 @@
                 <property name="label" translatable="yes">Ask Me What to Do</property>
                 <property name="use_underline">True</property>
                 <property name="draw_as_radio">True</property>
-                <property name="group">deleted_ask</property>
               </widget>
             </child>
             <child>