BrowserTabとスレ一覧のフォントのスタイル指定をできるようにした。

diff --git a/Giko.pas b/Giko.pas
index 9ba09ad..a3033dc 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -1374,15 +1374,27 @@ begin
                TreeView.Font.Size := GikoSys.Setting.CabinetFontSize;
                TreeView.Font.Color := GikoSys.Setting.CabinetFontColor;
                TreeView.Color := GikoSys.Setting.CabinetBackColor;
-
-               FavoriteTreeView.Font.Name := GikoSys.Setting.CabinetFontName;
-               FavoriteTreeView.Font.Size := GikoSys.Setting.CabinetFontSize;
-               FavoriteTreeView.Font.Color := GikoSys.Setting.CabinetFontColor;
+               {TreeView.Font.Style := [];
+               if GikoSys.Setting.CabinetFontBold then
+                       TreeView.Font.Style := [fsBold];
+               if GikoSys.Setting.CabinetFontItalic then
+                       TreeView.Font.Style := TreeView.Font.Style + [fsItalic];
+               }
+               //FavoriteTreeView.Font.Name := GikoSys.Setting.CabinetFontName;
+               //FavoriteTreeView.Font.Size := GikoSys.Setting.CabinetFontSize;
+               //FavoriteTreeView.Font.Color := GikoSys.Setting.CabinetFontColor;
+               FavoriteTreeView.Font.Assign(TreeView.Font);
                FavoriteTreeView.Color := GikoSys.Setting.CabinetBackColor;
 
                ListView.Font.Name := GikoSys.Setting.ListFontName;
                ListView.Font.Size := GikoSys.Setting.ListFontSize;
                ListView.Font.Color := GikoSys.Setting.ListFontColor;
+               ListView.Font.Style := [];
+               if GikoSys.Setting.ListFontBold then
+                       ListView.Font.Style := [fsbold];
+               if GikoSys.Setting.ListFontItalic then
+                       ListView.Font.Style := ListView.Font.Style + [fsitalic];
+
                ListViewBackGroundColor := clWhite;                                                                                             // \83f\83t\83H\83\8b\83g\82É\90Ý\92è\82µ\82½\82Ì\82¿
                ListViewBackGroundColor := GikoSys.Setting.ListBackColor;       // \83\86\81[\83U\92è\8b`\82É\95Ï\8dX
                FUseOddResOddColor := GikoSys.Setting.UseOddColorOddResNum;
@@ -1399,6 +1411,11 @@ begin
        //\83u\83\89\83E\83U\83^\83u\83t\83H\83\93\83g
        BrowserTab.Font.Name := GikoSys.Setting.BrowserTabFontName;
        BrowserTab.Font.Size := GikoSys.Setting.BrowserTabFontSize;
+       BrowserTab.Font.Style := [];
+       if GikoSys.Setting.BrowserTabFontBold then
+               BrowserTab.Font.Style := [fsBold];
+       if GikoSys.Setting.BrowserTabFontItalic then
+               BrowserTab.Font.Style := GikoForm.BrowserTab.Font.Style + [fsItalic];
        FDragWFirst := false;
        SetContent(BrowserNullTab);                                                                                                     //\83u\83\89\83E\83U\82ð\8bó\94\92\95\\8e¦
 //     TreeView.TopItem.Expanded := True;                              //\83c\83\8a\81[\83g\83b\83v\8d\80\96Ú\82¾\82¯\82ð\8aJ\82­

diff --git a/Option.dfm b/Option.dfm
index 2ae2bbb..bf840cc 100644 (file)
--- a/Option.dfm
+++ b/Option.dfm
@@ -60,9 +60,9 @@ object OptionDialog: TOptionDialog
     Top = 4
     Width = 509
     Height = 389
-    ActivePage = TabSheet2
+    ActivePage = Font1Sheet
     MultiLine = True
-    TabIndex = 6
+    TabIndex = 1
     TabOrder = 3
     OnChange = OptionTabChange
     object ConnectSheet: TTabSheet

diff --git a/Option.pas b/Option.pas
index 40a3de2..9f0a65d 100644 (file)
--- a/Option.pas
+++ b/Option.pas
@@ -550,11 +550,23 @@ begin
        CabinetMemo.Font.Name := GikoSys.Setting.CabinetFontName;
        CabinetMemo.Font.Size := GikoSys.Setting.CabinetFontSize;
        CabinetMemo.Font.Color := GikoSys.Setting.CabinetFontColor;
