diff options
Diffstat (limited to 'apps/plugins/clock.c')
-rw-r--r-- | apps/plugins/clock.c | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c index 59b98247b8..3c70759da6 100644 --- a/apps/plugins/clock.c +++ b/apps/plugins/clock.c | |||
@@ -92,6 +92,7 @@ Original release, featuring analog/digital modes and a few options. | |||
92 | #include "time.h" | 92 | #include "time.h" |
93 | #include "checkbox.h" | 93 | #include "checkbox.h" |
94 | #include "xlcd.h" | 94 | #include "xlcd.h" |
95 | #include "oldmenuapi.h" | ||
95 | 96 | ||
96 | PLUGIN_HEADER | 97 | PLUGIN_HEADER |
97 | 98 | ||
@@ -1177,12 +1178,12 @@ void analog_settings_menu(void) | |||
1177 | rb->lcd_set_foreground(LCD_BLACK); | 1178 | rb->lcd_set_foreground(LCD_BLACK); |
1178 | #endif | 1179 | #endif |
1179 | 1180 | ||
1180 | m = rb->menu_init(analog_items, sizeof(analog_items) / sizeof(*analog_items), | 1181 | m = menu_init(rb, analog_items, sizeof(analog_items) / sizeof(*analog_items), |
1181 | NULL, NULL, NULL, NULL); | 1182 | NULL, NULL, NULL, NULL); |
1182 | 1183 | ||
1183 | while(!done) | 1184 | while(!done) |
1184 | { | 1185 | { |
1185 | result = rb->menu_show(m); | 1186 | result = menu_show(m); |
1186 | 1187 | ||
1187 | switch(result) | 1188 | switch(result) |
1188 | { | 1189 | { |
@@ -1204,7 +1205,7 @@ void analog_settings_menu(void) | |||
1204 | break; | 1205 | break; |
1205 | } | 1206 | } |
1206 | 1207 | ||
1207 | rb->menu_exit(m); | 1208 | menu_exit(m); |
1208 | } | 1209 | } |
1209 | } | 1210 | } |
1210 | 1211 | ||
@@ -1222,12 +1223,12 @@ void digital_settings_menu(void) | |||
1222 | rb->lcd_set_foreground(LCD_BLACK); | 1223 | rb->lcd_set_foreground(LCD_BLACK); |
1223 | #endif | 1224 | #endif |
1224 | 1225 | ||
1225 | m = rb->menu_init(digital_items, sizeof(digital_items) / sizeof(*digital_items), | 1226 | m = menu_init(rb, digital_items, sizeof(digital_items) / sizeof(*digital_items), |
1226 | NULL, NULL, NULL, NULL); | 1227 | NULL, NULL, NULL, NULL); |
1227 | 1228 | ||
1228 | while(!done) | 1229 | while(!done) |
1229 | { | 1230 | { |
1230 | result = rb->menu_show(m); | 1231 | result = menu_show(m); |
1231 | 1232 | ||
1232 | switch(result) | 1233 | switch(result) |
1233 | { | 1234 | { |
@@ -1253,7 +1254,7 @@ void digital_settings_menu(void) | |||
1253 | break; | 1254 | break; |
1254 | } | 1255 | } |
1255 | 1256 | ||
1256 | rb->menu_exit(m); | 1257 | menu_exit(m); |
1257 | } | 1258 | } |
1258 | } | 1259 | } |
1259 | 1260 | ||
@@ -1271,12 +1272,12 @@ void fullscreen_settings_menu(void) | |||
1271 | rb->lcd_set_foreground(LCD_BLACK); | 1272 | rb->lcd_set_foreground(LCD_BLACK); |
1272 | #endif | 1273 | #endif |
1273 | 1274 | ||
1274 | m = rb->menu_init(fullscreen_items, sizeof(fullscreen_items) / sizeof(*fullscreen_items), | 1275 | m = menu_init(rb, fullscreen_items, sizeof(fullscreen_items) / sizeof(*fullscreen_items), |
1275 | NULL, NULL, NULL, NULL); | 1276 | NULL, NULL, NULL, NULL); |
1276 | 1277 | ||
1277 | while(!done) | 1278 | while(!done) |
1278 | { | 1279 | { |
1279 | result = rb->menu_show(m); | 1280 | result = menu_show(m); |
1280 | 1281 | ||
1281 | switch(result) | 1282 | switch(result) |
1282 | { | 1283 | { |
@@ -1294,7 +1295,7 @@ void fullscreen_settings_menu(void) | |||
1294 | break; | 1295 | break; |
1295 | } | 1296 | } |
1296 | 1297 | ||
1297 | rb->menu_exit(m); | 1298 | menu_exit(m); |
1298 | } | 1299 | } |
1299 | } | 1300 | } |
1300 | 1301 | ||
@@ -1312,12 +1313,12 @@ void binary_settings_menu(void) | |||
1312 | rb->lcd_set_foreground(LCD_BLACK); | 1313 | rb->lcd_set_foreground(LCD_BLACK); |
1313 | #endif | 1314 | #endif |
1314 | 1315 | ||
1315 | m = rb->menu_init(binary_items, sizeof(binary_items) / sizeof(*binary_items), | 1316 | m = menu_init(rb,binary_items, sizeof(binary_items) / sizeof(*binary_items), |
1316 | NULL, NULL, NULL, NULL); | 1317 | NULL, NULL, NULL, NULL); |
1317 | 1318 | ||
1318 | while(!done) | 1319 | while(!done) |
1319 | { | 1320 | { |
1320 | result = rb->menu_show(m); | 1321 | result = menu_show(m); |
1321 | 1322 | ||
1322 | switch(result) | 1323 | switch(result) |
1323 | { | 1324 | { |
@@ -1331,7 +1332,7 @@ void binary_settings_menu(void) | |||
1331 | break; | 1332 | break; |
1332 | } | 1333 | } |
1333 | 1334 | ||
1334 | rb->menu_exit(m); | 1335 | menu_exit(m); |
1335 | } | 1336 | } |
1336 | } | 1337 | } |
1337 | 1338 | ||
@@ -1349,12 +1350,12 @@ void plain_settings_menu(void) | |||
1349 | rb->lcd_set_foreground(LCD_BLACK); | 1350 | rb->lcd_set_foreground(LCD_BLACK); |
1350 | #endif | 1351 | #endif |
1351 | 1352 | ||
1352 | m = rb->menu_init(plain_items, sizeof(plain_items) / sizeof(*plain_items), | 1353 | m = menu_init(rb,plain_items, sizeof(plain_items) / sizeof(*plain_items), |
1353 | NULL, NULL, NULL, NULL); | 1354 | NULL, NULL, NULL, NULL); |
1354 | 1355 | ||
1355 | while(!done) | 1356 | while(!done) |
1356 | { | 1357 | { |
1357 | result = rb->menu_show(m); | 1358 | result = menu_show(m); |
1358 | 1359 | ||
1359 | switch(result) | 1360 | switch(result) |
1360 | { | 1361 | { |
@@ -1380,7 +1381,7 @@ void plain_settings_menu(void) | |||
1380 | break; | 1381 | break; |
1381 | } | 1382 | } |
1382 | 1383 | ||
1383 | rb->menu_exit(m); | 1384 | menu_exit(m); |
1384 | } | 1385 | } |
1385 | } | 1386 | } |
1386 | 1387 | ||
@@ -1434,12 +1435,12 @@ void general_settings(void) | |||
1434 | 1435 | ||
1435 | set_standard_colors(); | 1436 | set_standard_colors(); |
1436 | 1437 | ||
1437 | m = rb->menu_init(general_settings_items, sizeof(general_settings_items) / sizeof(*general_settings_items), | 1438 | m = menu_init(rb,general_settings_items, sizeof(general_settings_items) / sizeof(*general_settings_items), |
1438 | NULL, NULL, NULL, NULL); | 1439 | NULL, NULL, NULL, NULL); |
1439 | 1440 | ||
1440 | while(!done) | 1441 | while(!done) |
1441 | { | 1442 | { |
1442 | result = rb->menu_show(m); | 1443 | result = menu_show(m); |
1443 | 1444 | ||
1444 | switch(result) | 1445 | switch(result) |
1445 | { | 1446 | { |
@@ -1481,7 +1482,7 @@ void general_settings(void) | |||
1481 | break; | 1482 | break; |
1482 | } | 1483 | } |
1483 | 1484 | ||
1484 | rb->menu_exit(m); | 1485 | menu_exit(m); |
1485 | } | 1486 | } |
1486 | 1487 | ||
1487 | set_digital_colors(); | 1488 | set_digital_colors(); |
@@ -1700,12 +1701,12 @@ void mode_selector(void) | |||
1700 | 1701 | ||
1701 | set_standard_colors(); | 1702 | set_standard_colors(); |
1702 | 1703 | ||
1703 | m = rb->menu_init(mode_selector_items, sizeof(mode_selector_items) / sizeof(*mode_selector_items), | 1704 | m = menu_init(rb,mode_selector_items, sizeof(mode_selector_items) / sizeof(*mode_selector_items), |
1704 | NULL, NULL, NULL, NULL); | 1705 | NULL, NULL, NULL, NULL); |
1705 | 1706 | ||
1706 | while(!done) | 1707 | while(!done) |
1707 | { | 1708 | { |
1708 | result = rb->menu_show(m); | 1709 | result = menu_show(m); |
1709 | 1710 | ||
1710 | /* check for this, so if the user exits the menu without | 1711 | /* check for this, so if the user exits the menu without |
1711 | * making a selection, it won't change to some weird value. */ | 1712 | * making a selection, it won't change to some weird value. */ |
@@ -1714,7 +1715,7 @@ void mode_selector(void) | |||
1714 | 1715 | ||
1715 | done = true; | 1716 | done = true; |
1716 | 1717 | ||
1717 | rb->menu_exit(m); | 1718 | menu_exit(m); |
1718 | } | 1719 | } |
1719 | 1720 | ||
1720 | set_digital_colors(); | 1721 | set_digital_colors(); |
@@ -1830,12 +1831,12 @@ void main_menu(void) | |||
1830 | 1831 | ||
1831 | set_standard_colors(); | 1832 | set_standard_colors(); |
1832 | 1833 | ||
1833 | m = rb->menu_init(main_menu_items, sizeof(main_menu_items) / sizeof(*main_menu_items), | 1834 | m = menu_init(rb,main_menu_items, sizeof(main_menu_items) / sizeof(*main_menu_items), |
1834 | NULL, NULL, NULL, NULL); | 1835 | NULL, NULL, NULL, NULL); |
1835 | 1836 | ||
1836 | while(!done) | 1837 | while(!done) |
1837 | { | 1838 | { |
1838 | result = rb->menu_show(m); | 1839 | result = menu_show(m); |
1839 | 1840 | ||
1840 | switch(result) | 1841 | switch(result) |
1841 | { | 1842 | { |
@@ -1866,7 +1867,7 @@ void main_menu(void) | |||
1866 | break; | 1867 | break; |
1867 | } | 1868 | } |
1868 | 1869 | ||
1869 | rb->menu_exit(m); | 1870 | menu_exit(m); |
1870 | } | 1871 | } |
1871 | 1872 | ||
1872 | rb->lcd_setfont(FONT_SYSFIXED); | 1873 | rb->lcd_setfont(FONT_SYSFIXED); |