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

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

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

programs/cmm/eolite/include/settings.h

@@ -156,8 +156,8 @@ void DrawSettingsCheckBoxes()
 
 void LoadIniSettings()
 {
-	ini.path = GetIni(#eolite_ini_path, "EOLITE.INI");
+	ini.path = GetIni(#eolite_ini_path, "app.ini");
-	ini.section = "Config";
+	ini.section = "Eolite";
 
 	files.SetFont(6, 9, 10000000b);
 	show_real_names.checked = ini.GetInt("RealFileNamesCase", true); 

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:
 

programs/cmm/pixie2/pixie.ini

@@ -1,3 +0,0 @@
-[Config]
-window_mode=0
-last_folder=

programs/cmm/pixie2/settings.h

@@ -18,8 +18,8 @@ _ini ini;
 
 void LoadIniConfig()
 {
-	ini.path = GetIni(#pixie_ini_path, "PIXIE.INI");
+	ini.path = GetIni(#pixie_ini_path, "app.ini");
-	ini.section = "Config";
+	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);

programs/games/snake/trunk/snake.asm

@@ -109,7 +109,7 @@ align 4
       invoke  ini.get_color, cur_dir_path, aTheme_name, aBackground_color, 0x000000
     or   [background_color],    eax
     or   [window_style_windowed],   eax
-      invoke  ini.get_color, cur_dir_path, aTheme_name, aDecorations_color, 0xAAAA00
+      invoke  ini.get_color, cur_dir_path, aTheme_name, aDecorations_color, 0x232300
     or   [decorations_color],  eax
       invoke  ini.get_color, cur_dir_path, aTheme_name, aSnake_color, 0x1111ff
     or   [snake_color], eax