diff --git a/Makefile b/Makefile index ff5ca8d..8111dc3 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,7 @@ dist: clean rm -rf /tmp/relational/mac/.svn/ rm -rf /tmp/relational/relational/.svn/ rm -rf /tmp/relational/relational_gui/.svn/ + rm -rf /tmp/relational/relational_pyside/.svn/ rm -rf /tmp/relational/mac rm -rf /tmp/relational/debian/ rm -rf /tmp/relational/relational_curses/.svn/ @@ -47,7 +48,7 @@ dist: clean #mv /tmp/relational /tmp/relational-`./relational_gui.py -v | grep Relational | cut -d" " -f2` #(cd /tmp; tar -zcf relational.tar.gz relational-*/) (cd /tmp; tar -zcf relational.tar.gz relational/) - mv /tmp/relational.tar.gz ./relational_`./relational_gui.py -v | grep Relational | cut -d" " -f2`.tar.gz + mv /tmp/relational.tar.gz ./relational_`./relational_gui.py -v | grep Relational | cut -d" " -f2`.orig.tar.gz clean: rm -rf *~ || echo ok diff --git a/debian/changelog b/debian/changelog index eaebae8..424d7af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +relational (1.1-1) unstable; urgency=low + + * New upstream release + * Can use either PyQt or PySide + + -- Salvo 'LtWorf' Tomaselli Thu, 13 Oct 2011 21:41:57 +0200 + relational (1.0-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index 2a83ce3..e33ee5b 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: math Priority: optional Maintainer: Salvo 'LtWorf' Tomaselli Build-Depends: debhelper (>= 7.0.50~), python, python-support -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://galileo.dmi.unict.it/wiki/relational/doku.php Package: python-relational @@ -19,13 +19,13 @@ Description: Educational tool for relational algebra (standalone module) Package: relational Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-relational (>= ${binary:Version}), python-qt4 +Depends: ${misc:Depends}, ${python:Depends}, python-relational (>= ${binary:Version}), python-qt4 | python-pyside.qtgui, python-qt4 | python-pyside.qtcore, python-qt4 | python-pyside.qtwebkit Description: Educational tool for relational algebra (graphical user interface) Relational is primarily a tool to provide a workspace for experimenting with relational algebra, an offshoot of first-order logic. . - This package provides a graphical user interface that can be used for - executing relational queries. + This package provides a graphical user interface that can be used to + execute relational queries. Package: relational-cli Architecture: all @@ -34,5 +34,5 @@ Description: Educational tool for relational algebra (command line interface) Relational is primarily a tool to provide a workspace for experimenting with relational algebra, an offshoot of first-order logic. . - This package provides a command line interface that can be used for - executing relational queries. + This package provides a command line interface that can be used to + execute relational queries. diff --git a/relational.1 b/relational.1 index 922afaa..11570f1 100644 --- a/relational.1 +++ b/relational.1 @@ -1,4 +1,4 @@ -.TH "Relational" "1.1" +.TH "Relational" 1 "Oct 13, 2011" "Relational algebra learning tool" .SH "NAME" relational \(em Python implementation of Relational algebra. .SH "SYNOPSIS" diff --git a/relational_gui/creator.py b/relational_gui/creator.py index 187122d..490333e 100644 --- a/relational_gui/creator.py +++ b/relational_gui/creator.py @@ -125,8 +125,11 @@ class creatorForm(QtGui.QDialog): pass - -def editRelation(rel=None): +def edit_relation(rel=None): + '''Opens the editor for the given relation and returns a _new_ relation + containing the new relation. + If the user cancels, it returns None''' + ui = rel_edit.Ui_Dialog() Form = creatorForm(rel) @@ -141,4 +144,4 @@ if __name__ == '__main__': import sys app = QtGui.QApplication(sys.argv) r=relation.relation("/home/salvo/dev/relational/trunk/samples/people.csv") - print editRelation(r) + print edit_relation(r) diff --git a/relational_gui/guihandler.py b/relational_gui/guihandler.py index 081a029..bfd3bcb 100644 --- a/relational_gui/guihandler.py +++ b/relational_gui/guihandler.py @@ -165,13 +165,13 @@ class relForm(QtGui.QMainWindow): def editRelation(self): import creator for i in self.ui.lstRelations.selectedItems(): - result=creator.editRelation(self.relations[compatibility.get_py_str(i.text())]) + result=creator.edit_relation(self.relations[compatibility.get_py_str(i.text())]) if result!=None: self.relations[compatibility.get_py_str(i.text())]=result self.updateRelations() def newRelation(self): import creator - result=creator.editRelation() + result=creator.edit_relation() if result==None: return diff --git a/relational_gui/maingui.py b/relational_gui/maingui.py index 58939cd..5e4f050 100644 --- a/relational_gui/maingui.py +++ b/relational_gui/maingui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'relational_gui/maingui.ui' # -# Created: Thu Oct 13 20:42:44 2011 +# Created: Thu Oct 13 21:38:18 2011 # by: PyQt4 UI code generator 4.8.3 # # WARNING! All changes made in this file will be lost! diff --git a/relational_gui/survey.py b/relational_gui/survey.py index 7dfb1c9..b9f57f7 100644 --- a/relational_gui/survey.py +++ b/relational_gui/survey.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'relational_gui/survey.ui' # -# Created: Thu Oct 13 20:42:44 2011 +# Created: Thu Oct 13 21:38:18 2011 # by: PyQt4 UI code generator 4.8.3 # # WARNING! All changes made in this file will be lost! diff --git a/relational_pyside/maingui.py b/relational_pyside/maingui.py index 44a4be8..e5b58f5 100644 --- a/relational_pyside/maingui.py +++ b/relational_pyside/maingui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'relational_pyside/maingui.ui' # -# Created: Thu Oct 13 20:42:44 2011 +# Created: Thu Oct 13 21:38:18 2011 # by: pyside-uic 0.2.13 running on PySide 1.0.7 # # WARNING! All changes made in this file will be lost! diff --git a/relational_pyside/survey.py b/relational_pyside/survey.py index 5135ea5..4e6d7bc 100644 --- a/relational_pyside/survey.py +++ b/relational_pyside/survey.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'relational_pyside/survey.ui' # -# Created: Thu Oct 13 20:42:44 2011 +# Created: Thu Oct 13 21:38:18 2011 # by: pyside-uic 0.2.13 running on PySide 1.0.7 # # WARNING! All changes made in this file will be lost! diff --git a/setup/relational.setup.py b/setup/relational.setup.py index 83c7bfb..66d14fe 100644 --- a/setup/relational.setup.py +++ b/setup/relational.setup.py @@ -19,4 +19,5 @@ import installer_common -installer_common.c_setup('relational_gui') \ No newline at end of file +installer_common.c_setup('relational_gui') +installer_common.c_setup('relational_pyside') \ No newline at end of file