+       CabinetMemo.Font.Style := [];
+       if GikoSys.Setting.CabinetFontBold then
+               CabinetMemo.Font.Style := [fsBold];
+       if GikoSys.Setting.CabinetFontItalic then
+               CabinetMemo.Font.Style := CabinetMemo.Font.Style + [fsItalic];
        CabinetMemo.Color := GikoSys.Setting.CabinetBackColor;
+
        //\83X\83\8c\83b\83h\83\8a\83X\83g\83t\83H\83\93\83g
        ListMemo.Font.Name := GikoSys.Setting.ListFontName;
        ListMemo.Font.Size := GikoSys.Setting.ListFontSize;
        ListMemo.Font.Color := GikoSys.Setting.ListFontColor;
+       ListMemo.Font.Style := [];
+       if GikoSys.Setting.ListFontBold then
+               ListMemo.Font.Style := ListMemo.Font.Style + [fsBold];
+       if GikoSys.Setting.ListFontItalic then
+               ListMemo.Font.Style := ListMemo.Font.Style + [fsItalic];
+
        ListMemo.Color := GikoSys.Setting.ListBackColor;
        //\83\8c\83X\90\94\91\9d\8c¸\83X\83\8c\8b­\92²\95\\8e¦\83`\83F\83b\83N\83{\83b\83N\83X\81\95\83J\83\89\81[\83_\83C\83A\83\8d\83O
        OddResNumCheckBox.Checked := GikoSys.Setting.UseOddColorOddResNum;
@@ -830,11 +842,15 @@ begin
        GikoSys.Setting.CabinetFontName := CabinetMemo.Font.Name;
        GikoSys.Setting.CabinetFontSize := CabinetMemo.Font.Size;
        GikoSys.Setting.CabinetFontColor := CabinetMemo.Font.Color;
+       GikoSys.Setting.CabinetFontBold  := fsBold in CabinetMemo.Font.Style;
+       GikoSys.Setting.CabinetFontItalic:= fsItalic in CabinetMemo.Font.Style;
        GikoSys.Setting.CabinetBackColor := CabinetMemo.Color;
 
-       GikoSys.Setting.ListFontName := ListMemo.Font.Name;
-       GikoSys.Setting.ListFontSize := ListMemo.Font.Size;
-       GikoSys.Setting.ListFontColor := ListMemo.Font.Color;
+       GikoSys.Setting.ListFontName    := ListMemo.Font.Name;
+       GikoSys.Setting.ListFontSize    := ListMemo.Font.Size;
+       GikoSys.Setting.ListFontColor   := ListMemo.Font.Color;
+       GikoSys.Setting.ListFontBold    := fsBold in ListMemo.Font.Style;
+       GikoSys.Setting.ListFontItalic  := fsItalic in ListMemo.Font.Style;
        GikoSys.Setting.ListBackColor := ListMemo.Color;
        GikoSys.Setting.UseOddColorOddResNum := OddResNumCheckBox.Checked;
        GikoSys.Setting.OddColor := OddResNumColorBox.Selected;
@@ -846,7 +862,8 @@ begin
 
        GikoSys.Setting.BrowserTabFontName := BrowserTabMemo.Font.Name;
        GikoSys.Setting.BrowserTabFontSize := BrowserTabMemo.Font.Size;
-
+       GikoSys.Setting.BrowserTabFontBold := fsBold in BrowserTabMemo.Font.Style;
+       GikoSys.Setting.BrowserTabFontItalic := fsItalic in BrowserTabMemo.Font.Style;
        GikoSys.Setting.EditorFontName := EditorMemo.Font.Name;
        GikoSys.Setting.EditorFontSize := EditorMemo.Font.Size;
        GikoSys.Setting.EditorFontColor := EditorMemo.Font.Color;
@@ -1082,21 +1099,40 @@ begin
                GikoForm.TreeView.Font.Color := GikoSys.Setting.CabinetFontColor;
                GikoForm.TreeView.Color := GikoSys.Setting.CabinetBackColor;
 
