Rename icons16.png to icons18.png and update all references

Signed-off-by: hrigar <h4gar02@protonmail.com>

data/Tupfile.lua

@@ -28,7 +28,7 @@ img_files = {
  {"ALLGAMES", "common/allgames"},
  {"HOME.PNG", "common/wallpapers/T_Home.png"},
  {"ICONS32.PNG", "common/icons32.png"},
- {"ICONS16.PNG", "common/icons16.png"},
+ {"ICONS18.PNG", "common/icons18.png"},
  {"INDEX.HTM", "common/index_htm"},
  {"KUZKINA.MID", "common/kuzkina.mid"},
  {"SINE.MP3", "common/sine.mp3"},

data/common/File Managers/icons.ini

@@ -1,4 +1,4 @@
-[icons16]
+[icons18]
 <dir>=0
 <up>=1
 <lot>=20

programs/cmm/eolite/Eolite.c

@@ -101,8 +101,8 @@ dword waves_pal[256];
 	collection_int selected0, selected1;
 	dword selected_count[PANES_COUNT]=0;
 
-libimg_image icons16_default;
+libimg_image icons18_default;
-libimg_image icons16_selected;
+libimg_image icons18_selected;
 libimg_image icons32_default;
 libimg_image icons32_selected;
 

programs/cmm/eolite/include/copy_and_delete.h

@@ -103,7 +103,7 @@ void CopyFilesListToClipboard(bool _cut_active)
 
 			if (cut_active) {
 				if (i>=files.first) && (i<files.first+files.visible)
-					PutShadow(files.x+4,i-files.first*files.item_h+files.y,icons16_default.w,files.item_h,1,-3);
+					PutShadow(files.x+4,i-files.first*files.item_h+files.y,icons18_default.w,files.item_h,1,-3);
 			}
 		}
 	}

programs/cmm/eolite/include/icons.h

