Changeset 1035

Timestamp:

07/26/10 19:38:58 (7 weeks ago)

Author:

vete

Message:

PG2 fix su sqlalchemy 0.6.3

Location:

trunk/core

Files:

• promogest/dao/Dao.py (modified) (1 diff)
• promogest/lib/HtmlHandler.py (modified) (3 diffs)
• promogest/ui/utils.py (modified) (1 diff)
• templates/articolo.html (modified) (1 diff)
• templates/index.html (modified) (1 diff)

trunk/core/promogest/dao/Dao.py

@@ -44 +44 @@
         """
         filter1 = filter2 = None
-        if complexFilter == True:
+        if complexFilter is not None:
             filter1 = complexFilter
         else:

trunk/core/promogest/lib/HtmlHandler.py

@@ -7 +7 @@
 import os
 import sys
+import gtk
 import gobject
 try:
-    from webkit import WebView
+    from webkit import WebView, WebSettings
     WEBKIT = True
 except:
@@ -140 +141 @@
 #        print "OOOOOIJJJJJJJJJJJJJJJJJJJJJ", widget, title, uri, userdata
         a= WebView()
+#        print dir(a)
 #    a.connect('hovering-over-link', _on_hovering_over_link,a)
         a.connect('navigation-requested', _on_navigation_requested,a)
@@ -201 +203 @@
 
     if WEBKIT:
-        widget.load_string(html,"text/html","utf-8", "file:///"+sys.path[0]+os.sep)
+        c = WebSettings()
+        c.set_property("minimum_font_size", 8)
+        c.set_property("javascript-can-open-windows-automatically", True)
+        c.set_property("default-encoding", "Utf-8")
+        c.set_property("enable-file-access-from-file-uris", True)
+        widget.set_settings(c)
+#        framme =  widget.get_main_frame()
+#        print "PPPPPPPPPPPPPPPPPP", framme, dir(framme)
+#        framme.print_full(gtk.PrintOperation(), gtk.PRINT_OPERATION_ACTION_PRINT_PREVIEW)
+        widget.load_html_string(html, "file:///"+sys.path[0]+os.sep)
+#        print dir(widget)
+#        widget.web_frame_print_full(GTK_PRINT_OPERATION_ACTION_EXPORT, )
+#        widget.load_string(html,"text/html","utf-8", "file:///")
+#        widget.set_editable(True)
         widget.show()
     else:

trunk/core/promogest/ui/utils.py

@@ -2226 +2226 @@
     _key= str(tipo+".registro").strip()
     registro = Setting().getRecord(id=_key)
-    print "REGISTROOOOOOOOOOOOOOOOOOOOOOOOOOOO", registro, tipo, date
+#    print "REGISTROOOOOOOOOOOOOOOOOOOOOOOOOOOO", registro, tipo, date
     if not registro :
         raise "ATTENZIONE , Registro numerazione non trovato"

trunk/core/templates/articolo.html

@@ -2 +2 @@
 
 {% block body %}
-<!-- <div id="head"> -->
-<!--        <div id="img" ><img src= "gui/articolo48x48.png"></div>-->
+<!--        <div id="img" ><img src= "http://blog.motane.lu/wp-content/uploads/2009/06/python_logo_without_textsvg.png"></div>-->
     <div id="testo">{{ui|replace("_"," ")|capitalize()}}</div>
   </div>  <div id="rigaheader"></div>
-<!-- <div> -->
 
 <table cellpadding="0" cellspacing="0" border="0">

trunk/core/templates/index.html

@@ -13 +13 @@
 Pagina Vuota
 {% endblock %}
-
 </div>
 </body>