Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 219 → Rev 220

/DUBwise/trunk/j2me/src/DUBwiseCanvas.java
74,6 → 74,7
public org.ligi.ufo.MKCommunicator mk=null;
// private MKStatistics mk_stat=null;
private MKParamsEditor params_editor=null;
private MKParamsEditor settings_editor=null;
public DUBwiseDebug debug=null;
public DUBwiseHelper helper=null;
303,14 → 304,17
switch (getGameAction (keyCode))
{
case UP:
if (act_menu_select!=0) act_menu_select--;
if (act_menu_select!=0)
act_menu_select--;
else
act_menu_select=menu_items.length-1;
break;
case DOWN:
if (act_menu_select<(menu_items.length-1)) act_menu_select++;
else act_menu_select=0;
if (act_menu_select<(menu_items.length-1))
act_menu_select++;
else
act_menu_select=0;
break;
}
329,7 → 333,8
 
int y;
 
int lcd_top= (state==STATEID_EDIT_PARAMS?0:25);
// int lcd_top= (state==STATEID_EDIT_PARAMS?0:25);
int lcd_top= 25;
max_lines=(canvas_height-lcd_top)/lcd_char_height;
 
int spacer_left_right=(canvas_width-(20*(lcd_img.getWidth()/222)))/2;
338,7 → 343,7
int display_lines=(lcd_lines.length>max_lines?max_lines:lcd_lines.length);
 
 
int lcd_off= (state==STATEID_EDIT_PARAMS?params_editor.act_y:act_menu_select)-display_lines+1;
int lcd_off= (((state==STATEID_EDIT_PARAMS)&&(!params_editor.select_mode))?params_editor.act_y:act_menu_select)-display_lines+1;
if ( lcd_off<0) lcd_off=0;
 
for(int i=0;i<display_lines;i++)
420,7 → 425,8
 
mk = new org.ligi.ufo.MKCommunicator();
helper = new DUBwiseHelper();
settings = new DUBwiseSettings();
settings = new DUBwiseSettings(this);
settings.load();
debug = new DUBwiseDebug(this);
 
//#if bluetooth=="on"
427,7 → 433,8
bt_scanner = new BTSearcher();
//#endif
 
params_editor = new MKParamsEditor(this);
 
 
//#if voice_mode!="no_voice"
status_voice=new MKStatusVoice(mk,this);
434,7 → 441,7
//#endif
load_images();
// load_images();
 
if (settings.connection_url!="")
connect_mk(settings.connection_url,settings.connection_name);
1175,13 → 1182,17
 
break;
 
case STATEID_SETTINGSMENU:
 
settings_editor.paint(g);
break;
// falltru wanted
case STATEID_SELECT_SPEED_FORMAT:
case STATEID_SELECT_GPS_FORMAT:
// case STATEID_SELECT_SPEED_FORMAT:
// case STATEID_SELECT_GPS_FORMAT:
case STATEID_MAINMENU:
 
case STATEID_SETTINGSMENU:
 
 
case STATEID_SELECT_PARAMSET:
case STATEID_HANDLE_PARAMS:
1369,10 → 1380,16
 
