From 59ab8ffa2c0ac2681712ca9f68cb0d4c944d35ef Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sun, 19 Dec 2021 14:25:40 +0000 Subject: [PATCH] barscfg: save docky state on/off after reboot cmm: all apps are now using shared icons, remove old implementation git-svn-id: svn://kolibrios.org@9445 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/icons16.png | Bin 11696 -> 12057 bytes data/et/settings/menu.dat | 4 ++-- data/it/settings/menu.dat | 4 ++-- data/rus/settings/menu.dat | 4 ++-- programs/cmm/barscfg/barscfg.c | 10 +++++++--- programs/cmm/misc/software_widget.c | 8 +++----- programs/cmm/pixie2/pixie.c | 4 ++-- programs/cmm/search/search.c | 4 +--- programs/cmm/taskbar2/taskbar2.c | 4 +--- 9 files changed, 20 insertions(+), 22 deletions(-) diff --git a/data/common/icons16.png b/data/common/icons16.png index af601816f8807daa1a7e8afd32fae27c9cf1543e..191eb9e4f99f3bfd0d5db45122cd702a8e863765 100644 GIT binary patch delta 12044 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 diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat index 95c38a80a7..0024208ca9 100644 --- a/data/et/settings/menu.dat +++ b/data/et/settings/menu.dat @@ -76,8 +76,8 @@ 50 Eolite |File Managers/Eolite 05 KFM2 |File Managers/kfm2 20 fNav |File Managers/fNav/fNav -24 KFAR |File Managers/kfar -24 NDN * |/kolibrios/utils/ndn/ndn +64 KFAR |File Managers/kfar +65 NDN * |/kolibrios/utils/ndn/ndn #11 **** DATA PROCESSING **** 16 Kalkulaator |calc 16 Teksti redaktor |tinypad diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat index 404eacdf77..ad64343e9d 100644 --- a/data/it/settings/menu.dat +++ b/data/it/settings/menu.dat @@ -75,8 +75,8 @@ 50 Eolite |File Managers/Eolite 05 KFM2 |File Managers/kfm2 20 fNav |File Managers/fNav/fNav -24 KFAR |File Managers/kfar -24 NDN * |/kolibrios/utils/ndn/ndn +64 KFAR |File Managers/kfar +65 NDN * |/kolibrios/utils/ndn/ndn #11 **** DATA PROCESSING 16 Calcolatrice |calc 16 Tinypad |tinypad diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index fdee153991..7c5c868226 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -78,8 +78,8 @@ 50 Eolite |File Managers/Eolite 05 KFM2 |File Managers/kfm2 20 fNav |File Managers/fNav/fNav -24 KFAR |File Managers/kfar -24 NDN * |/kolibrios/utils/ndn/ndn +64 KFAR |File Managers/kfar +65 NDN * |/kolibrios/utils/ndn/ndn #9 **** Система > Спец.возможности 49 Экранная лупа |magnify 59 Экранная клавиатура |zkey diff --git a/programs/cmm/barscfg/barscfg.c b/programs/cmm/barscfg/barscfg.c index 086a2fb166..f38c95d14c 100644 --- a/programs/cmm/barscfg/barscfg.c +++ b/programs/cmm/barscfg/barscfg.c @@ -1,4 +1,4 @@ -#define MEMSIZE 0x23E80 +#define MEMSIZE 1024*40 #include "..\lib\kolibri.h" #include "..\lib\strings.h" #include "..\lib\mem.h" @@ -112,8 +112,12 @@ void main() DrawWindowContent(); } if (docky_on.click(id)) { - IF (docky_on.checked == true) RunProgram("/sys/@docky", 0); - ELSE KillProcessByName("@DOCKY", SINGLE); + IF (docky_on.checked == true) { + dkLocation = 2; + SaveSettingsAndRestartProcess(DOCKY); + } ELSE { + KillProcessByName("@DOCKY", SINGLE); + } DrawWindowContent(); } break; diff --git a/programs/cmm/misc/software_widget.c b/programs/cmm/misc/software_widget.c index 420aad7e36..3310f9a910 100644 --- a/programs/cmm/misc/software_widget.c +++ b/programs/cmm/misc/software_widget.c @@ -1,13 +1,12 @@ /* -SOFTWARE CENTER v2.86 +SOFTWARE CENTER v2.87 */ -#define MEMSIZE 4096 * 15 +#define MEMSIZE 1024 * 30 #include "..\lib\strings.h" #include "..\lib\mem.h" #include "..\lib\gui.h" -#include "..\lib\obj\libimg.h" #include "..\lib\obj\libini.h" #include "..\lib\kfont.h" #include "..\lib\list_box.h" @@ -58,7 +57,6 @@ void main() { dword id; kfont.init(DEFAULT_FONT); - load_dll(libimg, #libimg_init,1); load_dll(libini, #lib_init,1); kolibrios_mounted = dir_exists("/kolibrios"); @@ -192,7 +190,7 @@ byte draw_icons_from_section(dword key_value, key_name, sec_name, f_name) kfont.WriteIntoWindowCenter(text_x, row*list.item_h+46 + list_pos + 13, list.item_w,0, swc.list_bg, swc.text, 12, key_name+space_pos); } if (icon_char_pos) icon_id = atoi(icon_char_pos+1); - if (Form.cwidth) DrawIcon32(icon_x, icon_y, swc.list_bg, icon_id); + if (Form.cwidth) draw_icon_32(icon_x, icon_y, swc.list_bg, icon_id); list.count++; col++; return true; diff --git a/programs/cmm/pixie2/pixie.c b/programs/cmm/pixie2/pixie.c index 7b68a3bba5..3260fb324f 100644 --- a/programs/cmm/pixie2/pixie.c +++ b/programs/cmm/pixie2/pixie.c @@ -358,8 +358,8 @@ void DrawAboutWindow() WriteText(130,15, 0x81, 0xF5EFB3, "Pixie Player"); WriteTextLines(10, 40, 0x90, theme.color_top_panel_song_name, ABOUT_MESSAGE, 19); - DrawIcon32(45, 15, theme.color_top_panel_bg, 65); - DrawIcon32(ABOUT_W-32-45, 15, theme.color_top_panel_bg, 65); + draw_icon_32(45, 15, theme.color_top_panel_bg, 65); + draw_icon_32(ABOUT_W-32-45, 15, theme.color_top_panel_bg, 65); } } diff --git a/programs/cmm/search/search.c b/programs/cmm/search/search.c index 31bfec67ef..9fba56a0b3 100644 --- a/programs/cmm/search/search.c +++ b/programs/cmm/search/search.c @@ -5,7 +5,6 @@ #include "../lib/list_box.h" #include "../lib/obj/box_lib.h" #include "../lib/obj/proc_lib.h" -#include "../lib/obj/libimg.h" #include "../lib/obj/libini.h" #include "../lib/patterns/select_list.h" @@ -102,7 +101,6 @@ void main() { int prev_first, prev_cur_y; load_dll(boxlib, #box_lib_init,0); - load_dll(libimg, #libimg_init,1); load_dll(libini, #lib_init,1); load_dll(Proc_lib, #OpenDialog_init,0); OpenDialog_init stdcall (#open_folder_dialog); @@ -209,7 +207,7 @@ void SelectList_DrawLine(dword i) #define ICONX 7 DrawBar(select_list.x, yyy, ICONX-1, select_list.item_h, 0xFFFfff); DrawBar(select_list.x+ICONX+18, yyy, select_list.w-ICONX-18, select_list.item_h, bg); - DrawIcon16(select_list.x+ICONX, yyy+1, 0xFFFfff, icon); + draw_icon_16(select_list.x+ICONX, yyy+1, icon); WriteText(select_list.x + ICONX+18+4,yyy+select_list.text_y,0x90, col, results.name.get(select_list.first + i)); WriteText(select_list.x + ICONX+18+206,yyy+select_list.text_y,0x90, col, results.path.get(select_list.first + i)); diff --git a/programs/cmm/taskbar2/taskbar2.c b/programs/cmm/taskbar2/taskbar2.c index 0c7aa51d49..bebfccb610 100644 --- a/programs/cmm/taskbar2/taskbar2.c +++ b/programs/cmm/taskbar2/taskbar2.c @@ -14,7 +14,6 @@ #include "../lib/mem.h" -#include "../lib/obj/libimg.h" #include "../lib/obj/libini.h" //===================================================// @@ -61,7 +60,6 @@ dword COLOR_TEXT = 0xFFFfff; void main() { int btn; - load_dll(libimg, #libimg_init,1); load_dll(libini, #lib_init,1); ini_get_int stdcall ("/sys/appicons.ini", "taskbar", "attachement", ATTACHEMENT_BOTTOM); @@ -167,7 +165,7 @@ void DrawProcessList() } DrawWideRectangle(posx, posy, 40, 40, CELL_PADDING, COLOR_BG); DefineButton(posx, posy, CELLW-1, CELLH, 100+i+BT_HIDE+BT_NOFRAME, NULL); - DrawIcon32(posx+CELL_PADDING, posy+CELL_PADDING, COLOR_BG, icon_n); + draw_icon_32(posx+CELL_PADDING, posy+CELL_PADDING, COLOR_BG, icon_n); if (ATTACHEMENT_BOTTOM==attachement) DrawBar(posx, posy+CELLH-ACTIVE_SIZE, CELLW, ACTIVE_SIZE, status_color); if (ATTACHEMENT_LEFT ==attachement) DrawBar(posx, posy, ACTIVE_SIZE, CELLH, status_color);