[Rapier-commits] r218 - trunk/src

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

Author: pamadio
Date: 2009-10-23 20:55:55 +0300 (Fri, 23 Oct 2009)
New Revision: 218

Modified:
   trunk/src/rapier
Log:
Nathan Anderson's fremantle patch

Modified: trunk/src/rapier
===================================================================
--- trunk/src/rapier	2009-10-23 17:38:31 UTC (rev 217)
+++ trunk/src/rapier	2009-10-23 17:55:55 UTC (rev 218)
@@ -28,13 +28,12 @@
 import gobject
 import re
 try:
-    from gnome import gconf
+	from gnome import gnomevfs
 except:
-    import gconf
-try:
-    from gnome import gnomevfs
-except:
-    import gnomevfs
+	import gnomevfs
+
+import gconf
+
 import swordutils
 import os
 import sqlite3
@@ -901,10 +900,10 @@
 
         if origValue:
             dialog = hildon.Note ("confirmation",\
-                                  (self.mgModWindow,\
+                                  self.mgModWindow,\
                                    "Are you sure you want to "+\
                                    " destroy this index ?",\
-                                   gtk.STOCK_DIALOG_WARNING)\
+                                   gtk.STOCK_DIALOG_WARNING\
                                   )
             dialog.set_button_texts ("Yes", "No")
             response = dialog.run()
@@ -921,10 +920,10 @@
         origValue=self.mgModLocalModel[path][3]
         if not origValue:
             dialog = hildon.Note ("confirmation",\
-                                  (self.mgModWindow,\
+                                  self.mgModWindow,\
                                    "Are you sure you want to"+ \
                                    " uninstall this module ?",\
-                                   gtk.STOCK_DIALOG_WARNING)\
+                                   gtk.STOCK_DIALOG_WARNING\
                                   )
             dialog.set_button_texts ("Yes", "No")
             response = dialog.run()
@@ -1215,7 +1214,7 @@
 
     def show_message(self,message):
         note = hildon.Note("information",
-                (self.mainWindow, message, gtk.STOCK_DIALOG_INFO))
+                self.mainWindow, message, gtk.STOCK_DIALOG_INFO)
         note.set_modal(True)
         def cleanup(*args):
             note.destroy()
@@ -1250,7 +1249,7 @@
     def process_panic(self,job):
         message='Fatal error:%s'%job.args['message']
         note = hildon.Note("information",
-                           (self.mainWindow, message, gtk.STOCK_DIALOG_INFO))
+                           self.mainWindow, message, gtk.STOCK_DIALOG_INFO)
         note.set_modal(True)
         def cleanup(*args):
             sys.exit()
@@ -1262,8 +1261,8 @@
     def prepareWaitingWindow(self):
         """self.mgModWindow"""
         self.waitingWinProgressBar=gtk.ProgressBar()
-        self.waitingWindow = hildon.Note("cancel_with_progress_bar",
-                (self.mainWindow, "Waiting...", self.waitingWinProgressBar))
+	self.waitingWindow = hildon.Note("cancel", self.mainWindow, "Waiting...", progressbar=self.waitingWinProgressBar)
+#        self.waitingWindow = hildon.Note("cancel_with_progress_bar",(self.mainWindow, "Waiting...", self.waitingWinProgressBar))
         
     def on_key_press(self,widget,event):
         if event.keyval ==gtk.keysyms.F6:
@@ -1466,8 +1465,9 @@
             self.textDisplay_textview.scroll_to_mark(mark,0.05, True, 0.0, 1.0)
         
     def refreshTextDisplay(self):
-        for mark in self.textMarks:
-            self.textDisplay_buffer.delete_mark(mark)
+    	for mark in self.textMarks:
+    	    if mark is not None and mark.get_buffer() is not None and mark.get_buffer().get_char_count() > 0:
+                self.textDisplay_buffer.delete_mark(mark)
         self.textDisplay_buffer.set_text("")
         v=0
         for verse in self.textArray:
@@ -1534,14 +1534,16 @@
         self.fillChapters()
         
     def chapter_combo_changed(self,widget):
-        self.selected_chapter=int(self.get_combo_active_text(widget))
-        self.fillVerses()
+	if self.get_combo_active_text(widget) is not None:
+            self.selected_chapter=int(self.get_combo_active_text(widget))
+	    self.fillVerses()
         #self.refresh_textArray()
 
     def verse_combo_changed(self,widget):
         self.highlight_verse(self.selected_verse,self.normalTag)
-        self.selected_verse=int(self.get_combo_active_text(widget))
-        self.refresh_textArray()
+        if self.get_combo_active_text(widget) is not None:
+    	    self.selected_verse=int(self.get_combo_active_text(widget))
+    	    self.refresh_textArray()
         """
 
         print "verse_combo_changed:",self.selected_verse
@@ -1559,19 +1561,21 @@
         if not swordutils.has_clucene_index(self.mgr, self.selected_module)\
                and not self.showStrongNumbers:
             dialog = hildon.Note ("information", \
-                                  (self.mainWindow, \
+                                  self.mainWindow, \
                                    "You need to build an index for "+\
                                    "this module first.",\
-                                   gtk.STOCK_DIALOG_INFO)\
+                                   gtk.STOCK_DIALOG_INFO\
                                   )
-            dialog.set_button_text("Ok")
+                                  
+                                  
+#            dialog.set_button_text("Ok")
             dialog.run()
             dialog.destroy()
             return
 
         if self.showStrongNumbers and not self.strong_db:
             dialog = hildon.Note ("information", \
-                                  (self.mainWindow, \
+                                  self.mainWindow, \
                                    "You need to download a Strong Number "+\
                                    "database and change "+\
                                    "the Preferences to point to its "+\
@@ -1579,9 +1583,9 @@
                                    "Such a database is available at \n"+\
                                    
                                    "http://hurdygurdy.dyndns.org/maemosword/strong.zip",\
-                                   gtk.STOCK_DIALOG_INFO)\
+                                   gtk.STOCK_DIALOG_INFO\
                                   )
-            dialog.set_button_text("Ok")
+#            dialog.set_button_text("Ok")
             dialog.run()
             dialog.destroy()
             return