Skip to content

Commit 9cd68b0

Browse files
walkermattwalkermatt
committed
Incorporate UI changes by @geosmiles inc. vertical scrollbar
1 parent 6dd2c7f commit 9cd68b0

File tree

4 files changed

+76
-74
lines changed

4 files changed

+76
-74
lines changed

‎gazetteers/astun.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
from json import loads
22
from collections import namedtuple
33

4-
url = "http://test.astuntechnology.com/iShareLatest.web/getdata.aspx"
4+
url = "http://example.gov.uk/getdata.aspx"
55
params = {
66
'type': 'json',
77
'RequestType': 'LocationSearch',
88
'gettotals': 'true',
99
'axuid': '1344265603167',
10-
'mapsource': 'Workshop/MyHouse',
10+
'mapsource': 'Example/MyHouse',
1111
'_': '1344265603168',
1212
'location': '##searchstring##',
13-
'pagesize': '30',
13+
'pagesize': '100',
1414
'startnum': '1',
1515
}
1616

‎gazetteers/nominatim.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
url = "http://nominatim.openstreetmap.org/search"
55
params = {
66
'q': '##searchstring##',
7-
'limit': 50,
7+
'limit': 100,
88
'format': 'xml',
99
'addressdetails': 1
1010
}

‎ui_gazetteersearch.py

+39-34
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
# Form implementation generated from reading ui file 'ui_gazetteersearch.ui'
44
#
5-
# Created: Mon Aug 20 21:49:16 2012
6-
# by: PyQt4 UI code generator 4.8.3
5+
# Created: Fri Aug 15 11:34:36 2014
6+
# by: PyQt4 UI code generator 4.10.2
77
#
88
# WARNING! All changes made in this file will be lost!
99

@@ -12,12 +12,21 @@
1212
try:
1313
_fromUtf8 = QtCore.QString.fromUtf8
1414
except AttributeError:
15-
_fromUtf8 = lambda s: s
15+
def _fromUtf8(s):
16+
return s
17+
18+
try:
19+
_encoding = QtGui.QApplication.UnicodeUTF8
20+
def _translate(context, text, disambig):
21+
return QtGui.QApplication.translate(context, text, disambig, _encoding)
22+
except AttributeError:
23+
def _translate(context, text, disambig):
24+
return QtGui.QApplication.translate(context, text, disambig)
1625

