diff --git a/data/Tupfile.lua b/data/Tupfile.lua index b5dce6c1c..59c1a24de 100644 --- a/data/Tupfile.lua +++ b/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"}, diff --git a/data/common/File Managers/icons.ini b/data/common/File Managers/icons.ini index f1d8c08d0..8db6b49b8 100644 --- a/data/common/File Managers/icons.ini +++ b/data/common/File Managers/icons.ini @@ -1,4 +1,4 @@ -[icons16] +[icons18] =0 =1 =20 diff --git a/data/common/icons16.png b/data/common/icons18.png similarity index 100% rename from data/common/icons16.png rename to data/common/icons18.png diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index beef16068..4e1545973 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/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 icons16_selected; +libimg_image icons18_default; +libimg_image icons18_selected; libimg_image icons32_default; libimg_image icons32_selected; diff --git a/programs/cmm/eolite/include/copy_and_delete.h b/programs/cmm/eolite/include/copy_and_delete.h index 325c7db02..6223932e8 100644 --- a/programs/cmm/eolite/include/copy_and_delete.h +++ b/programs/cmm/eolite/include/copy_and_delete.h @@ -103,7 +103,7 @@ void CopyFilesListToClipboard(bool _cut_active) if (cut_active) { if (i>=files.first) && (i1) { 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); - //img_destroy stdcall(icons16.image); + memmov(shared_i16, icons18.imgsrc, size16); + //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*2+TABX, PAD+30, "ICONS16W", 10+ACTIVE_ICONS16W, active_tab & ACTIVE_ICONS16W); + DrawFlatButton(PAD+BTNW*1+TABX, PAD+30, "ICONS18", 10+ACTIVE_ICONS18, active_tab & ACTIVE_ICONS18); + 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) { - iconimg = icons16.imgsrc; + } else if (active_tab & ACTIVE_ICONS18) { + iconimg = icons18.imgsrc; iconw = 18; - iconh = icons16.h; - } else if (active_tab & ACTIVE_ICONS16W) { + iconh = icons18.h; + } 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; diff --git a/programs/develop/cedit/SRC/Icons.ob07 b/programs/develop/cedit/SRC/Icons.ob07 index a3a1a7181..8d0935d76 100644 --- a/programs/develop/cedit/SRC/Icons.ob07 +++ b/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; diff --git a/programs/fs/opendial/opendial.asm b/programs/fs/opendial/opendial.asm index 1435a3461..f6e5bacfc 100644 --- a/programs/fs/opendial/opendial.asm +++ b/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 ;--------------------------------------------------------------------- diff --git a/programs/other/fb2reader/SRC/Icons.ob07 b/programs/other/fb2reader/SRC/Icons.ob07 index eafb5191d..023a9a342 100644 --- a/programs/other/fb2reader/SRC/Icons.ob07 +++ b/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