N65: TMenuItem;
BBSSelectPopupMenu: TPopupMenu;
PlugInMenu: TMenuItem;
+ TmpToolBar: TToolBar;
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
procedure CabinetPanelHide(Sender: TObject);
ListToolBar.Wrapable := GikoSys.Setting.ListToolBarWrapable;
BrowserToolBar.Wrapable := GikoSys.Setting.BrowserToolBarWrapable;
+ KeepDefaultToolButton(StdToolBar, TmpToolBar);
+ KeepDefaultToolButton(StdToolBar, ListToolBar);
+ KeepDefaultToolButton(StdToolBar, BrowserToolBar);
//\83c\81[\83\8b\83{\83^\83\93\93Ç\82Ý\8d\9e\82Ý
ReadToolBarSetting(ActionList, StdToolBar);
ReadToolBarSetting(ActionList, ListToolBar);
procedure TGikoForm.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
var
i: Integer;
- CoolSet: TCoolSet;
+// CoolSet: TCoolSet;
wp: TWindowPlacement;
begin
if ( GikoSys.Setting.ShowDialogForEnd ) and
//\82¨\8bC\82É\93ü\82è\95Û\91¶
try
FavoriteDM.WriteFavorite;
+ FavoriteDM.Clear;
+ try
+ // if FavoriteDM <> nil then
+ // FavoriteDM.Free;
+ // FavoriteDM := nil;
+ except
+ end;
except
end;
// Favorite.Free;
try
TreeView.Items.BeginUpdate;
for i := TreeView.Items.Count - 1 downto 0 do begin
- {if TreeView.Items[i].Data <> nil then begin
- if TObject(TreeView.Items[i].Data) is TBBS then
- TBBS(TreeView.Items[i].Data).Free
- else if TObject(TreeView.Items[i].Data) is TCategory then
- TCategory(TreeView.Items[i].Data).Free
- else if TObject(TreeView.Items[i].Data) is TBoard then
- TBoard(TreeView.Items[i].Data).Free;
-
- end;
- }
TreeView.Items[i].Free;
end;
TreeView.Items.Clear;
except
end;
- //\83q\83X\83g\83\8a\83\8a\83X\83g\95Û\91¶
- try
- SaveHistory;
- ClearHistory;
- except
- end;
+
+
//\83A\83h\83\8c\83X\97\9a\97ð\95Û\91¶
try
AddressHistoryDM.WriteHistory(AddressComboBox.Items, GikoSys.Setting.AddressHistoryCount);
+ //if AddressHistoryDM <> nil then
+ // AddressHistoryDM.Free;
+ //AddressHistoryDM := nil;
except
end;
- try
- FControlThread.Terminate;
- FControlThread.WaitFor;
- FControlThread.Free;
- except
- end;
// FDownload.Free;
except
end;
try
- ClearLinkBar;
+ //ClearLinkBar;
except
end;
except
end;
}
+ //\83q\83X\83g\83\8a\83\8a\83X\83g\95Û\91¶
try
- if FavoriteDM <> nil then
- FavoriteDM.Free;
- FavoriteDM := nil;
- if AddressHistoryDM <> nil then
- AddressHistoryDM.Free;
- AddressHistoryDM := nil;
+ SaveHistory;
+ ClearHistory;
+
except
end;
except
end;
-
try
- for i := CabinetSelectPopupMenu.Items.Count - 1 downto 0 do begin
+ {for i := CabinetSelectPopupMenu.Items.Count - 1 downto 0 do begin
if CabinetSelectPopupMenu.Items[ i ] is TBBSMenuItem then begin
- CabinetSelectPopupMenu.Items[ i ].Free;
+ TBBSMenuItem(CabinetSelectPopupMenu.Items[ i ]).Free;
CabinetMenu.Items[ i ].Free;
end;
end;
+ }
+ except
+ end;
+ try
+ FControlThread.Terminate;
+ FControlThread.WaitFor;
+ FControlThread.Free;
except
end;
+
// TBBS \82Í\95Û\8e\9d\82µ\82Ä\82¢\82é TCategory, TBoard, TThreadItem \82·\82×\82Ä\82ð\8aJ\95ú\82·\82é
// TBoard, TThreadItem \82Ì\83f\83X\83g\83\89\83N\83^\82Í\83v\83\89\83O\83C\83\93\82É\94j\8aü\82ð\93`\82¦\82é\82Ì\82Å
// BoardPluteIns \82Ì\8aJ\95ú\82æ\82è\90æ\82É\8ds\82¤\82±\82Æ
end;
except
end;
-
+ //Application.HookMainWindow(Hook);
+ Application.UnhookMainWindow(Hook);
Application.Terminate;
end;
procedure TGikoForm.FormDestroy(Sender: TObject);
begin
-;
+
end;
//\83t\83H\81[\83\80\83N\83\8d\81[\83Y
procedure TGikoForm.FormClose(Sender: TObject; var Action: TCloseAction);
begin
+end;
+{
+//procedure TGikoForm.FormClose(Sender: TObject; var Action: TCloseAction);
+//begin
+//end;
// ListCoolBar.WindowProc := nil;
// BrowserCoolBar.WindowProc := nil;
// MainCoolBar.WindowProc := nil;
// Application.Terminate;
// Action := caFree;
// Application.UnhookMainWindow(Hook);
-end;
+}
//\83L\83\83\83r\83l\83b\83g\81~\83{\83^\83\93\83N\83\8a\83b\83N
procedure TGikoForm.CabinetPanelHide(Sender: TObject);
begin
if not TBoard(Node.Data).IsThreadDatRead then begin
Screen.Cursor := crHourGlass;
try
- GikoSys.ReadSubjectFile(TBoard(Node.Data));
+ GikoSys.ReadSubjectFile(Node.Data);
finally
Screen.Cursor := crDefault;
end;
favItem : TFavoriteThreadItem;
begin
if ThreadItem.IsLogFile then begin
- favItem := TFavoriteThreadItem.CreateWithItem( ThreadItem );
- AddHistory( favItem );
+ //favItem := TFavoriteThreadItem.CreateWithItem( ThreadItem );
+ favItem := TFavoriteThreadItem.Create(ThreadItem.URL, ThreadItem.Title );
+ if not AddHistory( favItem ) then
+ favItem.Free;
for i := 0 to BrowserTab.Tabs.Count - 1 do begin
if TObject(BrowserTab.Tabs.Objects[i]) is TThreadItem then begin
if TThreadItem(BrowserTab.Tabs.Objects[i]) = ThreadItem then begin
if FTreeType = gttHistory then
if TreeView.TopItem <> TreeView.Items[ i ] then
TreeView.Items[ i ].MoveTo( TreeView.TopItem, naInsert );
+ Result := false;
Exit;
end;
end;
if s <> '' then begin
favItem := TFavoriteThreadItem.Create(
s, HistoryNode.Attributes[ 'title' ] );
- AddHistory( favItem );
+ if not AddHistory( favItem ) then
+ favItem.Free;
end;
//end;
end;
if ThreadItem.IsLogFile then begin
// if AddHistory(ThreadItem) then
// SetContent(ThreadItem);
- InsertBrowserTab(ThreadItem);
+ InsertBrowserTab(ListItem.Data);
ListView.UpdateItems(ListItem.Index, ListItem.Index);
end else begin
// SetContent(ThreadItem);
- InsertBrowserTab(ThreadItem);
+ InsertBrowserTab(ListItem.Data);
end;
end;
procedure TGikoForm.ToolButton18Click(Sender: TObject);
begin
if FTreeType = gttHistory then begin
+ ClearHistory;
FHistoryList.Clear;
TreeView.Items.Clear;
end;
try
LinkBarPopupMenu.Items.Clear;
for i := LinkToolBar.ButtonCount - 1 downto 0 do
- LinkToolBar.RemoveControl(LinkToolBar.Buttons[i]);
+ //LinkToolBar.RemoveControl(LinkToolBar.Buttons[i]);
+ LinkToolBar.Buttons[i].Free;
for i := 0 to FavoriteTreeView.Items.Count - 1 do begin
if FavoriteTreeView.Items[i].Text = Favorite.FAVORITE_LINK_NAME then begin
for j := 0 to FavoriteTreeView.Items[i].Count - 1 do begin
ToolButton := TLinkToolButton.Create(LinkToolBar);
+// ToolButton.Parent := LinkToolBar;
if TObject(FavoriteTreeView.Items[i].Item[j].Data) is TFavoriteFolder then begin
MenuItem := TMenuItem.Create(Self);
CreateFavMenu(FavoriteTreeView.Items[i].Item[j], MenuItem);
begin
MainCoolBar.Bands.BeginUpdate;
try
- LinkBarPopupMenu.Items.Clear;
+ if LinkBarPopupMenu.Items.Count > 0 then
+ LinkBarPopupMenu.Items.Clear;
for i := LinkToolBar.ButtonCount - 1 downto 0 do
- LinkToolBar.RemoveControl(LinkToolBar.Buttons[i]);
+ //LinkToolBar.RemoveControl(LinkToolBar.Buttons[i]);
+ LinkToolBar.Buttons[i].Free;
finally
MainCoolBar.Bands.EndUpdate;
end;
OSDN Git Service
