Skip to content

Commit 162e47e

Browse files
dlechdlech
committed
Updates for GRX 3.0.0
1 parent 31c82d8 commit 162e47e

15 files changed

Lines changed: 58 additions & 54 deletions

‎demo/UiDemoWindow.vala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ namespace Ev3devKit.Demo {
8787

8888
internal override bool key_pressed (uint key_code) {
8989
// ignore back button otherwise we end up with no windows in the stack
90-
if (key_code == Key.BackSpace)
90+
if (key_code == Key.BACK_SPACE)
9191
return false;
9292
return base.key_pressed (key_code);
9393
}
@@ -164,9 +164,9 @@ namespace Ev3devKit.Demo {
164164
child3_box.add (child3_message);
165165

166166
var child1_handler_id = child1_box.key_pressed.connect ((key_code) => {
167-
if (key_code == Key.Left) {
167+
if (key_code == Key.LEFT) {
168168
stack.active_child = child3_box;
169-
} else if (key_code == Key.Right) {
169+
} else if (key_code == Key.RIGHT) {
170170
stack.active_child = child2_box;
171171
} else {
172172
return false;
@@ -176,9 +176,9 @@ namespace Ev3devKit.Demo {
176176
return true;
177177
});
178178
var child2_handler_id = child2_box.key_pressed.connect ((key_code) => {
179-
if (key_code == Key.Left) {
179+
if (key_code == Key.LEFT) {
180180
stack.active_child = child1_box;
181-
} else if (key_code == Key.Right) {
181+
} else if (key_code == Key.RIGHT) {
182182
stack.active_child = child3_box;
183183
} else {
184184
return false;
@@ -188,9 +188,9 @@ namespace Ev3devKit.Demo {
188188
return true;
189189
});
190190
var child3_handler_id = child3_box.key_pressed.connect ((key_code) => {
191-
if (key_code == Key.Left) {
191+
if (key_code == Key.LEFT) {
192192
stack.active_child = child2_box;
193-
} else if (key_code == Key.Right) {
193+
} else if (key_code == Key.RIGHT) {
194194
stack.active_child = child1_box;
195195
} else {
196196
return false;

‎demo/python/ui_demo.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232

3333
def do_activate(app):
34+
app.hold()
3435
demo_window = UiDemoWindow()
3536
demo_window.connect('quit', lambda _: app.quit())
3637
demo_window.show()

‎demo/python/ui_demo_window.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def __init__(self):
8080

8181
def do_key_pressed(self, window, key_code):
8282
# ignore the backspace key press
83-
if key_code == Grx.KEY_BackSpace:
83+
if key_code == Grx.Key.BACK_SPACE:
8484
GObject.signal_stop_emission_by_name(self, 'key-pressed')
8585
return True
8686
return False
@@ -160,9 +160,9 @@ def on_stack_menu_item_pressed(self, button):
160160
child3_box.add(child3_message)
161161

162162
def child1_key_pressed_handler(widget, key_code):
163-
if key_code == Grx.KEY_Left:
163+
if key_code == Grx.Key.LEFT:
164164
stack.set_active_child(child3_box)
165-
elif key_code == Grx.KEY_Right:
165+
elif key_code == Grx.Key.RIGHT:
166166
stack.set_active_child(child2_box)
167167
else:
168168
return False
@@ -175,9 +175,9 @@ def child1_key_pressed_handler(widget, key_code):
175175
child1_key_pressed_handler)
176176

177177
def child2_key_pressed_handler(widget, key_code):
178-
if key_code == Grx.KEY_Left:
178+
if key_code == Grx.Key.LEFT:
179179
stack.set_active_child(child1_box)
180-
elif key_code == Grx.KEY_Right:
180+
elif key_code == Grx.Key.RIGHT:
181181
stack.set_active_child(child3_box)
182182
else:
183183
return False
@@ -190,9 +190,9 @@ def child2_key_pressed_handler(widget, key_code):
190190
child2_key_pressed_handler)
191191

192192
def child3_key_pressed_handler(widget, key_code):
193-
if key_code == Grx.KEY_Left:
193+
if key_code == Grx.Key.LEFT:
194194
stack.set_active_child(child2_box)
195-
elif key_code == Grx.KEY_Right:
195+
elif key_code == Grx.Key.RIGHT:
196196
stack.set_active_child(child1_box)
197197
else:
198198
return False

‎demo/ui_demo.vala‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ namespace Ev3devKit.Demo {
3030
var app = new ConsoleApp ();
3131

3232
var activate_id = app.activate.connect (() => {
33+
app.hold ();
3334
var demo_window = new UiDemoWindow ();
3435
demo_window.quit.connect (app.quit);
3536
demo_window.show ();

‎src/ConsoleApp.vala‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,12 @@ namespace Ev3devKit {
7070
Ui.Screen.active_screen = new Ui.Screen ();
7171
}
7272

73-
public override void input_event (Grx.Event event) {
73+
public override bool event (Grx.Event event) {
7474
if (event.type == Grx.EventType.KEY_DOWN) {
7575
Ui.Screen.active_screen.queue_key_code (event.key.keysym);
76+
return true;
7677
}
78+
return false;
7779
}
7880
}
7981
}

‎src/ui/Button.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ namespace Ev3devKit.Ui {
9999
* Default handler for the key_pressed signal.
100100
*/
101101
internal override bool key_pressed (uint key_code) {
102-
if (key_code == Key.Return) {
102+
if (key_code == Key.RETURN) {
103103
pressed ();
104104
Signal.stop_emission_by_name (this, "key-pressed");
105105
return true;

‎src/ui/CheckButton.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ namespace Ev3devKit.Ui {
196196
* Default handler for the key_pressed signal.
197197
*/
198198
internal override bool key_pressed (uint key_code) {
199-
if (key_code == Key.Return) {
199+
if (key_code == Key.RETURN) {
200200
if (check_button_type == CheckButtonType.CHECKBOX)
201201
checked = !checked;
202202
else

‎src/ui/InputDialog.vala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ namespace Ev3devKit.Ui {
9292
* Default handler for the key_pressed signal.
9393
*/
9494
protected override bool key_pressed (uint key_code) {
95-
if (key_code == Grx.Key.BackSpace) {
95+
if (key_code == Grx.Key.BACK_SPACE) {
9696
Signal.stop_emission_by_name (this, "key-pressed");
9797
on_cancel_button_pressed ();
9898
return true;

‎src/ui/MessageDialog.vala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ namespace Ev3devKit.Ui {
7676
*/
7777
public override bool key_pressed (uint key_code) {
7878
switch (key_code) {
79-
case Key.Up:
79+
case Key.UP:
8080
vscroll.scroll_backward ();
8181
break;
82-
case Key.Down:
82+
case Key.DOWN:
8383
vscroll.scroll_forward ();
8484
break;
85-
case Key.Return:
86-
return base.key_pressed (Key.BackSpace);
85+
case Key.RETURN:
86+
return base.key_pressed (Key.BACK_SPACE);
8787
default:
8888
return base.key_pressed (key_code);
8989
}

‎src/ui/OnScreenKeyboard.vala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@ namespace Ev3devKit.Ui {
107107
}
108108
});
109109
text_entry.key_pressed.connect ((key_code) => {
110-
if (key_code == Key.Up)
110+
if (key_code == Key.UP)
111111
text_entry.focus_next (FocusDirection.UP);
112-
else if (key_code == Key.Down)
112+
else if (key_code == Key.DOWN)
113113
text_entry.focus_next (FocusDirection.DOWN);
114-
else if (key_code == Key.BackSpace)
114+
else if (key_code == Key.BACK_SPACE)
115115
text_entry.delete_char (true);
116-
else if (key_code != Key.Return)
116+
else if (key_code != Key.RETURN)
117117
return false;
118118
Signal.stop_emission_by_name (text_entry, "key-pressed");
119119
return true;
@@ -371,9 +371,9 @@ namespace Ev3devKit.Ui {
371371
* Default handler for the key_pressed signal.
372372
*/
373373
internal override bool key_pressed (uint key_code) {
374-
if (key_code == Key.BackSpace)
374+
if (key_code == Key.BACK_SPACE)
375375
text_entry.delete_char (true);
376-
else if (key_code == Key.Delete)
376+
else if (key_code == Key.DELETE)
377377
text_entry.delete_char ();
378378
else if (key_code >= 32 && key_code < 127)
379379
set_char ((char)key_code);

0 commit comments

Comments
 (0)