Commit: 0b001560307e8af4a61674eb6c61a95caf6f4193 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: 0b001560307e8af4a61674eb6c61a95caf6f4193 (tree)
• Time: 2007-02-15 00:12:06
• Author: h677 <h677>
• Commiter: h677

Log Message

新ＮＧワードの試みを終了。

Change Summary

• modified: GikoDataModule.dfm
• modified: GikoDataModule.pas
• modified: HTMLCreate.pas
• modified: gikoNavi.dpr

Incremental Difference

--- a/GikoDataModule.dfm
+++ b/GikoDataModule.dfm
@@ -1315,7 +1315,6 @@ object GikoDM: TGikoDM
       Category = 'NGword'
       Caption = 'NG'#12527#12540#12489#32232#38598#12501#12457#12540#12512
       Hint = 'NG'#12527#12540#12489#32232#38598#12501#12457#12540#12512#12458#12540#12503#12531
-      OnExecute = NGWordEditFormActionExecute
     end
   end
   object ToobarImageList: TImageList

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -435,7 +435,6 @@ type
     procedure AllImageLinkToClipbordActionExecute(Sender: TObject);
     procedure SetForcusForAddresBarActionExecute(Sender: TObject);
     procedure NewBoardSearchActionExecute(Sender: TObject);
-    procedure NGWordEditFormActionExecute(Sender: TObject);
   private
 	{ Private éŒ¾ }
 	procedure ClearResFilter;
@@ -488,7 +487,7 @@ uses
 	GikoBayesian, About, ShellAPI,
 	RoundName, RoundData, Menus, ListViewUtils,
 	ThreadControl, GikoMessage, InputAssist,
-    DefaultFileManager, Forms, NewBoardURL, NGWordEdit;
+    DefaultFileManager, Forms, NewBoardURL;
 
 const
 	MSG_ERROR : string = 'ƒGƒ‰[';
@@ -4341,17 +4340,5 @@ begin
     end;
 end;
 
-procedure TGikoDM.NGWordEditFormActionExecute(Sender: TObject);
-var
-    form: TNGWordEditForm;
-begin
-    form := TNGWordEditForm.Create(Self);
-    try
-        form.ShowModal;
-    finally
-        form.Release;
-    end;
-end;
-
 end.
 

--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -100,7 +100,7 @@ var
 implementation
 
 uses
-    Trip, NGWordUnit;
+    Trip;
 
 const
 	URL_CHAR: string = '0123456789'
@@ -771,26 +771,17 @@ begin
 		end;
 
 		if (Trim(ReadList[i]) <> '') then begin
-
 			DivideStrLine(ReadList[i], @Res);
-{$IFDEF NEWNGWORD}
-            if (NGWordList.IsNG(@Res) = -1) then begin
-{$ENDIF}
-    			AddAnchorTag(@Res);
-	    		ConvRes(@Res, @ResLink);
-		    	Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
-
-			    if NewReceiveNo <= (i + 1) then
-				    // V’…ƒŒƒX
-    				html.Add(SkinedRes(SkinNewRes, @Res, IntToStr(i + 1)))
-	    		else
-		    		// ’ʏí‚̃ŒƒX
-			    	html.Add(SkinedRes(SkinRes, @Res, IntToStr(i + 1)));
-{$IFDEF NEWNGWORD}
-            end else begin
-                html.Add('<h4>‚ ‚ځ`‚ñ</h4>');
-            end;
-{$ENDIF}
+            AddAnchorTag(@Res);
+            ConvRes(@Res, @ResLink);
+            Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
+
+            if NewReceiveNo <= (i + 1) then
+                // V’…ƒŒƒX
+                html.Add(SkinedRes(SkinNewRes, @Res, IntToStr(i + 1)))
+            else
+                // ’ʏí‚̃ŒƒX
+                html.Add(SkinedRes(SkinRes, @Res, IntToStr(i + 1)));
 		end;
 
 		if ThreadItem.Kokomade = (i + 1) then begin
@@ -868,23 +859,15 @@ begin
 			if (Trim(ReadList[i]) <> '') then begin
 				No := IntToStr(i + 1);
 				DivideStrLine(ReadList[i], @Res);
