Changes between Version 11 and Version 12 of Docs/825gen2/Dev/UpdatingLegacyAppsToNewLook

Timestamp:

02/08/24 13:02:16 (10 months ago)

Author:

Don Wilson

Comment:

--

Docs/825gen2/Dev/UpdatingLegacyAppsToNewLook

@@ -218 +218 @@
 
 {{{
-void MenuConfig(void) 
-{
-#if ARM64
-        CFormRect rect;
-        CFormButton btnExit;
-
-        FORM_INIT(Menu, EventMenuCfgShow, NULL, NULL, NULL, nFormFlgNone);
-
-        formMenu.SetFontSet(&formFontSet);
-
-        rect.SetLeftAndWidthBasedOnDspArea(formMenu.GetDspArea(), MENU_BTN_LEFT_OFFSET_PERCENT, MENU_BTN_TWO_COLUMN_WIDTH_PERCENT);
-        rect.SetTopAndHeightBasedOnFont(formFontSet.GetFont(fontIndexPrompt),
-                        MENU_BTN_TOP_FONT_HEIGHT_MULTIPLIER, MENU_BTN_HEIGHT_FONT_HEIGHT_MULTIPLIER);
-
-        FORM_ADD_BUTTON2(Menu, Tickets,         rect,   LANG(STR_CONFIG_TICKETS_BTN),           'T', EventMenuTickets,          FORM_BUTTON_SHADOW);
-        rect += buttonAdvanceY;
-        FORM_ADD_BUTTON2(Menu, CfgIDs,          rect,   LANG(STR_CONFIG_IDS_BTN),                       'I', EventMenuCfgIDs,           FORM_BUTTON_SHADOW);
-        rect += buttonAdvanceY;
-        FORM_ADD_BUTTON2(Menu, Scoreboard,      rect,   LANG(STR_CONFIG_SCOREBOARD_BTN),        'S', EventMenuScoreboard,       FORM_BUTTON_SHADOW | FORM_OUTLINE_1LINE_WND | FORM_SHOW_EVENT);
-        rect += buttonAdvanceY;
-        FORM_ADD_BUTTON2(Menu, RFID,            rect,   LANG(STR_CONFIG_BADGE_BTN),                     'F', EventMenuBadge,            FORM_BUTTON_SHADOW | FORM_OUTLINE_1LINE_WND | FORM_SHOW_EVENT);
-        rect += buttonAdvanceY;
-
-        rect.SetLeftAndWidthBasedOnDspArea(formMenu.GetDspArea(), MENU_BTN_LEFT_OFFSET_PERCENT, 0.68);
-
-        FORM_ADD_BUTTON2(Menu, LocalRemote, rect,       LANG(STR_CONFIG_LOCAL_REMOTE_BTN),      'R', EventMenuLocalRemote,      FORM_BUTTON_SHADOW | FORM_OUTLINE_1LINE_WND | FORM_SHOW_EVENT);
-        rect += buttonAdvanceY;
-        FORM_ADD_BUTTON2(Menu, Mobile,          rect,   LANG(STR_CONFIG_MOBILE_BTN),            'R', EventMenuMobile,           FORM_BUTTON_SHADOW | FORM_OUTLINE_1LINE_WND | FORM_SHOW_EVENT);
-
-        rect.SetLeftAndWidthBasedOnDspArea(formMenu.GetDspArea(), MENU_BTN_MID_LEFT, MENU_BTN_TWO_COLUMN_WIDTH_PERCENT);
-        rect.SetTopAndHeightBasedOnFont(formFontSet.GetFont(fontIndexPrompt),
-                        MENU_BTN_TOP_FONT_HEIGHT_MULTIPLIER, MENU_BTN_HEIGHT_FONT_HEIGHT_MULTIPLIER);
-
-        FORM_ADD_BUTTON2(Menu, Language,        rect,   LANG(STR_CONFIG_LANGUAGE_BTN),          'L', EventMenuLanguage,         FORM_BUTTON_SHADOW);
-        rect += buttonAdvanceY;
-        FORM_ADD_BUTTON2(Menu, WeightAlarm, rect,       LANG(STR_CONFIG_WEIGHT_ALARM_BTN),      'A', EventMenuWeightAlarm,      FORM_BUTTON_SHADOW| FORM_OUTLINE_1LINE_WND | FORM_SHOW_EVENT);
-#if IP_CAMERA_CAPTURE
-        rect += buttonAdvanceY;
-        FORM_ADD_BUTTON2(Menu, Cameras, rect,   LANG(STR_CONFIG_CAMERAS_BTN),   'A', EventMenuCameras,  FORM_BUTTON_SHADOW);
-#endif
-
-        AddFormExitButton(formMenu, btnExit);
-
-#else
-
-        FORM_INIT(Menu, EventMenuCfgShow, NULL, NULL, NULL, nFormFlgNone);
-        FORM_ADD_BUTTON(Menu, Tickets,          MENU_COL1_X,    MENU_ROW1_Y,    LANG(STR_CONFIG_TICKETS_BTN),           'T', EventMenuTickets,          FORM_BUTTON_INVERT);
-        FORM_ADD_BUTTON(Menu, CfgIDs,           MENU_COL1_X,    MENU_ROW2_Y,    LANG(STR_CONFIG_IDS_BTN),                       'I', EventMenuCfgIDs,           FORM_BUTTON_INVERT);
-        FORM_ADD_BUTTON(Menu, Scoreboard,       MENU_COL1_X,    MENU_ROW3_Y,    LANG(STR_CONFIG_SCOREBOARD_BTN),        'S', EventMenuScoreboard,       FORM_BUTTON_INVERT | FORM_OUTLINE_1LINE_WND | FORM_SHOW_EVENT);
-        FORM_ADD_BUTTON(Menu, RFID,             MENU_COL1_X,    MENU_ROW4_Y,    LANG(STR_CONFIG_BADGE_BTN),                     'F', EventMenuBadge,            FORM_BUTTON_INVERT | FORM_OUTLINE_1LINE_WND | FORM_SHOW_EVENT);
-        FORM_ADD_BUTTON(Menu, LocalRemote,      MENU_COL1_X,    MENU_ROW5_Y,    LANG(STR_CONFIG_LOCAL_REMOTE_BTN),      'R', EventMenuLocalRemote,      FORM_BUTTON_INVERT | FORM_OUTLINE_1LINE_WND | FORM_SHOW_EVENT);
-        FORM_ADD_BUTTON(Menu, Mobile,           MENU_COL1_X,    MENU_ROW6_Y,    LANG(STR_CONFIG_MOBILE_BTN),            'R', EventMenuMobile,           FORM_BUTTON_INVERT | FORM_OUTLINE_1LINE_WND | FORM_SHOW_EVENT);
-
-        FORM_ADD_BUTTON(Menu, Language,         MENU_COL2_X,    MENU_ROW1_Y,    LANG(STR_CONFIG_LANGUAGE_BTN),          'L', EventMenuLanguage,         FORM_BUTTON_INVERT);
-        FORM_ADD_BUTTON(Menu, WeightAlarm,      MENU_COL2_X,    MENU_ROW2_Y,    LANG(STR_CONFIG_WEIGHT_ALARM_BTN),      'A', EventMenuWeightAlarm,      FORM_BUTTON_INVERT| FORM_OUTLINE_1LINE_WND | FORM_SHOW_EVENT);
-        FORM_ADD_BUTTON(Menu, Exit,             EXIT_BTN_X,     EXIT_BTN_Y,     LANG(STR_EXIT_BTN),                             'X', EventExit,                         FORM_BUTTON_INVERT);
-#endif
-        FORM_SHOW(Menu);
-        FORM_RUN(Menu);
-        FORM_HIDE(Menu);
-
-}
-
-}}}
-
-
+#if ARM64
+        FORM_INIT(Update, EventDownloadedFileShow, NULL, NULL, NULL, 0);
+
+        SetupMenuFormToUseFontSet(formUpdate, rect, 0.8 );
+
+        FORM_ADD_BUTTON2(Update, Export, rect, "Export",        'X',  EventExport,      FORM_BUTTON_SHADOW, NULL);
+        rect += invertBtnAdvanceY;
+        FORM_ADD_BUTTON2(Update, Import, rect, "Import",        'I',  EventImport,      FORM_BUTTON_SHADOW, NULL);
+#else
+        FORM_INIT(Update, EventDownloadedFileShow, NULL, NULL, NULL, 0);
+
+        FORM_ADD_BUTTON(Update, Export, MENU_COL1_X,    MENU_ROW1_Y,    " Export ", 'X', EventExport, FORM_BUTTON_INVERT);
+        FORM_ADD_BUTTON(Update, Import, MENU_COL1_X,    MENU_ROW2_Y,    " Import ", 'I', EventImport, FORM_BUTTON_INVERT);
+#endif
+
+        FORM_SHOW(Update);
+        FORM_RUN(Update);
+        FORM_HIDE(Update);
+
+}}}
+