Commits

Julien Jehannet  committed 450afd5 Merge

(merge)

  • Participants
  • Parent commits f43fed4, 7836c8b

Comments (0)

Files changed (4)

File hgview/gtk/graphrenderer.py

         #search on the string log
         from cgi import escape
 
-        str_node = escape(layout.get_text())
-        if searched_text in str_node:
+        txt = escape(layout.get_text())
+        try:
+            str_node = unicode(txt, "utf-8")
+        except UnicodeError:
+            str_node = unicode(txt, "iso-8859-1", 'ignore' ) 
+        
+        if searched_text and searched_text in str_node :
             rexp = re.compile( '(%s)' % escape(searched_text))
             markup = rexp.sub('<span background="yellow">\\1</span>', str_node)
             layout.set_markup(markup)
         else:
-            layout.set_markup('<span>%s</span>'% str_node)
+            markup = str_node
+            layout.set_markup('<span>%s</span>' % markup)
             
         w_,h_ = layout.get_size()
         d_ = (h-h_/pango.SCALE)/2

File hgview/gtk/hgview_gtk.py

     def on_about_activate(self, *args):
         """ Display about dialog """
         dlg=gtk.AboutDialog()
-        dlg.set_authors([u'Ludovic Aubry, Logilab',
-                         u'David Douard, Logilab',
-                         u'Aur�lien Camp�as, Logilab'])
-        from __pkginfo__ import modname, version, short_desc, long_desc
+        dlg.set_authors([u'Ludovic Aubry',
+                         u'Aur�lien Camp�as',
+                         u'David Douard',
+                         u'Graziella Toutoungis',
+                         ])
+        from hgview.__pkginfo__ import modname, version, short_desc, long_desc
         dlg.set_comments(short_desc)
         dlg.set_name(modname)
         dlg.set_version(version)

File hgview/hgrepo.py

         self.dir = self.find_repository( path )
         self.ui = ui.ui()
         self.repo = hg.repository( self.ui, self.dir )
-        print '///', self
         # cache and indexing of changelog
         self._cache = {}
 

File hgview/qt4/hgview_qt4.py

 
     def on_about(self, *args):
         """ Display about dialog """
-        from __pkginfo__ import modname, version, short_desc, long_desc
+        from hgview.__pkginfo__ import modname, version, short_desc, long_desc
         QtGui.QMessageBox.about(self, self.tr("About hgview_qt4"),
                                 "<h2>About hgview_qt4 %s</h2>" % version + 
                                 "<p><i>%s</i></p>" % short_desc.capitalize() +