|
@@ -94,6 +94,11 @@ static void hid_dialog_callback(DialogExResult result, void* context) {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+static uint32_t hid_menu_view(void* context) {
|
|
|
|
|
+ UNUSED(context);
|
|
|
|
|
+ return HidViewSubmenu;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
static uint32_t hid_exit_confirm_view(void* context) {
|
|
static uint32_t hid_exit_confirm_view(void* context) {
|
|
|
UNUSED(context);
|
|
UNUSED(context);
|
|
|
return HidViewExitConfirm;
|
|
return HidViewExitConfirm;
|
|
@@ -187,31 +192,31 @@ Hid* hid_app_alloc_view(void* context) {
|
|
|
|
|
|
|
|
// Keynote view
|
|
// Keynote view
|
|
|
app->hid_keynote = hid_keynote_alloc(app);
|
|
app->hid_keynote = hid_keynote_alloc(app);
|
|
|
- view_set_previous_callback(hid_keynote_get_view(app->hid_keynote), hid_exit_confirm_view);
|
|
|
|
|
|
|
+ view_set_previous_callback(hid_keynote_get_view(app->hid_keynote), hid_menu_view);
|
|
|
view_dispatcher_add_view(
|
|
view_dispatcher_add_view(
|
|
|
app->view_dispatcher, HidViewKeynote, hid_keynote_get_view(app->hid_keynote));
|
|
app->view_dispatcher, HidViewKeynote, hid_keynote_get_view(app->hid_keynote));
|
|
|
|
|
|
|
|
// Keyboard view
|
|
// Keyboard view
|
|
|
app->hid_keyboard = hid_keyboard_alloc(app);
|
|
app->hid_keyboard = hid_keyboard_alloc(app);
|
|
|
- view_set_previous_callback(hid_keyboard_get_view(app->hid_keyboard), hid_exit_confirm_view);
|
|
|
|
|
|
|
+ view_set_previous_callback(hid_keyboard_get_view(app->hid_keyboard), hid_menu_view);
|
|
|
view_dispatcher_add_view(
|
|
view_dispatcher_add_view(
|
|
|
app->view_dispatcher, HidViewKeyboard, hid_keyboard_get_view(app->hid_keyboard));
|
|
app->view_dispatcher, HidViewKeyboard, hid_keyboard_get_view(app->hid_keyboard));
|
|
|
|
|
|
|
|
//Numpad keyboard view
|
|
//Numpad keyboard view
|
|
|
app->hid_numpad = hid_numpad_alloc(app);
|
|
app->hid_numpad = hid_numpad_alloc(app);
|
|
|
- view_set_previous_callback(hid_numpad_get_view(app->hid_numpad), hid_exit_confirm_view);
|
|
|
|
|
|
|
+ view_set_previous_callback(hid_numpad_get_view(app->hid_numpad), hid_menu_view);
|
|
|
view_dispatcher_add_view(
|
|
view_dispatcher_add_view(
|
|
|
app->view_dispatcher, HidViewNumpad, hid_numpad_get_view(app->hid_numpad));
|
|
app->view_dispatcher, HidViewNumpad, hid_numpad_get_view(app->hid_numpad));
|
|
|
|
|
|
|
|
// Media view
|
|
// Media view
|
|
|
app->hid_media = hid_media_alloc(app);
|
|
app->hid_media = hid_media_alloc(app);
|
|
|
- view_set_previous_callback(hid_media_get_view(app->hid_media), hid_exit_confirm_view);
|
|
|
|
|
|
|
+ view_set_previous_callback(hid_media_get_view(app->hid_media), hid_menu_view);
|
|
|
view_dispatcher_add_view(
|
|
view_dispatcher_add_view(
|
|
|
app->view_dispatcher, HidViewMedia, hid_media_get_view(app->hid_media));
|
|
app->view_dispatcher, HidViewMedia, hid_media_get_view(app->hid_media));
|
|
|
|
|
|
|
|
// Movie view
|
|
// Movie view
|
|
|
app->hid_movie = hid_movie_alloc(app);
|
|
app->hid_movie = hid_movie_alloc(app);
|
|
|
- view_set_previous_callback(hid_movie_get_view(app->hid_movie), hid_exit_confirm_view);
|
|
|
|
|
|
|
+ view_set_previous_callback(hid_movie_get_view(app->hid_movie), hid_menu_view);
|
|
|
view_dispatcher_add_view(
|
|
view_dispatcher_add_view(
|
|
|
app->view_dispatcher, HidViewMovie, hid_movie_get_view(app->hid_movie));
|
|
app->view_dispatcher, HidViewMovie, hid_movie_get_view(app->hid_movie));
|
|
|
|
|
|
|
@@ -230,7 +235,7 @@ Hid* hid_app_alloc_view(void* context) {
|
|
|
// Mouse clicker view
|
|
// Mouse clicker view
|
|
|
app->hid_mouse_clicker = hid_mouse_clicker_alloc(app);
|
|
app->hid_mouse_clicker = hid_mouse_clicker_alloc(app);
|
|
|
view_set_previous_callback(
|
|
view_set_previous_callback(
|
|
|
- hid_mouse_clicker_get_view(app->hid_mouse_clicker), hid_exit_confirm_view);
|
|
|
|
|
|
|
+ hid_mouse_clicker_get_view(app->hid_mouse_clicker), hid_menu_view);
|
|
|
view_dispatcher_add_view(
|
|
view_dispatcher_add_view(
|
|
|
app->view_dispatcher,
|
|
app->view_dispatcher,
|
|
|
HidViewMouseClicker,
|
|
HidViewMouseClicker,
|
|
@@ -239,7 +244,7 @@ Hid* hid_app_alloc_view(void* context) {
|
|
|
// Mouse jiggler view
|
|
// Mouse jiggler view
|
|
|
app->hid_mouse_jiggler = hid_mouse_jiggler_alloc(app);
|
|
app->hid_mouse_jiggler = hid_mouse_jiggler_alloc(app);
|
|
|
view_set_previous_callback(
|
|
view_set_previous_callback(
|
|
|
- hid_mouse_jiggler_get_view(app->hid_mouse_jiggler), hid_exit_confirm_view);
|
|
|
|
|
|
|
+ hid_mouse_jiggler_get_view(app->hid_mouse_jiggler), hid_menu_view);
|
|
|
view_dispatcher_add_view(
|
|
view_dispatcher_add_view(
|
|
|
app->view_dispatcher,
|
|
app->view_dispatcher,
|
|
|
HidViewMouseJiggler,
|
|
HidViewMouseJiggler,
|
|
@@ -247,7 +252,7 @@ Hid* hid_app_alloc_view(void* context) {
|
|
|
|
|
|
|
|
// Ptt view
|
|
// Ptt view
|
|
|
app->hid_ptt = hid_ptt_alloc(app);
|
|
app->hid_ptt = hid_ptt_alloc(app);
|
|
|
- view_set_previous_callback(hid_ptt_get_view(app->hid_ptt), hid_exit_confirm_view);
|
|
|
|
|
|
|
+ view_set_previous_callback(hid_ptt_get_view(app->hid_ptt), hid_menu_view);
|
|
|
view_dispatcher_add_view(
|
|
view_dispatcher_add_view(
|
|
|
app->view_dispatcher, HidViewPtt, hid_ptt_get_view(app->hid_ptt));
|
|
app->view_dispatcher, HidViewPtt, hid_ptt_get_view(app->hid_ptt));
|
|
|
|
|
|