1726
class Ui_gazetteerSearch(object):
1827
def setupUi(self, gazetteerSearch):
1928
gazetteerSearch.setObjectName(_fromUtf8("gazetteerSearch"))
20-
gazetteerSearch.resize(393, 452)
29+
gazetteerSearch.resize(674, 233)
2130
self.gridLayout = QtGui.QGridLayout(gazetteerSearch)
2231
self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
2332
self.label_3 = QtGui.QLabel(gazetteerSearch)
@@ -26,27 +35,7 @@ def setupUi(self, gazetteerSearch):
2635
self.label_3.setFont(font)
2736
self.label_3.setAlignment(QtCore.Qt.AlignCenter)
2837
self.label_3.setObjectName(_fromUtf8("label_3"))
29-
self.gridLayout.addWidget(self.label_3, 0, 0, 1, 4)
30-
self.label = QtGui.QLabel(gazetteerSearch)
31-
self.label.setObjectName(_fromUtf8("label"))
32-
self.gridLayout.addWidget(self.label, 1, 0, 1, 1)
33-
self.searchEdit = QtGui.QLineEdit(gazetteerSearch)
34-
self.searchEdit.setObjectName(_fromUtf8("searchEdit"))
35-
self.gridLayout.addWidget(self.searchEdit, 1, 1, 1, 1)
36-
self.label_2 = QtGui.QLabel(gazetteerSearch)
37-
self.label_2.setObjectName(_fromUtf8("label_2"))
38-
self.gridLayout.addWidget(self.label_2, 2, 0, 1, 1)
39-
self.gazzetterCombo = QtGui.QComboBox(gazetteerSearch)
40-
self.gazzetterCombo.setObjectName(_fromUtf8("gazzetterCombo"))
41-
self.gridLayout.addWidget(self.gazzetterCombo, 2, 1, 1, 1)
42-
self.line = QtGui.QFrame(gazetteerSearch)
43-
self.line.setFrameShape(QtGui.QFrame.HLine)
44-
self.line.setFrameShadow(QtGui.QFrame.Sunken)
45-
self.line.setObjectName(_fromUtf8("line"))
46-
self.gridLayout.addWidget(self.line, 3, 0, 1, 4)
47-
self.resultsList = QtGui.QListWidget(gazetteerSearch)
48-
self.resultsList.setObjectName(_fromUtf8("resultsList"))
49-
self.gridLayout.addWidget(self.resultsList, 4, 0, 1, 4)
38+
self.gridLayout.addWidget(self.label_3, 0, 0, 1, 5)
5039
self.goButton = QtGui.QPushButton(gazetteerSearch)
5140
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
5241
sizePolicy.setHorizontalStretch(0)
@@ -57,22 +46,38 @@ def setupUi(self, gazetteerSearch):
5746
font.setPointSize(9)
5847
self.goButton.setFont(font)
5948
self.goButton.setObjectName(_fromUtf8("goButton"))
60-
self.gridLayout.addWidget(self.goButton, 1, 3, 1, 1)
49+
self.gridLayout.addWidget(self.goButton, 1, 4, 1, 1)
6150
self.clearButton = QtGui.QPushButton(gazetteerSearch)
6251
self.clearButton.setCheckable(False)
6352
self.clearButton.setAutoRepeat(False)
6453
self.clearButton.setObjectName(_fromUtf8("clearButton"))
65-
self.gridLayout.addWidget(self.clearButton, 2, 3, 1, 1)
54+
self.gridLayout.addWidget(self.clearButton, 2, 4, 1, 1)
55+
self.searchEdit = QtGui.QLineEdit(gazetteerSearch)
56+
self.searchEdit.setObjectName(_fromUtf8("searchEdit"))
57+
self.gridLayout.addWidget(self.searchEdit, 1, 1, 1, 1)
58+
self.resultsList = QtGui.QListWidget(gazetteerSearch)
59+
self.resultsList.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
60+
self.resultsList.setObjectName(_fromUtf8("resultsList"))
61+
self.gridLayout.addWidget(self.resultsList, 4, 1, 1, 4)
62+
self.line = QtGui.QFrame(gazetteerSearch)
63+
self.line.setFrameShape(QtGui.QFrame.HLine)
64+
self.line.setFrameShadow(QtGui.QFrame.Sunken)
65+
self.line.setObjectName(_fromUtf8("line"))
66+
self.gridLayout.addWidget(self.line, 3, 1, 1, 4)
67+
self.gazzetterCombo = QtGui.QComboBox(gazetteerSearch)
68+
self.gazzetterCombo.setObjectName(_fromUtf8("gazzetterCombo"))
69+
self.gridLayout.addWidget(self.gazzetterCombo, 6, 1, 1, 1)
70+
self.label_2 = QtGui.QLabel(gazetteerSearch)
71+
self.label_2.setObjectName(_fromUtf8("label_2"))
72+
self.gridLayout.addWidget(self.label_2, 5, 1, 1, 1)
6673

6774
self.retranslateUi(gazetteerSearch)
6875
QtCore.QObject.connect(self.searchEdit, QtCore.SIGNAL(_fromUtf8("returnPressed()")), self.goButton.click)
6976
QtCore.QMetaObject.connectSlotsByName(gazetteerSearch)
7077

