Commit: 3 - textdefind (svn)

Commit MetaInfo

• Revision: 3 (tree)
• Time: 2018-12-09 00:45:20
• Author: kentamaken

Log Message

ドラッグ修正
リストのツリー化
検索文字列も表示

Change Summary

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

Incremental Difference

--- textdefind.dproj	(revision 2)
+++ textdefind.dproj	(revision 3)
@@ -72,6 +72,7 @@
         <DCC_RemoteDebug>true</DCC_RemoteDebug>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+        <Debugger_RunParams>/IUV3</Debugger_RunParams>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <DCC_DebugDCUs>false</DCC_DebugDCUs>
         <AppEnableHighDPI>true</AppEnableHighDPI>

--- textdefindunit.pas	(revision 2)
+++ textdefindunit.pas	(revision 3)
@@ -16,6 +16,10 @@
 
 	end;
 
+	TStringsHelper=class helper for TStrings
+		function setstrings(sa:TStringDynArray):Integer;
+	end;
+
 	TStringDynArrayHelper=record helper for TStringDynArray
 		function add(s:string):Integer;
 		function adduni(s:string):Integer;
@@ -76,7 +80,6 @@
 		Panel1:TPanel;
 		Path:TComboBox;
 		Find:TButton;
-		Text:TRichEdit;
 	GridFiles: TStringGrid;
 		PopupMenu2:TPopupMenu;
 		PFileCut:TMenuItem;
@@ -94,6 +97,14 @@
 		TMP:TComboBox;
 		SaveDialog:TSaveDialog;
 		OpenDialog:TOpenDialog;
