diff --git a/data/common/emul/uarm/download_image.sh b/data/common/emul/uarm/download_image.sh index 680a1cf96a..921bcbd262 100755 --- a/data/common/emul/uarm/download_image.sh +++ b/data/common/emul/uarm/download_image.sh @@ -1,2 +1,2 @@ #SHS -/sys/network/dl http://xvilka.me/jaunty.rel.v2.bz2 +/sys/network/dl http://store.kolibri-n.org/other/jaunty.rel.v2.bz2 diff --git a/programs/cmm/browser/TWB/set_style.h b/programs/cmm/browser/TWB/set_style.h index e7d24db5f9..608b432e70 100644 --- a/programs/cmm/browser/TWB/set_style.h +++ b/programs/cmm/browser/TWB/set_style.h @@ -87,7 +87,7 @@ void TWebBrowser::tag_font() } } else { - text_colors.pop(); + if (bg_colors.count>1) text_colors.pop(); if (bg_colors.count>1) bg_colors.pop(); //never pop the last color } } diff --git a/programs/cmm/browser/const.h b/programs/cmm/browser/const.h index 2fa881e89c..f9eda5ca73 100644 --- a/programs/cmm/browser/const.h +++ b/programs/cmm/browser/const.h @@ -107,4 +107,4 @@ char editbox_icons[] = FROM "res/editbox_icons.raw"; #define DEFAULT_URL "/sys/fonts/ru.htm" -char version[]="WebView 3.66"; \ No newline at end of file +char version[]="WebView 3.66-1"; \ No newline at end of file diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index ad54c57948..74f4f0b7ea 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -9,9 +9,9 @@ TODO: http://board.kolibrios.org/viewtopic.php?f=23&t=4521&p=77334#p77334 */ -#define ABOUT_TITLE "EOLITE 5.1" -#define TITLE_EOLITE "Eolite File Manager 5.1" -#define TITLE_KFM "Kolibri File Manager 2.1"; +#define ABOUT_TITLE "EOLITE 5.11" +#define TITLE_EOLITE "Eolite File Manager 5.11" +#define TITLE_KFM "Kolibri File Manager 2.11"; #define MEMSIZE 1024 * 250 #include "../lib/clipboard.h" @@ -383,25 +383,18 @@ void main() break; } - if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) { - + if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) + { if (key_scancode == SCAN_CODE_ENTER) { EventOpenSelected(); break; } - old_cur_y = files.cur_y; files.ProcessKey(key_scancode); EventChooseFilesRange(old_cur_y, files.cur_y); break; } - if (files.ProcessKey(key_scancode)) - { - List_ReDraw(); - break; - } - if (key_modifier&KEY_LCTRL) || (key_modifier&KEY_RCTRL) { switch(key_scancode) @@ -459,8 +452,7 @@ void main() break; } break; - } - + } switch (key_scancode) { case SCAN_CODE_BS: @@ -495,6 +487,14 @@ void main() case SCAN_CODE_F1...SCAN_CODE_F10: FnProcess(key_scancode-58); break; + case SCAN_CODE_DOWN: + case SCAN_CODE_UP: + case SCAN_CODE_HOME: + case SCAN_CODE_END: + case SCAN_CODE_PGUP: + case SCAN_CODE_PGDN: + if (files.ProcessKey(key_scancode)) List_ReDraw(); + break; default: EventSelectFileByKeyPress(); } diff --git a/programs/cmm/misc/install.c b/programs/cmm/misc/install.c index a08fa6f850..b512da36fd 100644 --- a/programs/cmm/misc/install.c +++ b/programs/cmm/misc/install.c @@ -121,7 +121,16 @@ void EventInstall() RunProgram("/sys/media/kiv", "\\S__/kolibrios/res/Wallpapers/Free yourself.jpg"); install_complete = true; - draw_window(); + + pause(150); + ActivateWindow_Self(); +} + +void ActivateWindow_Self() +{ + proc_info Form; + GetProcessInfo(#Form, SelfInfo); + ActivateWindow(GetProcessSlot(Form.ID)); } void Operation_Draw_Progress(dword filename) { } \ No newline at end of file