Skip to content

Commit

Permalink
#83 Moved auth dropdown up a level
Browse files Browse the repository at this point in the history
  • Loading branch information
@stajs
stajs committed Mar 4, 2016
1 parent 2948819 commit 8b8dd36
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 37 deletions.
69 changes: 35 additions & 34 deletions LIC.Malone.Client.Desktop/Views/AppView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
d:DataContext="{d:DesignInstance Type=designData:AppViewModelDesignData, IsDesignTimeCreatable=True}"
cal:Bind.AtDesignTime="True">
<Window.Resources>
<Style x:Key="FormLabel" TargetType="Label">
<Setter Property="FontFamily" Value="Segoe UI" />
<Setter Property="FontSize" Value="14" />
<Setter Property="Foreground" Value="#FF9395A2" />
<Setter Property="VerticalAlignment" Value="Bottom" />
</Style>
<converters:BooleanToVisibilityConverter x:Key="ShowWhenTrueConverter" />
<converters:BooleanToVisibilityConverter x:Key="HideWhenTrueConverter" IsReversed="True" />
<converters:NullToVisibilityConverter x:Key="ShowWhenNullConverter" />
Expand Down Expand Up @@ -199,13 +205,40 @@
<RowDefinition />
<RowDefinition Height="10"/>
<RowDefinition />
<RowDefinition Height="10"/>
<RowDefinition />
</Grid.RowDefinitions>

<ComboBox Grid.Row="0" Grid.Column="0" x:Name="Methods" Width="80" Style="{StaticResource DefaultComboBox}" />
<TextBox Grid.Row="0" Grid.Column="2" x:Name="Url" metro:TextBoxHelper.Watermark="Enter URL or choose from history" Style="{StaticResource DefaultTextBox}" cal:Message.Attach="[Event KeyDown] = [Action ExecuteSend($eventArgs)]"/>
<ComboBox Grid.Row="0" Grid.Column="4" x:Name="Accepts" Width="130" Style="{StaticResource DefaultComboBox}" />
<!--<Label Grid.Row="2" Grid.Column="0" Content="Authentication" Style="{StaticResource FormLabel}" />-->
<ComboBox Grid.Row="2" Grid.Column="2" x:Name="Tokens" Style="{StaticResource DefaultComboBox}" VerticalAlignment="Bottom" Padding="3" >
<ComboBox.ItemTemplate>
<DataTemplate>
<DataTemplate.Resources>
<Style x:Key="Historical" TargetType="TextBlock" BasedOn="{StaticResource DefaultTextBlock}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsHistorical}" Value="True">
<Setter Property="Text" Value="History"/>
</DataTrigger>
<DataTrigger Binding="{Binding IsHistorical}" Value="False">
<Setter Property="Text" Value="Session"/>
</DataTrigger>
</Style.Triggers>
</Style>
</DataTemplate.Resources>
<DockPanel>
<TextBlock Style="{StaticResource Historical}" Width="50" Foreground="#666666"/>
<TextBlock Text="{Binding Name}" />
</DockPanel>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>

<StackPanel Grid.Row="2" Grid.Column="2" Orientation="Horizontal">
<controls:IconLink Grid.Row="2" Grid.Column="4" HorizontalAlignment="Left" VerticalAlignment="Bottom" Content="Add" IconData="{StaticResource IconPlus}" IconMargin="{StaticResource IconPlusMargin}" cal:Message.Attach="[Event PreviewMouseLeftButtonUp] = [Action AddToken()]" />

<StackPanel Grid.Row="4" Grid.Column="2" Orientation="Horizontal">
<controls:IconButton x:Name="Send" Content="Send" IconData="{StaticResource IconPaperPlane}" IconMargin="{StaticResource IconPaperPlaneMargin}" />
<controls:IconButton x:Name="Cancel" Content="Cancel" Margin="10 0 0 0" />
</StackPanel>
Expand Down Expand Up @@ -293,39 +326,7 @@
</TabItem>

<TabItem Header="Authentication">

<DockPanel LastChildFill="True">

<Grid DockPanel.Dock="Top" Margin="0 0 0 10">
<ComboBox x:Name="Tokens" Style="{StaticResource DefaultComboBox}" VerticalAlignment="Bottom" Margin="5,0,96,0" Padding="3" Height="30" >
<ComboBox.ItemTemplate>
<DataTemplate>
<DataTemplate.Resources>
<Style x:Key="Historical" TargetType="TextBlock" BasedOn="{StaticResource DefaultTextBlock}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsHistorical}" Value="True">
<Setter Property="Text" Value="History"/>
</DataTrigger>
<DataTrigger Binding="{Binding IsHistorical}" Value="False">
<Setter Property="Text" Value="Session"/>
</DataTrigger>
</Style.Triggers>
</Style>
</DataTemplate.Resources>
<DockPanel>
<TextBlock Style="{StaticResource Historical}" Width="50" Foreground="#666666"/>
<TextBlock Text="{Binding Name}" />
</DockPanel>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<controls:IconLink HorizontalAlignment="Right" VerticalAlignment="Bottom" Content="Add" IconData="{StaticResource IconPlus}" IconMargin="{StaticResource IconPlusMargin}" cal:Message.Attach="[Event PreviewMouseLeftButtonUp] = [Action AddToken()]" />
</Grid>

<ae:TextEditor DockPanel.Dock="Top" Document="{Binding SelectedTokenJson, Mode=OneWay}" SyntaxHighlighting="JavaScript" />

</DockPanel>

<ae:TextEditor DockPanel.Dock="Top" Document="{Binding SelectedTokenJson, Mode=OneWay}" SyntaxHighlighting="JavaScript" />
</TabItem>

</TabControl>
Expand Down
6 changes: 3 additions & 3 deletions Solution Items/SharedAssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
// http://blog.ploeh.dk/2013/12/10/semantic-versioning-with-continuous-deployment/
// http://docs.nuget.org/create/nuspec-reference#Replacement_Tokens

[assembly: AssemblyVersion("0.9.4")]
[assembly: AssemblyFileVersion("0.9.4")]
[assembly: AssemblyInformationalVersion("0.9.4")]
[assembly: AssemblyVersion("0.9.5")]
[assembly: AssemblyFileVersion("0.9.5")]
[assembly: AssemblyInformationalVersion("0.9.5")]

0 comments on commit 8b8dd36

Please sign in to comment.