-{$IFDEF NEWNGWORD}
-                if (NGWordList.IsNG(@Res) = -1) then begin
-{$ENDIF}
-                    AddAnchorTag(@Res);
-                    ConvRes(@Res, @ResLink);
-                    Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
-                    if Res.FMailTo = '' then
-                        html.Add(Format(FORMAT_NOMAIL, [No, No, No, Res.FName, Res.FDateTime, Res.FBody]))
-                    else if GikoSys.Setting.ShowMail then
-                        html.Add(Format(FORMAT_SHOWMAIL, [No, No, No, Res.FMailTo, Res.FName, Res.FMailTo, Res.FDateTime, Res.FBody]))
-                    else
-                        html.Add(Format(FORMAT_NOSHOW, [No, No, No, Res.FMailTo, Res.FName, Res.FDateTime, Res.FBody]));
-{$IFDEF NEWNGWORD}
-			    end else begin
-                    html.Add('<h4>‚ ‚ځ`‚ñ</h4>');
-                end;
-{$ENDIF}
+                AddAnchorTag(@Res);
+                ConvRes(@Res, @ResLink);
+                Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
+                if Res.FMailTo = '' then
+                    html.Add(Format(FORMAT_NOMAIL, [No, No, No, Res.FName, Res.FDateTime, Res.FBody]))
+                else if GikoSys.Setting.ShowMail then
+                    html.Add(Format(FORMAT_SHOWMAIL, [No, No, No, Res.FMailTo, Res.FName, Res.FMailTo, Res.FDateTime, Res.FBody]))
+                else
+                    html.Add(Format(FORMAT_NOSHOW, [No, No, No, Res.FMailTo, Res.FName, Res.FDateTime, Res.FBody]));
             end;
 			if ThreadItem.Kokomade = (i + 1) then begin
 				html.Add('<a name="koko"></a><div class="koko">ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</div>');
@@ -939,23 +922,15 @@ begin
 		if (Trim(ReadList[i]) <> '') then begin
 			No := IntToStr(i + 1);
 			DivideStrLine(ReadList[i], @Res);
-{$IFDEF NEWNGWORD}
-            if (NGWordList.IsNG(@Res) = -1) then begin
-{$ENDIF}
-			    AddAnchorTag(@Res);
-    			ConvRes(@Res, @ResLink);
-	    		Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
-		    	if Res.FMailTo = '' then
-			    	html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<font color="forestgreen"><b> ' + Res.FName + ' </b></font> “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
-    			else if GikoSys.Setting.ShowMail then
-	    			html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> [' + Res.FMailTo + '] “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
-		    	else
-			    	html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10);
-{$IFDEF NEWNGWORD}
-            end else begin
-                html.Add('<h4>‚ ‚ځ`‚ñ</h4>');
-            end;
-{$ENDIF}
+            AddAnchorTag(@Res);
+            ConvRes(@Res, @ResLink);
+            Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
+            if Res.FMailTo = '' then
+                html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<font color="forestgreen"><b> ' + Res.FName + ' </b></font> “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
+            else if GikoSys.Setting.ShowMail then
+                html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> [' + Res.FMailTo + '] “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
+            else
+                html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10);
         end;
 		if ThreadItem.Kokomade = (i + 1) then begin
 			html.Add('</dl>');
@@ -1002,9 +977,7 @@ begin
 						ReadList.LoadFromFile(FileName);
 						ReadList.EndUpdate;
 						GikoSys.FAbon.IndividualAbon(ReadList, ChangeFileExt(FileName,'.NG'));
-                        {$IFNDEF NEWNGWORD}
 						GikoSys.FAbon.Execute(ReadList);		//	 ‚ ‚ځ`‚ñ‚µ‚Ä
-                        {$ENDIF}
 						GikoSys.FSelectResFilter.Execute(ReadList); //ƒŒƒX‚̃tƒBƒ‹ƒ^ƒŠƒ“ƒO‚ð‚·‚é
 						if ThreadItem.Title = '' then begin
 							DivideStrLine(ReadList[0], @Res);

--- a/gikoNavi.dpr
+++ b/gikoNavi.dpr
@@ -75,10 +75,7 @@ uses
   DefaultFileManager in 'DefaultFileManager.pas',
   MoveHistoryItem in 'MoveHistoryItem.pas',
   SambaTimer in 'SambaTimer.pas',
-  HistoryList in 'HistoryList.pas',
-  NewBoardURL in 'NewBoardURL.pas' {NewBoardURLForm},
-  NGWordUnit in 'NGWordUnit.pas',
-  NGWordEdit in 'NGWordEdit.pas' {NGWordEditForm};
+  HistoryList in 'HistoryList.pas';
 
 {$R *.RES}
 {$R gikoResource.res}