From 2f3ccbc12186df5706d92c076a00cf15cf975eb7 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 2 Oct 2018 23:32:56 +0000 Subject: [PATCH] eolite.ini, pixie.ini: delete, use app.ini instead snake.ini: remove from IMG pixie2 skin.png: better compressing git-svn-id: svn://kolibrios.org@7429 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 10 +++--- data/common/settings/{eolite.ini => app.ini} | 5 ++- programs/cmm/eolite/include/settings.h | 4 +-- programs/cmm/pixie2/pixie.c | 31 +++++++++++++++++++ programs/cmm/pixie2/pixie.ini | 3 -- programs/cmm/pixie2/settings.h | 4 +-- programs/cmm/pixie2/skin.png | Bin 2521 -> 1857 bytes programs/games/snake/trunk/snake.asm | 2 +- 8 files changed, 44 insertions(+), 15 deletions(-) rename data/common/settings/{eolite.ini => app.ini} (63%) delete mode 100644 programs/cmm/pixie2/pixie.ini diff --git a/data/Tupfile.lua b/data/Tupfile.lua index d690ec1d97..e729905c30 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -40,7 +40,6 @@ img_files = { {"File Managers/FNAV/FNAV_ICN.PNG", "common/File Managers/fNav/fnav_icn.png"}, {"FONTS/LITT.CHR", PROGS .. "/demos/bgitest/trunk/FONTS/LITT.CHR"}, {"FONTS/TAHOMA.KF", "common/fonts/tahoma.kf"}, - {"GAMES/SNAKE.INI", PROGS .. "/games/snake/trunk/snake.ini"}, {"LIB/ICONV.OBJ", "common/lib/iconv.obj"}, {"LIB/KMENU.OBJ", "common/lib/kmenu.obj"}, {"LIB/NETCODE.OBJ", "common/lib/netcode.obj"}, @@ -50,29 +49,28 @@ img_files = { {"MEDIA/IMGF/DITHER.OBJ", "common/media/ImgF/dither.obj"}, {"MEDIA/IMGF/INVSOL.OBJ", "common/media/ImgF/invSol.obj"}, {"MEDIA/KIV.INI", PROGS .. "/media/kiv/trunk/kiv.ini"}, - {"MEDIA/PIXIE/PIXIE.INI", PROGS .. "/cmm/pixie2/pixie.ini"}, {"MEDIA/PIXIE/SKIN.PNG", PROGS .. "/cmm/pixie2/skin.png"}, {"NETWORK/FTPC.INI", PROGS .. "/network/ftpc/ftpc.ini"}, {"NETWORK/FTPD.INI", "common/network/ftpd.ini"}, {"NETWORK/USERS.INI", "common/network/users.ini"}, {"NETWORK/TL_SYS_16.PNG", PROGS .. "/network/ftpc/tl_sys_16.png"}, {"NETWORK/TL_NOD_16.PNG", PROGS .. "/network/ftpc/tl_nod_16.png"}, - {"SETTINGS/AUTORUN.DAT", "common/settings/AUTORUN.DAT"}, + {"SETTINGS/APP.INI", "common/settings/app.ini"}, {"SETTINGS/ASSOC.INI", "common/settings/assoc.ini"}, + {"SETTINGS/AUTORUN.DAT", "common/settings/AUTORUN.DAT"}, {"SETTINGS/DOCKY.INI", "common/settings/docky.ini"}, - {"SETTINGS/EOLITE.INI", "common/settings/eolite.ini"}, {"SETTINGS/ESKIN.INI", "common/settings/eskin.ini"}, {"SETTINGS/FB2READ.INI", "common/settings/fb2read.ini"}, + {"SETTINGS/HOTANGLES.CFG", PROGS .. "/other/ha/SETTINGS/HOTANGLES.CFG"}, {"SETTINGS/ICON.INI", build_type .. "/settings/icon.ini"}, {"SETTINGS/KEYMAP.KEY", PROGS .. "/system/taskbar/trunk/KEYMAP.KEY"}, {"SETTINGS/KOLIBRI.LBL", build_type .. "/settings/kolibri.lbl"}, {"SETTINGS/LANG.INI", build_type .. "/settings/lang.ini"}, {"SETTINGS/MENU.DAT", build_type .. "/settings/menu.dat"}, {"SETTINGS/NETWORK.INI", "common/settings/network.ini"}, - {"SETTINGS/TASKBAR.INI", "common/settings/taskbar.ini"}, {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"}, {"SETTINGS/SYSTEM.INI", "common/settings/system.ini"}, - {"SETTINGS/HOTANGLES.CFG", PROGS .. "/other/ha/SETTINGS/HOTANGLES.CFG"}, + {"SETTINGS/TASKBAR.INI", "common/settings/taskbar.ini"}, } -- For russian build, add russian-only files. diff --git a/data/common/settings/eolite.ini b/data/common/settings/app.ini similarity index 63% rename from data/common/settings/eolite.ini rename to data/common/settings/app.ini index 1566456f1c..1717124451 100644 --- a/data/common/settings/eolite.ini +++ b/data/common/settings/app.ini @@ -1,5 +1,8 @@ +[Pixie] +window_mode=0 +last_folder= + [Config] -SelectionColor=148,174,206 ShowDeviceName=1 RealFileNamesCase=1 InfoAfterCopy=0 diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h index 5c5dbccde5..d083b87e1a 100644 --- a/programs/cmm/eolite/include/settings.h +++ b/programs/cmm/eolite/include/settings.h @@ -156,8 +156,8 @@ void DrawSettingsCheckBoxes() void LoadIniSettings() { - ini.path = GetIni(#eolite_ini_path, "EOLITE.INI"); - ini.section = "Config"; + ini.path = GetIni(#eolite_ini_path, "app.ini"); + ini.section = "Eolite"; files.SetFont(6, 9, 10000000b); show_real_names.checked = ini.GetInt("RealFileNamesCase", true); diff --git a/programs/cmm/pixie2/pixie.c b/programs/cmm/pixie2/pixie.c index 8a635581de..a29c5961c8 100644 --- a/programs/cmm/pixie2/pixie.c +++ b/programs/cmm/pixie2/pixie.c @@ -181,6 +181,7 @@ void main() if (key_scancode==SCAN_CODE_KEY_M) RunProgram("/sys/@VOLUME", "m"); if (key_scancode==SCAN_CODE_KEY_R) EventRepeatClick(); if (key_scancode==SCAN_CODE_KEY_S) EventShuffleClick(); + if (key_scancode==SCAN_CODE_KEY_I) EventShowTagInfo(); if (key_scancode==SCAN_CODE_RIGHT) RunProgram("/sys/@VOLUME", "+"); if (key_scancode==SCAN_CODE_LEFT) RunProgram("/sys/@VOLUME", "-"); if (key_scancode==SCAN_CODE_ENTER) EventStartPlayingSelectedItem(); @@ -567,6 +568,36 @@ void ShowAboutThread() } } +/* +struct { + char tag[4]; + char title[60]; + char artist[60]; + char album[60]; + char speed; + char genre[30]; + char start_time[6]; + char end_time[6]; +} tag11; + +struct { + char tag[3]; + char title[30]; + char artist[30]; + char album[30]; + char year[4]; + char comment[30]; + unsigned char genre; //https://www.w3.org/People/Bos/MP3tag/mp3tag.c +} tag10; +*/ + +void EventShowTagInfo() +{ + char item_path[4096]; + sprintf(#item_path,"%s/%s",#work_folder,GetSelectedItemName()); + RunProgram("/sys/media/mp3info", #item_path); +} + stop: diff --git a/programs/cmm/pixie2/pixie.ini b/programs/cmm/pixie2/pixie.ini deleted file mode 100644 index 499ebc55f7..0000000000 --- a/programs/cmm/pixie2/pixie.ini +++ /dev/null @@ -1,3 +0,0 @@ -[Config] -window_mode=0 -last_folder= \ No newline at end of file diff --git a/programs/cmm/pixie2/settings.h b/programs/cmm/pixie2/settings.h index b146623fe0..54d628bc82 100644 --- a/programs/cmm/pixie2/settings.h +++ b/programs/cmm/pixie2/settings.h @@ -18,8 +18,8 @@ _ini ini; void LoadIniConfig() { - ini.path = GetIni(#pixie_ini_path, "PIXIE.INI"); - ini.section = "Config"; + ini.path = GetIni(#pixie_ini_path, "app.ini"); + ini.section = "Pixie"; window_mode = ini.GetInt("window_mode", WINDOW_MODE_NORMAL); win_x_normal = ini.GetInt("win_x_normal", 100); win_y_normal = ini.GetInt("win_y_normal", 90); diff --git a/programs/cmm/pixie2/skin.png b/programs/cmm/pixie2/skin.png index 1d1c06ebb98b1cff241d7ebc320f668e25ce072d..92c02bd666a128ff892ba770912a6f10dbe16d7f 100644 GIT binary patch delta 1843 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 a%I|-dpn8BS{t$)$0000