WebSVN – Kolibri OS – Path Comparison – /

Regard whitespace Rev 1372 → Rev 1373

/kernel/branches/net/applications/tftpc/editbox_ex.mac
File deleted

 /kernel/branches/net/applications/tftpc/TFTP.asm
 ,7 → 9,7
 include '../macros.inc'
 include '../dll.inc'
 include '../libio.inc'
-include 'editbox_ex.mac'
+include '../../../../../programs/develop/libraries/box_lib/trunk/box_lib.mac'
 include '../network.inc'

 /programs/develop/fasm/trunk/fasm.asm
 ,9 → 36,9
 purge add,sub    ; macros.inc does incorrect substitution
 include 'fasm.inc'
-include '..\..\..\develop\libraries\box_lib\trunk\editbox.mac'
-include '..\..\..\develop\libraries\box_lib\trunk\checkbox.mac'
-;include '..\..\..\develop\libraries\box_lib\asm\trunk\editbox_ex.mac'
+include '..\..\..\develop\libraries\box_lib\trunk\box_lib.mac'
+;include '..\..\..\develop\libraries\box_lib\trunk\editbox.mac'
+;include '..\..\..\develop\libraries\box_lib\trunk\checkbox.mac'
 include '..\..\..\develop\libraries\box_lib\load_lib.mac'
   @use_library

 /programs/develop/libraries/box_lib/!readme.txt
 ,7 → 221,7
     dd 0x0              ; óêàçàòåëü íà ñòðîêó ñ ïàðàìåòðàìè.
     dd cur_dir_path
 include 'macros.inc'
-include 'editbox_ex.mac'
+include 'box_lib.mac'
 include 'load_lib.mac'
         @use_library    ;use load lib macros
 start:

/programs/develop/libraries/box_lib/asm/trunk/editbox_ex.mac
File deleted

 /programs/develop/libraries/box_lib/asm/trunk/OpenDial.asm
 ,7 → 40,7
 include '../../../../../macros.inc'
 include '../../load_lib.mac'
-include 'editbox_ex.mac'
+include '../../trunk/box_lib.mac'
 ;include 'macros.inc'
 ;include 'load_lib.mac'
 @use_library

 /programs/develop/libraries/box_lib/asm/trunk/editbox_ex.asm
 ,7 → 13,7
 include '../../../../../macros.inc'
-include 'editbox_ex.mac'
+include '../../trunk/box_lib.mac'
 include '../../load_lib.mac'
         @use_library    ;use load lib macros
 start:

/programs/develop/libraries/box_lib/trunk/tree_list_doc/info_treelist.htm
File deleted
\ No newline at end of file

/programs/develop/libraries/box_lib/trunk/tree_list_doc/window_tree_list.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/develop/libraries/box_lib/trunk/tree_list_doc/info_size.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/develop/libraries/box_lib/trunk/tree_list_doc
Property changes:
Deleted: tsvn:logminsize
-5
\ No newline at end of property

 /programs/develop/libraries/box_lib/trunk/checkbox.mac
 ,7 → 3,7
 ;Checkbox
 ch_struc_size=36
