CCF_100/relational
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix to run on osx, runs even if webkit can't be imported

Browse Source 
git-svn-id: http://galileo.dmi.unict.it/svn/relational/trunk@37 014f5005-505e-4b48-8d0a-63407b615a7c
This commit is contained in:
LtWorf 2008-08-14 18:53:42 +00:00
parent 15707f89c5
commit 35126caa5a
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -27,4 +27,7 @@
0.5 0.5
- Added support for float numbers - Added support for float numbers
- Added support for dates - Added support for dates
0.6
- Fixes to run on Mac OsX

23
about.py
View File

@ -17,7 +17,13 @@
# #
# author Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it> # author Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it>
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
try: #If QtWebKit is available, uses it
from PyQt4 import QtWebKit
webk=True
except:
webk=False
import relational import relational
class Ui_Dialog(object): class Ui_Dialog(object):
@ -77,10 +83,17 @@ class Ui_Dialog(object):
self.tab_2.setObjectName("tab_2") self.tab_2.setObjectName("tab_2")
self.verticalLayout_7 = QtGui.QVBoxLayout(self.tab_2) self.verticalLayout_7 = QtGui.QVBoxLayout(self.tab_2)
self.verticalLayout_7.setObjectName("verticalLayout_7") self.verticalLayout_7.setObjectName("verticalLayout_7")
self.webView = QtWebKit.QWebView(self.tab_2) if (webk):
self.webView.setUrl(QtCore.QUrl("http://galileo.dmi.unict.it/wiki/relational/doku.php")) self.webView = QtWebKit.QWebView(self.tab_2)
self.webView.setObjectName("webView") self.webView.setUrl(QtCore.QUrl("http://galileo.dmi.unict.it/wiki/relational/doku.php"))
self.verticalLayout_7.addWidget(self.webView) 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.tabWidget.addTab(self.tab_2,"")
self.verticalLayout_2.addWidget(self.tabWidget) self.verticalLayout_2.addWidget(self.tabWidget)
self.buttonBox = QtGui.QDialogButtonBox(Dialog) 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.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)) 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__": if __name__ == "__main__":
import sys import sys