diff --git a/programs/cmm/TWB/links.h b/programs/cmm/TWB/links.h index 660f021d2f..0913dc2b28 100644 --- a/programs/cmm/TWB/links.h +++ b/programs/cmm/TWB/links.h @@ -18,7 +18,6 @@ struct LinksArray { void Hover(); void AddLink(); void AddText(); - void ClickLink(); dword GetURL(); void Clear(); void GetAbsoluteURL(); @@ -164,54 +163,3 @@ void LinksArray::GetAbsoluteURL(dword in_URL) strcpy(orig_URL, #newurl); } -void LinksArray::ClickLink() -{ - if (http_transfer > 0) - { - StopLoading(); - BrowserHistory.current--; - } - - strcpy(#URL, PageLinks.GetURL(PageLinks.active)); - //#1 - if (URL[0] == '#') - { - strcpy(#anchor, #URL+strrchr(#URL, '#')); - strcpy(#URL, BrowserHistory.CurrentUrl()); - WB1.list.first=WB1.list.count-WB1.list.visible; - ShowPage(); - return; - } - //liner.ru#1 - if (strrchr(#URL, '#')!=-1) - { - strcpy(#anchor, #URL+strrchr(#URL, '#')); - URL[strrchr(#URL, '#')-1] = 0x00; - } - - PageLinks.GetAbsoluteURL(#URL); - - if (UrlExtIs(".png")==1) || (UrlExtIs(".gif")==1) || (UrlExtIs(".jpg")==1) || (UrlExtIs(".zip")==1) || (UrlExtIs(".kex")==1) - || (UrlExtIs(".7z")==1) || (UrlExtIs("netcfg")==1) - { - //notify(#URL); - if (!strncmp(#URL,"http://", 7)) - { - strcpy(#DL_URL, #URL); - CreateThread(#Downloader,#downloader_stak+4092); - } - else RunProgram("@open", #URL); - strcpy(#editURL, BrowserHistory.CurrentUrl()); - strcpy(#URL, BrowserHistory.CurrentUrl()); - return; - } - if (!strncmp(#URL,"mailto:", 7)) - { - notify(#URL); - strcpy(#editURL, BrowserHistory.CurrentUrl()); - strcpy(#URL, BrowserHistory.CurrentUrl()); - return; - } - OpenPage(); - return; -} diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c index 25c724260d..05f5b1bd97 100644 --- a/programs/cmm/browser/WebView.c +++ b/programs/cmm/browser/WebView.c @@ -504,6 +504,58 @@ void DrawProgress() DrawBar(address_box.left-2, address_box.top+15, btn, 2, wv_progress_bar.progress_color); } +void ClickLink() +{ + if (http_transfer > 0) + { + StopLoading(); + BrowserHistory.current--; + } + + strcpy(#URL, PageLinks.GetURL(PageLinks.active)); + //#1 + if (URL[0] == '#') + { + strcpy(#anchor, #URL+strrchr(#URL, '#')); + strcpy(#URL, BrowserHistory.CurrentUrl()); + WB1.list.first=WB1.list.count-WB1.list.visible; + ShowPage(); + return; + } + //liner.ru#1 + if (strrchr(#URL, '#')!=-1) + { + strcpy(#anchor, #URL+strrchr(#URL, '#')); + URL[strrchr(#URL, '#')-1] = 0x00; + } + + PageLinks.GetAbsoluteURL(#URL); + + if (UrlExtIs(".png")==1) || (UrlExtIs(".gif")==1) || (UrlExtIs(".jpg")==1) || (UrlExtIs(".zip")==1) || (UrlExtIs(".kex")==1) + || (UrlExtIs(".7z")==1) || (UrlExtIs("netcfg")==1) + { + //notify(#URL); + if (!strncmp(#URL,"http://", 7)) + { + strcpy(#DL_URL, #URL); + CreateThread(#Downloader,#downloader_stak+4092); + } + else RunProgram("@open", #URL); + strcpy(#editURL, BrowserHistory.CurrentUrl()); + strcpy(#URL, BrowserHistory.CurrentUrl()); + return; + } + if (!strncmp(#URL,"mailto:", 7)) + { + notify(#URL); + strcpy(#editURL, BrowserHistory.CurrentUrl()); + strcpy(#URL, BrowserHistory.CurrentUrl()); + return; + } + OpenPage(); + return; +} + char downloader_stak[4096]; stop: \ No newline at end of file diff --git a/programs/cmm/example fonts/font/Georgia 45px original b/programs/cmm/example fonts/font/Georgia 45px original deleted file mode 100644 index 1c7e37993e..0000000000 Binary files a/programs/cmm/example fonts/font/Georgia 45px original and /dev/null differ diff --git a/programs/cmm/example fonts/font/Other/Droid Sans Mono w slashed zero 14px b/programs/cmm/example fonts/font/Other/Droid Sans Mono w slashed zero 14px deleted file mode 100644 index 5b683cb1c9..0000000000 Binary files a/programs/cmm/example fonts/font/Other/Droid Sans Mono w slashed zero 14px and /dev/null differ diff --git a/programs/cmm/example fonts/font/Other/Droid Sans Mono w slashed zero 18px b/programs/cmm/example fonts/font/Other/Droid Sans Mono w slashed zero 18px deleted file mode 100644 index d5d660bb66..0000000000 Binary files a/programs/cmm/example fonts/font/Other/Droid Sans Mono w slashed zero 18px and /dev/null differ diff --git a/programs/cmm/example fonts/font/Other/Georgia 45px original b/programs/cmm/example fonts/font/Other/Georgia 45px original deleted file mode 100644 index 1c7e37993e..0000000000 Binary files a/programs/cmm/example fonts/font/Other/Georgia 45px original and /dev/null differ diff --git a/programs/cmm/example fonts/font/Other/Tahoma 11px b/programs/cmm/example fonts/font/Other/Tahoma 11px deleted file mode 100644 index 623434614a..0000000000 Binary files a/programs/cmm/example fonts/font/Other/Tahoma 11px and /dev/null differ diff --git a/programs/cmm/example fonts/font/Other/Tahoma 11px italic b/programs/cmm/example fonts/font/Other/Tahoma 11px italic deleted file mode 100644 index 237b780f68..0000000000 Binary files a/programs/cmm/example fonts/font/Other/Tahoma 11px italic and /dev/null differ diff --git a/programs/cmm/example fonts/font/Other/Tahoma 14px italic b/programs/cmm/example fonts/font/Other/Tahoma 14px italic deleted file mode 100644 index 54fbe3d3d8..0000000000 Binary files a/programs/cmm/example fonts/font/Other/Tahoma 14px italic and /dev/null differ diff --git a/programs/cmm/example fonts/font/Other/Tahoma 14px italic bold b/programs/cmm/example fonts/font/Other/Tahoma 14px italic bold deleted file mode 100644 index dda5a82fd5..0000000000 Binary files a/programs/cmm/example fonts/font/Other/Tahoma 14px italic bold and /dev/null differ diff --git a/programs/cmm/example fonts/font/Other/Times New Roman 30px original b/programs/cmm/example fonts/font/Other/Times New Roman 30px original deleted file mode 100644 index 924c92f7af..0000000000 Binary files a/programs/cmm/example fonts/font/Other/Times New Roman 30px original and /dev/null differ diff --git a/programs/cmm/example fonts/font/Tahoma source/10 b/programs/cmm/example fonts/font/Tahoma source/10 deleted file mode 100644 index 7c23549e1b..0000000000 Binary files a/programs/cmm/example fonts/font/Tahoma source/10 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Tahoma source/11 b/programs/cmm/example fonts/font/Tahoma source/11 deleted file mode 100644 index 623434614a..0000000000 Binary files a/programs/cmm/example fonts/font/Tahoma source/11 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Tahoma source/12 b/programs/cmm/example fonts/font/Tahoma source/12 deleted file mode 100644 index 4e78e88938..0000000000 Binary files a/programs/cmm/example fonts/font/Tahoma source/12 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Tahoma source/13 b/programs/cmm/example fonts/font/Tahoma source/13 deleted file mode 100644 index f594c62eb2..0000000000 Binary files a/programs/cmm/example fonts/font/Tahoma source/13 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Tahoma source/14 b/programs/cmm/example fonts/font/Tahoma source/14 deleted file mode 100644 index bd57b090b6..0000000000 Binary files a/programs/cmm/example fonts/font/Tahoma source/14 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Tahoma source/15 b/programs/cmm/example fonts/font/Tahoma source/15 deleted file mode 100644 index b0244009ef..0000000000 Binary files a/programs/cmm/example fonts/font/Tahoma source/15 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Tahoma source/16 b/programs/cmm/example fonts/font/Tahoma source/16 deleted file mode 100644 index 5c3a82d27b..0000000000 Binary files a/programs/cmm/example fonts/font/Tahoma source/16 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Tahoma source/17 b/programs/cmm/example fonts/font/Tahoma source/17 deleted file mode 100644 index 282c179dfb..0000000000 Binary files a/programs/cmm/example fonts/font/Tahoma source/17 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Tahoma source/18 b/programs/cmm/example fonts/font/Tahoma source/18 deleted file mode 100644 index 9d6ea74bf6..0000000000 Binary files a/programs/cmm/example fonts/font/Tahoma source/18 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Tahoma source/19 b/programs/cmm/example fonts/font/Tahoma source/19 deleted file mode 100644 index f3965f116f..0000000000 Binary files a/programs/cmm/example fonts/font/Tahoma source/19 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Tahoma source/20 b/programs/cmm/example fonts/font/Tahoma source/20 deleted file mode 100644 index 90bf7a7f69..0000000000 Binary files a/programs/cmm/example fonts/font/Tahoma source/20 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Tahoma source/21 b/programs/cmm/example fonts/font/Tahoma source/21 deleted file mode 100644 index 47f018ea93..0000000000 Binary files a/programs/cmm/example fonts/font/Tahoma source/21 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Tahoma source/22 b/programs/cmm/example fonts/font/Tahoma source/22 deleted file mode 100644 index 44892cc647..0000000000 Binary files a/programs/cmm/example fonts/font/Tahoma source/22 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Tahoma source/9 b/programs/cmm/example fonts/font/Tahoma source/9 deleted file mode 100644 index 501b82f9b9..0000000000 Binary files a/programs/cmm/example fonts/font/Tahoma source/9 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Times New Roman 30px original b/programs/cmm/example fonts/font/Times New Roman 30px original deleted file mode 100644 index 924c92f7af..0000000000 Binary files a/programs/cmm/example fonts/font/Times New Roman 30px original and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana 15px original b/programs/cmm/example fonts/font/Verdana 15px original deleted file mode 100644 index 42a2b4415d..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana 15px original and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/10 b/programs/cmm/example fonts/font/Verdana source/10 deleted file mode 100644 index f26817aca2..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/10 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/11 b/programs/cmm/example fonts/font/Verdana source/11 deleted file mode 100644 index 0945153cb2..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/11 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/12 b/programs/cmm/example fonts/font/Verdana source/12 deleted file mode 100644 index f917fcd81b..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/12 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/13 b/programs/cmm/example fonts/font/Verdana source/13 deleted file mode 100644 index 74a8cb6bf4..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/13 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/14 b/programs/cmm/example fonts/font/Verdana source/14 deleted file mode 100644 index afcd63ffc3..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/14 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/15 b/programs/cmm/example fonts/font/Verdana source/15 deleted file mode 100644 index 42a2b4415d..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/15 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/16 b/programs/cmm/example fonts/font/Verdana source/16 deleted file mode 100644 index 4804163239..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/16 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/17 b/programs/cmm/example fonts/font/Verdana source/17 deleted file mode 100644 index e44d4ba7bd..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/17 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/18 b/programs/cmm/example fonts/font/Verdana source/18 deleted file mode 100644 index 6735cc8cbd..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/18 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/19 b/programs/cmm/example fonts/font/Verdana source/19 deleted file mode 100644 index 83e21bb972..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/19 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/20 b/programs/cmm/example fonts/font/Verdana source/20 deleted file mode 100644 index 80775108fe..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/20 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/21 b/programs/cmm/example fonts/font/Verdana source/21 deleted file mode 100644 index d8030246f7..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/21 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/22 b/programs/cmm/example fonts/font/Verdana source/22 deleted file mode 100644 index f72e649a11..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/22 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/23 b/programs/cmm/example fonts/font/Verdana source/23 deleted file mode 100644 index 57606ed0ae..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/23 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/24 b/programs/cmm/example fonts/font/Verdana source/24 deleted file mode 100644 index 1e94fd8e25..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/24 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/25 b/programs/cmm/example fonts/font/Verdana source/25 deleted file mode 100644 index 8ed2544398..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/25 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/26 b/programs/cmm/example fonts/font/Verdana source/26 deleted file mode 100644 index 0ec42be51b..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/26 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/27 b/programs/cmm/example fonts/font/Verdana source/27 deleted file mode 100644 index 0b4783619f..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/27 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/28 b/programs/cmm/example fonts/font/Verdana source/28 deleted file mode 100644 index 11e9867b6e..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/28 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/29 b/programs/cmm/example fonts/font/Verdana source/29 deleted file mode 100644 index 5363aedd85..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/29 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/30 b/programs/cmm/example fonts/font/Verdana source/30 deleted file mode 100644 index f718bf328c..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/30 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/8 b/programs/cmm/example fonts/font/Verdana source/8 deleted file mode 100644 index 3c12f52b15..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/8 and /dev/null differ diff --git a/programs/cmm/example fonts/font/Verdana source/9 b/programs/cmm/example fonts/font/Verdana source/9 deleted file mode 100644 index 81824b3cb8..0000000000 Binary files a/programs/cmm/example fonts/font/Verdana source/9 and /dev/null differ diff --git a/programs/cmm/liza/mail_box.c b/programs/cmm/liza/mail_box.c index 54ccacc918..4756b3f52d 100644 --- a/programs/cmm/liza/mail_box.c +++ b/programs/cmm/liza/mail_box.c @@ -416,5 +416,6 @@ int GetLetterSize_(int number) { } - - +void ClickLink() { + RunProgram("/sys/network/WebView", PageLinks.GetURL(PageLinks.active)); +} \ No newline at end of file