diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 3ac3e93803..e8c6c09d4f 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -47,7 +47,7 @@ img_files = { {"MEDIA/IMGF/CEDG.OBJ", "common/media/ImgF/cEdg.obj"}, {"MEDIA/IMGF/DITHER.OBJ", "common/media/ImgF/dither.obj"}, {"MEDIA/IMGF/INVSOL.OBJ", "common/media/ImgF/invSol.obj"}, - {"MEDIA/PIXIE/SKIN.PNG", PROGS .. "/cmm/pixie2/skin.png"}, + {"MEDIA/PIXIE/PIXIESKN.PNG", PROGS .. "/cmm/pixie2/pixieskn.png"}, {"NETWORK/FTPC.INI", PROGS .. "/network/ftpc/ftpc.ini"}, {"NETWORK/FTPD.INI", "common/network/ftpd.ini"}, {"NETWORK/USERS.INI", "common/network/users.ini"}, @@ -582,7 +582,7 @@ tup.append_table(img_files, { {"EASYSHOT", PROGS .. "/cmm/easyshot/easyshot.com"}, {"MOUSECFG", PROGS .. "/cmm/mousecfg/mousecfg.com"}, {"NOTES", PROGS .. "/cmm/notes/notes.com"}, - {"PANELS_CFG", PROGS .. "/cmm/panels_cfg/panels_cfg.com"}, + {"BARSCFG", PROGS .. "/cmm/barscfg/barscfg.com"}, {"SYSPANEL", PROGS .. "/cmm/software_widget/software_widget.com"}, {"SYSMON", PROGS .. "/cmm/sysmon/sysmon.com"}, {"TXTREAD", PROGS .. "/cmm/txtread/txtread.com"}, @@ -596,7 +596,7 @@ tup.append_table(img_files, { {"GAMES/FindNumbers", PROGS .. "/games/FindNumbers/trunk/FindNumbers"}, {"GAMES/FLOOD-IT", PROGS .. "/games/flood-it/trunk/flood-it.com"}, {"GAMES/MINE", PROGS .. "/games/mine/trunk/mine"}, - {"MEDIA/PIXIE/PIXIE", PROGS .. "/cmm/pixie2/pixie.com"}, + {"MEDIA/PIXIE", PROGS .. "/cmm/pixie2/pixie.com"}, {"MEDIA/ICONEDIT", PROGS .. "/cmm/iconedit/iconedit.com"}, {"NETWORK/WEBVIEW", PROGS .. "/cmm/browser/WebView.com"}, }) diff --git a/data/ca/settings/menu.dat b/data/ca/settings/menu.dat index b9c6fa5a2d..39f2c84a42 100644 --- a/data/ca/settings/menu.dat +++ b/data/ca/settings/menu.dat @@ -42,7 +42,7 @@ Animage /sys/media/animage Efectes d'imatges /sys/media/imgf/imgf Palitra /sys/media/palitra #4 **** MULTIM╚DIA **** -Reproductor MP3 Pixie /sys/media/pixie/pixie +Pixie - audio /sys/media/pixie Fplay - video /KolibriOS/media/fplay MidAMP /sys/media/midamp #5 **** DESARROLLO **** diff --git a/data/common/File Managers/fNav/fnav.set b/data/common/File Managers/fNav/fnav.set index 1274c10529..b53b7a8242 100644 --- a/data/common/File Managers/fNav/fnav.set +++ b/data/common/File Managers/fNav/fnav.set @@ -1 +1 @@ -/sys/TinyPad: asm, inc, txt, mac, log, dat /sys/media/kiv: gif, bmp, png, tga, jpg, ico, cur, tif, tiff, jpeg, ppm, pgm, pbm, pnm, pcx, wbmp, xcf /sys/Network/Webview: htm, html, mht, xhtml /sys/fb2read: fb2 /sys/develop/cObj: obj /sys/skincfg: skn /sys/rtfRead: rtf /sys/develop/t_edit: cpp, h, c, c--, pas, set, ext, ini /sys/media/mgb: mgb /sys/media/pixie/pixie: mp3 /sys/media/AC97SND: wav, xm /sys/media/MIDAMP: mid /sys/media/listplay: m3u, lap, asf /sys/shell: sh /sys/3d/view3ds: 3ds, asc /sys/graph: cvs, grf /sys/unz: zip, 7z /sys/table: csv /kolibrios/media/updf: pdf /kolibrios/media/fplay: avi, mpg, mov, flv, wmv, vob, mkv, mp4, mpeg, divx, 3gp, webm /kolibrios/emul/zsnes: smc /kolibrios/emul/psx4all: mcr /kolibrios/emul/fceu/fceu: nes /kolibrios/emul/e80/e80: sna /kolibrios/emul/gameboy: gb, gbc /kolibrios/emul/pokemini: min /sys/develop/heed: \ No newline at end of file +/sys/TinyPad: asm, inc, txt, mac, log, dat /sys/media/kiv: gif, bmp, png, tga, jpg, ico, cur, tif, tiff, jpeg, ppm, pgm, pbm, pnm, pcx, wbmp, xcf /sys/Network/Webview: htm, html, mht, xhtml /sys/fb2read: fb2 /sys/develop/cObj: obj /sys/skincfg: skn /sys/rtfRead: rtf /sys/develop/t_edit: cpp, h, c, c--, pas, set, ext, ini /sys/media/mgb: mgb /sys/media/pixie: mp3 /sys/media/AC97SND: wav, xm /sys/media/MIDAMP: mid /sys/media/listplay: m3u, lap, asf /sys/shell: sh /sys/3d/view3ds: 3ds, asc /sys/graph: cvs, grf /sys/unz: zip, 7z /sys/table: csv /kolibrios/media/updf: pdf /kolibrios/media/fplay: avi, mpg, mov, flv, wmv, vob, mkv, mp4, mpeg, divx, 3gp, webm /kolibrios/emul/zsnes: smc /kolibrios/emul/psx4all: mcr /kolibrios/emul/fceu/fceu: nes /kolibrios/emul/e80/e80: sna /kolibrios/emul/gameboy: gb, gbc /kolibrios/emul/pokemini: min /sys/develop/heed: \ No newline at end of file diff --git a/data/common/File Managers/kfar.ini b/data/common/File Managers/kfar.ini index 360097ad80..ea5b77f1b4 100644 --- a/data/common/File Managers/kfar.ini +++ b/data/common/File Managers/kfar.ini @@ -28,7 +28,7 @@ lap=/sys/media/listplay asf=/sys/media/listplay m3u=/sys/media/AC97SND wav=/sys/media/AC97SND -mp3=/sys/media/pixie/pixie +mp3=/sys/media/pixie xm=/sys/media/AC97SND mid=/sys/media/MIDAMP cvs=/sys/graph diff --git a/data/common/File Managers/kfm.ini b/data/common/File Managers/kfm.ini index 189d087d79..9b4d0fa49b 100644 --- a/data/common/File Managers/kfm.ini +++ b/data/common/File Managers/kfm.ini @@ -173,7 +173,7 @@ tiff /sys/media/kiv wbmp /sys/media/kiv m3u /sys/media/ac97snd wav /sys/media/ac97snd -mp3 /sys/media/pixie/pixie +mp3 /sys/media/pixie xm /sys/media/ac97snd mid /sys/media/midamp rtf /sys/rtfread diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini index 1f7e6a5c1b..d7f7e4937f 100644 --- a/data/common/settings/assoc.ini +++ b/data/common/settings/assoc.ini @@ -37,7 +37,7 @@ exec=/sys/media/animage icon=15 [Pixie] -exec=/sys/media/pixie/pixie +exec=/sys/media/pixie icon=65 next=$AC97snd diff --git a/data/common/settings/docky.ini b/data/common/settings/docky.ini index 68fdc875b0..952838ca31 100644 --- a/data/common/settings/docky.ini +++ b/data/common/settings/docky.ini @@ -20,7 +20,7 @@ param= icon=58 [Pixie] -path=media/pixie/pixie +path=media/pixie param= icon=65 diff --git a/data/common/settings/syspanel.ini b/data/common/settings/syspanel.ini index 971c02f5c2..a9bd8e9a31 100644 --- a/data/common/settings/syspanel.ini +++ b/data/common/settings/syspanel.ini @@ -14,7 +14,7 @@ Appearance=/k/utils/appearance,62 Background=media/palitra,61 SkinConfig=skincfg,80 Volume=@VOLUME,64 -Panels=panels_cfg,63 +Panels=barscfg,63 Mouse=mousecfg,54 DriverInstall=/k/drivers/DRVINST.KEX,71 Autorun=tinypad|/sys/settings/autorun.dat,55 diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat index 7797106723..18c3d0fcc8 100644 --- a/data/eng/settings/menu.dat +++ b/data/eng/settings/menu.dat @@ -42,7 +42,7 @@ Animage /sys/media/animage Image Filtering /sys/media/imgf/imgf Palitra /sys/media/palitra #4 **** MULTIMEDIA **** -Pixie (MP3 player) /sys/media/pixie/pixie +Pixie AudioPlayer /sys/media/pixie AC97SND Audioplayer /sys/media/ac97snd Fplay* Video player /kolibrios/media/fplay MidAMP /sys/media/midamp diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat index 66f6fac97b..8d4d586079 100644 --- a/data/et/settings/menu.dat +++ b/data/et/settings/menu.dat @@ -42,7 +42,7 @@ Animage /sys/media/animage Image Filtering /sys/media/imgf/imgf Palitra /sys/media/palitra #4 **** MULTIMEDIA **** -Pixie MP3 Player /sys/media/pixie/pixie +Pixie Audioplayer /sys/media/pixie AC97SND Audioplayer /sys/media/ac97snd Fplay - video /kolibrios/media/fplay MidAMP /sys/media/midamp diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat index 9c07309c07..c6056240b4 100644 --- a/data/it/settings/menu.dat +++ b/data/it/settings/menu.dat @@ -41,7 +41,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 +Pixie Audioplayer /sys/media/pixie AC97SND Audioplayer /sys/media/ac97snd Fplay - video /KolibriOS/media/fplay MidAMP /sys/media/midamp diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index 70f25ffb7c..9a4345ddaf 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -43,7 +43,7 @@ FlatWave /sys/3d/flatwav Наложение фильтров /sys/media/imgf/imgf Палитра /sys/media/palitra #4 **** Мультимедиа **** -Аудиоплеер Pixie /sys/media/pixie/pixie +Аудиоплеер Pixie /sys/media/pixie Аудиоплеер AC97SND /sys/media/ac97snd Видеоплеер Fplay /kolibrios/media/fplay Midi-плеер /sys/media/midamp diff --git a/data/sp/settings/menu.dat b/data/sp/settings/menu.dat index 33d98a7874..f27a59902f 100644 --- a/data/sp/settings/menu.dat +++ b/data/sp/settings/menu.dat @@ -42,7 +42,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 +Pixie Audioplayer /sys/media/pixie AC97SND Audioplayer /sys/media/ac97snd Fplay - video /kolibrios/media/fplay MidAMP /sys/media/midamp diff --git a/programs/cmm/panels_cfg/Tupfile.lua b/programs/cmm/barscfg/Tupfile.lua similarity index 61% rename from programs/cmm/panels_cfg/Tupfile.lua rename to programs/cmm/barscfg/Tupfile.lua index 986f14ec72..e5e8797872 100644 --- a/programs/cmm/panels_cfg/Tupfile.lua +++ b/programs/cmm/barscfg/Tupfile.lua @@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end -tup.rule("panels_cfg.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "panels_cfg.com") +tup.rule("barscfg.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "barscfg.com") diff --git a/programs/cmm/panels_cfg/panels_cfg.c b/programs/cmm/barscfg/barscfg.c similarity index 100% rename from programs/cmm/panels_cfg/panels_cfg.c rename to programs/cmm/barscfg/barscfg.c diff --git a/programs/cmm/panels_cfg/compile_en.bat b/programs/cmm/barscfg/compile_en.bat similarity index 56% rename from programs/cmm/panels_cfg/compile_en.bat rename to programs/cmm/barscfg/compile_en.bat index a9926df82a..8646f3ff57 100644 --- a/programs/cmm/panels_cfg/compile_en.bat +++ b/programs/cmm/barscfg/compile_en.bat @@ -1,11 +1,11 @@ @del lang.h-- @echo #define LANG_ENG 1 >lang.h-- -@del panels_cfg +@del barscfg cls -@c-- panels_cfg.c +@c-- barscfg.c @pause @echo off -@rename panels_cfg.com panels_cfg +@rename barscfg.com barscfg @del warning.txt @del lang.h-- diff --git a/programs/cmm/panels_cfg/compile_ru.bat b/programs/cmm/barscfg/compile_ru.bat similarity index 54% rename from programs/cmm/panels_cfg/compile_ru.bat rename to programs/cmm/barscfg/compile_ru.bat index f1cb42f895..40722df826 100644 --- a/programs/cmm/panels_cfg/compile_ru.bat +++ b/programs/cmm/barscfg/compile_ru.bat @@ -1,10 +1,10 @@ @del lang.h-- @echo #define LANG_RUS 1 >lang.h-- -@del panels_cfg +@del barscfg cls -@c-- panels_cfg.c +@c-- barscfg.c @pause -@rename panels_cfg.com panels_cfg +@rename barscfg.com barscfg @del warning.txt @del lang.h-- diff --git a/programs/cmm/panels_cfg/panels_cfg.png b/programs/cmm/barscfg/panels_cfg.png similarity index 100% rename from programs/cmm/panels_cfg/panels_cfg.png rename to programs/cmm/barscfg/panels_cfg.png diff --git a/programs/cmm/panels_cfg/panels_image.raw b/programs/cmm/barscfg/panels_image.raw similarity index 100% rename from programs/cmm/panels_cfg/panels_image.raw rename to programs/cmm/barscfg/panels_image.raw diff --git a/programs/cmm/pixie2/skin.png b/programs/cmm/pixie2/pixieskn.png similarity index 100% rename from programs/cmm/pixie2/skin.png rename to programs/cmm/pixie2/pixieskn.png diff --git a/programs/cmm/pixie2/settings.h b/programs/cmm/pixie2/settings.h index 54d628bc82..315533af73 100644 --- a/programs/cmm/pixie2/settings.h +++ b/programs/cmm/pixie2/settings.h @@ -27,7 +27,7 @@ void LoadIniConfig() win_y_small = ini.GetInt("win_y_small", -1); ini.GetString("last_folder", #work_folder, sizeof(work_folder), NULL); - Libimg_LoadImage(#skin, abspath("skin.png")); + Libimg_LoadImage(#skin, abspath("pixieskn.png")); skin.w = 322; theme.color_top_panel_bg = 0x242424; theme.color_top_panel_folder_name = 0xEEEeee;