From 35126caa5a76fecd81421032ad0b275f65ba3bbf Mon Sep 17 00:00:00 2001
From: LtWorf <LtWorf@014f5005-505e-4b48-8d0a-63407b615a7c>
Date: Thu, 14 Aug 2008 18:53:42 +0000
Subject: [PATCH] fix to run on osx, runs even if webkit can't be imported

git-svn-id: http://galileo.dmi.unict.it/svn/relational/trunk@37 014f5005-505e-4b48-8d0a-63407b615a7c
---
 CHANGELOG |  5 ++++-
 about.py  | 23 ++++++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f856cbb..33314a4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,4 +27,7 @@
 
 0.5
 - Added support for float numbers
-- Added support for dates
\ No newline at end of file
+- Added support for dates
+
+0.6
+- Fixes to run on Mac OsX
\ No newline at end of file
diff --git a/about.py b/about.py
index 239b7de..14765c1 100644
--- a/about.py
+++ b/about.py
@@ -17,7 +17,13 @@
 # 
 # author Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it>
 
+
 from PyQt4 import QtCore, QtGui
+try: #If QtWebKit is available, uses it
+	from PyQt4 import QtWebKit
+	webk=True
+except:
+	webk=False
 import relational
 
 class Ui_Dialog(object):
@@ -77,10 +83,17 @@ class Ui_Dialog(object):
         self.tab_2.setObjectName("tab_2")
         self.verticalLayout_7 = QtGui.QVBoxLayout(self.tab_2)
         self.verticalLayout_7.setObjectName("verticalLayout_7")
-        self.webView = QtWebKit.QWebView(self.tab_2)
-        self.webView.setUrl(QtCore.QUrl("http://galileo.dmi.unict.it/wiki/relational/doku.php"))
-        self.webView.setObjectName("webView")
-        self.verticalLayout_7.addWidget(self.webView)
+        if (webk):
+		self.webView = QtWebKit.QWebView(self.tab_2)
+        	self.webView.setUrl(QtCore.QUrl("http://galileo.dmi.unict.it/wiki/relational/doku.php"))
+        	self.webView.setObjectName("webView")
+		self.verticalLayout_7.addWidget(self.webView)
+	else:
+		self.webError = QtGui.QLabel(self.groupBox)
+		self.webError.setFont(font)
+        	self.webError.setObjectName("lblError")
+        	self.verticalLayout_7.addWidget(self.webError)
+		self.webError.setText(QtGui.QApplication.translate("Dialog", "Error! Unable to import QtWebKit module.", None, QtGui.QApplication.UnicodeUTF8))
         self.tabWidget.addTab(self.tab_2,"")
         self.verticalLayout_2.addWidget(self.tabWidget)
         self.buttonBox = QtGui.QDialogButtonBox(Dialog)
@@ -250,7 +263,7 @@ class Ui_Dialog(object):
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.License), QtGui.QApplication.translate("Dialog", "License", None, QtGui.QApplication.UnicodeUTF8))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), QtGui.QApplication.translate("Dialog", "Docs", None, QtGui.QApplication.UnicodeUTF8))
 
-from PyQt4 import QtWebKit
+
 
 if __name__ == "__main__":
     import sys