Avans/huehuehue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/yorickr/huehuehue into dev

Browse Source
This commit is contained in:
Yorick Rommers
2015-12-03 11:33:38 +01:00
parent 4fd750f8e0 adfff4f035
commit eb6d794806
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HueUWP/DetailView.xaml
+2 -2
View File
@@ -46,12 +46,12 @@
</StackPanel>
<StackPanel Margin="20,10,20,0">
<TextBlock FontSize="14">Saturation</TextBlock>
<TextBlock FontSize="18">Saturation</TextBlock>
<Slider Maximum="254" Value="{Binding Saturation, Mode=TwoWay}" ValueChanged="Slider_ValueChanged" PointerCaptureLost="Slider_Released" />
</StackPanel>
<StackPanel Margin="20,10,20,0">
<TextBlock FontSize="14">Brightness</TextBlock>
<TextBlock FontSize="18">Brightness</TextBlock>
<Slider Maximum="254" Value="{Binding Brightness, Mode=TwoWay}" ValueChanged="Slider_ValueChanged" PointerCaptureLost="Slider_Released"/>
</StackPanel>
HueUWP/SettingsView.xaml
+5 -5
View File
@@ -19,15 +19,15 @@
</RelativePanel>
<StackPanel Grid.Row="1">
<StackPanel Margin="20">
<StackPanel Margin="20, 10, 20, 0">
<TextBlock FontSize="16">Server IP</TextBlock>
<TextBox Margin="0,10,0,10" Text="{x:Bind SettingsViewModel.IP, Mode=TwoWay}" />
<TextBox Margin="0,10,0,10" Text="{x:Bind SettingsViewModel.IP, Mode=TwoWay}" PlaceholderText="145.48.205.190"/>
</StackPanel>
<StackPanel Margin="20">
<StackPanel Margin="20, 10, 20, 0">
<TextBlock FontSize="16">Server Port</TextBlock>
<TextBox Margin="0,10,0,10" Text="{x:Bind SettingsViewModel.PORT, Mode=TwoWay}" />
<TextBox Margin="0,10,0,10" Text="{x:Bind SettingsViewModel.PORT, Mode=TwoWay}" PlaceholderText="80" />
</StackPanel>
<StackPanel Margin="20">
<StackPanel Margin="20, 10, 20, 0">
<TextBlock FontSize="16">User ID</TextBlock>
<TextBox Name="IDBox" Margin="0,10,0,10" Text="{x:Bind SettingsViewModel.ID, Mode=OneWay}" IsEnabled="False"/>
<StackPanel Orientation="Horizontal" Margin="0,10,0,10">