Add options to set default values of auto hide and align tabs

Author: leafOfTree

WtProgram/ManagerViewService/Views/BehaviorView.fs

@@ -28,11 +28,37 @@ type HotKeyView() =
 
     let settingsCheckbox key = checkBox(settingsProperty(key))
 
+    let dropDown (prop:IProperty<string>, items: string list) = 
+        let combo = new ComboBox()
+
+        // First add items
+        combo.Items.AddRange(items |> List.toArray |> Array.map box)
+        
+        // Then set initial value if exists, otherwise select first item
+        let initialIndex = 
+            match items |> List.tryFindIndex ((=) prop.value) with
+            | Some index -> index
+            | None -> if combo.Items.Count > 0 then 0 else -1
+        
+        if initialIndex >= 0 then
+            combo.SelectedIndex <- initialIndex
+            
+        combo.SelectedIndexChanged.Add(fun _ ->
+            if combo.SelectedIndex >= 0 then
+                prop.value <- combo.SelectedItem.ToString()
+        )
+
+        combo :> Control
+
+    let settingsDropDown key value = dropDown(settingsProperty(key), value)
+
     let basicForm = 
         let fields = List2([
             ("runAtStartup", settingsCheckbox "runAtStartup")
             ("hideInactiveTabs", settingsCheckbox "hideInactiveTabs")
             ("isTabbingEnabledForAllProcessesByDefault", checkBox(prop<IFilterService, bool>(Services.filter, "isTabbingEnabledForAllProcessesByDefault")))
+            ("autoHide", settingsCheckbox "autoHide")
+            ("alignment", settingsDropDown "alignment" ["Left"; "Center"; "Right"])
         ])
         "Basics", UIHelper.form fields
 
@@ -63,14 +89,6 @@ type HotKeyView() =
             editor.value <- Services.program.getHotKey(key)
             editor.changed.Add <| fun() ->
                 Services.program.setHotKey key (unbox<int>(editor.value))
-        
-        let checkBox (prop:IProperty<bool>) = 
-            let checkbox = BoolEditor() :> IPropEditor
-            checkbox.value <- box(prop.value)
-            checkbox.changed.Add <| fun() -> prop.value <- unbox<bool>(checkbox.value)
-            checkbox.control
-
-        let settingsCheckbox key = checkBox(settingsProperty(key))
 
         let fields = hotKeys.map <| fun(key,text) ->
             let editor = editors.find key

WtProgram/Properties/Resources.ja-JP.resx

@@ -168,6 +168,12 @@
   <data name="enableHoverActivate" xml:space="preserve">
     <value>マウスホバーでタブを有効にする</value>
   </data>
+  <data name="autoHide" xml:space="preserve">
+    <value>最大化時にタブを自動的に隠す</value>
+  </data>
+  <data name="alignment" xml:space="preserve">
+    <value>タブの配置</value>
+  </data>
   <data name="Height" xml:space="preserve">
     <value>高さ</value>
   </data>

WtProgram/Properties/Resources.resx

@@ -168,6 +168,12 @@
   <data name="enableHoverActivate" xml:space="preserve">
     <value>Enable mouse hover to activate tab</value>
   </data>
+  <data name="autoHide" xml:space="preserve">
+    <value>Auto hide tab when maximized</value>
+  </data>
+  <data name="alignment" xml:space="preserve">
+    <value>Align tabs</value>
+  </data>
   <data name="Height" xml:space="preserve">
     <value>Height</value>
   </data>

WtProgram/Settings.fs

@@ -87,7 +87,9 @@ type Settings(isStandAlone) as this =
                     groupWindowsInSwitcher = settingsJson.getBool("groupWindowsInSwitcher").def(false)
                     enableCtrlNumberHotKey = settingsJson.getBool("enableCtrlNumberHotKey").def(true)
                     enableHoverActivate = settingsJson.getBool("enableHoverActivate").def(false)
+                    autoHide = settingsJson.getBool("autoHide").def(true)
                     version = settingsJson.getString("version").def(String.Empty)
+                    alignment = settingsJson.getString("alignment").def("Center")
                     tabAppearance =
                         let appearanceObject = settingsJson.getObject("tabAppearance").def(JObject())
                         appearanceObject.items.fold this.defaultTabAppearance <| fun appearance (key,value) ->
