• R/O
  • HTTP
  • 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

Revisión54480f1b089e2c733267533b56ebdd2f81e300b9 (tree)
Tiempo2007-07-25 04:12:35
Autorcvs2git <cvs2git>
Commitercvs2git

Log Message

This commit was manufactured by cvs2svn to create tag 'v1_56_0_714'.

Cambiar Resumen

Diferencia incremental

--- a/ExternalThreadItem.pas
+++ b/ExternalThreadItem.pas
@@ -316,13 +316,13 @@ begin
316316 if inIsNew then
317317 Result := CreateResultString( HTMLCreater.SkinedRes(
318318 HTMLCreater.LoadFromSkin(
319- GikoSys.GetSkinNewResFileName, threadItem, threadItem.Size
319+ GikoSys.Setting.GetSkinNewResFileName, threadItem, threadItem.Size
320320 ), @res, no
321321 ) )
322322 else
323323 Result := CreateResultString( HTMLCreater.SkinedRes(
324324 HTMLCreater.LoadFromSkin(
325- GikoSys.GetSkinResFileName, threadItem, threadItem.Size
325+ GikoSys.Setting.GetSkinResFileName, threadItem, threadItem.Size
326326 ), @res, no
327327 ) );
328328 end else if GikoSys.Setting.UseCSS then begin
@@ -395,7 +395,7 @@ begin
395395 try
396396 if GikoSys.Setting.UseSkin then begin
397397 // ƒXƒLƒ“
398- skinHeader := HTMLCreater.LoadFromSkin( GikoSys.GetSkinHeaderFileName, threadItem, threadItem.Size );
398+ skinHeader := HTMLCreater.LoadFromSkin( GikoSys.Setting.GetSkinHeaderFileName, threadItem, threadItem.Size );
399399 if Length( optionalHeader ) > 0 then
400400 skinHeader :=
401401 StringReplace( skinHeader, '</head>', optionalHeader + '</head><a name="top"></a>', [] );
@@ -451,7 +451,7 @@ begin
451451 try
452452 if GikoSys.Setting.UseSkin then begin
453453 // ƒXƒLƒ“
454- skinFooter := HTMLCreater.LoadFromSkin( GikoSys.GetSkinFooterFileName, threadItem, threadItem.Size );
454+ skinFooter := HTMLCreater.LoadFromSkin( GikoSys.Setting.GetSkinFooterFileName, threadItem, threadItem.Size );
455455 if Length( optionalFooter ) > 0 then
456456 skinFooter :=
457457 StringReplace( skinFooter, '</body>', optionalFooter + '</body>', [] );
--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -2283,7 +2283,7 @@ var
22832283 begin
22842284 URLs := TStringList.Create();
22852285 try
2286- fileName := GikoSys.GetAppDir + TABFILE;
2286+ fileName := ExtractFilePath(Application.ExeName) + TABFILE;
22872287 if FileExists(fileName) then begin
22882288 try
22892289 URLs.LoadFromFile(fileName);
--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -276,7 +276,7 @@ implementation
276276
277277 uses
278278 Giko, RoundData, Favorite, Registry, HTMLCreate, MojuUtils, Sort, YofUtils,
279- IniFiles, DateUtils, SkinFiles;
279+ IniFiles, DateUtils;
280280
281281 const
282282 FOLDER_INDEX_VERSION = '1.01';
@@ -480,37 +480,37 @@ end;
480480 //! Skin:ƒwƒbƒ_‚̃tƒ@ƒCƒ‹–¼
481481 function TGikoSys.GetSkinHeaderFileName: string;
482482 begin
483- Result := Setting.SkinFiles.GetSkinHeaderFileName;
483+ Result := Setting.GetSkinHeaderFileName;
484484 end;
485485
486486 //! Skin:ƒtƒbƒ^‚̃tƒ@ƒCƒ‹–¼
487487 function TGikoSys.GetSkinFooterFileName: string;
488488 begin
489- Result := Setting.SkinFiles.GetSkinFooterFileName;
489+ Result := Setting.GetSkinFooterFileName;
490490 end;
491491
492492 //! Skin:V’…ƒŒƒX‚̃tƒ@ƒCƒ‹–¼
493493 function TGikoSys.GetSkinNewResFileName: string;
494494 begin
495- Result := Setting.SkinFiles.GetSkinNewResFileName;
495+ Result := Setting.GetSkinNewResFileName;
496496 end;
497497
498498 //! Skin:”ñV’…ƒŒƒX‚̃tƒ@ƒCƒ‹–¼
499499 function TGikoSys.GetSkinResFileName: string;
500500 begin
501- Result := Setting.SkinFiles.GetSkinResFileName;
501+ Result := Setting.GetSkinResFileName;
502502 end;
503503
504504 //! Skin:‚µ‚¨‚è(‚±‚±‚Ü‚Å“Ç‚ñ‚¾)‚̃tƒ@ƒCƒ‹–¼
505505 function TGikoSys.GetSkinBookmarkFileName: string;
506506 begin
507- Result := Setting.SkinFiles.GetSkinBookmarkFileName;
507+ Result := Setting.GetSkinBookmarkFileName;
508508 end;
509509
510510 //! Skin:‚µ‚¨‚è(V’…ƒŒƒX)‚̃tƒ@ƒCƒ‹–¼
511511 function TGikoSys.GetSkinNewmarkFileName: string;
512512 begin
513- Result := Setting.SkinFiles.GetSkinNewmarkFileName;
513+ Result := Setting.GetSkinNewmarkFileName;
514514 end;
515515
516516 //! UserAgentŽæ“¾
--- a/InputAssist.pas
+++ b/InputAssist.pas
@@ -64,8 +64,7 @@ type
6464 FSortColumn : Integer;
6565 FInsertText : String;
6666 procedure AddListViewItem(ResWord : TResistWord);
67- procedure SetCategory(combo: TComboBox; selected: String);
68- function ValidateKey(key, category: String): boolean;
67+ procedure SetCategory(combo: TComboBox);
6968 public
7069 { Public éŒ¾ }
7170 procedure SetUpFromEditor();
@@ -144,35 +143,22 @@ procedure TInputAssistForm.AddButtonClick(Sender: TObject);
144143 var
145144 resWord : TResistWord;
146145 begin
147- if (ValidateKey(KeyNameEdit.Text, CategoryNameComboBox.Text)) then begin
146+ if (Length(KeyNameEdit.Text) = 0) then begin
147+ ShowMessage('ƒL[–¼‚ðÝ’肵‚Ä‚­‚¾‚³‚¢B');
148+ end else begin
148149 if (not InputAssistDM.IsDupulicate(
149150 KeyNameEdit.Text, CategoryNameComboBox.Text) ) then begin
150151 resWord := InputAssistDM.Add(KeyNameEdit.Text);
151152 resWord.SetCategory(CategoryNameComboBox.Text);
152153 resWord.SetText(TextMemo.Text);
153154 AddListViewItem(resWord);
154- SetCategory(CategoryNameComboBox, resWord.GetCategory);
155+ SetCategory(CategoryNameComboBox);
155156 GikoListView1.AlphaSort;
156157 end else begin
157158 ShowMessage('“¯ˆê‚̃L[–¼EƒJƒeƒSƒŠ–¼‚ÅŠù‚É“o˜^Ï‚Ý‚Å‚·B');
158159 end;
159160 end;
160161 end;
161-//! ƒL[–¼EƒJƒeƒSƒŠ—LŒøƒ`ƒFƒbƒN
162-function TInputAssistForm.ValidateKey(key, category: String): boolean;
163-begin
164- Result := True;
165- if (Length(key) = 0) then begin
166- ShowMessage('ƒL[–¼‚ðÝ’肵‚Ä‚­‚¾‚³‚¢B');
167- Result := False;
168- end else begin
169- if (Length(category) = 0) then begin
170- ShowMessage('ƒJƒeƒSƒŠ‚ðÝ’肵‚Ä‚­‚¾‚³‚¢B');
171- Result := False;
172- end;
173- end;
174-end;
175-
176162 //! íœƒ{ƒ^ƒ“‰Ÿ‰ºŽž‚̃Cƒxƒ“ƒg
177163 procedure TInputAssistForm.DeleteButtonClick(Sender: TObject);
178164 begin
@@ -188,21 +174,18 @@ var
188174 resWord : TResistWord;
189175 begin
190176 if GikoListView1.Selected <> nil then begin
191- if (ValidateKey(KeyNameEdit.Text, CategoryNameComboBox.Text)) then begin
192- if (not InputAssistDM.IsDupulicate(
193- KeyNameEdit.Text, CategoryNameComboBox.Text) ) then begin
194- resWord := TResistWord(GikoListView1.Selected.Data);
195- resWord.SetKey(KeyNameEdit.Text);
196- resWord.SetCategory(CategoryNameComboBox.Text);
197- resWord.SetText(TextMemo.Text);
198- // ˆê——‚̍XV
199- GikoListView1.Selected.Caption := resWord.GetKey;
200- GikoListView1.Selected.SubItems[0] := resWord.GetCategory;
201- SetCategory(CategoryNameComboBox, resWord.GetCategory);
202- GikoListView1.AlphaSort;
203- end else begin
204- ShowMessage('“¯ˆê‚̃L[–¼EƒJƒeƒSƒŠ–¼‚ÅŠù‚É“o˜^Ï‚Ý‚Å‚·B');
205- end;
177+ if (Length(KeyNameEdit.Text) = 0) then begin
178+ ShowMessage('ƒL[–¼‚𖳂µ‚É‚Í‚Å‚«‚Ü‚¹‚ñB');
179+ end else begin
180+ resWord := TResistWord(GikoListView1.Selected.Data);
181+ resWord.SetKey(KeyNameEdit.Text);
182+ resWord.SetCategory(CategoryNameComboBox.Text);
183+ resWord.SetText(TextMemo.Text);
184+ // ˆê——‚̍XV
185+ GikoListView1.Selected.Caption := resWord.GetKey;
186+ GikoListView1.Selected.SubItems[0] := resWord.GetCategory;
187+ SetCategory(CategoryNameComboBox);
188+ GikoListView1.AlphaSort;
206189 end;
207190 end;
208191 end;
@@ -309,10 +292,9 @@ begin
309292 LockWindowUpdate(0);
310293 end;
311294 //! ƒJƒeƒSƒŠƒRƒ“ƒ{ƒ{ƒbƒNƒXÝ’è
312-procedure TInputAssistForm.SetCategory(combo: TComboBox; selected: String);
295+procedure TInputAssistForm.SetCategory(combo: TComboBox);
313296 var
314297 cat : TStringList;
315- i : Integer;
316298 begin
317299 // ŒŸõ—p
318300 cat := TStringList.Create;
@@ -324,11 +306,6 @@ begin
324306 combo.Items.AddStrings(cat);
325307 combo.ItemIndex := 0;
326308 combo.Items.EndUpdate;
327- // ‘I‘ðÏ‚݂̃JƒeƒSƒŠ‚ɃCƒ“ƒfƒbƒNƒX‚ð•ÏX
328- i := combo.Items.IndexOf(selected);
329- if (i <> -1) then begin
330- combo.ItemIndex := i;
331- end;
332309 finally
333310 cat.Free;
334311 end;
@@ -344,9 +321,11 @@ begin
344321 FInsertText := '';
345322 CloseAction.ShortCut := TShortCut(0);
346323 // ’ljÁ—pƒL[“ü—ÍOK
347- SetCategory(CategoryNameComboBox, '');
324+ SetCategory(CategoryNameComboBox);
348325 end;
349326 procedure TInputAssistForm.SetUpFromEditor();
327+var
328+ cat : TStringList;
350329 begin
351330 Self.Caption := '“ü—̓AƒVƒXƒg';
352331 Panel3.Visible := False;
@@ -356,7 +335,7 @@ begin
356335 FInsertText := '';
357336 CloseAction.ShortCut := ShortCut(VK_ESCAPE, []);
358337 // ŒŸõ—p
359- SetCategory(CategoryComboBox, '');
338+ SetCategory(CategoryComboBox);
360339 end;
361340 function TInputAssistForm.GetInsertText(): String;
362341 begin
--- a/InputAssistDataModule.pas
+++ b/InputAssistDataModule.pas
@@ -408,6 +408,7 @@ end;
408408 function TInputAssistDM.IsDupulicate(Key: String; Category: String): Boolean;
409409 var
410410 i : Integer;
411+// resWord : TResistWord;
411412 begin
412413 // ‚±‚̃ƒ\ƒbƒh‚ł́Aƒ\[ƒgÏ‚Ý‚Æ‚ÍŒÀ‚ç‚È‚¢‚̂ŁA‘S‚ẴL[‚ð’Tõ‚µ‚Ä‚¢‚é
413414 Result := False;
--- a/Option.pas
+++ b/Option.pas
@@ -1283,7 +1283,7 @@ end;
12831283 function TOptionDialog.CheckFolder: Boolean;
12841284 begin
12851285 if Trim(LogFolderEdit.Text) = '' then
1286- LogFolderEdit.Text := GikoSys.GetAppDir + 'Log';
1286+ LogFolderEdit.Text := ExtractFilePath(Application.ExeName) + 'Log';
12871287
12881288 if DirectoryExists(LogFolderEdit.Text) then begin
12891289 Result := True;
--- a/Setting.pas
+++ b/Setting.pas
@@ -5,7 +5,7 @@ interface
55
66 uses
77 SysUtils, Classes, Graphics, Forms, {Math, IniFiles, UCryptAuto, UBase64,}
8- ComCtrls, GestureModel, IniFiles, SkinFiles;
8+ ComCtrls, GestureModel, IniFiles;
99
1010 const
1111 MAIN_COOLBAND_COUNT = 4; //ƒƒCƒ“CoolBand‚̐”
@@ -232,6 +232,8 @@ type
232232 FListViewNo: Boolean;
233233 //CSS•\Ž¦
234234 FUseCSS: Boolean;
235+ //CSSƒtƒ@ƒCƒ‹–¼
236+ FCSSFileName: string;
235237 // ƒXƒLƒ“•\Ž¦(ˆêŽž“I‚È‚à‚Ì‚Å ini ‚É•Û‘¶‚Í‚³‚ê‚È‚¢)
236238 FUseSkin: Boolean;
237239 //‚©‚¿‚ã`‚µ‚á—p‚ÌSkin‚ð—˜—p‚·‚é‚©
@@ -448,8 +450,6 @@ type
448450 FSentIniFileSize: Integer;
449451 //! ƒŠƒ“ƒNURLŽæ“¾‚̑Ώۊg’£Žq
450452 FExtList: String;
451- //! SkinŠÖ˜A
452- FSkinFiles: TSkinFiles;
453453 function GetMainCoolSet(Index: Integer): TCoolSet;
454454 function GetBoardCoolSet(Index: Integer): TCoolSet;
455455 function GetBrowserCoolSet(Index: Integer): TCoolSet;
@@ -475,7 +475,6 @@ type
475475
476476 procedure SetUseCSS( value: Boolean );
477477 procedure SetCSSFileName( fileName: string );
478- function GetCSSFileName: string;
479478 //! ƒvƒƒLƒVÝ’è“ǂݍž‚Ý
480479 procedure ReadProxySettings(memIni: TMemIniFile);
481480 //! ŠeŽíƒEƒBƒ“ƒhƒEÝ’è“ǂݍž‚Ý
@@ -512,6 +511,12 @@ type
512511 function GetSentFileName: string;
513512 function GetConfigDir: string;
514513 function GetSkinDir: string;
514+ function GetSkinHeaderFileName: string;
515+ function GetSkinFooterFileName: string;
516+ function GetSkinResFileName: string;
517+ function GetSkinNewResFileName: string;
518+ function GetSkinBookmarkFileName: string;
519+ function GetSkinNewmarkFileName: string;
515520 function GetStyleSheetDir: string;
516521 function GetOutBoxFileName: string;
517522 function GetNGWordsDir: string;
@@ -640,7 +645,7 @@ type
640645
641646 property ListViewNo: Boolean read FListViewNo write FListViewNo;
642647 property UseCSS: Boolean read FUseCSS write SetUseCSS;
643- property CSSFileName: string read GetCSSFileName write SetCSSFileName;
648+ property CSSFileName: string read FCSSFileName write SetCSSFileName;
644649 property UseKatjushaType : Boolean read FUseKatjushaType write FUseKatjushaType;
645650 property UseSkin: Boolean read FUseSkin;
646651
@@ -805,8 +810,6 @@ type
805810 property SentIniFileSize: Integer read FSentIniFileSize write FSentIniFileSize;
806811 //! ƒŠƒ“ƒNURLŽæ“¾‚̑Ώۊg’£Žq
807812 property ExtList: String read FExtList write FExtList;
808- //! Skinƒtƒ@ƒCƒ‹ŠÇ—
809- property SkinFiles: TSkinFiles read FSkinFiles;
810813
811814 end;
812815
@@ -827,6 +830,12 @@ const
827830 CONFIG_DIR_NAME = 'config';
828831 CSS_DIR_NAME = 'css';
829832 SKIN_DIR_NAME = 'skin';
833+ SKIN_HEADER_FILE_NAME = 'Header.html';
834+ SKIN_FOOTER_FILE_NAME = 'Footer.html';
835+ SKIN_NEWRES_FILE_NAME = 'NewRes.html';
836+ SKIN_RES_FILE_NAME = 'Res.html';
837+ SKIN_BOOKMARK_FILE_NAME = 'Bookmark.html';
838+ SKIN_NEWMARK_FILE_NAME = 'Newmark.html';
830839 NGWORDs_DIR_NAME : String = 'NGwords';
831840 BOARD_PLUGIN_DIR_NAME = 'BoardPlugin';
832841 SAMBATIME_FILE_NAME : String = 'Samba.ini';
@@ -960,7 +969,6 @@ begin
960969 FCategoryColumnOrder := TGikoCategoryColumnList.Create;
961970 FBoardColumnOrder := TGikoBoardColumnList.Create;
962971 FGestures := TGestureModel.Create;
963- FSkinFiles := TSkinFiles.Create;
964972 FNameList.Duplicates := dupIgnore;
965973 FMailList.Duplicates := dupIgnore;
966974 FBoardURLs.Duplicates := dupIgnore;
@@ -986,13 +994,13 @@ end;
986994 //‰Šú‰»ƒtƒ@ƒCƒ‹–¼Žæ“¾iƒpƒX{ƒtƒ@ƒCƒ‹–¼j
987995 function TSetting.GetFileName(): string;
988996 begin
989- Result := GetAppDir + INI_FILE_NAME;
997+ Result := ExtractFilePath(Application.ExeName) + INI_FILE_NAME;
990998 end;
991999
9921000 //”XV—pURLÝ’èƒtƒ@ƒCƒ‹–¼iƒpƒX{ƒtƒ@ƒCƒ‹–¼j
9931001 function TSetting.GetBoardURLFileName(): string;
9941002 begin
995- Result := GetAppDir + BOARD_URL_INI_FILE_NAME;
1003+ Result := ExtractFilePath(Application.ExeName) + BOARD_URL_INI_FILE_NAME;
9961004 end;
9971005
9981006 //Ý’èƒtƒ@ƒCƒ‹“Ǎž
@@ -1120,7 +1128,7 @@ begin
11201128 //ResAnchorjamp
11211129 ResAnchorJamp := ini.ReadBool('Function', 'ResAnchoJamp', True);
11221130 //ƒƒOƒtƒHƒ‹ƒ_
1123- LogFolder := ini.ReadString('Folder', 'LogFolder', GetAppDir + 'Log');
1131+ LogFolder := ini.ReadString('Folder', 'LogFolder', ExtractFilePath(Application.ExeName) + 'Log');
11241132 NewLogFolder := '';
11251133
11261134 //”ÂURL
@@ -1193,7 +1201,7 @@ begin
11931201 SoundFileName[i] := '';
11941202 end;
11951203 end else begin
1196- s := GetAppDir + '\sound\';
1204+ s := ExtractFileDir(Application.ExeName) + '\sound\';
11971205 SoundFileName[0] := s + 'Žæ“¾¬Œ÷.wav';
11981206 SoundFileName[1] := s + 'Žæ“¾¬Œ÷(·•ª).wav';
11991207 SoundFileName[2] := s + '–¢XV.wav';
@@ -1474,7 +1482,7 @@ begin
14741482 //‚©‚µ‚ã`‚µ‚á‚̃XƒLƒ“‚ðŽg‚¤‚©
14751483 ini.WriteBool('CSS', 'UseKatjushaType', FUseKatjushaType);
14761484 //CSSƒtƒ@ƒCƒ‹–¼
1477- ini.WriteString('CSS', 'FileName', FSkinFiles.FileName);
1485+ ini.WriteString('CSS', 'FileName', FCSSFileName);
14781486 //Mail—“•\Ž¦
14791487 ini.WriteBool('Thread', 'ShowMail', FShowMail);
14801488 // ƒŒƒX•\Ž¦”͈Í
@@ -1719,7 +1727,7 @@ var
17191727 begin
17201728 ini := TMemIniFile.Create(GetFileName());
17211729 try
1722- if GetAppDir + 'Log' = NewLogFolder then
1730+ if ExtractFilePath(Application.ExeName) + 'Log' = NewLogFolder then
17231731 ini.DeleteKey('Folder', 'LogFolder')
17241732 else
17251733 ini.WriteString('Folder', 'LogFolder', NewLogFolder);
@@ -1961,7 +1969,7 @@ end;
19611969 *************************************************************************)
19621970 function TSetting.GetBoardFileName: string;
19631971 begin
1964- Result := GetConfigDir + BOARD_FILE_NAME;
1972+ Result := GetAppDir + CONFIG_DIR_NAME + '\' + BOARD_FILE_NAME;
19651973 end;
19661974
19671975 (*************************************************************************
@@ -1969,15 +1977,15 @@ end;
19691977 *************************************************************************)
19701978 function TSetting.GetCustomBoardFileName: string;
19711979 begin
1972- Result := GetConfigDir + CUSTOMBOARD_FILE_NAME;
1980+ Result := GetAppDir + CONFIG_DIR_NAME + '\' + CUSTOMBOARD_FILE_NAME;
19731981 end;
19741982
19751983 (*************************************************************************
1976- *ƒ{[ƒhƒfƒBƒŒƒNƒgƒŠŽæ“¾(\‚ŏI‚í‚é)
1984+ *ƒ{[ƒhƒfƒBƒŒƒNƒgƒŠŽæ“¾
19771985 *************************************************************************)
19781986 function TSetting.GetBoardDir: string;
19791987 begin
1980- Result := IncludeTrailingPathDelimiter(GetConfigDir + BOARD_DIR_NAME);
1988+ Result := GetAppDir + CONFIG_DIR_NAME + '\' + BOARD_DIR_NAME + '\';
19811989 end;
19821990
19831991 (*************************************************************************
@@ -1990,7 +1998,7 @@ end;
19901998
19911999
19922000 (*************************************************************************
1993- *ŽÀsƒtƒ@ƒCƒ‹ƒtƒHƒ‹ƒ_Žæ“¾(ÅŒã‚É\‚ª‚ ‚é)
2001+ *ŽÀsƒtƒ@ƒCƒ‹ƒtƒHƒ‹ƒ_Žæ“¾
19942002 *************************************************************************)
19952003 function TSetting.GetAppDir: string;
19962004 begin
@@ -2022,36 +2030,58 @@ begin
20222030 end;
20232031
20242032 (*************************************************************************
2025- *ConfigƒtƒHƒ‹ƒ_Žæ“¾(\‚ŏI‚í‚é)
2033+ *ConfigƒtƒHƒ‹ƒ_Žæ“¾
20262034 *************************************************************************)
20272035 function TSetting.GetConfigDir: string;
20282036 begin
20292037 Result := IncludeTrailingPathDelimiter(GetAppDir + CONFIG_DIR_NAME);
20302038 end;
2031-(*************************************************************************
2032- *CSSƒtƒHƒ‹ƒ_Žæ“¾(\‚ŏI‚í‚é)
2033- *************************************************************************)
2039+
20342040 function TSetting.GetStyleSheetDir: string;
20352041 begin
20362042 Result := IncludeTrailingPathDelimiter(GetConfigDir + CSS_DIR_NAME);
20372043 end;
2038-(*************************************************************************
2039- *skinƒtƒHƒ‹ƒ_Žæ“¾(\‚ŏI‚í‚é)
2040- *************************************************************************)
2044+
20412045 function TSetting.GetSkinDir: string;
20422046 begin
20432047 Result := IncludeTrailingPathDelimiter(GetConfigDir + SKIN_DIR_NAME);
20442048 end;
2045-(*************************************************************************
2046- *NGƒ[ƒhƒfƒBƒŒƒNƒgƒŠŽæ“¾(\‚ŏI‚í‚é)
2047- *************************************************************************)
2049+
2050+function TSetting.GetSkinHeaderFileName: string;
2051+begin
2052+ Result := CSSFileName + SKIN_HEADER_FILE_NAME;
2053+end;
2054+
2055+function TSetting.GetSkinFooterFileName: string;
2056+begin
2057+ Result := CSSFileName + SKIN_FOOTER_FILE_NAME;
2058+end;
2059+
2060+function TSetting.GetSkinNewResFileName: string;
2061+begin
2062+ Result := CSSFileName + SKIN_NEWRES_FILE_NAME;
2063+end;
2064+
2065+function TSetting.GetSkinResFileName: string;
2066+begin
2067+ Result := CSSFileName + SKIN_RES_FILE_NAME;
2068+end;
2069+
2070+function TSetting.GetSkinBookmarkFileName: string;
2071+begin
2072+ Result := CSSFileName + SKIN_BOOKMARK_FILE_NAME;
2073+end;
2074+
2075+function TSetting.GetSkinNewmarkFileName: string;
2076+begin
2077+ Result := CSSFileName + SKIN_NEWMARK_FILE_NAME;
2078+end;
2079+
20482080 function TSetting.GetNGWordsDir: string;
20492081 begin
20502082 Result := IncludeTrailingPathDelimiter(GetConfigDir + NGWORDs_DIR_NAME);
20512083 end;
2052-(*************************************************************************
2053- *Boardƒvƒ‰ƒOƒCƒ“ƒfƒBƒŒƒNƒgƒŠŽæ“¾(\‚ŏI‚í‚é)
2054- *************************************************************************)
2084+
20552085 function TSetting.GetBoardPlugInDir: string;
20562086 begin
20572087 Result := IncludeTrailingPathDelimiter(GetConfigDir + BOARD_PLUGIN_DIR_NAME);
@@ -2065,25 +2095,24 @@ begin
20652095 // ƒRƒR‚Å‚Ì”»’è‚Å‚à‘啶Žš¬•¶Žš‚̈Ⴂ‚Í–³Ž‹‚·‚éB
20662096 FUseSkin :=
20672097 UseCSS and
2068- (Pos( AnsiLowerCase(GetSkinDir), AnsiLowerCase(FSkinFiles.FileName) ) > 0) and
2069- FileExists( FSkinFiles.GetSkinHeaderFileName );
2098+ (Pos( AnsiLowerCase(GetSkinDir), AnsiLowerCase(CSSFileName) ) > 0) and
2099+ FileExists( GetSkinHeaderFileName );
20702100
20712101 end;
20722102
20732103 procedure TSetting.SetCSSFileName( fileName: string );
20742104 begin
2075- FSkinFiles.FileName := fileName;
2105+
2106+ FCSSFileName := fileName;
20762107 // Windows“I‚Ƀtƒ@ƒCƒ‹ƒpƒX‚̑啶Žš¬•¶Žš‚̈Ⴂ‚Í–³Ž‹‚³‚ê‚é‚̂ŁA
20772108 // ƒRƒR‚Å‚Ì”»’è‚Å‚à‘啶Žš¬•¶Žš‚̈Ⴂ‚Í–³Ž‹‚·‚éB
20782109 FUseSkin :=
20792110 UseCSS and
2080- (Pos( AnsiLowerCase(GetSkinDir), AnsiLowerCase(FSkinFiles.FileName) ) > 0) and
2081- FileExists( FSkinFiles.GetSkinHeaderFileName );
2111+ (Pos( AnsiLowerCase(GetSkinDir), AnsiLowerCase(CSSFileName) ) > 0) and
2112+ FileExists( GetSkinHeaderFileName );
20822113
20832114 end;
2084-(*************************************************************************
2085- *sambaÝ’èƒtƒ@ƒCƒ‹–¼Žæ“¾
2086- *************************************************************************)
2115+
20872116 function TSetting.GetSambaFileName: string;
20882117 begin
20892118 Result := GetAppDir + SAMBATIME_FILE_NAME;
@@ -2364,11 +2393,5 @@ begin
23642393 end;
23652394 end;
23662395 end;
2367-
2368-function TSetting.GetCSSFileName: string;
2369-begin
2370- Result := FSkinFiles.FileName;
2371-end;
2372-
23732396 end.
23742397
--- a/SkinFiles.pas
+++ /dev/null
@@ -1,86 +0,0 @@
1-unit SkinFiles;
2-
3-interface
4-
5-uses
6- SysUtils, Classes, ComCtrls;
7-
8-type
9- TSkinFiles = class(TObject)
10- private
11- FFileName: String;
12- procedure SetFileName(AFileName: string);
13- public
14- //! ƒXƒLƒ“ƒtƒ@ƒCƒ‹ƒpƒX
15- property FileName:String read FFileName write SetFileName;
16- //! ƒwƒbƒ_‚̃tƒ@ƒCƒ‹–¼
17- function GetSkinHeaderFileName: string;
18- //! ƒtƒbƒ^‚̃tƒ@ƒCƒ‹–¼
19- function GetSkinFooterFileName: string;
20- //! V’…ƒŒƒX‚̃tƒ@ƒCƒ‹–¼
21- function GetSkinNewResFileName: string;
22- //! ”ñV’…ƒŒƒX‚̃tƒ@ƒCƒ‹–¼
23- function GetSkinResFileName: string;
24- //! ‚µ‚¨‚è(‚±‚±‚Ü‚Å“Ç‚ñ‚¾)‚̃tƒ@ƒCƒ‹–¼
25- function GetSkinBookmarkFileName: string;
26- //! ‚µ‚¨‚è(V’…ƒŒƒX)‚̃tƒ@ƒCƒ‹–¼
27- function GetSkinNewmarkFileName: string;
28- end;
29-
30-implementation
31-
32-const
33- SKIN_HEADER_FILE_NAME = 'Header.html';
34- SKIN_FOOTER_FILE_NAME = 'Footer.html';
35- SKIN_NEWRES_FILE_NAME = 'NewRes.html';
36- SKIN_RES_FILE_NAME = 'Res.html';
37- SKIN_BOOKMARK_FILE_NAME = 'Bookmark.html';
38- SKIN_NEWMARK_FILE_NAME = 'Newmark.html';
39-
40-//! ƒXƒLƒ“ƒtƒ@ƒCƒ‹–¼Ý’è
41-procedure TSkinFiles.SetFileName(AFileName: string);
42-begin
43- // ƒfƒBƒŒƒNƒgƒŠ‚̏ꍇÅŒã‚É\‚ŏI‚í‚ç‚·
44- if DirectoryExists(AFileName) then begin
45- // \ ‚ŏI‚í‚é‚悤‚É‚·‚é
46- FFileName := IncludeTrailingPathDelimiter(AFileName);
47- end else begin
48- FFileName := AFileName;
49- end;
50-end;
51-//! Skin:ƒwƒbƒ_‚̃tƒ@ƒCƒ‹–¼
52-function TSkinFiles.GetSkinHeaderFileName: string;
53-begin
54- Result := FFileName + SKIN_HEADER_FILE_NAME;
55-end;
56-
57-//! Skin:ƒtƒbƒ^‚̃tƒ@ƒCƒ‹–¼
58-function TSkinFiles.GetSkinFooterFileName: string;
59-begin
60- Result := FFileName + SKIN_FOOTER_FILE_NAME;
61-end;
62-
63-//! Skin:V’…ƒŒƒX‚̃tƒ@ƒCƒ‹–¼
64-function TSkinFiles.GetSkinNewResFileName: string;
65-begin
66- Result := FFileName + SKIN_NEWRES_FILE_NAME;
67-end;
68-
69-//! Skin:”ñV’…ƒŒƒX‚̃tƒ@ƒCƒ‹–¼
70-function TSkinFiles.GetSkinResFileName: string;
71-begin
72- Result := FFileName + SKIN_RES_FILE_NAME;
73-end;
74-
75-//! Skin:‚µ‚¨‚è(‚±‚±‚Ü‚Å“Ç‚ñ‚¾)‚̃tƒ@ƒCƒ‹–¼
76-function TSkinFiles.GetSkinBookmarkFileName: string;
77-begin
78- Result := FFileName + SKIN_BOOKMARK_FILE_NAME;
79-end;
80-
81-//! Skin:‚µ‚¨‚è(V’…ƒŒƒX)‚̃tƒ@ƒCƒ‹–¼
82-function TSkinFiles.GetSkinNewmarkFileName: string;
83-begin
84- Result := FFileName + SKIN_NEWMARK_FILE_NAME;
85-end;
86-end.
--- a/gikoNavi.dpr
+++ b/gikoNavi.dpr
@@ -77,8 +77,7 @@ uses
7777 SambaTimer in 'SambaTimer.pas',
7878 HistoryList in 'HistoryList.pas',
7979 ReplaceDataModule in 'ReplaceDataModule.pas' {ReplaceDM: TDataModule},
80- ResPopupBrowser in 'ResPopupBrowser.pas',
81- SkinFiles in 'SkinFiles.pas';
80+ ResPopupBrowser in 'ResPopupBrowser.pas';
8281
8382 {$R *.RES}
8483 {$R gikoResource.res}
Binary files a/gikoNavi.res and b/gikoNavi.res differ
--- a/readme/gikoSetup.iss
+++ b/readme/gikoSetup.iss
@@ -10,11 +10,11 @@ VersionInfoDescription=
1010 DefaultGroupName=ƒMƒRƒiƒr
1111 ; Ž©•ª‚̊‹«‚ɍ‡‚킹‚Ä‚­‚¾‚³‚¢
1212 SourceDir=G:\Release
13-OutputDir=G:\Output
13+OutputDir=G:\InnoSetup\Output
1414 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
1515 ; ƒMƒRƒiƒr‚̃o[ƒWƒ‡ƒ“‚É‚ ‚킹‚Ä‚­‚¾‚³‚¢
16-VersionInfoVersion=1.56.0.714
17-OutputBaseFilename=gikoNavi_1.56.0.714_2_setup
16+VersionInfoVersion=1.56.0.713
17+OutputBaseFilename=gikoNavi_1.56.0.713_setup
1818
1919
2020 [Tasks]
@@ -22,19 +22,19 @@ Name: "startmenuicon"; Description: "
2222 Name: "desktopicon"; Description: "ƒfƒXƒNƒgƒbƒv‚ɃVƒ‡[ƒgƒJƒbƒg‚ðì¬"; GroupDescription: "ƒVƒ‡[ƒgƒJƒbƒg"; Flags:
2323
2424 [Dirs]
25-Name: "{app}\Log"
26-Name: "{app}\Sound"
27-Name: "{app}\config\Board"
28-Name: "{app}\config\BoardPlugin"
29-Name: "{app}\config\NGwords"
25+Name: "{app}\Log" ; Permissions: everyone-full
26+Name: "{app}\Sound" ; Permissions: everyone-full
27+Name: "{app}\config\Board" ; Permissions: everyone-full
28+Name: "{app}\config\BoardPlugin" ; Permissions: everyone-full
29+Name: "{app}\config\NGwords" ; Permissions: everyone-full
3030
3131
3232 [Files]
33-Source: * ; Destdir: {app} ;Excludes: "gikoNavi.exe" ;
33+Source: * ; Destdir: {app} ;Excludes: "gikoNavi.exe" ; Permissions: everyone-full
3434 Source: "gikoNavi.exe" ; Destdir: {app} ;Permissions: everyone-full; Flags: ignoreversion
35-Source: "Sound\*" ; Destdir: {app}\Sound ;Flags: createallsubdirs recursesubdirs ;
36-Source: "config\*" ; Destdir: {app}\config ;Excludes: "*.dll";Flags: createallsubdirs recursesubdirs ;
37-Source: "config\BoardPlugin\*.dll" ; Destdir: {app}\config\BoardPlugin ;Flags: ignoreversion;
35+Source: "Sound\*" ; Destdir: {app}\Sound ;Flags: createallsubdirs recursesubdirs ; Permissions: everyone-full
36+Source: "config\*" ; Destdir: {app}\config ;Excludes: "*.dll";Flags: createallsubdirs recursesubdirs ; Permissions: everyone-full
37+Source: "config\BoardPlugin\*.dll" ; Destdir: {app}\config\BoardPlugin ;Flags: ignoreversion; Permissions: everyone-full
3838
3939 [Icons]
4040 Name: "{group}\Readme"; Filename: "{app}\readme.txt"; Tasks: startmenuicon
@@ -56,6 +56,9 @@ Name: japanese; MessagesFile: compiler:Languages\Japanese.isl
5656
5757 [Code]
5858 procedure CurStepChanged(CurStep: TSetupStep);
59+var
60+ path :String;
61+ p : Integer;
5962 begin
6063 case CurStep of
6164 ssInstall:
@@ -63,8 +66,7 @@ begin
6366 if (RegKeyExists(HKEY_LOCAL_MACHINE,
6467 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\gikoNavi')) then
6568 begin
66- if MsgBox('ˆÈ‘O‚̃o[ƒWƒ‡ƒ“‚̃Aƒ“ƒCƒ“ƒXƒg[ƒ‹î•ñ‚ðíœ‚µ‚Ä‚æ‚낵‚¢‚Å‚µ‚傤‚©H'
67- + #10#13 + '(ƒoƒ^56ˆÈ‘O‚©‚ç‚̃Aƒbƒvƒf[ƒg‚̏ꍇu‚Í‚¢v„§)',
69+ if MsgBox('ˆÈ‘O‚̃o[ƒWƒ‡ƒ“‚̃Aƒ“ƒCƒ“ƒXƒg[ƒ‹î•ñ‚ðíœ‚µ‚Ä‚æ‚낵‚¢‚Å‚µ‚傤‚©H',
6870 mbConfirmation, MB_YESNO) = IDYES then
6971 begin
7072 if not RegDeleteKeyIncludingSubkeys(HKEY_LOCAL_MACHINE,
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -108,17 +108,9 @@ LICENSE
108108 ------------------------------
109109 —š—ð
110110 ------------------------------
111-2007/08/05
111+2007/XX/YY
112112 Version ÊÞÀ56
113-@ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚Ì‘½’i‘Ήž
114-@•\Ž¦‚µ‚Ä‚¢‚éƒXƒŒƒbƒh’†‚̃Šƒ“ƒN‚ÌURL‚̎擾ƒAƒNƒVƒ‡ƒ“‚ð’ljÁ
115-@—š—ðƒŠƒXƒg‚É‚µ‚ÄEnter‚ŃXƒŒƒbƒh‚ð•\Ž¦‚·‚é‚ƃGƒ‰[‚ª•\Ž¦‚³‚ê‚é•s‹ï‡‚̏C³
116-@TabŽ©“®•Û‘¶E•œŒ³‚ð—LŒø‚É‚µ‚Ä‚¢‚é‚Æ‚«‚ɁA‹N“®Žž‚Ì•œŒ³‚Å•\Ž¦‚µ‚Ä‚¢‚½ƒ^ƒu‚ðŠJ‚­‚悤‚ɏC³
117-@“ü—̓AƒVƒXƒg‚̃JƒeƒSƒŠ‚̍€–Ú‚ðComboBox‰»
118-@Ú×Ý’è‚Å100ƒŒƒX•\Ž¦‚̐擪•\Ž¦ƒŒƒX”‚ª–ˆ‰ñ1‚Æ•\Ž¦‚³‚ê‚é•s‹ï‡‚̏C³
119-@ƒXƒNƒŠƒvƒgŒë”½‰ž‘΍ô‹@”\‚̃fƒtƒHƒ‹ƒgƒtƒ@ƒCƒ‹(replace.default)‚̍XV
120- (ƒAƒbƒvƒf[ƒg‚̏ꍇAŽè“®‚ōXV‚·‚é•K—v‚ª‚ ‚è‚Ü‚·)
121-@ƒCƒ“ƒXƒg[ƒ‰‚ðInno Setup(http://www.jrsoftware.org/)‚ōì‚è’¼‚µ‚½
113+ ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚Ì‘½’i‘Ήž
122114
123115 2007/04/01
124116 Version ÊÞÀ55
--- a/res/default/replace.default
+++ b/res/default/replace.default
@@ -4,5 +4,4 @@ body onload=window\(\)
44 GetSpecialFolder\(
55 CodeModule\.Lines
66 ms-its:mhtml:
7-!exec*:*:
8-$mircexe mircexe
\ No newline at end of file
7+!exec*:*:
\ No newline at end of file