Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 7629 → Rev 7630

/data/Tupfile.lua
47,7 → 47,7
{"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
{"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
{"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"},
})
/data/ca/settings/menu.dat
42,7 → 42,7
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 ****
/data/common/File Managers/fNav/fnav.set
/data/common/File Managers/kfar.ini
28,7 → 28,7
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
/data/common/File Managers/kfm.ini
173,7 → 173,7
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
/data/common/settings/assoc.ini
37,7 → 37,7
icon=15
 
[Pixie]
exec=/sys/media/pixie/pixie
exec=/sys/media/pixie
icon=65
next=$AC97snd
 
/data/common/settings/docky.ini
20,7 → 20,7
icon=58
 
[Pixie]
path=media/pixie/pixie
path=media/pixie
param=
icon=65
 
/data/common/settings/syspanel.ini
14,7 → 14,7
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
/data/eng/settings/menu.dat
42,7 → 42,7
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
/data/et/settings/menu.dat
42,7 → 42,7
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
/data/it/settings/menu.dat
41,7 → 41,7
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
/data/rus/settings/menu.dat
43,7 → 43,7
 «®¦¥­¨¥ 䨫ìâ஢ /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
/data/sp/settings/menu.dat
42,7 → 42,7
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
/programs/cmm/panels_cfg/compile_en.bat
File deleted
/programs/cmm/panels_cfg/panels_cfg.c
File deleted
\ No newline at end of file
/programs/cmm/panels_cfg/compile_ru.bat
File deleted
/programs/cmm/panels_cfg/panels_cfg.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/programs/cmm/panels_cfg/Tupfile.lua
File deleted
/programs/cmm/panels_cfg/panels_image.raw
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/programs/cmm/barscfg/Tupfile.lua
0,0 → 1,6
if tup.getconfig("NO_CMM") ~= "" then return end
if tup.getconfig("LANG") == "ru"
then C_LANG = "LANG_RUS"
else C_LANG = "LANG_ENG" -- this includes default case without config
end
tup.rule("barscfg.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "barscfg.com")
/programs/cmm/barscfg/barscfg.c
0,0 → 1,257
#ifndef AUTOBUILD
#include "lang.h--"
#endif
 
#define MEMSIZE 0x23E80
#include "..\lib\kolibri.h"
#include "..\lib\strings.h"
#include "..\lib\mem.h"
#include "..\lib\fs.h"
#include "..\lib\dll.h"
#include "..\lib\gui.h"
 
#include "..\lib\obj\libio.h"
#include "..\lib\obj\libini.h"
#include "..\lib\obj\box_lib.h"
 
#include "..\lib\patterns\restart_process.h"
 
#ifdef LANG_RUS
?define WINDOW_TITLE " áâனª¨ ¯ ­¥«¨ § ¤ ç ¨ „®ª "
?define TASK_FRAME_T "  ­¥«ì § ¤ ç "
?define DOCK_FRAME_T " 㨻 "
?define MIN_LEFT_BUTTON "Š­®¯ª  áªàëâ¨ï á«¥¢ "
?define MIN_RIGHT_BUTTON "Š­®¯ª  áªàëâ¨ï á¯à ¢ "
?define SOFTEN_UP "‘£« ¦¨¢ ­¨¥ ᢥàåã"
?define SOFTEN_DOWN "‘£« ¦¨¢ ­¨¥ á­¨§ã"
?define CLOCK "— áë"
?define CPU_USAGE "‡ £à㧪  –"
?define CHANGE_LANG "Ÿ§ëª ¢¢®¤ "
?define MENU_BUTTON "Š­®¯ª  ¬¥­î"
?define PANEL_HEIGHT "‚ëá®â  ¯ ­¥«¨"
?define SOFTEN_HEIGHT "‚ëá®â  ᣫ ¦¨¢ ­¨ï"
?define BUTTON_OFFSET "®«¥ ¢®ªà㣠ª­®¯®ª"
?define FSIZE "¥¦¨¬ ¯ ­¥«¨"
?define ASHOW "¥ áªà뢠âì"
?define CHANGE_POS " ¦¬¨â¥ ­  ¨§®¡à ¦¥­¨¥ ¤«ï ᬥ­ë ¯®§¨æ¨¨"
#else
?define WINDOW_TITLE "Taskbar and Docky configuration"
?define TASK_FRAME_T " Taskbar "
?define DOCK_FRAME_T " Docky "
?define MIN_LEFT_BUTTON "Min Left Button"
?define MIN_RIGHT_BUTTON "Min Right Button"
?define SOFTEN_UP "Soften Up"
?define SOFTEN_DOWN "Soften Down"
?define CLOCK "Clock"
?define CPU_USAGE "Cpu Usage"
?define CHANGE_LANG "Change Language"
?define MENU_BUTTON "Menu Button"
?define PANEL_HEIGHT "Panel Height"
?define SOFTEN_HEIGHT "Soften Height"
?define BUTTON_OFFSET "Button Offset"
?define FSIZE "Full width"
?define ASHOW "Always show"
?define CHANGE_POS "Click on image to change position"
#endif
 
char taskbar_ini_path[] = "/sys/settings/taskbar.ini";
_ini taskbar_flags_ini = { #taskbar_ini_path, "Flags" };
_ini taskbar_vars_ini = { #taskbar_ini_path, "Variables" };
 
_ini docky_ini = { "/sys/settings/docky.ini", "@" };
 
unsigned char panels_img_data[] = FROM "panels_image.raw";
#define PIMG_W 37
#define PIMG_H 27 //27*5
 
proc_info Form;
 
enum { BTN_TB_ATTACHEMENT=100, BTN_DOCKY_ATTACHEMENT=200 };
enum { TASKBAR, DOCKY };
 
more_less_box tbPanelHeight = { NULL, 6, 99, PANEL_HEIGHT };
more_less_box tbSoftenHeight = { NULL, 0, 99, SOFTEN_HEIGHT };
more_less_box tbButtonOffset = { NULL, 0, 99, BUTTON_OFFSET };
 
int tbAttachment;
checkbox tbSoftenUp = { SOFTEN_UP };
checkbox tbClock = { CLOCK };
checkbox tbSoftenDown = { SOFTEN_DOWN };
checkbox tbCpuUsage = { CPU_USAGE };
checkbox tbMinLeftButton = { MIN_LEFT_BUTTON };
checkbox tbChangeLang = { CHANGE_LANG };
checkbox tbMinRightButton = { MIN_RIGHT_BUTTON };
checkbox tbMenuButton = { MENU_BUTTON };
checkbox dkFsize = { FSIZE };
checkbox dkAshow = { ASHOW };
 
int dkLocation;
checkbox tbRunApplButton;
checkbox tbClnDeskButton;
 
 
void main()
{
dword id, key;
 
load_dll(libini, #lib_init,1);
load_dll(boxlib, #box_lib_init,0);
 
LoadCfg();
 
loop() switch(WaitEvent())
{
case evButton:
id=GetButtonID();
if (1==id) ExitProcess();
//taskbar buttons
if (BTN_TB_ATTACHEMENT == id) {
tbAttachment ^= 1;
DrawWindowContent();
SaveSettingsAndRestartProcess(TASKBAR);
}
 
if (tbSoftenUp.click(id)) || (tbSoftenDown.click(id))
|| (tbMinLeftButton.click(id)) || (tbMinRightButton.click(id))
|| (tbRunApplButton.click(id)) || (tbClnDeskButton.click(id)) {
SaveSettingsAndRestartProcess(TASKBAR);
}
 
if (tbClock.click(id)) || (tbCpuUsage.click(id))
|| (tbChangeLang.click(id)) || (tbMenuButton.click(id))
|| (tbPanelHeight.click(id)) || (tbSoftenHeight.click(id))
|| (tbButtonOffset.click(id)) {
SaveSettingsAndRestartProcess(TASKBAR);
}
//docky buttons
if (id==200) {
dkLocation++;
if (dkLocation>3) dkLocation=1;
DrawWindowContent();
SaveSettingsAndRestartProcess(DOCKY);
}
if (dkFsize.click(id)) SaveSettingsAndRestartProcess(DOCKY);
if (dkAshow.click(id)) SaveSettingsAndRestartProcess(DOCKY);
break;
case evKey:
GetKeys();
if (key_scancode == SCAN_CODE_ESC) ExitProcess();
break;
case evReDraw:
system.color.get();
DefineAndDrawWindow(130, 150, 465, 398 + skin_height, 0x34, system.color.work, WINDOW_TITLE, 0);
GetProcessInfo(#Form, SelfInfo);
if (Form.status_window>2) break;
DrawWindowContent();
}
}
 
void DrawPanelsImage(dword y, n)
{
_PutImage(22, y, PIMG_W, PIMG_H, n * PIMG_W * PIMG_H * 3 + #panels_img_data);
}
 
void DrawWindowContent()
{
#define PD 10
dword frame_y;
word win_center_x = Form.cwidth / 2 + 20;
incn y;
 
frame_y = 15;
y.n = frame_y;
DefineButton(22, y.inc(18), PIMG_W-1, PIMG_H-1, 100 + BT_HIDE, 0);
DrawPanelsImage(y.n, tbAttachment);
WriteText(68, y.inc(7), 0x90, system.color.work_text, CHANGE_POS);
tbSoftenUp.draw(22, y.inc(35));
tbClock.draw(win_center_x, y.n);
tbSoftenDown.draw(22, y.inc(24));
tbCpuUsage.draw(win_center_x, y.n);
tbMinLeftButton.draw(22, y.inc(24));
tbChangeLang.draw(win_center_x, y.n);
tbMinRightButton.draw(22, y.inc(24));
tbMenuButton.draw(win_center_x, y.n);
tbPanelHeight.draw(22, y.inc(28));
tbSoftenHeight.draw(22, y.inc(32));
tbButtonOffset.draw(22, y.inc(32));
DrawFrame(PD, frame_y, Form.cwidth-PD-PD, y.inc(32)-frame_y, TASK_FRAME_T);
//DOCKY
frame_y = calc(y.inc(20));
DefineButton(22, y.inc(18), PIMG_W-1, PIMG_H-1, 200 + BT_HIDE, 0);
DrawPanelsImage(y.n, dkLocation+1);
WriteText(68, y.inc(7), 0x90, system.color.work_text, CHANGE_POS);
dkFsize.draw(22, y.inc(35));
dkAshow.draw(win_center_x, y.n);
DrawFrame(PD, frame_y, Form.cwidth-PD-PD, Form.cheight-frame_y-PD, DOCK_FRAME_T);
}
 
void LoadCfg()
{
tbAttachment = taskbar_flags_ini.GetInt("Attachment", 1);
tbSoftenUp.checked = taskbar_flags_ini.GetInt("SoftenUp", 1);
tbSoftenDown.checked = taskbar_flags_ini.GetInt("SoftenDown", 1);
tbMinLeftButton.checked = taskbar_flags_ini.GetInt("MinLeftButton", 1);
tbMinRightButton.checked = taskbar_flags_ini.GetInt("MinRightButton", 1);
tbClock.checked = taskbar_flags_ini.GetInt("Clock", 1);
tbCpuUsage.checked = taskbar_flags_ini.GetInt("CpuUsage", 1);
tbChangeLang.checked = taskbar_flags_ini.GetInt("ChangeLang", 1);
tbMenuButton.checked = taskbar_flags_ini.GetInt("MenuButton", 1);
tbPanelHeight.value = taskbar_vars_ini.GetInt("PanelHeight", 28);
tbSoftenHeight.value = taskbar_vars_ini.GetInt("SoftenHeight", 4);
tbButtonOffset.value = taskbar_vars_ini.GetInt("ButtonTopOffset", 3);
tbButtonOffset.value = taskbar_vars_ini.GetInt("ButtonBotOffset", 3);
 
dkLocation = docky_ini.GetInt("location", 0);
dkFsize.checked = docky_ini.GetInt("fsize", 0);
dkAshow.checked = docky_ini.GetInt("ashow", 0);
}
 
void SaveSettingsAndRestartProcess(byte panel_type)
{
if (panel_type==TASKBAR) {
taskbar_flags_ini.SetInt("Attachment", tbAttachment);
taskbar_flags_ini.SetInt("SoftenUp", tbSoftenUp.checked);
taskbar_flags_ini.SetInt("SoftenDown", tbSoftenDown.checked);
taskbar_flags_ini.SetInt("MinLeftButton", tbMinLeftButton.checked);
taskbar_flags_ini.SetInt("MinRightButton", tbMinRightButton.checked);
taskbar_flags_ini.SetInt("RunApplButton", tbRunApplButton.checked);
taskbar_flags_ini.SetInt("ClnDeskButton", tbClnDeskButton.checked);
taskbar_flags_ini.SetInt("Clock", tbClock.checked);
taskbar_flags_ini.SetInt("CpuUsage", tbCpuUsage.checked);
taskbar_flags_ini.SetInt("ChangeLang", tbChangeLang.checked);
taskbar_flags_ini.SetInt("MenuButton", tbMenuButton.checked);
taskbar_vars_ini.SetInt("PanelHeight", tbPanelHeight.value);
taskbar_vars_ini.SetInt("SoftenHeight", tbSoftenHeight.value);
taskbar_vars_ini.SetInt("ButtonTopOffset", tbButtonOffset.value);
taskbar_vars_ini.SetInt("ButtonBottOffset", tbButtonOffset.value);
}
if (panel_type==DOCKY) {
docky_ini.SetInt("location", dkLocation);
docky_ini.SetInt("fsize", dkFsize.checked);
docky_ini.SetInt("ashow", dkAshow.checked);
}
RestartProcess(panel_type);
}
 
void RestartProcess(byte panel_type)
{
dword proc_name1;
if (panel_type == TASKBAR)
{
RestartProcessByName("@taskbar", SINGLE);
pause(50);
}
else
{
RestartProcessByName("@docky", SINGLE);
pause(120);
}
GetProcessInfo(#Form, SelfInfo);
ActivateWindow(GetProcessSlot(Form.ID));
}
 
 
 
stop:
/programs/cmm/barscfg/compile_en.bat
0,0 → 1,11
@del lang.h--
@echo #define LANG_ENG 1 >lang.h--
 
@del barscfg
cls
@c-- barscfg.c
@pause
@echo off
@rename barscfg.com barscfg
@del warning.txt
@del lang.h--
/programs/cmm/barscfg/compile_ru.bat
0,0 → 1,10
@del lang.h--
@echo #define LANG_RUS 1 >lang.h--
 
@del barscfg
cls
@c-- barscfg.c
@pause
@rename barscfg.com barscfg
@del warning.txt
@del lang.h--
/programs/cmm/barscfg/panels_cfg.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/programs/cmm/barscfg/panels_image.raw
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/programs/cmm/pixie2/skin.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/programs/cmm/pixie2/pixieskn.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/programs/cmm/pixie2/settings.h
27,7 → 27,7
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;