diff --git a/modules/webapp/src/main/elm/Comp/SearchMenu.elm b/modules/webapp/src/main/elm/Comp/SearchMenu.elm index 29118524..f991aeac 100644 --- a/modules/webapp/src/main/elm/Comp/SearchMenu.elm +++ b/modules/webapp/src/main/elm/Comp/SearchMenu.elm @@ -596,7 +596,7 @@ view flags settings model = ] , Html.map TagSelectMsg (Comp.TagSelect.view settings model.tagSelectModel) , Html.map FolderSelectMsg - (Comp.FolderSelect.view settings.searchMenuFolders model.folderList) + (Comp.FolderSelect.view settings.searchMenuFolderCount model.folderList) , formHeaderHelp nameIcon "Names" ToggleNameHelp , span [ classList diff --git a/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm b/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm index dbdedc66..6d6879bb 100644 --- a/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm +++ b/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm @@ -30,8 +30,8 @@ type alias Model = , itemSearchNoteLength : Maybe Int , searchNoteLengthModel : Comp.IntField.Model , itemDetailNotesPosition : Pos - , searchMenuFolders : Maybe Int - , searchMenuFoldersModel : Comp.IntField.Model + , searchMenuFolderCount : Maybe Int + , searchMenuFolderCountModel : Comp.IntField.Model } @@ -58,8 +58,8 @@ init flags settings = False "Max. Note Length" , itemDetailNotesPosition = settings.itemDetailNotesPosition - , searchMenuFolders = Just settings.searchMenuFolders - , searchMenuFoldersModel = + , searchMenuFolderCount = Just settings.searchMenuFolderCount + , searchMenuFolderCountModel = Comp.IntField.init (Just 0) (Just 2000) @@ -122,15 +122,15 @@ update sett msg model = SearchMenuFolderMsg lm -> let ( m, n ) = - Comp.IntField.update lm model.searchMenuFoldersModel + Comp.IntField.update lm model.searchMenuFolderCountModel nextSettings = - Maybe.map (\len -> { sett | searchMenuFolders = len }) n + Maybe.map (\len -> { sett | searchMenuFolderCount = len }) n model_ = { model - | searchMenuFoldersModel = m - , searchMenuFolders = n + | searchMenuFolderCountModel = m + , searchMenuFolderCount = n } in ( model_, nextSettings ) @@ -235,9 +235,9 @@ view flags _ model = , Html.map SearchMenuFolderMsg (Comp.IntField.viewWithInfo "How many folders to display in search menu at once. Other folders can be expanded." - model.searchMenuFolders + model.searchMenuFolderCount "field" - model.searchMenuFoldersModel + model.searchMenuFolderCountModel ) , div [ class "ui dividing header" ] [ text "Item Detail" diff --git a/modules/webapp/src/main/elm/Data/UiSettings.elm b/modules/webapp/src/main/elm/Data/UiSettings.elm index a13cc8a7..00c76c5a 100644 --- a/modules/webapp/src/main/elm/Data/UiSettings.elm +++ b/modules/webapp/src/main/elm/Data/UiSettings.elm @@ -33,7 +33,7 @@ type alias StoredUiSettings = , nativePdfPreview : Bool , itemSearchNoteLength : Maybe Int , itemDetailNotesPosition : Maybe String - , searchMenuFolders : Maybe Int + , searchMenuFolderCount : Maybe Int } @@ -50,7 +50,7 @@ type alias UiSettings = , nativePdfPreview : Bool , itemSearchNoteLength : Int , itemDetailNotesPosition : Pos - , searchMenuFolders : Int + , searchMenuFolderCount : Int } @@ -89,7 +89,7 @@ defaults = , nativePdfPreview = False , itemSearchNoteLength = 0 , itemDetailNotesPosition = Top - , searchMenuFolders = 5 + , searchMenuFolderCount = 4 } @@ -111,9 +111,9 @@ merge given fallback = , itemDetailNotesPosition = choose (Maybe.andThen posFromString given.itemDetailNotesPosition) fallback.itemDetailNotesPosition - , searchMenuFolders = - choose given.searchMenuFolders - fallback.searchMenuFolders + , searchMenuFolderCount = + choose given.searchMenuFolderCount + fallback.searchMenuFolderCount } @@ -131,7 +131,7 @@ toStoredUiSettings settings = , nativePdfPreview = settings.nativePdfPreview , itemSearchNoteLength = Just settings.itemSearchNoteLength , itemDetailNotesPosition = Just (posToString settings.itemDetailNotesPosition) - , searchMenuFolders = Just settings.searchMenuFolders + , searchMenuFolderCount = Just settings.searchMenuFolderCount }