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

rename panels_cfg to barscfg and change path of /sys/media/pixie/pixie to just /sys/media/pixie

Browse Source 
git-svn-id: svn://kolibrios.org@7630 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2019-04-17 08:06:15 +00:00
parent 22678da483
commit 4f577b5e9b
21 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/Tupfile.lua
View File

@ -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"},
})

2
data/ca/settings/menu.dat
View File

@ -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 ****

2
data/common/File Managers/fNav/fnav.set
View File

@ -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:
/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:

2
data/common/File Managers/kfar.ini
View File

@ -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

2
data/common/File Managers/kfm.ini
View File

@ -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

2
data/common/settings/assoc.ini
View File

@ -37,7 +37,7 @@ exec=/sys/media/animage
icon=15
[Pixie]
exec=/sys/media/pixie/pixie
exec=/sys/media/pixie
icon=65
next=$AC97snd

2
data/common/settings/docky.ini
View File

@ -20,7 +20,7 @@ param=
icon=58
[Pixie]
path=media/pixie/pixie
path=media/pixie
param=
icon=65

2
data/common/settings/syspanel.ini
View File

@ -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

2
data/eng/settings/menu.dat
View File

@ -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

2
data/et/settings/menu.dat
View File

@ -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

2
data/it/settings/menu.dat
View File

@ -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

2
data/rus/settings/menu.dat
View File

@ -43,7 +43,7 @@ FlatWave /sys/3d/flatwav
<EFBFBD> «®¦¥­¨¥ 䨫ìâ஢ /sys/media/imgf/imgf
<EFBFBD> «¨âà  /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

2
data/sp/settings/menu.dat
View File

@ -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

2
programs/cmm/panels_cfg/Tupfile.lua → programs/cmm/barscfg/Tupfile.lua
View File

@ -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")

0
programs/cmm/panels_cfg/panels_cfg.c → programs/cmm/barscfg/barscfg.c
View File

6
programs/cmm/panels_cfg/compile_en.bat → programs/cmm/barscfg/compile_en.bat
View File

@ -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--

6
programs/cmm/panels_cfg/compile_ru.bat → programs/cmm/barscfg/compile_ru.bat
View File

@ -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--

0
programs/cmm/panels_cfg/panels_cfg.png → programs/cmm/barscfg/panels_cfg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 469 B

After

Width:  |  Height:  |  Size: 469 B

0
programs/cmm/panels_cfg/panels_image.raw → programs/cmm/barscfg/panels_image.raw
View File

0
programs/cmm/pixie2/skin.png → programs/cmm/pixie2/pixieskn.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

2
programs/cmm/pixie2/settings.h
View File

@ -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;