[Rapier-commits] r203 - trunk/src

[This list send mail when a change occurs on the subversion repository]

Author: pamadio
Date: 2008-01-22 19:09:51 +0200 (Tue, 22 Jan 2008)
New Revision: 203

Modified:
   trunk/src/rapier
Log:
some post backup fixes

Modified: trunk/src/rapier
===================================================================
--- trunk/src/rapier	2008-01-22 16:52:17 UTC (rev 202)
+++ trunk/src/rapier	2008-01-22 17:09:51 UTC (rev 203)
@@ -148,10 +148,13 @@
         self.searchProgressbar.hide()
 
         """
-         If there is no data_path gconf variable, then let set it
+         If there is no data_path gconf variable, or if it looks dodgy
+         then let set it
          to /home/user/sword
         """
-        if not self.gconf.get_string("/apps/osso/rapier/data_path"):
+        tmp_dataPath=self.gconf.get_string("/apps/osso/rapier/data_path")
+        if not tmp_dataPath\
+               or not self.is_valid_datapath(tmp_dataPath):
             defdst="/home/user/sword"
             src_uri=gnomevfs.URI("/usr/share/sword")
             dst_uri=gnomevfs.URI(defdst)
@@ -307,14 +310,11 @@
         self.mainWindow.MainMenu.append(\
             self.mainWindow.itemSubMenuModuleChooser)
 
-        
         #Manage menu item
         self.mainWindow.itemMenuManage=gtk.MenuItem("Manage")
         self.mainWindow.MainMenu.append(self.mainWindow.itemMenuManage)
-        #self.mainWindow.itemMenuManage.connect("activate",self.menuitem_response,"Manage")
         self.mainWindow.itemMenuManage.connect(\
             "activate",self.displayManageModuleWindow)
-        
 
         self.mainWindow.itemMenuPref=gtk.MenuItem("Preferences")
         self.mainWindow.MainMenu.append(self.mainWindow.itemMenuPref)
@@ -350,13 +350,6 @@
             'changed',self.verse_combo_changed)
         self.mainWindow.toolbar.insert(self.mainWindow.verse_tb_item,2)
 
-        #Ok button
-        #self.mainWindow.display_b_item=gtk.ToolItem()
-        #self.mainWindow.display_b=gtk.Button("Display")
-        #self.mainWindow.display_b_item.add(self.mainWindow.display_b)
-        #self.mainWindow.display_b.connect("clicked",self.display_b_clicked)
-        #self.mainWindow.toolbar.insert(self.mainWindow.display_b_item,3)
-
         #Strong Number checkbox.
         self.mainWindow.strong_number_item=gtk.ToolItem()
         self.mainWindow.strong_number_check_b=gtk.CheckButton(\
@@ -368,9 +361,6 @@
         self.mainWindow.toolbar.insert(\
             self.mainWindow.strong_number_item,3)
 
-
-
-
         self.mainWindow.back_b_item=gtk.ToolItem()
         self.mainWindow.back_b=gtk.Button()
         self.mainWindow.back_b_item.add(self.mainWindow.back_b)
@@ -746,7 +736,20 @@
             return False
         return True
             
+    def is_valid_datapath(self,path):
+        if not  os.path.isdir(path):
+            return False
+        if not os.path.isdir(path+"/mods.d"):
+            return False
+        if not os.path.isdir(path+"/locales.d"):
+            return False
+        if not os.path.isdir(path+"/modules"):
+            return False
+        
+        return True
 
+
+
     def prefStrongTabDirChange_bClicked(self,widget):
         prefStrongTabDirFileSelector=\
                                        hildon.FileChooserDialog(\
@@ -772,11 +775,6 @@
             prefStrongTabDirFileSelector.destroy()
 
 
-
-
-
-
-
     def changePrefs(self):
 
         #Module preferences.
@@ -1146,18 +1144,8 @@
         
         self.mgModRemoteInstallCol.set_attributes(\
             self.mgModRemoteInstallCell,active=0)
-        
 
-        """
         self.mgModRemoteNameCell=gtk.CellRendererText()
-        self.mgModRemoteNameCol=gtk.TreeViewColumn('Name')
-        self.mgModRemoteTv.append_column(self.mgModRemoteNameCol)
-        self.mgModRemoteNameCol.pack_start(self.mgModRemoteNameCell,True)
-        self.mgModRemoteNameCol.set_attributes(\
-            self.mgModRemoteNameCell,text=1)
-        """
-
-        self.mgModRemoteNameCell=gtk.CellRendererText()
         self.mgModRemoteInstallCol.pack_start(self.mgModRemoteNameCell,True)
         self.mgModRemoteInstallCol.set_attributes(\
             self.mgModRemoteNameCell,text=1)
@@ -1227,7 +1215,6 @@
     def hide_dic_window(self,widget):
         self.dictDisplay_w.hide()
 
-
     def process_module_management(self,result):
         self.waitForModuleManagementFlag=False
 
@@ -1239,14 +1226,6 @@
         self.waitingWindow.hide()
         self.mgModWindow.hide()
         self.show_message(snt)
-        
-        #self.plop(snt)
-        #self.waitingWindow.hide()
-        #self.mgModWindow.hide()
-
-        print snt
-        
-
         self.reload_manager()
         self.refresh_module_list()
         self.refillPrefModuleList()
@@ -1255,7 +1234,6 @@
 
 
     def process_panic(self,job):
-        print "job=",job.args
         message='Fatal error:%s'%job.args['message']
         note = hildon.Note("information",
                            (self.mainWindow, message, gtk.STOCK_DIALOG_INFO))