diff --git a/data/common/icons32.png b/data/common/icons32.png index 5e9faf8511..140cdc4f3d 100644 Binary files a/data/common/icons32.png and b/data/common/icons32.png differ diff --git a/data/common/settings/syspanel.ini b/data/common/settings/syspanel.ini index 5c206d5c54..0276bc4e6c 100644 --- a/data/common/settings/syspanel.ini +++ b/data/common/settings/syspanel.ini @@ -1,6 +1,6 @@ [Config] title=KolibriOS System Panel -win_width=670 +win_width=680 cell_w=82 cell_h=78 @@ -28,13 +28,15 @@ GhostMonitor=gmon,107 SysMonitor=sysmon,57 Processes=cpu,60 Clipboard=develop/clipview,83 +PciDevice=pcidev,38 +AMDtemp=/k/utils/AMDtemp,128 [Testing] -Protection=test,37 CpuID=cpuid,37 Display=disptest,113 File Speed=fspeed,45 HDDinfo=hdd_info,50 BusOff=kbd,37 -GraphicBench=mgb,121 -PciDevice=pcidev,38 \ No newline at end of file +Protection=test,37 +Graphic Bench=mgb,121 +Network Speed=network/dl|-test,51 \ No newline at end of file diff --git a/data/rus/settings/syspanel.ini b/data/rus/settings/syspanel.ini index bb1f5df073..5d1a0d4062 100644 --- a/data/rus/settings/syspanel.ini +++ b/data/rus/settings/syspanel.ini @@ -28,13 +28,15 @@ Ghost monitor=gmon,107 Системный монитор=sysmon,57 Процессы=cpu,60 Буфер обмена=develop/clipview,83 +Устройства PCI=pcidev,38 +AMDtemp=/k/utils/AMDtemp,128 [Тестирование] -Тест защиты=test,37 CpuId=cpuid,37 Экран=disptest,113 Скорость ФС=fspeed,45 Информация о дисках=hdd_info,50 Шина=kbd,37 +Тест защиты=test,37 Скорость графики=mgb,121 -Устройства PCI=pcidev,38 \ No newline at end of file +Скорость сети=network/dl|-test,51 \ No newline at end of file diff --git a/programs/cmm/browser/res/test.htm b/programs/cmm/browser/res/test.htm index dd9f2df789..ebd52a6e4d 100644 --- a/programs/cmm/browser/res/test.htm +++ b/programs/cmm/browser/res/test.htm @@ -34,4 +34,5 @@ Complex: artcon.ru nubo.ru salinc.ru -electromyne.de \ No newline at end of file +electromyne.de +tom's hardware \ No newline at end of file diff --git a/programs/cmm/downloader/const.h b/programs/cmm/downloader/const.h index c126c3fabc..8d5cdc7555 100644 --- a/programs/cmm/downloader/const.h +++ b/programs/cmm/downloader/const.h @@ -6,11 +6,13 @@ #define T_CANCEL "Отмена" #define T_OPEN_DIR "Показать в папке" #define T_RUN "Открыть файл" + #define T_SPEED_TEST "Тест скорости" #define FILE_SAVED_AS "'Менеджер загрузок\nФайл сохранен как %s' -Dt" #define FILE_NOT_SAVED "'Менеджер загрузок\nОшибка! Файл не может быть сохранен как\n%s' -Et" #define KB_RECEIVED "Идет скачивание... %s получено" #define T_ERROR_STARTING_DOWNLOAD "'Невозможно начать скачивание.\nПроверьте введенный путь и соединение с Интернетом.' -E" #define T_AUTOCLOSE "Автозакрытие" +#define SPEED_TEST_INFO_MESSAGE "'Скорость загрузки отображается в поле Download программы Network status.'-Id" char accept_language[]= "Accept-Language: ru\n"; #else #define DL_WINDOW_HEADER "Download Manager" @@ -18,11 +20,13 @@ #define T_CANCEL "Cancel" #define T_OPEN_DIR " Show in folder " #define T_RUN "Open file" + #define T_SPEED_TEST "Speed test" #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... %s received" #define T_ERROR_STARTING_DOWNLOAD "'Error while starting download process.\nCheck entered path and Internet connection.' -E" #define T_AUTOCLOSE "Autoclose" + #define SPEED_TEST_INFO_MESSAGE "'Download speed is shown after `Download`\nlabel in the Network status program.'-Id" char accept_language[]= "Accept-Language: en\n"; #endif @@ -33,6 +37,8 @@ char save_dir[] = "/tmp0/1/Downloads"; char dl_shared[] = "DL"; +#define URL_SPEED_TEST "http://speedtest.tele2.net/100MB.zip" + enum { BTN_EXIT=1, BTN_START, diff --git a/programs/cmm/downloader/dl.c b/programs/cmm/downloader/dl.c index 5cd8469463..9a764825a7 100644 --- a/programs/cmm/downloader/dl.c +++ b/programs/cmm/downloader/dl.c @@ -48,6 +48,12 @@ void main() } else { strcpy(#uEdit, #param); } + + if (streq(#param, "-test")) { + strcpy(#uEdit, URL_SPEED_TEST); + RunProgram("/sys/network/netstat", NULL); + notify(SPEED_TEST_INFO_MESSAGE); + } } if (uEdit[0]) StartDownloading(); else { edit_box_set_text stdcall (#ed, "http://");