fix the importing to html

tedj · Feb 22, 2014 · 1f63794 · 1f63794
1 parent 6dec013
commit 1f63794
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/src/alfanous-desktop/Gui.py b/src/alfanous-desktop/Gui.py
@@ -30,6 +30,7 @@
 import os
 import gettext
 from re import compile
+import codecs
 
 from pyparsing import ParseException
 from configobj import ConfigObj
@@ -83,7 +84,8 @@ def __init__( self ):
         self.last_results = None
         self.currentQuery = 0
         self.Queries = []
-        self.history = []
+        self.undo_stack = []
+        self.redo_stack = []
 
     def exit( self ):
         self.save_config()
@@ -273,12 +275,12 @@ def search_all( self, page = 1 ):
         """
         The main search function
         """
-        # add to history
-        if self.o_query.currentText() in self.history:
-            self.history.remove( self.o_query.currentText() )
-        self.history.insert( 0, self.o_query.currentText() )
+        # add to undo stack
+        if self.o_query.currentText() in self.undo_stack:
+            self.undo_stack.remove( self.o_query.currentText() )
+        self.undo_stack.insert( 0, self.o_query.currentText() )
         self.o_query.clear()
-        self.o_query.addItems( self.history )
+        self.o_query.addItems( self.undo_stack )
         self.o_query.setCurrentIndex( 0 )
 
         limit = int( self.limit_group.checkedAction().text() )
@@ -526,13 +528,13 @@ def save_results( self ):
             filenames = diag.selectedFiles();
 
         path = unicode( filenames[0] )
-        file = open( path, "w" )
-        file.write( self.o_results.toHtml().toUtf8().replace("<head>", "<head><meta charset=\"utf-8\">") + "<br><br>CopyRights(c)<a href='http://www.alfanous.org'>Alfanous</a>  " )
-        file.close()
+        f = codecs.open( path, "w", "utf-8")
+        f.write( self.o_results.page().currentFrame().toHtml().replace("<head>", "<head><meta charset=\"utf-8\">") + "<br><br>CopyRights(c)<a href='http://www.alfanous.org'>Alfanous</a>  " )
+        f.close()
 
     def print_results( self ):
         printer = QtGui.QPrinter()
-        printer.setCreator( self.o_results.toHtml() )
+        printer.setCreator( self.o_results.html() )
         printer.setDocName( _( u"Results" ) + "-" + str( self.o_page.value() ) )
         printer.setPageSize( printer.A4 )
 

diff --git a/src/alfanous-desktop/Templates.py b/src/alfanous-desktop/Templates.py
@@ -937,7 +937,7 @@
 					  		 <span class='quran_decoration prev_aya'>
 							 ] </span>
 							 <span style='direction:ltr;' class='prev_aya'>
-								({{ ayaresult_content.aya.prev_aya.sura }} {{ ayaresult_content.aya.prev_aya.id }})  
+								({{ ayaresult_content.aya.prev_aya.sura_arabic }} {{ ayaresult_content.aya.prev_aya.id }})  
 					  		</span>
 					  		 </p>
 					  		
@@ -956,7 +956,7 @@
 					 ] </span>
 					  <span style='direction:rtl;' class='main_aya'>
 					  		   
-											({{ ayaresult_content.identifier.sura_name }} {{ ayaresult_content.aya.id }})  
+											({{ ayaresult_content.identifier.sura_arabic_name }} {{ ayaresult_content.aya.id }})  
 							
 					   
 					  </span>
@@ -976,7 +976,7 @@
 							 <span style='direction:ltr;' class='next_aya'>
 							   
 					
-							({{ ayaresult_content.aya.next_aya.sura }} {{ ayaresult_content.aya.next_aya.id }}) 
+							({{ ayaresult_content.aya.next_aya.sura_arabic }} {{ ayaresult_content.aya.next_aya.id }}) 
 							
 							</span>
 					  		 </p>
@@ -1015,7 +1015,7 @@
 					   {% endif %}
 					  	
 					  {% if ayaresult_content.stat or 	ayaresult_content.position %}		
-						  <div class='aya_details'>
+						  <div class='aya_details' style='text-align:center;'>
 						  	{% if ayaresult_content.stat %}
 			
 							  	<div class='details_label aya_stat0 clickable'> {{ _("words") }} | {{ ayaresult_content.stat.words }} </div>