Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5493 → Rev 5492

/programs/cmm/eolite/include/icons.h
19,7 → 19,7
"nes", 18, "smc", 18,
"gif", 19, "bmp", 19, "tga", 19, "pcx", 19, "png", 19, "pnm", 19, "jpg", 19, "xcf", 19, "ai", 19,
"jpeg",19, "raw", 11, "psd", 19, "wbmp",19, "tiff",19, "tif", 19,
"3ds", 20, "asc", 20, "ico", 20, "cur", 20, "ani", 20, "vox", 20,
"3ds", 20, "ico", 20, "cur", 20, "ani", 20, "vox", 20,
"img", 21, "ima", 21,
"dll", 22, "obj", 22, "dict",22,
"rar", 23, "zip", 23, "cab", 23, "tar", 23, "ajr", 23, "jar", 23, "7z", 23, "gz", 23, "kexp", 23,
/programs/cmm/lib/file_system.h
272,17 → 272,4
itoa_(#size_prefix, bytes);
strcat(#size_prefix, #size_nm);
return #size_prefix;
}
 
:dword ConvertSizeToKb(unsigned int bytes)
{
unsigned char size[25]=0;
unsigned int kb;
dword kb_line;
 
kb_line = itoa(bytes / 1024);
strcpy(#size, kb_line);
strcat(#size, " Kb");
 
return #size;
}
/programs/cmm/browser/downloader.h
File deleted
/programs/cmm/browser/WebView.c
29,10 → 29,10
//useful patterns
#include "..\lib\patterns\libimg_load_skin.h"
 
char homepage[] = FROM "html\\homepage.htm";
char homepage[] = FROM "html\homepage.htm";
 
#ifdef LANG_RUS
char version[]=" ’¥ªáâ®¢ë© ¡à ã§¥à 1.0";
char version[]=" ’¥ªáâ®¢ë© ¡à ã§¥à 1.0 Beta 6.2";
?define IMAGES_CACHE_CLEARED "Šíè ª à⨭®ª ®ç¨é¥­"
?define T_LAST_SLIDE "â® ¯®á«¥¤­¨© á« ©¤"
char loading[] = "‡ £à㧪  áâà ­¨æë...<br>";
39,7 → 39,7
char page_not_found[] = FROM "html\page_not_found_ru.htm";
char accept_language[]= "Accept-Language: ru\n";
#else
char version[]=" Text-based Browser 1.0";
char version[]=" Text-based Browser 1.0 Beta 6.2";
?define IMAGES_CACHE_CLEARED "Images cache cleared"
?define T_LAST_SLIDE "This slide is the last"
char loading[] = "Loading...<br>";
77,7 → 77,6
#include "menu_rmb.h"
#include "history.h"
#include "show_src.h"
#include "downloader.h"
 
char editURL[sizeof(URL)];
int mouse_twb;
134,11 → 133,9
Form.width=WIN_W;
Form.height=WIN_H;
SetElementSizes();
if (param) strcpy(#URL, #param); else strcpy(#URL, URL_SERVICE_HOME);
if (!URL) strcpy(#URL, URL_SERVICE_HOME);
OpenPage();
 
CreateDir("/tmp0/1/downloads");
 
SetEventMask(0xa7);
loop()
{
379,11 → 376,6
OpenPage();
return;
 
case 006: //download manager
DL_URL[0] = 0;
CreateThread(#Downloader,#downloader_stak+4092);
return;
 
case BACK:
if (!BrowserHistory.GoBack()) return;
OpenPage();
424,6 → 416,9
MoveSize(190,80,OLD,OLD);
RunProgram(#program_path, #URL);
return;
case HOME:
strcpy(#editURL, "http://kolibrios.org/");
case GOTOURL:
case 0x0D: //enter
if (!editURL[0]) return;
530,19 → 525,10
PageLinks.GetAbsoluteURL(#URL);
if (UrlExtIs(".png")==1) || (UrlExtIs(".gif")==1) || (UrlExtIs(".jpg")==1) || (UrlExtIs(".zip")==1)
|| (UrlExtIs(".7z")==1) || (UrlExtIs("netcfg")==1)
if (!strcmp(#URL + strlen(#URL) - 4, ".gif")) || (!strcmp(#URL + strlen(#URL) - 4, ".png")) || (!strcmp(#URL + strlen(#URL) - 4, ".jpg"))
{
notify(#URL);
if (strcmpn(#URL,"http://:", 8)==0)
{
strcpy(#DL_URL, #URL);
CreateThread(#Downloader,#downloader_stak+4092);
}
else
{
RunProgram("@open", #URL);
}
//if (strstr(#URL,"http:"))
RunProgram("/sys/media/kiv", #URL);
strcpy(#editURL, BrowserHistory.CurrentUrl());
strcpy(#URL, BrowserHistory.CurrentUrl());
return;
665,14 → 651,7
if (!strcmp(#version, #header)) DrawTitle(#header);
}
 
byte UrlExtIs(dword ext)
{
if (strcmpi(#URL + strlen(#URL) - strlen(ext), ext)==0) return 1; else return 0;
}
 
 
 
 
stop:
 
char downloader_stak[4096];
/programs/cmm/browser/menu_rmb.h
10,13 → 10,11
"¥¤ ªâ¨à®¢ âì ¨á室­¨ª F4",53,
"Žç¨áâ¨âì ªíè ª à⨭®ª" ,02,
"ˆáâ®à¨ï" ,03,
"Œ¥­¥¤¦¥à § £à㧮ª" ,06,
#else
"View source F3",52,
"Edit source F4",53,
"Free image cache" ,09,
"History" ,03,
"Download Manager" ,06,
#endif
0};
 
/programs/cmm/browser/html/page_not_found_en.htm
9,10 → 9,10
<ul>
<li>
Make sure that evetything fine with Internet connection.<br>
Open <a href="/sys/network/netcfg">Netcfg</a> network diagnostic tool.<br>
Open /sys/network/netcfg network diagnostic tool.<br>
</li>
<li>
Check page address, there may have been made a typo.<br>
Check page address, there may have been made ​​a typo.<br>
</li>
<li>
Server is temporarily unavailable.<br>
/programs/cmm/browser/html/page_not_found_ru.htm
10,7 → 10,7
<ul>
<li>
“¡¥¤¨â¥áì, çâ® ¥áâì ¯®¤ª«î祭¨¥ ª á¥â¨ ˆ­â¥à­¥â.<br>
Žâªà®©â¥ <a href="/sys/network/netcfg">Netcfg</a> ¤«ï ¤¨ £­®á⨪¨ á¥â¨.<br>
Žâªà®©â¥ /sys/network/netcfg ¤«ï ¤¨ £­®á⨪¨ á¥â¨.<br>
</li>
<li>
à®¢¥àì⥠ ¤à¥áá áâà ­¨æë, ¢®§¬®¦­®, ¡ë«  ᤥ« ­  ®¯¥ç âª .<br>
/programs/cmm/downloader/Downloader.c
86,7 → 86,7
sc.get();
DefineAndDrawWindow(215,100,WIN_W,WIN_H,0x73,sc.work,#header,0);
GetProcessInfo(#Form, SelfInfo);
if (Form.status_window>2) break;
if (Form.status_window>2) return;
if (Form.height<120) MoveSize(OLD,OLD,OLD,120);
if (Form.width<280) MoveSize(OLD,OLD,280,OLD);
diagram.Init(20, 87, Form.cwidth - 40, Form.cheight - 87 - 28);
105,7 → 105,7
http_transfer=0;
strcpy(#filepath, "/tmp0/1/");
strcat(#filepath, #URL+strrchr(#URL, '/'));
if (!WriteFile(bufsize, bufpointer, #filepath))
if (WriteFile(bufsize, bufpointer, #filepath))
{
strcpy(#notify_message, "File saved as ");
}
235,7 → 235,7
}
else
{
notify("File adress should starts from http://");
notify("File adress should starts form http://");
}
}
 
/programs/cmm/TWB/TWB.c
2,7 → 2,7
dword o_bufpointer;
dword bufsize;
 
char URL[10000];
#define URL param
 
scroll_bar scroll_wv = { 15,200,398,44,0,2,115,15,0,0xeeeeee,0xBBBbbb,0xeeeeee,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1};
 
422,11 → 422,6
}
if (isTag("div")) || (isTag("header")) || (isTag("article")) || (isTag("footer")) {
IF(oldtag[0] <>'h') NewLine();
if (!strcmp(#parametr, "bgcolor="))
{
bg_color=GetColor(#options);
DrawBuf.Fill(bg_color);
}
return;
}
if (isTag("p")) {