Overhauled configuration window with MahApps.Metro UI

topher-au · Aug 13, 2015 · 9dd64b8 · 9dd64b8
1 parent 95e1724
commit 9dd64b8
Show file tree

Hide file tree

Showing 12 changed files with 297 additions and 466 deletions.
diff --git a/hsVoiceCommands/HDT-Voice.vb b/hsVoiceCommands/HDT-Voice.vb
@@ -1,9 +1,10 @@
 Imports System
 Imports System.Windows.Controls
-
+Imports MahApps.Metro
 Imports Hearthstone_Deck_Tracker.Plugins
 Public Class HDTVoice
     Implements IPlugin
+
     Public ReadOnly Property Author As String Implements IPlugin.Author
         Get
             Return "Chris Sheridan"
@@ -24,7 +25,10 @@ Public Class HDTVoice
 
     Public ReadOnly Property MenuItem As MenuItem Implements IPlugin.MenuItem
         Get
-            Return Nothing
+            Dim pluginMenu As New MenuItem
+            AddHandler pluginMenu.Click, AddressOf OnButtonPress
+            pluginMenu.Header = New String("HDT-Voice Settings...")
+            Return pluginMenu
         End Get
     End Property
 
@@ -36,14 +40,13 @@ Public Class HDTVoice
 
     Public ReadOnly Property Version As Version Implements IPlugin.Version
         Get
-            Return New Version(0, 5, 1)
+            Return New Version(0, 5, 2)
         End Get
     End Property
 
     Public Sub OnButtonPress() Implements IPlugin.OnButtonPress
-        Dim fc As New formConfig
-        fc.ShowDialog()
-
+        Dim fmc = New MetroConfig
+        fmc.ShowDialog() ' Show configuration dialog
         Return
     End Sub
 

diff --git a/hsVoiceCommands/HDT-Voice.vbproj b/hsVoiceCommands/HDT-Voice.vbproj
@@ -47,13 +47,22 @@
     <Reference Include="Hearthstone Deck Tracker">
       <HintPath>..\..\..\..\..\Games\Hearthstone\Hearthstone Deck Tracker\Hearthstone Deck Tracker.exe</HintPath>
     </Reference>
+    <Reference Include="MahApps.Metro, Version=1.1.2.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
+      <HintPath>..\packages\MahApps.Metro.1.1.2.0\lib\net45\MahApps.Metro.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Speech" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\MahApps.Metro.1.1.2.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -73,12 +82,6 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="formConfig.Designer.vb">
-      <DependentUpon>formConfig.vb</DependentUpon>
-    </Compile>
-    <Compile Include="formConfig.vb">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="HDT-Voice.vb" />
     <Compile Include="hsVoicePlugin.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
@@ -96,11 +99,11 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="metroConfig.xaml.vb">
+      <DependentUpon>metroConfig.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="formConfig.resx">
-      <DependentUpon>formConfig.vb</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="My Project\Resources.resx">
       <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.vb</LastGenOutput>
@@ -119,6 +122,13 @@
       <CustomToolNamespace>My</CustomToolNamespace>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="metroConfig.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>

diff --git a/hsVoiceCommands/My Project/Settings.Designer.vb b/hsVoiceCommands/My Project/Settings.Designer.vb
diff --git a/hsVoiceCommands/My Project/Settings.settings b/hsVoiceCommands/My Project/Settings.settings
@@ -23,5 +23,11 @@
     <Setting Name="smoothCursor" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="cursorSpeed" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">2</Value>
+    </Setting>
+    <Setting Name="autoListen" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/hsVoiceCommands/app.config b/hsVoiceCommands/app.config
@@ -50,6 +50,23 @@
             <setting name="smoothCursor" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="cursorSpeed" serializeAs="String">
+                <value>2</value>
+            </setting>
+            <setting name="autoListen" serializeAs="String">
+                <value>True</value>
+            </setting>
         </HDTVoice.My.MySettings>
     </userSettings>
+  <Application.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Application.Resources>
 </configuration>
diff --git a/hsVoiceCommands/formConfig.Designer.vb b/hsVoiceCommands/formConfig.Designer.vb