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

Forget about sessions for now

Browse Source
This commit is contained in:
Salvo 'LtWorf' Tomaselli
2013-12-27 00:17:19 +01:00
parent 5e4a703f56
commit f31d0dea28
7 changed files with 88 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
relational_gui/maingui.py
View File

@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'relational_gui/maingui.ui'
#
# Created: Sun Jun 30 11:47:05 2013
# by: PyQt4 UI code generator 4.10.2
# Created: Fri Dec 27 00:05:54 2013
# by: PyQt4 UI code generator 4.10.3
#
# WARNING! All changes made in this file will be lost!
@@ -213,7 +213,7 @@ class Ui_MainWindow(object):
self.verticalLayout_7.addLayout(self.horizontalLayout_2)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtGui.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 20))
self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 19))
self.menubar.setObjectName(_fromUtf8("menubar"))
self.menuFile = QtGui.QMenu(self.menubar)
self.menuFile.setObjectName(_fromUtf8("menuFile"))
@@ -221,8 +221,6 @@ class Ui_MainWindow(object):
self.menuAbout.setObjectName(_fromUtf8("menuAbout"))
self.action = QtGui.QAction(MainWindow)
self.action.setObjectName(_fromUtf8("action"))
self.menuSession = QtGui.QMenu(self.menubar)
self.menuSession.setObjectName(_fromUtf8("menuSession"))
self.menuRelations = QtGui.QMenu(self.menubar)
self.menuRelations.setObjectName(_fromUtf8("menuRelations"))
MainWindow.setMenuBar(self.menubar)
@@ -254,9 +252,6 @@ class Ui_MainWindow(object):
self.menuFile.addAction(self.action_Quit)
self.menuAbout.addAction(self.actionAbout)
self.menuAbout.addAction(self.actionCheck_for_new_versions)
self.menuSession.addAction(self.actionNew_session)
self.menuSession.addAction(self.actionSave_session_as)
self.menuSession.addAction(self.actionManage_sessions)
self.menuRelations.addAction(self.actionNew_relation)
self.menuRelations.addAction(self.action_Load_relation)
self.menuRelations.addAction(self.action_Save_relation)
@@ -264,7 +259,6 @@ class Ui_MainWindow(object):
self.menuRelations.addAction(self.actionUnload_relation)
self.menubar.addAction(self.menuFile.menuAction())
self.menubar.addAction(self.menuRelations.menuAction())
self.menubar.addAction(self.menuSession.menuAction())
self.menubar.addAction(self.menuAbout.menuAction())
self.label.setBuddy(self.txtQuery)
@@ -307,9 +301,6 @@ class Ui_MainWindow(object):
QtCore.QObject.connect(self.actionEdit_relation, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWindow.editRelation)
QtCore.QObject.connect(self.cmdNew, QtCore.SIGNAL(_fromUtf8("clicked()")), MainWindow.newRelation)
QtCore.QObject.connect(self.actionNew_relation, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWindow.newRelation)
QtCore.QObject.connect(self.actionManage_sessions, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWindow.manageSessions)
QtCore.QObject.connect(self.actionNew_session, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWindow.newSession)
QtCore.QObject.connect(self.actionSave_session_as, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWindow.saveSessionAs)
QtCore.QObject.connect(self.actionUnload_relation, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWindow.unloadRelation)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
MainWindow.setTabOrder(self.cmdAbout, self.cmdSurvey)
@@ -389,7 +380,6 @@ class Ui_MainWindow(object):
self.cmdExecute.setText(_translate("MainWindow", "Execute", None))
self.menuFile.setTitle(_translate("MainWindow", "&File", None))
self.menuAbout.setTitle(_translate("MainWindow", "&Help", None))
self.menuSession.setTitle(_translate("MainWindow", "Session", None))
self.menuRelations.setTitle(_translate("MainWindow", "Relations", None))
self.actionAbout.setText(_translate("MainWindow", "&About", None))
self.action_Load_relation.setText(_translate("MainWindow", "&Load relation", None))

59
relational_gui/maingui.ui
View File

@@ -455,7 +455,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
<height>20</height>
<height>19</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -473,14 +473,6 @@
<addaction name="actionAbout"/>
<addaction name="actionCheck_for_new_versions"/>
</widget>
<widget class="QMenu" name="menuSession">
<property name="title">
<string>Session</string>
</property>
<addaction name="actionNew_session"/>
<addaction name="actionSave_session_as"/>
<addaction name="actionManage_sessions"/>
</widget>
<widget class="QMenu" name="menuRelations">
<property name="title">
<string>Relations</string>
@@ -493,7 +485,6 @@
</widget>
<addaction name="menuFile"/>
<addaction name="menuRelations"/>
<addaction name="menuSession"/>
<addaction name="menuAbout"/>
</widget>
<action name="actionAbout">
@@ -1217,54 +1208,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>actionManage_sessions</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>manageSessions()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>399</x>
<y>305</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionNew_session</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>newSession()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>399</x>
<y>305</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionSave_session_as</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>saveSessionAs()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>399</x>
<y>305</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionUnload_relation</sender>
<signal>triggered()</signal>

29
relational_gui/rel_edit.py
View File

