Skip to content

Commit df13360

Browse files
committed
qtvcp -entry_widget - add spacebar into keyboard
Jim (Persei from forum) noticed and fixed this oversight. Thanks!
1 parent d0d35ca commit df13360

1 file changed

Lines changed: 10 additions & 28 deletions

File tree

lib/python/qtvcp/widgets/entry_widget.py

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -96,34 +96,35 @@ def do_layout(self, keyboard_type='default'):
9696

9797
control_widget_list = []
9898

99-
button = MyFlatPushButton('Up')
99+
button = MyFlatPushButton('LINE\nUP')
100100
button.setToolTip('Cursor Up')
101101
button.KEY_CHAR = QtCore.Qt.Key_Up
102102
control_widget_list.append(button)
103-
control_widget_list.append('sep')
104103

105-
button = MyFlatPushButton('Down')
104+
button = MyFlatPushButton('LINE\nDOWN')
106105
button.setToolTip('Cursor Down')
107106
button.KEY_CHAR = QtCore.Qt.Key_Down
108107
control_widget_list.append(button)
109-
control_widget_list.append('sep')
108+
109+
# space
110+
button = MyFlatPushButton('SPACE', min_size=(160, 50))
111+
button.KEY_CHAR = QtCore.Qt.Key_Space
112+
control_widget_list.append(button)
110113

111114
# back space
112-
button = MyFlatPushButton('<B')
115+
button = MyFlatPushButton('BACK')
113116
button.setToolTip('Backspace')
114117
button.KEY_CHAR = QtCore.Qt.Key_Backspace
115118
control_widget_list.append(button)
116-
control_widget_list.append('sep')
117119

118120
# close
119-
button = MyFlatPushButton('Close')
121+
button = MyFlatPushButton('CLOSE')
120122
button.setToolTip('Close Keyboard')
121123
button.KEY_CHAR = QtCore.Qt.Key_Escape
122124
control_widget_list.append(button)
123-
control_widget_list.append('sep')
124125

125126
# enter
126-
button = MyFlatPushButton('Enter', min_size=(100, 50))
127+
button = MyFlatPushButton('ENTER', min_size=(105, 50))
127128
button.setToolTip('Enter Command')
128129
button.KEY_CHAR = QtCore.Qt.Key_Enter
129130
control_widget_list.append(button)
@@ -147,9 +148,6 @@ def do_layout(self, keyboard_type='default'):
147148
for widget in widget_list:
148149
if widget == 'new_row':
149150
col = MAX_COL
150-
elif widget == 'sep':
151-
tlist.append(self.get_vline())
152-
continue
153151
else:
154152
tlist.append(widget)
155153
widget.clicked.connect(self.signalMapper.map)
@@ -230,22 +228,6 @@ def update_panel_position(self):
230228
panelPos = widget.mapToGlobal(panelPos)
231229
self.move(panelPos)
232230

233-
def _get_line(self, vertical=True):
234-
line = QtWidgets.QFrame()
235-
line.setContentsMargins(0, 0, 0, 0)
236-
if vertical is True:
237-
line.setFrameShape(line.VLine)
238-
else:
239-
line.setFrameShape(line.HLine)
240-
line.setFrameShadow(line.Sunken)
241-
return line
242-
243-
def get_hline(self):
244-
return self._get_line(vertical=False)
245-
246-
def get_vline(self):
247-
return self._get_line()
248-
249231

250232
# a widget that calls our keyboard dialog
251233
class TouchInterface(QtWidgets.QWidget):

0 commit comments

Comments
 (0)