From ffbd4b92ca27b5aab3067e18c2a3f0ec2ce0bb71 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Wed, 25 Feb 2015 13:56:06 +0000 Subject: [PATCH] Pixie: upload the rest files, update and fix menu.dat, rename pixie skins to fit into 11 symbols git-svn-id: svn://kolibrios.org@5468 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 6 +++++- data/eng/settings/menu.dat | 1 + data/et/settings/menu.dat | 5 +++-- data/it/settings/menu.dat | 5 +++-- data/rus/settings/menu.dat | 3 ++- data/sp/settings/menu.dat | 1 + programs/cmm/pixie/{pixie_dark.png => s_dark.png} | Bin programs/cmm/pixie/{pixie_light.png => s_light.png} | Bin programs/cmm/pixie/settings.h | 4 ++-- 9 files changed, 17 insertions(+), 8 deletions(-) rename programs/cmm/pixie/{pixie_dark.png => s_dark.png} (100%) rename programs/cmm/pixie/{pixie_light.png => s_light.png} (100%) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index cb6cc2bfd8..33b8553028 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -25,6 +25,10 @@ img_files = { {"FONTS/LITT.CHR", PROGS .. "/demos/bgitest/trunk/FONTS/LITT.CHR"}, {"GAMES/SNAKE.INI", PROGS .. "/games/snake/trunk/snake.ini"}, {"MEDIA/KIV.INI", PROGS .. "/media/kiv/trunk/kiv.ini"}, + {"MEDIA/PIXIE/PIXIE.INI", PROGS .. "/cmm/pixie/pixie.ini"}, + {"MEDIA/PIXIE/S_DARK.PNG", PROGS .. "/cmm/pixie/s_dark.png"}, + {"MEDIA/PIXIE/S_LIGHT.PNG", PROGS .. "/cmm/pixie/s_light.png"}, + {"MEDIA/PIXIE/MINIMP3", PROGS .. "/cmm/pixie/minimp3"}, {"NETWORK/WV_SKIN.PNG", PROGS .. "/cmm/browser/wv_skin.png"}, {"SETTINGS/AUTORUN.DAT", build_type .. "/settings/autorun.dat"}, {"DEFAULT.SKN", build_type .. "/default.skn"}, @@ -179,7 +183,7 @@ if build_type == "rus" then tup.append_table(extra_files, { {"Docs/cp1251/install.txt", build_type .. "/docs/INSTALL.WIN.TXT", cp1251_from = build_type .. "/docs/INSTALL.TXT"}, {"Docs/cp1251/readme.txt", build_type .. "/docs/README.WIN.TXT", cp1251_from = build_type .. "/docs/README.TXT"}, {"Docs/cp1251/sysfuncr.txt", build_type .. "/docs/SYSFUNCR.WIN.TXT", cp1251_from = PROGS .. "/system/docpack/trunk/SYSFUNCR.TXT"}, - {"HD_Load/9x2klbr/", PROGS .. "/hd_load/9x2klbr/readme_dos.txt"}, + {"HD_Load/9x2klbr/f", PROGS .. "/hd_load/9x2klbr/readme_dos.txt"}, {"HD_Load/9x2klbr/", PROGS .. "/hd_load/9x2klbr/readme_win.txt"}, {"HD_Load/mtldr/", PROGS .. "/hd_load/mtldr/install.txt"}, {"HD_Load/USB_Boot/", PROGS .. "/hd_load/usb_boot/readme.txt"}, diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat index 237eae156d..edcf5f2631 100644 --- a/data/eng/settings/menu.dat +++ b/data/eng/settings/menu.dat @@ -41,6 +41,7 @@ Animage /sys/media/animage Image Filtering /sys/media/imgf/imgf Palitra /sys/media/palitra #4 **** MULTIMEDIA **** +Pixie MP3 Player /sys/media/pixie/pixie Fplay - video /KolibriOS/media/fplay-full MidAMP /sys/media/midamp #5 **** PROGRAMMING **** diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat index b5458671ac..6d87d19ff4 100644 --- a/data/et/settings/menu.dat +++ b/data/et/settings/menu.dat @@ -41,6 +41,7 @@ Animage /sys/media/animage Image Filtering /sys/media/imgf/imgf Palitra /sys/media/palitra #4 **** MULTIMEDIA **** +Pixie MP3 Player /sys/media/pixie/pixie Fplay - video /KolibriOS/media/fplay-full MidAMP /sys/media/midamp #5 **** PROGRAMMING **** @@ -63,8 +64,8 @@ Message Boxes example /sys/demos/use_mb Sфtted > /@11 S№steemi sensorid > /@12 TЎЎ failidega > /@13 -Testimine > /@19 -Hїlbustus seaded > /@20 +Testimine > /@16 +Hїlbustus seaded > /@17 Silumisaken /sys/develop/board Terminal /sys/terminal #8 **** SETTINGS **** diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat index 0f3ae495a2..e77352c732 100644 --- a/data/it/settings/menu.dat +++ b/data/it/settings/menu.dat @@ -40,6 +40,7 @@ Image viewer zSea /KolibriOS/media/zsea/zsea Animage /sys/media/animage Palitra /sys/media/palitra #4 **** MULTIMEDIA **** +Pixie MP3 Player /sys/media/pixie/pixie Fplay - video /KolibriOS/media/fplay-full MidAMP /sys/media/midamp #5 **** PROGRAMMING **** @@ -94,8 +95,8 @@ Table Processor /sys/table Graph builder /sys/graph Hex-Editor /sys/develop/heed #12 **** NET **** -Servers > /@16 -Clients > /@17 +Servers > /@13 +Clients > /@14 Zero-Config /sys/network/zeroconf Network Config /sys/network/netcfg Network status /sys/network/netstat diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index 89861681c6..2cd3f5601b 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -42,6 +42,7 @@ FlatWave /sys/3d/flatwav Наложение фильтров /sys/media/imgf/imgf Палитра /sys/media/palitra #4 **** Мультимедиа **** +Аудиоплеер Pixie /sys/media/pixie/pixie Видеоплеер Fplay /KolibriOS/media/fplay-full Midi-плеер /sys/media/midamp #5 **** Разработка **** @@ -107,7 +108,7 @@ FSPEED ско HEX-редактор /sys/develop/heed #14 **** Сеть **** Серверы > /@18 -Клиенты > /@19 +Клиенты > /@16 Авто (network.ini) /sys/network/zeroconf Настройки сети /sys/network/netcfg Статус подключения /sys/network/netstat diff --git a/data/sp/settings/menu.dat b/data/sp/settings/menu.dat index faf70ffbcd..94d02d99d8 100644 --- a/data/sp/settings/menu.dat +++ b/data/sp/settings/menu.dat @@ -41,6 +41,7 @@ Animage /sys/media/animage Efectos de imаgenes /sys/media/imgf/imgf Palitra /sys/media/palitra #4 **** MULTIMEDIA **** +Pixie MP3 Player /sys/media/pixie/pixie Fplay - video /KolibriOS/media/fplay-full MidAMP /sys/media/midamp #5 **** DESARROLLO **** diff --git a/programs/cmm/pixie/pixie_dark.png b/programs/cmm/pixie/s_dark.png similarity index 100% rename from programs/cmm/pixie/pixie_dark.png rename to programs/cmm/pixie/s_dark.png diff --git a/programs/cmm/pixie/pixie_light.png b/programs/cmm/pixie/s_light.png similarity index 100% rename from programs/cmm/pixie/pixie_light.png rename to programs/cmm/pixie/s_light.png diff --git a/programs/cmm/pixie/settings.h b/programs/cmm/pixie/settings.h index f59cf14eda..feaecc1df6 100644 --- a/programs/cmm/pixie/settings.h +++ b/programs/cmm/pixie/settings.h @@ -42,7 +42,7 @@ struct struct_pixie_colors { void SetColorThemeDark() { current_theme = THEME_DARK; - Libimg_LoadImage(#skin, abspath("pixie_dark.png")); + Libimg_LoadImage(#skin, abspath("s_dark.png")); skin.w = 300; theme.color_top_panel_text = 0xFCFFBE; theme.color_list_bg = 0x313031; @@ -62,7 +62,7 @@ void SetColorThemeDark() void SetColorThemeLight() { current_theme = THEME_LIGHT; - Libimg_LoadImage(#skin, abspath("pixie_light.png")); + Libimg_LoadImage(#skin, abspath("s_light.png")); skin.w = 300; theme.color_top_panel_text = 0x85663F; theme.color_list_bg = 0xE2E2E2;