Commit: 11 - textdefind (svn)

Commit MetaInfo

• Révision: 11 (tree)
• l'heure: 2018-12-25 20:09:10
• Auteur: kentamaken

Message de Log

ituneで開く

Change Summary

• modified: Win32/Release/textdefind.exe
• modified: textdefind.dproj
• modified: textdefindunit.dfm
• modified: textdefindunit.pas

Modification

--- textdefind.dproj	(revision 10)
+++ textdefind.dproj	(revision 11)
@@ -78,6 +78,7 @@
         <DCC_RemoteDebug>false</DCC_RemoteDebug>
         <BT_BuildType>Debug</BT_BuildType>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_Warnings>false</DCC_Warnings>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>

--- textdefindunit.pas	(revision 10)
+++ textdefindunit.pas	(revision 11)
@@ -7,7 +7,9 @@
 	System.Classes,Vcl.Graphics,
 	Vcl.Controls,Vcl.Forms,Vcl.Dialogs,Vcl.StdCtrls,Vcl.ExtCtrls,Vcl.Grids,
 	types,inifiles,
-	Vcl.ComCtrls,ShlObj,ActiveX,Vcl.Menus,Vcl.CheckLst;
+	Vcl.ComCtrls,ShlObj,ActiveX,Vcl.Menus,Vcl.CheckLst, IdBaseComponent,
+  IdComponent, IdTCPConnection, IdTCPClient,IdGlobal, IdURI, IdHTTP, Vcl.OleCtrls, SHDocVw,
+  IdIOHandler, IdIOHandlerSocket, IdIOHandlerStack, IdSSL, IdSSLOpenSSL;
 
 type
 	TStringSelf=class(TStringList)
@@ -51,10 +53,6 @@
 
 		function DoMouseWheelDown(Shift:TShiftState;MousePos:TPoint):boolean;override;
 		function DoMouseWheelUp(Shift:TShiftState;MousePos:TPoint):boolean;override;
-		function ColExpand(min:Integer):Integer;
-		function RowDelete(Y,cnt:Integer):Integer;
-		function RowInsert(Y,cnt:Integer):Integer;
-		function RowClear(Y,cnt:Integer):Integer;
 
 	public
 		downinselection:boolean;
@@ -61,6 +59,15 @@
 		saverect:TGridRect;
 		buf:TGrid;
 
+		function ColExpand(min:Integer):Integer;
+		function RowDelete(Y,cnt:Integer):Integer;
+		function RowInsert(Y,cnt:Integer):Integer;
+		function RowClear(Y,cnt:Integer):Integer;
+		function ColDelete(X,cnt:Integer):Integer;
+		function ColInsert(X,cnt:Integer):Integer;
+		function ColClear(X,cnt:Integer):Integer;
+
+
 		procedure cutcopy(modecut:boolean);
 		function paste:TGridRect;
 		function selrowdo(func:TFuncXY):Integer;
@@ -70,9 +77,11 @@
 		procedure copy(G:TGrid);
 		procedure savebuf;
 		procedure seldel;
+		function seltext:string;
 		procedure setfixed;
 		function load(fn:string):boolean;
 		function save(fn:string):boolean;
+		procedure clear;
 
 	published
 		property InplaceEditor;
@@ -109,7 +118,7 @@
 		SaveDialog:TSaveDialog;
 		OpenDialog:TOpenDialog;
 		LeftPanel:TPanel;
-		Name:TComboBox;
+    ListName: TComboBox;
 		Text:TRichEdit;
 		Tree:TTreeView;
 		Button1:TButton;
@@ -134,6 +143,19 @@
 		OptionUrlDQuote:TCheckBox;
 		OpURLComment:TCheckBox;
 		OpURLButton:TButton;
+    Web: TWebBrowser;
+	IdHTTP: TIdHTTP;
+    IdSSLIOHandlerSocketOpenSSL: TIdSSLIOHandlerSocketOpenSSL;
+    Memo1: TMemo;
+    OpURLFile: TCheckBox;
+    OpURLitune: TCheckBox;
+    PFileUpdate: TMenuItem;
+    PColAdd: TMenuItem;
+    PColDel: TMenuItem;
+    PRowAdd: TMenuItem;
+    PRowDel: TMenuItem;
+    N5: TMenuItem;
+    PClear: TMenuItem;
 		procedure FindClick(Sender:TObject);
 		procedure FormCreate(Sender:TObject);
 		procedure GridFilesMouseDown(Sender:TObject;Button:TMouseButton;Shift:TShiftState;X,Y:Integer);
@@ -148,7 +170,7 @@
 		procedure PTextSaveAsClick(Sender:TObject);
 		procedure PTextOpenClick(Sender:TObject);
 		procedure FormDestroy(Sender:TObject);
-		procedure NameChange(Sender:TObject);
+		procedure ListNameChange(Sender:TObject);
 		procedure TreeClick(Sender:TObject);
 		procedure Button1Click(Sender:TObject);
 		procedure PFileFolderClick(Sender:TObject);
@@ -163,6 +185,15 @@
 		procedure GridFilesSetEditText(Sender:TObject;ACol,ARow:Integer;const Value:string);
 		procedure FormClose(Sender:TObject;var Action:TCloseAction);
 		procedure OpURLButtonClick(Sender:TObject);
+    procedure PFileUpdateClick(Sender: TObject);
+    procedure PTextFindUrlAddClick(Sender: TObject);
+    procedure PColAddClick(Sender: TObject);
+    procedure GridFilesSelectCell(Sender: TObject; ACol, ARow: Integer;
+      var CanSelect: Boolean);
+    procedure PRowDelClick(Sender: TObject);
+    procedure PRowAddClick(Sender: TObject);
+    procedure PColDelClick(Sender: TObject);
+    procedure PClearClick(Sender: TObject);
 	private
 		{ Private 宣言 }
 	public
@@ -180,7 +211,7 @@
 
 implementation
 
-uses strutils,IOUtils,masks,clipbrd,SHELLAPI,Vcl.FileCtrl,IdGlobal,IdURI;
+uses strutils,IOUtils,masks,clipbrd,SHELLAPI,Vcl.FileCtrl,ComObj,System.JSON;
 
 var
 	Malloc:IMalloc;
@@ -199,12 +230,22 @@
 	LF=#10;
 	CRLF=#13#10;
 	TAB=#9;
-	CTEXT=1;
-	CFILE=2;
-	CPATH=3;
+	CTEXT='検索文字';
+	CFILE='ファイル';
+	CPATH='パス';
+	CNAME='アーティスト';
+	COPEN='開く';
+	COPEN2='開く2';
 
 var
-	CHEAD:TStringDynArray=['','検索文字','ファイル','パス'];
+	NTEXT:integer;
+	NFILE:integer;
+	NPATH:integer;
+	NNAME:integer;
+	NOPEN:integer;
+	NOPEN2:integer;
+	CHEAD:TStringDynArray=['',CTEXT,CFILE,CPATH];
+	CHEADWEB:TStringDynArray=['',CTEXT,CFILE,COPEN,COPEN2,CPATH,CNAME];
 
 {$R *.dfm}
 
@@ -248,15 +289,44 @@
 	Result:=String(buf);
 end;
 
-procedure TTextDeFindForm.FormCreate(Sender:TObject);
-	procedure LoadChecked(C:TComponent);
+
+procedure OptionSaveLoad(C:TPanel;bsave:boolean);
+var
+  i:integer;
+  s:string;
+  B:TButton;
+	procedure Save(C:TComponent);
 	begin
 		if C.ClassType=TMenuItem then
+			Ini.WriteBool('',C.Name,TMenuItem(C).Checked);
+		if C.ClassType=TCheckBox then
+			Ini.WriteBool('',C.Name,TCheckBox(C).Checked);
+		if C.ClassType=TEdit then
+			Ini.WriteString('',C.Name,TEdit(C).Text);
+	end;
+
+	procedure Load(C:TComponent);
+	begin
+		if C.ClassType=TMenuItem then
 			TMenuItem(C).Checked:=Ini.ReadBool('',C.Name,TMenuItem(C).Checked);
 		if C.ClassType=TCheckBox then
 			TCheckBox(C).Checked:=Ini.ReadBool('',C.Name,TCheckBox(C).Checked);
+		if C.ClassType=TEdit then begin
+			s:=Ini.ReadString('',C.Name,TEdit(C).Text);
+			if s<>'' then TEdit(C).Text:=s;
+		end;
 	end;
+begin
+	for i:=0 to C.ControlCount-1 do begin
+		if bsave then Save(C.Controls[i]) else Load(C.Controls[i]);
+	end;
 
+end;
+
+
+
+procedure TTextDeFindForm.FormCreate(Sender:TObject);
+
 begin
 	Ini:=TMemInifile.Create(ChangeFileExt(Application.ExeName,'.ini'));
 	Inifile:=TMemInifile.Create(ChangeFileExt(Application.ExeName,'.txt'));
@@ -269,13 +339,7 @@
 	LeftPanel.Width:=Ini.ReadInteger('','LeftPanel.Width',LeftPanel.Width);
 	Font.Size:=Ini.ReadInteger('','Font.Size',Font.Size);
 
-	LoadChecked(OpURLComment);
-	LoadChecked(OpUrlSpace);
-	OpURLSpaceEdit.Text:=Ini.ReadString('','OpURLSpaceEdit',OpURLSpaceEdit.Text);
-	LoadChecked(OpURLEscape);
-	OpURLEscapeEdit.Text:=Ini.ReadString('','OpURLEscape',OpURLEscapeEdit.Text);
-	LoadChecked(OpURLZenkaku);
-	LoadChecked(OptionUrlDQuote);
+	OptionSaveLoad(OpURLPanel,false);
 
 	Path.Text:=Ini.ReadString('','Path.Text','');
 	Url.Text:=Ini.ReadString('','Url.Text','');
@@ -287,8 +351,8 @@
 
 	try
 		// Tree.LoadFromFile(ChangeFileExt(Application.ExeName,'.txt'));
-		NameChange(Sender);
-		pname:=Name.Text;
+		ListNameChange(Sender);
+		pname:=ListName.Text;
 		TreeClick(Sender);
 	except
 		ShowMessage('ツリーテキストを読み込めませんでした');
@@ -298,13 +362,6 @@
 
 procedure TTextDeFindForm.FormClose(Sender:TObject;var Action:TCloseAction);
 
-	procedure SaveChecked(C:TComponent);
-	begin
-		if C.ClassType=TMenuItem then
-			Ini.WriteBool('',C.Name,TMenuItem(C).Checked);
-		if C.ClassType=TCheckBox then
-			Ini.WriteBool('',C.Name,TCheckBox(C).Checked);
-	end;
 
 begin
 	if Application.Terminated then
@@ -318,15 +375,10 @@
 	Ini.WriteString('','Url.Text',Url.Text);
 	Ini.writestrings('Url.Items',Url.Items);
 
-	SaveChecked(OpURLComment);
-	SaveChecked(OpUrlSpace);
-	Ini.WriteString('','OpURLSpaceEdit',OpURLSpaceEdit.Text);
-	SaveChecked(OpURLEscape);
-	Ini.WriteString('','OpURLEscape',OpURLEscapeEdit.Text);
-	SaveChecked(OpURLZenkaku);
-	SaveChecked(OptionUrlDQuote);
+	OptionSaveLoad(OpURLPanel,true);
 
-	NameChange(Sender);
+
+	ListNameChange(Sender);
 	Inifile.writetreeview('Tree',Tree);
 	// Tree.SaveToFile(ChangeFileExt(Application.ExeName,'.txt'));
 
@@ -375,7 +427,7 @@
 
 procedure TTextDeFindForm.FindUrlButtonClick(Sender:TObject);
 var
-	s,ss:string;
+	urls,s,ss:string;
 	ls,le,i,count:Integer;
 
 	function option(Url:String):String;
@@ -407,19 +459,109 @@
 			Url:='\"'+Url+'\"';
 		end;
 
-		Result:=Url;
+		Result:=trim(Url);
 	end;
 
+	function iddownload(url:string):string;
+	var
+		S : TStringStream;
+	begin
+		IdHTTP.HandleRedirects := True;
+		S := TStringStream.Create('',TEncoding.UTF8);
+		try
+			url:=TIdURI.URLEncode(url,IndyTextEncoding_UTF8);
+			IdHTTP.Get(url, S);
+			S.Position:=0;
+			result:=S.ReadString(S.Size);
+		finally
+			FreeAndNil(S);
+		end;
+		IdHTTP.Disconnect;
+
+	end;
+
+	function jsontogrid(url:string):string;
+	var
+		obj: TJSONObject;
+		val: TJSONValue;
+		vresults: TJSONArray;
+		vitem: TJSONObject;
+		pair: TJSONPair;
+		i,r:integer;
+		data:string;
+		function getval(k:string):string;
+		begin
+			try
+				result:=vitem.GetValue(k).Value;
+			except
+				result:='';
+			end;
+		end;
+
+	begin
+		data:=iddownload(url);
+//		memo1.Lines.LoadFromFile('D:\utilsrad10\textdefind\Win32\Debug\1-10.txt',TEncoding.UTF8);
+//		data:=memo1.Lines.text;
+		try
+			obj := TJSONObject.ParseJSONValue(Data) as TJSONObject;
+			vresults:=obj.GetValue('results') as TJSONArray;
+			for i:=0 to vresults.count-1 do begin
+				vitem:=vresults.items[i] as TJSONObject;;
+				r:=Files.RowCount;
+				Files.RowCount:=r+1;
+				Files.cells[NTEXT,r]:=option(ss);
+				Files.cells[NFILE,r]:=GetVal('trackName');
+				Files.cells[NPATH,r]:=GetVal('trackViewUrl').Replace('https:','itmss:');
+				Files.cells[NNAME,r]:=GetVal('artistName');
+				Files.cells[NOPEN,r]:='M';
+				Files.cells[NOPEN2,r]:='S';
+			end;
+			if vresults.count=0 then begin
+				r:=Files.RowCount;
+				Files.RowCount:=r+1;
+				Files.cells[NTEXT,r]:=option(ss);
+			end;
+
+		except
+		end;
+	end;
+
+	function datatogrid(url:string):string;
+	var
+		data:string;
+		i,r:integer;
+	begin
+		data:=iddownload(url);
+		r:=Files.RowCount;
+		Files.RowCount:=r+1;
+		Files.cells[NTEXT,r]:=option(ss);
+		Files.cells[NFILE,r]:=data;
+	end;
+
+
+
+
 begin
 	urlrun:=not urlrun;
 	// with GridFiles do begin
 	// for i:=selection.top to selection.Bottom do begin
 	// end;
+
+//	if Sender<>PTextFindUrlAdd then begin
+//		Files.clear;
+//		Files.RowCount:=1;
+//	end;
+
+	Files.ColCount:=CHEADWEB.count;
+	Files.Rows[0].setstrings(CHEADWEB);
+	PFileUpdateClick(Sender);
+
 	Screen.Cursor:=crHourGlass;
 	ls:=Text.Perform(EM_LINEFROMCHAR,Text.SelStart,0);
 	le:=Text.Perform(EM_LINEFROMCHAR,Text.SelStart+Text.SelLength-1*Integer(Text.SelLength>0),0);
 	for i:=ls to le do begin
 		FindUrlButton.Caption:='中止';
