Commit: 7 - textdefind (svn)

Commit MetaInfo

• Revision: 7 (tree)
• Time: 2018-12-17 12:29:53
• Author: kentamaken

Log Message

(empty log message)

Change Summary

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

Incremental Difference

--- textdefindunit.pas	(revision 6)
+++ textdefindunit.pas	(revision 7)
@@ -83,6 +83,8 @@
 		procedure writestrings(sc:string;sl:TStrings);
 		procedure readgrid(sc:string;G:TGrid);
 		procedure writegrid(sc:string;G:TGrid);
+		procedure readtreeview(sc:string;T:TTreeView);
+		procedure writetreeview(sc:string;T:TTreeView);
 	end;
 
 	TTextDeFindForm=class(TForm,IDropSource)
@@ -153,6 +155,7 @@
     procedure PathSelButtonClick(Sender: TObject);
     procedure GridFilesSetEditText(Sender: TObject; ACol, ARow: Integer;
       const Value: string);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
 	private
 		{ Private 宣言 }
 	public
@@ -177,10 +180,12 @@
 	FMouseDownPt:TPoint;
 	SL          :TStringDynArray;
 	Ini         :TMemIniFile;
+	Inifile     :TMemIniFile;
 	inidir      :string;
 	pname		:string;
 
 const
+	MAXLIST  =4096;
 	TKNMAXLEN=1024;
 	NULLNULL =#0#0;
 	CR       =#13;
@@ -209,9 +214,11 @@
 
 
 
+
 procedure TTextDeFindForm.FormCreate(Sender:TObject);
 begin
-	Ini:=TMemIniFile.Create(ChangeFileExt(Application.ExeName,'.INI'));
+	Ini:=TMemIniFile.Create(ChangeFileExt(Application.ExeName,'.ini'));
+	Inifile:=TMemIniFile.Create(ChangeFileExt(Application.ExeName,'.txt'));
 	inidir:=Ini.ReadString('','inidir',inidir);
 	OpenDialog.InitialDir:=ExtractFileDir(Application.ExeName);
 	SaveDialog.InitialDir:=ExtractFileDir(Application.ExeName);
@@ -224,18 +231,26 @@
 	Path.Text:=Ini.ReadString('','Path.Text','');
 	Url.Text:=Ini.ReadString('','Url.Text','');
 	Ini.readstrings('Url.Items',Url.Items);
+	Inifile.readtreeview('Tree',Tree);
 
 //	Files:=GridFiles;
 	Files:=TGrid.CreateEX(GridFiles);
 
-	Tree.LoadFromFile(ChangeFileExt(Application.ExeName,'.txt'));
-	NameChange(Sender);
-	pname:=Name.Text;
-	TreeClick(Sender);
+	try
+//		Tree.LoadFromFile(ChangeFileExt(Application.ExeName,'.txt'));
+		NameChange(Sender);
+		pname:=Name.Text;
+		TreeClick(Sender);
+	except
+		ShowMessage('ツリーテキストを読み込めませんでした');
+		Application.Terminate;
+	end;
 end;
 
-procedure TTextDeFindForm.FormDestroy(Sender:TObject);
+procedure TTextDeFindForm.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
+	if Application.Terminated then exit;
+
 	Ini.WriteInteger('','Width',Width);
 	Ini.WriteInteger('','Height',Height);
 	Ini.WriteInteger('','LeftPanel.Width',LeftPanel.Width);
@@ -245,11 +260,18 @@
 	Ini.writestrings('Url.Items',Url.Items);
 
 	NameChange(Sender);
-	Tree.SaveToFile(ChangeFileExt(Application.ExeName,'.txt'));
+	Inifile.writetreeview('Tree',Tree);
+//	Tree.SaveToFile(ChangeFileExt(Application.ExeName,'.txt'));
 
+	Ini.UpdateFile;
+	Inifile.UpdateFile;
+end;
 
-	Ini.UpdateFile;
+procedure TTextDeFindForm.FormDestroy(Sender:TObject);
+begin
+
 	Ini.Free;
+	Inifile.Free;
 
 end;
 
@@ -554,9 +576,9 @@
 
 			 NN.DeleteChildren;
 			 for s in Text.lines do
-				 Tree.Items.AddChild(NN,s);
+				 Tree.Items.AddChild(NN,Trim(s));
 
