badpork/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Now @icon looks for icon.ini in the SETTINGS

Browse Source 
git-svn-id: svn://kolibrios.org@4091 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
GerdtR 2013-10-25 20:03:51 +00:00
parent defd7b727b
commit 513b5cc12a
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
programs/system/icon_new/@icon.asm
View File

@ -35,6 +35,8 @@ BegData equ fiStdIco.point
dd 0 ; boot parameters
dd 0 ; path
;------------------------------------------------------------------------------
include 'lang.inc'
include 'lang.inc'
include '../../macros.inc'
include '../../proc32.inc'
@ -1141,7 +1143,7 @@ fiIni dd 5 ;
dd 0
dd 0
dd bufIni
db '/rd/1/icon.ini',0
db '/rd/1/settings/icon.ini',0
IconsFile db ICON_STRIP,0
@ -1158,9 +1160,9 @@ RButtonActiv dd 0
MovingActiv dd 0
DlgAddActiv dd 0
IconIni db '/rd/1/icon.ini',0
IconIni db '/rd/1/settings/icon.ini',0
pthNotify db '/rd/1/@notify',0
;keyName db 'name',0
keyPath db 'path',0
@ -1222,43 +1224,33 @@ PredItem dd -1
if lang eq ru
RMenuRedrawFon db '<27>¥à¥à¨á®¢ âì',0
RMenuAlign db '‚ë஢­ïâì ¯® á¥âª¥',0
RMenuOffMoving db '‡ ªà¥¯¨âì ¨ª®­ª¨',0
RMenuOnMoving db 'Žâªà¥¯¨âì ¨ª®­ª¨',0
RMenuAdd db '„®¡ ¢¨âì',0
RMenuDel db '“¤ «¨âì',0
RMenuProp db '‘¢®©á⢠',0
else
RMenuOffMoving db 'Fix the icons',0
RMenuOnMoving db 'Unfix the icons',0
RMenuRedrawFon db 'Redraw',0
RMenuAlign db 'Snap to Grid',0
RMenuOffMoving db 'Fix the icons',0
RMenuOnMoving db 'Unfix the icons',0
RMenuAdd db 'Add',0
RMenuDel db 'Delete',0
RMenuProp db 'Properties',0
end if
if lang eq ru
ErrRunProg db 'Žè¨¡ª  § ¯ã᪠ ¯à®£à ¬¬ë',0
WarningSave db '<27>¥ § ¡ã¤ì⥠á®åà ­¨âì ¨§¬¥­¥­¨ï, § ¯ãáâ¨âì RDSave',0
ErrNotFoundIni db '<27>¥ ­ ©¤¥­ icon.ini',0
ErrName db 'ˆ¬ï "rbmenu" § à¥§¥à¢¨à®¢ ­®',0
else
ErrRunProg db 'Error runing program',0
WarningSave db 'Do not forget to save the changes, run the RDSave',0
ErrNotFoundIni db 'icon.ini not found',0
ErrName db 'The name "rbmenu" reserved',0
end if
pthNotify db '/rd/1/@notify',0
;-------------------------------------------------------------------------------
;------- AddDlg.inc ---------------------------------------------------------------
;-------------------------------------------------------------------------------
@ -1319,6 +1311,7 @@ sbIcons:
.r_size_x dw 0
.r_start_x dw 0
.r_size_y dw 0
.r_start_y dw 0
.m_pos dd 0
.m_pos2 dd 0