+		Caption:=Self.Name+Format(' %d/%d',[i,le]);
 		ss:=Text.lines[i];
 		if not urlrun then
 			break;
@@ -427,11 +569,26 @@
 		s:=Url.Text;
 		if s='' then
 			continue;
-		s:=s.Replace('%リスト名%',option(Name.Text));
+		s:=s.Replace('%リスト名%',option(ListName.Text));
 		s:=s.Replace('%検索文字%',option(ss));
-		ShellExecute(Handle,'open',PChar(s),'','',1);
-		sleep(3000);
+		urls:=s;
+
+		if OpURLFile.Checked then
+			datatogrid(urls)
+		else if OpURLitune.Checked and (urls.IndexOf('itmss:')=0) then begin
+			urls:=urls.Replace('itmss:','https:');
+			jsontogrid(urls);
+		end else
+			ShellExecute(Handle,'open',PChar(urls),'','',1);
+
+		if Files.RowCount>(Files.VisibleRowCount+1) then
+			Files.TopRow:=Files.RowCount-Files.VisibleRowCount;
+		Files.ColExpand(10);
+		Files.setfixed;
+
+		sleep(1000);
 	end;
+
 	FindUrlButton.Caption:='URL検索';
 	urlrun:=false;
 	Screen.Cursor:=crDefault;
@@ -440,13 +597,13 @@
 procedure TTextDeFindForm.PFileExecClick(Sender:TObject);
 begin
 	with GridFiles do
-		ShellExecute(Handle,'open',PChar(INCBS(cells[CPATH,row])+cells[CFILE,row]),'','',1);
+		ShellExecute(Handle,'open',PChar(INCBS(cells[NPATH,row])+cells[NFILE,row]),'','',1);
 end;
 
 procedure TTextDeFindForm.PFileFolderClick(Sender:TObject);
 begin
 	with GridFiles do
-		ShellExecute(Handle,'open',PChar(INCBS(cells[CPATH,row])),'','',1);
+		ShellExecute(Handle,'open',PChar(INCBS(cells[NPATH,row])),'','',1);
 
 end;
 
@@ -471,6 +628,26 @@
 		Files.save(SaveDialog.FileName);
 end;
 
+procedure TTextDeFindForm.PFileUpdateClick(Sender: TObject);
+begin
+	NTEXT:=Files.Rows[0].IndexOf(CTEXT);
+	NFILE:=Files.Rows[0].IndexOf(CFILE);
+	NPATH:=Files.Rows[0].IndexOf(CPATH);
+	NNAME:=Files.Rows[0].IndexOf(CNAME);
+	NOPEN:=Files.Rows[0].IndexOf(COPEN);
+	NOPEN2:=Files.Rows[0].IndexOf(COPEN2);
+end;
+
+procedure TTextDeFindForm.PRowAddClick(Sender: TObject);
+begin
+	Files.RowInsert(Files.Selection.Top,Files.Selection.Bottom-Files.Selection.Top+1)
+end;
+
+procedure TTextDeFindForm.PRowDelClick(Sender: TObject);
+begin
+	Files.RowDelete(Files.Selection.Top,Files.Selection.Bottom-Files.Selection.Top+1)
+end;
+
 procedure TTextDeFindForm.PTextCopyClick(Sender:TObject);
 begin
 	Text.CopyToClipboard;
@@ -486,6 +663,11 @@
 	FindClick(Sender);
 end;
 
+procedure TTextDeFindForm.PTextFindUrlAddClick(Sender: TObject);
+begin
+	FindUrlButtonClick(Sender);
+end;
+
 procedure TTextDeFindForm.PTextFindUrlClick(Sender:TObject);
 begin
 	FindUrlButtonClick(Sender);
@@ -520,6 +702,7 @@
 		Result:=false;
 end;
 
