Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sd2 #4

Open
wants to merge 66 commits into
base: mainline
Choose a base branch
from
Open

Sd2 #4

wants to merge 66 commits into from

Conversation

garyhertel
Copy link
Owner

No description provided.

- Adding [Column], HotKeys, Temp Path, DataItem, TaskQueue
# Conflicts:
#	Libraries/Atlas.Tabs/TabInstance.cs
#	Libraries/Atlas.UI.Avalonia/Themes/Fluent/Accents/FluentBaseLight.xaml
- Removed [MinValue] and [MaxValue] in favor of [Range]
- Changed Param Labels to Top Alignment
Added bookmark support for custom controls
- Switched main navigation arrows to simplified style
- Renamed the existing Left & Right arrow icons to Left/RightArrowCircle
- Added rounded borders for Toolbar Icons when highlighting
- Fluent Dark Theme
  - Updated ToolTip background
  - Incrased ToolTip border thickness
- Decreased Fluent ToolTip border padding
- CallTimer.Stop() now stops the task too instead of waiting for dispose
- Fixed custom constructor when type disappears
- Disabled UserSettings.TemporaryDataExpiration until it gets used
- Fixed SelectedRow not handling null values
- Enabled [AutoSize] for ListMember.Name
- Added DataGrid Copy Cell Value context menu item
# Conflicts:
#	Libraries/Atlas.Core/CallTimer.cs
#	Libraries/Atlas.Serialize/DataRepo/DataItemCollection.cs
#	Libraries/Atlas.Tabs/Settings/SelectedRow.cs
#	Libraries/Atlas.Tabs/TabInstance.cs
#	Libraries/Atlas.UI.Avalonia/Controls/DataGrid/DataGridContextMenu.cs
#	Libraries/Atlas.UI.Avalonia/Controls/TabControlComboBox.cs
#	Libraries/Atlas.UI.Avalonia/Controls/TabControlParams.cs
#	Libraries/Atlas.UI.Avalonia/Controls/TabControlTextBox.cs
#	Libraries/Atlas.UI.Avalonia/View/TabView.cs
- Added a sequence index to DataRepoInstance
- Removed DataItemCollection from DataItem
…o sd2

# Conflicts:
#	Libraries/Atlas.Resources/Atlas.Resources.csproj
#	Libraries/Atlas.Resources/Icons.cs
#	Libraries/Atlas.Serialize/DataRepo/DataRepoInstance.cs
#	Libraries/Atlas.Tabs.Tools/FileBrowser/TabFile.cs
#	Libraries/Atlas.Tabs/TabToolbar.cs
#	Libraries/Atlas.UI.Avalonia/Controls/ToolBar/TabControlToolbar.cs
#	Libraries/Atlas.UI.Avalonia/Controls/ToolBar/ToolbarButton.cs
#	Libraries/Atlas.UI.Avalonia/Themes/Fluent/Accents/FluentBaseLight.xaml
#	Libraries/Atlas.UI.Avalonia/Utilities/SvgUtils.cs
# Conflicts:
#	Libraries/Atlas.Serialize/DataRepo/DataItemCollection.cs
#	Libraries/Atlas.UI.Avalonia/Controls/TabControlParams.cs
#	Libraries/Atlas.UI.Avalonia/Controls/ToolBar/ToolbarButton.cs
#	Libraries/Atlas.UI.Avalonia/View/TabView.cs
# Conflicts:
#	Docs/Credits.md
#	Libraries/Atlas.Tabs/TabToolbar.cs
#	Libraries/Atlas.UI.Avalonia/Controls/TabControlParams.cs
#	Libraries/Atlas.UI.Avalonia/Controls/ToolBar/ToolbarButton.cs
#	Libraries/Atlas.UI.Avalonia/View/TabView.cs
# Conflicts:
#	Libraries/Atlas.UI.Avalonia/View/TabView.cs
# Conflicts:
#	Libraries/Atlas.Tabs.Tools/FileBrowser/TabDirectory.cs
# Conflicts:
#	Libraries/Atlas.Tabs.Tools/FileBrowser/TabDirectory.cs
#	Libraries/Atlas.Tabs.Tools/FileBrowser/TabDrives.cs
# Conflicts:
#	Libraries/Atlas.Core/Attributes/TabMemberAttributes.cs
#	Libraries/Atlas.Serialize/DataRepo/DataItemCollection.cs
#	Libraries/Atlas.Serialize/DataRepo/DataRepo.cs
#	Libraries/Atlas.Serialize/DataRepo/DataRepoInstance.cs
#	Libraries/Atlas.Serialize/DataRepo/DataRepoView.cs
#	Libraries/Atlas.Tabs.Tools/FileBrowser/TabDrives.cs
#	Libraries/Atlas.Tabs.Tools/FileBrowser/TabFile.cs
# Conflicts:
#	Libraries/Atlas.Serialize/DataRepo/DataPageView.cs
#	Libraries/Atlas.Serialize/DataRepo/DataRepoIndex.cs
#	Libraries/Atlas.Serialize/DataRepo/DataRepoInstance.cs
#	Libraries/Atlas.Serialize/DataRepo/DataRepoView.cs
#	Libraries/Atlas.Tabs.Tools/FileBrowser/TabDirectory.cs
#	Libraries/Atlas.Tabs.Tools/FileBrowser/TabDrives.cs
#	Libraries/Atlas.Tabs.Tools/FileBrowser/TabFile.cs
#	Libraries/Atlas.Tabs/TabInstance.cs
#	Test/Atlas.Serialize.Test/TestDataRepo.cs
# Conflicts:
#	Libraries/Atlas.Tabs.Tools/FileBrowser/TabDirectory.cs
# Conflicts:
#	Libraries/Atlas.UI.Avalonia/Controls/TabControlComboBox.cs
#	Libraries/Atlas.UI.Avalonia/Controls/TabControlFormattedComboBox.cs
# Conflicts:
#	Libraries/Atlas.Tabs.Tools/FileBrowser/NodeView.cs
#	Libraries/Atlas.Tabs.Tools/FileBrowser/TabDirectory.cs
#	Libraries/Atlas.Tabs.Tools/FileBrowser/TabDrives.cs
#	Libraries/Atlas.Tabs.Tools/FileBrowser/TabFile.cs
# Conflicts:
#	Libraries/Atlas.Tabs/TabInterfaces.cs
#	Libraries/Atlas.UI.Avalonia/View/TabView.cs
# Conflicts:
#	Libraries/Atlas.Tabs/Settings/UserSettings.cs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant