From 776c6246257538d7be385b8bc63927848c253f80 Mon Sep 17 00:00:00 2001 From: GerdtR Date: Wed, 2 Oct 2013 20:50:38 +0000 Subject: [PATCH] Fixed code. Now compile. Removed unnecessary files. git-svn-id: svn://kolibrios.org@3962 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/system/icon_new/@icon.asm | 64 ++++++++++------------------- programs/system/icon_new/DlgAdd.inc | 9 +++- programs/system/icon_new/readme.txt | 4 +- 3 files changed, 31 insertions(+), 46 deletions(-) diff --git a/programs/system/icon_new/@icon.asm b/programs/system/icon_new/@icon.asm index 572012a540..83ffa9577d 100644 --- a/programs/system/icon_new/@icon.asm +++ b/programs/system/icon_new/@icon.asm @@ -48,7 +48,6 @@ START: ; start of execution stdcall dll.Load,IMPORTS test eax,eax jnz ErrLoadLibs -;------------------------------------------------------------------------------- ; unpack deflate mov eax,[unpack_DeflateUnpack2] @@ -141,8 +140,11 @@ START: ; start of execution and eax,0FFh mov [sbIcons.max_area],eax - stdcall [OpenDialog_Init],OpenDialog_data - + ; int3 +; mov eax,1 +; mov eax,[IconsOffs+eax*4] +; stdcall [ini_del_section],IconIni,eax +; ret jmp MSGRedrawIcons messages: @@ -298,7 +300,6 @@ LButtonPress: ;------------------------------------------------------------------------------- MovingIcon: -;int3 stdcall GetNumIcon,[MouseX],[MouseY],-1 mov [SelIcon],eax stdcall RestoreBackgrnd,[SelIcon] @@ -367,9 +368,9 @@ MovingIcon: ;qweqwe: mov [MovingActiv],1 - mcall 51,1,MovingWnd,stack_move ;CreateThread MovingWnd,stack_dlg + mcall 51,1,MovingWnd,stack_dlg ;CreateThread MovingWnd,stack_dlg .WaitLB: - mcall 37,2 ;GetMouseKey + mcall 37,2 ;GetMouseKey test al,001b jz .endWaitLB @@ -456,7 +457,7 @@ RButtonPress: jmp @b @@: - mcall 51,1,RButtonWin,stack_rb ;CreateThread RButtonWin,stack_dlg + mcall 51,1,RButtonWin,stack_dlg ;CreateThread RButtonWin,stack_dlg jmp messages @@ -1184,8 +1185,6 @@ RButtonActiv dd 0 MovingActiv dd 0 DlgAddActiv dd 0 -slotDlgAdd dd 0 - IconIni db '/rd/1/icon.ini',0 @@ -1195,6 +1194,7 @@ keyParams db 'param',0 keyIco db 'ico',0 keyX db 'x',0 keyY db 'y',0 +keyMenuColor db 'menucolor',0 ;------------------------------------------------------------------------------- IMPORTS: @@ -1243,7 +1243,6 @@ import libini,\ ;----- RButton.inc ------------------------------------------------------------- ;------------------------------------------------------------------------------- secRButt db 'rbmenu',0 -keyMenuColor db 'menucolor',0 if lang eq ru RMenuRedrawFon db 'ЏҐаҐаЁб®ў вм',0 @@ -1253,14 +1252,7 @@ if lang eq ru RMenuProp db '‘ў®©бвў ',0 RMenuOffMoving db '‡ ЄаҐЇЁвм ЁЄ®­ЄЁ',0 RMenuOnMoving db 'ЋвЄаҐЇЁвм ЁЄ®­ЄЁ',0 -else if lang eq et - RMenuRedrawFon db 'Vдrskenda',0 - RMenuAlign db 'Tхmme vхrgule',0 - RMenuAdd db 'Lisa',0 - RMenuDel db 'Kustuta',0 - RMenuProp db 'Omadused',0 - RMenuOffMoving db 'Paranda ikoonid',0 - RMenuOnMoving db 'Дra paranda ikoone',0 + else RMenuRedrawFon db 'Redraw',0 @@ -1278,10 +1270,7 @@ if lang eq ru ErrRunProg db 'ЋиЁЎЄ  § ЇгбЄ  Їа®Ја ¬¬л',0 WarningSave db 'ЌҐ § Ўг¤м⥠б®еа ­Ёвм Ё§¬Ґ­Ґ­Ёп, § ЇгбвЁвм RDSave',0 ErrNotFoundIni db 'ЌҐ ­ ©¤Ґ­ icon.ini',0 -else if lang eq et - ErrRunProg db 'Programmi kдivitamise viga',0 - WarningSave db 'Дra unusta muudatusi salvestada, kдivita RDSave',0 - ErrNotFoundIni db 'icon.ini ei leitud',0 + else ErrRunProg db 'Error runing program',0 @@ -1297,35 +1286,27 @@ pthNotify db '/rd/1/@notify',0 ;------- AddDlg.inc --------------------------------------------------------------- ;------------------------------------------------------------------------------- if lang eq ru -DTitle db '„®Ў ўЁвм ЁЄ®­Єг',0 +DTitleAdd db '„®Ў ўЁвм ЁЄ®­Єг',0 +DTitleProp db '€§¬Ґ­Ёвм ЁЄ®­Єг',0 DCaptName db '€¬п',0 DCaptPath db 'Џгвм',0 DCaptParams db 'Џ а ¬Ґвал',0 DCaptIcon db '€Є®­Є ',0 +;DCaptChange db '.',0 DCaptCreate db '‘®§¤ вм',0 DCaptProperties db '€§¬Ґ­Ёвм',0 DCaptCancel db 'Ћв¬Ґ­Ёвм',0 -else if lang eq et -DTitle db 'Lisa ikoon',0 - -DCaptName db 'Nimi',0 -DCaptPath db 'Asukoht',0 -DCaptParams db 'Parameetrid',0 -DCaptIcon db 'Ikoon',0 -;DCaptChange db '.',0 -DCaptCreate db 'Loo',0 -DCaptProperties db 'Muuda',0 -DCaptCancel db 'Katkesta',0 - else -DTitle db 'Add icon',0 +DTitleAdd db 'Add icon',0 +DTitleProp db 'Change icon',0 DCaptName db 'Name',0 DCaptPath db 'Path',0 DCaptParams db 'Parameters',0 DCaptIcon db 'Icon',0 +;DCaptChange db '.',0 DCaptCreate db 'Create',0 DCaptProperties db 'Change',0 DCaptCancel db 'Cancel',0 @@ -1427,6 +1408,7 @@ AddY rd 1 SelIcon rd 1 DlgSelIcon rd 1 +slotDlgAdd rd 1 sc system_colors @@ -1435,6 +1417,7 @@ bufStdIco rb 40 IconsOffs rd 100 PIcoDB rd 1 + align 4 icon_count rd 1 strip_file rd 1 @@ -1451,7 +1434,7 @@ RMenuH rw 1 RMenuHsb rw 1 MaxPage rd 1 - +RBMenuColor rd 1 mouse_dd rd 1 DAreaName rb NAME_LENGTH+1 @@ -1461,17 +1444,12 @@ DAreaIcon rb 256+1 align 4 RBProcInfo rb 1024 -RBMenuColor rd 1 - - +align 4 ; OpenDialog temp_dir_pach rb 1024 fname_Info rb 1024 ;------------------------------------------------------------------------------- - rb 256 -stack_move: -stack_rb: rb 1024 stack_dlg: align 4 diff --git a/programs/system/icon_new/DlgAdd.inc b/programs/system/icon_new/DlgAdd.inc index d43890d10b..347328ba70 100644 --- a/programs/system/icon_new/DlgAdd.inc +++ b/programs/system/icon_new/DlgAdd.inc @@ -367,7 +367,14 @@ proc DRedraw mcall 12,1 ;RedrawWinBeg mov edx,[sc.work] or edx,33000000h - mcall 0,<100,400>,<100,(IMG_SIZE+SPCH)*ICONS_DRAW_COUNTH+185>,,,DTitle + cmp [DlgSelIcon],-1 + jne @f + mov edi,DTitleAdd + jmp .l1 + @@: + mov edi,DTitleProp + .l1: + mcall 0,<100,400>,<100,(IMG_SIZE+SPCH)*ICONS_DRAW_COUNTH+185>,,, stdcall [edit_box_draw],edtName stdcall [edit_box_draw],edtExePath diff --git a/programs/system/icon_new/readme.txt b/programs/system/icon_new/readme.txt index c867877545..9b85673f32 100644 --- a/programs/system/icon_new/readme.txt +++ b/programs/system/icon_new/readme.txt @@ -1,5 +1,5 @@ Данная программа заменяет стандартный icon. - Для установки в систему скопируйте @icon и icon.ini в системный -диск. Уберите из Autorun.dat строки с запуском @rb и icon и добавьте + Для установки в систему скопируйте @icon и icon.ini на системный +диск. Уберите из Autorun.dat строки с запуском @rb и icon и добавьте строку с запуском @icon (без параметров, хотя это не важно). Сохраните системный диск и перезагрузите. Всё, программа установлена. \ No newline at end of file