-
Notifications
You must be signed in to change notification settings - Fork 0
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
garyhertel
wants to merge
66
commits into
mainline
Choose a base branch
from
sd2
base: mainline
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Sd2 #4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.