-			Ini.writegrid('grid\'+pname,TGrid(GridFiles));
+			Inifile.writegrid('grid\'+pname,TGrid(GridFiles));
 		end;
 
 	end;
@@ -566,7 +588,7 @@
 	while N<>nil do begin
 		if N.text=Name.text then begin
 			childtext(N);
-			Ini.readgrid('grid\'+Name.text,TGrid(GridFiles));
+			Inifile.readgrid('grid\'+Name.text,TGrid(GridFiles));
 		end;
 		N:=N.getNextSibling;
 	end;
@@ -602,6 +624,7 @@
 	sub   :boolean;
 	hit   :boolean;
 	ls,le,i,j,count:integer;
+	pathtext:string;
 
 
 	function zenkaku(Str : String) : String;//半角全角
@@ -679,7 +702,12 @@
 	try
 		Screen.Cursor:=crHourGlass;
 		Application.ProcessMessages;
-		Path.Text:=incbs(Path.Text);
+
+		ls:=Text.Perform(EM_LINEFROMCHAR,Text.SelStart, 0);
+		pathtext:=Path.Text;
+		pathtext:=pathtext.Replace('%リスト名%',Name.text);
+		pathtext:=pathtext.Replace('%検索文字%',Text.lines[ls]);
+		pathtext:=incbs(pathtext);
 //		snm:=ExtractFileName(Path.Text);
 //		if snm='' then
 		snm:='*';
@@ -688,7 +716,7 @@
 		op:=TSearchOption.soAllDirectories;
 		//		else
 		//			op := TSearchOption.soTopDirectoryOnly;
-		SA:=TDirectory.GetFiles(Path.Text,snm,op);
+		SA:=TDirectory.GetFiles(PathText,snm,op);
 		Files.RowCount:=1;
 		Files.ColCount:=4;
 		Files.Rows[0].setstrings(['','検索文字','ファイル','パス']);
@@ -696,7 +724,7 @@
 		if sender=Find then begin
 			ls:=0;
 			le:=Text.Lines.Count-1;
-		
+
 		end else begin
 			ls:=Text.Perform(EM_LINEFROMCHAR,Text.SelStart, 0);
 			le:=Text.Perform(EM_LINEFROMCHAR,Text.SelStart+Text.SelLength-1*integer(Text.SelLength>0),0);
@@ -1304,13 +1332,13 @@
 		G.rows[y].clear;
 	end);
 	G.rowcount:=1;
-	for y:=0 to 1024 do begin
+	for y:=0 to MAXLIST do begin
 		for x:=0 to G.ColCount-1 do begin
 			s:=inttostr(y)+','+inttostr(x);
-			if not ini.ValueExists(sc,s) then break;
+			if not ValueExists(sc,s) then break;
 			if x>=G.colcount then G.colcount:=x+1;
 			if y>=G.rowcount then G.rowcount:=y+1;
-			G.cells[x,y]:=Ini.ReadString(sc,inttostr(y)+','+inttostr(x),'');
+			G.cells[x,y]:=ReadString(sc,inttostr(y)+','+inttostr(x),'');
 		end;
 	end;
 	if G.rowcount<2 then G.rowcount:=2;
@@ -1321,11 +1349,11 @@
 
 procedure TMemIniFileHelper.writegrid(sc: string; G: TGrid);
 begin
-	Ini.EraseSection(sc);
+	EraseSection(sc);
 	G.alldo(procedure(X,Y:Integer)begin
-		Ini.WriteString(sc,inttostr(y)+','+inttostr(x),G.cells[x,y]);
+		WriteString(sc,inttostr(y)+','+inttostr(x),G.cells[x,y]);
 	end);
-	
+
 end;
 
 procedure TMemIniFileHelper.readstrings(sc: string; sl:TStrings);
@@ -1332,22 +1360,76 @@
 var i:integer;
 	s:string;
 begin
-  if ini.SectionExists(sc) then sl.clear;
-	for i:=0 to 1024 do begin
-		if not ini.ValueExists(sc,inttostr(i)) then break;
-		sl.add(Ini.ReadString(sc,inttostr(i),''));
+  if SectionExists(sc) then sl.clear;
+	for i:=0 to MAXLIST do begin
+		if not ValueExists(sc,inttostr(i)) then break;
+		sl.add(ReadString(sc,inttostr(i),''));
 	end;
 end;
 
 
+
 procedure TMemIniFileHelper.writestrings(sc: string; sl: TStrings);
 var i:integer;
 begin
-	Ini.EraseSection(sc);
+	EraseSection(sc);
 	for i:=0 to sl.Count-1 do
-		Ini.WriteString(sc,inttostr(i),sl[i]);
+		WriteString(sc,inttostr(i),sl[i]);
 end;
 
+procedure TMemIniFileHelper.readtreeview(sc: string; T: TTreeView);
+var
+	N:TTreeNode;
+	i:integer;
+	procedure sub(key:string;N:TTreeNode);
+	var i:integer;
+		k:string;
+	begin
+		for i:=0 to MAXLIST do begin
+			k:=key+','+inttostr(i);
+			if not ValueExists(sc,k) then break;
+			T.Items.AddChild(N,ReadString(sc,k,''));
+			sub(k,N);
+		end;
+	end;
+begin
+	if SectionExists(sc) then T.Items.clear;
+	for i:=0 to MAXLIST do begin
+		if not ValueExists(sc,inttostr(i)) then break;
+		N:=T.Items.Add(nil,ReadString(sc,inttostr(i),''));
+		sub(inttostr(i),N);
+	end;
+
+end;
+
+procedure TMemIniFileHelper.writetreeview(sc: string; T: TTreeView);
+var
+	N:TTreeNode;
+	i:integer;
+	procedure sub(key: string;N:TTreeNode);
+	var i:integer;
+	begin
+		N:=N.getFirstChild;
+		i:=0;
+		while N<>nil do begin
+			WriteString(sc,key+','+inttostr(N.index),N.text);
+			sub(sc,N);
+			N:=N.getNextSibling;
+			inc(i);
+		end;
+	end;
+begin
+	EraseSection(sc);
+	i:=0;
+	N:=T.Items.GetFirstNode;
+	while N<>nil do begin
+		WriteString(sc,inttostr(N.index),N.text);
+		sub(inttostr(N.index),N);
+		N:=N.getNextSibling;
+		inc(i);
+	end;
+end;
+
 initialization
 
 SHGetMalloc(Malloc);