27,6 → 27,11 |
public final static int[] handle_params_menu_items={STRINGID_EDIT_CONTENT,STRINGID_RENAME,STRINGID_SAVE_AS,STRINGID_SAVE,STRINGID_REREAD,STRINGID_BACK}; |
public final static byte[] handle_params_menu_actions={ACTIONID_EDIT_PARAMS,ACTIONID_RENAME_PARAMS,ACTIONID_WRITE_PARAM_AS,ACTIONID_WRITE_PARAMS,ACTIONID_UNDO_PARAMS,ACTIONID_SELECT_PARAMS }; |
|
|
|
public final static int[] setting_options_menu_items={STRINGID_EDIT,STRINGID_LOADPLAIN,STRINGID_LOADFANCY,STRINGID_BACK}; |
public final static byte[]setting_options_menu_actions={ACTIONID_SETTINGS,ACTIONID_SETTING_LOADPLAIN,ACTIONID_SETTING_LOADFANCY,ACTIONID_MAINMENU }; |
|
public final static int[] onlyback_menu_items={STRINGID_BACK }; |
public final static byte[] back_to_conndetails_actions={ACTIONID_BACK_TO_CONNDETAILS}; |
|
219,6 → 224,7 |
{ |
tmp_menu_add(l(STRINGID_PACKET_TRAFFIC),ACTIONID_TRAFFIC); |
tmp_menu_add(l(STRINGID_VIEW_DATA),ACTIONID_DATABUFF); |
tmp_menu_add(l(STRINGID_FORCERECONNECT),ACTIONID_RECONNECT); |
} |
//#if bluetooth=="on" |
tmp_menu_add(l(STRINGID_CONNECT_BT),ACTIONID_SCAN_BT); |
238,7 → 244,7 |
{ |
tmp_menu_init(20); |
|
tmp_menu_add(l(STRINGID_SETTINGS),ACTIONID_SETTINGS); |
tmp_menu_add(l(STRINGID_SETTINGS),ACTIONID_SETTING_OPTIONS); |
tmp_menu_add(l(STRINGID_CONN),ACTIONID_CONN_DETAILS); |
|
if (settings.dev_mode) |
1775,7 → 1781,9 |
|
settings_editor.paint(g); |
break; |
|
// falltru wanted |
case STATEID_SETTING_OPTIONS: |
case STATEID_MAINMENU: |
case STATEID_SELECT_PARAMSET: |
case STATEID_HANDLE_PARAMS: |
2053,6 → 2061,9 |
// case STATEID_COPY_PARAMS: |
|
//break; |
case STATEID_SETTING_OPTIONS: |
setup_menu(setting_options_menu_items,setting_options_menu_actions); |
break; |
|
case STATEID_GPSVIEW: |
|
2059,12 → 2070,8 |
mk.user_intent=USER_INTENT_GPSOSD; |
break; |
case STATEID_SELECT_FIRMWARE: |
|
|
|
fw_loader=new FirmwareLoader(); |
setup_menu(new String[0],new byte[0]); |
|
break; |
|
|
2376,6 → 2383,17 |
{ |
switch(actionid) |
{ |
case ACTIONID_SETTING_LOADFANCY: |
settings.load_fancy_defaults(); |
break; |
|
case ACTIONID_SETTING_LOADPLAIN: |
settings.load_plain_defaults(); |
break; |
|
case ACTIONID_RECONNECT: |
mk.close_connections(false); |
break; |
case ACTIONID_UPDATE_DUBWISE: |
try |
{ |
2534,6 → 2552,10 |
chg_state(STATEID_SETTINGSMENU); |
break; |
|
case ACTIONID_SETTING_OPTIONS: |
chg_state(STATEID_SETTING_OPTIONS); |
break; |
|
case ACTIONID_RCDATA: |
chg_state(STATEID_STICKVIEW); |
break; |
2663,6 → 2685,7 |
case STATEID_TRAFFIC: |
case STATEID_SELECT_COMPORT: |
case STATEID_MAINMENU: |
case STATEID_SETTING_OPTIONS: |
case STATEID_SELECT_PARAMSET: |
case STATEID_DEVICESELECT: |
|
2994,6 → 3017,7 |
break; |
*/ |
|
case STATEID_SETTING_OPTIONS: |
case STATEID_MAINMENU: |
case STATEID_SELECT_PARAMSET: |
case STATEID_SELECT_COMPORT: |