UI Done.

Catboy96 · Mar 26, 2018 · 42bed6c · 42bed6c
1 parent e3ee47c
commit 42bed6c
Show file tree

Hide file tree

Showing 9 changed files with 227 additions and 16 deletions.
diff --git a/Automator/Automator/Application.xaml b/Automator/Automator/Application.xaml
@@ -4,6 +4,13 @@
     xmlns:local="clr-namespace:Automator"
     StartupUri="MainWindow.xaml">
     <Application.Resources>
-
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Blue.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/Automator/Automator/Automator.vbproj b/Automator/Automator/Automator.vbproj
@@ -7,7 +7,7 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Automator</RootNamespace>
-    <AssemblyName>Automator1</AssemblyName>
+    <AssemblyName>Automator</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <MyType>Custom</MyType>
   </PropertyGroup>
@@ -19,7 +19,7 @@
     <DefineTrace>true</DefineTrace>
     <IncrementalBuild>true</IncrementalBuild>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>Automator1.xml</DocumentationFile>
+    <DocumentationFile>Automator.xml</DocumentationFile>
     <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -31,7 +31,7 @@
     <IncrementalBuild>false</IncrementalBuild>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>Automator1.xml</DocumentationFile>
+    <DocumentationFile>Automator.xml</DocumentationFile>
     <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -50,6 +50,15 @@
     <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="MaterialDesignColors, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
+    </Reference>
+    <Reference Include="MaterialDesignThemes.Wpf, Version=2.4.0.1044, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaterialDesignThemes.2.4.0.1044\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -128,6 +137,7 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />

diff --git a/Automator/Automator/MainWindow.xaml b/Automator/Automator/MainWindow.xaml
@@ -3,10 +3,166 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:local="clr-namespace:Automator"
         mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800">
+        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        TextElement.FontWeight="Regular"
+        TextElement.FontSize="9"
+        TextOptions.TextFormattingMode="Ideal" 
+        TextOptions.TextRenderingMode="Auto"        
+        Background="{DynamicResource MaterialDesignPaper}"
+        FontFamily="{StaticResource MaterialDesignFont}"
+        WindowStartupLocation="CenterScreen"
+        Title="Automator" Height="450" Width="850" Icon="Resources/icon.ico">
     <Grid>
