diff --git a/programs/cmm/browser/TWB/set_style.h b/programs/cmm/browser/TWB/set_style.h index 41ed6ba30..9bf920d3b 100644 --- a/programs/cmm/browser/TWB/set_style.h +++ b/programs/cmm/browser/TWB/set_style.h @@ -270,11 +270,15 @@ void TWebBrowser::tag_h1234_caption() void TWebBrowser::tag_kosicon() { dword imgbuf[44]; + dword maxicon; dword shared_i18 = memopen("ICONS18", NULL, SHM_READ); + maxicon = EDX / 18 / 18 / 4; if (shared_i18) && (tag.get_number_of("n")) { - if (draw_x + 18 > canvas.bufw) NewLine(); - canvas.DrawImage(draw_x, draw_y-2, 18, 18, 18*18*4*tag.number+shared_i18); - draw_x += 22; + if (tag.number < maxicon) { + if (draw_x + 18 > canvas.bufw) NewLine(); + canvas.DrawImage(draw_x, draw_y-2, 18, 18, 18*18*4*tag.number+shared_i18); + draw_x += 22; + } } } diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c index c3ee16334..71e37a393 100644 --- a/programs/cmm/browser/WebView.c +++ b/programs/cmm/browser/WebView.c @@ -571,10 +571,10 @@ void OpenPage(dword _open_URL) //INTERNAL PAGE history.add(#new_url); WB1.custom_encoding = -1; - if (streq(#new_url, URL_SERVICE_HOMEPAGE)) LoadInternalPage(#buildin_page_home, sizeof(buildin_page_home)-1); - else if (streq(#new_url, URL_SERVICE_TEST)) LoadInternalPage(#buildin_page_test, sizeof(buildin_page_test)-1); + if (streq(#new_url, URL_SERVICE_HOMEPAGE)) LoadInternalPage(#buildin_page_home, sizeof(buildin_page_home)); + else if (streq(#new_url, URL_SERVICE_TEST)) LoadInternalPage(#buildin_page_test, sizeof(buildin_page_test)); else if (streq(#new_url, URL_SERVICE_HISTORY)) ShowHistory(); - else LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error)-1); + else LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error)); } else if (!strncmp(#new_url,"http:",5)) || (!strncmp(#new_url,"https:",6)) { //WEB PAGE @@ -589,7 +589,7 @@ void OpenPage(dword _open_URL) if (!http.transfer) { history.add(#new_url); - LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error)-1); + LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error)); } } else { //LOCAL PAGE @@ -712,7 +712,7 @@ void EventSubmitOmnibox() void LoadInternalPage(dword _bufdata, _in_bufsize){ if (!_bufdata) || (!_in_bufsize) { - LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error)-1); + LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error)); } else { WB1.list.first = 0; //scroll page to the top DrawOmnibox(); diff --git a/programs/cmm/browser/const.h b/programs/cmm/browser/const.h index 30d3c38df..1ad3c39b1 100644 --- a/programs/cmm/browser/const.h +++ b/programs/cmm/browser/const.h @@ -112,4 +112,4 @@ char editbox_icons[] = FROM "res/editbox_icons.raw"; #define DEFAULT_URL URL_SERVICE_HOMEPAGE -char version[]="WebView 3.85"; \ No newline at end of file +char version[]="WebView 3.9"; \ No newline at end of file diff --git a/programs/cmm/browser/res/homepage_en.htm b/programs/cmm/browser/res/homepage_en.htm index f5107e5bf..9abd1d979 100644 --- a/programs/cmm/browser/res/homepage_en.htm +++ b/programs/cmm/browser/res/homepage_en.htm @@ -1,17 +1,49 @@ - - -Homepage - -
Welcome to WebView a Text-Based Browser. 
+New tab
+
 
-KolibriOS Bookmarks:
-1. Homepage
-2. Night-builds
-3. FTP Server
+
+ ___________________
+|# :             : #|
+|  :   WebView   :  |
+|  :  TextBased  :  |
+|  :   Browser   :  |
+|  :             :  |
+|  :_____________:  |
+|     ___________   |
+|    | __        |  |
+|    ||  |       |  |
+\____||__|_______|__|lc
 
-By the way, 
+ web  1.0  compatable
+              
+

+
+
+Homepage  
+Night-builds  
+FTP Server
+
+
+By the way,
 • You can check for browser updates from the main menu.
-• To run a web search, type a text in the adress box and press Ctrl+Enter. 
+• To run a web search, type a text in the adress box and press Ctrl+Enter.
 • Pressing F6 moves a text cursor to the omnibox.
-• Click on a label in the bottom right corner to change the encoding of a page.
-
+• You can manually change the encoding of a page by clicking on a label in the bottom right corner.
+
+
+
+
+
+
+
+        ~+
+
+                 *       +
+           '                  |
+       ()    .-.,="``"=.    - o -
+             '=/_       \     |
+          *   |  '=._    |
+               \     `=./`,        '
+            .   '=.__.=' `='      *
+   +                         +
+        O      *        '       .jgs
\ No newline at end of file
diff --git a/programs/cmm/browser/res/homepage_ru.htm b/programs/cmm/browser/res/homepage_ru.htm
index 2639aa66f..458d4532e 100644
--- a/programs/cmm/browser/res/homepage_ru.htm
+++ b/programs/cmm/browser/res/homepage_ru.htm
@@ -1,15 +1,49 @@
-
-Домашняя страница
-
Добро пожаловать текстовый браузер WebView!
+Новая вкладка
+
 
-Ресурсы KolibriOS:
    
-
  1. Официальный сайт
-
  2. Ночные сборки
-
  3. FTP сервер

+
+ ___________________
+|# :             : #|
+|  :   WebView   :  |
+|  :  Текстовый  :  |
+|  :   Браузер   :  |
+|  :             :  |
+|  :_____________:  |
+|     ___________   |
+|    | __        |  |
+|    ||  |       |  |
+\____||__|_______|__|lc
 
-Кстати, 
+ web  1.0  compatable
+              
+

+
+
+Официальный сайт  
+Ночные сборки  
+FTP сервер
+
+
+Кстати,
 • Из главного меню можно проверить наличие обновлений
 • Для поиска в Google наберите тест в адресной строке и нажмите Ctrl+Enter
 • Клавиша F6 перемещает текстовый курсор в омнибокс.
 • Можно изменить кодировку страницы, для этого нажмите на надпись в правом нижнем углу окна.
 
+
+
+
+
+
+
+        ~+
+
+                 *       +
+           '                  |
+       ()    .-.,="``"=.    - o -
+             '=/_       \     |
+          *   |  '=._    |
+               \     `=./`,        '
+            .   '=.__.=' `='      *
+   +                         +
+        O      *        '       .jgs
\ No newline at end of file