-ch_flag_en=10b
+ch_flag_en=10b ;ýëåìåíò âûáðàí
 ch_left  equ [edi]         ;ª®®à¤¨ â   ç «  à¨á®¢ ¨ï ¯® å
 ch_top   equ [edi+2]       ;ª®®à¤¨ â   ç «  à¨á®¢ ¨ï ¯® ã
 ,24 → 18,15
 macro check_boxes_set_sys_color start,end,color_table
 {
-ch_left equ [edi]    ;ª®®à¤¨ â   ç «  à¨á®¢ ¨ï ¯® å
-ch_top equ [edi+2]   ;ª®®à¤¨ â   ç «  à¨á®¢ ¨ï ¯® ã
-ch_text_margin equ [edi+4]      ;=4 à ááâ®ï¨¥ ®â ¯àï¬®ã£®«ì¨ª  ç¥ª ¡®ªá  ¤®  ¤¯¨á¨
-ch_size equ [edi+8]             ;12 à §¬¥à ª¢ ¤à â  ç¥ª ¡®ªá
-ch_color equ [edi+12]           ;æ¢¥â ¢ãâà¨ checkbox
-ch_border_color equ [edi+16] ; or [edi+4] ;æ¢¥â à ¬ª¨ checkbox ¥¥ ¬®¦® § ¤ âì á ¬®áâ®ïâ¥«ì®
-ch_text_color equ   [edi+20];[edi+4]  ;æ¢¥â â¥ªáâ
-ch_text_ptr equ [edi+24]    ;ãª § â¥«ì    ç «® â¥ªáâ®¢®© áâà®ª¨
-ch_text_length equ [edi+28]
-ch_flags equ [edi+32]       ;ä« £¨
         mov     edi,start
         mov     ecx,((end-start)/ch_struc_size)
         mov     esi,color_table
 @@:
-        push    dword [esi+32]
+;    push    dword [esi+20] ;æ¢¥â à ¡®ç¥© ®¡« áâ¨ ®ª
+;    pop     dword ch_color
+    push    dword [esi+32] ;æ¢¥â â¥ªáâ  ¢ à ¡®ç¥© ®¡« áâ¨ ®ª
         pop     dword ch_text_color
-        push    dword [esi+36]
+    push    dword [esi+36] ;æ¢¥â £à ä¨ª¨ ¢ ®ª¥ (à §¤¥«¨â¥«ìë¥ «¨¨¨ ¨ â.¯.)
         pop     dword ch_border_color
         add     edi,ch_struc_size
         loop    @b
 ,9 → 33,8
 }
 struc check_box left,top,ch_text_margin,ch_size,color,border_color,text_color,text,ch_text_length,flags
 {        ;áâàãªâãà  ¯ à ¬¥âà®¢ ¤«ï ç¥ª ¡®ªá
-ch_flag_en=10b
-.left: dw left      ;+0        ;¯®«®¦¥¨¥ ¯® å
-.top: dw top        ;¯®«®¦¥¨¥ ¯® ã
+.left: dw left      ;+0 ¯®«®¦¥¨¥ ¯® å
+.top:  dw top       ;+2 ¯®«®¦¥¨¥ ¯® ã
 .ch_text_margin:  dd ch_text_margin ;à ááâ®ï¨¥ ®â ¯àï¬®ã£®«ì¨ª  ç¥ª ¡®ªá  ¤®  ¤¯¨á¨
 .ch_size: dd ch_size ;à §¬¥à ª¢ ¤à â  ç¥ª ¡®ªá , ¤«ï ¯à¨¬¥à  12
 .color: dd color    ;æ¢¥â ¢ãâà¨ ç¥ª¡®ªá

 /programs/develop/libraries/box_lib/trunk/doc/box_lib.htm
 ,0 → 1,71
+<html>
+<head>
+<title>áèáëèîòåêà boxlib</title>
+<meta http-equiv="content-type" content="text/html; charset=WINDOWS-1251">
+<style>
+body
+{
+  font-size: 15px;
+  font-family: "Bookman Old Style";
+  color: black;
+  text-align: justify;
+}
+h1 { color: green; font-size: 23px; }
+h2 { color: green; font-size: 21px; }
+h3 { color: green; font-size: 19px; }
+h4 { color: #803f00; font-size: 17px; }
+i { color: #0099cc; }
+b { color: #0099cc; }
+p {
+  text-indent: 1em;
+  margin-top: 3px;
+  margin-bottom: 2px;
+  margin-left: 0px;
+  margin-right: 0px;
+}
+ol, ul, dl{
+  margin-top: 3px;
+  margin-bottom: 2px;
+}
+pre
+{
+  padding: 2px;
+  padding-left: 20px;
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 0px;
+  margin-right: 0px;
+  font-family: "Courier New";
+  font-size: 15px;
+  color: #004000;
+  background-color: #ffd0ff;
+}
+table { font-size: 15px; }
+</style>
+</head>
+<body>
+<h1>Îãëàâëåíèå</h1>
+<p><a href="#vveden">Ââåäåíèå</a></p>
+<p><a href="#elements">Ýëåìåíòû áèáëèîòåêè</a></p>
+<h1><a name="vveden">Ââåäåíèå</a></h1>
+<p>Áèáëèîòåêà <b>box_lib.obj</b> ñîäåðæèò ðàçíûå ýëåìåíòû óïðàâëåíèÿ, êîòîðûå ìîæíî
+ èñïîëüçîâàòü ïðè íàïèñàíèè ïðèëîæåíèé. Ôàéë <b>box_lib.mac</b> ïîäêëþ÷àåò ìàêðîñû
+ äëÿ êîìïèëÿöèè áèáëèîòåêè è äëÿ èñïîëüçîâàíèÿ ýëåìåíòîâ.</p>
+<h1><a name="elements">Ýëåìåíòû áèáëèîòåêè</a></h1>
+<ul>
+  <li><a href="editbox\info_editbox.htm">editbox</a></li>
+  <li>checkbox</li>
+  <li>optionbox</li>
+  <li>scrollbar</li>
+  <li>d_button</li>
+  <li>menubar</li>
+  <li>filebrowser</li>
+<li><a href="tree_list\info_treelist.htm">tree_list</a></li>
+</ul>
+<hr>
+<p>Äîêóìåíòàöèÿ îáíîâëÿëàñü ïîñëåäíèé ðàç 09.01.10.</p>
+</body>
+</html>

 /programs/develop/libraries/box_lib/trunk/doc/editbox/info_editbox.htm
 ,0 → 1,109
+<html>
+<head>
+<title>ýëåìåíò Edit Box</title>
+<meta http-equiv="content-type" content="text/html; charset=WINDOWS-1251">
+<style>
+body
+{
+  font-size: 15px;
+  font-family: "Bookman Old Style";
+  color: black;
+  text-align: justify;
+}
+h1 { color: green; font-size: 23px; }
+h2 { color: green; font-size: 21px; }
+h3 { color: green; font-size: 19px; }
+h4 { color: #803f00; font-size: 17px; }
+i { color: #0099cc; }
+b { color: #0099cc; }
+p {
+  text-indent: 1em;
+  margin-top: 3px;
+  margin-bottom: 2px;
+  margin-left: 0px;
+  margin-right: 0px;
+}
+ol, ul, dl{
+  margin-top: 3px;
+  margin-bottom: 2px;
+}
+pre
+{
+  padding: 2px;
+  padding-left: 20px;
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 0px;
+  margin-right: 0px;
+  font-family: "Courier New";
+  font-size: 15px;
+  color: #004000;
+  background-color: #ffd0ff;
+}
+table { font-size: 15px; }
+</style>
+</head>
+<body>
+<h1>Îãëàâëåíèå</h1>
+<p><a href="#vveden">Ââåäåíèå</a></p>
+<p><a href="#funct">Ôóíêöèè</a></p>
+<ul>
+<li><a href="#fun_key">edit_box_key</a></li>
+<li><a href="#fun_mouse">edit_box_mouse</a></li>
+<li><a href="#version">version_ed</a></li>
+</ul>
+<p><a href="#struc_editbox">Ñòðóêòóðà editbox</a></p>
+<p><a href="#editbox_styles">Ñòèëè ýëåìåíòà</a></p>
+<h1><a name="vveden">Ââåäåíèå</a></h1>
+<p>Òåêñòîâîå ïîëå, èñïîëüçóåòñÿ ïðè ââîäå òåêñòîâîé/÷èñëîâîé èíôîðìàöèè.</p>
+<h1><a name="funct">Ôóíêöèè</a></h1>
+<h2><a name="fun_key">edit_box_key</a></h2>
+<p>Ýòà ôóíêöèÿ äîëæíà âûçûâàòñÿ ïðè ââîäå èíôîðìàöèè ñ êëàâèàòóðû.</p>
+<h2><a name="fun_mouse">edit_box_mouse</a></h2>
+<p>Ýòà ôóíêöèÿ äîëæíà âûçûâàòñÿ ïðè ââîäå èíôîðìàöèè ñ ìûøè.</p>
+<h2><a name="version">version_ed</a></h2>
+<p>Âåðñèÿ ýëåìåíòà</p>
+<h1><a name="struc_editbox">Ñòðóêòóðà editbox</a></h1>
+<pre>struc  edit_box width,left,top,color,shift_color,focus_border_color,\
+       blur_border_color,text_color,max,text,mouse_variable,flags,size,pos
+{
+.width dd width
+.left  dd left
+.top   dd top
+.color dd color
+.shift_color dd shift_color
+.focus_border_color dd focus_border_color
+.blur_border_color  dd blur_border_color
+.text_color dd text_color
+.max  dd max
+.text dd text
+.mouse_variable dd mouse_variable
+.flags  dd flags+0
+.size   dd size+0
+.pos    dd pos+0
+.offset dd 0
+.cl_curs_x dd 0
+.cl_curs_y dd 0
+.shift     dd 0
+.shift_old dd 0
+}</pre>
+<p><b>width</b> - øèðèíà ýëåìåíòà.</p>
+<p><b>left</b> - îòñòóï ñëåâà.</p>
+<h1><a name="editbox_styles">Ñòèëè ýëåìåíòà</a></h1>
+<h2>ed_figure_only</h2>
+<p>Ðàçðåøàåòñÿ ââîä ÷èñåë îò 0 äî 9.</p>
+<h2>ed_focus</h2>
+<p>Òåêñòîâîå ïîëå â ôîêóñå.</p>
+<hr>
+<p>Äîêóìåíòàöèÿ îáíîâëÿëàñü ïîñëåäíèé ðàç 09.01.10.</p>
+</body>
+</html>

 /programs/develop/libraries/fontslib/trunk/font_ex.asm
 ,7 → 37,7
     dd 0x0              ; ãª § â¥«ì   áâà®ªã á ¯ à ¬¥âà ¬¨.
     dd way_of_ini
 include '../../../../macros.inc'
-include '../../box_lib/asm/trunk/editbox_ex.mac'
+include '../../box_lib/trunk/box_lib.mac'
 include '../../box_lib/load_lib.mac'
         @use_library    ;use load lib macros
 start:

 /programs/media/scrshoot/scrshoot.asm
 ,7 → 6,7
 title equ 'Screenshooter v 0.92' ;  £®«®¢®ª ®ª
 include '../../develop/libraries/box_lib/load_lib.mac'
-include '../../develop/libraries/box_lib/asm/trunk/editbox_ex.mac'
+include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 ;include '../../develop/examples/editbox/trunk/editbox.inc'
 include '../../macros.inc'
 include 'txtbut.inc'
 ,6 → 38,24
 include 'gp.inc'
 include 'srectwin.inc'
 include 'lang.inc'
+macro get_sys_colors col_buf
+{
+        ;mov     eax,48
+        push    48
+        pop     eax
+        ;mov     ebx,3
+        push    3
+        pop     ebx
+        ;mov     ecx,col_buf
+        push    col_buf
+        pop     ecx
+        ;mov     edx,40
+        push    40
+        pop     edx
+        mcall
+}
 ;---  ç «® ¯à®£à ¬¬ë ---
 align 4
 start:

 /programs/system/cpu/trunk/cpu.asm
 ,7 → 22,7
 include 'lang.inc'
 include '../../../macros.inc'
-include '../../../develop/libraries/box_lib/asm/trunk/editbox_ex.mac'
+include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
 include '../../../develop/libraries/box_lib/load_lib.mac'
 display_processes=32            ; number of processes to show
 @use_library    ;use load lib macros

 /programs/system/rdsave/trunk/rdsave.asm
 ,7 → 27,7
 ;include '..\..\..\develop\examples\editbox\trunk\editbox.inc'
 include '../../../develop/libraries/box_lib/load_lib.mac'
-include '../../../develop/libraries/box_lib/asm/trunk/editbox_ex.mac'
+include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
         @use_library
 ;use_edit_box

 /programs/system/run/trunk/run.asm
 ,7 → 8,7
 ;--- ¤àã£¨¥ ¬ ªà®áë ---
 ;include '../../../develop/examples/editbox/trunk/editbox.inc'
 include '../../../develop/libraries/box_lib/load_lib.mac'
-include '../../../develop/libraries/box_lib/asm/trunk/editbox_ex.mac'
+include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
 ;include 'editbox.inc'
 include 'txtbut.inc'
 include '../../../macros.inc'
 ,10 → 278,17
 library_name     db 'box_lib.obj',0
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+if lang eq ru
+err_message_found_lib   db 'è¨¡ª  ¯à¨ ¯®¨áª¥ box_lib.obj',0
+head_f_i:
+head_f_l        db '¨áâ¥¬ ï ®è¨¡ª ',0
+err_message_import      db 'è¨¡ª  ¯à¨ ¨¬¯®àâ¥ box_lib.obj',0
+else
 err_message_found_lib   db 'Sorry I cannot load library box_lib.obj',0
 head_f_i:
 head_f_l        db 'System error',0
 err_message_import      db 'Error on load import library box_lib.obj',0
+end if
 myimport:

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1372 → Rev 1373