diff --git a/data/Tupfile.lua b/data/Tupfile.lua index e729905c30..d8ac7c73af 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -48,7 +48,6 @@ img_files = { {"MEDIA/IMGF/CEDG.OBJ", "common/media/ImgF/cEdg.obj"}, {"MEDIA/IMGF/DITHER.OBJ", "common/media/ImgF/dither.obj"}, {"MEDIA/IMGF/INVSOL.OBJ", "common/media/ImgF/invSol.obj"}, - {"MEDIA/KIV.INI", PROGS .. "/media/kiv/trunk/kiv.ini"}, {"MEDIA/PIXIE/SKIN.PNG", PROGS .. "/cmm/pixie2/skin.png"}, {"NETWORK/FTPC.INI", PROGS .. "/network/ftpc/ftpc.ini"}, {"NETWORK/FTPD.INI", "common/network/ftpd.ini"}, diff --git a/data/common/icons32.png b/data/common/icons32.png index b3c7a19afa..6d6104e561 100644 Binary files a/data/common/icons32.png and b/data/common/icons32.png differ diff --git a/data/common/settings/app.ini b/data/common/settings/app.ini index 1717124451..50cdb91579 100644 --- a/data/common/settings/app.ini +++ b/data/common/settings/app.ini @@ -2,8 +2,14 @@ window_mode=0 last_folder= -[Config] +[Eolite] ShowDeviceName=1 RealFileNamesCase=1 InfoAfterCopy=0 ShowStatusBar=1 + +[Kiv] +Next=PgDn +Prev=PgUp +SlideShow=f +ToggleBar=Tab diff --git a/programs/media/kiv/trunk/kiv.asm b/programs/media/kiv/trunk/kiv.asm index 2db8fb9a56..63ff4b7d27 100644 --- a/programs/media/kiv/trunk/kiv.asm +++ b/programs/media/kiv/trunk/kiv.asm @@ -1299,8 +1299,8 @@ store dword b at $ - numimages*20*20 + numimages*20*y + (%-1)*4 end repeat end repeat -inifilename db '/sys/media/kiv.ini',0 -aShortcuts db 'Shortcuts',0 +inifilename db '/sys/settings/app.ini',0 +aShortcuts db 'Kiv',0 aNext db 'Next',0 aPrev db 'Prev',0 aSlide db 'SlideShow',0 diff --git a/programs/media/kiv/trunk/kiv.ini b/programs/media/kiv/trunk/kiv.ini deleted file mode 100644 index 95b07f6ac3..0000000000 --- a/programs/media/kiv/trunk/kiv.ini +++ /dev/null @@ -1,5 +0,0 @@ -[Shortcuts] -Next=PgDn -Prev=PgUp -SlideShow=f -ToggleBar=Tab diff --git a/programs/other/calc/trunk/calc.asm b/programs/other/calc/trunk/calc.asm index 8ae7452f39..550ca5399d 100644 --- a/programs/other/calc/trunk/calc.asm +++ b/programs/other/calc/trunk/calc.asm @@ -813,7 +813,7 @@ clear_all: ;data -title db 'Calc 1.41', 0 +title db 'Calc 1.45', 0 display_type dd 0 ; 0 = decimal, 1 = hexadecimal, 2= binary entry_multiplier dd 10