public void chg_state(byte next_state)
{
settings_editor = null;
params_editor = null;
 
if (next_state!=state)act_menu_select=0;
// prepare next state
switch(next_state)
{
case STATEID_EDIT_PARAMS:
params_editor = new MKParamsEditor(this,mk.params,STATEID_HANDLE_PARAMS);
break;
case STATEID_STRINGINPUT:
lcd_lines=new String[2];
lcd_lines[0]=act_input_str;
1482,17 → 1499,8
setup_menu(conn_details_menu_items,conn_details_menu_actions);
break;
 
case STATEID_SELECT_GPS_FORMAT:
setup_menu(set_gps_format_menu_items,set_gps_format_menu_actions);
 
break;
 
 
case STATEID_SELECT_SPEED_FORMAT:
setup_menu(set_speed_format_menu_items,set_speed_format_menu_actions);
 
break;
 
case STATEID_TRAFFIC:
setup_menu(onlyback_menu_items,back_to_conndetails_actions);
break;
1591,7 → 1599,8
break;
 
case STATEID_SETTINGSMENU:
settings_editor = new MKParamsEditor(this,settings,STATEID_MAINMENU);
/*
menu_items=new String[settings_menu_items.length];
for(int cnt=0;cnt<settings_menu_items.length;cnt++)
menu_items[cnt]=settings_menu_items[cnt];
1609,7 → 1618,7
//#endif
menu_items[8]+=(!settings.expert_mode)?" Off":" On";
menu_actions=settings_menu_actions;
lcd_lines=new String[menu_items.length];
lcd_lines=new String[menu_items.length];*/
break;
 
case STATEID_RAWDEBUG:
1665,15 → 1674,15
mk.extern_control[EXTERN_CONTROL_GIER]=(byte)(mul*settings.default_extern_control[EXTERN_CONTROL_GIER]);
 
else if (keyCode==this.KEY_NUM1)
mk.extern_control[EXTERN_CONTROL_HIGHT]+=mul;
mk.extern_control[EXTERN_CONTROL_HIGHT]+=mul*settings.default_extern_control[EXTERN_CONTROL_HIGHT];
else if (keyCode==this.KEY_NUM4)
mk.extern_control[EXTERN_CONTROL_HIGHT]-=mul;
mk.extern_control[EXTERN_CONTROL_HIGHT]-=mul*settings.default_extern_control[EXTERN_CONTROL_HIGHT];
 
 
else if (keyCode==this.KEY_NUM6)
{ if ( mk.extern_control[EXTERN_CONTROL_GAS]<255) mk.extern_control[EXTERN_CONTROL_GAS]+=mul; }
{ if ( mk.extern_control[EXTERN_CONTROL_GAS]<255) mk.extern_control[EXTERN_CONTROL_GAS]+=mul*settings.default_extern_control[EXTERN_CONTROL_GAS]; }
else if (keyCode==this.KEY_NUM9)
{ if ( mk.extern_control[EXTERN_CONTROL_GAS]>0) mk.extern_control[EXTERN_CONTROL_GAS]-=mul; }
{ if ( mk.extern_control[EXTERN_CONTROL_GAS]>0) mk.extern_control[EXTERN_CONTROL_GAS]-=mul*settings.default_extern_control[EXTERN_CONTROL_GAS]; }
 
else switch (getGameAction (keyCode))
{
1773,8 → 1782,8
 
if ((keyCode==KEY_POUND)&&(state!=STATEID_KEYCONTROL))
{
settings.fullscreen=!settings.fullscreen;
setFullScreenMode(settings.fullscreen);
settings.toggle_fullscreen();
 
return;
}
 
2096,14 → 2105,17
 
//#endif
 
case STATEID_SETTINGSMENU:
settings_editor.keypress(keyCode,getGameAction (keyCode)) ;
break;
 
// handle menue
case STATEID_SELECT_SPEED_FORMAT:
case STATEID_SELECT_GPS_FORMAT:
// case STATEID_SELECT_SPEED_FORMAT:
// case STATEID_SELECT_GPS_FORMAT:
case STATEID_TRAFFIC:
case STATEID_CONN_DETAILS:
case STATEID_HANDLE_PARAMS:
case STATEID_SETTINGSMENU:
 
case STATEID_MAINMENU:
 
if ( getGameAction (keyCode)==FIRE )
2110,16 → 2122,19
{
switch(menu_actions[act_menu_select])
{
 
/*
case ACTIONID_TOGGLE_EXPERT:
settings.expert_mode=!settings.expert_mode;
chg_state(STATEID_SETTINGSMENU);
break;
*/
case ACTIONID_RENAME_PARAMS:
act_input_str=mk.params.names[mk.params.act_paramset];
ipinput_pos=0;
chg_state(STATEID_STRINGINPUT);
break;
 
/*
case ACTIONID_SET_SPEED_FORMAT_CMS:
mk.gps_position.act_speed_format=SPEED_FORMAT_CMS;
chg_state(STATEID_SETTINGSMENU);
2153,7 → 2168,7
 
case ACTIONID_SELECT_GPS_FORMAT:
chg_state(STATEID_SELECT_GPS_FORMAT);
break;
break; */
 
case ACTIONID_BACK_TO_CONNDETAILS:
chg_state(STATEID_CONN_DETAILS);
2261,12 → 2276,7
 
break;
 
case ACTIONID_CHANGESKIN:
settings.act_skin++;
settings.act_skin=(byte)(settings.act_skin%2);
load_images();
chg_state(STATEID_SETTINGSMENU);
break;
 
case ACTIONID_SOUNDTOGGLE:
settings.do_sound=!settings.do_sound;
chg_state(STATEID_SETTINGSMENU);
2276,19 → 2286,6
chg_state(STATEID_SETTINGSMENU);
break;
 
case ACTIONID_GRAPHTOGGLE:
settings.do_scrollbg=!settings.do_scrollbg;
load_images();
chg_state(STATEID_SETTINGSMENU);
break;
 
 
case ACTIONID_FULLSCREENTOGGLE:
settings.fullscreen=!settings.fullscreen;
setFullScreenMode(settings.fullscreen);
chg_state(STATEID_SETTINGSMENU);
break;
 
//#if devicecontrol=="on"
case ACTIONID_LIGHTTOGGLE:
settings.keep_lighton =!settings.keep_lighton;