Skip to content

Commit 7f3020f

Browse files
LegoStormtrooprLegoStormtroopr
committed
Merge pull request #20 from LegoStormtroopr/0.2.5-motley-clue
0.2.5 motley clue
2 parents 9bb89d4 + f5edc19 commit 7f3020f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+211
-39
lines changed

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ widgets:
1111
pyuic4 ui/bulkQuestionEditor.ui -o SQBLWidgets/sqblUI/bulkQuestionEditor.py
1212
pyuic4 ui/conditionalTree.ui -o SQBLWidgets/sqblUI/conditionalTree.py
1313
pyuic4 ui/conditionalTreeText.ui -o SQBLWidgets/sqblUI/conditionalTreeText.py
14+
pyuic4 ui/derivedDataItems.ui -o SQBLWidgets/sqblUI/derivedDataItems.py
1415
pyuic4 ui/languagePicker.ui -o SQBLWidgets/sqblUI/languagePicker.py
1516
pyuic4 ui/logicNodeText.ui -o SQBLWidgets/sqblUI/logicNodeText.py
1617
pyuic4 ui/logicNodeText.ui -o SQBLWidgets/sqblUI/logicNodeText.py
@@ -39,6 +40,7 @@ widgets:
3940
pyuic4 ui/unsupportedWidget.ui -o SQBLWidgets/sqblUI/unsupportedWidget.py
4041
pyuic4 ui/wordSub.ui -o SQBLWidgets/sqblUI/wordSub.py
4142
pyuic4 ui/wordSubText.ui -o SQBLWidgets/sqblUI/wordSubText.py
43+
pyuic4 ui/wordSubstitutions.ui -o SQBLWidgets/sqblUI/wordSubstitutions.py
4244

4345
#x.py: X.ui
4446
# pyuic ui/X.ui -o SQBLWidgets/sqblUI/x.py

‎SQBLWidgets/SQBLWidgets.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ class UnsupportedWidget(SQBLWidget,sqblUI.unsupportedWidget.Ui_Form):
1717
def __init__(self):
1818
SQBLWidget.__init__(self,None,None)
1919

20+
class WordSubstitutions(SQBLWidget,sqblUI.wordSubstitutions.Ui_Form):
21+
def __init__(self):
22+
SQBLWidget.__init__(self,None,None)
23+
24+
class DerivedDataItems(SQBLWidget,sqblUI.derivedDataItems.Ui_Form):
25+
def __init__(self):
26+
SQBLWidget.__init__(self,None,None)
27+
2028
class BulkQuestionEditor(SQBLWeirdThingWidget, sqblUI.bulkQuestionEditor.Ui_Form):
2129
def __init__(self,element,model):
2230
SQBLWeirdThingWidget.__init__(self,element,model,langXPath="//")

‎SQBLWidgets/sqblUI/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import bulkQuestionEditor
55
import conditionalTree
66
import conditionalTreeText
7+
import derivedDataItems
78
import languagePicker
89
import logicNodeText
910
import loopFor
@@ -32,4 +33,6 @@
3233
import unsupportedWidget
3334
import wordSub
3435
import wordSubText
36+
import wordSubstitutions
37+
3538
#import canard_icons as icons

‎SQBLWidgets/sqblUI/branch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Form implementation generated from reading ui file 'ui/branch.ui'
44
#
5-
# Created: Sun Nov 30 11:26:54 2014
5+
# Created: Sat Jul 25 12:16:37 2015
66
# by: PyQt4 UI code generator 4.9.1
77
#
88
# WARNING! All changes made in this file will be lost!

‎SQBLWidgets/sqblUI/bulkQuestionEditor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Form implementation generated from reading ui file 'ui/bulkQuestionEditor.ui'
44
#
5-
# Created: Sun Nov 30 11:26:55 2014
5+
# Created: Sat Jul 25 12:16:38 2015
66
# by: PyQt4 UI code generator 4.9.1
77
#
88
# WARNING! All changes made in this file will be lost!

‎SQBLWidgets/sqblUI/canard_rc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Resource object code
44
#
5-
# Created: Sun Nov 30 11:27:22 2014
5+
# Created: Sat Jul 25 12:17:20 2015
66
# by: The Resource Compiler for PyQt (Qt v4.8.1)
77
#
88
# WARNING! All changes made in this file will be lost!

‎SQBLWidgets/sqblUI/conditionalTree.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Form implementation generated from reading ui file 'ui/conditionalTree.ui'
44
#
5-
# Created: Sun Nov 30 11:26:56 2014
5+
# Created: Sat Jul 25 12:16:39 2015
66
# by: PyQt4 UI code generator 4.9.1
77
#
88
# WARNING! All changes made in this file will be lost!

‎SQBLWidgets/sqblUI/conditionalTreeText.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Form implementation generated from reading ui file 'ui/conditionalTreeText.ui'
44
#
5-
# Created: Sun Nov 30 11:26:57 2014
5+
# Created: Sat Jul 25 12:16:40 2015
66
# by: PyQt4 UI code generator 4.9.1
77
#
88
# WARNING! All changes made in this file will be lost!

‎SQBLWidgets/sqblUI/derivedDataItems.py

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# -*- coding: utf-8 -*-
2+
3+
# Form implementation generated from reading ui file 'ui/derivedDataItems.ui'
4+
#
5+
# Created: Sat Jul 25 12:16:42 2015
6+
# by: PyQt4 UI code generator 4.9.1
7+
#
8+
# WARNING! All changes made in this file will be lost!
9+
10+
from PyQt4 import QtCore, QtGui
11+
12+
try:
13+
_fromUtf8 = QtCore.QString.fromUtf8
14+
except AttributeError:
15+
_fromUtf8 = lambda s: s
16+
17+
class Ui_Form(object):
18+
def setupUi(self, Form):
19+
Form.setObjectName(_fromUtf8("Form"))
20+
Form.resize(400, 300)
21+
self.verticalLayout = QtGui.QVBoxLayout(Form)
22+
self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
23+
self.label = QtGui.QLabel(Form)
24+
self.label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
25+
self.label.setWordWrap(True)
26+
self.label.setMargin(15)
27+
self.label.setObjectName(_fromUtf8("label"))
28+
self.verticalLayout.addWidget(self.label)
29+
30+
self.retranslateUi(Form)
31+
QtCore.QMetaObject.connectSlotsByName(Form)
32+
33+
def retranslateUi(self, Form):
34+
Form.setWindowTitle(QtGui.QApplication.translate("Form", "Form", None, QtGui.QApplication.UnicodeUTF8))
35+
self.label.setText(QtGui.QApplication.translate("Form", "<html><head/><body><p>Right click on \"Derived Data Items\" in the \"Module Components\" pane to add a new derived data item.</p>\n"
36+
"<!-- p>Alternatively, you can use the keyboard shortcut: <tt>Crtl+Shift+W</tt></p --></body></html>", None, QtGui.QApplication.UnicodeUTF8))
37+

‎SQBLWidgets/sqblUI/languagePicker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Form implementation generated from reading ui file 'ui/languagePicker.ui'
44
#
5-
# Created: Sun Nov 30 11:26:58 2014
5+
# Created: Sat Jul 25 12:16:43 2015
66
# by: PyQt4 UI code generator 4.9.1
77
#
88
# WARNING! All changes made in this file will be lost!

0 commit comments

Comments
 (0)