Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8880 → Rev 8881

/programs/cmm/eolite/compile_ru.bat
File deleted
\ No newline at end of file
/programs/cmm/eolite/compile_en.bat
File deleted
\ No newline at end of file
/programs/cmm/eolite/Eolite.c
3,15 → 3,10
 
// 70.5 - get volume info and label
 
#define ABOUT_TITLE "EOLITE 5 Beta5"
#define TITLE_EOLITE "Eolite File Manager 5 Beta5"
#define TITLE_KFM "Kolibri File Manager 2 Beta5";
#define ABOUT_TITLE "EOLITE 5 Beta6"
#define TITLE_EOLITE "Eolite File Manager 5 Beta6"
#define TITLE_KFM "Kolibri File Manager 2 Beta6";
 
#ifndef AUTOBUILD
#include "lang.h--"
#endif
 
//libraries
#define MEMSIZE 1024 * 250
#include "../lib/clipboard.h"
#include "../lib/strings.h"
47,7 → 42,8
GOUP_BTN,
COPY_BTN,
CUT_BTN,
PASTE_BTN
PASTE_BTN,
KFM_FUNC_ID = 450
};
 
//NewElement options
141,8 → 137,7
libimg_image icons32_default;
libimg_image icons32_selected;
 
#define STATUS_BAR_H 16;
int status_bar_h = 0;
int status_bar_h;
 
int icon_size = 18;
 
407,6 → 402,9
case BREADCRUMB_ID...360:
ClickOnBreadCrumb(id-BREADCRUMB_ID);
break;
case KFM_FUNC_ID...KFM_FUNC_ID+10:
FnProcess(id-KFM_FUNC_ID);
break;
}
break;
576,7 → 574,10
incn x;
dword title;
if (show_status_bar.checked) {
status_bar_h = STATUS_BAR_H;
#define STBAR_EOLITE_H 16;
#define STBAR_KFM_H 21;
if (efm) status_bar_h = STBAR_KFM_H;
else status_bar_h = STBAR_EOLITE_H;
} else {
status_bar_h = 0;
}
650,6 → 651,19
if (efm) && (files.x<5) DrawBar(files.x+files.w+16,files.y,1,files.h,sc.work_graph);
}
 
void DrawFuncButtonsInKfm()
{
int i, x=0, len, min_w=0, padding;
for (i=0; i<10; i++) min_w += strlen(kfm_func[i])*6 + 2;
padding = Form.cwidth - min_w + 4 / 10;
for (i=0; i<10; i++) {
len = strlen(kfm_func[i])*6 + padding;
if (i==9) len = Form.cwidth - x - 3;
DrawFlatButtonSmall(x+1, Form.cheight - 19, len, 16, i+KFM_FUNC_ID+1, kfm_func[i]);
x += len + 2;
}
}
 
void DrawStatusBar()
{
char status_bar_str[80];
657,7 → 671,7
 
if (efm) {
DrawBar(0, Form.cheight - status_bar_h, Form.cwidth, status_bar_h, sc.work);
WriteTextCenter(0,Form.cheight - 12, Form.cwidth,sc.work_text,T_KFM_FUNC);
DrawFuncButtonsInKfm();
return;
}
 
/programs/cmm/eolite/build_en.bat
0,0 → 1,5
@del Eolite
@c-- /D=LANG_ENG Eolite.c
@rename Eolite.com Eolite
if not exist Eolite ( @pause )
@del warning.txt
/programs/cmm/eolite/build_ru.bat
0,0 → 1,5
@del Eolite
@c-- /D=LANG_RUS Eolite.c
@rename Eolite.com Eolite
if not exist Eolite ( @pause )
@del warning.txt
/programs/cmm/eolite/include/translations.h
26,6 → 26,18
?define COPY_PATH_STR "'ãâì ¯ ¯ª¨ ᪮¯¨à®¢ ­ ¢ ¡ãä¥à ®¡¬¥­ ' -I"
?define T_ABOUT "Ž ¯à®£à ¬¬¥"
?define T_USE_SHIFT_ENTER "'ˆá¯®«ì§ã©â¥ Shift+Enter çâ®¡ë ®âªàëâì ¢á¥ ¢ë¤¥«¥­­ë¥ ä ©«ë.' -I"
char *kfm_func = {
"F1 ˆ­ä®",
"F2 ¥à¥¨¬.",
"F3 à®á¬.",
"F4 ¥¤ ªâ.",
"F5 Š®¯¨à®¢ âì",
"F6 ¥à¥¬¥áâ¨âì",
"F7  ¯ª ",
"F8 “¤ «¨âì",
"F9 ” ©«",
"F10  áâனª¨"
}
#else
?define T_FILE "File"
?define T_TYPE "Type"
55,7 → 67,17
?define COPY_PATH_STR "'Directory path copied to clipboard' -I"
?define T_ABOUT "About"
?define T_USE_SHIFT_ENTER "'Use Shift+Enter to open all selected files.' -I"
char *kfm_func = {
"F1 Info",
"F2 Rename",
"F3 View",
"F4 Edit",
"F5 Copy",
"F6 Move",
"F7 Folder",
"F8 Delete",
"F9 File",
"F10 Settings"
}
#endif
 
?define T_KFM_FUNC "F1 Info | F2 Rename | F3 View | F4 Edit | F5 Copy | F6 Move | F7 Folder | F8 Delete | F9 File | F10 Settings"
//?define T_KFM_FUNC "F1 ˆ­ä® | F2 ¥à¥¨¬. | F3 à®á¬. | F4 ¥¤ ªâ. | F5 Š®¯¨à®¢ âì | F6 ¥à¥¬¥áâ¨âì | F7  ¯ª  | F8 “¤ «¨âì | F9 ” ©« | F10  áâனª¨"
/programs/cmm/menu/menu.c
154,8 → 154,8
 
inline ProcessKeys()
{
key_scancode = @GetKeyScancode();
switch(key_scancode)
@GetKeyScancode();
switch(AL)
{
case SCAN_CODE_ESC:
exit();
184,7 → 184,7
break;
 
default:
if (menu1.ProcessKey(key_scancode)) draw_list();
if (menu1.ProcessKey(AL)) draw_list();
}
}
 
/programs/cmm/template/build.bat
0,0 → 1,5
@del t
@c-- t.c
@pause
@rename t.com t
@del warning.txt
/programs/cmm/template/t.c
0,0 → 1,27
#define MEMSIZE 4096*40
 
#include "../lib/gui.h"
#include "../lib/fs.h"
 
void main()
{
proc_info Form;
 
@SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE);
loop() switch(WaitEvent())
{
case evMouse:
mouse.get();
break;
 
case evKey:
@GetKeyScancode();
if (AL == SCAN_CODE_ESC) @ExitProcess();
break;
 
case evReDraw:
sc.get();
DefineAndDrawWindow(100, 100, 300, 250, 0x34, sc.work, "Template app", 0);
GetProcessInfo(#Form, SelfInfo);
}
}