KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

Apps/downloader: Improved UI

Browse Source 
Fixed an issue in the UI: The user does not realize that the file
has already been downloaded and may want to click "Download" again.
This commit is contained in:
Kiril Lipatov
2025-02-26 22:37:12 +02:00
committed by Maxim Logaev
parent 84aec355b8
commit bf9f7d2a19
2 changed files with 163 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
programs/cmm/downloader/const.h
View File

@@ -6,12 +6,20 @@
#define T_CANCEL "<22>⬥<EFBFBD><E2ACA5>"
#define T_OPEN_DIR "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>"
#define T_RUN "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 䠩<>"
#define T_SPEED_TEST "<22><><EFBFBD><EFBFBD> ᪮<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
#define T_NEW "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>㧪<EFBFBD>"
#define T_SAVE_TO "<22><><EFBFBD>࠭<EFBFBD><E0A0AD><EFBFBD> <20>:"
#define T_AUTOCLOSE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD> <20><><EFBFBD><EFBFBD>㧪<EFBFBD>"
#define T_STATUS_READY "<22><>⮢ <20> <20><><EFBFBD><EFBFBD>㧪<EFBFBD> ^_^ "
#define T_STATUS_DOWNLOADING "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>㧪<EFBFBD> 䠩<><E4A0A9>... %i.%i M<> <20><><EFBFBD><EFBFBD>祭<EFBFBD> (%i K<>/<EFBFBD>) "
#define T_STATUS_COMPLETE "<22><><EFBFBD><EFBFBD>㧪<EFBFBD> <20>ᯥ譮 <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD>. "
#define T_STATUS_DL_P1 "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>㧪<EFBFBD> 䠩<><E4A0A9>... "
#define T_STATUS_DL_P2 " M<> <20><><EFBFBD><EFBFBD>祭<EFBFBD> ("
#define T_STATUS_DL_P3 " K<>/<EFBFBD>) "
#define FILE_SAVED_AS "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>㧮<EFBFBD>\n<><6E><EFBFBD><EFBFBD> <20><><EFBFBD>࠭<EFBFBD><E0A0AD> <20><><EFBFBD> %s' -Dt"
#define FILE_NOT_SAVED "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>㧮<EFBFBD>\n<>訡<EFBFBD><E8A8A1>! <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>࠭<EFBFBD><E0A0AD> <20><><EFBFBD>\n%s' -Et"
#define KB_RECEIVED "<22><><EFBFBD><EFBFBD> ᪠稢<E1AAA0><E7A8A2><EFBFBD><EFBFBD>: %i.%i M<> <20><><EFBFBD><EFBFBD>祭<EFBFBD> (%i K<>/<EFBFBD>) "
#define T_ERROR_STARTING_DOWNLOAD "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᪠稢<E1AAA0><E7A8A2><EFBFBD><EFBFBD>.\n<>஢<EFBFBD><E0AEA2><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> ᮥ<><E1AEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>୥⮬.' -E"
#define T_AUTOCLOSE "<22><>⮧<EFBFBD><E2AEA7><EFBFBD><EFBFBD>⨥"
char accept_language[]= "Accept-Language: ru\n";
#else
#define DL_WINDOW_HEADER "Download Manager"
@@ -19,20 +27,31 @@
#define T_CANCEL "Cancel"
#define T_OPEN_DIR " Show in folder "
#define T_RUN "Open file"
#define T_SPEED_TEST "Speed test"
#define T_NEW "New download"
#define T_SAVE_TO "Download to:"
#define T_AUTOCLOSE "Close this window when download completes"
#define T_STATUS_READY "Ready to download ^_^ "
#define T_STATUS_DOWNLOADING "Downloading... %i.%i MB received (%i KB/s) "
#define T_STATUS_COMPLETE "Download completed succesfully. "
#define T_STATUS_DL_P1 "Downloading... "
#define T_STATUS_DL_P2 " MB received ("
#define T_STATUS_DL_P3 " KB/s) "
#define FILE_SAVED_AS "'Download manager\nFile saved as %s' -Dt"
#define FILE_NOT_SAVED "'Download manager\nError! Can\96t save file as %s' -Et"
#define KB_RECEIVED "Downloading: %i.%i MB received (%i KB/s) "
#define T_ERROR_STARTING_DOWNLOAD "'Error while starting download process.\nCheck entered path and Internet connection.' -E"
#define T_AUTOCLOSE "Autoclose"
char accept_language[]= "Accept-Language: en\n";
#endif
#define GAPX 15
#define WIN_W 540
#define WIN_H 100
#define WIN_W 526
#define WIN_H 195
#define GAPX 15
#define BUT_W 148
#define DEFAULT_SAVE_DIR "/tmp0/1/Downloads"
char save_dir[] = "/tmp0/1/Downloads";
char dl_shared[] = "DL";
#define URL_SPEED_TEST "http://speedtest.tele2.net/100MB.zip"
@@ -43,4 +62,9 @@ enum {
BTN_STOP,
BTN_DIR,
BTN_RUN,
};
BTN_NEW
};
#define PB_COL_ERROR 0xF55353
#define PB_COL_PROGRESS 0x297FFD
#define PB_COL_COMPLETE 0x74DA00