+
 procedure TTextDeFindForm.GridFilesMouseDown(Sender:TObject;Button:TMouseButton;Shift:TShiftState;X,Y:Integer);
 var
 	ACol,ARow:Longint;
@@ -532,6 +715,29 @@
 
 end;
 
+
+procedure TTextDeFindForm.GridFilesSelectCell(Sender: TObject; ACol,
+  ARow: Integer; var CanSelect: Boolean);
+var
+s:string;
+begin
+	PFileUpdateClick(sender);
+	if ACol=NOPEN then
+		s:=Files.cells[NPATH,arow];
+	if ACol=NOPEN2 then
+		s:=Files.cells[NPATH,arow]+'&app=itunes';
+
+	if s='' then exit;
+
+	ShellExecute(Handle,'open',PChar(s),'','',1);
+
+//	if s.IndexOf('http:')<>0 then
+//		if s.IndexOf('https:')<>0 then
+//			if s.IndexOf('itmss:')<>0 then
+//				exit;
+
+end;
+
 procedure TTextDeFindForm.GridFilesSetEditText(Sender:TObject;ACol,ARow:Integer;const Value:string);
 begin
 	// ShowMessage(Value);
@@ -558,7 +764,7 @@
 
 begin
 
-	ppname:=Name.Text;
+	ppname:=ListName.Text;
 
 
 	// for i:=Name.Items.Count-1 downto 1 do
@@ -570,13 +776,13 @@
 		TMP.Items.add(N.Text);
 		N:=N.getNextSibling;
 	end;
-	Name.Enabled:=false;
-	Name.Items.Text:=TMP.Items.Text;
+	ListName.Enabled:=false;
+	ListName.Items.Text:=TMP.Items.Text;
 	// Name.ItemIndex:=-1;
 	// Name.Text:=ppname;
-	Name.ItemIndex:=Name.Items.IndexOf(ppname);
+	ListName.ItemIndex:=ListName.Items.IndexOf(ppname);
 	// Application.ProcessMessages;
-	Name.Enabled:=true;
+	ListName.Enabled:=true;
 end;
 
 function inputtextbox(P:TForm;C:TWinControl;Text:string):string;
@@ -621,6 +827,22 @@
 	end;
 end;
 
+procedure TTextDeFindForm.PClearClick(Sender: TObject);
+begin
+	Files.clear;
+	Files.RowCOunt:=1;
+end;
+
+procedure TTextDeFindForm.PColAddClick(Sender: TObject);
+begin
+	Files.ColInsert(Files.Col,1);
+end;
+
+procedure TTextDeFindForm.PColDelClick(Sender: TObject);
+begin
+	Files.ColDelete(Files.Col,1);
+end;
+
 procedure TTextDeFindForm.UrlEditButtonClick(Sender:TObject);
 begin
 	Url.Items.Text:=inputtextbox(self,Url,Url.Items.Text);
@@ -631,7 +853,7 @@
 	TreeClick(Sender);
 end;
 
-procedure TTextDeFindForm.NameChange(Sender:TObject);
+procedure TTextDeFindForm.ListNameChange(Sender:TObject);
 var
 	N,NN:TTreeNode;
 	s:string;
@@ -680,9 +902,9 @@
 	Text.Text:='';
 	N:=Tree.Items.GetFirstNode;
 	while N<>nil do begin
-		if N.Text=Name.Text then begin
+		if N.Text=ListName.Text then begin
 			childtext(N);
