From 96d20af14ae39780905da834760b7e835a3c4135 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Wed, 18 Feb 2015 21:58:18 +0000
Subject: [PATCH] iconstrp.png rename to icons32.png, update icons

git-svn-id: svn://kolibrios.org@5425 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/Tupfile.lua                               |   2 +-
 data/common/{iconstrp.png => icons32.png}      | Bin
 programs/cmm/software_widget/software_widget.c |   2 +-
 programs/system/docky/trunk/DATA.INC           |   2 +-
 programs/system/icon_new/@icon.asm             |  10 +++++-----
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename data/common/{iconstrp.png => icons32.png} (100%)

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index e40ed79c1f..c4e4f71ca6 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -29,7 +29,7 @@ img_files = {
  {"SETTINGS/AUTORUN.DAT", build_type .. "/settings/autorun.dat"},
  {"DEFAULT.SKN", build_type .. "/default.skn"},
  {"SETTINGS/ICON.INI", build_type .. "/settings/icon.ini"},
- {"ICONSTRP.PNG", "common/iconstrp.png"},
+ {"ICONS32.PNG", "common/icons32.png"},
  {"INDEX.HTM", build_type .. "/index_htm"},
  {"KERPACK", "common/kerpack"},
  {"SETTINGS/KEYMAP.KEY", build_type .. "/settings/keymap.key"},
diff --git a/data/common/iconstrp.png b/data/common/icons32.png
similarity index 100%
rename from data/common/iconstrp.png
rename to data/common/icons32.png
diff --git a/programs/cmm/software_widget/software_widget.c b/programs/cmm/software_widget/software_widget.c
index e68a0fe464..128c2bafa1 100644
--- a/programs/cmm/software_widget/software_widget.c
+++ b/programs/cmm/software_widget/software_widget.c
@@ -69,7 +69,7 @@ void main()
 	if (load_dll2(libimg, #libimg_init,1)!=0) notify("Error: library doesn't exists - libimg");
 	if (load_dll2(libini, #lib_init,1)!=0) notify("Error: library doesn't exists - libini");
 
-	Libimg_LoadImage(#skin, "/sys/iconstrp.png");
+	Libimg_LoadImage(#skin, "/sys/icons32.png");
 	Libimg_FillTransparent(skin.image, skin.w, skin.h, LIST_BACKGROUND_COLOR);
 
 	if (param)
diff --git a/programs/system/docky/trunk/DATA.INC b/programs/system/docky/trunk/DATA.INC
index bf9c454da6..edd07c6562 100644
--- a/programs/system/docky/trunk/DATA.INC
+++ b/programs/system/docky/trunk/DATA.INC
@@ -1,7 +1,7 @@
 ;-------------------------------------------------------------------------------
 img_data:
  .file_name:
-    db	    "/sys/iconstrp.png", 0
+    db	    "/sys/icons32.png", 0
 ;-------------------------------------------------------------------------------
 ini_data:
  .file_name:
diff --git a/programs/system/icon_new/@icon.asm b/programs/system/icon_new/@icon.asm
index 9f376925b1..6f38ae09f8 100644
--- a/programs/system/icon_new/@icon.asm
+++ b/programs/system/icon_new/@icon.asm
@@ -1,4 +1,4 @@
-ICON_STRIP	equ '/rd/1/iconstrp.png'
+ICON_STRIP	equ '/rd/1/icons32.png'
 ICON_INI	equ '/rd/1/settings/icon.ini'
 ICON_SIZE	equ 68	  ;размер области для иконки с надписью
 IMG_SIZE	equ 32	  ;размер иконок
@@ -51,18 +51,18 @@ START:		; start of execution
 	mov	eax,[unpack_DeflateUnpack2]
 	mov	[deflate_unpack],eax
 ;---------------------------------------------------------------------
-; get size of file ICONSTRP.PNG
+; get size of file icons32.png
 	mcall	70,fiStdIco
 	test	eax,eax
 	jnz	ErrorStrp
-; get memory for ICONSTRP.PNG
+; get memory for icons32.png
 	mov	ecx,dword[bufStdIco+32]
 	mov	[fiStdIco.size],ecx
 	mov	[img_size],ecx
 	mcall	68,12
 	mov	[fiStdIco.point],eax
 	mov	[image_file],eax
-; load ICONSTRP.PNG
+; load icons32.png
 	mov	dword[fiStdIco],0
 	mcall	70,fiStdIco
 	test	eax,eax
@@ -197,7 +197,7 @@ ErrLoadLibs:
 	;debug_newline
 	jmp	close
 ErrorStrp:
-	;dps     'Ошибка открытия iconstrp.png'
+	;dps     'Ошибка открытия icons32.png'
 	;debug_newline
 close:
 	mcall	-1