Skip to content

Commit b3f3c0c

Browse files
committed
First pass at XAML for configure project dialog.
1 parent bd12b10 commit b3f3c0c

File tree

2 files changed

+48
-53
lines changed

2 files changed

+48
-53
lines changed

src/Stratis.VS.StratisEVM/Window1.xaml

Lines changed: 47 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
55
Background="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelBrushKey}}"
66
Foreground="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelTextBrushKey}}"
7-
WindowStartupLocation="CenterOwner"
8-
WindowState="Normal"
9-
HasMaximizeButton="True"
10-
HasMinimizeButton="True"
11-
BorderThickness="0,1,0,0"
12-
ShowInTaskbar="true"
13-
Title="Window1"
14-
Width="814"
15-
Height="460"
16-
MinWidth="814"
17-
MinHeight="460"
18-
>
19-
20-
7+
SnapsToDevicePixels="True"
8+
UseLayoutRounding="True"
9+
WindowStartupLocation="CenterOwner"
10+
WindowStyle="None"
11+
WindowState="Normal"
12+
ResizeMode="CanResize"
13+
ShowInTaskbar="false"
14+
15+
16+
17+
Width="460"
18+
Height="200"
19+
MinWidth="460"
20+
MinHeight="200">
2121
<Grid>
2222

2323
<Grid.Resources>
@@ -37,8 +37,10 @@
3737
</Trigger>
3838
</Style.Triggers>
3939
</Style>
40-
<Style TargetType="{x:Type ListBox}">
40+
<Style TargetType="{x:Type ComboBox}">
41+
<Setter Property="HorizontalAlignment" Value="Right"/>
4142
<Setter Property="Foreground" Value="{DynamicResource {x:Static vs:ThemedDialogColors.WindowPanelTextBrushKey}}" />
43+
<Setter Property="Background" Value="{DynamicResource {x:Static vs:ThemedDialogColors.ListBoxBorderBrushKey}}" />
4244
</Style>
4345
<Style TargetType="{x:Type StackPanel}">
4446
<Setter Property="Orientation" Value="Horizontal" />
@@ -53,7 +55,7 @@
5355

5456
<Grid.ColumnDefinitions>
5557
<ColumnDefinition Width="Auto" />
56-
<ColumnDefinition />
58+
<ColumnDefinition Width="Auto" />
5759
</Grid.ColumnDefinitions>
5860

5961
<Grid.RowDefinitions>
@@ -62,53 +64,45 @@
6264
<RowDefinition Height="Auto" />
6365
<RowDefinition Height="Auto" />
6466
<RowDefinition Height="Auto" />
65-
<RowDefinition />
66-
</Grid.RowDefinitions>
67+
68+
</Grid.RowDefinitions>
6769

68-
<!-- Left Margin -->
69-
<Label Grid.Column="0" Grid.Row="0">Solidity project configuration file:</Label>
70-
<ComboBox VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="1" Grid.Row="0" SelectedItem="{Binding SelectedConfigFile, Mode=OneWay}">
71-
<ComboBoxItem>remappings.txt</ComboBoxItem>
70+
<Image Grid.Column="1" Grid.Row="0" Width="64" Height="64" HorizontalAlignment="Right" Source="https://stratisdevex.gallerycdn.vsassets.io/extensions/stratisdevex/stratisevm/0.1.3/1725544756658/Microsoft.VisualStudio.Services.Icons.Default" />
71+
72+
<Label Grid.Column="0" Grid.Row="0" FontSize="21"> Configure your Solidity Project</Label>
73+
<Label Grid.Column="0" Grid.Row="1">Solidity project configuration file:</Label>
74+
<ComboBox
75+
VerticalAlignment="Center"
76+
Grid.Column="1"
77+
Width="150"
78+
Grid.Row="1"
79+
SelectedItem="{Binding SelectedConfigFile, Mode=OneWay}">
80+
<ComboBoxItem IsSelected="true">remappings.txt</ComboBoxItem>
7281
<ComboBoxItem>foundry.toml</ComboBoxItem>
7382
<ComboBoxItem>brownie-config.yaml</ComboBoxItem>
7483
<ComboBoxItem>truffle-config.js</ComboBoxItem>
7584
<ComboBoxItem>hardhat.config.js</ComboBoxItem>
7685
</ComboBox>
7786

7887

88+
<Label Grid.Column="0" Grid.Row="2">Solidity compiler version:</Label>
89+
<ComboBox
90+
VerticalAlignment="Center"
91+
Grid.Column="1"
92+
Width="150"
93+
Grid.Row="2"
94+
SelectedItem="{Binding SelectedCompilerVersion, Mode=OneWay}">
95+
<ComboBoxItem IsSelected="true">0.8.27</ComboBoxItem>
96+
<ComboBoxItem>0.8.26</ComboBoxItem>
97+
<ComboBoxItem>0.8.25</ComboBoxItem>
98+
<ComboBoxItem>0.8.24</ComboBoxItem>
99+
<ComboBoxItem>0.8.23</ComboBoxItem>
100+
</ComboBox>
79101

80-
<!-- Top Margin -->
81-
<Label Grid.Column="0" Grid.Row="1">Top Margin:</Label>
82-
<TextBox Name="topMarginTextBox" Grid.Column="1" Grid.Row="1">
83-
<TextBox.Text>
84-
<Binding Path="Top" UpdateSourceTrigger="PropertyChanged">
85-
86-
</Binding>
87-
</TextBox.Text>
88-
</TextBox>
89-
90-
<!-- Right Margin -->
91-
<Label Grid.Column="0" Grid.Row="2">Right Margin:</Label>
92-
<TextBox Name="rightMarginTextBox" Grid.Column="1" Grid.Row="2">
93-
<TextBox.Text>
94-
<Binding Path="Right" UpdateSourceTrigger="PropertyChanged">
95-
96-
</Binding>
97-
</TextBox.Text>
98-
</TextBox>
99-
100-
<!-- Bottom Margin -->
101-
<Label Grid.Column="0" Grid.Row="3">Bottom Margin:</Label>
102-
<TextBox Name="bottomMarginTextBox" Grid.Column="1" Grid.Row="3">
103-
<TextBox.Text>
104-
<Binding Path="Bottom" UpdateSourceTrigger="PropertyChanged">
105-
106-
</Binding>
107-
</TextBox.Text>
108-
</TextBox>
109-
102+
<!-- Top Margin -->
103+
110104
<!-- Accept or Cancel -->
111-
<StackPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="4">
105+
<StackPanel Grid.Column="0" Grid.ColumnSpan="2" Margin="0,10,0,10" Grid.Row="4">
112106
<Button Name="okButton" Click="okButton_Click" IsDefault="True">OK</Button>
113107
<Button Name="cancelButton" IsCancel="True">Cancel</Button>
114108
</StackPanel>

src/Stratis.VS.StratisEVM/Window1.xaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public Window1()
2828

2929
public string SelectedConfigFile { get; set; }
3030

31+
public string SelectedCompilerVersion { get; set; }
3132

3233
private void okButton_Click(object sender, RoutedEventArgs e) =>
3334
DialogResult = true;

0 commit comments

Comments
 (0)