Skip to content
This repository has been archived by the owner on Apr 6, 2020. It is now read-only.

Removed related account combobox control from ImportCustomContractView #107

Merged
merged 1 commit into from
Dec 24, 2017
Merged

Removed related account combobox control from ImportCustomContractView #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Neo.Gui.ViewModels/Accounts/ImportCustomContractViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
using System;
using System.Collections.ObjectModel;
using System.Linq;
using System.Windows.Input;

using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Command;

using Neo.Core;
using Neo.Cryptography.ECC;
using Neo.SmartContract;
using Neo.Wallets;

using Neo.Gui.Base.Controllers;
using Neo.Gui.Base.Dialogs.Interfaces;
using Neo.Gui.Base.Dialogs.Results.Wallets;
using Neo.Gui.Base.Messages;
Expand Down
12 changes: 4 additions & 8 deletions Neo.Gui.Wpf/Views/Accounts/ImportCustomContractView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
Width="600" Height="520" ResizeMode="NoResize">
<Grid Margin="12">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
Expand All @@ -21,17 +20,14 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>

<Label Grid.Row="0" Grid.Column="0" Content="{x:Static globalization:Strings.RelatedAccount}" HorizontalAlignment="Right" VerticalAlignment="Center" />
<ComboBox Grid.Row="0" Grid.Column="1" ItemsSource="{Binding RelatedAccounts}" SelectedItem="{Binding SelectedRelatedAccount}" Margin="0 4" HorizontalAlignment="Stretch" />

<Label Grid.Row="1" Grid.Column="0" Content="{x:Static globalization:Strings.ParameterList}" HorizontalAlignment="Right" VerticalAlignment="Center" />
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding ParameterList, UpdateSourceTrigger=PropertyChanged}" Margin="0 4" Padding="4" HorizontalAlignment="Stretch" />
<Label Grid.Row="0" Grid.Column="0" Content="{x:Static globalization:Strings.ParameterList}" HorizontalAlignment="Right" VerticalAlignment="Center" />
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding ParameterList, UpdateSourceTrigger=PropertyChanged}" Margin="0 4" Padding="4" HorizontalAlignment="Stretch" />

<GroupBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Header="{x:Static globalization:Strings.Script}">
<GroupBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Header="{x:Static globalization:Strings.Script}">
<TextBox Text="{Binding Script, UpdateSourceTrigger=PropertyChanged}" AcceptsReturn="True" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Visible" />
</GroupBox>

<DockPanel Grid.Row="3" Grid.ColumnSpan="2" Margin="0 8 0 0" HorizontalAlignment="Right">
<DockPanel Grid.Row="2" Grid.ColumnSpan="2" Margin="0 8 0 0" HorizontalAlignment="Right">
<Button Content="{x:Static globalization:Strings.Confirm}" Width="60" Margin="0 0 8 0" Command="{Binding ConfirmCommand}" IsEnabled="{Binding ConfirmEnabled}" />
<Button Content="{x:Static globalization:Strings.Cancel}" Width="60" Command="{Binding CancelCommand}" />
</DockPanel>
Expand Down