Subversion Repositories Kolibri OS

Rev

Rev 2433 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2433 Rev 2444
Line 77... Line 77...
77
77
Line 78... Line 78...
78 
		URL[find_symbol(#URL, '#')-1] = 0x00; //çàãëóøêà, ëó÷øå, ÷åì íè÷åãî (õàáð, íàïðèìåð, áóäåò ðàáîòàòü)  //ýòî íå ñîâñåì ïðàâèëüíî - â åäèòóðë äîëæíî îñòàâàòüñÿ
 78 
		URL[find_symbol(#URL, '#')-1] = 0x00; //çàãëóøêà, ëó÷øå, ÷åì íè÷åãî (õàáð, íàïðèìåð, áóäåò ðàáîòàòü)  //ýòî íå ñîâñåì ïðàâèëüíî - â åäèòóðë äîëæíî îñòàâàòüñÿ
Line 79... Line 79...
79 
 
 79 
 
80 
		GetNewUrl();
 80 
		GetNewUrl();
81 
 
 81 
 
82 
		//ïðûãàåò èçîáðàæåíèå ïîëîñà, áåëàÿ ðèñóåòñÿ ñíèçó
 82 
		//ïîëîñà, áåëàÿ ðèñóåòñÿ ñíèçó
83 
		if (!strcmp(#URL + strlen(#URL) - 4, ".gif")) || (!strcmp(#URL + strlen(#URL) - 4, ".png")) || (!strcmp(#URL + strlen(#URL) - 4, ".jpg"))
 83 
		if (!strcmp(#URL + strlen(#URL) - 4, ".gif")) || (!strcmp(#URL + strlen(#URL) - 4, ".png")) || (!strcmp(#URL + strlen(#URL) - 4, ".jpg"))
84 
		{
 84 
		{
Line 195... Line 195...
195 
	{
 195 
	{
196 
		copystr(BrowserHistory.CurrentUrl(), #editURL); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
 196 
		copystr(BrowserHistory.CurrentUrl(), #editURL); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
Line 197... Line 197...
197
197
Line 198... Line 198...
198 
		_CUT_ST_LEVEL_MARK:
 198 
		_CUT_ST_LEVEL_MARK:
199
199
200 
		IF (editURL[find_symbol(#editURL, '/')-2]<>'/')  // åñëè íå http://pagename.ua <-- íàõðåíà ýòà ñòðîêà???
 200 
		if (editURL[find_symbol(#editURL, '/')-2]<>'/')  // åñëè íå http://pagename.ua <-- íàõðåíà ýòà ñòðîêà???
201 
		{
 201 
		{
Line 202... Line 202...
202 
			editURL[find_symbol(#editURL, '/')] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
 202 
			editURL[find_symbol(#editURL, '/')] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
Line 207... Line 207...
207 
			copystr(#URL+3,#URL);
 207 
			copystr(#URL+3,#URL);
208 
			editURL[find_symbol(#editURL, '/')-1] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
 208 
			editURL[find_symbol(#editURL, '/')-1] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
209 
			goto _CUT_ST_LEVEL_MARK;
 209 
			goto _CUT_ST_LEVEL_MARK;
210 
		}
 210 
		}
Line -... Line 211...
- 
 
 211
211
212 
		if (editURL[strlen(#editURL)-1]<>'/') copystr("/", #editURL + strlen(#editURL));
212 
		copystr(#URL, #editURL + strlen(#editURL)); //êëåèì íîâûé àäðåñ
 213 
		copystr(#URL, #editURL + strlen(#editURL)); //êëåèì íîâûé àäðåñ
213 
		copystr(#editURL, #URL);
 214 
		copystr(#editURL, #URL);
214 
	}
 215 
	}
Line 510... Line 511...
510 
	IF(!chTag("q")) copystr("\"", #line + strlen(#line));
 511 
	IF(!chTag("q")) copystr("\"", #line + strlen(#line));
Line 511... Line 512...
511
512
512 
	//âûâîä íà ýêðàí
 513 
	//âûâîä íà ýêðàí
513 
	if (stroka >= 0) && (stroka - 2 < max_kolvo_strok) && (line)
514 
	if (stroka >= 0) && (stroka - 2 < max_kolvo_strok) && (line)
514 
	{
 515 
	{
515 
		WriteText(stolbec * 6 + left1, top1, 0x80, text_colors[text_color_index], #line, 0);
 516 
		WriteText(stolbec * 6 + left1, top1, 0x80, text_colors[text_color_index], #line, 0); //ìîæåò òóò ðèñîâàòü áåëóþ ñòðîêó?
516 
		IF (b_text) WriteText(stolbec * 6 + left1 + 1, top1, 0x80, text_colors[text_color_index], #line, 0);
 517 
		IF (b_text) WriteText(stolbec * 6 + left1 + 1, top1, 0x80, text_colors[text_color_index], #line, 0);
517 
		IF (i_text) Skew(stolbec * 6 + left1, top1, strlen(#line)+1*6, 10); //íàêëîííûé òåêñò
 518 
		IF (i_text) Skew(stolbec * 6 + left1, top1, strlen(#line)+1*6, 10); //íàêëîííûé òåêñò
518 
		IF (s_text) DrawBar(stolbec * 6 + left1, top1 + 4, strlen(#line) * 6, 1, text_colors[text_color_index]); //çà÷¸ðêíóòûé
 519 
		IF (s_text) DrawBar(stolbec * 6 + left1, top1 + 4, strlen(#line) * 6, 1, text_colors[text_color_index]); //çà÷¸ðêíóòûé
519 
		IF (u_text) DrawBar(stolbec * 6 + left1, top1 + 8, strlen(#line) * 6, 1, text_colors[text_color_index]); //ïîä÷¸ðêíóòûé
 520 
		IF (u_text) DrawBar(stolbec * 6 + left1, top1 + 8, strlen(#line) * 6, 1, text_colors[text_color_index]); //ïîä÷¸ðêíóòûé