KolibriOS/kolibrios
12
4
Fork 13
Code Issues 78 Pull Requests 6 Projects Releases Activity

Pixie 2.91: Shift+Delete permanently deletes selected file

Browse Source 
git-svn-id: svn://kolibrios.org@7347 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2018-09-10 18:52:48 +00:00
parent bafa916623
commit 3dd78a9d88
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
programs/cmm/pixie2/get_files_list.h
View File

@ -15,7 +15,6 @@ void OpenDirectory(dword folder_path)
{ {
notify("'Error opening folder' -E"); notify("'Error opening folder' -E");
} }
debugval("sizeof(files_mas)", sizeof(files_mas));
for (j=0; j<filesnum; j++) for (j=0; j<filesnum; j++)
{ {
strcpy(#temp_filename, j*304 + buf+72); strcpy(#temp_filename, j*304 + buf+72);
@ -53,6 +52,11 @@ void SetOpenedFileFirst(dword in_name)
} }
} }
dword Getcur_yItemName() { dword GetPlayingItemName() {
return files_mas[current_playing_file_n]*304 + buf+72; return files_mas[current_playing_file_n]*304 + buf+72;
} }
dword GetSelectedItemName() {
int cury = list.cur_y;
return files_mas[cury]*304 + buf+72;
}

25
programs/cmm/pixie2/pixie.c
View File

@ -30,7 +30,7 @@
char default_dir[] = "/rd/1"; char default_dir[] = "/rd/1";
od_filter filter2 = { 15, "MP3\0WAV\0XM\0\0" }; od_filter filter2 = { 15, "MP3\0WAV\0XM\0\0" };
#define ABOUT_MESSAGE "Pixie Player v2.9 Final #define ABOUT_MESSAGE "Pixie Player v2.91 Final
A tiny music folder player. A tiny music folder player.
Supports MP3, WAV, XM audio file formats. Supports MP3, WAV, XM audio file formats.
@ -42,6 +42,7 @@ Hot keys:
Goto next/previous track: Ctrl + Left/Right Goto next/previous track: Ctrl + Left/Right
Change sound volume: Left/Right key Change sound volume: Left/Right key
Remove from the list: Delete Remove from the list: Delete
Permanently delete file: Shift + Delete
Repeat: R Repeat: R
Shuffle: S Shuffle: S
Mute: M Mute: M
@ -169,7 +170,11 @@ void main()
if (key_scancode==SCAN_CODE_LEFT) EventPlaybackPrevious(); if (key_scancode==SCAN_CODE_LEFT) EventPlaybackPrevious();
if (key_scancode==SCAN_CODE_RIGHT) EventPlaybackNext(); if (key_scancode==SCAN_CODE_RIGHT) EventPlaybackNext();
break; break;
} }
if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) {
if (key_scancode==SCAN_CODE_DEL) EventPermanentlyDeleteFile();
break;
}
if (key_scancode==SCAN_CODE_KEY_O) EventFileDialogOpen(); if (key_scancode==SCAN_CODE_KEY_O) EventFileDialogOpen();
if (key_scancode==SCAN_CODE_KEY_M) RunProgram("/sys/@VOLUME", "m"); if (key_scancode==SCAN_CODE_KEY_M) RunProgram("/sys/@VOLUME", "m");
if (key_scancode==SCAN_CODE_KEY_R) EventRepeatClick(); if (key_scancode==SCAN_CODE_KEY_R) EventRepeatClick();
@ -177,7 +182,7 @@ void main()
if (key_scancode==SCAN_CODE_RIGHT) RunProgram("/sys/@VOLUME", "+"); if (key_scancode==SCAN_CODE_RIGHT) RunProgram("/sys/@VOLUME", "+");
if (key_scancode==SCAN_CODE_LEFT) RunProgram("/sys/@VOLUME", "-"); if (key_scancode==SCAN_CODE_LEFT) RunProgram("/sys/@VOLUME", "-");
if (key_scancode==SCAN_CODE_ENTER) EventStartPlayingSelectedItem(); if (key_scancode==SCAN_CODE_ENTER) EventStartPlayingSelectedItem();
if (key_scancode==SCAN_CODE_DEL) EventDeleteItem(); if (key_scancode==SCAN_CODE_DEL) EventRemoveItemFromList();
if (key_scancode==SCAN_CODE_KEY_P)||(key_scancode==SCAN_CODE_SPACE) EventPlayAndPause(); if (key_scancode==SCAN_CODE_KEY_P)||(key_scancode==SCAN_CODE_SPACE) EventPlayAndPause();
if (key_scancode==SCAN_CODE_F1) EventShowAbout(); if (key_scancode==SCAN_CODE_F1) EventShowAbout();
if (list.ProcessKey(key_scancode)) DrawPlayList(); if (list.ProcessKey(key_scancode)) DrawPlayList();
@ -392,7 +397,7 @@ void EventStartPlaying()
return; return;
} }
playback_mode = PLAYBACK_MODE_PLAYING; playback_mode = PLAYBACK_MODE_PLAYING;
strlcpy(#current_filename, Getcur_yItemName(), sizeof(current_filename)); strlcpy(#current_filename, GetPlayingItemName(), sizeof(current_filename));
sprintf(#item_path,"-h %s/%s",#work_folder,#current_filename); sprintf(#item_path,"-h %s/%s",#work_folder,#current_filename);
current_filename[strrchr(#current_filename, '.')-1] = '\0'; current_filename[strrchr(#current_filename, '.')-1] = '\0';
DrawPlayList(); DrawPlayList();
@ -500,7 +505,7 @@ void EventShuffleClick()
DrawTopPanel(); DrawTopPanel();
} }
void EventDeleteItem() void EventRemoveItemFromList()
{ {
int i; int i;
if (list.cur_y == current_playing_file_n) EventStopPlaying(); if (list.cur_y == current_playing_file_n) EventStopPlaying();
@ -517,6 +522,14 @@ void EventDeleteItem()
else DrawPlayList(); else DrawPlayList();
} }
void EventPermanentlyDeleteFile()
{
char item_path[4096];
sprintf(#item_path,"%s/%s",#work_folder,GetSelectedItemName());
DeleteFile(#item_path);
EventRemoveItemFromList();
}
void EventShowAbout() void EventShowAbout()
{ {
CreateThread(#ShowAboutThread,#menu_stak+4092); CreateThread(#ShowAboutThread,#menu_stak+4092);
@ -535,7 +548,7 @@ void ShowAboutThread()
if (key_scancode == SCAN_CODE_ESC) ExitProcess(); if (key_scancode == SCAN_CODE_ESC) ExitProcess();
break; break;
case evReDraw: case evReDraw:
DefineDragableWindow(150, 200, 400, 346); DefineDragableWindow(150, 200, 400, 368);
GetProcessInfo(#pop_up, SelfInfo); GetProcessInfo(#pop_up, SelfInfo);
DrawBar(0, 0, pop_up.width, pop_up.height, theme.color_top_panel_bg); DrawBar(0, 0, pop_up.width, pop_up.height, theme.color_top_panel_bg);