-
+        <DockPanel>
+
+            <ToolBarTray DockPanel.Dock="Top">
+                <ToolBar Style="{DynamicResource MaterialDesignToolBar}" ClipToBounds="False" >
+
+                    <!-- Loop control -->
+                    <ToggleButton x:Name="tgbLoop" Style="{StaticResource MaterialDesignSwitchToggleButton}"
+                                  Margin="10 0 8 0">
+                        <materialDesign:PackIcon Kind="ShuffleDisabled" Width="19" Height="19"/>
+                        <materialDesign:ToggleButtonAssist.OnContent>
+                            <materialDesign:PackIcon Kind="Repeat" Width="19" Height="19"/>
+                        </materialDesign:ToggleButtonAssist.OnContent>
+                        <ToggleButton.ToolTip>
+                            <StackPanel>
+                                <TextBlock Text="Loop control" />
+                                <TextBlock Text="OFF: Program will execute once." />
+                                <TextBlock Text="ON:  Program will execute repeatly." />
+                            </StackPanel>
+                        </ToggleButton.ToolTip>
+                    </ToggleButton>
+                    <Separator />
+
+                    <!-- File operations -->
+                    <Button x:Name="btnNewFile" ToolTip="New file" Click="btnNewFile_Click">
+                        <materialDesign:PackIcon Kind="File" />
+                    </Button>
+                    <Button x:Name="btnSave" ToolTip="Save" Click="btnSave_Click">
+                        <materialDesign:PackIcon Kind="ContentSave" />
+                    </Button>
+                    <Separator />
+
+                    <!-- Input -->
+                    <Button ToolTip="Input" x:Name="btnInput" Click="btnInput_Click">
+                        <materialDesign:PackIcon Kind="Keyboard" />
+                    </Button>
+                    <ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}"
+                                  x:Name="tgbReturn"  Margin="8 0 10 0">
+                        <materialDesign:PackIcon Kind="KeyboardReturn" Width="19" Height="19"/>
+                        <materialDesign:ToggleButtonAssist.OnContent>
+                            <materialDesign:PackIcon Kind="KeyboardReturn" Width="19" Height="19"/>
+                        </materialDesign:ToggleButtonAssist.OnContent>
+                        <ToggleButton.ToolTip>
+                            <StackPanel>
+                                <TextBlock Text="Send RETURN after input" />
+                                <TextBlock Text="OFF: Input the specified text" />
+                                <TextBlock Text="ON:  Input the specified text and send RETURN" />
+                            </StackPanel>
+                        </ToggleButton.ToolTip>
+                    </ToggleButton>
+                    <Separator />
+
+                    <!-- Delay -->
+                    <Button ToolTip="Delay" x:Name="btnDelay" Click="btnDelay_Click">
+                        <materialDesign:PackIcon Kind="ClockFast" />
+                    </Button>
+                    <Separator/>
+
+
+                    <Button ToolTip="Send key stroke">
+                        <materialDesign:PackIcon Kind="AppleKeyboardCommand" />
+                    </Button>
+                    <Separator/>
+
+
+
+                    <ListBox SelectedIndex="0" ToolTip="Send combo keys" SelectionMode="Multiple">
+                        <ListBoxItem>
+                            <materialDesign:PackIcon Kind="AppleKeyboardCommand"/>
+                        </ListBoxItem>
+                        <ListBoxItem>
+                            <materialDesign:PackIcon Kind="AppleKeyboardOption"/>
+                        </ListBoxItem>
+                        <ListBoxItem >
+                            <materialDesign:PackIcon Kind="AppleKeyboardControl"/>
+                        </ListBoxItem>
+                        <ListBoxItem>
+                            <materialDesign:PackIcon Kind="AppleKeyboardShift"/>
+                        </ListBoxItem>
+                    </ListBox>
+                    <ComboBox Text="..." FontSize="16">
+                        <ComboBoxItem Content="SPACE" />
+                        <ComboBoxItem Content="RETURN" />
+                        <ComboBoxItem Content="F1" />
+                        <ComboBoxItem Content="F2" />
+                        <ComboBoxItem Content="F3" />
+                        <ComboBoxItem Content="F4" />
+                        <ComboBoxItem Content="F5" />
+                        <ComboBoxItem Content="F6" />
+                        <ComboBoxItem Content="F7" />
+                        <ComboBoxItem Content="F8" />
+                        <ComboBoxItem Content="F9" />
+                        <ComboBoxItem Content="F10" />
+                        <ComboBoxItem Content="F11" />
+                        <ComboBoxItem Content="F12" />
+                        <ComboBoxItem Content="A" />
+                        <ComboBoxItem Content="B" />
+                        <ComboBoxItem Content="C" />
+                        <ComboBoxItem Content="D" />
+                        <ComboBoxItem Content="E" />
+                        <ComboBoxItem Content="F" />
+                        <ComboBoxItem Content="G" />
+                        <ComboBoxItem Content="H" />
+                        <ComboBoxItem Content="I" />
+                        <ComboBoxItem Content="J" />
+                        <ComboBoxItem Content="K" />
+                        <ComboBoxItem Content="L" />
+                        <ComboBoxItem Content="M" />
+                        <ComboBoxItem Content="N" />
+                        <ComboBoxItem Content="O" />
+                        <ComboBoxItem Content="P" />
+                        <ComboBoxItem Content="Q" />
+                        <ComboBoxItem Content="R" />
+                        <ComboBoxItem Content="S" />
+                        <ComboBoxItem Content="T" />
+                        <ComboBoxItem Content="U" />
+                        <ComboBoxItem Content="V" />
+                        <ComboBoxItem Content="W" />
+                        <ComboBoxItem Content="X" />
+                        <ComboBoxItem Content="Y" />
+                        <ComboBoxItem Content="Z" />
+                        <ComboBoxItem Content="0" />
+                        <ComboBoxItem Content="1" />
+                        <ComboBoxItem Content="2" />
+                        <ComboBoxItem Content="3" />
+                        <ComboBoxItem Content="4" />
+                        <ComboBoxItem Content="5" />
+                        <ComboBoxItem Content="6" />
+                        <ComboBoxItem Content="7" />
+                        <ComboBoxItem Content="8" />
+                        <ComboBoxItem Content="9" />
+                    </ComboBox>
+                    <Button ToolTip="Add to code">
+                        <materialDesign:PackIcon Kind="Plus" />
+                    </Button>
+
+                </ToolBar>
+            </ToolBarTray >
+
+            <Grid Background="White">
+                <TextBox Style="{StaticResource MaterialDesignTextAreaTextBox}" Margin="8,8,8,8" 
+                         x:Name="txtCode"
+                         AcceptsReturn="True" TextWrapping="Wrap"
+                         VerticalScrollBarVisibility="Auto" 
+                         materialDesign:HintAssist.Hint="Code preview"
+                         FontFamily="Consolas" FontSize="16"/>
+            </Grid>
+
+        </DockPanel>
     </Grid>
 </Window>
