--- icons-old.c 2003-11-14 20:23:38.427201600 -0800 +++ icons.c 2003-11-18 17:20:30.421289600 -0800 @@ -85,6 +85,8 @@ {0x3e,0x41,0x51,0x41,0x45,0x41,0x3e}, /* Shuffle playmode (dice) */ {0x04,0x0c,0x1c,0x3c,0x1c,0x0c,0x04}, /* Down-arrow */ {0x20,0x30,0x38,0x3c,0x38,0x30,0x20}, /* Up-arrow */ + {0x00,0xE9,0xAD,0xAF,0xAB,0xE9,0x00}, /* ON button */ + {0xFF,0x7E,0x3C,0x18,0xFF,0x00,0xFF}, /* Play/Pause combined */ }; unsigned char rockbox112x37[]={ --- icons-old.h 2003-11-14 20:23:52.227044800 -0800 +++ icons.h 2003-11-18 17:21:21.194297600 -0800 @@ -54,6 +54,8 @@ Icon_Shuffle, Icon_DownArrow, Icon_UpArrow, + Icon_OnButton, + Icon_PlayPause, Icon_Last }; --- screens-old.c 2003-11-14 20:22:45.541155200 -0800 +++ screens.c 2003-11-18 17:19:30.905710400 -0800 @@ -432,13 +432,37 @@ lcd_clear_display(); /* Shuffle mode */ - lcd_putsxy(0, LCD_HEIGHT/2 - h*2, str(LANG_SHUFFLE)); - lcd_putsxy(0, LCD_HEIGHT/2 - h, str(LANG_F2_MODE)); - lcd_putsxy(0, LCD_HEIGHT/2, - global_settings.playlist_shuffle ? + lcd_putsxy(10, 0, str(LANG_SHUFFLE)); + lcd_putsxy(57, 0, str(LANG_F2_MODE)); + lcd_putsxy(89, 0, + global_settings.playlist_shuffle ? str(LANG_ON) : str(LANG_OFF)); - lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], - LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); + lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], + 0, 1, 7, 8, true); + + + /* Repeat Mode */ + switch ( global_settings.repeat_mode ) { + case REPEAT_OFF: + ptr = str(LANG_OFF); + break; + + case REPEAT_ALL: + ptr = str(LANG_REPEAT_ALL); + break; + + case REPEAT_ONE: + ptr = str(LANG_REPEAT_ONE); + break; + } + + lcd_getstringsize(str(LANG_REPEAT),&w,&h); + lcd_putsxy(10, 11, str(LANG_REPEAT)); + lcd_putsxy(50, 11, str(LANG_F2_MODE)); + lcd_putsxy(83, 11, ptr); + lcd_bitmap(bitmap_icons_7x8[Icon_FastForward], + 0, 11, 7, 8, true); + /* Directory Filter */ switch ( global_settings.dirfilter ) { @@ -453,41 +477,41 @@ case SHOW_MUSIC: ptr = str(LANG_FILTER_MUSIC); break; - + case SHOW_PLAYLIST: ptr = str(LANG_FILTER_PLAYLIST); break; } - snprintf(buf, sizeof buf, "%s:", str(LANG_FILTER)); + snprintf(buf, sizeof buf, "%s", str(LANG_FILTER)); lcd_getstringsize(buf,&w,&h); - lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h*2, buf); + lcd_putsxy(10, 22, buf); lcd_getstringsize(ptr,&w,&h); - lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, ptr); + lcd_putsxy(43, 22, ptr); lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], - LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); - - /* Repeat Mode */ - switch ( global_settings.repeat_mode ) { - case REPEAT_OFF: - ptr = str(LANG_OFF); - break; + 0, 22, 7, 8, true); - case REPEAT_ALL: - ptr = str(LANG_REPEAT_ALL); - break; - case REPEAT_ONE: - ptr = str(LANG_REPEAT_ONE); - break; - } + /* Add to favorites.m3u */ + lcd_putsxy(10, 33, str(LANG_ADD_FAVS)); + lcd_bitmap(bitmap_icons_7x8[Icon_PlayPause], + 0, 33, 7, 8, true); + + /* Scroll Bar */ + lcd_putsxy(10, 44, str(LANG_F3_SCROLL)); + lcd_putsxy(50, 44, str(LANG_F3_BAR)); + lcd_putsxy(75, 44, + global_settings.scrollbar ? str(LANG_ON) : str(LANG_OFF)); + lcd_bitmap(bitmap_icons_7x8[Icon_UpArrow], + 0, 44, 7, 8, true); - lcd_getstringsize(str(LANG_REPEAT),&w,&h); - lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h*2, str(LANG_REPEAT)); - lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h, str(LANG_F2_MODE)); - lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2, ptr); - lcd_bitmap(bitmap_icons_7x8[Icon_FastForward], - LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8, true); + /* Status Bar */ + lcd_putsxy(10, 55, str(LANG_F3_STATUS)); + lcd_putsxy(50, 55, str(LANG_F3_BAR)); + lcd_putsxy(75, 55, + global_settings.statusbar ? str(LANG_ON) : str(LANG_OFF)); + lcd_bitmap(bitmap_icons_7x8[Icon_OnButton], + 0, 55, 7, 8, true); lcd_update(); @@ -507,6 +531,14 @@ used = true; break; + case BUTTON_RIGHT: + case BUTTON_F2 | BUTTON_RIGHT: + global_settings.repeat_mode++; + if ( global_settings.repeat_mode >= NUM_REPEAT_MODES ) + global_settings.repeat_mode = 0; + used = true; + break; + case BUTTON_DOWN: case BUTTON_F2 | BUTTON_DOWN: global_settings.dirfilter++; @@ -515,11 +547,21 @@ used = true; break; - case BUTTON_RIGHT: - case BUTTON_F2 | BUTTON_RIGHT: - global_settings.repeat_mode++; - if ( global_settings.repeat_mode >= NUM_REPEAT_MODES ) - global_settings.repeat_mode = 0; + case BUTTON_PLAY: + case BUTTON_F2 | BUTTON_PLAY: + plugin_load("/.rockbox/rocks/favorites.rock"); + return true; + return false; + + case BUTTON_UP: + case BUTTON_F2 | BUTTON_UP: + global_settings.scrollbar = !global_settings.scrollbar; + used = true; + break; + + case BUTTON_ON: + case BUTTON_F2 | BUTTON_ON: + global_settings.statusbar = !global_settings.statusbar; used = true; break; @@ -529,6 +571,13 @@ used = true; break; + case BUTTON_OFF: + case BUTTON_F2 | BUTTON_OFF: + if ( used ) + exit = true; + used = true; + break; + case BUTTON_F2 | BUTTON_REPEAT: used = true; break; --- english-old.lang 2003-11-14 20:24:24.253096000 -0800 +++ english.lang 2003-11-18 17:30:14.831630400 -0800 @@ -607,7 +607,7 @@ id: LANG_F3_BAR desc: in wps F3 pressed -eng: "Bar" +eng: "Bar:" new: id: LANG_END_PLAYLIST_PLAYER @@ -813,7 +813,7 @@ id: LANG_FILTER desc: setting name for dir filter -eng: "Show Files" +eng: "Show:" new: id: LANG_FILTER_MUSIC @@ -1817,3 +1817,8 @@ desc: in radio screen eng: "The preset list is full" new: + +id: LANG_ADD_FAVS +desc: in f2 screen +eng: "Add To Favorites" +new: