WebSVN – Kolibri OS – Path Comparison – / – /programs/ Rev 7975 and /programs/ Rev 7976

Regard whitespace Rev 7975 → Rev 7976

/programs/cmm/aelia/buidin_pages/home.htm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/programs/cmm/aelia/buidin_pages/about.htm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/programs/cmm/aelia/buidin_pages/not_found.htm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/programs/cmm/aelia/gui.h
File deleted

/programs/cmm/aelia/favicon.h
File deleted
\ No newline at end of file

/programs/cmm/aelia/aelia.c
File deleted

/programs/cmm/aelia/_compile.bat
File deleted

/programs/cmm/aelia/prepare_page.h
File deleted

/programs/cmm/aelia/canvas.h
File deleted

/programs/cmm/aelia/link.h
File deleted
\ No newline at end of file

/programs/cmm/aelia/ini.h
File deleted

/programs/cmm/aelia/atoolbar.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/programs/cmm/aelia/special.h
File deleted

/programs/cmm/aelia/Tupfile.lua
File deleted

/programs/cmm/aelia/pointer.cur
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/programs/cmm/browser/html/homepage_en.htm
File deleted
\ No newline at end of file

/programs/cmm/browser/html/page_not_found_en.htm
File deleted
\ No newline at end of file

/programs/cmm/browser/html/help_en.htm
File deleted
\ No newline at end of file

/programs/cmm/browser/html/homepage_ru.htm
File deleted
\ No newline at end of file

/programs/cmm/browser/html/page_not_found_ru.htm
File deleted
\ No newline at end of file

/programs/cmm/browser/html/help_ru.htm
File deleted
\ No newline at end of file

