From 5be46955c44f909f5376b74f963cbdcfb2382937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= <nefarius@dhmx.at>
Date: Tue, 23 Oct 2018 15:27:14 +0200
Subject: [PATCH] More stuff

---
 DerpingDrivers/App.xaml              |  3 +-
 DerpingDrivers/DerpingDrivers.csproj |  3 -
 DerpingDrivers/MainWindow.xaml       | 98 +++++++++++-----------------
 DerpingDrivers/packages.config       |  1 -
 4 files changed, 40 insertions(+), 65 deletions(-)

diff --git a/DerpingDrivers/App.xaml b/DerpingDrivers/App.xaml
index d27c576..e6afd74 100644
--- a/DerpingDrivers/App.xaml
+++ b/DerpingDrivers/App.xaml
@@ -13,11 +13,10 @@
                 <!-- Accent and AppTheme setting -->
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/FlatButton.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="Label">
                 <Setter Property="FontFamily" Value="Segoe UI Light"/>
-                <Setter Property="FontSize" Value="26px"/>
+                <Setter Property="FontSize" Value="24px"/>
             </Style>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/DerpingDrivers/DerpingDrivers.csproj b/DerpingDrivers/DerpingDrivers.csproj
index 2af481e..e7065dd 100644
--- a/DerpingDrivers/DerpingDrivers.csproj
+++ b/DerpingDrivers/DerpingDrivers.csproj
@@ -47,9 +47,6 @@
     <Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MahApps.Metro.1.6.5\lib\net45\MahApps.Metro.dll</HintPath>
     </Reference>
-    <Reference Include="MahApps.Metro.IconPacks, Version=2.3.0.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.IconPacks.2.3.0\lib\net45\MahApps.Metro.IconPacks.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/DerpingDrivers/MainWindow.xaml b/DerpingDrivers/MainWindow.xaml
index 8a6ddb9..2ba8c57 100644
--- a/DerpingDrivers/MainWindow.xaml
+++ b/DerpingDrivers/MainWindow.xaml
@@ -5,79 +5,59 @@
                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                       xmlns:local="clr-namespace:DerpingDrivers"
                       xmlns:controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
-                      xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
                       mc:Ignorable="d"
                       Title="Derping Drivers - Windows driver settings detection tool"
-                      Height="420" Width="600"
+                      Height="360" Width="880"
                       ShowMaxRestoreButton="False"
                       ResizeMode="NoResize"
                       DataContext="{Binding RelativeSource={RelativeSource Self}}">
-    <controls:MetroWindow.Flyouts>
-        <controls:FlyoutsControl>
-            <controls:Flyout Header="Driver situation for this machine"
-                             IsOpen="{Binding IsChecked, ElementName=DetailsToggleButton}"
-                             Position="Right"
-                             Width="600">
-                <!-- Your custom content here -->
-                <Label>Hi</Label>
-            </controls:Flyout>
-        </controls:FlyoutsControl>
-    </controls:MetroWindow.Flyouts>
-
     <Grid Margin="15">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="20"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
 
-        <Grid Grid.Row="0">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="20" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
+        <GroupBox Grid.Column="0" Header="System details">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="20" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
 
-            <Label Grid.Row="0" Grid.Column="0">Windows version name:</Label>
-            <Label Grid.Row="0" Grid.Column="2" Content="{Binding Path=OsVersionName}" />
+                <Label Grid.Row="0" Grid.Column="0">Windows version name:</Label>
+                <Label Grid.Row="0" Grid.Column="2" Content="{Binding Path=OsVersionName}" />
 
-            <Label Grid.Row="1" Grid.Column="0">Windows version number:</Label>
-            <Label Grid.Row="1" Grid.Column="2" Content="{Binding Path=OsVersion}" />
+                <Label Grid.Row="1" Grid.Column="0">Windows version number:</Label>
+                <Label Grid.Row="1" Grid.Column="2" Content="{Binding Path=OsVersion}" />
 
-            <Label Grid.Row="2" Grid.Column="0">Windows architecture:</Label>
-            <Label Grid.Row="2" Grid.Column="2" Content="{Binding Path=OsArchitecture}" />
+                <Label Grid.Row="2" Grid.Column="0">Windows architecture:</Label>
+                <Label Grid.Row="2" Grid.Column="2" Content="{Binding Path=OsArchitecture}" />
 
-            <Label Grid.Row="3" Grid.Column="0">Current boot mode:</Label>
-            <Label Grid.Row="3" Grid.Column="2" Content="{Binding Path=BootMode}" />
+                <Label Grid.Row="3" Grid.Column="0">Current boot mode:</Label>
+                <Label Grid.Row="3" Grid.Column="2" Content="{Binding Path=BootMode}" />
 
-            <Label Grid.Row="4" Grid.Column="0">Secure Boot state:</Label>
-            <Label Grid.Row="4" Grid.Column="2" Content="{Binding Path=SecureBootEnabled}" />
+                <Label Grid.Row="4" Grid.Column="0">Secure Boot state:</Label>
+                <Label Grid.Row="4" Grid.Column="2" Content="{Binding Path=SecureBootEnabled}" />
 
-            <Label Grid.Row="5" Grid.Column="0">OS upgrade status:</Label>
-            <Label Grid.Row="5" Grid.Column="2" Content="{Binding Path=OsUpgradeStatus}" />
+                <Label Grid.Row="5" Grid.Column="0">OS upgrade status:</Label>
+                <Label Grid.Row="5" Grid.Column="2" Content="{Binding Path=OsUpgradeStatus}" />
 
-        </Grid>
+            </Grid>
+        </GroupBox>
 
-        <Grid Grid.Row="1" Margin="0,20,0,0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <ToggleButton x:Name="DetailsToggleButton"
-                          Grid.Column="0"
-                          FontSize="20px">
-                Show me some wisdom!
-            </ToggleButton>
-        </Grid>
+        <GroupBox Grid.Column="2" Header="Summary">
+            <TextBlock TextAlignment="Justify">Lorem ipsum</TextBlock>
+        </GroupBox>
     </Grid>
 </controls:MetroWindow>
\ No newline at end of file
diff --git a/DerpingDrivers/packages.config b/DerpingDrivers/packages.config
index bed2368..3159a5b 100644
--- a/DerpingDrivers/packages.config
+++ b/DerpingDrivers/packages.config
@@ -4,5 +4,4 @@
   <package id="Costura.Fody" version="3.1.6" targetFramework="net451" />
   <package id="Fody" version="3.2.13" targetFramework="net451" developmentDependency="true" />
   <package id="MahApps.Metro" version="1.6.5" targetFramework="net451" />
-  <package id="MahApps.Metro.IconPacks" version="2.3.0" targetFramework="net451" />
 </packages>
\ No newline at end of file