Rev 212 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 212 | Rev 219 | ||
|---|---|---|---|
| Line 53... | Line 53... | ||
| 53 | 53 | ||
| 54 | DUBwiseView canvas; |
54 | DUBwiseView canvas; |
| 55 | boolean do_sound; |
55 | boolean do_sound; |
| 56 | boolean fullscreen; |
56 | boolean fullscreen; |
| 57 | MKCommunicator mk; |
57 | MKCommunicator mk; |
| 58 | String[] menu_items = new String[]{"Connection", "Old Interface" , "View On Maps", "Flight Settings","RCData","Motor Test", "About","Quit"}; |
58 | String[] menu_items = new String[]{"Settings","Connection", "Old Interface" , "View On Maps", "Flight Settings","RCData","Motor Test", "About","Quit"}; |
| Line 59... | Line 59... | ||
| 59 | int[] menu_actions= new int[]{ACTIONID_CONN , ACTIONID_OLDINTERFACE , ACTIONID_MAPS ,ACTIONID_FLIGHTSETTINGS,ACTIONID_RCDATA,ACTIONID_MOTORTEST, ACTIONID_ABOUT , ACTIONID_QUIT }; |
59 | int[] menu_actions= new int[]{ACTIONID_SETTINGS,ACTIONID_CONN , ACTIONID_OLDINTERFACE , ACTIONID_MAPS ,ACTIONID_FLIGHTSETTINGS,ACTIONID_RCDATA,ACTIONID_MOTORTEST, ACTIONID_ABOUT , ACTIONID_QUIT }; |
| 60 | 60 | ||
| 61 | public final static int ACTIONID_CONN=0; |
61 | public final static int ACTIONID_CONN=0; |
| 62 | public final static int ACTIONID_MAPS=1; |
62 | public final static int ACTIONID_MAPS=1; |
| 63 | public final static int ACTIONID_ABOUT=2; |
63 | public final static int ACTIONID_ABOUT=2; |
| 64 | public final static int ACTIONID_OLDINTERFACE=3; |
64 | public final static int ACTIONID_OLDINTERFACE=3; |
| 65 | public final static int ACTIONID_FLIGHTSETTINGS=4; |
65 | public final static int ACTIONID_FLIGHTSETTINGS=4; |
| - | 66 | public final static int ACTIONID_MOTORTEST=5; |
|
| 66 | public final static int ACTIONID_MOTORTEST=5; |
67 | public final static int ACTIONID_RCDATA=6; |
| Line 67... | Line 68... | ||
| 67 | public final static int ACTIONID_RCDATA=6; |
68 | public final static int ACTIONID_SETTINGS=7; |
| 68 | public final static int ACTIONID_QUIT=100; |
69 | public final static int ACTIONID_QUIT=100; |
| 69 | 70 | ||
| Line 110... | Line 111... | ||
| 110 | 111 | ||
| 111 | 112 | ||
| Line -... | Line 113... | ||
| - | 113 | switch(menu_actions[position]) |
|
| - | 114 | { |
|
| - | 115 | ||
| - | 116 | case ACTIONID_SETTINGS: |
|
| - | 117 | // setContentView(new ConnectionView(this)); |
|
| - | 118 | ||
| 112 | switch(menu_actions[position]) |
119 | startActivity(new Intent(this, SettingsActivity.class)); |
| 113 | { |
120 | break; |
| Line 114... | Line 121... | ||
| 114 | 121 | ||
| 115 | case ACTIONID_CONN: |
122 | case ACTIONID_CONN: |