From dd84ffb5f5326adca159cb20b21955664cae9632 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 26 Nov 2020 23:29:40 +0000 Subject: [PATCH] Various small fixes git-svn-id: svn://kolibrios.org@8256 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/File Managers/kfar.ini | 1 + data/common/distr_data/autorun.inf | 1 - data/common/settings/assoc.ini | 1 + programs/cmm/iconedit/canvas_resize.h | 2 +- programs/cmm/iconedit/iconedit.c | 2 +- programs/other/ha/HACONFIG.ASM | 2 +- 6 files changed, 5 insertions(+), 4 deletions(-) diff --git a/data/common/File Managers/kfar.ini b/data/common/File Managers/kfar.ini index 6dad3795b..8c225e53f 100644 --- a/data/common/File Managers/kfar.ini +++ b/data/common/File Managers/kfar.ini @@ -15,6 +15,7 @@ pcx=/sys/media/kiv pbm=/sys/media/kiv pgm=/sys/media/kiv pnm=/sys/media/kiv +ppm=/sys/media/kiv tif=/sys/media/kiv tiff=/sys/media/kiv wbmp=/sys/media/kiv diff --git a/data/common/distr_data/autorun.inf b/data/common/distr_data/autorun.inf index a3c071e7c..fe17e133d 100644 --- a/data/common/distr_data/autorun.inf +++ b/data/common/distr_data/autorun.inf @@ -1,3 +1,2 @@ [AutoRun] icon=KolibriOS_icon.ico -shellexecute=readme.txt \ No newline at end of file diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini index 3054ae56e..9f0a4572b 100644 --- a/data/common/settings/assoc.ini +++ b/data/common/settings/assoc.ini @@ -125,6 +125,7 @@ pcx=$KIV pbm=$KIV pgm=$KIV pnm=$KIV +ppm=$KIV tga=$KIV tif=$KIV tiff=$KIV diff --git a/programs/cmm/iconedit/canvas_resize.h b/programs/cmm/iconedit/canvas_resize.h index ed9e9778e..86144e554 100644 --- a/programs/cmm/iconedit/canvas_resize.h +++ b/programs/cmm/iconedit/canvas_resize.h @@ -41,7 +41,7 @@ void CanvasReSize_Thread() if (SCAN_CODE_ENTER == key_scancode) EventApplyClick(); if (SCAN_CODE_TAB == key_scancode) EventTabClick(); - EAX= key_ascii << 8; + EAX = key_editbox; edit_box_key stdcall (#edit_columns); edit_box_key stdcall (#edit_rows); break; diff --git a/programs/cmm/iconedit/iconedit.c b/programs/cmm/iconedit/iconedit.c index 79c331ec4..2d68874cb 100644 --- a/programs/cmm/iconedit/iconedit.c +++ b/programs/cmm/iconedit/iconedit.c @@ -40,7 +40,7 @@ char image_menu_items[] = Заменить все цвета 1 на 2"; ?define T_MENU_IMAGE "Иконка" ?define T_TEST_ICON "Проверить иконку" -?define T_TITLE "Редактор иконок 0.70 Beta" +?define T_TITLE "Редактор иконок 0.70a Beta" ?define T_UNIC_COLORS_COUNT "'Уникальных цветов: %i.' -I" ?define T_TOO_BIG_IMAGE_FOR_PREVIEW "'IconEdit Изображение слишком большое для предпросмотра!' -tE" diff --git a/programs/other/ha/HACONFIG.ASM b/programs/other/ha/HACONFIG.ASM index f12bda3d5..00600f029 100644 --- a/programs/other/ha/HACONFIG.ASM +++ b/programs/other/ha/HACONFIG.ASM @@ -1450,7 +1450,7 @@ text db "This is a Hot Angles Configurator. " hed: title db "Hot Angles Configurator", 0 buttonText db " Apply ", 0 -buttonTextSize = 5 +buttonTextSize = 9 ch_text db 'Activate "Hot Angles"',0 ;ёюяЁютюцфр■∙шщ ЄхъёЄ фы▀ ўхъ сюъёр