From 907e4a2a361713469ea457ea8fe1f1df51be57b9 Mon Sep 17 00:00:00 2001
From: Kenneth van Ewijk <kennyboy@live.nl>
Date: Mon, 7 Dec 2015 10:43:55 +0100
Subject: [PATCH] Improved multi-edit interface

---
 HueUWP/MainPage.xaml     | 44 ++++++++++++++++++++++++++++++++++------
 HueUWP/MainPage.xaml.cs  | 15 +++++++++++++-
 HueUWP/MultiEdit.xaml    |  2 +-
 HueUWP/MultiEdit.xaml.cs |  7 ++++++-
 4 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/HueUWP/MainPage.xaml b/HueUWP/MainPage.xaml
index abcdae4..d5d3bf4 100644
--- a/HueUWP/MainPage.xaml
+++ b/HueUWP/MainPage.xaml
@@ -61,14 +61,46 @@
 
     <Page.BottomAppBar>
         <CommandBar>
-            <AppBarButton Icon="Edit" Label="Change values" Name="ValuesButton" Click="ValuesButton_Click" Visibility="Collapsed"/>
-            <AppBarButton Icon="LikeDislike" Label="On/Off" Name="OnOffButton" Click="OnOffButton_Click" Visibility="Collapsed"/>
+            <!-- Update values -->
+            <AppBarButton Label="Change values" Name="ValuesButton" Click="ValuesButton_Click" Visibility="Collapsed">
+                <AppBarButton.Icon>
+                    <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE70F;"/>
+                </AppBarButton.Icon>
+            </AppBarButton>
+            <!-- Update on/off -->
+            <AppBarButton Label="On" Name="OnOffButton" Click="OnOffButton_Click" Visibility="Collapsed">
+                <AppBarButton.Icon>
+                    <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE8B1;"/>
+                </AppBarButton.Icon>
+            </AppBarButton>
+            <!-- Group -->
+            <AppBarToggleButton Label="Group" Name="GroupButton" Click="GroupButton_Click">
+                <AppBarToggleButton.Icon>
+                    <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE73A;"/>
+                </AppBarToggleButton.Icon>
+            </AppBarToggleButton>
             
-            <AppBarToggleButton Icon="SelectAll" Label="Group" Name="GroupButton" Click="GroupButton_Click"/>
             <AppBarSeparator Name="Seperator" />
-            <AppBarToggleButton Icon="Audio" Label="Disco" Name="DiscoButton" Click="DiscoButton_Click"/>
-            <AppBarButton Icon="Setting" Label="Settings" Name="SettingsButton" Click="SettingsButton_Click"/>
-            <AppBarButton Icon="Refresh" Label="Refresh" Name="RefreshButton" Click="RefreshButton_Click"/>
+
+            <!-- Disco -->
+            <AppBarToggleButton Label="Disco" Name="DiscoButton" Click="DiscoButton_Click">
+                <AppBarToggleButton.Icon>
+                    <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE8D6;"/>
+                </AppBarToggleButton.Icon>
+            </AppBarToggleButton>
+            
+            <!-- Settings -->
+            <AppBarButton Label="Settings" Name="SettingsButton" Click="SettingsButton_Click">
+                <AppBarButton.Icon>
+                    <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE713;"/>
+                </AppBarButton.Icon>
+            </AppBarButton>
+            <!-- Refresh -->
+            <AppBarButton Label="Refresh" Name="RefreshButton" Click="RefreshButton_Click">
+                <AppBarButton.Icon>
+                    <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE72C;"/>
+                </AppBarButton.Icon>
+            </AppBarButton>
             
 
             <CommandBar.SecondaryCommands>
diff --git a/HueUWP/MainPage.xaml.cs b/HueUWP/MainPage.xaml.cs
index c8cb178..cfd5ac5 100644
--- a/HueUWP/MainPage.xaml.cs
+++ b/HueUWP/MainPage.xaml.cs
@@ -161,11 +161,24 @@ namespace HueUWP
 
         private void OnOffButton_Click(object sender, RoutedEventArgs e)
         {
+            bool first = false;
+
+            if(OnOffButton.Label == "Off")
+            {
+                first = false;
+                OnOffButton.Label = "On";
+            }
+            else
+            {
+                first = true;
+                OnOffButton.Label = "Off";
+            }
+
             if ((bool)GroupButton.IsChecked)
             {
                 foreach(var v in myListView.SelectedItems)
                 {
-                    ((Light)v).UpdateState(!((Light)v).IsOn);
+                    ((Light)v).UpdateState(first);
                 }
             }
         }
diff --git a/HueUWP/MultiEdit.xaml b/HueUWP/MultiEdit.xaml
index 2af6ad1..d10e3b7 100755
--- a/HueUWP/MultiEdit.xaml
+++ b/HueUWP/MultiEdit.xaml
@@ -34,7 +34,7 @@
         </RelativePanel>
 
         <StackPanel Grid.Row="3">
-            <ToggleSwitch Margin="20,10,0,10" Toggled="ToggleSwitch_Toggled" IsOn="False">
+            <ToggleSwitch Margin="20,10,0,10" Name="OnOffButton" Toggled="ToggleSwitch_Toggled" IsOn="False">
                 <ToggleSwitch.OffContent>Off</ToggleSwitch.OffContent>
                 <ToggleSwitch.OnContent>On</ToggleSwitch.OnContent>
             </ToggleSwitch>
diff --git a/HueUWP/MultiEdit.xaml.cs b/HueUWP/MultiEdit.xaml.cs
index f1081e1..9979401 100755
--- a/HueUWP/MultiEdit.xaml.cs
+++ b/HueUWP/MultiEdit.xaml.cs
@@ -36,7 +36,12 @@ namespace HueUWP
         {
             main = e.Parameter as MainPage;
 
-            foreach(var v in main.GetListView().SelectedItems)
+            HueSlider.Value = ((Light) main.GetListView().SelectedItems[0]).Hue;
+            SaturationSlider.Value = ((Light)main.GetListView().SelectedItems[0]).Saturation;
+            BrightnessSlider.Value = ((Light)main.GetListView().SelectedItems[0]).Brightness;
+            OnOffButton.IsOn = ((Light)main.GetListView().SelectedItems[0]).IsOn;
+
+            foreach (var v in main.GetListView().SelectedItems)
             {
                 Light l = (Light)v;
                 lights.Add(l);