7178
def retranslateUi(self, gazetteerSearch):
72-
gazetteerSearch.setWindowTitle(QtGui.QApplication.translate("gazetteerSearch", "Form", None, QtGui.QApplication.UnicodeUTF8))
73-
self.label_3.setText(QtGui.QApplication.translate("gazetteerSearch", "Where would you like to go today?", None, QtGui.QApplication.UnicodeUTF8))
74-
self.label.setText(QtGui.QApplication.translate("gazetteerSearch", "Search for:", None, QtGui.QApplication.UnicodeUTF8))
75-
self.label_2.setText(QtGui.QApplication.translate("gazetteerSearch", "Gazetteer:", None, QtGui.QApplication.UnicodeUTF8))
76-
self.goButton.setText(QtGui.QApplication.translate("gazetteerSearch", "Go!", None, QtGui.QApplication.UnicodeUTF8))
77-
self.clearButton.setText(QtGui.QApplication.translate("gazetteerSearch", "Clear", None, QtGui.QApplication.UnicodeUTF8))
78-
79+
gazetteerSearch.setWindowTitle(_translate("gazetteerSearch", "Form", None))
80+
self.label_3.setText(_translate("gazetteerSearch", "Search for:", None))
81+
self.goButton.setText(_translate("gazetteerSearch", "Go!", None))
82+
self.clearButton.setText(_translate("gazetteerSearch", "Clear", None))
83+
self.label_2.setText(_translate("gazetteerSearch", "Gazetteer:", None))

‎ui_gazetteersearch.ui

+33-36
Original file line numberDiff line numberDiff line change
@@ -6,60 +6,30 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>393</width>
10-
<height>452</height>
9+
<width>674</width>
10+
<height>233</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17-
<item row="0" column="0" colspan="4">
17+
<item row="0" column="0" colspan="5">
1818
<widget class="QLabel" name="label_3">
1919
<property name="font">
2020
<font>
2121
<pointsize>15</pointsize>
2222
</font>
2323
</property>
2424
<property name="text">
25-
<string>Where would you like to go today?</string>
25+
<string>Search for:</string>
2626
</property>
2727
<property name="alignment">
2828
<set>Qt::AlignCenter</set>
2929
</property>
3030
</widget>
3131
</item>
32-
<item row="1" column="0">
33-
<widget class="QLabel" name="label">
34-
<property name="text">
35-
<string>Search for:</string>
36-
</property>
37-
</widget>
38-
</item>
39-
<item row="1" column="1">
40-
<widget class="QLineEdit" name="searchEdit"/>
41-
</item>
42-
<item row="2" column="0">
43-
<widget class="QLabel" name="label_2">
44-
<property name="text">
45-
<string>Gazetteer:</string>
46-
</property>
47-
</widget>
48-
</item>
49-
<item row="2" column="1">
50-
<widget class="QComboBox" name="gazzetterCombo"/>
51-
</item>
52-
<item row="3" column="0" colspan="4">
53-
<widget class="Line" name="line">
54-
<property name="orientation">
55-
<enum>Qt::Horizontal</enum>
56-
</property>
57-
</widget>
58-
</item>
59-
<item row="4" column="0" colspan="4">
60-
<widget class="QListWidget" name="resultsList"/>
61-
</item>
62-
<item row="1" column="3">
32+
<item row="1" column="4">
6333
<widget class="QPushButton" name="goButton">
6434
<property name="sizePolicy">
6535
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -77,7 +47,7 @@
7747
</property>
7848
</widget>
7949
</item>
80-
<item row="2" column="3">
50+
<item row="2" column="4">
8151
<widget class="QPushButton" name="clearButton">
8252
<property name="text">
8353
<string>Clear</string>
@@ -90,6 +60,33 @@
9060
</property>
9161
</widget>
9262
</item>
63+
<item row="1" column="1">
64+
<widget class="QLineEdit" name="searchEdit"/>
65+
</item>
66+
<item row="4" column="1" colspan="4">
67+
<widget class="QListWidget" name="resultsList">
68+
<property name="verticalScrollBarPolicy">
69+
<enum>Qt::ScrollBarAlwaysOn</enum>
70+
</property>
71+
</widget>
72+
</item>
73+
<item row="3" column="1" colspan="4">
74+
<widget class="Line" name="line">
75+
<property name="orientation">
76+
<enum>Qt::Horizontal</enum>
77+
</property>
78+
</widget>
79+
</item>
80+
<item row="6" column="1">
81+
<widget class="QComboBox" name="gazzetterCombo"/>
82+
</item>
83+
<item row="5" column="1">
84+
<widget class="QLabel" name="label_2">
85+
<property name="text">
86+
<string>Gazetteer:</string>
87+
</property>
88+
</widget>
89+
</item>
9390
</layout>
9491
</widget>
9592
<resources/>

0 commit comments

Comments
 (0)