From: h677 <h677>
Date: Wed, 17 Nov 2004 16:19:19 +0000 (+0000)
Subject: HTMLを作っているところで、フォント等の設定の共通部分を関数化。
X-Git-Tag: v1_64_1_820~721
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=66f95586e31355ce7f79175619e505231d84fd6b;p=gikonavigoeson%2Fgikonavi.git

HTMLを作っているところで、フォント等の設定の共通部分を関数化。
---

diff --git a/GikoSystem.pas b/GikoSystem.pas
index d670537..e8da9a3 100644
--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -96,7 +96,7 @@ type
 
 //		FExitWrite: TStringList;
 //		function StrToFloatDef(s: string; Default: Double): Double;
-
+		function SetUserOptionalStyle(): string;
 	public
 		{ Public éŒ¾ }
 		FAbon : TAbon;
@@ -1086,27 +1086,7 @@ begin
 			boardPlugIn		:= ThreadItem.BoardPlugIn;
 			NewReceiveNo	:= ThreadItem.NewReceive;
 			// ƒtƒHƒ“ƒg‚âƒTƒCƒY‚̐ݒè
-			if Length( GikoSys.Setting.BrowserFontName ) > 0 then
-				UserOptionalStyle := UserOptionalStyle +
-								'font-family:"' + GikoSys.Setting.BrowserFontName + '";';
-			if GikoSys.Setting.BrowserFontSize <> 0 then
-				UserOptionalStyle := UserOptionalStyle +
-								'font-size:' + IntToStr( GikoSys.Setting.BrowserFontSize ) + 'pt;';
-			if GikoSys.Setting.BrowserFontColor <> -1 then
-				UserOptionalStyle := UserOptionalStyle +
-								'color:#' + IntToHex( GikoSys.Setting.BrowserFontColor, 6 ) + ';';
-			if GikoSys.Setting.BrowserBackColor <> -1 then
-				UserOptionalStyle := UserOptionalStyle +
-								'background-color:#' + IntToHex( GikoSys.Setting.BrowserBackColor, 6 ) + ';';
-			case GikoSys.Setting.BrowserFontBold of
-				-1: UserOptionalStyle := UserOptionalStyle + 'font-weight:normal;';
-				1: UserOptionalStyle := UserOptionalStyle + 'font-weight:bold;';
-			end;
-			case GikoSys.Setting.BrowserFontItalic of
-				-1: UserOptionalStyle := UserOptionalStyle + 'font-style:normal;';
-				1: UserOptionalStyle := UserOptionalStyle + 'font-style:italic;';
-			end;
-
+			UserOptionalStyle := SetUserOptionalStyle;
 			SaveList := TStringList.Create;
 			try
 				doc.open;
@@ -1221,27 +1201,7 @@ begin
 			doc.charset := 'Shift_JIS';
 
 			// ƒtƒHƒ“ƒg‚âƒTƒCƒY‚̐ݒè
-			if Length( GikoSys.Setting.BrowserFontName ) > 0 then
-				UserOptionalStyle := UserOptionalStyle +
-								'font-family:"' + GikoSys.Setting.BrowserFontName + '";';
-			if GikoSys.Setting.BrowserFontSize <> 0 then
-				UserOptionalStyle := UserOptionalStyle +
-								'font-size:' + IntToStr( GikoSys.Setting.BrowserFontSize ) + 'pt;';
-			if GikoSys.Setting.BrowserFontColor <> -1 then
-				UserOptionalStyle := UserOptionalStyle +
-								'color:#' + IntToHex( GikoSys.Setting.BrowserFontColor, 6 ) + ';';
-			if GikoSys.Setting.BrowserBackColor <> -1 then
-				UserOptionalStyle := UserOptionalStyle +
-								'background-color:#' + IntToHex( GikoSys.Setting.BrowserBackColor, 6 ) + ';';
-			case GikoSys.Setting.BrowserFontBold of
-				-1: UserOptionalStyle := UserOptionalStyle + 'font-weight:normal;';
-				1: UserOptionalStyle := UserOptionalStyle + 'font-weight:bold;';
-			end;
-			case GikoSys.Setting.BrowserFontItalic of
-				-1: UserOptionalStyle := UserOptionalStyle + 'font-style:normal;';
-				1: UserOptionalStyle := UserOptionalStyle + 'font-style:italic;';
-			end;
-
+			UserOptionalStyle := SetUserOptionalStyle;
 			CSSFileName := GetStyleSheetDir + Setting.CSSFileName;
 			if GikoSys.Setting.UseSkin then begin
 				// ƒXƒLƒ“Žg—p
@@ -1532,27 +1492,7 @@ begin
 			//===== ƒvƒ‰ƒOƒCƒ“‚É‚æ‚é•\Ž¦
 			boardPlugIn		:= ThreadItem.BoardPlugIn;
 			// ƒtƒHƒ“ƒg‚âƒTƒCƒY‚̐ݒè