-			Inifile.readgrid('grid\'+Name.Text,TGrid(GridFiles));
+			Inifile.readgrid('grid\'+ListName.Text,TGrid(GridFiles));
 		end;
 		N:=N.getNextSibling;
 	end;
@@ -705,7 +927,7 @@
 	// Text.lines.Text:=
 	// Ini.ReadSectionValues(Name.Text,Text.lines);
 
-	pname:=Name.Text;
+	pname:=ListName.Text;
 end;
 
 procedure TTextDeFindForm.OpURLButtonClick(Sender:TObject);
@@ -757,9 +979,9 @@
 				snm:=findr(ExtractFileName(s));
 				if MatchesMask(snm,nm) then begin
 					Files.RowCount:=Files.RowCount+1;
-					Files.cells[CTEXT,Files.RowCount-1]:=Trim(ssss);
-					Files.cells[CPATH,Files.RowCount-1]:=ExtractFileDir(s);
-					Files.cells[CFILE,Files.RowCount-1]:=ExtractFileName(s);
+					Files.cells[NTEXT,Files.RowCount-1]:=Trim(ssss);
+					Files.cells[NPATH,Files.RowCount-1]:=ExtractFileDir(s);
+					Files.cells[NFILE,Files.RowCount-1]:=ExtractFileName(s);
 					hit:=true;
 				end;
 			end;
@@ -775,7 +997,7 @@
 
 		ls:=Text.Perform(EM_LINEFROMCHAR,Text.SelStart,0);
 		pathtext:=Path.Text;
-		pathtext:=pathtext.Replace('%リスト名%',Name.Text);
+		pathtext:=pathtext.Replace('%リスト名%',ListName.Text);
 		pathtext:=pathtext.Replace('%検索文字%',Text.lines[ls]);
 		pathtext:=INCBS(pathtext);
 		// snm:=ExtractFileName(Path.Text);
@@ -788,8 +1010,9 @@
 		// op := TSearchOption.soTopDirectoryOnly;
 		sa:=TDirectory.GetFiles(pathtext,snm,op);
 		Files.RowCount:=1;
-		Files.ColCount:=4;
-		Files.Rows[0].setstrings(['','検索文字','ファイル','パス']);
+		Files.ColCount:=CHEAD.count;
+		Files.Rows[0].setstrings(CHEAD);
+		PFileUpdateClick(Sender);
 
 		if Sender=Find then begin
 			ls:=0;
@@ -807,9 +1030,9 @@
 
 			if not hit then begin
 				Files.RowCount:=Files.RowCount+1;
-				Files.cells[CTEXT,Files.RowCount-1]:=Trim(ss);
-				Files.cells[CPATH,Files.RowCount-1]:='';
-				Files.cells[CFILE,Files.RowCount-1]:='';
+				Files.cells[NTEXT,Files.RowCount-1]:=Trim(ss);
+				Files.cells[NPATH,Files.RowCount-1]:='';
+				Files.cells[NFILE,Files.RowCount-1]:='';
 			end;
 		end;
 		Files.ColExpand(10);
@@ -839,7 +1062,7 @@
 		exit;
 
 	for i:=G.selection.top to G.selection.Bottom do begin
-		fn:=INCBS(G.cells[CPATH,i])+G.cells[CFILE,i];
+		fn:=INCBS(G.cells[NPATH,i])+G.cells[NFILE,i];
 
 		if not FileExists(fn) then
 			continue;
@@ -860,6 +1083,7 @@
 
 // --------------------------------------------------------------------------------
 
+
 procedure TGrid.copy(G:TGrid);
 var
 	r:TGridRect;
@@ -885,6 +1109,7 @@
 	self.Parent:=Origin.Parent;
 	self.Options:=Origin.Options;
 	self.OnSetEditText:=Origin.OnSetEditText;
+	self.OnSelectCell:=Origin.OnSelectCell;
 	self.OnMouseDown:=Origin.OnMouseDown;
 	self.OnMouseMove:=Origin.OnMouseMove;
 	buf:=TGrid.Create(self);
@@ -977,6 +1202,7 @@
 	Txt.Free;
 end;
 
+
 function TGrid.paste:TGridRect;
 var
 	i,j,si,colcnt:Integer;
@@ -1020,6 +1246,7 @@
 	Result:=TGridRect(rect(xs,ys,xs+xw,ys+yw));
 end;
 
+
 procedure TGrid.savebuf;
 begin
 	saverect:=selection;
@@ -1046,10 +1273,8 @@
 
 procedure TGrid.setfixed;
 begin
-	if ColCount>1 then
-		FixedCols:=1;
-	if RowCount>1 then
-		FixedRows:=1;
+	if ColCount>1 then 	FixedCols:=1;
+	if RowCount>1 then 	FixedRows:=1;
 end;
 
 function TGrid.load(fn:string):boolean;
@@ -1119,6 +1344,11 @@
 		func(0,i);
 end;
 
+function TGrid.seltext: string;
+begin
+	result:=cells[col,row];
+end;
+
 procedure TGrid.SetEditText(ACol,ARow:Integer;const Value:string);
 begin
 	inherited;
@@ -1134,6 +1364,7 @@
 
 end;
 
+
 procedure TGrid.KeyDown(var Key:Word;Shift:TShiftState);
 var
 	w:Word;
@@ -1188,6 +1419,7 @@
 	inherited;
 end;
 
+
 procedure TGrid.MouseMove(Shift:TShiftState;X,Y:Integer);
 var
 	DataObject:IDataObject;
@@ -1276,6 +1508,73 @@
 	Result:=w3+4;
 end;
 
+procedure TGrid.clear;
+begin
+	alldo(
+		procedure(X,Y:Integer)
+		begin
+			cells[X,Y]:='';
+		end);
+end;
+
+function TGrid.ColClear(X, cnt: Integer): Integer;
+var
+	i:Integer;
+begin
+	if (X<0) then
+		X:=0;
+	if X>=ColCount then
+		X:=ColCount;
+	for i:=0 to cnt-1 do
+		Cols[X+i].clear();
+	Result:=0
+
+end;
+
+function TGrid.ColDelete(X, cnt: Integer): Integer;
+var
+	i:Integer;
+	w:Integer;
+begin
+	Result:=0;
+	if cnt<0 then
+		exit;
+	if X<0 then
+		exit;
+	if X>=ColCount then
+		exit;
+	w:=ColCount-cnt;
+	for i:=X to w-1 do begin
+		Cols[i]:=Cols[i+cnt];
+		ColWidths[i]:=ColWidths[i+cnt];
+	end;
+	RowClear(w,cnt);
+	ColCount:=w;
+end;
+
+
+function TGrid.ColInsert(X, cnt: Integer): Integer;
+var
+	i:Integer;
+	lcnt:Integer;
+begin
+	if cnt<0 then
+		exit;
+	if (X<0)or(X>=ColCount) then
+		X:=ColCount;
+	ColCount:=ColCount+cnt;
+	lcnt:=ColCount;
+
+	for i:=lcnt-1 downto X+cnt do begin
+		Cols[i]:=Cols[i-cnt];
+		ColWidths[i]:=ColWidths[i-cnt];
+	end;
+	for i:=0 to cnt-1 do
+		Cols[X+i].clear();
+	Result:=0;
+end;
+
+
 function TGrid.RowDelete(Y,cnt:Integer):Integer;
 var
 	i:Integer;
@@ -1448,8 +1747,9 @@
 			G.Rows[Y].clear;
 		end);
 	G.RowCount:=1;
+	G.ColCount:=1;
 	for Y:=0 to MAXLIST do begin
-		for X:=0 to G.ColCount-1 do begin
+		for X:=0 to 10 do begin
 			s:=inttostr(Y)+','+inttostr(X);
 			if not ValueExists(sc,s) then
 				break;
@@ -1462,8 +1762,9 @@
 	end;
 	if G.RowCount<2 then
 		G.RowCount:=2;
-	G.FixedRows:=1;
-	G.Rows[0].setstrings(CHEAD);
+
+	//	G.Rows[0].setstrings(CHEAD);
+	G.setfixed;
 	G.ColExpand(10);
 end;