From 11b622b324239317b5b954b7d4568f44ca5e9e13 Mon Sep 17 00:00:00 2001 From: LtWorf Date: Mon, 14 Mar 2011 21:51:22 +0000 Subject: [PATCH] - Clickable links in the about window git-svn-id: http://galileo.dmi.unict.it/svn/relational/trunk@276 014f5005-505e-4b48-8d0a-63407b615a7c --- debian/pyversions | 2 +- relational_gui/about.py | 31 ++++++++++++++++++++++--------- relational_readline/linegui.py | 2 +- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/debian/pyversions b/debian/pyversions index b3dc41e..0c043f1 100644 --- a/debian/pyversions +++ b/debian/pyversions @@ -1 +1 @@ -2.5- +2.6- diff --git a/relational_gui/about.py b/relational_gui/about.py index 1bfe875..dac91ac 100644 --- a/relational_gui/about.py +++ b/relational_gui/about.py @@ -91,13 +91,24 @@ class Ui_Dialog(object): 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, + self.webLink = QtGui.QLabel(self.groupBox) + self.webLink.setFont(font) + self.webLink.setObjectName("lblLink") + self.webLink.setText(QtGui.QApplication.translate("Dialog", "Relational's website", None,)) + self.webLink.setOpenExternalLinks(True) + self.webLink.setTextFormat(QtCore.Qt.AutoText) + self.webLink.setTextInteractionFlags( + QtCore.Qt.LinksAccessibleByKeyboard | + QtCore.Qt.LinksAccessibleByMouse | + QtCore.Qt.TextBrowserInteraction | + QtCore.Qt.TextSelectableByKeyboard | + QtCore.Qt.TextSelectableByMouse + ) + + self.verticalLayout_7.addWidget(self.webLink) + + - QtGui.QApplication.UnicodeUTF8)) self.tabWidget.addTab(self.tab_2,"") self.verticalLayout_2.addWidget(self.tabWidget) self.buttonBox = QtGui.QDialogButtonBox(Dialog) @@ -119,12 +130,14 @@ class Ui_Dialog(object): self.label_3.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) self.groupBox_3.setTitle(QtGui.QApplication.translate("Dialog", "Author", None, QtGui.QApplication.UnicodeUTF8)) if os.name=='nt': #Differentiates acknowledgements depending on the system - self.label_2.setText(QtGui.QApplication.translate("Dialog", "Salvo \"LtWorf\" Tomaselli \nEmilio Di Prima (For the windows version)", None, QtGui.QApplication.UnicodeUTF8)) + self.label_2.setText(QtGui.QApplication.translate("Dialog", "Salvo \"LtWorf\" Tomaselli <tiposchi@tiscali.it>
Emilio Di Prima <emiliodiprima [at] msn [dot] com> (For the windows version)", None, QtGui.QApplication.UnicodeUTF8)) else: - self.label_2.setText(QtGui.QApplication.translate("Dialog", "Salvo \"LtWorf\" Tomaselli ", None, QtGui.QApplication.UnicodeUTF8)) + self.label_2.setText(QtGui.QApplication.translate("Dialog", "Salvo \"LtWorf\" Tomaselli <tiposchi@tiscali.it>", None, QtGui.QApplication.UnicodeUTF8)) + self.label_2.setOpenExternalLinks (True) self.label_2.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) self.groupBox_2.setTitle(QtGui.QApplication.translate("Dialog", "Links", None, QtGui.QApplication.UnicodeUTF8)) - self.label_4.setText(QtGui.QApplication.translate("Dialog", "http://galileo.dmi.unict.it/wiki/relational/", None, QtGui.QApplication.UnicodeUTF8)) + self.label_4.setText(QtGui.QApplication.translate("Dialog", "http://galileo.dmi.unict.it/wiki/relational/", None, QtGui.QApplication.UnicodeUTF8)) + self.label_4.setOpenExternalLinks (True) self.label_4.setTextInteractionFlags(QtCore.Qt.LinksAccessibleByMouse|QtCore.Qt.TextSelectableByMouse) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), QtGui.QApplication.translate("Dialog", "About", None, QtGui.QApplication.UnicodeUTF8)) self.textEdit.setHtml(QtGui.QApplication.translate("Dialog", "\n" diff --git a/relational_readline/linegui.py b/relational_readline/linegui.py index 4b054bb..097e826 100644 --- a/relational_readline/linegui.py +++ b/relational_readline/linegui.py @@ -122,6 +122,7 @@ def help(command): print 'To execute a query:\n[relation =] query\nIf the 1st part is omitted, the result will be stored in the relation last_.' print 'To prevent from printing the relation, append a ; to the end of the query.' print 'To insert relational operators, type _OPNAME, they will be internally replaced with the correct symbol.' + print 'Rember: the tab key is enabled and can be very helpful if you can\'t remember something.' return cmd=p[1] @@ -218,7 +219,6 @@ def replacements(query): def exec_query(command): '''This function executes a query and prints the result on the screen if the command terminates with ";" the result will not be printed - ''' #If it terminates with ; doesn't print the result