diff --git a/Automator/Automator/MainWindow.xaml.vb b/Automator/Automator/MainWindow.xaml.vb
@@ -1,3 +1,26 @@
 Class MainWindow
 
+    Private Sub btnNewFile_Click(sender As Object, e As RoutedEventArgs)
+        If txtCode.Text <> "" Then
+            If MessageBox.Show("Create a new file? All unsaved changes will be lost.", "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
+                txtCode.Clear()
+            End If
+        End If
+    End Sub
+
+    Private Sub btnSave_Click(sender As Object, e As RoutedEventArgs)
+
+    End Sub
+
+    Private Sub btnInput_Click(sender As Object, e As RoutedEventArgs)
+        If tgbReturn.IsChecked = True Then
+            txtCode.AppendText("DigiKeyboard.println("""");")
+        Else
+            txtCode.AppendText("DigiKeyboard.print("""");")
+        End If
+    End Sub
+
+    Private Sub btnDelay_Click(sender As Object, e As RoutedEventArgs)
+        txtCode.AppendText("DigiKeyboard.delay();")
+    End Sub
 End Class
diff --git a/Automator/Automator/Resources/automator_2_preview.png b/Automator/Automator/Resources/automator_2_preview.png
diff --git a/Automator/Automator/obj/Debug/Automator.vbproj.FileListAbsolute.txt b/Automator/Automator/obj/Debug/Automator.vbproj.FileListAbsolute.txt
@@ -1,17 +1,26 @@
-C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\Automator1.exe.config
-C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\Automator1.exe
-C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\Automator1.pdb
-C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\Automator1.xml
 C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator.vbprojResolveAssemblyReference.cache
 C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\MainWindow.g.vb
 C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Application.g.vb
-C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator1_MarkupCompile.cache
-C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator1_MarkupCompile.lref
 C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\MainWindow.baml
-C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator1.g.resources
 C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator.Resources.resources
 C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator.vbproj.GenerateResource.cache
 C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator.vbproj.CoreCompileInputs.cache
-C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator1.exe
-C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator1.xml
-C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator1.pdb
+C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\MaterialDesignColors.dll
+C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\MaterialDesignThemes.Wpf.dll
+C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\Newtonsoft.Json.dll
+C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\MaterialDesignColors.pdb
+C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\MaterialDesignThemes.Wpf.pdb
+C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\MaterialDesignThemes.Wpf.xml
+C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\Newtonsoft.Json.xml
+C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Application.baml
+C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator.vbproj.CopyComplete
+C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\Automator.exe.config
+C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\Automator.exe
+C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\Automator.pdb
+C:\Users\me\source\repos\Automator\Automator\Automator\bin\Debug\Automator.xml
+C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator_MarkupCompile.cache
+C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator_MarkupCompile.lref
+C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator.g.resources
+C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator.exe
+C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator.xml
+C:\Users\me\source\repos\Automator\Automator\Automator\obj\Debug\Automator.pdb
diff --git a/Automator/Automator/obj/Debug/Automator.vbprojResolveAssemblyReference.cache b/Automator/Automator/obj/Debug/Automator.vbprojResolveAssemblyReference.cache
diff --git a/Automator/Automator/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Automator/Automator/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/Automator/Automator/packages.config b/Automator/Automator/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MaterialDesignColors" version="1.1.3" targetFramework="net45" />
+  <package id="MaterialDesignThemes" version="2.4.0.1044" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
+</packages>