diff options
Diffstat (limited to 'apps/debug_menu.c')
-rw-r--r-- | apps/debug_menu.c | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 995333e582..81f1c58d55 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -1833,9 +1833,12 @@ static bool dbg_dircache_info(void) | |||
1833 | #ifdef HAVE_TAGCACHE | 1833 | #ifdef HAVE_TAGCACHE |
1834 | static int database_callback(int btn, struct gui_synclist *lists) | 1834 | static int database_callback(int btn, struct gui_synclist *lists) |
1835 | { | 1835 | { |
1836 | (void)btn; (void)lists; | 1836 | (void)lists; |
1837 | struct tagcache_stat *stat = tagcache_get_stat(); | 1837 | struct tagcache_stat *stat = tagcache_get_stat(); |
1838 | static bool synced = false; | ||
1839 | |||
1838 | simplelist_set_line_count(0); | 1840 | simplelist_set_line_count(0); |
1841 | |||
1839 | simplelist_addline(SIMPLELIST_ADD_LINE, "Initialized: %s", | 1842 | simplelist_addline(SIMPLELIST_ADD_LINE, "Initialized: %s", |
1840 | stat->initialized ? "Yes" : "No"); | 1843 | stat->initialized ? "Yes" : "No"); |
1841 | simplelist_addline(SIMPLELIST_ADD_LINE, "DB Ready: %s", | 1844 | simplelist_addline(SIMPLELIST_ADD_LINE, "DB Ready: %s", |
@@ -1846,18 +1849,38 @@ static int database_callback(int btn, struct gui_synclist *lists) | |||
1846 | stat->ramcache_used, stat->ramcache_allocated); | 1849 | stat->ramcache_used, stat->ramcache_allocated); |
1847 | simplelist_addline(SIMPLELIST_ADD_LINE, "Progress: %d%% (%d entries)", | 1850 | simplelist_addline(SIMPLELIST_ADD_LINE, "Progress: %d%% (%d entries)", |
1848 | stat->progress, stat->processed_entries); | 1851 | stat->progress, stat->processed_entries); |
1852 | simplelist_addline(SIMPLELIST_ADD_LINE, "Curfile: %s", | ||
1853 | stat->curentry ? stat->curentry : "---"); | ||
1849 | simplelist_addline(SIMPLELIST_ADD_LINE, "Commit step: %d", | 1854 | simplelist_addline(SIMPLELIST_ADD_LINE, "Commit step: %d", |
1850 | stat->commit_step); | 1855 | stat->commit_step); |
1851 | simplelist_addline(SIMPLELIST_ADD_LINE, "Commit delayed: %s", | 1856 | simplelist_addline(SIMPLELIST_ADD_LINE, "Commit delayed: %s", |
1852 | stat->commit_delayed ? "Yes" : "No"); | 1857 | stat->commit_delayed ? "Yes" : "No"); |
1858 | |||
1859 | |||
1860 | if (synced) | ||
1861 | { | ||
1862 | synced = false; | ||
1863 | tagcache_screensync_event(); | ||
1864 | } | ||
1865 | |||
1866 | if (!btn && stat->curentry) | ||
1867 | { | ||
1868 | synced = true; | ||
1869 | return ACTION_REDRAW; | ||
1870 | } | ||
1871 | |||
1872 | if (btn == ACTION_STD_CANCEL) | ||
1873 | tagcache_screensync_enable(false); | ||
1874 | |||
1853 | return btn; | 1875 | return btn; |
1854 | } | 1876 | } |
1855 | static bool dbg_tagcache_info(void) | 1877 | static bool dbg_tagcache_info(void) |
1856 | { | 1878 | { |
1857 | struct simplelist_info info; | 1879 | struct simplelist_info info; |
1858 | simplelist_info_init(&info, "Database Info", 7, NULL); | 1880 | simplelist_info_init(&info, "Database Info", 8, NULL); |
1859 | info.action_callback = database_callback; | 1881 | info.action_callback = database_callback; |
1860 | info.hide_selection = true; | 1882 | info.hide_selection = true; |
1883 | tagcache_screensync_enable(true); | ||
1861 | return simplelist_show_list(&info); | 1884 | return simplelist_show_list(&info); |
1862 | } | 1885 | } |
1863 | #endif | 1886 | #endif |
@@ -2257,15 +2280,10 @@ static char* dbg_menu_getname(int item, void * data, char *buffer) | |||
2257 | bool debug_menu(void) | 2280 | bool debug_menu(void) |
2258 | { | 2281 | { |
2259 | struct simplelist_info info; | 2282 | struct simplelist_info info; |
2260 | info.title = "Debug Menu"; | 2283 | |
2261 | info.selection_size = 1; | 2284 | simplelist_info_init(&info, "Debug Menu", ARRAYLEN(menuitems), NULL); |
2262 | info.count = ARRAYLEN(menuitems); | ||
2263 | info.selection_size = 1; | ||
2264 | info.action_callback = menu_action_callback; | 2285 | info.action_callback = menu_action_callback; |
2265 | info.hide_selection = false; | ||
2266 | info.scroll_all = false; | ||
2267 | info.get_icon = NULL; | ||
2268 | info.get_name = dbg_menu_getname; | 2286 | info.get_name = dbg_menu_getname; |
2269 | info.callback_data = NULL; | 2287 | |
2270 | return simplelist_show_list(&info); | 2288 | return simplelist_show_list(&info); |
2271 | } | 2289 | } |