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

WebView: fix crash on End and PgDown

Browse Source 
mousecfg: -1 img sector
Eolite: small fixes and improvements in status bar

git-svn-id: svn://kolibrios.org@7804 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2020-04-17 17:04:54 +00:00
parent 1a812a14c6
commit 667c49c5af
9 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,7 @@ mgb=47
<lot>=60
com=1
bat=1
sh=1
sh=55
exe=2
img=3
ini=5

2
programs/cmm/browser/texts.h
View File

@ -1,4 +1,4 @@
char version[]="WebView 2.47a";
char version[]="WebView 2.47b";
#ifdef LANG_RUS
char page_not_found[] = FROM "html\\page_not_found_ru.htm""\0";

10
programs/cmm/eolite/Eolite.c
View File

@ -432,7 +432,6 @@ void main()
EventSelectAllFiles(true);
break;
case SCAN_CODE_KEY_U: //unselect all files
selected_count = 0;
EventSelectAllFiles(false);
break;
}
@ -529,7 +528,7 @@ void draw_window()
//main rectangles
DrawRectangle(1,40,Form.cwidth-3,Form.cheight - 42-status_bar_h,col.graph);
DrawRectangle(0,39,Form.cwidth-1,-show_status_bar.checked*status_bar_h + Form.cheight - 40,col.work_gradient[4]); //bg
for (i=0; i<5; i++) DrawBar(0, 34+i, Form.cwidth, 1, col.work_gradient[-i*3+15]);
for (i=0; i<6; i++) DrawBar(0, 34+i, Form.cwidth, 1, MixColors(system.color.work_dark, system.color.work, i*10));
llist_copy(#files_active, #files);
strcpy(#active_path, #path);
DrawStatusBar();
@ -562,8 +561,13 @@ void DrawStatusBar()
if (!show_status_bar.checked) return;
if (files.count>0) && (strcmp(file_mas[0]*304+buf+72,"..")==0) go_up_folder_exists=1;
DrawBar(0, Form.cheight - status_bar_h, Form.cwidth, status_bar_h, system.color.work);
sprintf(#status_bar_str, STATUS_STR, files.count-go_up_folder_exists, count_dir-go_up_folder_exists, files.count-count_dir, selected_count);
sprintf(#status_bar_str, T_STATUS_EVEMENTS, count_dir-go_up_folder_exists, files.count-count_dir);
WriteText(6,Form.cheight - 13,0x80,system.color.work_text,#status_bar_str);
if (selected_count) {
sprintf(#status_bar_str, T_STATUS_SELECTED, selected_count);
WriteText(Form.cwidth - calc(strlen(#status_bar_str)*6)-6,Form.cheight - 13,
0x80,system.color.work_text,#status_bar_str);
}
}
void DrawFilePanels()

1
programs/cmm/eolite/include/copy.h
View File

@ -14,6 +14,7 @@ void setElementSelectedFlag(dword n, int state) {
}
if (state==true) selected_count++;
if (state==false) selected_count--;
if (selected_count<0) selected_count=0;
}
int getElementSelectedFlag(dword n) {

9
programs/cmm/eolite/include/gui.h
View File

@ -64,14 +64,7 @@ void DrawFlatButtonSmall(dword x,y,width,height,id,text)
}
void DrawFilledBar(dword x, y, w, h)
{
int i, fill_h;
if (h < 12) {
for (i=0; i<h; i++) DrawBar(x, y+i, w, 1, col.work_gradient[-i*3+15]);
} else {
DrawBar(x, y, w, h, col.work_gradient[12]);
}
}
{ int i; for (i=0; i<h; i++) DrawBar(x, y+h-i-1, w, 1, col.work_gradient[i]); }
int popin_w=260;
void DrawEolitePopup(dword b1_text, b2_text)

2
programs/cmm/eolite/include/settings.h
View File

@ -267,7 +267,7 @@ void SetAppColors()
}
col.selec_inactive = MixColors(0xBBBbbb, col.list_bg, 65);
col.slider_bg_left = MixColors(col.graph, col.slider_bg_big, 10);
for (i=0; i<=20; i++) col.work_gradient[20-i] = MixColors(0, system.color.work, i);
for (i=0; i<20; i++) col.work_gradient[i] = MixColors(system.color.work_light, system.color.work, i*5);
if (old_list_bg_color!=col.list_bg) LoadIcons();
}

10
programs/cmm/eolite/include/translations.h
View File

@ -1,5 +1,5 @@
#define TITLE "Eolite File Manager 4.22"
#define ABOUT_TITLE "EOLITE 4.22"
#define TITLE "Eolite File Manager 4.23"
#define ABOUT_TITLE "EOLITE 4.23"
#ifdef LANG_RUS
?define T_FILE "” ©«"
@ -26,7 +26,8 @@
?define T_SELECT_APP_TO_OPEN_WITH "‚ë¡¥à¨â¥ ¯à®£à ¬¬ã ¤«ï ®âªàëâ¨ï ä ©« "
?define DEL_MORE_FILES_1 "¢ë¡à ­­ë¥ í«¥¬¥­âë ("
?define DEL_MORE_FILES_2 " èâ.)?"
?define STATUS_STR "<EFBFBD>«¥¬¥­â®¢: %d <20> ¯®ª: %d ” ©«®¢: %d ‚뤥«¥­­®: %d"
?define T_STATUS_EVEMENTS "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %d <20><><EFBFBD><EFBFBD>: %d"
?define T_STATUS_SELECTED "<EFBFBD>襪カキ⑭: %d"
?define COPY_PATH_STR "'<27>ãâì ¯ ¯ª¨ ᪮¯¨à®¢ ­ ¢ ¡ãä¥à ®¡¬¥­ ' -I"
?define T_ABOUT "Ž ¯à®£à ¬¬¥"
#else
@ -55,7 +56,8 @@
?define T_SELECT_APP_TO_OPEN_WITH "Select application to open file"
?define DEL_MORE_FILES_1 "selected items("
?define DEL_MORE_FILES_2 " pcs.)?"
?define STATUS_STR "Elements: %d Dirs: %d Files: %d Selected: %d"
?define T_STATUS_EVEMENTS "Dirs: %d Files: %d"
?define T_STATUS_SELECTED "Selected: %d"
?define COPY_PATH_STR "'Directory path copied to clipboard' -I"
?define T_ABOUT "About"
#endif

1
programs/cmm/lib/list_box.h
View File

@ -206,6 +206,7 @@ struct llist
if (cur_y==count-1) && (first==count-visible) return 0;
cur_y = count-1;
first = count - visible;
CheckDoesValuesOkey();
return 1;
}

2
programs/cmm/mousecfg/mousecfg.c
View File

@ -11,7 +11,6 @@
#include "..\lib\fs.h"
#include "..\lib\gui.h"
#include "..\lib\obj\libio.h"
#include "..\lib\obj\box_lib.h"
#include "..\lib\obj\libini.h"
#include "..\lib\patterns\restart_process.h"
@ -59,7 +58,6 @@ void main() {
int id;
load_dll(libini, #lib_init,1);
load_dll(boxlib, #box_lib_init,0);
LoadCfg();