ギコナビ
Revisão | 2b18cc71187fb61d0b440d76324aaf6a2384ede1 (tree) |
---|---|
Hora | 2007-07-25 04:12:34 |
Autor | cvs2git <cvs2git> |
Commiter | cvs2git |
This commit was manufactured by cvs2svn to create tag 'v1_56_0_713'.
@@ -316,13 +316,13 @@ begin | ||
316 | 316 | if inIsNew then |
317 | 317 | Result := CreateResultString( HTMLCreater.SkinedRes( |
318 | 318 | HTMLCreater.LoadFromSkin( |
319 | - GikoSys.GetSkinNewResFileName, threadItem, threadItem.Size | |
319 | + GikoSys.Setting.GetSkinNewResFileName, threadItem, threadItem.Size | |
320 | 320 | ), @res, no |
321 | 321 | ) ) |
322 | 322 | else |
323 | 323 | Result := CreateResultString( HTMLCreater.SkinedRes( |
324 | 324 | HTMLCreater.LoadFromSkin( |
325 | - GikoSys.GetSkinResFileName, threadItem, threadItem.Size | |
325 | + GikoSys.Setting.GetSkinResFileName, threadItem, threadItem.Size | |
326 | 326 | ), @res, no |
327 | 327 | ) ); |
328 | 328 | end else if GikoSys.Setting.UseCSS then begin |
@@ -395,7 +395,7 @@ begin | ||
395 | 395 | try |
396 | 396 | if GikoSys.Setting.UseSkin then begin |
397 | 397 | // XL |
398 | - skinHeader := HTMLCreater.LoadFromSkin( GikoSys.GetSkinHeaderFileName, threadItem, threadItem.Size ); | |
398 | + skinHeader := HTMLCreater.LoadFromSkin( GikoSys.Setting.GetSkinHeaderFileName, threadItem, threadItem.Size ); | |
399 | 399 | if Length( optionalHeader ) > 0 then |
400 | 400 | skinHeader := |
401 | 401 | StringReplace( skinHeader, '</head>', optionalHeader + '</head><a name="top"></a>', [] ); |
@@ -451,7 +451,7 @@ begin | ||
451 | 451 | try |
452 | 452 | if GikoSys.Setting.UseSkin then begin |
453 | 453 | // XL |
454 | - skinFooter := HTMLCreater.LoadFromSkin( GikoSys.GetSkinFooterFileName, threadItem, threadItem.Size ); | |
454 | + skinFooter := HTMLCreater.LoadFromSkin( GikoSys.Setting.GetSkinFooterFileName, threadItem, threadItem.Size ); | |
455 | 455 | if Length( optionalFooter ) > 0 then |
456 | 456 | skinFooter := |
457 | 457 | StringReplace( skinFooter, '</body>', optionalFooter + '</body>', [] ); |
@@ -1431,8 +1431,6 @@ begin | ||
1431 | 1431 | end; |
1432 | 1432 | // |
1433 | 1433 | procedure TGikoForm.FormShow(Sender: TObject); |
1434 | -var | |
1435 | - item : TThreadItem; | |
1436 | 1434 | begin |
1437 | 1435 | if FStartUp then begin |
1438 | 1436 | ShowWindow(Application.Handle, SW_HIDE); |
@@ -1466,13 +1464,6 @@ begin | ||
1466 | 1464 | GikoDM.TabsOpenAction.Tag := 1; |
1467 | 1465 | GikoDM.TabsOpenAction.Execute; |
1468 | 1466 | GikoDM.TabsOpenAction.Tag := 0; |
1469 | - if (GikoSys.Setting.LastCloseTabURL <> '') then begin | |
1470 | - item := BBSsFindThreadFromURL( GikoSys.Setting.LastCloseTabURL ); | |
1471 | - if (item <> nil) and (item.IsLogFile) then begin | |
1472 | - OpenThreadItem(item, item.URL); | |
1473 | - end; | |
1474 | - GikoSys.Setting.LastCloseTabURL := ''; | |
1475 | - end; | |
1476 | 1467 | end; |
1477 | 1468 | |
1478 | 1469 | //ActionListÌGroupIndexð³Éß· |
@@ -1493,13 +1484,8 @@ begin | ||
1493 | 1484 | Exit; |
1494 | 1485 | end; |
1495 | 1486 | |
1496 | - GikoSys.Setting.LastCloseTabURL := ''; | |
1497 | 1487 | if GikoSys.Setting.TabAutoLoadSave then begin |
1498 | 1488 | GikoDM.TabsSaveAction.Execute; |
1499 | - if (GetActiveContent <> nil) and | |
1500 | - (GetActiveContent.IsLogFile) then begin | |
1501 | - GikoSys.Setting.LastCloseTabURL := GetActiveContent.URL; | |
1502 | - end; | |
1503 | 1489 | end; |
1504 | 1490 | |
1505 | 1491 | if (SearchDialog <> nil) then begin |
@@ -3585,8 +3571,6 @@ begin | ||
3585 | 3571 | end; |
3586 | 3572 | BrowserTab.Tabs.BeginUpdate; |
3587 | 3573 | try |
3588 | - GikoSys.Setting.LastCloseTabURL := | |
3589 | - TBrowserRecord(BrowserTab.Tabs.Objects[index]).Thread.URL; | |
3590 | 3574 | TBrowserRecord(BrowserTab.Tabs.Objects[index]).Free; |
3591 | 3575 | if ( BrowserTab.Tabs.Count - 1 = index ) and |
3592 | 3576 | ( BrowserTab.TabRect(index).Left |
@@ -2283,7 +2283,7 @@ var | ||
2283 | 2283 | begin |
2284 | 2284 | URLs := TStringList.Create(); |
2285 | 2285 | try |
2286 | - fileName := GikoSys.GetAppDir + TABFILE; | |
2286 | + fileName := ExtractFilePath(Application.ExeName) + TABFILE; | |
2287 | 2287 | if FileExists(fileName) then begin |
2288 | 2288 | try |
2289 | 2289 | URLs.LoadFromFile(fileName); |
@@ -276,7 +276,7 @@ implementation | ||
276 | 276 | |
277 | 277 | uses |
278 | 278 | Giko, RoundData, Favorite, Registry, HTMLCreate, MojuUtils, Sort, YofUtils, |
279 | - IniFiles, DateUtils, SkinFiles; | |
279 | + IniFiles, DateUtils; | |
280 | 280 | |
281 | 281 | const |
282 | 282 | FOLDER_INDEX_VERSION = '1.01'; |
@@ -480,37 +480,37 @@ end; | ||
480 | 480 | //! Skin:wb_Ìt@C¼ |
481 | 481 | function TGikoSys.GetSkinHeaderFileName: string; |
482 | 482 | begin |
483 | - Result := Setting.SkinFiles.GetSkinHeaderFileName; | |
483 | + Result := Setting.GetSkinHeaderFileName; | |
484 | 484 | end; |
485 | 485 | |
486 | 486 | //! Skin:tb^Ìt@C¼ |
487 | 487 | function TGikoSys.GetSkinFooterFileName: string; |
488 | 488 | begin |
489 | - Result := Setting.SkinFiles.GetSkinFooterFileName; | |
489 | + Result := Setting.GetSkinFooterFileName; | |
490 | 490 | end; |
491 | 491 | |
492 | 492 | //! Skin:V XÌt@C¼ |
493 | 493 | function TGikoSys.GetSkinNewResFileName: string; |
494 | 494 | begin |
495 | - Result := Setting.SkinFiles.GetSkinNewResFileName; | |
495 | + Result := Setting.GetSkinNewResFileName; | |
496 | 496 | end; |
497 | 497 | |
498 | 498 | //! Skin:ñV XÌt@C¼ |
499 | 499 | function TGikoSys.GetSkinResFileName: string; |
500 | 500 | begin |
501 | - Result := Setting.SkinFiles.GetSkinResFileName; | |
501 | + Result := Setting.GetSkinResFileName; | |
502 | 502 | end; |
503 | 503 | |
504 | 504 | //! Skin:µ¨è(±±ÜÅÇñ¾)Ìt@C¼ |
505 | 505 | function TGikoSys.GetSkinBookmarkFileName: string; |
506 | 506 | begin |
507 | - Result := Setting.SkinFiles.GetSkinBookmarkFileName; | |
507 | + Result := Setting.GetSkinBookmarkFileName; | |
508 | 508 | end; |
509 | 509 | |
510 | 510 | //! Skin:µ¨è(V X)Ìt@C¼ |
511 | 511 | function TGikoSys.GetSkinNewmarkFileName: string; |
512 | 512 | begin |
513 | - Result := Setting.SkinFiles.GetSkinNewmarkFileName; | |
513 | + Result := Setting.GetSkinNewmarkFileName; | |
514 | 514 | end; |
515 | 515 | |
516 | 516 | //! UserAgentæ¾ |
@@ -64,8 +64,7 @@ type | ||
64 | 64 | FSortColumn : Integer; |
65 | 65 | FInsertText : String; |
66 | 66 | procedure AddListViewItem(ResWord : TResistWord); |
67 | - procedure SetCategory(combo: TComboBox; selected: String); | |
68 | - function ValidateKey(key, category: String): boolean; | |
67 | + procedure SetCategory(combo: TComboBox); | |
69 | 68 | public |
70 | 69 | { Public é¾ } |
71 | 70 | procedure SetUpFromEditor(); |
@@ -144,35 +143,22 @@ procedure TInputAssistForm.AddButtonClick(Sender: TObject); | ||
144 | 143 | var |
145 | 144 | resWord : TResistWord; |
146 | 145 | 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 | |
148 | 149 | if (not InputAssistDM.IsDupulicate( |
149 | 150 | KeyNameEdit.Text, CategoryNameComboBox.Text) ) then begin |
150 | 151 | resWord := InputAssistDM.Add(KeyNameEdit.Text); |
151 | 152 | resWord.SetCategory(CategoryNameComboBox.Text); |
152 | 153 | resWord.SetText(TextMemo.Text); |
153 | 154 | AddListViewItem(resWord); |
154 | - SetCategory(CategoryNameComboBox, resWord.GetCategory); | |
155 | + SetCategory(CategoryNameComboBox); | |
155 | 156 | GikoListView1.AlphaSort; |
156 | 157 | end else begin |
157 | 158 | ShowMessage('¯êÌL[¼EJeS¼ÅùÉo^ÏÝÅ·B'); |
158 | 159 | end; |
159 | 160 | end; |
160 | 161 | end; |
161 | -//! L[¼EJeSLø`FbN | |
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('JeSðÝèµÄ¾³¢B'); | |
171 | - Result := False; | |
172 | - end; | |
173 | - end; | |
174 | -end; | |
175 | - | |
176 | 162 | //! í{^ºÌCxg |
177 | 163 | procedure TInputAssistForm.DeleteButtonClick(Sender: TObject); |
178 | 164 | begin |
@@ -188,21 +174,18 @@ var | ||
188 | 174 | resWord : TResistWord; |
189 | 175 | begin |
190 | 176 | 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 | - // êÌXV | |
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[¼EJeS¼ÅùÉ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 | + // êÌXV | |
185 | + GikoListView1.Selected.Caption := resWord.GetKey; | |
186 | + GikoListView1.Selected.SubItems[0] := resWord.GetCategory; | |
187 | + SetCategory(CategoryNameComboBox); | |
188 | + GikoListView1.AlphaSort; | |
206 | 189 | end; |
207 | 190 | end; |
208 | 191 | end; |
@@ -309,10 +292,9 @@ begin | ||
309 | 292 | LockWindowUpdate(0); |
310 | 293 | end; |
311 | 294 | //! JeSR{{bNXÝè |
312 | -procedure TInputAssistForm.SetCategory(combo: TComboBox; selected: String); | |
295 | +procedure TInputAssistForm.SetCategory(combo: TComboBox); | |
313 | 296 | var |
314 | 297 | cat : TStringList; |
315 | - i : Integer; | |
316 | 298 | begin |
317 | 299 | // õp |
318 | 300 | cat := TStringList.Create; |
@@ -324,11 +306,6 @@ begin | ||
324 | 306 | combo.Items.AddStrings(cat); |
325 | 307 | combo.ItemIndex := 0; |
326 | 308 | combo.Items.EndUpdate; |
327 | - // IðÏÝÌJeSÉCfbNXðÏX | |
328 | - i := combo.Items.IndexOf(selected); | |
329 | - if (i <> -1) then begin | |
330 | - combo.ItemIndex := i; | |
331 | - end; | |
332 | 309 | finally |
333 | 310 | cat.Free; |
334 | 311 | end; |
@@ -344,9 +321,11 @@ begin | ||
344 | 321 | FInsertText := ''; |
345 | 322 | CloseAction.ShortCut := TShortCut(0); |
346 | 323 | // ÇÁpL[üÍOK |
347 | - SetCategory(CategoryNameComboBox, ''); | |
324 | + SetCategory(CategoryNameComboBox); | |
348 | 325 | end; |
349 | 326 | procedure TInputAssistForm.SetUpFromEditor(); |
327 | +var | |
328 | + cat : TStringList; | |
350 | 329 | begin |
351 | 330 | Self.Caption := 'üÍAVXg'; |
352 | 331 | Panel3.Visible := False; |
@@ -356,7 +335,7 @@ begin | ||
356 | 335 | FInsertText := ''; |
357 | 336 | CloseAction.ShortCut := ShortCut(VK_ESCAPE, []); |
358 | 337 | // õp |
359 | - SetCategory(CategoryComboBox, ''); | |
338 | + SetCategory(CategoryComboBox); | |
360 | 339 | end; |
361 | 340 | function TInputAssistForm.GetInsertText(): String; |
362 | 341 | begin |
@@ -408,6 +408,7 @@ end; | ||
408 | 408 | function TInputAssistDM.IsDupulicate(Key: String; Category: String): Boolean; |
409 | 409 | var |
410 | 410 | i : Integer; |
411 | +// resWord : TResistWord; | |
411 | 412 | begin |
412 | 413 | // ±Ì\bhÅÍA\[gÏÝÆÍÀçÈ¢ÌÅASÄÌL[ðTõµÄ¢é |
413 | 414 | Result := False; |
@@ -1283,7 +1283,7 @@ end; | ||
1283 | 1283 | function TOptionDialog.CheckFolder: Boolean; |
1284 | 1284 | begin |
1285 | 1285 | if Trim(LogFolderEdit.Text) = '' then |
1286 | - LogFolderEdit.Text := GikoSys.GetAppDir + 'Log'; | |
1286 | + LogFolderEdit.Text := ExtractFilePath(Application.ExeName) + 'Log'; | |
1287 | 1287 | |
1288 | 1288 | if DirectoryExists(LogFolderEdit.Text) then begin |
1289 | 1289 | Result := True; |
@@ -5,7 +5,7 @@ interface | ||
5 | 5 | |
6 | 6 | uses |
7 | 7 | SysUtils, Classes, Graphics, Forms, {Math, IniFiles, UCryptAuto, UBase64,} |
8 | - ComCtrls, GestureModel, IniFiles, SkinFiles; | |
8 | + ComCtrls, GestureModel, IniFiles; | |
9 | 9 | |
10 | 10 | const |
11 | 11 | MAIN_COOLBAND_COUNT = 4; //CCoolBandÌ |
@@ -232,6 +232,8 @@ type | ||
232 | 232 | FListViewNo: Boolean; |
233 | 233 | //CSS\¦ |
234 | 234 | FUseCSS: Boolean; |
235 | + //CSSt@C¼ | |
236 | + FCSSFileName: string; | |
235 | 237 | // XL\¦(êIÈàÌÅ ini É۶ͳêÈ¢) |
236 | 238 | FUseSkin: Boolean; |
237 | 239 | //©¿ã`µápÌSkinðp·é© |
@@ -378,8 +380,7 @@ type | ||
378 | 380 | |
379 | 381 | //Tab©®Û¶ |
380 | 382 | FTabAutoLoadSave : Boolean; |
381 | - //ÅãÉJ¢Ä¢½XbhÌURL | |
382 | - FLastCloseTabURL: String; | |
383 | + | |
383 | 384 | //É¿áñêÄàT|[g@\ |
384 | 385 | F2chSupport : Boolean; |
385 | 386 |
@@ -448,8 +449,6 @@ type | ||
448 | 449 | FSentIniFileSize: Integer; |
449 | 450 | //! NURLæ¾ÌÎÛg£q |
450 | 451 | FExtList: String; |
451 | - //! SkinÖA | |
452 | - FSkinFiles: TSkinFiles; | |
453 | 452 | function GetMainCoolSet(Index: Integer): TCoolSet; |
454 | 453 | function GetBoardCoolSet(Index: Integer): TCoolSet; |
455 | 454 | function GetBrowserCoolSet(Index: Integer): TCoolSet; |
@@ -475,7 +474,6 @@ type | ||
475 | 474 | |
476 | 475 | procedure SetUseCSS( value: Boolean ); |
477 | 476 | procedure SetCSSFileName( fileName: string ); |
478 | - function GetCSSFileName: string; | |
479 | 477 | //! vLVÝèÇÝÝ |
480 | 478 | procedure ReadProxySettings(memIni: TMemIniFile); |
481 | 479 | //! eíEBhEÝèÇÝÝ |
@@ -512,6 +510,12 @@ type | ||
512 | 510 | function GetSentFileName: string; |
513 | 511 | function GetConfigDir: string; |
514 | 512 | function GetSkinDir: string; |
513 | + function GetSkinHeaderFileName: string; | |
514 | + function GetSkinFooterFileName: string; | |
515 | + function GetSkinResFileName: string; | |
516 | + function GetSkinNewResFileName: string; | |
517 | + function GetSkinBookmarkFileName: string; | |
518 | + function GetSkinNewmarkFileName: string; | |
515 | 519 | function GetStyleSheetDir: string; |
516 | 520 | function GetOutBoxFileName: string; |
517 | 521 | function GetNGWordsDir: string; |
@@ -640,7 +644,7 @@ type | ||
640 | 644 | |
641 | 645 | property ListViewNo: Boolean read FListViewNo write FListViewNo; |
642 | 646 | property UseCSS: Boolean read FUseCSS write SetUseCSS; |
643 | - property CSSFileName: string read GetCSSFileName write SetCSSFileName; | |
647 | + property CSSFileName: string read FCSSFileName write SetCSSFileName; | |
644 | 648 | property UseKatjushaType : Boolean read FUseKatjushaType write FUseKatjushaType; |
645 | 649 | property UseSkin: Boolean read FUseSkin; |
646 | 650 |
@@ -754,8 +758,6 @@ type | ||
754 | 758 | property SelectInterval : Integer read FSelectInterval write FSelectInterval; |
755 | 759 | //TabÛ¶ |
756 | 760 | property TabAutoLoadSave: Boolean read FTabAutoLoadSave write FTabAutoLoadSave; |
757 | - //^u̳Ʃp | |
758 | - property LastCloseTabURL: String read FLastCloseTabURL write FLastCloseTabURL; | |
759 | 761 | //property Gengo: TStringList read F2chLanguage write F2chLanguage; |
760 | 762 | property GengoSupport : Boolean read F2chSupport write F2chSupport; |
761 | 763 | property KuroutSettingTabIndex: Integer read FKuroutSettingTabIndex write FKuroutSettingTabIndex; |
@@ -805,8 +807,6 @@ type | ||
805 | 807 | property SentIniFileSize: Integer read FSentIniFileSize write FSentIniFileSize; |
806 | 808 | //! NURLæ¾ÌÎÛg£q |
807 | 809 | property ExtList: String read FExtList write FExtList; |
808 | - //! Skint@CÇ | |
809 | - property SkinFiles: TSkinFiles read FSkinFiles; | |
810 | 810 | |
811 | 811 | end; |
812 | 812 |
@@ -827,6 +827,12 @@ const | ||
827 | 827 | CONFIG_DIR_NAME = 'config'; |
828 | 828 | CSS_DIR_NAME = 'css'; |
829 | 829 | SKIN_DIR_NAME = 'skin'; |
830 | + SKIN_HEADER_FILE_NAME = 'Header.html'; | |
831 | + SKIN_FOOTER_FILE_NAME = 'Footer.html'; | |
832 | + SKIN_NEWRES_FILE_NAME = 'NewRes.html'; | |
833 | + SKIN_RES_FILE_NAME = 'Res.html'; | |
834 | + SKIN_BOOKMARK_FILE_NAME = 'Bookmark.html'; | |
835 | + SKIN_NEWMARK_FILE_NAME = 'Newmark.html'; | |
830 | 836 | NGWORDs_DIR_NAME : String = 'NGwords'; |
831 | 837 | BOARD_PLUGIN_DIR_NAME = 'BoardPlugin'; |
832 | 838 | SAMBATIME_FILE_NAME : String = 'Samba.ini'; |
@@ -960,7 +966,6 @@ begin | ||
960 | 966 | FCategoryColumnOrder := TGikoCategoryColumnList.Create; |
961 | 967 | FBoardColumnOrder := TGikoBoardColumnList.Create; |
962 | 968 | FGestures := TGestureModel.Create; |
963 | - FSkinFiles := TSkinFiles.Create; | |
964 | 969 | FNameList.Duplicates := dupIgnore; |
965 | 970 | FMailList.Duplicates := dupIgnore; |
966 | 971 | FBoardURLs.Duplicates := dupIgnore; |
@@ -986,13 +991,13 @@ end; | ||
986 | 991 | //ú»t@C¼æ¾ipX{t@C¼j |
987 | 992 | function TSetting.GetFileName(): string; |
988 | 993 | begin |
989 | - Result := GetAppDir + INI_FILE_NAME; | |
994 | + Result := ExtractFilePath(Application.ExeName) + INI_FILE_NAME; | |
990 | 995 | end; |
991 | 996 | |
992 | 997 | //ÂXVpURLÝèt@C¼ipX{t@C¼j |
993 | 998 | function TSetting.GetBoardURLFileName(): string; |
994 | 999 | begin |
995 | - Result := GetAppDir + BOARD_URL_INI_FILE_NAME; | |
1000 | + Result := ExtractFilePath(Application.ExeName) + BOARD_URL_INI_FILE_NAME; | |
996 | 1001 | end; |
997 | 1002 | |
998 | 1003 | //Ýèt@CÇ |
@@ -1120,7 +1125,7 @@ begin | ||
1120 | 1125 | //ResAnchorjamp |
1121 | 1126 | ResAnchorJamp := ini.ReadBool('Function', 'ResAnchoJamp', True); |
1122 | 1127 | //OtH_ |
1123 | - LogFolder := ini.ReadString('Folder', 'LogFolder', GetAppDir + 'Log'); | |
1128 | + LogFolder := ini.ReadString('Folder', 'LogFolder', ExtractFilePath(Application.ExeName) + 'Log'); | |
1124 | 1129 | NewLogFolder := ''; |
1125 | 1130 | |
1126 | 1131 | //ÂURL |
@@ -1193,7 +1198,7 @@ begin | ||
1193 | 1198 | SoundFileName[i] := ''; |
1194 | 1199 | end; |
1195 | 1200 | end else begin |
1196 | - s := GetAppDir + '\sound\'; | |
1201 | + s := ExtractFileDir(Application.ExeName) + '\sound\'; | |
1197 | 1202 | SoundFileName[0] := s + '澬÷.wav'; |
1198 | 1203 | SoundFileName[1] := s + '澬÷(·ª).wav'; |
1199 | 1204 | SoundFileName[2] := s + '¢XV.wav'; |
@@ -1237,7 +1242,7 @@ begin | ||
1237 | 1242 | |
1238 | 1243 | //Tab©®Û¶AÇÝÝ |
1239 | 1244 | FTabAutoLoadSave := ini.ReadBool('TabAuto', 'TabAutoLoadSave', False); |
1240 | - FLastCloseTabURL := ini.ReadString('Thread', 'LastCloseTabURL', ''); | |
1245 | + | |
1241 | 1246 | FKuroutSettingTabIndex := ini.ReadInteger('OptionDialog', 'KuroutTabIndex' , 0); |
1242 | 1247 | |
1243 | 1248 | // }EXWFX`[ |
@@ -1474,7 +1479,7 @@ begin | ||
1474 | 1479 | //©µã`µáÌXLðg¤© |
1475 | 1480 | ini.WriteBool('CSS', 'UseKatjushaType', FUseKatjushaType); |
1476 | 1481 | //CSSt@C¼ |
1477 | - ini.WriteString('CSS', 'FileName', FSkinFiles.FileName); | |
1482 | + ini.WriteString('CSS', 'FileName', FCSSFileName); | |
1478 | 1483 | //Mail\¦ |
1479 | 1484 | ini.WriteBool('Thread', 'ShowMail', FShowMail); |
1480 | 1485 | // X\¦ÍÍ |
@@ -1636,7 +1641,6 @@ begin | ||
1636 | 1641 | |
1637 | 1642 | //^u©®Û¶ |
1638 | 1643 | ini.WriteBool('TabAuto', 'TabAutoLoadSave', FTabAutoLoadSave); |
1639 | - ini.WriteString('Thread', 'LastCloseTabURL', FLastCloseTabURL); | |
1640 | 1644 | //Ú×Ýè |
1641 | 1645 | ini.WriteInteger('OptionDialog', 'KuroutTabIndex', FKuroutSettingTabIndex); |
1642 | 1646 |
@@ -1719,7 +1723,7 @@ var | ||
1719 | 1723 | begin |
1720 | 1724 | ini := TMemIniFile.Create(GetFileName()); |
1721 | 1725 | try |
1722 | - if GetAppDir + 'Log' = NewLogFolder then | |
1726 | + if ExtractFilePath(Application.ExeName) + 'Log' = NewLogFolder then | |
1723 | 1727 | ini.DeleteKey('Folder', 'LogFolder') |
1724 | 1728 | else |
1725 | 1729 | ini.WriteString('Folder', 'LogFolder', NewLogFolder); |
@@ -1961,7 +1965,7 @@ end; | ||
1961 | 1965 | *************************************************************************) |
1962 | 1966 | function TSetting.GetBoardFileName: string; |
1963 | 1967 | begin |
1964 | - Result := GetConfigDir + BOARD_FILE_NAME; | |
1968 | + Result := GetAppDir + CONFIG_DIR_NAME + '\' + BOARD_FILE_NAME; | |
1965 | 1969 | end; |
1966 | 1970 | |
1967 | 1971 | (************************************************************************* |
@@ -1969,15 +1973,15 @@ end; | ||
1969 | 1973 | *************************************************************************) |
1970 | 1974 | function TSetting.GetCustomBoardFileName: string; |
1971 | 1975 | begin |
1972 | - Result := GetConfigDir + CUSTOMBOARD_FILE_NAME; | |
1976 | + Result := GetAppDir + CONFIG_DIR_NAME + '\' + CUSTOMBOARD_FILE_NAME; | |
1973 | 1977 | end; |
1974 | 1978 | |
1975 | 1979 | (************************************************************************* |
1976 | - *{[hfBNgæ¾(\ÅIíé) | |
1980 | + *{[hfBNgæ¾ | |
1977 | 1981 | *************************************************************************) |
1978 | 1982 | function TSetting.GetBoardDir: string; |
1979 | 1983 | begin |
1980 | - Result := IncludeTrailingPathDelimiter(GetConfigDir + BOARD_DIR_NAME); | |
1984 | + Result := GetAppDir + CONFIG_DIR_NAME + '\' + BOARD_DIR_NAME + '\'; | |
1981 | 1985 | end; |
1982 | 1986 | |
1983 | 1987 | (************************************************************************* |
@@ -1990,7 +1994,7 @@ end; | ||
1990 | 1994 | |
1991 | 1995 | |
1992 | 1996 | (************************************************************************* |
1993 | - *Àst@CtH_æ¾(ÅãÉ\ª é) | |
1997 | + *Àst@CtH_æ¾ | |
1994 | 1998 | *************************************************************************) |
1995 | 1999 | function TSetting.GetAppDir: string; |
1996 | 2000 | begin |
@@ -2022,36 +2026,58 @@ begin | ||
2022 | 2026 | end; |
2023 | 2027 | |
2024 | 2028 | (************************************************************************* |
2025 | - *ConfigtH_æ¾(\ÅIíé) | |
2029 | + *ConfigtH_æ¾ | |
2026 | 2030 | *************************************************************************) |
2027 | 2031 | function TSetting.GetConfigDir: string; |
2028 | 2032 | begin |
2029 | 2033 | Result := IncludeTrailingPathDelimiter(GetAppDir + CONFIG_DIR_NAME); |
2030 | 2034 | end; |
2031 | -(************************************************************************* | |
2032 | - *CSStH_æ¾(\ÅIíé) | |
2033 | - *************************************************************************) | |
2035 | + | |
2034 | 2036 | function TSetting.GetStyleSheetDir: string; |
2035 | 2037 | begin |
2036 | 2038 | Result := IncludeTrailingPathDelimiter(GetConfigDir + CSS_DIR_NAME); |
2037 | 2039 | end; |
2038 | -(************************************************************************* | |
2039 | - *skintH_æ¾(\ÅIíé) | |
2040 | - *************************************************************************) | |
2040 | + | |
2041 | 2041 | function TSetting.GetSkinDir: string; |
2042 | 2042 | begin |
2043 | 2043 | Result := IncludeTrailingPathDelimiter(GetConfigDir + SKIN_DIR_NAME); |
2044 | 2044 | end; |
2045 | -(************************************************************************* | |
2046 | - *NG[hfBNgæ¾(\ÅIíé) | |
2047 | - *************************************************************************) | |
2045 | + | |
2046 | +function TSetting.GetSkinHeaderFileName: string; | |
2047 | +begin | |
2048 | + Result := CSSFileName + SKIN_HEADER_FILE_NAME; | |
2049 | +end; | |
2050 | + | |
2051 | +function TSetting.GetSkinFooterFileName: string; | |
2052 | +begin | |
2053 | + Result := CSSFileName + SKIN_FOOTER_FILE_NAME; | |
2054 | +end; | |
2055 | + | |
2056 | +function TSetting.GetSkinNewResFileName: string; | |
2057 | +begin | |
2058 | + Result := CSSFileName + SKIN_NEWRES_FILE_NAME; | |
2059 | +end; | |
2060 | + | |
2061 | +function TSetting.GetSkinResFileName: string; | |
2062 | +begin | |
2063 | + Result := CSSFileName + SKIN_RES_FILE_NAME; | |
2064 | +end; | |
2065 | + | |
2066 | +function TSetting.GetSkinBookmarkFileName: string; | |
2067 | +begin | |
2068 | + Result := CSSFileName + SKIN_BOOKMARK_FILE_NAME; | |
2069 | +end; | |
2070 | + | |
2071 | +function TSetting.GetSkinNewmarkFileName: string; | |
2072 | +begin | |
2073 | + Result := CSSFileName + SKIN_NEWMARK_FILE_NAME; | |
2074 | +end; | |
2075 | + | |
2048 | 2076 | function TSetting.GetNGWordsDir: string; |
2049 | 2077 | begin |
2050 | 2078 | Result := IncludeTrailingPathDelimiter(GetConfigDir + NGWORDs_DIR_NAME); |
2051 | 2079 | end; |
2052 | -(************************************************************************* | |
2053 | - *BoardvOCfBNgæ¾(\ÅIíé) | |
2054 | - *************************************************************************) | |
2080 | + | |
2055 | 2081 | function TSetting.GetBoardPlugInDir: string; |
2056 | 2082 | begin |
2057 | 2083 | Result := IncludeTrailingPathDelimiter(GetConfigDir + BOARD_PLUGIN_DIR_NAME); |
@@ -2065,25 +2091,24 @@ begin | ||
2065 | 2091 | // RRÅÌ»èÅà嶬¶Ìá¢Í³·éB |
2066 | 2092 | FUseSkin := |
2067 | 2093 | UseCSS and |
2068 | - (Pos( AnsiLowerCase(GetSkinDir), AnsiLowerCase(FSkinFiles.FileName) ) > 0) and | |
2069 | - FileExists( FSkinFiles.GetSkinHeaderFileName ); | |
2094 | + (Pos( AnsiLowerCase(GetSkinDir), AnsiLowerCase(CSSFileName) ) > 0) and | |
2095 | + FileExists( GetSkinHeaderFileName ); | |
2070 | 2096 | |
2071 | 2097 | end; |
2072 | 2098 | |
2073 | 2099 | procedure TSetting.SetCSSFileName( fileName: string ); |
2074 | 2100 | begin |
2075 | - FSkinFiles.FileName := fileName; | |
2101 | + | |
2102 | + FCSSFileName := fileName; | |
2076 | 2103 | // WindowsIÉt@CpXÌ嶬¶Ìá¢Í³³êéÌÅA |
2077 | 2104 | // RRÅÌ»èÅà嶬¶Ìá¢Í³·éB |
2078 | 2105 | FUseSkin := |
2079 | 2106 | UseCSS and |
2080 | - (Pos( AnsiLowerCase(GetSkinDir), AnsiLowerCase(FSkinFiles.FileName) ) > 0) and | |
2081 | - FileExists( FSkinFiles.GetSkinHeaderFileName ); | |
2107 | + (Pos( AnsiLowerCase(GetSkinDir), AnsiLowerCase(CSSFileName) ) > 0) and | |
2108 | + FileExists( GetSkinHeaderFileName ); | |
2082 | 2109 | |
2083 | 2110 | end; |
2084 | -(************************************************************************* | |
2085 | - *sambaÝèt@C¼æ¾ | |
2086 | - *************************************************************************) | |
2111 | + | |
2087 | 2112 | function TSetting.GetSambaFileName: string; |
2088 | 2113 | begin |
2089 | 2114 | Result := GetAppDir + SAMBATIME_FILE_NAME; |
@@ -2364,11 +2389,5 @@ begin | ||
2364 | 2389 | end; |
2365 | 2390 | end; |
2366 | 2391 | end; |
2367 | - | |
2368 | -function TSetting.GetCSSFileName: string; | |
2369 | -begin | |
2370 | - Result := FSkinFiles.FileName; | |
2371 | -end; | |
2372 | - | |
2373 | 2392 | end. |
2374 | 2393 |
@@ -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 | - //! XLt@CpX | |
15 | - property FileName:String read FFileName write SetFileName; | |
16 | - //! wb_Ìt@C¼ | |
17 | - function GetSkinHeaderFileName: string; | |
18 | - //! tb^Ì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 | -//! XLt@C¼Ýè | |
41 | -procedure TSkinFiles.SetFileName(AFileName: string); | |
42 | -begin | |
43 | - // fBNgÌêÅãÉ\Å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:wb_Ìt@C¼ | |
52 | -function TSkinFiles.GetSkinHeaderFileName: string; | |
53 | -begin | |
54 | - Result := FFileName + SKIN_HEADER_FILE_NAME; | |
55 | -end; | |
56 | - | |
57 | -//! Skin:tb^Ì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. |
@@ -77,8 +77,7 @@ uses | ||
77 | 77 | SambaTimer in 'SambaTimer.pas', |
78 | 78 | HistoryList in 'HistoryList.pas', |
79 | 79 | ReplaceDataModule in 'ReplaceDataModule.pas' {ReplaceDM: TDataModule}, |
80 | - ResPopupBrowser in 'ResPopupBrowser.pas', | |
81 | - SkinFiles in 'SkinFiles.pas'; | |
80 | + ResPopupBrowser in 'ResPopupBrowser.pas'; | |
82 | 81 | |
83 | 82 | {$R *.RES} |
84 | 83 | {$R gikoResource.res} |
@@ -1,110 +0,0 @@ | ||
1 | -[Setup] | |
2 | -AppName=MRir | |
3 | -AppVerName=MRir | |
4 | -AppId=gikoNavi | |
5 | -AppMutex=http://gikonavi.sourceforge.jp/gikonavi/mutex | |
6 | -AppPublisherURL=http://gikonavi.sourceforge.jp/ | |
7 | -AppendDefaultDirName = no | |
8 | -DefaultDirName={pf}\gikonavi | |
9 | -VersionInfoDescription=MRirZbgAbvvO | |
10 | -DefaultGroupName=MRir | |
11 | -; ©ªÌ«Éí¹Ä¾³¢ | |
12 | -SourceDir=G:\Release | |
13 | -OutputDir=G:\Output | |
14 | -SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico" | |
15 | -; MRirÌo[WÉ í¹Ä¾³¢ | |
16 | -VersionInfoVersion=1.56.0.714 | |
17 | -OutputBaseFilename=gikoNavi_1.56.0.714_2_setup | |
18 | - | |
19 | - | |
20 | -[Tasks] | |
21 | -Name: "startmenuicon"; Description: "X^[gj [Éo^·é"; GroupDescription: "V[gJbg"; Flags: | |
22 | -Name: "desktopicon"; Description: "fXNgbvÉV[gJbgðì¬"; GroupDescription: "V[gJbg"; Flags: | |
23 | - | |
24 | -[Dirs] | |
25 | -Name: "{app}\Log" | |
26 | -Name: "{app}\Sound" | |
27 | -Name: "{app}\config\Board" | |
28 | -Name: "{app}\config\BoardPlugin" | |
29 | -Name: "{app}\config\NGwords" | |
30 | - | |
31 | - | |
32 | -[Files] | |
33 | -Source: * ; Destdir: {app} ;Excludes: "gikoNavi.exe" ; | |
34 | -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; | |
38 | - | |
39 | -[Icons] | |
40 | -Name: "{group}\Readme"; Filename: "{app}\readme.txt"; Tasks: startmenuicon | |
41 | -Name: "{group}\MRir"; Filename: "{app}\gikoNavi.exe"; Tasks: startmenuicon | |
42 | -Name: "{commondesktop}\MRir"; Filename: "{app}\gikoNavi.exe"; Tasks: desktopicon | |
43 | - | |
44 | -[Run] | |
45 | -Filename: "{app}\readme.txt"; Description: "READMEð\¦·é"; Flags: postinstall shellexec skipifsilent unchecked | |
46 | -Filename: "{app}\gikoNavi.exe"; Description: "AvP[VðN®·é"; Flags: postinstall shellexec skipifsilent | |
47 | - | |
48 | -[UninstallDelete] | |
49 | -Type: files; Name: "{app}\sent.ini" | |
50 | -Type: files; Name: "{app}\url.ini" | |
51 | -Type: files; Name: "{app}\Samba.ini" | |
52 | -Type: files; Name: "{app}\gikoNavi.ini" | |
53 | - | |
54 | -[Languages] | |
55 | -Name: japanese; MessagesFile: compiler:Languages\Japanese.isl | |
56 | - | |
57 | -[Code] | |
58 | -procedure CurStepChanged(CurStep: TSetupStep); | |
59 | -begin | |
60 | - case CurStep of | |
61 | - ssInstall: | |
62 | - begin | |
63 | - if (RegKeyExists(HKEY_LOCAL_MACHINE, | |
64 | - 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\gikoNavi')) then | |
65 | - begin | |
66 | - if MsgBox('ÈOÌo[WÌACXg[îñðíµÄæ뵢ŵ天H' | |
67 | - + #10#13 + '(o^56ÈO©çÌAbvf[gÌêuÍ¢v§)', | |
68 | - mbConfirmation, MB_YESNO) = IDYES then | |
69 | - begin | |
70 | - if not RegDeleteKeyIncludingSubkeys(HKEY_LOCAL_MACHINE, | |
71 | - 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\gikoNavi') then | |
72 | - begin | |
73 | - MsgBox('ACXg[îñÌíɸsµÜµ½B', mbError, MB_OK); | |
74 | - end; | |
75 | - end; | |
76 | - end; | |
77 | - end; | |
78 | - end; | |
79 | - | |
80 | -end; | |
81 | -procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); | |
82 | -var | |
83 | - path :String; | |
84 | -begin | |
85 | - case CurUninstallStep of | |
86 | - usUninstall: | |
87 | - begin | |
88 | - path := ExpandConstant('{app}') + '\Log'; | |
89 | - if MsgBox(path + 'tH_Ⱥð®SÉÁµÄæ뵢ŵ天H', mbConfirmation, MB_YESNO) = IDYES then | |
90 | - begin | |
91 | - DelTree(path, True, True, True); | |
92 | - end; | |
93 | - | |
94 | - path := ExpandConstant('{app}') + '\config'; | |
95 | - if MsgBox(path + 'tH_Ⱥð®SÉÁµÄæ뵢ŵ天H', mbConfirmation, MB_YESNO) = IDYES then | |
96 | - begin | |
97 | - DelTree(path, True, True, True); | |
98 | - end; | |
99 | - | |
100 | - end; | |
101 | - usPostUninstall: | |
102 | - begin | |
103 | - path := ExpandConstant('{app}'); | |
104 | - | |
105 | - MsgBox(path + 'tH_ȺÉAíµ«êÈ¢t@CªcÁÄ¢éêª èÜ·B' #10#13 'mF̤¦è®ÅíµÄ¾³¢B', | |
106 | - mbInformation, MB_OK); | |
107 | - end; | |
108 | - end; | |
109 | -end; | |
110 | - |
@@ -108,17 +108,8 @@ LICENSE | ||
108 | 108 | ------------------------------ |
109 | 109 | ð |
110 | 110 | ------------------------------ |
111 | -2007/08/05 | |
111 | +2007/XX/YY | |
112 | 112 | Version ÊÞÀ56 |
113 | -@X|bvAbv̽iΠ| |
114 | -@\¦µÄ¢éXbhÌNÌURLÌæ¾ANVðÇÁ | |
115 | -@ðXgɵÄEnterÅXbhð\¦·éÆG[ª\¦³êésïÌC³ | |
116 | -@Tab©®Û¶E³ðLøɵĢéÆ«ÉAN®Ì³Å\¦µÄ¢½^uðJæ¤ÉC³ | |
117 | -@üÍAVXgÌJeSÌÚðComboBox» | |
118 | -@Ú×ÝèÅ100X\¦Ìæª\¦Xªñ1Æ\¦³êésïÌC³ | |
119 | -@XNvgë½Îô@\ÌftHgt@C(replace.default)ÌXV | |
120 | - (Abvf[gÌêAè®ÅXV·éKvª èÜ·) | |
121 | -@CXg[ðInno Setup(http://www.jrsoftware.org/)Åìè¼µ½ | |
122 | 113 | |
123 | 114 | 2007/04/01 |
124 | 115 | Version ÊÞÀ55 |
@@ -4,5 +4,4 @@ body onload=window\(\) | ||
4 | 4 | GetSpecialFolder\( |
5 | 5 | CodeModule\.Lines |
6 | 6 | ms-its:mhtml: |
7 | -!exec*:*: | |
8 | -$mircexe mircexe | |
\ No newline at end of file | ||
7 | +!exec*:*: | |
\ No newline at end of file |