KolibriOS/kolibrios
13
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

barscfg: save docky state on/off after reboot

Browse Source 
cmm: all apps are now using shared icons, remove old implementation

git-svn-id: svn://kolibrios.org@9445 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2021-12-19 14:25:40 +00:00
parent 7b0fc6a739
commit 59ab8ffa2c
9 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/common/icons16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

4
data/et/settings/menu.dat
View File

@ -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

4
data/it/settings/menu.dat
View File

@ -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

4
data/rus/settings/menu.dat
View File

@ -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 <20>ªà ­­ ï «ã¯  |magnify
59 <20>ªà ­­ ï ª« ¢¨ âãà  |zkey

10
programs/cmm/barscfg/barscfg.c
View File

@ -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;

8
programs/cmm/misc/software_widget.c
View File

@ -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;

4
programs/cmm/pixie2/pixie.c
View File

@ -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);
}
}

4
programs/cmm/search/search.c
View File

@ -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));

4
programs/cmm/taskbar2/taskbar2.c
View File

@ -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);