+	Panel2: TPanel;
+	Name: TComboBox;
+	Text: TRichEdit;
+	Tree: TTreeView;
+	Button1: TButton;
+	Splitter1: TSplitter;
+    PFileExec: TMenuItem;
+    PFileFolder: TMenuItem;
 		procedure FindClick(Sender:TObject);
 		procedure FormCreate(Sender:TObject);
 		procedure GridFilesMouseDown(Sender:TObject;Button:TMouseButton;
@@ -109,6 +120,11 @@
 		procedure PTextSaveAsClick(Sender:TObject);
 		procedure PTextOpenClick(Sender:TObject);
 		procedure FormDestroy(Sender:TObject);
+	procedure NameChange(Sender: TObject);
+	procedure TreeClick(Sender: TObject);
+	procedure Button1Click(Sender: TObject);
+    procedure PFileFolderClick(Sender: TObject);
+	procedure PFileExecClick(Sender: TObject);
 	private
 		{ Private 宣言 }
 	public
@@ -117,17 +133,15 @@
 
 		function QueryContinueDrag(fEscapePressed:BOOL;grfKeyState:Longint):HResult;stdcall;
 		function GiveFeedback(dwEffect:Longint):HResult;stdcall;
+		function GetFilePathDataObject(G:TStringGrid):IDataObject;
 	end;
 
-
-	function GetFilePathDataObject(G:TStringGrid):IDataObject;
-
 var
 	TextDeFindForm:TTextDeFindForm;
 
 implementation
 
-uses strutils,IOUtils,masks,clipbrd,inifiles;
+uses strutils,IOUtils,masks,clipbrd,inifiles,SHELLAPI;
 
 var
 	Malloc      :IMalloc;
@@ -135,6 +149,7 @@
 	SL          :TStringDynArray;
 	Ini         :TIniFile;
 	inidir      :string;
+	pname		:string;
 
 const
 	TKNMAXLEN=1024;
@@ -143,9 +158,28 @@
 	LF       =#10;
 	CRLF     =#13#10;
 	TAB      =#9;
+	CTEXT    =1;
+	CFILE    =2;
+	CPATH    =3;
+var
+	CHEAD:TStringDynArray =['','テキスト','ファイル','パス'];
 
 {$R *.dfm}
 
+function INCBS(const s:string):string;
+begin
+	Result:=s;
+	if not IsPathDelimiter(Result,Length(Result)) then Result:=Result+'\';
+end;
+
+function EXCBS(const s:string):string;
+begin
+	Result:=s;
+	if IsPathDelimiter(Result,Length(Result)) then SetLength(Result,Length(Result)-1);
+end;
+
+
+
 procedure TTextDeFindForm.FormCreate(Sender:TObject);
 begin
 	Ini:=TIniFile.Create(ChangeFileExt(Application.ExeName,'.INI'));
@@ -158,10 +192,16 @@
 	Text.Width:=Ini.ReadInteger('','Text.Width',Text.Width);
 	Font.Size:=Ini.ReadInteger('','Font.Size',Font.Size);
 
+	Path.Text:=Ini.ReadString('','Path.Text','');
+
 //	Files:=GridFiles;
 	Files:=TGrid.CreateEX(GridFiles);
-	Text.lines.LoadFromFile(ChangeFileExt(Application.ExeName,'.txt'));
+
+	Tree.LoadFromFile(ChangeFileExt(Application.ExeName,'.txt'));
 	files.Load(ChangeFileExt(Application.ExeName,'.csv'));
+	NameChange(Sender);
+	pname:=Name.Text;
+	TreeClick(Sender);
 end;
 
 procedure TTextDeFindForm.FormDestroy(Sender:TObject);
@@ -170,9 +210,11 @@
 	Ini.WriteInteger('','Height',Height);
 	Ini.WriteInteger('','Text.Width',Text.Width);
 	Ini.WriteInteger('','Font.Size',Font.Size);
+	Ini.WriteString('','Path.Text',Path.Text);
 	Ini.Free;
 
-	Text.lines.SaveToFile(ChangeFileExt(Application.ExeName,'.txt'));
+	NameChange(Sender);
+	Tree.SaveToFile(ChangeFileExt(Application.ExeName,'.txt'));
 	files.save(ChangeFileExt(Application.ExeName,'.csv'));
 
 end;
@@ -192,6 +234,7 @@
 	else Result:=S_OK;
 end;
 
+
 function TTextDeFindForm.GiveFeedback(dwEffect:Longint):HResult;
 begin
 	//デフォルトのカーソルを使う
@@ -208,6 +251,19 @@
 	files.cutcopy(true);
 end;
 
+procedure TTextDeFindForm.PFileExecClick(Sender: TObject);
+begin
+	with GridFiles do
+	ShellExecute(Handle,'open',Pchar(INCBS(cells[CPATH,row])+cells[CFILE,row]),'','',1);
+end;
+
+procedure TTextDeFindForm.PFileFolderClick(Sender: TObject);
+begin
+	with GridFiles do
+	ShellExecute(Handle,'open',Pchar(INCBS(cells[CPATH,row])),'','',1);
+
+end;
+
 procedure TTextDeFindForm.PFileOpenClick(Sender:TObject);
 begin
 	OpenDialog.DefaultExt:='csv';
@@ -257,72 +313,138 @@
 
 end;
 
-function INCBS(const s:string):string;
-begin
-	Result:=s;
-	if not IsPathDelimiter(Result,Length(Result)) then Result:=Result+'\';
-end;
 
-function EXCBS(const s:string):string;
+
+function gridInRect(X,Y:Integer;const r:TGridRect):boolean;
 begin
-	Result:=s;
-	if IsPathDelimiter(Result,Length(Result)) then SetLength(Result,Length(Result)-1);
+	Result:=true;
+	if ((X<r.left)or(X>r.right)or(Y<r.top)or(Y>r.Bottom)) then Result:=false;
 end;
 
-function GetFilePathDataObject(G:TStringGrid):IDataObject;
+procedure TTextDeFindForm.GridFilesMouseDown(Sender:TObject;Button:TMouseButton;
+	Shift:TShiftState;X,Y:Integer);
 var
-	fDesktop,fTargetFolder:IShellFolder;
-	Filepidl              :packed array of PItemIDList;
-	Dirpidl               :PItemIDList;
-	pchEaten,dwAttributes :Cardinal;
-	Dir,FileName          :Widestring;
-	i,r,count             :Integer;
-	SourceFile            :string;
+	ACol,ARow:Longint;
+
 begin
-	Result:=nil;
+	Files.MouseToCell(X,Y,ACol,ARow);
+	if gridInRect(ACol,ARow,Files.selection) then exit;
+	Files.MouseToCell(X,Y,ACol,ARow);
 
-	count:=G.selection.Bottom-G.selection.top+1;
-	SetLength(Filepidl,count);
-	for i:=0 to count-1 do begin
-		r:=i+G.selection.top;
+end;
 
-		SourceFile:=INCBS(G.cells[2,r])+G.cells[1,r];
-		if not FileExists(SourceFile) then exit;
 
-		Dir:=ExtractFileDir(SourceFile);
-		FileName:=ExtractFileName(SourceFile);
+procedure TTextDeFindForm.TreeClick(Sender: TObject);
+var N:TTreeNode;
+ppname:string;
+i:integer;
 
-		SHGetDesktopFolder(fDesktop);
 
-		if Failed(fDesktop.ParseDisplayName(0,nil,PWideChar(Dir),pchEaten,Dirpidl,dwAttributes)) then exit;
-		if Failed(fDesktop.BindToObject(Dirpidl,nil,IID_IShellFolder,fTargetFolder)) then exit;
-		if Failed(fTargetFolder.ParseDisplayName(0,nil,PWideChar(FileName),pchEaten,Filepidl[i],dwAttributes)) then
-	end;
+begin
 
-	if count<1 then exit;
+	ppname:=Name.Text;
 
-	fTargetFolder.GetUIObjectOf(0,count,Filepidl[0],IDataObject,nil,Pointer(Result));
+
+//	for i:=Name.Items.Count-1 downto 1 do
+//		Name.Items.Delete(i);
+
+	Tmp.Clear;
+	N:=Tree.Items.GetFirstNode;
+	while N<>nil do begin
+		Tmp.Items.add(N.Text);
+		N:=N.getNextSibling;
+	end;
+	Name.Enabled:=false;
+	Name.Items.Text:=Tmp.Items.text;
+//	Name.ItemIndex:=-1;
+//	Name.Text:=ppname;
+	Name.ItemIndex:=Name.Items.IndexOf(ppname);
+//	Application.ProcessMessages;
+	Name.Enabled:=true;
 end;
 
-
-function gridInRect(X,Y:Integer;const r:TGridRect):boolean;
+procedure TTextDeFindForm.Button1Click(Sender: TObject);
 begin
-	Result:=true;
-	if ((X<r.left)or(X>r.right)or(Y<r.top)or(Y>r.Bottom)) then Result:=false;
+	TreeClick(Sender);
 end;
 
-procedure TTextDeFindForm.GridFilesMouseDown(Sender:TObject;Button:TMouseButton;
-	Shift:TShiftState;X,Y:Integer);
-var
-	ACol,ARow:Longint;
 
+procedure TTextDeFindForm.NameChange(Sender: TObject);
+var N,NN:TTreeNode;
+s:string;
+ function childtext(N:TTreeNode):string;
+ begin
+	N:=N.getFirstChild;
+	while N<>nil do begin
+		Text.Lines.add(N.Text);
+		N:=N.getNextSibling;
+	end;
+
+ end;
+
+
 begin
-	Files.MouseToCell(X,Y,ACol,ARow);
-	if gridInRect(ACol,ARow,Files.selection) then exit;
-	Files.MouseToCell(X,Y,ACol,ARow);
+	if Trim(pname)<>'' then begin
+		N:=Tree.Items.GetFirstNode;
+		NN:=nil;
+		while N<>nil do begin
+			if N.text=pname then begin
+				NN:=N;
+				break;
+			end;
+			N:=N.getNextSibling;
+		end;
+		if Trim(Text.lines.Text)='' then begin   //空ならリストから消す
+			if NN<>nil then begin
+				NN.Delete;
+				TreeClick(Sender);
+			end;
 
+		end else begin                           //空以外ならリストへ
+			if NN=nil then begin
+				NN:=Tree.Items.Add(nil,pname);
+				TreeClick(Sender);
+			end;
+
+			 NN.DeleteChildren;
+			 for s in Text.lines do
+				 Tree.Items.AddChild(NN,s);
+
+		end;
+
+	end;
+
+	Text.Text:='';
+	N:=Tree.Items.GetFirstNode;
+	while N<>nil do begin
+		if N.text=Name.text then begin
+			childtext(N);
+		end;
+		N:=N.getNextSibling;
+	end;
+
+
+
+
+
+//	if Trim(Text.lines.Text)<>'' then begin
+//		Ini.EraseSection(Name.Text);
+//
+//		Tmp.Items.LoadFromFile(Ini.FileName);
+//		Tmp.Items.Add('['+Name.Text+']');
+//		Tmp.Items.AddStrings(Text.Lines);
+//		Tmp.Items.SaveToFile(Ini.FileName);
+//
+//	end;
+//	Ini.ReadSection(Name.Text,Tmp.Items);
+//	Text.lines.Text:=Tmp.Items.Text;
+//	Text.lines.Text:=
+//	Ini.ReadSectionValues(Name.Text,Text.lines);
+
+	pname:=Name.Text;
 end;
 
+
 procedure TTextDeFindForm.FindClick(Sender:TObject);
 var
 	op    :TSearchOption;
@@ -330,14 +452,39 @@
 	s,ss  :string;
 	snm,nm:string;
 	sub   :boolean;
+
+	function hankaku(Str : String) : String;//全角半角
+	var
+	　Buf:array [0 .. 1023] of Char;
+	begin
+	　LCMapString(GetUserDefaultLCID, LCMAP_HALFWIDTH, PChar(Str), Length(Str)+1, Buf, 1024);
+	　Result:=String(Buf);
+	end;
+	function hira(Str : String) : String;      //カタカナひらがな
+	var
+	　Buf:array [0 .. 1023] of Char;
+	begin
+	　LCMapString(GetUserDefaultLCID, LCMAP_FULLWIDTH, PChar(Str), Length(Str)+1, Buf, 1024);
+	　Str:=String(Buf);
+	　LCMapString(GetUserDefaultLCID, LCMAP_HIRAGANA, PChar(Str), Length(Str)+1, Buf, 1024);
+	　Result:=String(Buf);
+	end;
+
+	function findr(s:string):string;
+	begin
+		s:=s.ToUpper;
+		s:=hankaku(s);
+		result:=s;
+	end;
 begin
 	try
 		Screen.Cursor:=crHourGlass;
 		Application.ProcessMessages;
+		Path.Text:=incbs(Path.Text);
+//		snm:=ExtractFileName(Path.Text);
+//		if snm='' then
+		snm:='*';
 
-		snm:=ExtractFileName(Path.Text);
-		if snm='' then snm:='*';
-
 		//		if sub then
 		op:=TSearchOption.soAllDirectories;
 		//		else
@@ -344,20 +491,22 @@
 		//			op := TSearchOption.soTopDirectoryOnly;
 		SA:=TDirectory.GetFiles(Path.Text,snm,op);
 		Files.RowCount:=1;
-		Files.ColCount:=3;
+		Files.ColCount:=4;
+		Files.Rows[0].setstrings(['','検索文字','ファイル','パス']);
 
 		for s in SA do begin
 			for ss in Text.lines do begin
-				nm:=Trim(ss);
+				nm:=Trim(findr(ss));
 				if nm='' then continue;
 
 				if Pos('*',nm)=0 then
 					if Pos('?',nm)=0 then nm:='*'+nm+'*';
-				snm:=ExtractFileName(s);
+				snm:=findr(ExtractFileName(s));
 				if MatchesMask(snm,nm) then begin
 					Files.RowCount:=Files.RowCount+1;
-					Files.cells[2,Files.RowCount-1]:=ExtractFileDir(s);
-					Files.cells[1,Files.RowCount-1]:=ExtractFileName(s);
+					Files.cells[CTEXT,Files.RowCount-1]:=(nm);
+					Files.cells[CPATH,Files.RowCount-1]:=ExtractFileDir(s);
+					Files.cells[CFILE,Files.RowCount-1]:=ExtractFileName(s);
 					break;
 				end;
 			end;
@@ -369,6 +518,52 @@
 	end;
 end;
 
+
+function TTextDeFindForm.GetFilePathDataObject(G:TStringGrid):IDataObject;
+var
+	fDesktop,fTargetFolder:IShellFolder;
+	Filepidl              :packed array of PItemIDList;
+	Dirpidl               :PItemIDList;
+	pchEaten,dwAttributes :Cardinal;
+	Dir,FileName          :Widestring;
+	i,r,count             :Integer;
+	SourceFile            :string;
+begin
+	Result:=nil;
+
+	count:=G.selection.Bottom-G.selection.top+1;
+	SetLength(Filepidl,count);
+	SHGetDesktopFolder(fDesktop);
+	if Failed(fDesktop.ParseDisplayName(0,nil,PWideChar(Path.text),pchEaten,Dirpidl,dwAttributes)) then exit;
+	if Failed(fDesktop.BindToObject(Dirpidl,nil,IID_IShellFolder,fTargetFolder)) then exit;
+
+
+	for i:=0 to count-1 do begin
+		r:=i+G.selection.top;
+
+		SourceFile:=INCBS(G.cells[CPATH,r])+G.cells[CFILE,r];
+		if not FileExists(SourceFile) then exit;
+
+		Dir:=ExtractFileDir(SourceFile);
+		FileName:=ExtractRelativePath(INCBS(Path.text),SourceFile);
+
+		if Failed(fTargetFolder.ParseDisplayName(0,nil,PWideChar(FileName),pchEaten,Filepidl[i],dwAttributes)) then exit;
+
+	end;
+
+	if count<1 then exit;
+
+	fTargetFolder.GetUIObjectOf(0,count,Filepidl[0],IDataObject,nil,Pointer(Result));
+end;
+
+
+
+//--------------------------------------------------------------------------------
+
+
+
+
+
 procedure TGrid.copy(G:TGrid);
 var
 	r:TGridRect;
@@ -546,7 +741,6 @@
 end;
 
 function TGrid.load(fn:string):boolean;
-const CHEAD=',ファイル,パス';
 var
 	i  :Integer;
 	TMP:TStringList;
@@ -566,8 +760,8 @@
 			Rows[i]:=TMP;
 		end;
 
-		ColCount:=SplitString(CHEAD,',').count;
-		Rows[0].CommaText:=CHEAD;
+		ColCount:=CHEAD.count;
+		Rows[0].setstrings(CHEAD);
 		setfixed;
 
 		savebuf;
@@ -645,6 +839,8 @@
 	inherited;
 end;
 
+
+
 procedure TGrid.MouseMove(Shift:TShiftState;X,Y:Integer);
 var
 	DataObject:IDataObject;
@@ -653,6 +849,8 @@
 	ACol,ARow :Longint;
 	savesel   :TGridRect;
 
+
+
 begin
 	MouseToCell(X,Y,ACol,ARow);
 	if not downinselection then begin
@@ -675,7 +873,7 @@
 		//BeginDrag(true);
 
 		//ファイル名からIDataObjectを取得
-		DataObject:=GetFilePathDataObject(Self);
+		DataObject:=TextDeFindForm.GetFilePathDataObject(Self);
 		//OLEドラッグ＆ドロップ開始
 		dwEffect:=DROPEFFECT_NONE;
 		DoDragDrop(DataObject,TextDeFindForm,DROPEFFECT_COPY,dwEffect);
@@ -859,6 +1057,18 @@
 end;
 
 //初期化処理
+{ TStringsHelper }
+
+function TStringsHelper.setstrings(sa: TStringDynArray): Integer;
+var i:integer;
+begin
+	for i:=0 to sa.Count-1 do
+		if i<Count then
+			Self[i]:=sa[i];
+
+
+end;
+
 initialization
 
 SHGetMalloc(Malloc);