ハ゛タ62の変更点を追加

[gikonavigoeson/gikonavi.git] / GikoDataModule.pas

diff --git a/GikoDataModule.pas b/GikoDataModule.pas
index 952d1df..3bc16ed 100644 (file)
--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -245,6 +245,7 @@ type
     UpdateGikonaviAction: TAction;
     konoURLPATHAction: TAction;
     konoURLQueryAction: TAction;
+    PopupMenuSettingAction: TAction;
        procedure EditNGActionExecute(Sender: TObject);
        procedure ReloadActionExecute(Sender: TObject);
        procedure GoFowardActionExecute(Sender: TObject);
@@ -333,7 +334,6 @@ type
        procedure TabsSaveActionExecute(Sender: TObject);
        procedure TabsOpenActionExecute(Sender: TObject);
        procedure BeLogInOutActionExecute(Sender: TObject);
-       procedure BeLogInOutActionUpdate(Sender: TObject);
        procedure KokomadeActionExecute(Sender: TObject);
        procedure ZenbuActionExecute(Sender: TObject);
        procedure KokoResActionExecute(Sender: TObject);
@@ -461,6 +461,7 @@ type
     procedure konoURLPATHActionExecute(Sender: TObject);
     procedure konoURLQueryActionExecute(Sender: TObject);
     procedure konoURLQueryActionUpdate(Sender: TObject);
+    procedure PopupMenuSettingActionExecute(Sender: TObject);
   private
        { Private \90é\8c¾ }
        procedure ClearResFilter;
@@ -476,7 +477,7 @@ type
        procedure ClearSelectComboBox;
     procedure ClearMailAllEditor();
     procedure ClearNameTextAllEditor();
-    procedure MoveURLWithHistory(URL : String);
+    procedure MoveURLWithHistory(URL : String; KeyMask: Boolean = False);
     procedure BackToHistory(item: TMoveHistoryItem);
     function GetActiveThreadLinks : IHTMLElementCollection;
     procedure GetLinkURLs(links : IHTMLElementCollection;
@@ -515,7 +516,8 @@ uses
        GikoBayesian, About, ShellAPI,
        RoundName, RoundData, Menus, ListViewUtils,
        ThreadControl, GikoMessage, InputAssist,
-    DefaultFileManager, Forms, NewBoardURL, UpdateCheck;
+    DefaultFileManager, Forms, NewBoardURL, UpdateCheck,
+    PopupMenuSetting;
 
 const
        MSG_ERROR : string = '\83G\83\89\81[';
@@ -2338,20 +2340,41 @@ end;
 //! Be2ch\82É\83\8d\83O\83C\83\93/\83\8d\83O\83A\83E\83g\82·\82é
 // *************************************************************************
 procedure TGikoDM.BeLogInOutActionExecute(Sender: TObject);
+var
+       TmpCursor: TCursor;
+       msg : String;
 begin
-       GikoSys.Setting.BeLogin := not GikoSys.Setting.BeLogin;
-end;
-// *************************************************************************
-//! Be2ch\82É\83\8d\83O\83C\83\93/\83\8d\83O\83A\83E\83g\82·\82é\82ÌUpdate\83C\83x\83\93\83g
-// *************************************************************************
-procedure TGikoDM.BeLogInOutActionUpdate(Sender: TObject);
-begin
-       if (GikoSys.Setting.BeUserID <> '') and (GikoSys.Setting.BeCode <> '') then begin
-               if (GikoSys.Setting.BeLogin) then BeLogInOutAction.Checked := true
-               else BeLogInOutAction.Checked := false;
-               BeLogInOutAction.Enabled := true
-       end else
-               BeLogInOutAction.Enabled := false;
+       if GikoSys.Belib.Connected then begin
+               //\83\8d\83O\83A\83E\83g
+               GikoSys.Belib.Disconnect;
+               BeLogInOutAction.Checked := False;
+               GikoForm.AddMessageList(GikoSys.GetGikoMessage(gmBeLogout), nil, gmiOK);
+       end else begin
+               TmpCursor := GikoForm.ScreenCursor;
+               GikoForm.ScreenCursor := crHourGlass;
+               try
+                       GikoSys.Belib.ClientUA := 'gikoNavi/1.00';
+                       GikoSys.Belib.UserName := GikoSys.Setting.BeUserID;
+                       GikoSys.Belib.Password := GikoSys.Setting.BePassword;
+            if GikoSys.Setting.ReadProxy then begin
+                               GikoSys.Belib.ProxyAddress := GikoSys.Setting.ReadProxyAddress;
+                               GikoSys.Belib.ProxyPort := GikoSys.Setting.ReadProxyPort;
+                       end else begin
+                GikoSys.Belib.ProxyAddress := '';
+                               GikoSys.Belib.ProxyPort := 0;
+            end;
+            if GikoSys.Belib.Connect then begin
+                GikoForm.AddMessageList(GikoSys.GetGikoMessage(gmBeLogin) + GikoSys.Setting.BeUserID, nil, gmiOK);
+                BeLogInOutAction.Checked := True;
+            end else begin
+                GikoForm.AddMessageList(GikoSys.Belib.ErrorMsg, nil, gmiNG);
+                GikoForm.PlaySound('Error');
+                BeLogInOutAction.Checked := False;
+                       end;
+               finally
+                       GikoForm.ScreenCursor := TmpCursor;
+               end;
+       end;
 end;
 ////////////////////////////////\83t\83@\83C\83\8b\82Ü\82Å\82¨\82µ\82Ü\82¢/////////////////////
 // *************************************************************************
@@ -4143,17 +4166,17 @@ begin
             end;
         end else begin
             //URL\82É\88Ú\93®
-            MoveURLWithHistory(item.ThreadItem.URL);
+            MoveURLWithHistory(item.ThreadItem.URL, True);
         end;
     end;
 end;
 //! \97\9a\97ð\8f\88\97\9d\82Â\82«URL\88Ú\93®
-procedure TGikoDM.MoveURLWithHistory(URL : String);
+procedure TGikoDM.MoveURLWithHistory(URL : String; KeyMask: Boolean = False);
 var
     idx : Integer;
 begin
     //URL\82É\88Ú\93®
-    GikoForm.MoveToURL(URL);
+    GikoForm.MoveToURL(URL, KeyMask);
     //\88È\89º\81A\97\9a\97ð\82Ì\8f\88\97\9d
     idx := GikoForm.AddressComboBox.Items.IndexOf(URL);
     if idx = -1 then begin
@@ -4670,6 +4693,18 @@ begin
         end;
     end;
 end;
+//! \83|\83b\83v\83A\83b\83v\83\81\83j\83\85\81[\90Ý\92è\83_\83C\83A\83\8d\83O\82ð\8aJ\82­
+procedure TGikoDM.PopupMenuSettingActionExecute(Sender: TObject);
+var
+       Dlg: TPopupMenuSettingDialog;
+begin
+       Dlg := TPopupMenuSettingDialog.Create(GikoForm, GikoFormActionList);
+       try
+               Dlg.ShowModal;
+       finally
+               Dlg.Release;
+       end;
+end;
 
 end.