Skip to content

Commit 2f4d1c1

Browse files
liuwenlongliuwenlong
committed
修改UI
1 parent 0c1b9d5 commit 2f4d1c1

File tree

4 files changed

+131
-118
lines changed

4 files changed

+131
-118
lines changed

‎apps/player/SettingsView.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ namespace mango
131131

132132
void SettingsView::initAdvanceList(){
133133
int img[]={IDP_ADVANCE_LANGUGE,IDP_ADVANCE_DISPLAY,IDP_ADVANCE_BATTARY,IDP_ADVANCE_LIBRARY,IDP_ADVANCE_SYSTEM_INFO,IDP_SYSTEM_RESET,IDP_ADVANCE_SYSTEM_INFO};
134-
int imgsec[]={IDP_ADVANCE_LANGUGE_S,IDP_ADVANCE_DISPLAY_S,IDP_ADVANCE_BATTARY_S,IDP_ADVANCE_LIBRARY,IDP_ADVANCE_SYSTEM_INFO_S,IDP_SYSTEM_RESET_S,IDP_ADVANCE_SYSTEM_INFO_S};
134+
int imgsec[]={IDP_ADVANCE_LANGUGE_S,IDP_ADVANCE_DISPLAY_S,IDP_ADVANCE_BATTARY_S,IDP_ADVANCE_LIBRARY_S,IDP_ADVANCE_SYSTEM_INFO_S,IDP_SYSTEM_RESET_S,IDP_ADVANCE_SYSTEM_INFO_S};
135135
int text[]={STR_ADVANCE_LANGUAGE,STR_ADVANCE_DISPLAY,STR_ADVANCE_POWER,STR_RESCAN_LIBRARY,STR_ADVANCE_SYSINFO,STR_SYSTEM_RESTET,STR_SYSTEM_UPDATE};
136136

137137
int i,count = sizeof(img)/sizeof(int);
@@ -159,7 +159,7 @@ namespace mango
159159
}
160160
void SettingsView::initMainList(){
161161
int img[]={IDP_SETTING_EQ,IDP_SETTING_PLAYORDER,IDP_SETTING_GAPLESS,IDP_SETTING_MUSICINFO,IDB_DUSBOTG_ICON,IDP_SETTING_ADVANCED};
162-
int imgsec[]={IDP_SETTING_EQ_S,IDP_SETTING_PLAYORDER_S,IDP_SETTING_GAPLESS_S,IDP_SETTING_MUSICINFO_S,IDB_DUSBOTG_ICON,IDP_SETTING_ADVANCED_S};
162+
int imgsec[]={IDP_SETTING_EQ_S,IDP_SETTING_PLAYORDER_S,IDP_SETTING_GAPLESS_S,IDP_SETTING_MUSICINFO_S,IDB_DUSBOTG_ICON_S,IDP_SETTING_ADVANCED_S};
163163
int text[]={STR_SETTING_EQ,STR_SETTING_PLAYOODER,STR_SETTING_GAPLESS,STR_SETTING_MUSICINFO,STR_USB_CONECT_SETTING,STR_SETTING_ADVANCED};
164164
int i,count = sizeof(img)/sizeof(int);
165165

‎apps/player/mediaView.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ namespace mango
405405
}
406406
void MediaView::initRootDirect(){
407407
int img[]={IDP_DFLASH_ICON,IDP_DSDCARD_ICON,IDB_DUSBOTG_ICON};
408-
int imgsec[]={IDP_DFLASH_ICON,IDP_DSDCARD_ICON,IDB_DUSBOTG_ICON};
408+
int imgsec[]={IDP_DFLASH_ICON_S,IDP_DSDCARD_ICON_S,IDB_DUSBOTG_ICON_S};
409409
int text[]={STR_D_FLASH,STR_D_SDCAR,STR_D_USBOTG};
410410
int i,count = 3;
411411

@@ -423,6 +423,8 @@ namespace mango
423423

424424
int img[]={IDP_PLAYING_LIST,IDP_FILE_LIST,IDP_PLAYLIST_LIST,
425425
IDP_ALL_MUSIC,IDP_ALBUM_LIST,IDP_ARTIST_LIST,IDP_GENRE_LIST};
426+
int sec[]={IDP_PLAYING_LIST_S,IDP_FILE_LIST_S,IDP_PLAYLIST_LIST_S,
427+
IDP_ALL_MUSIC_S,IDP_ALBUM_LIST_S,IDP_ARTIST_LIST_S,IDP_GENRE_LIST_S};
426428
int til[]={STR_PLAYING_LIST,STR_FILE_LIST,STR_LAYLIST_LIST,
427429
STR_MUSIC_LIST,STR_ALBUM_LIST,STR_ARTIST_LIST,STR_GENRE_LIST};
428430
int i,count = 7;
@@ -436,7 +438,7 @@ namespace mango
436438
#else
437439
if(mMainListAdapter == NULL){
438440
mMainListAdapter = new MainListAdapter(mListView,ADAPTER_PLAYING);
439-
mMainListAdapter->setData(img,img,til,count);
441+
mMainListAdapter->setData(img,sec,til,count);
440442
}else{
441443
log_i("mMainListAdapter->refresh()");
442444
mListView->deleteAllItems();

‎apps/player/playingView.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace mango
5252
mNextButton->setPressedImageId(IDP_PLAYING_NEXT_ACTIVE);
5353
mNextButton->onCreate();
5454

55-
rect.setEx(145, 178, 32, 23);
55+
rect.setEx(145, 178, 32, 30);
5656
mPlayButton = new Button(PLAYING_IDB_PLAY, TEXT("mPlayButton"), this, &rect, 0);
5757
mPlayButton->setNormalImageId(IDP_PLAYING_PLAY_ACTIVE);
5858
mPlayButton->setPressedImageId(IDP_PLAYING_PLAY_ACTIVE);

‎apps/player/resource.h

Lines changed: 124 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Module Name:
2121
2222
Revision History:
2323
24-
2014-4-1 20:10:4 Created by Fibo Lu
24+
2014-4-2 18:44:7 Created by Fibo Lu
2525
2626
--*/
2727

@@ -160,117 +160,128 @@ Revision History:
160160
//
161161
#define DPI_VOLUME_ICON 0x05A1
162162
#define IDB_DUSBOTG_ICON 0x05A2
163-
#define IDP_ADVANCE_BATTARY 0x05A3
164-
#define IDP_ADVANCE_BATTARY_S 0x05A4
165-
#define IDP_ADVANCE_DISPLAY 0x05A5
166-
#define IDP_ADVANCE_DISPLAY_S 0x05A6
167-
#define IDP_ADVANCE_LANGUGE 0x05A7
168-
#define IDP_ADVANCE_LANGUGE_S 0x05A8
169-
#define IDP_ADVANCE_LIBRARY 0x05A9
170-
#define IDP_ADVANCE_SYSTEM_INFO 0x05AA
171-
#define IDP_ADVANCE_SYSTEM_INFO_S 0x05AB
172-
#define IDP_ALBUM_LIST 0x05AC
173-
#define IDP_ALL_MUSIC 0x05AD
174-
#define IDP_ARTIST_LIST 0x05AE
175-
#define IDP_BACKGROUND_BOTTOM 0x05AF
176-
#define IDP_BATTERY_0 0x05B0
177-
#define IDP_BATTERY_10 0x05B1
178-
#define IDP_BATTERY_100 0x05B2
179-
#define IDP_BATTERY_20 0x05B3
180-
#define IDP_BATTERY_40 0x05B4
181-
#define IDP_BATTERY_60 0x05B5
182-
#define IDP_BATTERY_80 0x05B6
183-
#define IDP_BATTERY_CHAGER 0x05B7
184-
#define IDP_BATTERY_ICON 0x05B8
185-
#define IDP_DEFAULT_ALBUM_ICON 0x05B9
186-
#define IDP_DFLASH_ICON 0x05BA
187-
#define IDP_DSDCARD_ICON 0x05BB
188-
#define IDP_EQ_MODE_BGD 0x05BC
189-
#define IDP_EQ_MODE_BGD_DS 0x05BD
190-
#define IDP_EQ_MODE_BGD_S 0x05BE
191-
#define IDP_EQ_SEEKBAR 0x05BF
192-
#define IDP_EQ_SEEKBAR_THUMB 0x05C0
193-
#define IDP_FILE_LIST 0x05C1
194-
#define IDP_FOLDER_ICON 0x05C2
195-
#define IDP_GENRE_LIST 0x05C3
196-
#define IDP_KEY_LOCK 0x05C4
197-
#define IDP_LISTICON_ALBUM 0x05C5
198-
#define IDP_LIST_GENRE_ICON 0x05C6
199-
#define IDP_LISTICON_ARTIST 0x05C7
200-
#define IDP_LISTICON_MUSIC 0x05C8
201-
#define IDP_LISTICON_PLAYING 0x05C9
202-
#define IDP_LISTITEM_BGD 0x05CA
203-
#define IDP_LISTITEM_BGD_SEC 0x05CB
204-
#define IDP_LISTITEM_NO_SEC 0x05CC
205-
#define IDP_LISTITEM_SEC 0x05CD
206-
#define IDP_MEDIA_SCAN_STOP_D 0x05CE
207-
#define IDP_MUSICINFO_ICON 0x05CF
208-
#define IDP_MUSIC_WMA 0x05D0
209-
#define IDP_MUSIC_WAV 0x05D1
210-
#define IDP_MUSIC_TITLEBAR 0x05D2
211-
#define IDP_MUSIC_PLAYLIST_ICO 0x05D3
212-
#define IDP_MUSIC_ORDERBY 0x05D4
213-
#define IDP_MUSIC_OGG 0x05D5
214-
#define IDP_MUSIC_NEW_PLAYLIST 0x05D6
215-
#define IDP_MUSIC_M4A 0x05D7
216-
#define IDP_MUSIC_ICON 0x05D8
217-
#define IDP_MUSIC_HOME_SEC 0x05D9
218-
#define IDP_MUSIC_HOME 0x05DA
219-
#define IDP_MUSIC_FLAC 0x05DB
220-
#define IDP_MUSIC_DSF 0x05DC
221-
#define IDP_MUSIC_APE 0x05DD
222-
#define IDP_MUSIC_AIFF 0x05DE
223-
#define IDP_MUSIC_AIF 0x05DF
224-
#define IDP_MUSIC_AAC 0x05E0
225-
#define IDP_MUSICINFO_ICON_DX90 0x05E1
226-
#define IDP_ORDER_SEC 0x05E2
227-
#define IDP_PLAYING_BACKGROUND 0x05E3
228-
#define IDP_PLAYING_LIST 0x05E4
229-
#define IDP_PLAYING_LIST_BACK 0x05E5
230-
#define IDP_PLAYING_MUSICNAME_BK 0x05E6
231-
#define IDP_PLAYING_MUSIC_ADD_PLAYLIST 0x05E7
232-
#define IDP_PLAYING_NAME_BK2 0x05E8
233-
#define IDP_PLAYING_NEXT_ACTIVE 0x05E9
234-
#define IDP_PLAYING_NEXT_INACTIVE 0x05EA
235-
#define IDP_PLAYING_PAUSE 0x05EB
236-
#define IDP_PLAYING_PLAY_ACTIVE 0x05EC
237-
#define IDP_PLAYING_PREV_ACTIVE 0x05ED
238-
#define IDP_PLAYING_PREV_INACTIVE 0x05EE
239-
#define IDP_PLAYLIST_LIST 0x05EF
240-
#define IDP_PLAYMODE_0 0x05F0
241-
#define IDP_PLAYMODE_0_S 0x05F1
242-
#define IDP_PLAYMODE_1 0x05F2
243-
#define IDP_PLAYMODE_1_S 0x05F3
244-
#define IDP_PLAYMODE_2 0x05F4
245-
#define IDP_PLAYMODE_2_S 0x05F5
246-
#define IDP_PLAYMODE_3 0x05F6
247-
#define IDP_PLAYMODE_3_S 0x05F7
248-
#define IDP_SDCARD_INSERT 0x05F8
249-
#define IDP_SEEKBAR_BKG 0x05F9
250-
#define IDP_SEEKBAR_SEEK 0x05FA
251-
#define IDP_SEEKBAR_THUMB 0x05FB
252-
#define IDP_SETTING_ADVANCED 0x05FC
253-
#define IDP_SETTING_ADVANCED_S 0x05FD
254-
#define IDP_SETTING_BACK 0x05FE
255-
#define IDP_SETTING_BACK_SEC 0x05FF
256-
#define IDP_SETTING_BGD 0x0600
257-
#define IDP_SETTING_EQ 0x0601
258-
#define IDP_SETTING_EQ_S 0x0602
259-
#define IDP_SETTING_GAPLESS 0x0603
260-
#define IDP_SETTING_GAPLESS_S 0x0604
261-
#define IDP_SETTING_MUSICINFO 0x0605
262-
#define IDP_SETTING_MUSICINFO_S 0x0606
263-
#define IDP_SETTING_PLAYORDER 0x0607
264-
#define IDP_SETTING_PLAYORDER_S 0x0608
265-
#define IDP_SHUTDOWM_LOGO 0x0609
266-
#define IDP_SHUTDOWM_LOGO_DX90 0x060A
267-
#define IDP_STORAGE_SPACE 0x060B
268-
#define IDP_STORAGE_USE 0x060C
269-
#define IDP_SYSTEM_RESET 0x060D
270-
#define IDP_SYS_FUNCTION 0x060E
271-
#define IDP_SYSTEM_RESET_S 0x060F
272-
#define IDP_USB_CONECT 0x0610
273-
#define IDP_VULUME_ICON 0x0611
274-
#define IDP_VULUME_ICON_BK 0x0612
163+
#define IDB_DUSBOTG_ICON_S 0x05A3
164+
#define IDP_ADVANCE_BATTARY 0x05A4
165+
#define IDP_ADVANCE_BATTARY_S 0x05A5
166+
#define IDP_ADVANCE_DISPLAY 0x05A6
167+
#define IDP_ADVANCE_DISPLAY_S 0x05A7
168+
#define IDP_ADVANCE_LANGUGE 0x05A8
169+
#define IDP_ADVANCE_LANGUGE_S 0x05A9
170+
#define IDP_ADVANCE_LIBRARY 0x05AA
171+
#define IDP_ADVANCE_LIBRARY_S 0x05AB
172+
#define IDP_ADVANCE_SYSTEM_INFO 0x05AC
173+
#define IDP_ADVANCE_SYSTEM_INFO_S 0x05AD
174+
#define IDP_ALBUM_LIST 0x05AE
175+
#define IDP_ALBUM_LIST_S 0x05AF
176+
#define IDP_ALL_MUSIC 0x05B0
177+
#define IDP_ALL_MUSIC_S 0x05B1
178+
#define IDP_ARTIST_LIST 0x05B2
179+
#define IDP_ARTIST_LIST_S 0x05B3
180+
#define IDP_BACKGROUND_BOTTOM 0x05B4
181+
#define IDP_BATTERY_0 0x05B5
182+
#define IDP_BATTERY_10 0x05B6
183+
#define IDP_BATTERY_100 0x05B7
184+
#define IDP_BATTERY_20 0x05B8
185+
#define IDP_BATTERY_40 0x05B9
186+
#define IDP_BATTERY_60 0x05BA
187+
#define IDP_BATTERY_80 0x05BB
188+
#define IDP_BATTERY_CHAGER 0x05BC
189+
#define IDP_BATTERY_ICON 0x05BD
190+
#define IDP_DEFAULT_ALBUM_ICON 0x05BE
191+
#define IDP_DFLASH_ICON 0x05BF
192+
#define IDP_DFLASH_ICON_S 0x05C0
193+
#define IDP_DSDCARD_ICON 0x05C1
194+
#define IDP_DSDCARD_ICON_S 0x05C2
195+
#define IDP_EQ_MODE_BGD 0x05C3
196+
#define IDP_EQ_MODE_BGD_DS 0x05C4
197+
#define IDP_EQ_MODE_BGD_S 0x05C5
198+
#define IDP_EQ_SEEKBAR 0x05C6
199+
#define IDP_EQ_SEEKBAR_THUMB 0x05C7
200+
#define IDP_FILE_LIST 0x05C8
201+
#define IDP_FILE_LIST_S 0x05C9
202+
#define IDP_FOLDER_ICON 0x05CA
203+
#define IDP_GENRE_LIST 0x05CB
204+
#define IDP_GENRE_LIST_S 0x05CC
205+
#define IDP_KEY_LOCK 0x05CD
206+
#define IDP_LISTICON_ALBUM 0x05CE
207+
#define IDP_LIST_GENRE_ICON 0x05CF
208+
#define IDP_LISTICON_ARTIST 0x05D0
209+
#define IDP_LISTICON_MUSIC 0x05D1
210+
#define IDP_LISTICON_PLAYING 0x05D2
211+
#define IDP_LISTITEM_BGD 0x05D3
212+
#define IDP_LISTITEM_BGD_SEC 0x05D4
213+
#define IDP_LISTITEM_NO_SEC 0x05D5
214+
#define IDP_LISTITEM_SEC 0x05D6
215+
#define IDP_MEDIA_SCAN_STOP_D 0x05D7
216+
#define IDP_MUSICINFO_ICON 0x05D8
217+
#define IDP_MUSIC_WMA 0x05D9
218+
#define IDP_MUSIC_WAV 0x05DA
219+
#define IDP_MUSIC_TITLEBAR 0x05DB
220+
#define IDP_MUSIC_PLAYLIST_ICO 0x05DC
221+
#define IDP_MUSIC_ORDERBY 0x05DD
222+
#define IDP_MUSIC_OGG 0x05DE
223+
#define IDP_MUSIC_NEW_PLAYLIST 0x05DF
224+
#define IDP_MUSIC_M4A 0x05E0
225+
#define IDP_MUSIC_ICON 0x05E1
226+
#define IDP_MUSIC_HOME_SEC 0x05E2
227+
#define IDP_MUSIC_HOME 0x05E3
228+
#define IDP_MUSIC_FLAC 0x05E4
229+
#define IDP_MUSIC_DSF 0x05E5
230+
#define IDP_MUSIC_APE 0x05E6
231+
#define IDP_MUSIC_AIFF 0x05E7
232+
#define IDP_MUSIC_AIF 0x05E8
233+
#define IDP_MUSIC_AAC 0x05E9
234+
#define IDP_MUSICINFO_ICON_DX90 0x05EA
235+
#define IDP_ORDER_SEC 0x05EB
236+
#define IDP_PLAYING_BACKGROUND 0x05EC
237+
#define IDP_PLAYING_LIST 0x05ED
238+
#define IDP_PLAYING_LIST_BACK 0x05EE
239+
#define IDP_PLAYING_LIST_S 0x05EF
240+
#define IDP_PLAYING_MUSICNAME_BK 0x05F0
241+
#define IDP_PLAYING_MUSIC_ADD_PLAYLIST 0x05F1
242+
#define IDP_PLAYING_NAME_BK2 0x05F2
243+
#define IDP_PLAYING_NEXT_ACTIVE 0x05F3
244+
#define IDP_PLAYING_NEXT_INACTIVE 0x05F4
245+
#define IDP_PLAYING_PAUSE 0x05F5
246+
#define IDP_PLAYING_PLAY_ACTIVE 0x05F6
247+
#define IDP_PLAYING_PREV_ACTIVE 0x05F7
248+
#define IDP_PLAYING_PREV_INACTIVE 0x05F8
249+
#define IDP_PLAYLIST_LIST 0x05F9
250+
#define IDP_PLAYLIST_LIST_S 0x05FA
251+
#define IDP_PLAYMODE_0 0x05FB
252+
#define IDP_PLAYMODE_0_S 0x05FC
253+
#define IDP_PLAYMODE_1 0x05FD
254+
#define IDP_PLAYMODE_1_S 0x05FE
255+
#define IDP_PLAYMODE_2 0x05FF
256+
#define IDP_PLAYMODE_2_S 0x0600
257+
#define IDP_PLAYMODE_3 0x0601
258+
#define IDP_PLAYMODE_3_S 0x0602
259+
#define IDP_SDCARD_INSERT 0x0603
260+
#define IDP_SEEKBAR_BKG 0x0604
261+
#define IDP_SEEKBAR_SEEK 0x0605
262+
#define IDP_SEEKBAR_THUMB 0x0606
263+
#define IDP_SETTING_ADVANCED 0x0607
264+
#define IDP_SETTING_ADVANCED_S 0x0608
265+
#define IDP_SETTING_BACK 0x0609
266+
#define IDP_SETTING_BACK_SEC 0x060A
267+
#define IDP_SETTING_BGD 0x060B
268+
#define IDP_SETTING_EQ 0x060C
269+
#define IDP_SETTING_EQ_S 0x060D
270+
#define IDP_SETTING_GAPLESS 0x060E
271+
#define IDP_SETTING_GAPLESS_S 0x060F
272+
#define IDP_SETTING_MUSICINFO 0x0610
273+
#define IDP_SETTING_MUSICINFO_S 0x0611
274+
#define IDP_SETTING_PLAYORDER 0x0612
275+
#define IDP_SETTING_PLAYORDER_S 0x0613
276+
#define IDP_SHUTDOWM_LOGO 0x0614
277+
#define IDP_SHUTDOWM_LOGO_DX90 0x0615
278+
#define IDP_STORAGE_SPACE 0x0616
279+
#define IDP_STORAGE_USE 0x0617
280+
#define IDP_SYSTEM_RESET 0x0618
281+
#define IDP_SYS_FUNCTION 0x0619
282+
#define IDP_SYSTEM_RESET_S 0x061A
283+
#define IDP_USB_CONECT 0x061B
284+
#define IDP_VULUME_ICON 0x061C
285+
#define IDP_VULUME_ICON_BK 0x061D
275286
//--End Png from player
276287

0 commit comments

Comments
 (0)