Fixed a few bugs. 5_0_x

Sun, 04 Jul 2010 20:48:26 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 04 Jul 2010 20:48:26 +0200
branch
5_0_x
changeset 385
dce841567a6c
parent 380
71d061e51cf0
child 387
7cb2a400b7a3

Fixed a few bugs.

Helpviewer/HelpBrowserWV.py file | annotate | diff | comparison | revisions
eric5.e4p file | annotate | diff | comparison | revisions
install.py file | annotate | diff | comparison | revisions
--- a/Helpviewer/HelpBrowserWV.py	Sun Jul 04 10:24:29 2010 +0200
+++ b/Helpviewer/HelpBrowserWV.py	Sun Jul 04 20:48:26 2010 +0200
@@ -351,6 +351,9 @@
         """
         resources = []
         
+        baseUrlString = self.page().mainFrame().evaluateJavaScript("document.baseURI")
+        baseUrl = QUrl.fromEncoded(baseUrlString)
+        
         lst = self.page().mainFrame().evaluateJavaScript(fetchLinks_js)
         for m in lst:
             rel = m["rel"]
@@ -366,7 +369,7 @@
             resource = LinkedResource()
             resource.rel = rel
             resource.type_ = type_
-            resource.href = href
+            resource.href = baseUrl.resolved(QUrl.fromEncoded(href))
             resource.title = title
             
             resources.append(resource)
--- a/eric5.e4p	Sun Jul 04 10:24:29 2010 +0200
+++ b/eric5.e4p	Sun Jul 04 20:48:26 2010 +0200
@@ -9,7 +9,7 @@
   <ProgLanguage mixed="1">Python3</ProgLanguage>
   <ProjectType>Qt4</ProjectType>
   <Description>eric5 is an integrated development environment for
the Python and Ruby language. It uses the PyQt4
bindings and the QScintilla2 editor widget.</Description>
-  <Version>5.0.0</Version>
+  <Version>5.0.1</Version>
   <Author>Detlev Offenbach</Author>
   <Email>detlev@die-offenbachs.de</Email>
   <TranslationPattern>i18n/eric5_%language%.ts</TranslationPattern>
--- a/install.py	Sun Jul 04 10:24:29 2010 +0200
+++ b/install.py	Sun Jul 04 20:48:26 2010 +0200
@@ -149,7 +149,7 @@
         wrapper = \
 '''#!/bin/sh
 
-exec "%s/bin/pythonw" "%s/%s.py" "$@"
+exec "%s/bin/pythonw3" "%s/%s.py" "$@"
 ''' % (sys.exec_prefix, pydir, wfile)
 
     # *nix systems
@@ -367,10 +367,10 @@
     except IOError as msg:
         sys.stderr.write('IOError: %s\nTry install as root.\n' % msg)
         sys.exit(7)
-        
-    except OSError as msg:
-        sys.stderr.write('OSError: %s\nTry install with admin rights.\n' % msg)
-        sys.exit(7)
+        
+    except OSError as msg:
+        sys.stderr.write('OSError: %s\nTry install with admin rights.\n' % msg)
+        sys.exit(7)
     
     # copy some text files to the doc area
     for name in ["LICENSE.GPL3", "THANKS", "changelog"]:

eric ide

mercurial