OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision9 (tree)
Time2018-12-21 18:35:01
Authorkentamaken

Log Message

検索文字を全角化

Change Summary

Incremental Difference

--- textdefind.dproj (revision 8)
+++ textdefind.dproj (revision 9)
@@ -1,11 +1,11 @@
11 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22 <PropertyGroup>
33 <ProjectGuid>{820901DB-44AF-472B-9EA6-3ED43D388D71}</ProjectGuid>
4- <ProjectVersion>18.4</ProjectVersion>
4+ <ProjectVersion>18.5</ProjectVersion>
55 <FrameworkType>VCL</FrameworkType>
66 <MainSource>textdefind.dpr</MainSource>
77 <Base>True</Base>
8- <Config Condition="'$(Config)'==''">Release</Config>
8+ <Config Condition="'$(Config)'==''">Debug</Config>
99 <Platform Condition="'$(Platform)'==''">Win32</Platform>
1010 <TargetedPlatforms>1</TargetedPlatforms>
1111 <AppType>Application</AppType>
@@ -74,10 +74,10 @@
7474 <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
7575 <Debugger_RunParams>/IUV3</Debugger_RunParams>
7676 <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
77- <DCC_DebugDCUs>false</DCC_DebugDCUs>
78- <AppEnableHighDPI>true</AppEnableHighDPI>
7977 <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
8078 <DCC_RemoteDebug>false</DCC_RemoteDebug>
79+ <BT_BuildType>Debug</BT_BuildType>
80+ <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
8181 </PropertyGroup>
8282 <PropertyGroup Condition="'$(Cfg_2)'!=''">
8383 <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -86,10 +86,10 @@
8686 <DCC_DebugInformation>0</DCC_DebugInformation>
8787 </PropertyGroup>
8888 <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
89- <AppEnableHighDPI>true</AppEnableHighDPI>
9089 <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
9190 <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
9291 <VerInfo_Locale>1033</VerInfo_Locale>
92+ <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
9393 </PropertyGroup>
9494 <ItemGroup>
9595 <DelphiCompile Include="$(MainSource)">
@@ -120,16 +120,8 @@
120120 <Source Name="MainSource">textdefind.dpr</Source>
121121 </Source>
122122 <Excluded_Packages>
123- <Excluded_Packages Name="$(BDSBIN)\dclDBXDrivers250.bpl">Embarcadero ドライバ コンポーネント</Excluded_Packages>
124- <Excluded_Packages Name="$(BDSBIN)\dclDBXDriversInt250.bpl">Embarcadero Intro ドライバ コンポーネント</Excluded_Packages>
125- <Excluded_Packages Name="$(BDSBIN)\dcldbx250.bpl">Embarcadero dbExpress コンポーネント</Excluded_Packages>
126- <Excluded_Packages Name="$(BDSBIN)\dcldbxcds250.bpl">Embarcadero SimpleDataSet コンポーネント (DBX)</Excluded_Packages>
127- <Excluded_Packages Name="$(BDSBIN)\DataExplorerDBXPlugin250.bpl">dbExpress とデータ エクスプローラのインテグレーション</Excluded_Packages>
128- <Excluded_Packages Name="$(BDSBIN)\DataExplorerDBXPluginInt250.bpl">dbExpress InterBase とデータ エクスプローラのインテグレーション</Excluded_Packages>
129- <Excluded_Packages Name="$(BDSBIN)\dclbindcompdbx250.bpl">LiveBinding 式コンポーネント DbExpress</Excluded_Packages>
130- <Excluded_Packages Name="$(BDSBIN)\dclnetdb250.bpl">Embarcadero インターネット DB コンポーネント</Excluded_Packages>
131- <Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 オートメーション サーバー ラッパー コンポーネントのサンプル</Excluded_Packages>
132- <Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP オートメーション サーバー ラッパー コンポーネントのサンプル</Excluded_Packages>
123+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k260.bpl">Microsoft Office 2000 オートメーション サーバー ラッパー コンポーネントのサンプル</Excluded_Packages>
124+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp260.bpl">Microsoft Office XP オートメーション サーバー ラッパー コンポーネントのサンプル</Excluded_Packages>
133125 </Excluded_Packages>
134126 </Delphi.Personality>
135127 <Deployment Version="3">
@@ -148,7 +140,6 @@
148140 <Operation>1</Operation>
149141 </Platform>
150142 <Platform Name="Win32">
151- <RemoteDir>Contents\MacOS</RemoteDir>
152143 <Operation>0</Operation>
153144 </Platform>
154145 </DeployClass>
@@ -158,6 +149,12 @@
158149 <Operation>1</Operation>
159150 </Platform>
160151 </DeployClass>
152+ <DeployClass Name="AndroidFileProvider">
153+ <Platform Name="Android">
154+ <RemoteDir>res\xml</RemoteDir>
155+ <Operation>1</Operation>
156+ </Platform>
157+ </DeployClass>
161158 <DeployClass Name="AndroidGDBServer">
162159 <Platform Name="Android">
163160 <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
@@ -194,6 +191,12 @@
194191 <Operation>1</Operation>
195192 </Platform>
196193 </DeployClass>
194+ <DeployClass Name="AndroidSplashStylesV21">
195+ <Platform Name="Android">
196+ <RemoteDir>res\values-v21</RemoteDir>
197+ <Operation>1</Operation>
198+ </Platform>
199+ </DeployClass>
197200 <DeployClass Name="Android_DefaultAppIcon">
198201 <Platform Name="Android">
199202 <RemoteDir>res\drawable</RemoteDir>
@@ -272,6 +275,11 @@
272275 <Operation>1</Operation>
273276 <Extensions>.framework</Extensions>
274277 </Platform>
278+ <Platform Name="OSX64">
279+ <RemoteDir>Contents\MacOS</RemoteDir>
280+ <Operation>1</Operation>
281+ <Extensions>.framework</Extensions>
282+ </Platform>
275283 <Platform Name="Win32">
276284 <Operation>0</Operation>
277285 </Platform>
@@ -294,6 +302,11 @@
294302 <Operation>1</Operation>
295303 <Extensions>.dylib</Extensions>
296304 </Platform>
305+ <Platform Name="OSX64">
306+ <RemoteDir>Contents\MacOS</RemoteDir>
307+ <Operation>1</Operation>
308+ <Extensions>.dylib</Extensions>
309+ </Platform>
297310 <Platform Name="Win32">
298311 <Operation>0</Operation>
299312 <Extensions>.dll;.bpl</Extensions>
@@ -317,6 +330,11 @@
317330 <Operation>1</Operation>
318331 <Extensions>.dylib</Extensions>
319332 </Platform>
333+ <Platform Name="OSX64">
334+ <RemoteDir>Contents\MacOS</RemoteDir>
335+ <Operation>1</Operation>
336+ <Extensions>.dylib</Extensions>
337+ </Platform>
320338 <Platform Name="Win32">
321339 <Operation>0</Operation>
322340 <Extensions>.bpl</Extensions>
@@ -339,6 +357,10 @@
339357 <RemoteDir>Contents\Resources\StartUp\</RemoteDir>
340358 <Operation>0</Operation>
341359 </Platform>
360+ <Platform Name="OSX64">
361+ <RemoteDir>Contents\Resources\StartUp\</RemoteDir>
362+ <Operation>0</Operation>
363+ </Platform>
342364 <Platform Name="Win32">
343365 <Operation>0</Operation>
344366 </Platform>
@@ -475,11 +497,21 @@
475497 <Operation>1</Operation>
476498 </Platform>
477499 </DeployClass>
500+ <DeployClass Name="ProjectOSXDebug">
501+ <Platform Name="OSX64">
502+ <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
503+ <Operation>1</Operation>
504+ </Platform>
505+ </DeployClass>
478506 <DeployClass Name="ProjectOSXEntitlements">
479507 <Platform Name="OSX32">
480508 <RemoteDir>..\</RemoteDir>
481509 <Operation>1</Operation>
482510 </Platform>
511+ <Platform Name="OSX64">
512+ <RemoteDir>..\</RemoteDir>
513+ <Operation>1</Operation>
514+ </Platform>
483515 </DeployClass>
484516 <DeployClass Name="ProjectOSXInfoPList">
485517 <Platform Name="OSX32">
@@ -486,6 +518,10 @@
486518 <RemoteDir>Contents</RemoteDir>
487519 <Operation>1</Operation>
488520 </Platform>
521+ <Platform Name="OSX64">
522+ <RemoteDir>Contents</RemoteDir>
523+ <Operation>1</Operation>
524+ </Platform>
489525 </DeployClass>
490526 <DeployClass Name="ProjectOSXResource">
491527 <Platform Name="OSX32">
@@ -492,6 +528,10 @@
492528 <RemoteDir>Contents\Resources</RemoteDir>
493529 <Operation>1</Operation>
494530 </Platform>
531+ <Platform Name="OSX64">
532+ <RemoteDir>Contents\Resources</RemoteDir>
533+ <Operation>1</Operation>
534+ </Platform>
495535 </DeployClass>
496536 <DeployClass Required="true" Name="ProjectOutput">
497537 <Platform Name="Android">
@@ -514,6 +554,10 @@
514554 <RemoteDir>Contents\MacOS</RemoteDir>
515555 <Operation>1</Operation>
516556 </Platform>
557+ <Platform Name="OSX64">
558+ <RemoteDir>Contents\MacOS</RemoteDir>
559+ <Operation>1</Operation>
560+ </Platform>
517561 <Platform Name="Win32">
518562 <Operation>0</Operation>
519563 </Platform>
@@ -553,11 +597,13 @@
553597 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
554598 <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
555599 <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
600+ <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
556601 <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
557602 </Deployment>
558603 <Platforms>
559604 <Platform value="Win32">True</Platform>
560605 </Platforms>
606+ <ModelSupport>False</ModelSupport>
561607 </BorlandProject>
562608 <ProjectFileVersion>12</ProjectFileVersion>
563609 </ProjectExtensions>
--- textdefindunit.pas (revision 8)
+++ textdefindunit.pas (revision 9)
@@ -173,7 +173,7 @@
173173
174174 implementation
175175
176-uses strutils,IOUtils,masks,clipbrd,SHELLAPI,Vcl.FileCtrl;
176+uses strutils,IOUtils,masks,clipbrd,SHELLAPI,Vcl.FileCtrl,IdGlobal,IdURI;
177177
178178 var
179179 Malloc :IMalloc;
@@ -212,9 +212,33 @@
212212 if IsPathDelimiter(Result,Length(Result)) then SetLength(Result,Length(Result)-1);
213213 end;
214214
215+function zenkaku(Str : String) : String;//半角全角
216+var
217+　Buf:array [0 .. 1023] of Char;
218+begin
219+　LCMapString(GetUserDefaultLCID, LCMAP_FULLWIDTH, PChar(Str), Length(Str)+1, Buf, 1024);
220+　Result:=String(Buf);
221+end;
215222
223+function hankaku(Str : String) : String;//全角半角
224+var
225+　Buf:array [0 .. 1023] of Char;
226+begin
227+　LCMapString(GetUserDefaultLCID, LCMAP_HALFWIDTH, PChar(Str), Length(Str)+1, Buf, 1024);
228+　Result:=String(Buf);
229+end;
230+function hira(Str : String) : String; //カタカナひらがな
231+var
232+　Buf:array [0 .. 1023] of Char;
233+begin
234+　LCMapString(GetUserDefaultLCID, LCMAP_FULLWIDTH, PChar(Str), Length(Str)+1, Buf, 1024);
235+　Str:=String(Buf);
236+　LCMapString(GetUserDefaultLCID, LCMAP_HIRAGANA, PChar(Str), Length(Str)+1, Buf, 1024);
237+　Result:=String(Buf);
238+end;
216239
217240
241+
218242 procedure TTextDeFindForm.FormCreate(Sender:TObject);
219243 begin
220244 Ini:=TMemIniFile.Create(ChangeFileExt(Application.ExeName,'.ini'));
@@ -314,6 +338,16 @@
314338 var
315339 s,ss:string;
316340 ls,le,i,count:integer;
341+ function escape(url: String): String;
342+ var
343+ c,cc:Char;
344+ begin
345+ for c in ':/?#[]@!$&''()*+,;=' do begin
346+ url:=url.Replace(c,format('%%%x',[(Ord(c))]));
347+ end;
348+ result:=url;
349+ end;
350+
317351 begin
318352 urlrun:=not urlrun;
319353 // with GridFiles do begin
@@ -329,8 +363,8 @@
329363 Application.ProcessMessages;
330364 s:=Url.text;
331365 if s='' then continue;
332- s:=s.Replace('%リスト名%',Name.text);
333- s:=s.Replace('%検索文字%',ss);
366+ s:=s.Replace('%リスト名%',zenkaku(Name.text));
367+ s:=s.Replace('%検索文字%',zenkaku(ss));
334368 ShellExecute(Handle,'open',Pchar(s),'','',1);
335369 sleep(3000);
336370 end;
@@ -626,32 +660,6 @@
626660 ls,le,i,j,count:integer;
627661 pathtext:string;
628662
629-
630- function zenkaku(Str : String) : String;//半角全角
631- var
632- 　Buf:array [0 .. 1023] of Char;
633- begin
634- 　LCMapString(GetUserDefaultLCID, LCMAP_FULLWIDTH, PChar(Str), Length(Str)+1, Buf, 1024);
635- 　Result:=String(Buf);
636- end;
637-
638- function hankaku(Str : String) : String;//全角半角
639- var
640- 　Buf:array [0 .. 1023] of Char;
641- begin
642- 　LCMapString(GetUserDefaultLCID, LCMAP_HALFWIDTH, PChar(Str), Length(Str)+1, Buf, 1024);
643- 　Result:=String(Buf);
644- end;
645- function hira(Str : String) : String; //カタカナひらがな
646- var
647- 　Buf:array [0 .. 1023] of Char;
648- begin
649- 　LCMapString(GetUserDefaultLCID, LCMAP_FULLWIDTH, PChar(Str), Length(Str)+1, Buf, 1024);
650- 　Str:=String(Buf);
651- 　LCMapString(GetUserDefaultLCID, LCMAP_HIRAGANA, PChar(Str), Length(Str)+1, Buf, 1024);
652- 　Result:=String(Buf);
653- end;
654-
655663 function findr(s:string):string;
656664 begin
657665 s:=s.ToUpper;