@@ -25,7 +25,7 @@ int ICONS_INI::get(dword _file_path, _ext, int size)
 		else if (size == 32) return i32.get(ext_pos);
 	} else {
 		exts.add(#ext);
-			icons_ini.section = "icons16";
+			icons_ini.section = "icons18";
 			i18.set(exts.count-1, icons_ini.GetInt(#ext, 2));
 
 			icons_ini.section = "icons32";
@@ -60,8 +60,8 @@ void DrawIconByExtension(dword file_path, extension, xx, yy, fairing_color)
 		selected_image = icons32_selected.image;
 		default_image = icons32_default.image;
 	} else {
-		selected_image = icons16_selected.image;
+		selected_image = icons18_selected.image;
-		default_image = icons16_default.image;
+		default_image = icons18_default.image;
 	}
 
 	if (fairing_color==col.selec) {

programs/cmm/eolite/include/settings.h

@@ -184,11 +184,11 @@ void LoadIcons()
 		icons32_default.replace_color(0x00000000, col.list_bg);
 		icons32_selected.replace_color(0x00000000, col.selec);
 	} else {
-		icons16_default.load("/sys/icons16.png");
+		icons18_default.load("/sys/icons18.png");
-		icons16_selected.load("/sys/icons16.png");
+		icons18_selected.load("/sys/icons18.png");
-		icons16_selected.replace_2colors(0xffFFFfff, col.selec, 0xffCACBD6, selected_shadow);
+		icons18_selected.replace_2colors(0xffFFFfff, col.selec, 0xffCACBD6, selected_shadow);
 		if (col.list_bg!=0xFFFfff) {
-			icons16_default.replace_2colors(0xffFFFfff, col.list_bg, 0xffCACBD6, non_white_shadow);
+			icons18_default.replace_2colors(0xffFFFfff, col.list_bg, 0xffCACBD6, non_white_shadow);
 		}
 	}
 
@@ -260,7 +260,7 @@ void BigIconsSwitch()
 		icon_size = 32; 
 		LoadIcons();
 	} else {
-		icon_size = icons16_default.w; 
+		icon_size = icons18_default.w; 
 	}
 	BigFontsChange();
 }

programs/cmm/eolite/search.c

@@ -220,7 +220,7 @@ void SelectList_DrawLine(dword i)
 	} else {
 		strcpy(#tname, results.name.get(select_list.first + i));
 		strlwr(#tname);
-		icons_ini.section = "icons16";
+		icons_ini.section = "icons18";
 		icon = icons_ini.GetInt(#tname + strrchr(#tname, '.'), 2);
 	}
 

programs/cmm/iconedit/iconedit.c

@@ -160,7 +160,7 @@ _ActionsHistory actionsHistory;
 //                                                   //
 //===================================================//
 
-libimg_image icons16;
+libimg_image icons18;
 
 void main()
 {
@@ -170,18 +170,18 @@ void main()
 	load_dll(libimg, #libimg_init, 1);
 	load_dll(boxlib, #box_lib_init,0);
 
-	icons16.load("/sys/icons16.png");
+	icons18.load("/sys/icons18.png");
-	leftbar_w = icons16.w + 16;
+	leftbar_w = icons18.w + 16;
 
 	sc.get();
 	bg_dark = skin_is_dark();
 
 	semi_white = MixColors(sc.work, 0xFFFfff, bg_dark*90 + 96);
-	icons16.replace_color(0xffFFFfff, sc.work);
+	icons18.replace_color(0xffFFFfff, sc.work);
-	icons16.replace_color(0xffCACBD6, MixColors(sc.work, 0, 200));
+	icons18.replace_color(0xffCACBD6, MixColors(sc.work, 0, 200));
 
 	//fix line and rectandle color for dark skins
-	if (bg_dark) icons16.replace_color(0xff545454, 0xffD3D3D4);
+	if (bg_dark) icons18.replace_color(0xff545454, 0xffD3D3D4);
 
 	EventSetActiveColor(1, color1);
 
@@ -301,7 +301,7 @@ void DrawTopPanelButton1(dword _event, _hotkey, _x, _icon_n)
 	#define ISIZE 18
 	#define YPOS 6
 	DefineHiddenButton(_x-4, YPOS-4, ISIZE+7, ISIZE+7, button.add(_event));
-	img_draw stdcall(icons16.image, _x, YPOS, ISIZE, ISIZE, 0, _icon_n*ISIZE);
+	img_draw stdcall(icons18.image, _x, YPOS, ISIZE, ISIZE, 0, _icon_n*ISIZE);
 	if (_hotkey) key.add_n(_hotkey, _event);
 }
 
@@ -323,10 +323,10 @@ int DrawFlatPanelButton(dword _id, _x, _y, _text)
 void DrawLeftPanelButton(dword _event, _hotkey, _y, _icon_n)
 {
 	int x = 5;
-	DrawRectangle(x, _y, icons16.w + 5, icons16.w + 5, sc.work);
+	DrawRectangle(x, _y, icons18.w + 5, icons18.w + 5, sc.work);
-	DefineHiddenButton(x, _y, icons16.w + 5, icons16.w + 5, button.add(_event));
+	DefineHiddenButton(x, _y, icons18.w + 5, icons18.w + 5, button.add(_event));
-	img_draw stdcall(icons16.image, x+3, _y+3, icons16.w, 
+	img_draw stdcall(icons18.image, x+3, _y+3, icons18.w, 
-		icons16.w, 0, _icon_n*icons16.w);
+		icons18.w, 0, _icon_n*icons18.w);
 	key.add_n(_hotkey, _event);
 }
 void DrawStatusBar()
@@ -419,8 +419,8 @@ void DrawWindow()
 
 void DrawLeftPanelSelection()
 {
-	if (previousTool!=-1) DrawRectangle3D(5, previousTool*GAPV+right_bar.y-2, icons16.w+5, icons16.w+5, sc.work, sc.work);
+	if (previousTool!=-1) DrawRectangle3D(5, previousTool*GAPV+right_bar.y-2, icons18.w+5, icons18.w+5, sc.work, sc.work);
-	DrawRectangle3D(5, currentTool*GAPV+right_bar.y-2, icons16.w+5, icons16.w+5, 0x333333, 0x777777);
+	DrawRectangle3D(5, currentTool*GAPV+right_bar.y-2, icons18.w+5, icons18.w+5, 0x333333, 0x777777);
 }
 
 void DrawEditArea()
@@ -429,7 +429,7 @@ void DrawEditArea()
 	int top_side;
 	int left_side;
 
-	wrapper.x = icons16.w + 16;
+	wrapper.x = icons18.w + 16;
 	wrapper.w = Form.cwidth - right_bar.w - 10 - wrapper.x;
 	wrapper.h = Form.cheight - TOPBAR_H - 35;
 

programs/cmm/imgedit/imgedit.c

@@ -44,9 +44,9 @@ void main()
 	OpenDialog_init stdcall (#o_dialog);
 
 	/* Init UI */
-	icons18.load("/sys/icons16.png");
+	icons18.load("/sys/icons18.png");
 	icons18.replace_2colors(0xffFFFfff, COL_LIGHT, 0xffCACBD6, COL_LIGHT-0x080808);
-	icons18a.load("/sys/icons16.png");
+	icons18a.load("/sys/icons18.png");
 	icons18a.replace_2colors(0xffFFFfff, COL_BUTTON, 0xffCACBD6, 0);
 	pixie_skin.load("/sys/media/pixieskn.png");
 	Form.width = screen.w/6*5;

programs/cmm/misc/reshare.c

@@ -21,8 +21,8 @@
 //===================================================//
 
 libimg_image icons32;
-libimg_image icons16;
+libimg_image icons18;
-libimg_image icons16w;
+libimg_image icons18w;
 unsigned int size32;
 unsigned int size16;
 
@@ -73,7 +73,7 @@ void main()
 	load_dll(libimg, #libimg_init, 1);
 
 	icons32.load("/SYS/ICONS32.PNG"); size32 = icons32.h * 32 * 4;
-	icons16.load("/SYS/ICONS16.PNG"); size16 = icons16.h * 18 * 4;
+	icons18.load("/SYS/ICONS18.PNG"); size16 = icons18.h * 18 * 4;
 
 	if (GetProcessesCount("@RESHARE")>1) {
 		start_ui();
@@ -103,8 +103,8 @@ void start_daemon()
 	img_destroy stdcall(icons32.image);
 
 	shared_i16 = memopen("ICONS18", size16, SHM_CREATE + SHM_WRITE);
-	memmov(shared_i16, icons16.imgsrc, size16);
+	memmov(shared_i16, icons18.imgsrc, size16);
-	//img_destroy stdcall(icons16.image);
+	//img_destroy stdcall(icons18.image);
 
 	shared_i16w = memopen("ICONS18W", size16, SHM_CREATE + SHM_WRITE);
 
@@ -114,7 +114,7 @@ void start_daemon()
 		sc.get();
 		$pop eax
 		if (sc.work != EAX) {
-			memmov(shared_i16w, icons16.imgsrc, size16);
+			memmov(shared_i16w, icons18.imgsrc, size16);
 			replace_2cols(shared_i16w, size16, 0xffFFFfff, sc.work, 0xffCACBD6, sc.dark);
 		}
 	} while(WaitEvent()==evDesktop);
@@ -133,7 +133,7 @@ void start_daemon()
 #define BTNH 24
 #define RESY PAD+30+BTNH+BTNH
 
-enum { ACTIVE_ICONS32=1, ACTIVE_ICONS16=2, ACTIVE_ICONS16W=4, ACTIVE_CHECKBOX=8 };
+enum { ACTIVE_ICONS32=1, ACTIVE_ICONS18=2, ACTIVE_ICONS18W=4, ACTIVE_CHECKBOX=8 };
 int active_tab = ACTIVE_ICONS32;
 
 void start_ui()
@@ -190,8 +190,8 @@ void draw_tabs()
 {
 	#define TABX WINW-BTNW-PAD-BTNW-PAD-BTNW-PAD-BTNW/2
 	DrawFlatButton(           TABX, PAD+30, "ICONS32",  10+ACTIVE_ICONS32, active_tab & ACTIVE_ICONS32);
-	DrawFlatButton(PAD+BTNW*1+TABX, PAD+30, "ICONS16",  10+ACTIVE_ICONS16, active_tab & ACTIVE_ICONS16);
+	DrawFlatButton(PAD+BTNW*1+TABX, PAD+30, "ICONS18",  10+ACTIVE_ICONS18, active_tab & ACTIVE_ICONS18);
-	DrawFlatButton(PAD+BTNW*2+TABX, PAD+30, "ICONS16W", 10+ACTIVE_ICONS16W, active_tab & ACTIVE_ICONS16W);
+	DrawFlatButton(PAD+BTNW*2+TABX, PAD+30, "ICONS18W", 10+ACTIVE_ICONS18W, active_tab & ACTIVE_ICONS18W);
 	DrawFlatButton(PAD+BTNW*3+TABX, PAD+30, "CHECKBOX", 10+ACTIVE_CHECKBOX, active_tab & ACTIVE_CHECKBOX);
 	draw_tab_icons32();
 }
@@ -209,14 +209,14 @@ void draw_tab_icons32()
 		iconimg = icons32.imgsrc;
 		iconw = 32;
 		iconh = icons32.h;
-	} else if (active_tab & ACTIVE_ICONS16) {
+	} else if (active_tab & ACTIVE_ICONS18) {
-		iconimg = icons16.imgsrc;
+		iconimg = icons18.imgsrc;
 		iconw = 18;
-		iconh = icons16.h;
+		iconh = icons18.h;
-	} else if (active_tab & ACTIVE_ICONS16W) {
+	} else if (active_tab & ACTIVE_ICONS18W) {
 		iconimg = memopen("ICONS18W", NULL, SHM_READ);
 		iconw = 18;
-		iconh = icons16.h;
+		iconh = icons18.h;
 	} else {
 		PutImage(WINW-13/2, WINH-RESY-13/2+RESY, 13, 13, #checkbox_flag);
 		return;

programs/develop/cedit/SRC/Icons.ob07

@@ -23,7 +23,7 @@ IMPORT
 	Graph, File, SYSTEM, KOSAPI;
 
 CONST
-	fileName = "/sys/Icons16.png";
+	fileName = "/sys/Icons18.png";
 	libName = "libimg.obj";
 
 	SIZE* = 18;

programs/fs/opendial/opendial.asm

@@ -1971,7 +1971,7 @@ calc_ini:
 	add	edi,[img_size]
 	dec     edi
 	mov     esi,eax
-	add     esi,9 ; after [icons16]
+	add     esi,9 ; after [icons18]
 	cld
 @@:
 	lodsb
@@ -2871,7 +2871,7 @@ root_pach:
 	db '/',0
 
 icons_file_name_2 db 'buttons/'
-icons_path        db '/sys/icons16.png',0
+icons_path        db '/sys/icons18.png',0
 ini_file_name     db '/sys/File managers/icons.ini',0
 ;---------------------------------------------------------------------
 

programs/other/fb2reader/SRC/Icons.ob07

@@ -23,7 +23,7 @@ IMPORT
     LibImg, K := SysUtils, Graph, File, KOSAPI, SYSTEM;
 
 CONST
-	fileName = "/sys/Icons16.png";
+	fileName = "/sys/Icons18.png";
 	SIZE* = 18;
 
 VAR