-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- UI improvements + fixes
- Loading branch information
Showing
37 changed files
with
1,232 additions
and
37 deletions.
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <UserControl xmlns="https://github.com/avaloniaui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| xmlns:local="using:Eos.Usercontrols" | ||
| mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" | ||
| x:Class="Eos.Usercontrols.CustomTableComboBox" | ||
| x:Name="ucCustomTableComboBox"> | ||
| <UserControl.Resources> | ||
| <ResourceDictionary> | ||
| <ResourceDictionary.MergedDictionaries> | ||
| <ResourceInclude Source="/Assets/ConverterResources.axaml"/> | ||
| </ResourceDictionary.MergedDictionaries> | ||
| </ResourceDictionary> | ||
| </UserControl.Resources> | ||
|
|
||
| <Grid DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:CustomTableComboBox}}}"> | ||
| <Grid.ColumnDefinitions> | ||
| <ColumnDefinition Width="*"/> | ||
| <ColumnDefinition Width="Auto"/> | ||
| <ColumnDefinition Width="Auto"/> | ||
| </Grid.ColumnDefinitions> | ||
|
|
||
| <Button x:Name="cbCustomTables" Grid.Column="0" Click="btSearch_Click" HorizontalContentAlignment="Stretch" MinHeight="22"> | ||
| <Button.Content> | ||
| <TextBlock Text="{Binding ElementName=ucCustomTableComboBox, Path=SelectedValue.Label}" Margin="3,0,0,0"/> | ||
| </Button.Content> | ||
| </Button> | ||
|
|
||
| <Button x:Name="btClear" Grid.Column="1" Content="🞪" Click="btClear_Click" Margin="2,0,0,0" | ||
| Height="{Binding ElementName=cbCustomTables, Path=Bounds.Height}" Width="{Binding ElementName=cbCustomTables, Path=Bounds.Height}" | ||
| IsVisible="{Binding ElementName=ucCustomTableComboBox, Path=IsNullable}"/> | ||
| <Button x:Name="btGoto" Grid.Column="2" Margin="2,0,0,0" Content="👁" Click="btGoto_Click" | ||
| Height="{Binding ElementName=cbCustomTables, Path=Bounds.Height}" Width="{Binding ElementName=cbCustomTables, Path=Bounds.Height}"/> | ||
| </Grid> | ||
| </UserControl> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| using Avalonia; | ||
| using Avalonia.Controls; | ||
| using Avalonia.Data; | ||
| using Avalonia.Interactivity; | ||
| using Eos.Models; | ||
| using Eos.Models.Tables; | ||
| using Eos.Repositories; | ||
| using Eos.Services; | ||
| using Eos.ViewModels.Base; | ||
| using Eos.ViewModels.Dialogs; | ||
|
|
||
| namespace Eos.Usercontrols | ||
| { | ||
| public partial class CustomTableComboBox : UserControl | ||
| { | ||
| public CustomTableComboBox() | ||
| { | ||
| InitializeComponent(); | ||
| } | ||
|
|
||
| public static readonly StyledProperty<CustomTable?> CustomTableTemplateProperty = AvaloniaProperty.Register<CustomTableComboBox, CustomTable?>("CustomTableTemplate", null); | ||
| public static readonly StyledProperty<CustomTableInstance?> SelectedValueProperty = AvaloniaProperty.Register<CustomTableComboBox, CustomTableInstance?>("SelectedValue", null, false, BindingMode.TwoWay); | ||
| public static readonly StyledProperty<bool> IsNullableProperty = AvaloniaProperty.Register<CustomTableComboBox, bool>("IsNullable", true); | ||
|
|
||
| public CustomTable? CustomTableTemplate | ||
| { | ||
| get { return GetValue(CustomTableTemplateProperty); } | ||
| set { SetValue(CustomTableTemplateProperty, value); } | ||
| } | ||
|
|
||
| public CustomTableInstance? SelectedValue | ||
| { | ||
| get { return GetValue(SelectedValueProperty); } | ||
| set { SetValue(SelectedValueProperty, value); } | ||
| } | ||
|
|
||
| public bool IsNullable | ||
| { | ||
| get { return GetValue(IsNullableProperty); } | ||
| set { SetValue(IsNullableProperty, value); } | ||
| } | ||
|
|
||
| private void btClear_Click(object sender, RoutedEventArgs e) | ||
| { | ||
| SetValue(SelectedValueProperty, null); | ||
| } | ||
|
|
||
| private void btSearch_Click(object sender, RoutedEventArgs e) | ||
| { | ||
| if (CustomTableTemplate != null) | ||
| { | ||
| var viewModel = new CustomTableInstanceSearchViewModel(CustomTableTemplate, MasterRepository.Project.CustomTableRepositories[CustomTableTemplate]); | ||
| WindowService.OpenDialog(viewModel); | ||
| if (viewModel.ResultModel != null) | ||
| SetValue(SelectedValueProperty, viewModel.ResultModel); | ||
| } | ||
| } | ||
|
|
||
| private void btGoto_Click(object sender, RoutedEventArgs e) | ||
| { | ||
| MessageDispatcher.Send(MessageType.OpenDetail, SelectedValue, true); | ||
| } | ||
| } | ||
| } |
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| using Eos.Models.Tables; | ||
| using Eos.Types; | ||
| using Eos.ViewModels.Base; | ||
| using ReactiveUI; | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Reactive; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace Eos.ViewModels | ||
| { | ||
| public class CustomTableInstanceViewModel : DataDetailViewModel<CustomTableInstance> | ||
| { | ||
| public CustomTableInstanceViewModel() : base() | ||
| { | ||
| DeleteItemCommand = ReactiveCommand.Create<CustomTableInstanceItem>(DeleteItem); | ||
| AddItemCommand = ReactiveCommand.Create(AddItem); | ||
| } | ||
|
|
||
| public CustomTableInstanceViewModel(CustomTableInstance instance) : base(instance) | ||
| { | ||
| DeleteItemCommand = ReactiveCommand.Create<CustomTableInstanceItem>(DeleteItem); | ||
| AddItemCommand = ReactiveCommand.Create(AddItem); | ||
| } | ||
|
|
||
| protected override HashSet<String> GetHeaderSourceFields() | ||
| { | ||
| return new HashSet<String>() | ||
| { | ||
| "Label" | ||
| }; | ||
| } | ||
|
|
||
| protected override string GetHeader() | ||
| { | ||
| return Data.Label; | ||
| } | ||
|
|
||
| private void AddItem() | ||
| { | ||
| var newItem = new CustomTableInstanceItem(); | ||
| Data.Add(newItem); | ||
| NotifyPropertyChanged("Data"); | ||
| } | ||
|
|
||
| private void DeleteItem(CustomTableInstanceItem item) | ||
| { | ||
| this.Data.Remove(item); | ||
| NotifyPropertyChanged("Data"); | ||
| } | ||
|
|
||
| public ReactiveCommand<CustomTableInstanceItem, Unit> DeleteItemCommand { get; private set; } | ||
| public ReactiveCommand<Unit, Unit> AddItemCommand { get; private set; } | ||
| } | ||
| } |
Oops, something went wrong.