/programs/cmm/browser/html
Property changes:
Deleted: tsvn:logminsize
-5
\ No newline at end of property

 /programs/cmm/browser/WebView.c
 ,6 → 592,16
         history.add(#new_url);
+        /*
+        There could be several possible types of addresses:
+        - cached page (only http/https)
+        - internal page
+        - web page
+        - local file
+        So we need to detect what incoming address is
+        and then halndle it in the propper way.
+        */
         if (pages_cache.has(#new_url)) {
                 //CACHED PAGE
                 LoadInternalPage(pages_cache.current_page_buf, pages_cache.current_page_size);
 ,10 → 608,10
         } else if (!strncmp(#new_url,"WebView:",8)) {
                 //INTERNAL PAGE
-                if (!strcmp(#new_url, URL_SERVICE_HOMEPAGE)) LoadInternalPage(#homepage, sizeof(homepage));
-                else if (!strcmp(#new_url, URL_SERVICE_HELP)) LoadInternalPage(#help, sizeof(help));
-                else if (!strcmp(#new_url, URL_SERVICE_HISTORY)) ShowHistory();
-                else LoadInternalPage(#page_not_found, sizeof(page_not_found));
+                if (streq(#new_url, URL_SERVICE_HOMEPAGE)) LoadInternalPage(#buidin_page_home, sizeof(buidin_page_home));
+                else if (streq(#new_url, URL_SERVICE_HELP)) LoadInternalPage(#buidin_page_help, sizeof(buidin_page_help));
+                else if (streq(#new_url, URL_SERVICE_HISTORY)) ShowHistory();
+                else LoadInternalPage(#buidin_page_error, sizeof(buidin_page_error));
         } else if (!strncmp(#new_url,"http:",5)) || (!strncmp(#new_url,"https:",6)) {
                 //WEB PAGE
 ,7 → 631,7
                 if (!http.transfer) {
                         StopLoading();
-                        LoadInternalPage(#page_not_found, sizeof(page_not_found));
+                        LoadInternalPage(#buidin_page_error, sizeof(buidin_page_error));
                 }
         } else {
                 //LOCAL PAGE
 ,7 → 643,7
                         strcpy(#new_url, "/tmp0/1/temp/word/document.xml");
                 }
                 if (!GetLocalFileData(#new_url)) {
-                        LoadInternalPage(#page_not_found, sizeof(page_not_found));
+                        LoadInternalPage(#buidin_page_error, sizeof(buidin_page_error));
                 }
         }
 }
 ,7 → 760,7
 void LoadInternalPage(dword _bufdata, _in_bufsize){
         if (!_bufdata) || (!_in_bufsize) {
-                LoadInternalPage(#page_not_found, sizeof(page_not_found));
+                LoadInternalPage(#buidin_page_error, sizeof(buidin_page_error));
         } else {
                 WB1.list.first = 0; //scroll page to the top
                 DrawOmnibox();

 /programs/cmm/browser/buidin_pages/help_en.htm
 ,0 → 1,28
+<html>
+<head>
+<meta charset="uft">
+<title>WebView Help</title>
+</head>
+<body>
+<h1>WebView Text-Based Browser</h1>
+It is free and open-source. If you have any suggestions or want to help improving it please visit its topic at <a href="http://board.kolibrios.org/viewtopic.php?f=40&amp;t=1075">board.kolibrios.org</a><pre>
+<b>Shortcut keys</b>
+<font bg="#C7CEE4">[CTRL + N or CTRL + T]</font> New window
+<font bg="#C7CEE4">[CTRL + R or F5]</font> Refresh the current page
+<font bg="#C7CEE4">[CTRL + O]</font> Start OpenDialog to open local file
+<font bg="#C7CEE4">[CTRL + U]</font> View a web page's source code
+<font bg="#C7CEE4">[CTRL + H]</font> Open browser history
+<font bg="#C7CEE4">[CTRL + J]</font> Display the file downloader
+<font bg="#C7CEE4">[CTRL + W]</font> Exit browser
+<font bg="#C7CEE4">[CTRL + ENTER]</font> Submit a web search
+<font bg="#C7CEE4">[CTRL + LEFT]</font> Back a page.
+<font bg="#C7CEE4">[CTRL + RIGHT]</font> Forward a page.
+<font bg="#C7CEE4">[F6]</font> Moves a text cursor to the omnibox
+</pre>
+</body>
+</html>

 /programs/cmm/browser/buidin_pages/homepage_en.htm
 ,0 → 1,21
+<html>
+<head>
+<meta charset="uft">
+<title>Homepage</title>
+</head>
+<body><pre>Bookmarks:
+. <a href="http://kolibrios.org" id="valera">KolibriOS homepage</a>
+. <a href="http://kolibri-n.org" id="hodor">KolibriN homepage</a>
+. <a href="http://store.kolibri-n.org">Kolibri Stuff</a>
+<font bg=#F8F15B>By the way,</font>
+<font color="#555555">&bull; You can check for browser updates from the main menu.
+&bull; To run a web search, type a text in the adress box and press Ctrl+Enter.
+&bull; You can also use other <a href="WebView:help"><font color="#555555">Hotkeys</font></a>.
+&bull; Click on a label in the bottom right corner to change the encoding of a page.
+</font>
+</pre>
+</body>
+</html>

 /programs/cmm/browser/buidin_pages/homepage_ru.htm
 ,0 → 1,20
+<html>
+<head>
+<meta charset="cp-866">
+<title>®¬ èïï áâà ¨æ </title>
+</head>
+<body><pre> ª« ¤ª¨:
+. <a href="http://kolibrios.org" id="valera">®¬ èïï áâà ¨æ  KolibriOS</a>
+. <a href="http://kolibri-n.org" id="hodor">KolibriN10</a>
+. <a href="http://store.kolibri-n.org">Kolibri Store</a>
+<font bg=#F8F15B>áâ â¨,</font>
+<font color="#555555">&bull; § £« ¢®£® ¬¥î ¬®¦® ¯à®¢¥à¨âì  «¨ç¨¥ ®¡®¢«¥¨©
+&bull; «ï ¯®¨áª  ¢ Google  ¡¥à¨â¥ â¥áâ ¢  ¤à¥á®© áâà®ª¥ ¨  ¦¬¨â¥ Ctrl+Enter
+&bull; áâì â ª¦¥ ¤àã£¨¥ <a href="WebView:help"><font color="#555555">®àïç¨¥ ª« ¢¨è¨</font></a>.
+&bull; ®¦® ¨§¬¥¨âì ª®¤¨à®¢ªã áâà ¨æë, ¤«ï íâ®£®  ¦¬¨â¥    ¤¯¨áì ¢ ¯à ¢®¬ ¨¦¥¬ ã£«ã ®ª .
+</font>
+</pre>
+</body>
+</html>

 /programs/cmm/browser/buidin_pages/help_ru.htm
 ,0 → 1,24
+<html>
+<head>
+<meta charset="cp-866">
+<title>¯à ¢ª  WebView</title>
+</head>
+<body><pre><h1>¯à ¢ª  WebView</h1>
+<b>« ¢¨è¨ ¡ëáâà®£® ¢ë§®¢ </b>
+<font bg="#C7CEE4">[CTRL + N ¨«¨ CTRL + T]</font> ®¢®¥ ®ª®
+<font bg="#C7CEE4">[CTRL + R ¨«¨ F5]</font> ¥à¥§ £àã§¨âì áâà ¨æã
+<font bg="#C7CEE4">[CTRL + O]</font> ë§¢ âì ¤¨ «®£ ¢ë¡®à  ä ©«
+<font bg="#C7CEE4">[CTRL + U]</font> ¬®âà¥âì ¨áå®¤ë© ª®¤ áâà ¨æë
+<font bg="#C7CEE4">[CTRL + H]</font> ¬®âà¥âì ¨áâ®à¨î ¯®á¥é¥ëå áâà ¨æ
+<font bg="#C7CEE4">[CTRL + J]</font> âªàëâì § £àã§ç¨ª ä ©«®¢
+<font bg="#C7CEE4">[CTRL + W]</font>  ªàëâì ¡à ã§¥à
+<font bg="#C7CEE4">[CTRL + ENTER]</font> ®¨áª ¢ ¨â¥à¥â¥ á ¯®¬®éìî Google
+<font bg="#C7CEE4">[CTRL + ]</font>  «®£¨ç® ª®¯ª¥ " § ¤" ¢ ¡à ã§¥à¥
+<font bg="#C7CEE4">[CTRL + ]</font>  «®£¨ç® ª®¯ª¥ "¯¥à¥¤"
+<font bg="#C7CEE4">[F6]</font> ¥à¥¬¥é ¥â â¥ªáâ®¢ë© ªãàá®à ¢ ®¬¨¡®ªá
+</pre>
+</body>
+</html>

 /programs/cmm/browser/buidin_pages/page_not_found_ru.htm
 ,0 → 1,27
+<html>
+<head>
+<meta charset="cp-866">
+<title>âà ¨æ  ¥  ©¤¥ </title>
+</head>
+<body>
+<h1>&nbsp;¥¡-áâà ¨æ  ¥¤®áâã¯ </h1>
+<h2>&nbsp;â® ¬®¦® á¤¥« âì:</h2>
+<ul>
+        <li>
+                ¡¥¤¨â¥áì, çâ® ¥áâì ¯®¤ª«îç¥¨¥ ª á¥â¨ â¥à¥â.<br>
+                âªà®©â¥ <a href="/sys/network/netcfg">Netcfg</a> ¤«ï ¤¨ £®áâ¨ª¨ á¥â¨.<br>
+        </li>
+        <li>
+                à®¢¥àìâ¥  ¤à¥áá áâà ¨æë, ¢®§¬®¦®, ¡ë«  á¤¥«   ®¯¥ç âª .<br>
+        </li>
+        <li>
+                ¥à¢¥à ¢à¥¬¥® ¥¤®áâã¯¥. <br>
+                ¡®¢¨â¥ áâà ¨æã.<br>
+        </li>
+        <li>
+                ¥ªáâ®¢ë© ¡à ã§¥à ¥ ¯à ¢¨«ì® ®¡à ¡®â « ®â¢¥â á¥à¢¥à .<br>
+                ®®¡é¨â¥ ®¡ ®è¨¡ª¥.<br>
+        </li>
+</ul>
+</body>
+</html>

 /programs/cmm/browser/buidin_pages/page_not_found_en.htm
 ,0 → 1,27
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=cp-866" />
+<title>Page not found</title>
+</head>
+<body>
+<h1>&nbsp;Webpage Not Available</h1>
+<h2>&nbsp;What could be done:</h2>
+<ul>
+        <li>
+                Make sure that evetything fine with Internet connection.<br>
+                Open <a href="/sys/network/netcfg">Netcfg</a> network diagnostic tool.<br>
+        </li>
+        <li>
+                Check page address, there may have been made a typo.<br>
+        </li>
+        <li>
+                Server is temporarily unavailable.<br>
+                Refresh the page.<br>
+        </li>
+        <li>
+                Browser doesn't handled properly server's response.<br>
+                Please, report an error.<br>
+        </li>
+</ul>
+</body>
+</html>

/programs/cmm/browser/buidin_pages
Property changes:
Added: tsvn:logminsize
+5
\ No newline at end of property

 /programs/cmm/browser/texts.h
 ,9 → 1,9
 char version[]="WebView 2.61";
 #ifdef LANG_RUS
-char page_not_found[] = FROM "html\\page_not_found_ru.htm""\0";
-char homepage[] = FROM "html\\homepage_ru.htm""\0";
-char help[] = FROM "html\\help_ru.htm""\0";
+char buidin_page_error[] = FROM "buidin_pages\\page_not_found_ru.htm""\0";
+char buidin_page_home[]  = FROM "buidin_pages\\homepage_ru.htm""\0";
+char buidin_page_help[]  = FROM "buidin_pages\\help_ru.htm""\0";
 char accept_language[]= "Accept-Language: ru\n";
 char rmb_menu[] =
 "®á¬®âà¥âì ¨áå®¤¨ª|Ctrl+U
 ,9 → 31,9
 char update_can_not_copy[] = "'WebView\n¥ ¬®£ã ¯¥à¥¬¥áâ¨âì ®¢ãî ¢¥àá¨î ¨§ ¯ ¯ª¨ Downloads   Ramdisk. ®§¬®¦®, ¥ ¤®áâ â®ç® ¬¥áâ .' -tE";
 char clear_cache_ok[] = "'WebView\níè ®ç¨é¥.' -tI";
 #else
-char page_not_found[] = FROM "html\\page_not_found_en.htm""\0";
-char homepage[] = FROM "html\\homepage_en.htm""\0";
-char help[] = FROM "html\\help_en.htm""\0";
+char buidin_page_error[] = FROM "buidin_pages\\page_not_found_en.htm""\0";
+char buidin_page_home[]  = FROM "buidin_pages\\homepage_en.htm""\0";
+char buidin_page_help[]  = FROM "buidin_pages\\help_en.htm""\0";
 char accept_language[]= "Accept-Language: en\n";
 char rmb_menu[] =
 "View source|Ctrl+U

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7975 → Rev 7976