diff --git a/src/cascadia/TerminalSettingsModel/CascadiaSettings.idl b/src/cascadia/TerminalSettingsModel/CascadiaSettings.idl index 7f81dded89..1675a5151a 100644 --- a/src/cascadia/TerminalSettingsModel/CascadiaSettings.idl +++ b/src/cascadia/TerminalSettingsModel/CascadiaSettings.idl @@ -2,7 +2,6 @@ // Licensed under the MIT license. import "GlobalAppSettings.idl"; -import "WindowSettings.idl"; import "Profile.idl"; import "TerminalWarnings.idl"; import "DefaultTerminal.idl"; diff --git a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl index d48121043b..7755297dbe 100644 --- a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl +++ b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl @@ -85,4 +85,59 @@ namespace Microsoft.Terminal.Settings.Model Boolean ShouldUsePersistedLayout(); } + + [default_interface] runtimeclass WindowSettings + { + WindowSettings(); + + String Name { get; }; + Guid DefaultProfile; + + INHERITABLE_SETTING(String, UnparsedDefaultProfile); + + INHERITABLE_SETTING(Int32, InitialRows); + INHERITABLE_SETTING(Int32, InitialCols); + INHERITABLE_SETTING(Boolean, AlwaysShowTabs); + INHERITABLE_SETTING(Boolean, ShowTabsFullscreen); + INHERITABLE_SETTING(NewTabPosition, NewTabPosition); + INHERITABLE_SETTING(Boolean, ShowTitleInTitlebar); + INHERITABLE_SETTING(Microsoft.UI.Xaml.Controls.TabViewWidthMode, TabWidthMode); + INHERITABLE_SETTING(Boolean, UseAcrylicInTabRow); + INHERITABLE_SETTING(Boolean, ShowTabsInTitlebar); + INHERITABLE_SETTING(String, WordDelimiters); + INHERITABLE_SETTING(Boolean, CopyOnSelect); + INHERITABLE_SETTING(Microsoft.Terminal.Control.CopyFormat, CopyFormatting); + INHERITABLE_SETTING(Boolean, WarnAboutLargePaste); + INHERITABLE_SETTING(Microsoft.Terminal.Control.WarnAboutMultiLinePaste, WarnAboutMultiLinePaste); + INHERITABLE_SETTING(Boolean, TrimPaste); + INHERITABLE_SETTING(LaunchPosition, InitialPosition); + INHERITABLE_SETTING(Boolean, CenterOnLaunch); + INHERITABLE_SETTING(Microsoft.Terminal.Control.DefaultInputScope, DefaultInputScope); + INHERITABLE_SETTING(LaunchMode, LaunchMode); + INHERITABLE_SETTING(Boolean, SnapToGridOnResize); + INHERITABLE_SETTING(Microsoft.Terminal.Control.GraphicsAPI, GraphicsAPI); + INHERITABLE_SETTING(Boolean, DisablePartialInvalidation); + INHERITABLE_SETTING(Boolean, SoftwareRendering); + INHERITABLE_SETTING(Microsoft.Terminal.Control.TextMeasurement, TextMeasurement); + INHERITABLE_SETTING(Microsoft.Terminal.Control.AmbiguousWidth, AmbiguousWidth); + INHERITABLE_SETTING(Boolean, UseBackgroundImageForWindow); + INHERITABLE_SETTING(Boolean, AlwaysOnTop); + INHERITABLE_SETTING(Boolean, AutoHideWindow); + INHERITABLE_SETTING(TabSwitcherMode, TabSwitcherMode); + INHERITABLE_SETTING(Boolean, DisableAnimations); + INHERITABLE_SETTING(String, StartupActions); + INHERITABLE_SETTING(Boolean, FocusFollowMouse); + INHERITABLE_SETTING(Boolean, ScrollToZoom); + INHERITABLE_SETTING(Boolean, ScrollToChangeOpacity); + INHERITABLE_SETTING(Boolean, TrimBlockSelection); + INHERITABLE_SETTING(Boolean, DetectURLs); + INHERITABLE_SETTING(Boolean, MinimizeToNotificationArea); + INHERITABLE_SETTING(Boolean, ShowAdminShield); + INHERITABLE_SETTING(IVector, NewTabMenu); + INHERITABLE_SETTING(Boolean, EnableShellCompletionMenu); + INHERITABLE_SETTING(Boolean, EnableUnfocusedAcrylic); + INHERITABLE_SETTING(String, SearchWebDefaultQueryUrl); + INHERITABLE_SETTING(IVector, SafeUriSchemes); + INHERITABLE_SETTING(ThemePair, Theme); + } } diff --git a/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj b/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj index b9bffda2f7..bb9297f4b4 100644 --- a/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj +++ b/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj @@ -83,7 +83,7 @@ GlobalAppSettings.idl - WindowSettings.idl + GlobalAppSettings.idl @@ -165,7 +165,7 @@ GlobalAppSettings.idl - WindowSettings.idl + GlobalAppSettings.idl KeyChordSerialization.idl @@ -228,7 +228,6 @@ - diff --git a/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj.filters b/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj.filters index 9c20182e26..7185db7d0b 100644 --- a/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj.filters +++ b/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj.filters @@ -106,7 +106,6 @@ - diff --git a/src/cascadia/TerminalSettingsModel/WindowSettings.idl b/src/cascadia/TerminalSettingsModel/WindowSettings.idl deleted file mode 100644 index e7d36956e8..0000000000 --- a/src/cascadia/TerminalSettingsModel/WindowSettings.idl +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -#include "IInheritable.idl.h" - -import "GlobalAppSettings.idl"; -import "NewTabMenuEntry.idl"; - -namespace Microsoft.Terminal.Settings.Model -{ - [default_interface] runtimeclass WindowSettings - { - WindowSettings(); - - String Name { get; }; - Guid DefaultProfile; - - INHERITABLE_SETTING(String, UnparsedDefaultProfile); - - INHERITABLE_SETTING(Int32, InitialRows); - INHERITABLE_SETTING(Int32, InitialCols); - INHERITABLE_SETTING(Boolean, AlwaysShowTabs); - INHERITABLE_SETTING(Boolean, ShowTabsFullscreen); - INHERITABLE_SETTING(NewTabPosition, NewTabPosition); - INHERITABLE_SETTING(Boolean, ShowTitleInTitlebar); - INHERITABLE_SETTING(Microsoft.UI.Xaml.Controls.TabViewWidthMode, TabWidthMode); - INHERITABLE_SETTING(Boolean, UseAcrylicInTabRow); - INHERITABLE_SETTING(Boolean, ShowTabsInTitlebar); - INHERITABLE_SETTING(String, WordDelimiters); - INHERITABLE_SETTING(Boolean, CopyOnSelect); - INHERITABLE_SETTING(Microsoft.Terminal.Control.CopyFormat, CopyFormatting); - INHERITABLE_SETTING(Boolean, WarnAboutLargePaste); - INHERITABLE_SETTING(Microsoft.Terminal.Control.WarnAboutMultiLinePaste, WarnAboutMultiLinePaste); - INHERITABLE_SETTING(Boolean, TrimPaste); - INHERITABLE_SETTING(LaunchPosition, InitialPosition); - INHERITABLE_SETTING(Boolean, CenterOnLaunch); - INHERITABLE_SETTING(Microsoft.Terminal.Control.DefaultInputScope, DefaultInputScope); - INHERITABLE_SETTING(LaunchMode, LaunchMode); - INHERITABLE_SETTING(Boolean, SnapToGridOnResize); - INHERITABLE_SETTING(Microsoft.Terminal.Control.GraphicsAPI, GraphicsAPI); - INHERITABLE_SETTING(Boolean, DisablePartialInvalidation); - INHERITABLE_SETTING(Boolean, SoftwareRendering); - INHERITABLE_SETTING(Microsoft.Terminal.Control.TextMeasurement, TextMeasurement); - INHERITABLE_SETTING(Microsoft.Terminal.Control.AmbiguousWidth, AmbiguousWidth); - INHERITABLE_SETTING(Boolean, UseBackgroundImageForWindow); - INHERITABLE_SETTING(Boolean, AlwaysOnTop); - INHERITABLE_SETTING(Boolean, AutoHideWindow); - INHERITABLE_SETTING(TabSwitcherMode, TabSwitcherMode); - INHERITABLE_SETTING(Boolean, DisableAnimations); - INHERITABLE_SETTING(String, StartupActions); - INHERITABLE_SETTING(Boolean, FocusFollowMouse); - INHERITABLE_SETTING(Boolean, ScrollToZoom); - INHERITABLE_SETTING(Boolean, ScrollToChangeOpacity); - INHERITABLE_SETTING(Boolean, TrimBlockSelection); - INHERITABLE_SETTING(Boolean, DetectURLs); - INHERITABLE_SETTING(Boolean, MinimizeToNotificationArea); - INHERITABLE_SETTING(Boolean, ShowAdminShield); - INHERITABLE_SETTING(IVector, NewTabMenu); - INHERITABLE_SETTING(Boolean, EnableShellCompletionMenu); - INHERITABLE_SETTING(Boolean, EnableUnfocusedAcrylic); - INHERITABLE_SETTING(String, SearchWebDefaultQueryUrl); - INHERITABLE_SETTING(IVector, SafeUriSchemes); - INHERITABLE_SETTING(ThemePair, Theme); - } -}