From 1842ba815f08665b23e2195e1de17037563f3b7b Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 3 Jan 2019 17:57:09 +0000 Subject: [PATCH] add Guide Documentation to RUS ISO git-svn-id: svn://kolibrios.org@7569 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 5 +++-- programs/cmm/lib/kolibri.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 822fa637de..58cfd84822 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -243,8 +243,8 @@ extra_files = { {"kolibrios/media/zsea/zsea.ini", PROGS .. "/media/zsea/zSea.ini"}, {"kolibrios/media/zsea/buttons/buttons.png", PROGS .. "/media/zsea/buttons.png"}, {"kolibrios/res/skins/", "../skins/authors.txt"}, - {"kolibrios/res/wallpapers/", "common/wallpapers/*"}, {"kolibrios/res/templates/", "common/templates/*"}, + {"kolibrios/res/wallpapers/", "common/wallpapers/*"}, } if build_type == "rus" then tup.append_table(extra_files, { {"Docs/cp866/config.txt", build_type .. "/docs/CONFIG.TXT"}, @@ -265,7 +265,6 @@ if build_type == "rus" then tup.append_table(extra_files, { {"HD_Load/9x2klbr/", PROGS .. "/hd_load/9x2klbr/readme_win.txt"}, {"HD_Load/mtldr/", PROGS .. "/hd_load/mtldr/install.txt"}, {"HD_Load/USB_Boot/", PROGS .. "/hd_load/usb_boot/readme.txt"}, - {"kolibrios/media/zsea/zsea_keys.txt", PROGS .. "/media/zsea/Docs/zSea_keys_rus.txt"}, {"kolibrios/games/Dungeons/Resources/Textures/Environment/", PROGS .. "/games/Dungeons/Resources/Textures/Environment/*"}, {"kolibrios/games/Dungeons/Resources/Textures/Objects/", PROGS .. "/games/Dungeons/Resources/Textures/Objects/*"}, {"kolibrios/games/Dungeons/Resources/Textures/HUD/", PROGS .. "/games/Dungeons/Resources/Textures/HUD/*"}, @@ -273,6 +272,8 @@ if build_type == "rus" then tup.append_table(extra_files, { {"kolibrios/games/Dungeons/", PROGS .. "/games/Dungeons/readme_ru.txt"}, {"kolibrios/games/WHOWTBAM/", build_type .. "/games/whowtbam"}, {"kolibrios/games/WHOWTBAM/", build_type .. "/games/appdata.dat"}, + {"kolibrios/media/zsea/zsea_keys.txt", PROGS .. "/media/zsea/Docs/zSea_keys_rus.txt"}, + {"kolibrios/res/guide/", build_type .. "/docs/guide/*"}, }) else tup.append_table(extra_files, { {"Docs/config.txt", build_type .. "/docs/CONFIG.TXT"}, {"Docs/copying.txt", build_type .. "/docs/COPYING.TXT"}, diff --git a/programs/cmm/lib/kolibri.h b/programs/cmm/lib/kolibri.h index dff2e641cb..4359bbd198 100644 --- a/programs/cmm/lib/kolibri.h +++ b/programs/cmm/lib/kolibri.h @@ -48,7 +48,7 @@ char program_path[4096]; #define EVM_KEY 10b #define EVM_BUTTON 100b #define EVM_EXIT 1000b -#define EVM_BACKGROUND 10000b +#define EVM_DESKTOPBG 10000b #define EVM_MOUSE 100000b #define EVM_IPC 1000000b #define EVM_STACK 10000000b