1 files changed, 77 insertions, 87 deletions

diff --git a/apps/shortcuts.c b/apps/shortcuts.c
index a32c298f6d..a7fbe7ccec 100644
--- a/apps/shortcuts.c
+++ b/apps/shortcuts.c
@@ -421,8 +421,6 @@ void shortcuts_init(void)
     --buflib_move_lock;
 }
 
-char* sleep_timer_getname(int selected_item, void * data,
-                          char *buffer, size_t buffer_len); /* settings_menu.c  */
 static const char * shortcut_menu_get_name(int selected_item, void * data,
                                            char * buffer, size_t buffer_len)
 {
@@ -440,11 +438,9 @@ static const char * shortcut_menu_get_name(int selected_item, void * data,
 #if CONFIG_RTC
             && !sc->u.timedata.talktime
 #endif
-        ) /* Toggle Sleep Timer */
-        {
-            sleep_timer_getname(selected_item, data, buffer, buffer_len);
-            return buffer;
-        }
+        ) /* String representation for toggling sleep timer */
+            return string_sleeptimer(buffer, buffer_len);
+
         return sc->name;
     }
     else if ((sc->type == SHORTCUT_SHUTDOWN || sc->type == SHORTCUT_REBOOT) &&
@@ -466,81 +462,6 @@ static const char * shortcut_menu_get_name(int selected_item, void * data,
     return sc->name[0] ? sc->name : sc->u.path;
 }
 
-static int shortcut_menu_speak_item(int selected_item, void * data);
-static int shortcut_menu_get_action(int action, struct gui_synclist *lists)
-{
-    (void)lists;
-    if (action == ACTION_STD_OK || action == ACTION_STD_MENU)
-        return ACTION_STD_CANCEL;
-    else if (action == ACTION_STD_QUICKSCREEN && action != ACTION_STD_CONTEXT)
-        return ACTION_STD_CANCEL;
-    else if (action == ACTION_STD_CONTEXT)
-    {
-        int selection = gui_synclist_get_sel_pos(lists);
-
-        if (confirm_delete_yesno("") != YESNO_YES)
-        {
-            gui_synclist_set_title(lists, lists->title, lists->title_icon);
-            shortcut_menu_speak_item(selection, NULL);
-            return ACTION_REDRAW;
-        }
-
-        remove_shortcut(selection);
-        gui_synclist_set_nb_items(lists, shortcut_count);
-        gui_synclist_set_title(lists, lists->title, lists->title_icon);
-        if (selection >= shortcut_count)
-            gui_synclist_select_item(lists, shortcut_count - 1);
-        first_idx_to_writeback = 0;
-        overwrite_shortcuts = true;
-        shortcuts_ata_idle_callback();
-        if (shortcut_count == 0)
-            return ACTION_STD_CANCEL;
-
-        shortcut_menu_speak_item(gui_synclist_get_sel_pos(lists), NULL);
-        return ACTION_REDRAW;
-    }
-    return action;
-}
-
-static enum themable_icons shortcut_menu_get_icon(int selected_item, void * data)
-{
-    (void)data;
-    int icon;
-    struct shortcut *sc = get_shortcut(selected_item);
-    if (!sc)
-        return Icon_NOICON;
-    if (sc->icon == Icon_NOICON)
-    {
-
-        switch (sc->type)
-        {
-            case SHORTCUT_FILE:
-                return filetype_get_icon(filetype_get_attr(sc->u.path));
-            case SHORTCUT_BROWSER:
-                icon = filetype_get_icon(filetype_get_attr(sc->u.path));
-                if (icon <= 0)
-                    icon = Icon_Folder;
-                return icon;
-            case SHORTCUT_SETTING:
-                return Icon_Menu_setting;
-            case SHORTCUT_DEBUGITEM:
-                return Icon_Menu_functioncall;
-            case SHORTCUT_PLAYLISTMENU:
-                return Icon_Playlist;
-            case SHORTCUT_SHUTDOWN:
-            case SHORTCUT_REBOOT:
-                return Icon_System_menu;
-            case SHORTCUT_TIME:
-                return Icon_Menu_functioncall;
-            default:
-                break;
-        }
-    }
-    return sc->icon;
-}
-
-void talk_timedate(void);
-int sleep_timer_voice(int selected_item, void*data); /* settings_menu.c  */
 static int shortcut_menu_speak_item(int selected_item, void * data)
 {
     (void)data;
@@ -605,7 +526,7 @@ static int shortcut_menu_speak_item(int selected_item, void * data)
                 else
 #endif
                 if (sc->u.timedata.sleep_timeout < 0)
-                    sleep_timer_voice(selected_item, data);
+                    talk_sleeptimer();
                 else if (sc->name[0])
                     talk_spell(sc->name, false);
                 break;
@@ -626,9 +547,78 @@ static int shortcut_menu_speak_item(int selected_item, void * data)
     return 0;
 }
 
-const char* sleep_timer_formatter(char* buffer, size_t buffer_size,
-                                  int value, const char* unit);
-int toggle_sleeptimer(void); /* settings_menu.c  */
+static int shortcut_menu_get_action(int action, struct gui_synclist *lists)
+{
+    (void)lists;
+    if (action == ACTION_STD_OK || action == ACTION_STD_MENU)
+        return ACTION_STD_CANCEL;
+    else if (action == ACTION_STD_QUICKSCREEN && action != ACTION_STD_CONTEXT)
+        return ACTION_STD_CANCEL;
+    else if (action == ACTION_STD_CONTEXT)
+    {
+        int selection = gui_synclist_get_sel_pos(lists);
+
+        if (confirm_delete_yesno("") != YESNO_YES)
+        {
+            gui_synclist_set_title(lists, lists->title, lists->title_icon);
+            shortcut_menu_speak_item(selection, NULL);
+            return ACTION_REDRAW;
+        }
+
+        remove_shortcut(selection);
+        gui_synclist_set_nb_items(lists, shortcut_count);
+        gui_synclist_set_title(lists, lists->title, lists->title_icon);
+        if (selection >= shortcut_count)
+            gui_synclist_select_item(lists, shortcut_count - 1);
+        first_idx_to_writeback = 0;
+        overwrite_shortcuts = true;
+        shortcuts_ata_idle_callback();
+        if (shortcut_count == 0)
+            return ACTION_STD_CANCEL;
+
+        shortcut_menu_speak_item(gui_synclist_get_sel_pos(lists), NULL);
+        return ACTION_REDRAW;
+    }
+    return action;
+}
+
+static enum themable_icons shortcut_menu_get_icon(int selected_item, void * data)
+{
+    (void)data;
+    int icon;
+    struct shortcut *sc = get_shortcut(selected_item);
+    if (!sc)
+        return Icon_NOICON;
+    if (sc->icon == Icon_NOICON)
+    {
+
+        switch (sc->type)
+        {
+            case SHORTCUT_FILE:
+                return filetype_get_icon(filetype_get_attr(sc->u.path));
+            case SHORTCUT_BROWSER:
+                icon = filetype_get_icon(filetype_get_attr(sc->u.path));
+                if (icon <= 0)
+                    icon = Icon_Folder;
+                return icon;
+            case SHORTCUT_SETTING:
+                return Icon_Menu_setting;
+            case SHORTCUT_DEBUGITEM:
+                return Icon_Menu_functioncall;
+            case SHORTCUT_PLAYLISTMENU:
+                return Icon_Playlist;
+            case SHORTCUT_SHUTDOWN:
+            case SHORTCUT_REBOOT:
+                return Icon_System_menu;
+            case SHORTCUT_TIME:
+                return Icon_Menu_functioncall;
+            default:
+                break;
+        }
+    }
+    return sc->icon;
+}
+
 int do_shortcut_menu(void *ignored)
 {
     (void)ignored;
@@ -761,7 +751,7 @@ int do_shortcut_menu(void *ignored)
                         {
                             set_sleeptimer_duration(sc->u.timedata.sleep_timeout);
                             splashf(HZ, "%s (%s)", str(LANG_SLEEP_TIMER),
-                                    sleep_timer_formatter(timer_buf, sizeof(timer_buf),
+                                    format_sleeptimer(timer_buf, sizeof(timer_buf),
                                                           sc->u.timedata.sleep_timeout,
                                                           NULL));
                         }