From 31410fbdb35a68e6a2ecc533090757ba1728d24f Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 20 Feb 2016 17:21:34 +0000 Subject: [PATCH] bigger fonts in docpack; move /system/clip to /other/outdated/ git-svn-id: svn://kolibrios.org@6267 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../outdated}/clip/trunk/@clip.ASM | 0 .../outdated}/clip/trunk/Tupfile.lua | 0 .../outdated}/clip/trunk/bdebug.inc | 0 .../outdated}/clip/trunk/build_ru.bat | 0 .../outdated}/clip/trunk/clip.inc | 0 .../outdated}/clip/trunk/clip.txt | 0 .../outdated}/clip/trunk/clip_en.txt | 0 .../outdated}/clip/trunk/cliptest.ASM | 0 .../outdated}/clip/trunk/makefile | 0 .../outdated}/clip/trunk/test2.asm | 0 programs/system/docpack/trunk/build.bat | 3 --- programs/system/docpack/trunk/build_en.bat | 6 +++++ programs/system/docpack/trunk/build_ru.bat | 6 +++++ programs/system/docpack/trunk/docpack.asm | 24 ++++++++++++------- 14 files changed, 27 insertions(+), 12 deletions(-) rename programs/{system => other/outdated}/clip/trunk/@clip.ASM (100%) rename programs/{system => other/outdated}/clip/trunk/Tupfile.lua (100%) rename programs/{system => other/outdated}/clip/trunk/bdebug.inc (100%) rename programs/{system => other/outdated}/clip/trunk/build_ru.bat (100%) rename programs/{system => other/outdated}/clip/trunk/clip.inc (100%) rename programs/{system => other/outdated}/clip/trunk/clip.txt (100%) rename programs/{system => other/outdated}/clip/trunk/clip_en.txt (100%) rename programs/{system => other/outdated}/clip/trunk/cliptest.ASM (100%) rename programs/{system => other/outdated}/clip/trunk/makefile (100%) rename programs/{system => other/outdated}/clip/trunk/test2.asm (100%) delete mode 100644 programs/system/docpack/trunk/build.bat create mode 100644 programs/system/docpack/trunk/build_en.bat create mode 100644 programs/system/docpack/trunk/build_ru.bat diff --git a/programs/system/clip/trunk/@clip.ASM b/programs/other/outdated/clip/trunk/@clip.ASM similarity index 100% rename from programs/system/clip/trunk/@clip.ASM rename to programs/other/outdated/clip/trunk/@clip.ASM diff --git a/programs/system/clip/trunk/Tupfile.lua b/programs/other/outdated/clip/trunk/Tupfile.lua similarity index 100% rename from programs/system/clip/trunk/Tupfile.lua rename to programs/other/outdated/clip/trunk/Tupfile.lua diff --git a/programs/system/clip/trunk/bdebug.inc b/programs/other/outdated/clip/trunk/bdebug.inc similarity index 100% rename from programs/system/clip/trunk/bdebug.inc rename to programs/other/outdated/clip/trunk/bdebug.inc diff --git a/programs/system/clip/trunk/build_ru.bat b/programs/other/outdated/clip/trunk/build_ru.bat similarity index 100% rename from programs/system/clip/trunk/build_ru.bat rename to programs/other/outdated/clip/trunk/build_ru.bat diff --git a/programs/system/clip/trunk/clip.inc b/programs/other/outdated/clip/trunk/clip.inc similarity index 100% rename from programs/system/clip/trunk/clip.inc rename to programs/other/outdated/clip/trunk/clip.inc diff --git a/programs/system/clip/trunk/clip.txt b/programs/other/outdated/clip/trunk/clip.txt similarity index 100% rename from programs/system/clip/trunk/clip.txt rename to programs/other/outdated/clip/trunk/clip.txt diff --git a/programs/system/clip/trunk/clip_en.txt b/programs/other/outdated/clip/trunk/clip_en.txt similarity index 100% rename from programs/system/clip/trunk/clip_en.txt rename to programs/other/outdated/clip/trunk/clip_en.txt diff --git a/programs/system/clip/trunk/cliptest.ASM b/programs/other/outdated/clip/trunk/cliptest.ASM similarity index 100% rename from programs/system/clip/trunk/cliptest.ASM rename to programs/other/outdated/clip/trunk/cliptest.ASM diff --git a/programs/system/clip/trunk/makefile b/programs/other/outdated/clip/trunk/makefile similarity index 100% rename from programs/system/clip/trunk/makefile rename to programs/other/outdated/clip/trunk/makefile diff --git a/programs/system/clip/trunk/test2.asm b/programs/other/outdated/clip/trunk/test2.asm similarity index 100% rename from programs/system/clip/trunk/test2.asm rename to programs/other/outdated/clip/trunk/test2.asm diff --git a/programs/system/docpack/trunk/build.bat b/programs/system/docpack/trunk/build.bat deleted file mode 100644 index 2c4c3695ab..0000000000 --- a/programs/system/docpack/trunk/build.bat +++ /dev/null @@ -1,3 +0,0 @@ -@fasm -m 32768 docpack.asm docpack -@kpack docpack -@pause \ No newline at end of file diff --git a/programs/system/docpack/trunk/build_en.bat b/programs/system/docpack/trunk/build_en.bat new file mode 100644 index 0000000000..318f742d5f --- /dev/null +++ b/programs/system/docpack/trunk/build_en.bat @@ -0,0 +1,6 @@ +@erase lang.inc +@echo lang fix en >lang.inc +@fasm -m 32768 docpack.asm docpack +@erase lang.inc +@kpack docpack +@pause \ No newline at end of file diff --git a/programs/system/docpack/trunk/build_ru.bat b/programs/system/docpack/trunk/build_ru.bat new file mode 100644 index 0000000000..ec7b09e8cc --- /dev/null +++ b/programs/system/docpack/trunk/build_ru.bat @@ -0,0 +1,6 @@ +@erase lang.inc +@echo lang fix ru >lang.inc +@fasm -m 32768 docpack.asm docpack +@erase lang.inc +@kpack docpack +@pause \ No newline at end of file diff --git a/programs/system/docpack/trunk/docpack.asm b/programs/system/docpack/trunk/docpack.asm index b1ec9629ec..0b501cb289 100755 --- a/programs/system/docpack/trunk/docpack.asm +++ b/programs/system/docpack/trunk/docpack.asm @@ -104,44 +104,50 @@ red: mcall 12,1 +BTN_H equ 21 + mov edx,[sc.work] or edx,0x34000000 - mcall 0, <220,120>, <30,FILECOUNT*16+35>, , ,title + mcall 0, <220,141>, <30,FILECOUNT*(BTN_H+3)+37>, , ,title mov ecx,FILECOUNT - mov ebx,5 shl 16+100 + mov ebx,23 shl 16+100 mov esi,[sc.work_button] - mov edi,5 shl 16+14 + mov edi,5 shl 16+BTN_H mov edx,10 mov eax,8 .btnlp: push ecx mcall ,,edi - add edi,16 shl 16 + add edi,(BTN_H+3) shl 16 inc edx pop ecx loop .btnlp mov ecx,FILECOUNT mov edx,embedded xor edi,edi - mov ebx,25 shl 16+8 + mov ebx,30 shl 16+8 mov eax,4 .list: lea edx,[edx+edi+8] mov edi,[edx-8] pusha - sub ebx,15 shl 16 - mcall ,,0xff0000,my_param,1 + sub ebx,20 shl 16 + mov ecx, [sc.work_text] + or ecx, 0x30000000 + mcall ,,,my_param,1 inc [my_param] popa push ecx mov esi, [edx-4] sub esi, 4 ;remove .txt extension - mcall ,,[sc.work_button_text] + mov ecx, [sc.work_button_text] + or ecx, 0x30000000 + mcall pop ecx add esi, 4 add edx, esi - add ebx,16 + add ebx,(BTN_H+3) loop .list mcall 12,2