避難所版

[gikonavigoeson/gikonavi.git] / Giko.pas

diff --git a/Giko.pas b/Giko.pas
index aa24b80..927ac14 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -426,6 +426,8 @@ type
     URLPATHINFO1: TMenuItem;
     URLQUERYSTRING1: TMenuItem;
     N86: TMenuItem;
+    K4: TMenuItem;
+    WikiFAQ1: TMenuItem;
                                procedure FormCreate(Sender: TObject);
                procedure FormDestroy(Sender: TObject);
         procedure SaveSettingAll();
@@ -616,6 +618,7 @@ type
         FUpdateExePath: string;    ///\83M\83R\83i\83r\8dX\90V\83C\83\93\83X\83g\81[\83\89\83p\83X
         FUpdateExeArgs: string;    ///\83M\83R\83i\83r\8dX\90V\83C\83\93\83X\83g\81[\83\89\88ø\90\94
         FKokoPopupThreadItem: TThreadItem;
+        FCwSave: Word;  // 8087CW\92l\95Û\91¶
                procedure DownloadEnd(Sender: TObject; Item: TDownloadItem);
                procedure DownloadMsg(Sender: TObject; Item: TDownloadItem; Msg: string; Icon: TGikoMessageIcon);
                procedure WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer; const AWorkTitle: string);
@@ -747,7 +750,7 @@ type
                property WorkCount: Integer read FWorkCount write FWorkCount;
         property UpdateExePath: string read FUpdateExePath write FUpdateExePath;
         property UpdateExeArgs: string read FUpdateExeArgs write FUpdateExeArgs;
-        
+
                procedure SetContent(inThread: TBrowserRecord);
                function GetActiveContent(popup :Boolean = false): TThreadItem;
                function GetActiveList: TObject;
@@ -929,6 +932,12 @@ begin
        Writeln('============================================================');
 {$ENDIF}
 //try
+    // \83[\83\8d\8a\84\97á\8aO\82Ì\8c»\8dÝ\82Ì\90Ý\92è\82ð\95Û\91¶\82·\82é
+    FCwSave := Get8087CW;
+    if ( AnsiPos('9.0', GikoSys.GetIEVersion()) = 1 ) then begin
+        // IE 9\82Ì\8fê\8d\87\82¾\82¯\81A\96³\8cø\83r\83b\83g\82ð\97§\82Ä\82é
+        Set8087CW(FCwSave or $0004);
+    end;
        Sort.SetSortDate(Now());
 
        FTreeType := gttNone;
@@ -1335,7 +1344,8 @@ begin
        if GikoSys.Setting.AutoLogin then
                GikoDM.LoginAction.Execute;
 
-       GikoSys.Setting.BeLogin := GikoSys.Setting.BeAutoLogin;
+    if GikoSys.Setting.BeAutoLogin then
+        GikoDM.BeLogInOutAction.Execute;
 
        //\83L\83\83\83v\83V\83\87\83\93\82ª\8fã\8f\91\82«\82³\82ê\82Ä\82µ\82Ü\82¤\82Ì\82Å\81A\82±\82±\82Å\8dÄ\90Ý\92è
        FavoriteAddToolButton.Caption := '\92Ç\89Á...';
@@ -1832,6 +1842,8 @@ begin
         // \83A\83b\83v\83f\81[\83g\8eÀ\8ds
         GikoSys.CreateProcess(FUpdateExePath, FUpdateExeArgs);
     end;
+    // \83[\83\8d\8a\84\97á\8aO\82ð\8c³\82É\96ß\82·
+    Set8087CW(FCwSave);
 end;
 
 // \8ae\8f\8a\82É\82 \82é\83L\83\83\83r\83l\83b\83g\81E BBS \83\81\83j\83\85\81[\82ð\83Z\83b\83g\81^\8dX\90V
@@ -2063,7 +2075,7 @@ begin
 
     if FResPopupBrowser <> nil then begin
         if not(Sender is TResPopupBrowser) then begin
-            if (FResPopupBrowser.Visible) then begin
+            if ((doc <> nil) and (FResPopupBrowser.Visible)) then begin
                 if ResPopupClearTimer.Interval > 0 then begin
                     ResPopupClearTimer.Enabled := True;
                     ResPopupClearTimer.Tag := 0;
@@ -2097,7 +2109,8 @@ begin
     end;
        s := '';
        Ext := AnsiLowerCase(ExtractFileExt(Text2));
-       if (Pos('http://', Text2) = 1) and (GikoSys.Setting.PreviewVisible) and
+//     if (Pos('http://', Text2) = 1) and (GikoSys.Setting.PreviewVisible) and
+       if ((Pos('http://', Text2) = 1) or (Pos('https://', Text2) = 1)) and (GikoSys.Setting.PreviewVisible) and
                        ((Ext = '.jpg') or (Ext = '.jpeg') or (Ext = '.gif') or (Ext = '.png')) or
         (Pos('http://www.nicovideo.jp/watch/', Text2) = 1)  then begin
                if FPreviewBrowser = nil then begin
@@ -5283,8 +5296,7 @@ begin
        SenderNode.Selected := False;
        FavoriteDragDrop( SenderNode, Source );
 
-       SetLinkBar;
-
+       PostMessage( Handle, USER_SETLINKBAR, 0, 0 );
 end;
 
 procedure TGikoForm.LinkToolButtonOnMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);