@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'relational_gui/rel_edit.ui'
#
# Created: Sat Oct 22 15:25:32 2011
# by: PyQt4 UI code generator 4.8.3
# Created: Fri Dec 27 00:05:54 2013
# by: PyQt4 UI code generator 4.10.3
#
# WARNING! All changes made in this file will be lost!
@@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui
try:
_fromUtf8 = QtCore.QString.fromUtf8
except AttributeError:
_fromUtf8 = lambda s: s
def _fromUtf8(s):
return s
try:
_encoding = QtGui.QApplication.UnicodeUTF8
def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig, _encoding)
except AttributeError:
def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig)
class Ui_Dialog(object):
def setupUi(self, Dialog):
@@ -64,11 +73,11 @@ class Ui_Dialog(object):
QtCore.QMetaObject.connectSlotsByName(Dialog)
def retranslateUi(self, Dialog):
Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", "Relation editor", None, QtGui.QApplication.UnicodeUTF8))
self.groupBox.setTitle(QtGui.QApplication.translate("Dialog", "Edit", None, QtGui.QApplication.UnicodeUTF8))
self.cmdAddTuple.setText(QtGui.QApplication.translate("Dialog", "Add tuple", None, QtGui.QApplication.UnicodeUTF8))
self.cmdRemoveTuple.setText(QtGui.QApplication.translate("Dialog", "Remove tuple", None, QtGui.QApplication.UnicodeUTF8))
self.cmdAddColumn.setText(QtGui.QApplication.translate("Dialog", "Add column", None, QtGui.QApplication.UnicodeUTF8))
self.cmdRemoveColumn.setText(QtGui.QApplication.translate("Dialog", "Remove column", None, QtGui.QApplication.UnicodeUTF8))
self.label.setText(QtGui.QApplication.translate("Dialog", "Remember that new relations and modified relations are not automatically saved", None, QtGui.QApplication.UnicodeUTF8))
Dialog.setWindowTitle(_translate("Dialog", "Relation editor", None))
self.groupBox.setTitle(_translate("Dialog", "Edit", None))
self.cmdAddTuple.setText(_translate("Dialog", "Add tuple", None))
self.cmdRemoveTuple.setText(_translate("Dialog", "Remove tuple", None))
self.cmdAddColumn.setText(_translate("Dialog", "Add column", None))
self.cmdRemoveColumn.setText(_translate("Dialog", "Remove column", None))
self.label.setText(_translate("Dialog", "Remember that new relations and modified relations are not automatically saved", None))

37
relational_gui/survey.py
View File

@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'relational_gui/survey.ui'
#
# Created: Sat Oct 22 15:25:32 2011
# by: PyQt4 UI code generator 4.8.3
# Created: Fri Dec 27 00:05:54 2013
# by: PyQt4 UI code generator 4.10.3
#
# WARNING! All changes made in this file will be lost!
@@ -12,7 +12,16 @@ from PyQt4 import QtCore, QtGui
try:
_fromUtf8 = QtCore.QString.fromUtf8
except AttributeError:
_fromUtf8 = lambda s: s
def _fromUtf8(s):
return s
try:
_encoding = QtGui.QApplication.UnicodeUTF8
def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig, _encoding)
except AttributeError:
def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig)
class Ui_Form(object):
def setupUi(self, Form):
@@ -123,15 +132,15 @@ class Ui_Form(object):
Form.setTabOrder(self.cmdClear, self.cmdCancel)
def retranslateUi(self, Form):
Form.setWindowTitle(QtGui.QApplication.translate("Form", "Survey", None, QtGui.QApplication.UnicodeUTF8))
self.label.setText(QtGui.QApplication.translate("Form", "Country", None, QtGui.QApplication.UnicodeUTF8))
self.label_2.setText(QtGui.QApplication.translate("Form", "School", None, QtGui.QApplication.UnicodeUTF8))
self.label_3.setText(QtGui.QApplication.translate("Form", "Age", None, QtGui.QApplication.UnicodeUTF8))
self.label_4.setText(QtGui.QApplication.translate("Form", "How did you find relational", None, QtGui.QApplication.UnicodeUTF8))
self.label_5.setText(QtGui.QApplication.translate("Form", "System", None, QtGui.QApplication.UnicodeUTF8))
self.label_6.setText(QtGui.QApplication.translate("Form", "Comments", None, QtGui.QApplication.UnicodeUTF8))
self.label_7.setText(QtGui.QApplication.translate("Form", "Email (only if you want a reply)", None, QtGui.QApplication.UnicodeUTF8))
self.cmdCancel.setText(QtGui.QApplication.translate("Form", "Cancel", None, QtGui.QApplication.UnicodeUTF8))
self.cmdClear.setText(QtGui.QApplication.translate("Form", "Clear", None, QtGui.QApplication.UnicodeUTF8))
self.cmdSend.setText(QtGui.QApplication.translate("Form", "Send", None, QtGui.QApplication.UnicodeUTF8))
Form.setWindowTitle(_translate("Form", "Survey", None))
self.label.setText(_translate("Form", "Country", None))
self.label_2.setText(_translate("Form", "School", None))
self.label_3.setText(_translate("Form", "Age", None))
self.label_4.setText(_translate("Form", "How did you find relational", None))
self.label_5.setText(_translate("Form", "System", None))
self.label_6.setText(_translate("Form", "Comments", None))
self.label_7.setText(_translate("Form", "Email (only if you want a reply)", None))
self.cmdCancel.setText(_translate("Form", "Cancel", None))
self.cmdClear.setText(_translate("Form", "Clear", None))
self.cmdSend.setText(_translate("Form", "Send", None))