Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Eolite: disalow textbox data editing in Properties window

Browse Source 
software_widget: improve usability at small screens
games.ini: fix Ataka path


git-svn-id: svn://kolibrios.org@7605 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2019-03-13 00:02:58 +00:00
parent bc5ea26ad2
commit 917b096afd
5 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ Almaz=/k/games/almaz,81
Tanks=games/tanks,67 Tanks=games/tanks,67
RocketForces=games/rforces,110 RocketForces=games/rforces,110
Pig=/k/games/pig/pigex Pig=/k/games/pig/pigex
; Ataka=games/ataka ;rus only ; Ataka=games/ataka,35 ;rus only
Donkey=/k/games/donkey Donkey=/k/games/donkey
Loderunner=/k/games/LRL/LRL,41 Loderunner=/k/games/LRL/LRL,41
; 21days=/k/games/21days,104 ;rus only ; 21days=/k/games/21days,104 ;rus only

2
data/rus/settings/games.ini
View File

@ -33,7 +33,7 @@ Almaz=/k/games/almaz,81
Tanks=games/tanks,67 Tanks=games/tanks,67
RocketForces=games/rforces,110 RocketForces=games/rforces,110
Pig=/k/games/pig/pigex Pig=/k/games/pig/pigex
Ataka=games/ataka ;rus only Ataka=games/ataka,35 ;rus only
Donkey=/k/games/donkey Donkey=/k/games/donkey
Loderunner=/k/games/LRL/LRL,41 Loderunner=/k/games/LRL/LRL,41
21days=/k/games/21days,104 ;rus only 21days=/k/games/21days,104 ;rus only

7
programs/cmm/eolite/include/properties.h
View File

@ -250,8 +250,11 @@ void properties_dialog()
break; break;
default: default:
edit_box_key stdcall(#file_name_ed); if (key_modifier & KEY_LCTRL) || (key_modifier & KEY_RCTRL) {
edit_box_key stdcall(#path_to_file_ed); EAX = key_editbox;
edit_box_key stdcall(#file_name_ed);
edit_box_key stdcall(#path_to_file_ed);
}
} }
break; break;

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

@ -1,5 +1,5 @@
#define TITLE "Eolite File Manager 4.06" #define TITLE "Eolite File Manager 4.07"
#define ABOUT_TITLE "EOLITE 4.06" #define ABOUT_TITLE "EOLITE 4.07"
#ifdef LANG_RUS #ifdef LANG_RUS
?define T_FILE "” ©«" ?define T_FILE "” ©«"

40
programs/cmm/software_widget/software_widget.c
View File

@ -1,5 +1,5 @@
/* /*
SOFTWARE CENTER v2.81 SOFTWARE CENTER v2.85
*/ */
#define MEMSIZE 4096 * 15 #define MEMSIZE 4096 * 15
@ -31,6 +31,8 @@ int list_pos,
char window_title[128], char window_title[128],
settings_ini_path[256] = "/sys/settings/"; settings_ini_path[256] = "/sys/settings/";
bool small_screen = false;
#define LIST_BACKGROUND_COLOR 0xF3F3F3 #define LIST_BACKGROUND_COLOR 0xF3F3F3
block ipos[128]; block ipos[128];
@ -77,6 +79,12 @@ void main()
DrawList(); DrawList();
window_height = row+1*list.item_h + list_pos + skin_height + 15; window_height = row+1*list.item_h + list_pos + skin_height + 15;
if (window_height>screen.height) {
window_width = screen.width;
list.item_h -= 5;
window_height = row+1*list.item_h + list_pos + skin_height + 15;
small_screen = true;
}
loop() switch(WaitEvent()) loop() switch(WaitEvent())
{ {
@ -98,13 +106,20 @@ void main()
system.color.get(); system.color.get();
DefineAndDrawWindow(screen.width-window_width/2,screen.height-window_height/2,window_width,window_height,0x74,system.color.work,"",0); DefineAndDrawWindow(screen.width-window_width/2,screen.height-window_height/2,window_width,window_height,0x74,system.color.work,"",0);
GetProcessInfo(#Form, SelfInfo); GetProcessInfo(#Form, SelfInfo);
if (Form.status_window>2) { DrawTitle(#window_title); break; } else DrawTitle(""); if (Form.status_window>2) {
draw_top_bar(); DrawTitle(#window_title);
break;
}
if (small_screen) {
DrawTitle(#window_title);
list.y = 0;
} else {
DrawTitle(NULL);
draw_top_bar();
}
DrawList(); DrawList();
DrawBar(0, row +1 * list.item_h + list_pos, Form.cwidth, -row - 1 * list.item_h - list_pos + Form.cheight, LIST_BACKGROUND_COLOR); DrawBar(0, row +1 * list.item_h + list_pos, Form.cwidth, -row - 1 * list.item_h - list_pos + Form.cheight, LIST_BACKGROUND_COLOR);
//if (list.cur_y == list.count) DrawSelection();
DrawSelection();
break;
} }
} }
@ -170,11 +185,14 @@ byte process_sections(dword sec_name, f_name)
} }
col = 0; col = 0;
old_row = row; old_row = row;
DrawBar(0, row * list.item_h + list_pos, Form.cwidth , 29, LIST_BACKGROUND_COLOR);
text_len = kfont.WriteIntoWindow(10, row * list.item_h + 10 + list_pos, LIST_BACKGROUND_COLOR, 0, 15, sec_name); if (!small_screen) {
DrawBar(text_len+20, row * list.item_h + list_pos + 20, Form.cwidth-text_len-20, 1, 0xDCDCDC); DrawBar(0, row * list.item_h + list_pos, Form.cwidth , 29, LIST_BACKGROUND_COLOR);
DrawBar(text_len+20, row * list.item_h + list_pos + 21, Form.cwidth-text_len-20, 1, 0xFCFCFC); text_len = kfont.WriteIntoWindow(10, row * list.item_h + 10 + list_pos, LIST_BACKGROUND_COLOR, 0, 15, sec_name);
list_pos += 29; DrawBar(text_len+20, row * list.item_h + list_pos + 20, Form.cwidth-text_len-20, 1, 0xDCDCDC);
DrawBar(text_len+20, row * list.item_h + list_pos + 21, Form.cwidth-text_len-20, 1, 0xFCFCFC);
list_pos += 29;
}
ini_enum_keys stdcall (f_name, sec_name, #draw_icons_from_section); ini_enum_keys stdcall (f_name, sec_name, #draw_icons_from_section);
return true; return true;
} }