-               GikoForm.FavoriteTreeView.Font.Name := GikoSys.Setting.CabinetFontName;
+               {GikoForm.TreeView.Font.Style := [];
+               if GikoSys.Setting.CabinetFontBold then
+                       GikoForm.TreeView.Font.Style := [fsBold];
+               if GikoSys.Setting.CabinetFontItalic then
+                       GikoForm.TreeView.Font.Style := GikoForm.TreeView.Font.Style + [fsItalic];
+               }
+               {GikoForm.FavoriteTreeView.Font.Name := GikoSys.Setting.CabinetFontName;
                GikoForm.FavoriteTreeView.Font.Size := GikoSys.Setting.CabinetFontSize;
                GikoForm.FavoriteTreeView.Font.Color := GikoSys.Setting.CabinetFontColor;
+               }
+               GikoForm.FavoriteTreeView.Font.Assign(GikoForm.TreeView.Font);
                GikoForm.FavoriteTreeView.Color := GikoSys.Setting.CabinetBackColor;
 
                GikoForm.ListView.Font.Name := GikoSys.Setting.ListFontName;
                GikoForm.ListView.Font.Size := GikoSys.Setting.ListFontSize;
                GikoForm.ListView.Font.Color := GikoSys.Setting.ListFontColor;
+               GikoForm.ListView.Font.Style := [];
+               if GikoSys.Setting.ListFontBold then
+                       GikoForm.ListView.Font.Style := [fsbold];
+               if GikoSys.Setting.ListFontItalic then
+                       GikoForm.ListView.Font.Style := GikoForm.ListView.Font.Style + [fsitalic];
+
                //GikoForm.ListView.Color := GikoSys.Setting.ListBackColor;
-                               GikoForm.ListViewBackGroundColor := GikoSys.Setting.ListBackColor;
+               GikoForm.ListViewBackGroundColor := GikoSys.Setting.ListBackColor;
         GikoForm.UseOddResOddColor := GikoSys.Setting.UseOddColorOddResNum;
         GikoForm.OddColor := GikoSys.Setting.OddColor;
 
                GikoForm.BrowserTab.Font.Name := GikoSys.Setting.BrowserTabFontName;
                GikoForm.BrowserTab.Font.Size := GikoSys.Setting.BrowserTabFontSize;
+               GikoForm.BrowserTab.Font.Style := [];
+               if GikoSys.Setting.BrowserTabFontBold then
+                       GikoForm.BrowserTab.Font.Style := [fsBold];
+               if GikoSys.Setting.BrowserTabFontItalic then
+                       GikoForm.BrowserTab.Font.Style := GikoForm.BrowserTab.Font.Style + [fsItalic];
 //             GikoForm.BrowserTab.Height := (GikoSys.Setting.BrowserTabFontSize * 2) + 1;
 //             GikoForm.BrowserBottomPanel.Height := GikoForm.BrowserTab.Height;
 

diff --git a/Setting.pas b/Setting.pas
index e13b4a0..f546c65 100644 (file)
--- a/Setting.pas
+++ b/Setting.pas
@@ -1331,13 +1331,17 @@ begin
                ini.WriteString('Window', 'CabinetFontName', FCabinetFontName);
                ini.WriteInteger('Window', 'CabinetFontSize', FCabinetFontSize);
                ini.WriteString('Window', 'CabinetFontColor', ColorToString(FCabinetFontColor));
+               ini.WriteBool('Window', 'CabinetFontBold', FCabinetFontBold);
+               ini.WriteBool('Window', 'CabinetFontItalic', FCabinetFontItalic);
                ini.WriteString('Window', 'CabinetBackColor', ColorToString(FCabinetBackColor));
 
                ini.WriteString('Window', 'ListFontName', FListFontName);
                ini.WriteInteger('Window', 'ListFontSize', FListFontSize);
                ini.WriteString('Window', 'ListFontColor', ColorToString(FListFontColor));
                ini.WriteString('Window', 'ListBackColor', ColorToString(FListBackColor));
-                ini.WriteBool('Window','UseOddColor',FUseOddColorOddResNum);
+               ini.WriteBool('Window', 'ListFontBold', FListFontBold);
+               ini.WriteBool('Window', 'ListFontItalic', FListFontItalic);
+                               ini.WriteBool('Window','UseOddColor',FUseOddColorOddResNum);
                 ini.WriteString('Window', 'OddColor',ColorToString(FOddColor));
 
                ini.WriteString('Window', 'EditorFontName', FEditorFontName);