@@ -106,6 +108,7 @@ type Settings(isStandAlone) as this =
             let settingsJson = this.settingsJson
             settingsJson.setString("version", settings.version)
             settingsJson.setString("licenseKey", settings.licenseKey)
+            settingsJson.setString("alignment", settings.alignment)
             settings.ticket.iter <| fun ticket -> settingsJson.setString("ticket", ticket)
             settingsJson.setBool("runAtStartup", settings.runAtStartup)
             settingsJson.setBool("hideInactiveTabs", settings.hideInactiveTabs)
@@ -115,6 +118,7 @@ type Settings(isStandAlone) as this =
             settingsJson.setBool("groupWindowsInSwitcher", settings.groupWindowsInSwitcher)
             settingsJson.setBool("enableCtrlNumberHotKey", settings.enableCtrlNumberHotKey)
             settingsJson.setBool("enableHoverActivate", settings.enableHoverActivate)
+            settingsJson.setBool("autoHide", settings.autoHide)
             settingsJson.setStringArray("includedPaths", settings.includedPaths.items)
             settingsJson.setStringArray("excludedPaths", settings.excludedPaths.items)
             settingsJson.setStringArray("autoGroupingPaths", settings.autoGroupingPaths.items)

WtProgram/Shared/ProgramTypes.fs

@@ -32,6 +32,8 @@ type SettingsRec = {
     enableCtrlNumberHotKey: bool
     combineIconsInTaskbar: bool
     enableHoverActivate: bool
+    autoHide: bool
+    alignment: string
     }
 
 type ILicenseManager =

WtProgram/TabStrip.fs

@@ -35,7 +35,18 @@ type TabStrip(monitor:ITabStripMonitor) as this =
     let showInsideCell = Cell.create(false)
     let isInAltTabCell = Cell.create(false)
     let iconOnlyCell = Cell.create(false)
-    let alignment = Cell.create(Map2(List2([(TabUp,TabLeft);(TabDown,TabCenter)])))
+    let alignmentMap = 
+        Map.ofList [
+            "Left", TabLeft
+            "Center", TabCenter
+            "Right", TabRight
+        ]
+    let alignmentDefault = 
+        let alignmentDefault = Services.settings.getValue("alignment").cast<string>()
+        match alignmentMap.TryFind alignmentDefault with
+        | Some align -> align
+        | None -> TabCenter
+    let alignment = Cell.create(Map2(List2([(TabUp,alignmentDefault);(TabDown,alignmentDefault)])))
     let capturedCell = Cell.create(None : Option<Tab*TabPart>)
     let hoverCell = Cell.create(None : Option<Tab*TabPart>)
     let slideCell = Cell.create(None)
@@ -68,7 +79,7 @@ type TabStrip(monitor:ITabStripMonitor) as this =
 
         Cell.listen <| fun() ->
             this.update()
-       
+
     member private this.inAltSwitch = isInAltTabCell.value
 
     member private this.layeredWindow = layeredWindowCell.value.Value

WtProgram/TabStripDecorator.fs

@@ -167,7 +167,8 @@ type TabStripDecorator(group:WindowGroup) as this =
             })
 
         let autoHideItem =
-            let isEnabled = group.bb.read("autoHide", true)
+            let isAutoHideEnabledDef = Services.settings.getValue("autoHide").cast<bool>()
+            let isEnabled = group.bb.read("autoHide", isAutoHideEnabledDef)
             CmiRegular({
                 text = "Auto hide maximized"
                 flags = checked(isEnabled)
@@ -295,7 +296,9 @@ type TabStripDecorator(group:WindowGroup) as this =
             let update() = cell.value <- group.bb.read(key, def)
             group.bb.subscribe key update
             cell
-        let autoHideCell = propCell("autoHide", true)
+
+        let isAutoHideEnabledDef = Services.settings.getValue("autoHide").cast<bool>()
+        let autoHideCell = propCell("autoHide", isAutoHideEnabledDef)
         let contextMenuVisibleCell = propCell("contextMenuVisible", false)
         let renamingTabCell = propCell("renamingTab", false)
         let isRecentlyChangedZorderCell =