CMM: fix in io.h, rename TEXTREADER into TXTREAD,

icons32.png: change colors for DIFF app
make RunOS window wider

git-svn-id: svn://kolibrios.org@6759 a494cfbc-eb01-0410-851d-a64ba20cac60

data/Tupfile.lua

@@ -15,7 +15,7 @@ img_files = {
  {"MACROS.INC", PROGS .. "/macros.inc"},
  {"CONFIG.INC", PROGS .. "/config.inc"},
  {"STRUCT.INC", PROGS .. "/struct.inc"},
- {"TOOLBAR.PNG", PROGS .. "/cmm/textreader/toolbar.png"},
+ {"TOOLBAR.PNG", PROGS .. "/cmm/txtread/toolbar.png"},
  {"DEVELOP/TE_ICON.PNG", PROGS .. "/other/t_edit/te_icon.png"},
  {"DEVELOP/TL_NOD_16.PNG", PROGS .. "/other/t_edit/tl_nod_16.png"},
  {"DEVELOP/TL_SYS_16.PNG", PROGS .. "/media/log_el/trunk/tl_sys_16.png"},
@@ -547,7 +547,7 @@ tup.append_table(img_files, {
  {"MOUSECFG", PROGS .. "/cmm/mousecfg/mousecfg.com"},
  {"NETWORK/WEBVIEW", PROGS .. "/cmm/browser/WebView.com"},
  {"PANELS_CFG", PROGS .. "/cmm/panels_cfg/panels_cfg.com"},
- {"TEXTREADER", PROGS .. "/cmm/textreader/textreader.com"},
+ {"txtread", PROGS .. "/cmm/txtread/txtread.com"},
  {"TMPDISK", PROGS .. "/cmm/tmpdisk/tmpdisk.com"},
  {"GAME_CENTER", PROGS .. "/cmm/software_widget/software_widget.com"},
  {"SYSPANEL", PROGS .. "/cmm/software_widget/software_widget.com"},

data/common/settings/assoc.ini

@@ -14,8 +14,8 @@ icon=58
 next=$Text Reader
 
 [Text Reader]
-exec=/sys/textreader
+exec=/sys/txtread
-icon=55
+icon=85
 next=$HexEditor
 
 [zSea]

programs/cmm/diff/diff_gui.h

@@ -28,8 +28,6 @@ void gui()
 	OpenDialog_init stdcall (#o_dialog);
 	SetEventMask(0x27);
 
-	debugln("GUI");
-
 	loop() switch(WaitEvent())
 	{
 		case evMouse:

programs/cmm/lib/io.h

@@ -229,22 +229,10 @@
 	dword pos;
 	if(!PATH) return self.dir;
 	pos = PATH;
-	if(DSBYTE[pos]=='/')
+	if(DSBYTE[pos]=='/') || (!strncmp(PATH,"./",2))
 	{
-		pos++;
+		return PATH;
-		if(!strncmp(pos,"sys/",4)) return PATH;
-		if(!strncmp(pos,"kolibrios/",10)) return PATH;
-		if(!strncmp(pos,"rd/",3)) return PATH;
-		if(!strncmp(pos,"fd/",3)) return PATH;
-		if(!strncmp(pos,"cd",2)) return PATH;
-		if(!strncmp(pos,"hd",2)) return PATH;
-		if(!strncmp(pos,"bd",2)) return PATH;
-		if(!strncmp(pos,"tmp",3)) return PATH;
-		if(!strncmp(pos,"usbhd",5)) return PATH;
-		sprintf(#__PATH_NEW,"/sys%s",PATH);
-		return #__PATH_NEW;
 	}
-	if(!strncmp(PATH,"./",2)) return PATH;
 	sprintf(#__PATH_NEW,"%s/%s",self.dir,PATH);
 	return #__PATH_NEW;
 }
@@ -337,6 +325,7 @@
     __file_F70.rezerv = 0;
     __file_F70.param2 = rparam;
     __file_F70.name = path.path(rpath);
+    debugln(__file_F70.name);
     $mov eax,70
     $mov ebx,#__file_F70.func
     $int 0x40

programs/cmm/lib/kolibri.h

@@ -608,6 +608,8 @@ dword __generator;  // random number generator -
 //The initialization of the initial data before running
 void ______INIT______()
 {
+	if (program_path[0]!='/') I_Path++;
+	
 	self.dir = #__BUF_DIR__;
 	self.file = 0;
 	self.path = I_Path;
@@ -622,7 +624,6 @@ void ______INIT______()
 	
 	mem_init();
 
-	if (program_path[0]!='/') I_Path++;
 
 	main();
 	ExitProcess();

programs/cmm/txtread/Tupfile.lua

@@ -3,4 +3,4 @@ if tup.getconfig("LANG") == "ru"
 then C_LANG = "LANG_RUS"
 else C_LANG = "LANG_ENG" -- this includes default case without config
 end
-tup.rule("textreader.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "textreader.com")
+tup.rule("txtread.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "txtread.com")

programs/cmm/txtread/ini.h

@@ -4,7 +4,7 @@ int encoding;
 
 void LoadIniSettings()
 {
-	strcpy(#ini_path, "/sys/settings/treader.ini");
+	strcpy(#ini_path, "/sys/settings/txtread.ini");
 	ini_get_int stdcall   (#ini_path, #config_section, "FontSize",  14); label.size.pt = EAX;
 	ini_get_int stdcall   (#ini_path, #config_section, "Encoding",  CH_CP866); encoding = EAX;
 	ini_get_int stdcall   (#ini_path, #config_section, "WinX", 150); Form.left = EAX;