-			if Length( GikoSys.Setting.BrowserFontName ) > 0 then
-				UserOptionalStyle := UserOptionalStyle +
-								'font-family:"' + GikoSys.Setting.BrowserFontName + '";';
-			if GikoSys.Setting.BrowserFontSize <> 0 then
-				UserOptionalStyle := UserOptionalStyle +
-								'font-size:' + IntToStr( GikoSys.Setting.BrowserFontSize ) + 'pt;';
-			if GikoSys.Setting.BrowserFontColor <> -1 then
-				UserOptionalStyle := UserOptionalStyle +
-								'color:#' + IntToHex( GikoSys.Setting.BrowserFontColor, 6 ) + ';';
-			if GikoSys.Setting.BrowserBackColor <> -1 then
-				UserOptionalStyle := UserOptionalStyle +
-								'background-color:#' + IntToHex( GikoSys.Setting.BrowserBackColor, 6 ) + ';';
-			case GikoSys.Setting.BrowserFontBold of
-				-1: UserOptionalStyle := UserOptionalStyle + 'font-weight:normal;';
-				1: UserOptionalStyle := UserOptionalStyle + 'font-weight:bold;';
-			end;
-			case GikoSys.Setting.BrowserFontItalic of
-				-1: UserOptionalStyle := UserOptionalStyle + 'font-style:normal;';
-				1: UserOptionalStyle := UserOptionalStyle + 'font-style:italic;';
-			end;
-
+			UserOptionalStyle := SetUserOptionalStyle;
 			try
 				// •¶ŽšƒR[ƒh‚̓vƒ‰ƒOƒCƒ“‚É”C‚¹‚é
 				// ƒwƒbƒ_
@@ -1607,27 +1547,7 @@ begin
 		end;
 		try
 			// ƒtƒHƒ“ƒg‚âƒTƒCƒY‚̐ݒè
-			if Length( GikoSys.Setting.BrowserFontName ) > 0 then
-				UserOptionalStyle := UserOptionalStyle +
-								'font-family:"' + GikoSys.Setting.BrowserFontName + '";';
-			if GikoSys.Setting.BrowserFontSize <> 0 then
-				UserOptionalStyle := UserOptionalStyle +
-								'font-size:' + IntToStr( GikoSys.Setting.BrowserFontSize ) + 'pt;';
-			if GikoSys.Setting.BrowserFontColor <> -1 then
-				UserOptionalStyle := UserOptionalStyle +
-								'color:#' + IntToHex( GikoSys.Setting.BrowserFontColor, 6 ) + ';';
-			if GikoSys.Setting.BrowserBackColor <> -1 then
-				UserOptionalStyle := UserOptionalStyle +
-								'background-color:#' + IntToHex( GikoSys.Setting.BrowserBackColor, 6 ) + ';';
-			case GikoSys.Setting.BrowserFontBold of
-				-1: UserOptionalStyle := UserOptionalStyle + 'font-weight:normal;';
-				1: UserOptionalStyle := UserOptionalStyle + 'font-weight:bold;';
-			end;
-			case GikoSys.Setting.BrowserFontItalic of
-				-1: UserOptionalStyle := UserOptionalStyle + 'font-style:normal;';
-				1: UserOptionalStyle := UserOptionalStyle + 'font-style:italic;';
-			end;
-
+			UserOptionalStyle := SetUserOptionalStyle;
 
 			if GikoSys.Setting.UseSkin then begin
 				// ƒXƒLƒ“Žg—p
@@ -1730,7 +1650,7 @@ begin
 					end;
 				end;
 				html.Append('<a name="bottom"></a>');
-				html.Append('</body></html>');
+				//html.Append('</body></html>');
 				html.Append('<a name="last"></a>');
 				html.Append('</body></html>');
 			end else begin
@@ -4019,6 +3939,26 @@ begin
 	end;
 
 end;
+function TGikoSys.SetUserOptionalStyle(): string;
+begin
+    Result := '';
+	if Length( GikoSys.Setting.BrowserFontName ) > 0 then
+		Result := 'font-family:"' + GikoSys.Setting.BrowserFontName + '";';
+	if GikoSys.Setting.BrowserFontSize <> 0 then
+		Result := Result + 'font-size:' + IntToStr( GikoSys.Setting.BrowserFontSize ) + 'pt;';
+	if GikoSys.Setting.BrowserFontColor <> -1 then
+		Result := Result + 'color:#' + IntToHex( GikoSys.Setting.BrowserFontColor, 6 ) + ';';
+	if GikoSys.Setting.BrowserBackColor <> -1 then
+		Result := Result + 'background-color:#' + IntToHex( GikoSys.Setting.BrowserBackColor, 6 ) + ';';
+	case GikoSys.Setting.BrowserFontBold of
+		-1: Result := Result + 'font-weight:normal;';
+		1:  Result := Result + 'font-weight:bold;';
+	end;
+	case GikoSys.Setting.BrowserFontItalic of
+		-1: Result := Result + 'font-style:normal;';
+		1:  Result := Result + 'font-style:italic;';
+	end;
+end;
 
 initialization
 	GikoSys := TGikoSys.Create;