Bb51の修正をマージ

diff --git a/Editor.pas b/Editor.pas
index a18bd7e..8cb50b8 100644 (file)
--- a/Editor.pas
+++ b/Editor.pas
@@ -931,33 +931,35 @@ begin
 
                                if ABoard = nil then Exit;
 
-                                if FileExists(ABoard.GetSETTINGTXTFileName)  then begin
-                                        body := TStringList.Create;
-                                        try
-                                                body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
-                                                Remote := GetFusianaName(body, ABoard);
-                                        finally
-                                                body.Free;
-                                        end;
-                                end;
-
-                                //Setting.txt\82ª\82È\82©\82Á\82½\82ç\8eæ\93¾
-                                //\8eI\82É\95\89\89×\82ª\82©\82©\82è\82»\82¤\82Å\95|\82¢\81E\81E\81E
-                                if not FileExists(ABoard.GetSETTINGTXTFileName) then begin
-                                        //GetSETTINGTXTAction\82ð\8cÄ\82Ñ\8fo\82·\82ÆIndy\82ª\8f\89\8aú\89»\82³\82ê\82é\82Ì\82Å\81A
+                                                               if FileExists(ABoard.GetSETTINGTXTFileName)  then begin
+                                                                               body := TStringList.Create;
+                                                                               try
+                                                                                               body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
+                                                                                               Remote := GetFusianaName(body, ABoard);
+                                                                               finally
+                                                                                               body.Free;
+                                                                               end;
+                                                               end;
+
+                                                               //Setting.txt\82ª\82È\82©\82Á\82½\82ç\8eæ\93¾
+                                                               //\8eI\82É\95\89\89×\82ª\82©\82©\82è\82»\82¤\82Å\95|\82¢\81E\81E\81E
+                                                               if not FileExists(ABoard.GetSETTINGTXTFileName) then begin
+                                                                               //GetSETTINGTXTAction\82ð\8cÄ\82Ñ\8fo\82·\82ÆIndy\82ª\8f\89\8aú\89»\82³\82ê\82é\82Ì\82Å\81A
                                                                                //\82±\82±\82ÅCookie\82ð\95Û\91¶\82µ\82È\82­\82Ä\82Í\82¢\82¯\82È\82¢
                                                                                tmpRawheader := Indy.Response.RawHeaders.Text;
                                                                                GetSETTINGTXTAction.Execute;
                                                                                body := TStringList.Create;
                                                                                try
-                                                body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
-                                                Remote := GetFusianaName(body, ABoard);
-                                        finally
-                                                body.Free;
-                                        end;
+                                                                                               if FileExists(ABoard.GetSETTINGTXTFileName) then begin
+                                                                                                       body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
+                                                                                                       Remote := GetFusianaName(body, ABoard);
+                                                                                               end;
+                                                                               finally
+                                                                                               body.Free;
+                                                                               end;
                                 end;
 
