keXa/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

fix various bugs found by Yuriy Olegov

Browse Source 
git-svn-id: svn://kolibrios.org@7928 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2020-05-16 13:32:10 +00:00
parent 733e326d0a
commit 734b394c93
9 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/Tupfile.lua
View File

@ -286,7 +286,7 @@ if build_type == "rus" then tup.append_table(extra_files, {
{"kolibrios/games/Dungeons/Resources/Textures/HUD/", PROGS .. "/games/Dungeons/Resources/Textures/HUD/*"}, {"kolibrios/games/Dungeons/Resources/Textures/HUD/", PROGS .. "/games/Dungeons/Resources/Textures/HUD/*"},
{"kolibrios/games/Dungeons/Resources/Textures/", PROGS .. "/games/Dungeons/Resources/Textures/Licenses.txt"}, {"kolibrios/games/Dungeons/Resources/Textures/", PROGS .. "/games/Dungeons/Resources/Textures/Licenses.txt"},
{"kolibrios/games/Dungeons/", PROGS .. "/games/Dungeons/readme_ru.txt"}, {"kolibrios/games/Dungeons/", PROGS .. "/games/Dungeons/readme_ru.txt"},
{"kolibrios/games/sstartrek/", "common/games/sstartrek/SStarTrek_ru"}, {"kolibrios/games/sstartrek/SStarTrek", "common/games/sstartrek/SStarTrek_ru"},
{"kolibrios/games/WHOWTBAM/", build_type .. "/games/whowtbam"}, {"kolibrios/games/WHOWTBAM/", build_type .. "/games/whowtbam"},
{"kolibrios/games/WHOWTBAM/", build_type .. "/games/appdata.dat"}, {"kolibrios/games/WHOWTBAM/", build_type .. "/games/appdata.dat"},
{"kolibrios/media/zsea/zsea_keys.txt", PROGS .. "/media/zsea/Docs/zSea_keys_rus.txt"}, {"kolibrios/media/zsea/zsea_keys.txt", PROGS .. "/media/zsea/Docs/zSea_keys_rus.txt"},
@ -302,7 +302,7 @@ if build_type == "rus" then tup.append_table(extra_files, {
{"HD_Load/mtldr/install.txt", PROGS .. "/hd_load/mtldr/install_eng.txt"}, {"HD_Load/mtldr/install.txt", PROGS .. "/hd_load/mtldr/install_eng.txt"},
{"HD_Load/USB_Boot/readme.txt", PROGS .. "/hd_load/usb_boot/readme_eng.txt"}, {"HD_Load/USB_Boot/readme.txt", PROGS .. "/hd_load/usb_boot/readme_eng.txt"},
{"kolibrios/games/ataka", "common/games/ataka/ataka_en"}, {"kolibrios/games/ataka", "common/games/ataka/ataka_en"},
{"kolibrios/games/sstartrek/", "common/games/sstartrek/SStarTrek_en"}, {"kolibrios/games/sstartrek/SStarTrek", "common/games/sstartrek/SStarTrek_en"},
{"kolibrios/media/zsea/zsea_keys.txt", PROGS .. "/media/zsea/Docs/zSea_keys_eng.txt"}, {"kolibrios/media/zsea/zsea_keys.txt", PROGS .. "/media/zsea/Docs/zSea_keys_eng.txt"},
}) end }) end
--[[ --[[

2
data/rus/settings/games.ini
View File

@ -32,7 +32,7 @@ Sea War=games/SW,66
Almaz=/k/games/almaz,81 Almaz=/k/games/almaz,81
Tanks=games/tanks,67 Tanks=games/tanks,67
RocketForces=games/rforces,110 RocketForces=games/rforces,110
Pig=/k/games/pig/pigex Pig=/k/games/pig/pigex,120
Ataka=/k/games/ataka,35 Ataka=/k/games/ataka,35
Donkey=/k/games/donkey Donkey=/k/games/donkey
Loderunner=/k/games/LRL/LRL,41 Loderunner=/k/games/LRL/LRL,41

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

@ -287,7 +287,7 @@ void EventDockyProcessButton(dword id)
{ {
if (BTN_DOCKY_ATTACHEMENT == id) { if (BTN_DOCKY_ATTACHEMENT == id) {
dkLocation++; dkLocation++;
if (dkLocation>3) dkLocation=1; if (dkLocation>4) dkLocation=1;
DrawWindowContent(); DrawWindowContent();
SaveSettingsAndRestartProcess(DOCKY); SaveSettingsAndRestartProcess(DOCKY);
} }

BIN
programs/cmm/barscfg/panels_cfg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 469 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
programs/cmm/barscfg/panels_image.raw
View File

Binary file not shown.

1
programs/cmm/eolite/include/settings.h
View File

@ -229,6 +229,7 @@ void SetAppColors()
dword old_list_bg_color = col.list_bg; dword old_list_bg_color = col.list_bg;
sc.get(); sc.get();
sc.work_dark = MixColors(0, sc.work, 35); sc.work_dark = MixColors(0, sc.work, 35);
if (sc.work == 0) sc.work = 1;
if (bg_col == sc.work) return; if (bg_col == sc.work) return;
bg_col = sc.work; bg_col = sc.work;
if (skin_is_dark()) if (skin_is_dark())

2
programs/cmm/lib/patterns/libimg_load_skin.h
View File

@ -30,7 +30,7 @@
:void Libimg_FillTransparent(dword struct_pointer, w, h, new_color) :void Libimg_FillTransparent(dword struct_pointer, w, h, new_color)
{ {
Libimg_ReplaceColor(struct_pointer, w, h, 0, new_color); if (new_color!=0) Libimg_ReplaceColor(struct_pointer, w, h, 0, new_color);
} }
:libimg_image icons32draw; :libimg_image icons32draw;

1
programs/cmm/misc/build.bat
View File

@ -10,6 +10,7 @@ move *.com bin
cd bin cd bin
forfiles /S /M *.com /C "cmd /c rename @file @fname" forfiles /S /M *.com /C "cmd /c rename @file @fname"
rename software_widget syspanel
cd .. cd ..
del warning.txt del warning.txt

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

@ -145,12 +145,15 @@ void SetAppColors()
swc.light = 0xFCFCFC; swc.light = 0xFCFCFC;
} }
if (swc.list_bg != old_list_bg_color) if (!skin.image) LoadImages();
else if (swc.list_bg != old_list_bg_color) LoadImages();
}
void LoadImages()
{ {
Libimg_LoadImage(#skin, "/sys/icons32.png"); Libimg_LoadImage(#skin, "/sys/icons32.png");
Libimg_FillTransparent(skin.image, skin.w, skin.h, swc.list_bg); Libimg_FillTransparent(skin.image, skin.w, skin.h, swc.list_bg);
} }
}
void DrawList() { void DrawList() {