-                                if Remote = 'fusianasan' then begin
+                                                               if Remote = 'fusianasan' then begin
                                        MsgResult := MsgBox(
                                                        Handle,
                                                '\83\8a\83\82\81[\83g\83z\83X\83g\82ð\95\\8e¦\82·\82é\8b@\94\\82ª\8eg\82í\82ê\82Ä\82¢\82Ü\82·' + #13#10 +
@@ -972,8 +974,8 @@ begin
                                                EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
                                                DrawMenuBar(Handle);
                                                Exit;
-                                       end;
-                                end;
+                                               end;
+                                                               end;
                         end;
 
                        if ResultType = grtOK then begin
@@ -1732,9 +1734,6 @@ var
        settingBody: TStringList;
        tmpBoard: TBoard;
 begin
-        if FWork then
-               Exit;
-        FWork := True;
 
        InitIdHTTP(Indy);
        if FThreadItem = nil then
@@ -1785,7 +1784,6 @@ begin
        end;
        ShowBoardInformation(tmpBoard, BoardInformationMemo);
 
-        FWork := False;
 end;
 
 procedure TEditorForm.ShowBoardInformation(ABoard: TBoard; AMemo: TMemo);

diff --git a/Giko.dfm b/Giko.dfm
index cf4678d..55e48eb 100644 (file)
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -1,6 +1,6 @@
 object GikoForm: TGikoForm
-  Left = 363
-  Top = 92
+  Left = 97
+  Top = 51
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   AutoScroll = False

diff --git a/Giko.pas b/Giko.pas
index eff9acd..ffe531f 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -1002,6 +1002,7 @@ begin
                BrowserTab.Font.Style := [fsBold];
        if GikoSys.Setting.BrowserTabFontItalic then
                BrowserTab.Font.Style := GikoForm.BrowserTab.Font.Style + [fsItalic];
+       BrowserTab.DoubleBuffered := True;
        FDragWFirst := false;
        SetContent(BrowserNullTab);                                                                                                     //\83u\83\89\83E\83U\82ð\8bó\94\92\95\\8e¦
 
@@ -3601,7 +3602,6 @@ begin
        FTabHintIndex := -1;
        for i := 0 to BrowserTab.Tabs.Count - 1 do begin
                if TBrowserRecord(BrowserTab.Tabs.Objects[i]) = BrowserRecord then begin
-                       BrowserTab.Tabs.BeginUpdate;
                        try
                                if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser <> nil then begin
                                        doc := TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser.Document;
@@ -3617,15 +3617,25 @@ begin
                                if j <> -1 then
                                        FBrowsers.Move(j, BROWSER_COUNT - 1);
                        end;
-                       TBrowserRecord(BrowserTab.Tabs.Objects[i]).Free;
-                       BrowserTab.Tabs.Delete(i);
-                       if idx > i then begin
-                               BrowserTab.TabIndex := idx - 1;
-                       end else begin
-                               if BrowserTab.Tabs.Count -1 >= idx then
-                                       BrowserTab.TabIndex := idx
-                               else
-                                       BrowserTab.TabIndex := BrowserTab.Tabs.Count - 1;
+                       BrowserTab.Tabs.BeginUpdate;
+                       try
+                               TBrowserRecord(BrowserTab.Tabs.Objects[i]).Free;
+                               if ( BrowserTab.Tabs.Count - 1 = i ) and
+                                       ( BrowserTab.TabRect(i).Left
+                                               <= BrowserTab.DisplayRect.Left ) then begin
+                                       BrowserTab.ScrollTabs(-1);
+                               end;
+                               BrowserTab.Tabs.Delete(i);
+                               if idx > i then begin
+                                       BrowserTab.TabIndex := idx - 1;
+                               end else begin
+                                       if BrowserTab.Tabs.Count -1 >= idx then
+                                               BrowserTab.TabIndex := idx
+                                       else
+                                               BrowserTab.TabIndex := BrowserTab.Tabs.Count - 1;
+                               end;
+                       finally
+                               BrowserTab.Tabs.EndUpdate;
                        end;
                        if BrowserTab.Tabs.Count = 0 then begin
                                BrowserNullTab.Thread := nil;
@@ -3645,7 +3655,6 @@ begin
                                TBrowserRecord(BrowserTab.Tabs.Objects[BrowserTab.TabIndex]).Repaint := true;
                                FBrowsers.Move(BROWSER_COUNT - 1, 0);
                        end;
-                       BrowserTab.Tabs.EndUpdate;
                        if( FActiveContent = nil) then
                                BrowserTab.OnChange(nil);
                        Exit;
@@ -3661,7 +3670,6 @@ begin
        FTabHintIndex := -1;
        for i := 0 to BrowserTab.Tabs.Count - 1 do begin
                if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread = ThreadItem then begin
-                       BrowserTab.Tabs.BeginUpdate;
                        try
                                if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser <> nil then begin
                                        doc := TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser.Document;
@@ -3678,15 +3686,25 @@ begin
                                if j <> -1 then
                                        FBrowsers.Move(j, BROWSER_COUNT - 1);
                        end;
-                       TBrowserRecord(BrowserTab.Tabs.Objects[i]).Free;
-                       BrowserTab.Tabs.Delete(i);
-                       if idx > i then begin
-                               BrowserTab.TabIndex := idx - 1;
-                       end else begin
-                               if BrowserTab.Tabs.Count -1 >= idx then
-                                       BrowserTab.TabIndex := idx
-                               else
-                                       BrowserTab.TabIndex := BrowserTab.Tabs.Count - 1;
+                       BrowserTab.Tabs.BeginUpdate;
+                       try
+                               TBrowserRecord(BrowserTab.Tabs.Objects[i]).Free;
+                               if ( BrowserTab.Tabs.Count - 1 = i ) and
+                                       ( BrowserTab.TabRect(i).Left
+                                               <= BrowserTab.DisplayRect.Left ) then begin
+                                       BrowserTab.ScrollTabs(-1);
+                               end;
+                               BrowserTab.Tabs.Delete(i);
+                               if idx > i then begin
+                                       BrowserTab.TabIndex := idx - 1;
+                               end else begin
+                                       if BrowserTab.Tabs.Count -1 >= idx then
+                                               BrowserTab.TabIndex := idx
+                                       else
+                                               BrowserTab.TabIndex := BrowserTab.Tabs.Count - 1;
+                               end;
+                       finally
+                               BrowserTab.Tabs.EndUpdate;
                        end;
                        if(BrowserTab.TabIndex <> -1) and
                                ( TBrowserRecord(BrowserTab.Tabs.Objects[BrowserTab.TabIndex]).Browser = nil) then begin
@@ -3704,7 +3722,6 @@ begin
                                FBrowsers.Move(BROWSER_COUNT - 1, 0);
                        end;
 
-                       BrowserTab.Tabs.EndUpdate;
                        if( FActiveContent = nil) then
                                BrowserTab.OnChange(nil);
                        Exit;
@@ -4043,54 +4060,51 @@ end;
 
 procedure TGikoForm.SetBrowserTabState;
 var
-//     i: Integer;
        CoolBand: TCoolBand;
 begin
        BrowserBottomPanel.AutoSize := False;
        if GikoSys.Setting.BrowserTabVisible then begin
-               if GikoSys.Setting.BrowserTabStyle = gtsTab then begin
-                       BrowserTab.Style := tsTabs;
-                       if GikoSys.Setting.BrowserTabPosition = gtpTop then
-                               BrowserTab.TabPosition := tpTop
-                       else
-                               BrowserTab.TabPosition := tpBottom;
-               end else if GikoSys.Setting.BrowserTabStyle = gtsButton then begin
-                       BrowserTab.TabPosition := tpTop;
-                       BrowserTab.Style := tsButtons;
-               end else begin
-                       BrowserTab.TabPosition := tpTop;
-                       BrowserTab.Style := tsFlatButtons
-               end;
-
-               if GikoSys.Setting.BrowserTabPosition = gtpTop then begin
-                       BrowserTab.Parent := BrowserTabToolBar;
-                       BrowserBottomPanel.Hide;
-                       CoolBand := GetCoolBand(BrowserCoolBar, BrowserTabToolBar);
-                       if CoolBand <> nil then
-                               CoolBand.Visible := True;
-//                     BrowserTab.Parent := BrowserTopPanel;
-//                     BrowserTab.Parent := BrowserCoolBar;
-//                     BrowserTab.Top := 26;
-//                     BrowserTopPanel.Height := 44;
+               BrowserTab.Hide;
+               BrowserTab.Tabs.BeginUpdate;
+               try
+                       if GikoSys.Setting.BrowserTabStyle = gtsTab then begin
+                               BrowserTab.Style := tsTabs;
+                               if GikoSys.Setting.BrowserTabPosition = gtpTop then
+                                       BrowserTab.TabPosition := tpTop
+                               else
+                                       BrowserTab.TabPosition := tpBottom;
+                       end else if GikoSys.Setting.BrowserTabStyle = gtsButton then begin
+                               BrowserTab.TabPosition := tpTop;
+                               BrowserTab.Style := tsButtons;
+                       end else begin
+                               BrowserTab.TabPosition := tpTop;
+                               BrowserTab.Style := tsFlatButtons
+                       end;
 
-               end else begin
-                       BrowserTab.Parent := BrowserBottomPanel;
-                       BrowserTab.Top := 0;
-                       BrowserTab.Left := 0;
-                       BrowserBottomPanel.Show;
-                       CoolBand := GetCoolBand(BrowserCoolBar, BrowserTabToolBar);
-                       if CoolBand <> nil then
-                               CoolBand.Visible := False;
-//                     BrowserTopPanel.Height := 26;
-               end;
-               BrowserTab.Show;
+                       if GikoSys.Setting.BrowserTabPosition = gtpTop then begin
+                               BrowserTab.Parent := BrowserTabToolBar;
+                               BrowserBottomPanel.Hide;
+                               CoolBand := GetCoolBand(BrowserCoolBar, BrowserTabToolBar);
+                               if CoolBand <> nil then
+                                       CoolBand.Visible := True;
+                       end else begin
+                               BrowserTab.Parent := BrowserBottomPanel;
+                               BrowserTab.Top := 0;
+                               BrowserTab.Left := 0;
+                               BrowserBottomPanel.Show;
+                               CoolBand := GetCoolBand(BrowserCoolBar, BrowserTabToolBar);
+                               if CoolBand <> nil then
+                                       CoolBand.Visible := False;
+                       end;
+               finally
+                       BrowserTab.Tabs.EndUpdate;
+                       BrowserTab.Show;
+               end;
        end else begin
                CoolBand := GetCoolBand(BrowserCoolBar, BrowserTabToolBar);
                if CoolBand <> nil then
                        CoolBand.Visible := False;
                BrowserBottomPanel.Visible := False;
-//             BrowserTab.Visible := False;
-//             BrowserTopPanel.Height := 26;
                GikoDM.AllTabCloseAction.Execute;
        end;
 end;

diff --git a/HTMLCreate.pas b/HTMLCreate.pas
index a0f5dc2..ab56fb4 100644 (file)
--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -970,17 +970,17 @@ const
        FORMAT_NOMAIL  = '<a name="%s"></a><div class="header"><span class="no"><a href="menu:%s">%s</a></span>'
                                        + '<span class="name_label">\96¼\91O\81F</span> <span class="name"><b>%s</b></span>'
                                        + '<span class="date_label">\93\8a\8de\93ú\81F</span> <span class="date">%s</span></div>'
-                                       + '<div class="mes">%s</div>';
+                                       + '<div class="mes">%s</div>'#13#10;
 
        FORMAT_SHOWMAIL = '<a name="%s"></a><div class="header"><span class="no"><a href="menu:%s">%s</a></span>'
                                        + '<span class="name_label"> \96¼\91O\81F </span><a class="name_mail" href="mailto:%s">'
                                        + '<b>%s</b></a><span class="mail"> [%s]</span><span class="date_label"> \93\8a\8de\93ú\81F</span>'
-                                       + '<span class="date"> %s</span></div><div class="mes">%s </div>';
+                                       + '<span class="date"> %s</span></div><div class="mes">%s</div>'#13#10;
 
        FORMAT_NOSHOW = '<a name="%s"></a><div class="header"><span class="no"><a href="menu:%s">%s</a></span>'
                                        + '<span class="name_label"> \96¼\91O\81F </span><a class="name_mail" href="mailto:%s">'
                                        + '<b>%s</b></a><span class="date_label"> \93\8a\8de\93ú\81F</span><span class="date"> %s</span></div>'
-                                       + '<div class="mes">%s </div>';
+                                       + '<div class="mes">%s</div>'#13#10;
 
 var
        i: integer;