diff --git a/.vs/guitarToolsForm/v15/.suo b/.vs/guitarToolsForm/v15/.suo index 3b17342..a7b79e1 100644 Binary files a/.vs/guitarToolsForm/v15/.suo and b/.vs/guitarToolsForm/v15/.suo differ diff --git a/FretboardLibrary/FretNote.cs b/FretboardLibrary/FretNote.cs index f4f8883..97224c8 100644 --- a/FretboardLibrary/FretNote.cs +++ b/FretboardLibrary/FretNote.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Xml.Linq; using System.Text; +using System; namespace FretboardLibrary { @@ -26,6 +27,8 @@ public class FretNote private Viewbox box; #endregion + private static readonly Object key = new Object(); + public FretNote(int index, double size, bool isActive, int root, Point xy, Grid grid) { #region Defining variables @@ -100,14 +103,13 @@ public void ShiftTuning(int ShiftBy) private void SetToolTip() { IntLimited interval = new IntLimited(Index - Root, 0, 12); - noteBody.ToolTip = (from node in XDocument.Load(@"C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\Data\Data.xml") + noteBody.ToolTip = (from node in XDocument.Load(System.IO.Directory.GetCurrentDirectory() + @"\Data\Data.xml") .Descendants("Ratios").Elements("Ratio") where node.Attribute("id").Value == interval.Value.ToString() select new StringBuilder(node.Element("Value").Value) .Append(" ") .Append(node.Element("Name").Value) .ToString()).Single(); - } } } \ No newline at end of file diff --git a/FretboardLibrary/Fretboard.cs b/FretboardLibrary/Fretboard.cs index a1ea281..b45accb 100644 --- a/FretboardLibrary/Fretboard.cs +++ b/FretboardLibrary/Fretboard.cs @@ -6,6 +6,9 @@ using System.Windows.Shapes; using ServicesLibrary; using System.Xml.Linq; +using System.IO; +using System.Threading; +using System; namespace FretboardLibrary { @@ -40,7 +43,7 @@ public Fretboard(Grid mainGrid, ushort strings, ushort frets, List - - - + diff --git a/guitarTools/GuitarScales.csproj b/guitarTools/GuitarScales.csproj index 6a93925..b68bf10 100644 --- a/guitarTools/GuitarScales.csproj +++ b/guitarTools/GuitarScales.csproj @@ -48,10 +48,15 @@ TRACE prompt 4 + + + + false + ..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll diff --git a/guitarTools/MainWindow.xaml.cs b/guitarTools/MainWindow.xaml.cs index 4555fa0..c15a002 100644 --- a/guitarTools/MainWindow.xaml.cs +++ b/guitarTools/MainWindow.xaml.cs @@ -1,12 +1,14 @@ -using System; -using System.Windows; -using System.Collections.Generic; -using FretboardLibrary; +using FretboardLibrary; using ServicesLibrary; -using System.Windows.Media.Animation; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Windows; using System.Windows.Controls; +using System.Windows.Media.Animation; +using System.Windows.Threading; using System.Xml.Linq; -using System.Linq; namespace GuitarScales { @@ -40,7 +42,7 @@ public MainWindow() ushort frets = 12 * 1; ushort strings = 6; NoteList = new List>(); // Row is a string, column is a fret - Doc = new XDocument(XDocument.Load(@"C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\Data\Data.xml")); + Doc = new XDocument(XDocument.Load(System.IO.Directory.GetCurrentDirectory() + @"\Data\Data.xml")); HiddenMenu = true; SettingsPanel = null; @@ -50,7 +52,6 @@ public MainWindow() fretboard = new Fretboard(mainGrid, strings, frets, NoteList, 4, "Standard E", "Ionian"); SetupControls(4, 0, strings); - SetupSearchScale(); } @@ -60,9 +61,8 @@ private void SetupControls(int root, int scale, int strings) // The root notes are constant - no need to fetch from database cbRoot.SelectedIndex = root; // Setting default root note to "E" - FillTunings(strings); - - FillScales(scale); + Dispatcher.Invoke(() => { FillTunings(strings); }); + Dispatcher.Invoke(() => { FillScales(scale); }); } private void FillTunings(int strings) @@ -95,22 +95,29 @@ private void FillScales(int scale) private void SetupSearchScale() { - foreach (var item in MusicKeys) - { - tbOne.Items.Add(item); - tbTwo.Items.Add(item); - tbThree.Items.Add(item); - } - var chords = from node in Doc.Descendants("Chords").Elements("Chord") select node.Element("Name").Value; - foreach (var item in chords) + Dispatcher.Invoke(() => { - cbOne.Items.Add(item); - cbTwo.Items.Add(item); - cbThree.Items.Add(item); - } + foreach (var item in MusicKeys) + { + tbOne.Items.Add(item); + tbTwo.Items.Add(item); + tbThree.Items.Add(item); + } + }, DispatcherPriority.ContextIdle); + + Dispatcher.Invoke(() => + { + foreach (var item in chords) + { + cbOne.Items.Add(item); + cbTwo.Items.Add(item); + cbThree.Items.Add(item); + } + }, DispatcherPriority.ContextIdle); + Menu = new ComboBox[,] { { tbOne, tbTwo, tbThree }, { cbOne, cbTwo, cbThree } }; init = true; } @@ -147,15 +154,9 @@ public void cbScale_SelectionChanged(object sender, System.Windows.Controls.Sele private void Menu_Click(object sender, RoutedEventArgs e) { - Storyboard sb; - if (HiddenMenu) - { - sb = Resources["sbShowLeftMenu"] as Storyboard; - } - else - { - sb = Resources["sbHideLeftMenu"] as Storyboard; - } + Storyboard sb = HiddenMenu ? Resources["sbShowLeftMenu"] as Storyboard : + Resources["sbHideLeftMenu"] as Storyboard; + sb.Begin(pnlLeftMenu); HiddenMenu = !HiddenMenu; } @@ -186,30 +187,38 @@ private void btnSearch_Click(object sender, RoutedEventArgs e) lbResults.Items.Clear(); List chordNotes = new List(); int pointA = Array.IndexOf(MusicKeys, tbOne.SelectedItem); + Semaphore sem = new Semaphore(1, Environment.ProcessorCount); + for (int row = 0; row < Menu.GetLength(1) - Active; row++) { - string[] chord = (from node in Doc.Descendants("Chords").Elements("Chord") - where node.Element("Name").Value == (string)Menu[1, row].SelectedValue - select node.Element("Interval").Value).Single().Split(' '); - - int pointB = Array.IndexOf(MusicKeys, Menu[1, row]); - if (pointA - pointB != 0) - { - IntLimited shiftBy = new IntLimited(pointA + pointB, 0, 12); - } - foreach (var item in chord) - if (!chordNotes.Contains(int.Parse(item))) - chordNotes.Add(int.Parse(item)); + Dispatcher.Invoke(() => { + sem.WaitOne(); + string[] chord = (from node in Doc.Descendants("Chords").Elements("Chord") + where node.Element("Name").Value == (string)Menu[1, row].SelectedValue + select node.Element("Interval").Value).Single().Split(' '); + + int pointB = Array.IndexOf(MusicKeys, Menu[1, row]); + if (pointA - pointB != 0) + { + IntLimited shiftBy = new IntLimited(pointA + pointB, 0, 12); + } + foreach (var item in chord) + if (!chordNotes.Contains(int.Parse(item))) + chordNotes.Add(int.Parse(item)); + sem.Release(); + }, DispatcherPriority.ContextIdle); } + chordNotes.Sort(); - try - { - var scales = from node in Doc.Descendants("Scales").Elements("Scale") - select node.Element("Interval").Value; - List found = new List(); - foreach (var item in scales) - { + var scales = from node in Doc.Descendants("Scales").Elements("Scale") + select node.Element("Interval").Value; + + List found = new List(); + foreach (var item in scales) + { + (new Thread(() => { + sem.WaitOne(); for (int note = 0; note < chordNotes.Count; note++) { if (item.IndexOf(note.ToString()) != -1) @@ -221,20 +230,18 @@ where node.Element("Name").Value == (string)Menu[1, row].SelectedValue } else break; } - } - if (found.Count > 0) - foreach (var item in found) - lbResults.Items.Add( - (from node in Doc.Descendants("Scales").Elements("Scale") - where node.Element("Interval").Value == item - select node.Element("Name").Value).Single() - ); - else lbResults.Items.Add("Unknown scale"); - } - catch - { - MessageBox.Show("OOOPS"); + sem.Release(); + })).Start(); } + + if (found.Count > 0) + foreach (var item in found) + lbResults.Items.Add( + (from node in Doc.Descendants("Scales").Elements("Scale") + where node.Element("Interval").Value == item + select node.Element("Name").Value).Single() + ); + else lbResults.Items.Add("Unknown scale"); } private void SelectionChanged(object sender, SelectionChangedEventArgs e) diff --git a/guitarTools/Properties/AssemblyInfo.cs b/guitarTools/Properties/AssemblyInfo.cs index bd909b5..4ad171c 100644 --- a/guitarTools/Properties/AssemblyInfo.cs +++ b/guitarTools/Properties/AssemblyInfo.cs @@ -7,12 +7,12 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("guitarTools")] +[assembly: AssemblyTitle("Guitar Tools")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("guitarTools")] -[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyProduct("Guitar Tools")] +[assembly: AssemblyCopyright("Copyright © 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -53,3 +53,5 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: NeutralResourcesLanguage("en")] + diff --git a/guitarTools/Properties/Settings.Designer.cs b/guitarTools/Properties/Settings.Designer.cs index 197b7bd..1b1ad6d 100644 --- a/guitarTools/Properties/Settings.Designer.cs +++ b/guitarTools/Properties/Settings.Designer.cs @@ -22,16 +22,5 @@ public static Settings Default { return defaultInstance; } } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] - [global::System.Configuration.DefaultSettingValueAttribute("Data Source=(LocalDB)\\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\\Data.mdf;Inte" + - "grated Security=True;Connect Timeout=30")] - public string DataConnectionString { - get { - return ((string)(this["DataConnectionString"])); - } - } } } diff --git a/guitarTools/Properties/Settings.settings b/guitarTools/Properties/Settings.settings index a34eddf..8e615f2 100644 --- a/guitarTools/Properties/Settings.settings +++ b/guitarTools/Properties/Settings.settings @@ -1,14 +1,5 @@  - + - - - <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\Data.mdf;Integrated Security=True;Connect Timeout=30</ConnectionString> - <ProviderName>System.Data.SqlClient</ProviderName> -</SerializableConnectionString> - Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\Data.mdf;Integrated Security=True;Connect Timeout=30 - - + \ No newline at end of file diff --git a/guitarTools/bin/Debug/Data.mdf b/guitarTools/bin/Debug/Data.mdf deleted file mode 100644 index 1726a04..0000000 Binary files a/guitarTools/bin/Debug/Data.mdf and /dev/null differ diff --git a/guitarTools/bin/Debug/Data/Data.xml b/guitarTools/bin/Debug/Data/Data.xml new file mode 100644 index 0000000..5adc7be --- /dev/null +++ b/guitarTools/bin/Debug/Data/Data.xml @@ -0,0 +1,225 @@ + + + + + Standard E + 4 11 7 2 9 4 + + + Drop D + 4 11 7 2 9 2 + + + Dad-Gad + 2 9 7 2 9 2 + + + Dad-Dad + 2 9 2 2 9 2 + + + Cello + 11 4 9 2 7 0 + + + + Standard B + 4 11 7 2 9 4 11 + + + Drop A + 4 11 7 2 9 4 9 + + + Standard F# + 4 11 7 2 9 4 11 6 + + + Drop E + 4 11 7 2 9 4 11 4 + + + + + Ionian + 0 2 4 5 7 9 11 + + + Dorian + 0 2 3 5 7 9 10 + + + Frygian + 0 1 3 5 7 8 10 + + + Lydian + 0 2 4 6 7 9 11 + + + Mixolydian + 0 2 4 5 7 8 10 + + + Aiolian + 0 2 3 5 7 8 10 + + + Locrian + 0 1 3 5 6 8 10 + + + Pentatonic Min + 0 3 5 7 10 + + + Pentatonic Maj + 0 2 4 7 9 + + + Harmonic Min + 0 2 3 5 7 8 11 + + + Harmonic Maj + 0 2 4 5 7 8 11 + + + Blues + 0 3 4 5 6 7 10 + + + + + Perfect unison + 1 + + + Minor second + -2 + + + Major second + 2 + + + Minor third + -3 + + + Major third + 3/-4 + + + Perfect fourth + 4 + + + Tritone + +4/-5 + + + Perfect fifth + 5 + + + Minor sixth + +5/-6 + + + Major sixth + 6 + + + Minor seventh + -7 + + + Major seventh + 7 + + + + + maj + 0 4 7 + + + 6 + 0 4 7 9 + + + maj7 + 0 4 7 11 + + + sus4 + 0 5 7 + + + sus2 + 0 2 7 + + + min + 0 3 7 + + + min6 + 0 3 7 9 + + + min7 + 0 3 7 10 + + + 7 + 0 4 7 10 + + + 7+ + 0 4 8 10 + + + 7sus + 0 5 7 10 + + + 9 + 0 2 4 7 10 + + + 7#9 + 0 3 4 7 10 + + + 7b9 + 0 1 4 7 10 + + + 13 + 0 2 4 7 9 10 + + + \ No newline at end of file diff --git a/guitarTools/bin/Debug/Data_log.ldf b/guitarTools/bin/Debug/Data_log.ldf deleted file mode 100644 index d1f6878..0000000 Binary files a/guitarTools/bin/Debug/Data_log.ldf and /dev/null differ diff --git a/guitarTools/bin/Debug/FretboardLibrary.dll b/guitarTools/bin/Debug/FretboardLibrary.dll index d875c9f..75be966 100644 Binary files a/guitarTools/bin/Debug/FretboardLibrary.dll and b/guitarTools/bin/Debug/FretboardLibrary.dll differ diff --git a/guitarTools/bin/Debug/FretboardLibrary.pdb b/guitarTools/bin/Debug/FretboardLibrary.pdb index e0982b8..5d40fc4 100644 Binary files a/guitarTools/bin/Debug/FretboardLibrary.pdb and b/guitarTools/bin/Debug/FretboardLibrary.pdb differ diff --git a/guitarTools/bin/Debug/GuitarScales.exe b/guitarTools/bin/Debug/GuitarScales.exe index 79a26cd..0bc014a 100644 Binary files a/guitarTools/bin/Debug/GuitarScales.exe and b/guitarTools/bin/Debug/GuitarScales.exe differ diff --git a/guitarTools/bin/Debug/GuitarScales.pdb b/guitarTools/bin/Debug/GuitarScales.pdb index 6f0fd86..5381a4f 100644 Binary files a/guitarTools/bin/Debug/GuitarScales.pdb and b/guitarTools/bin/Debug/GuitarScales.pdb differ diff --git a/guitarTools/bin/Release/Data.mdf b/guitarTools/bin/Release/Data.mdf deleted file mode 100644 index 6b0734c..0000000 Binary files a/guitarTools/bin/Release/Data.mdf and /dev/null differ diff --git a/guitarTools/bin/Release/Data/Data.xml b/guitarTools/bin/Release/Data/Data.xml new file mode 100644 index 0000000..5adc7be --- /dev/null +++ b/guitarTools/bin/Release/Data/Data.xml @@ -0,0 +1,225 @@ + + + + + Standard E + 4 11 7 2 9 4 + + + Drop D + 4 11 7 2 9 2 + + + Dad-Gad + 2 9 7 2 9 2 + + + Dad-Dad + 2 9 2 2 9 2 + + + Cello + 11 4 9 2 7 0 + + + + Standard B + 4 11 7 2 9 4 11 + + + Drop A + 4 11 7 2 9 4 9 + + + Standard F# + 4 11 7 2 9 4 11 6 + + + Drop E + 4 11 7 2 9 4 11 4 + + + + + Ionian + 0 2 4 5 7 9 11 + + + Dorian + 0 2 3 5 7 9 10 + + + Frygian + 0 1 3 5 7 8 10 + + + Lydian + 0 2 4 6 7 9 11 + + + Mixolydian + 0 2 4 5 7 8 10 + + + Aiolian + 0 2 3 5 7 8 10 + + + Locrian + 0 1 3 5 6 8 10 + + + Pentatonic Min + 0 3 5 7 10 + + + Pentatonic Maj + 0 2 4 7 9 + + + Harmonic Min + 0 2 3 5 7 8 11 + + + Harmonic Maj + 0 2 4 5 7 8 11 + + + Blues + 0 3 4 5 6 7 10 + + + + + Perfect unison + 1 + + + Minor second + -2 + + + Major second + 2 + + + Minor third + -3 + + + Major third + 3/-4 + + + Perfect fourth + 4 + + + Tritone + +4/-5 + + + Perfect fifth + 5 + + + Minor sixth + +5/-6 + + + Major sixth + 6 + + + Minor seventh + -7 + + + Major seventh + 7 + + + + + maj + 0 4 7 + + + 6 + 0 4 7 9 + + + maj7 + 0 4 7 11 + + + sus4 + 0 5 7 + + + sus2 + 0 2 7 + + + min + 0 3 7 + + + min6 + 0 3 7 9 + + + min7 + 0 3 7 10 + + + 7 + 0 4 7 10 + + + 7+ + 0 4 8 10 + + + 7sus + 0 5 7 10 + + + 9 + 0 2 4 7 10 + + + 7#9 + 0 3 4 7 10 + + + 7b9 + 0 1 4 7 10 + + + 13 + 0 2 4 7 9 10 + + + \ No newline at end of file diff --git a/guitarTools/bin/Release/Data_log.ldf b/guitarTools/bin/Release/Data_log.ldf deleted file mode 100644 index 5d34327..0000000 Binary files a/guitarTools/bin/Release/Data_log.ldf and /dev/null differ diff --git a/guitarTools/bin/Release/FontAwesome.WPF.dll b/guitarTools/bin/Release/FontAwesome.WPF.dll new file mode 100644 index 0000000..bcb5dc9 Binary files /dev/null and b/guitarTools/bin/Release/FontAwesome.WPF.dll differ diff --git a/guitarTools/bin/Release/FontAwesome.WPF.xml b/guitarTools/bin/Release/FontAwesome.WPF.xml new file mode 100644 index 0000000..acdcfb7 --- /dev/null +++ b/guitarTools/bin/Release/FontAwesome.WPF.xml @@ -0,0 +1,3502 @@ + + + + FontAwesome.WPF + + + + + Provides attached properties to set FontAwesome icons on controls. + + + + + FontAwesome FontFamily. + + + + + Identifies the FontAwesome.WPF.Awesome.Content attached dependency property. + + + + + Gets the content of a ContentControl, expressed as a FontAwesome icon. + + The ContentControl subject of the query + FontAwesome icon found as content + + + + Sets the content of a ContentControl expressed as a FontAwesome icon. This will cause the content to be redrawn. + + The ContentControl where to set the content + FontAwesome icon to set as content + + + + Control extensions + + + + + The key used for storing the spinner Storyboard. + + + + + Start the spinning animation + + FrameworkElement and ISpinable + Control to apply the rotation + + + + Stop the spinning animation + + FrameworkElement and ISpinable + Control to stop the rotation. + + + + Sets the rotation for the control + + FrameworkElement and IRotatable + Control to apply the rotation + + + + Sets the flip orientation for the control + + FrameworkElement and IRotatable + Control to apply the rotation + + + + Converts the CSS class name to a FontAwesomIcon and vice-versa. + + + + + Gets or sets the mode of the converter + + + + + Defines the CssClassNameConverter mode. + + + + + Default mode. Expects a string and converts to a FontAwesomeIcon. + + + + + Expects a FontAwesomeIcon and converts it to a string. + + + + + Converts a FontAwesomIcon to its description. + + + + + Converts a FontAwesomIcon to an ImageSource. Use the ConverterParameter to pass the Brush. + + + + + Provides a lightweight control for displaying a FontAwesome icon as text. + + + + + FontAwesome FontFamily. + + + + + Identifies the FontAwesome.WPF.FontAwesome.Icon dependency property. + + + + + Identifies the FontAwesome.WPF.FontAwesome.Spin dependency property. + + + + + Identifies the FontAwesome.WPF.FontAwesome.Spin dependency property. + + + + + Identifies the FontAwesome.WPF.FontAwesome.Rotation dependency property. + + + + + Identifies the FontAwesome.WPF.FontAwesome.FlipOrientation dependency property. + + + + + Gets or sets the FontAwesome icon. Changing this property will cause the icon to be redrawn. + + + + + Gets or sets the current spin (angle) animation of the icon. + + + + + Gets or sets the duration of the spinning animation (in seconds). This will stop and start the spin animation. + + + + + Gets or sets the current rotation (angle). + + + + + Gets or sets the current orientation (horizontal, vertical). + + + + + FontAwesome v4.7.0 by Dave Gandy (@davegandy) + The iconic font and CSS toolkit + License http://fontawesome.io/license (Font: v4.7.0, C#: MIT License) + + + + + + + Set this value to show no icon. + + + Glass (created: 1.0) + + + + Music (created: 1.0) + + + + Search (created: 1.0) + + + + Envelope Outlined (created: 1.0) + + + + Heart (created: 1.0) + + + + Star (created: 1.0) + + + + Star Outlined (created: 1.0) + + + + User (created: 1.0) + + + + Film (created: 1.0) + + + + th-large (created: 1.0) + + + + th (created: 1.0) + + + + th-list (created: 1.0) + + + + Check (created: 1.0) + + + + Times (created: 1.0) + + + + Alias of: Times + + + + Alias of: Times + + + + Search Plus (created: 1.0) + + + + Search Minus (created: 1.0) + + + + Power Off (created: 1.0) + + + + signal (created: 1.0) + + + + cog (created: 1.0) + + + + Alias of: Cog + + + + Trash Outlined (created: 1.0) + + + + home (created: 1.0) + + + + File Outlined (created: 1.0) + + + + Clock Outlined (created: 1.0) + + + + road (created: 1.0) + + + + Download (created: 1.0) + + + + Arrow Circle Outlined Down (created: 1.0) + + + + Arrow Circle Outlined Up (created: 1.0) + + + + inbox (created: 1.0) + + + + Play Circle Outlined (created: 1.0) + + + + Repeat (created: 1.0) + + + + Alias of: Repeat + + + + refresh (created: 1.0) + + + + list-alt (created: 1.0) + + + + lock (created: 1.0) + + + + flag (created: 1.0) + + + + headphones (created: 1.0) + + + + volume-off (created: 1.0) + + + + volume-down (created: 1.0) + + + + volume-up (created: 1.0) + + + + qrcode (created: 1.0) + + + + barcode (created: 1.0) + + + + tag (created: 1.0) + + + + tags (created: 1.0) + + + + book (created: 1.0) + + + + bookmark (created: 1.0) + + + + print (created: 1.0) + + + + camera (created: 1.0) + + + + font (created: 1.0) + + + + bold (created: 1.0) + + + + italic (created: 1.0) + + + + text-height (created: 1.0) + + + + text-width (created: 1.0) + + + + align-left (created: 1.0) + + + + align-center (created: 1.0) + + + + align-right (created: 1.0) + + + + align-justify (created: 1.0) + + + + list (created: 1.0) + + + + Outdent (created: 1.0) + + + + Alias of: Outdent + + + + Indent (created: 1.0) + + + + Video Camera (created: 1.0) + + + + Picture Outlined (created: 1.0) + + + + Alias of: PictureOutline + + + + Alias of: PictureOutline + + + + pencil (created: 1.0) + + + + map-marker (created: 1.0) + + + + adjust (created: 1.0) + + + + tint (created: 1.0) + + + + Pencil Square Outlined (created: 1.0) + + + + Alias of: PencilSquareOutline + + + + Share Square Outlined (created: 1.0) + + + + Check Square Outlined (created: 1.0) + + + + Arrows (created: 1.0) + + + + step-backward (created: 1.0) + + + + fast-backward (created: 1.0) + + + + backward (created: 1.0) + + + + play (created: 1.0) + + + + pause (created: 1.0) + + + + stop (created: 1.0) + + + + forward (created: 1.0) + + + + fast-forward (created: 1.0) + + + + step-forward (created: 1.0) + + + + eject (created: 1.0) + + + + chevron-left (created: 1.0) + + + + chevron-right (created: 1.0) + + + + Plus Circle (created: 1.0) + + + + Minus Circle (created: 1.0) + + + + Times Circle (created: 1.0) + + + + Check Circle (created: 1.0) + + + + Question Circle (created: 1.0) + + + + Info Circle (created: 1.0) + + + + Crosshairs (created: 1.0) + + + + Times Circle Outlined (created: 1.0) + + + + Check Circle Outlined (created: 1.0) + + + + ban (created: 1.0) + + + + arrow-left (created: 1.0) + + + + arrow-right (created: 1.0) + + + + arrow-up (created: 1.0) + + + + arrow-down (created: 1.0) + + + + Share (created: 1.0) + + + + Alias of: Share + + + + Expand (created: 1.0) + + + + Compress (created: 1.0) + + + + plus (created: 1.0) + + + + minus (created: 1.0) + + + + asterisk (created: 1.0) + + + + Exclamation Circle (created: 1.0) + + + + gift (created: 1.0) + + + + leaf (created: 1.0) + + + + fire (created: 1.0) + + + + Eye (created: 1.0) + + + + Eye Slash (created: 1.0) + + + + Exclamation Triangle (created: 1.0) + + + + Alias of: ExclamationTriangle + + + + plane (created: 1.0) + + + + calendar (created: 1.0) + + + + random (created: 1.0) + + + + comment (created: 1.0) + + + + magnet (created: 1.0) + + + + chevron-up (created: 1.0) + + + + chevron-down (created: 1.0) + + + + retweet (created: 1.0) + + + + shopping-cart (created: 1.0) + + + + Folder (created: 1.0) + + + + Folder Open (created: 1.0) + + + + Arrows Vertical (created: 1.0) + + + + Arrows Horizontal (created: 1.0) + + + + Bar Chart (created: 1.0) + + + + Alias of: BarChart + + + + Twitter Square (created: 1.0) + + + + Facebook Square (created: 1.0) + + + + camera-retro (created: 1.0) + + + + key (created: 1.0) + + + + cogs (created: 1.0) + + + + Alias of: Cogs + + + + comments (created: 1.0) + + + + Thumbs Up Outlined (created: 1.0) + + + + Thumbs Down Outlined (created: 1.0) + + + + star-half (created: 1.0) + + + + Heart Outlined (created: 1.0) + + + + Sign Out (created: 1.0) + + + + LinkedIn Square (created: 1.0) + + + + Thumb Tack (created: 1.0) + + + + External Link (created: 1.0) + + + + Sign In (created: 1.0) + + + + trophy (created: 1.0) + + + + GitHub Square (created: 1.0) + + + + Upload (created: 1.0) + + + + Lemon Outlined (created: 1.0) + + + + Phone (created: 2.0) + + + + Square Outlined (created: 2.0) + + + + Bookmark Outlined (created: 2.0) + + + + Phone Square (created: 2.0) + + + + Twitter (created: 2.0) + + + + Facebook (created: 2.0) + + + + Alias of: Facebook + + + + GitHub (created: 2.0) + + + + unlock (created: 2.0) + + + + credit-card (created: 2.0) + + + + rss (created: 2.0) + + + + Alias of: Rss + + + + HDD (created: 2.0) + + + + bullhorn (created: 2.0) + + + + bell (created: 2.0) + + + + certificate (created: 2.0) + + + + Hand Outlined Right (created: 2.0) + + + + Hand Outlined Left (created: 2.0) + + + + Hand Outlined Up (created: 2.0) + + + + Hand Outlined Down (created: 2.0) + + + + Arrow Circle Left (created: 2.0) + + + + Arrow Circle Right (created: 2.0) + + + + Arrow Circle Up (created: 2.0) + + + + Arrow Circle Down (created: 2.0) + + + + Globe (created: 2.0) + + + + Wrench (created: 2.0) + + + + Tasks (created: 2.0) + + + + Filter (created: 2.0) + + + + Briefcase (created: 2.0) + + + + Arrows Alt (created: 2.0) + + + + Users (created: 2.0) + + + + Alias of: Users + + + + Link (created: 2.0) + + + + Alias of: Link + + + + Cloud (created: 2.0) + + + + Flask (created: 2.0) + + + + Scissors (created: 2.0) + + + + Alias of: Scissors + + + + Files Outlined (created: 2.0) + + + + Alias of: FilesOutline + + + + Paperclip (created: 2.0) + + + + Floppy Outlined (created: 2.0) + + + + Alias of: FloppyOutline + + + + Square (created: 2.0) + + + + Bars (created: 2.0) + + + + Alias of: Bars + + + + Alias of: Bars + + + + list-ul (created: 2.0) + + + + list-ol (created: 2.0) + + + + Strikethrough (created: 2.0) + + + + Underline (created: 2.0) + + + + table (created: 2.0) + + + + magic (created: 2.0) + + + + truck (created: 2.0) + + + + Pinterest (created: 2.0) + + + + Pinterest Square (created: 2.0) + + + + Google Plus Square (created: 2.0) + + + + Google Plus (created: 2.0) + + + + Money (created: 2.0) + + + + Caret Down (created: 2.0) + + + + Caret Up (created: 2.0) + + + + Caret Left (created: 2.0) + + + + Caret Right (created: 2.0) + + + + Columns (created: 2.0) + + + + Sort (created: 2.0) + + + + Alias of: Sort + + + + Sort Descending (created: 2.0) + + + + Alias of: SortDesc + + + + Sort Ascending (created: 2.0) + + + + Alias of: SortAsc + + + + Envelope (created: 2.0) + + + + LinkedIn (created: 2.0) + + + + Undo (created: 2.0) + + + + Alias of: Undo + + + + Gavel (created: 2.0) + + + + Alias of: Gavel + + + + Tachometer (created: 2.0) + + + + Alias of: Tachometer + + + + comment-o (created: 2.0) + + + + comments-o (created: 2.0) + + + + Lightning Bolt (created: 2.0) + + + + Alias of: Bolt + + + + Sitemap (created: 2.0) + + + + Umbrella (created: 2.0) + + + + Clipboard (created: 2.0) + + + + Alias of: Clipboard + + + + Lightbulb Outlined (created: 3.0) + + + + Exchange (created: 3.0) + + + + Cloud Download (created: 3.0) + + + + Cloud Upload (created: 3.0) + + + + user-md (created: 2.0) + + + + Stethoscope (created: 3.0) + + + + Suitcase (created: 3.0) + + + + Bell Outlined (created: 3.0) + + + + Coffee (created: 3.0) + + + + Cutlery (created: 3.0) + + + + File Text Outlined (created: 3.0) + + + + Building Outlined (created: 3.0) + + + + hospital Outlined (created: 3.0) + + + + ambulance (created: 3.0) + + + + medkit (created: 3.0) + + + + fighter-jet (created: 3.0) + + + + beer (created: 3.0) + + + + H Square (created: 3.0) + + + + Plus Square (created: 3.0) + + + + Angle Double Left (created: 3.0) + + + + Angle Double Right (created: 3.0) + + + + Angle Double Up (created: 3.0) + + + + Angle Double Down (created: 3.0) + + + + angle-left (created: 3.0) + + + + angle-right (created: 3.0) + + + + angle-up (created: 3.0) + + + + angle-down (created: 3.0) + + + + Desktop (created: 3.0) + + + + Laptop (created: 3.0) + + + + tablet (created: 3.0) + + + + Mobile Phone (created: 3.0) + + + + Alias of: Mobile + + + + Circle Outlined (created: 3.0) + + + + quote-left (created: 3.0) + + + + quote-right (created: 3.0) + + + + Spinner (created: 3.0) + + + + Circle (created: 3.0) + + + + Reply (created: 3.0) + + + + Alias of: Reply + + + + GitHub Alt (created: 3.0) + + + + Folder Outlined (created: 3.0) + + + + Folder Open Outlined (created: 3.0) + + + + Smile Outlined (created: 3.1) + + + + Frown Outlined (created: 3.1) + + + + Meh Outlined (created: 3.1) + + + + Gamepad (created: 3.1) + + + + Keyboard Outlined (created: 3.1) + + + + Flag Outlined (created: 3.1) + + + + flag-checkered (created: 3.1) + + + + Terminal (created: 3.1) + + + + Code (created: 3.1) + + + + reply-all (created: 3.1) + + + + Alias of: ReplyAll + + + + Star Half Outlined (created: 3.1) + + + + Alias of: StarHalfOutline + + + + Alias of: StarHalfOutline + + + + location-arrow (created: 3.1) + + + + crop (created: 3.1) + + + + code-fork (created: 3.1) + + + + Chain Broken (created: 3.1) + + + + Alias of: ChainBroken + + + + Question (created: 3.1) + + + + Info (created: 3.1) + + + + exclamation (created: 3.1) + + + + superscript (created: 3.1) + + + + subscript (created: 3.1) + + + + eraser (created: 3.1) + + + + Puzzle Piece (created: 3.1) + + + + microphone (created: 3.1) + + + + Microphone Slash (created: 3.1) + + + + shield (created: 3.1) + + + + calendar-o (created: 3.1) + + + + fire-extinguisher (created: 3.1) + + + + rocket (created: 3.1) + + + + MaxCDN (created: 3.1) + + + + Chevron Circle Left (created: 3.1) + + + + Chevron Circle Right (created: 3.1) + + + + Chevron Circle Up (created: 3.1) + + + + Chevron Circle Down (created: 3.1) + + + + HTML 5 Logo (created: 3.1) + + + + CSS 3 Logo (created: 3.1) + + + + Anchor (created: 3.1) + + + + Unlock Alt (created: 3.1) + + + + Bullseye (created: 3.1) + + + + Ellipsis Horizontal (created: 3.1) + + + + Ellipsis Vertical (created: 3.1) + + + + RSS Square (created: 3.1) + + + + Play Circle (created: 3.1) + + + + Ticket (created: 3.1) + + + + Minus Square (created: 3.1) + + + + Minus Square Outlined (created: 3.1) + + + + Level Up (created: 3.1) + + + + Level Down (created: 3.1) + + + + Check Square (created: 3.1) + + + + Pencil Square (created: 3.1) + + + + External Link Square (created: 3.1) + + + + Share Square (created: 3.1) + + + + Compass (created: 3.2) + + + + Caret Square Outlined Down (created: 3.2) + + + + Alias of: CaretSquareOutlineDown + + + + Caret Square Outlined Up (created: 3.2) + + + + Alias of: CaretSquareOutlineUp + + + + Caret Square Outlined Right (created: 3.2) + + + + Alias of: CaretSquareOutlineRight + + + + Euro (EUR) (created: 3.2) + + + + Alias of: Eur + + + + GBP (created: 3.2) + + + + US Dollar (created: 3.2) + + + + Alias of: Usd + + + + Indian Rupee (INR) (created: 3.2) + + + + Alias of: Inr + + + + Japanese Yen (JPY) (created: 3.2) + + + + Alias of: Jpy + + + + Alias of: Jpy + + + + Alias of: Jpy + + + + Russian Ruble (RUB) (created: 4.0) + + + + Alias of: Rub + + + + Alias of: Rub + + + + Korean Won (KRW) (created: 3.2) + + + + Alias of: Krw + + + + Bitcoin (BTC) (created: 3.2) + + + + Alias of: Btc + + + + File (created: 3.2) + + + + File Text (created: 3.2) + + + + Sort Alpha Ascending (created: 3.2) + + + + Sort Alpha Descending (created: 3.2) + + + + Sort Amount Ascending (created: 3.2) + + + + Sort Amount Descending (created: 3.2) + + + + Sort Numeric Ascending (created: 3.2) + + + + Sort Numeric Descending (created: 3.2) + + + + thumbs-up (created: 3.2) + + + + thumbs-down (created: 3.2) + + + + YouTube Square (created: 3.2) + + + + YouTube (created: 3.2) + + + + Xing (created: 3.2) + + + + Xing Square (created: 3.2) + + + + YouTube Play (created: 3.2) + + + + Dropbox (created: 3.2) + + + + Stack Overflow (created: 3.2) + + + + Instagram (created: 4.6) + + + + Flickr (created: 3.2) + + + + App.net (created: 3.2) + + + + Bitbucket (created: 3.2) + + + + Bitbucket Square (created: 3.2) + + + + Tumblr (created: 3.2) + + + + Tumblr Square (created: 3.2) + + + + Long Arrow Down (created: 3.2) + + + + Long Arrow Up (created: 3.2) + + + + Long Arrow Left (created: 3.2) + + + + Long Arrow Right (created: 3.2) + + + + Apple (created: 3.2) + + + + Windows (created: 3.2) + + + + Android (created: 3.2) + + + + Linux (created: 3.2) + + + + Dribbble (created: 3.2) + + + + Skype (created: 3.2) + + + + Foursquare (created: 3.2) + + + + Trello (created: 3.2) + + + + Female (created: 3.2) + + + + Male (created: 3.2) + + + + Gratipay (Gittip) (created: 3.2) + + + + Alias of: Gratipay + + + + Sun Outlined (created: 3.2) + + + + Moon Outlined (created: 3.2) + + + + Archive (created: 3.2) + + + + Bug (created: 3.2) + + + + VK (created: 3.2) + + + + Weibo (created: 3.2) + + + + Renren (created: 3.2) + + + + Pagelines (created: 4.0) + + + + Stack Exchange (created: 4.0) + + + + Arrow Circle Outlined Right (created: 4.0) + + + + Arrow Circle Outlined Left (created: 4.0) + + + + Caret Square Outlined Left (created: 4.0) + + + + Alias of: CaretSquareOutlineLeft + + + + Dot Circle Outlined (created: 4.0) + + + + Wheelchair (created: 4.0) + + + + Vimeo Square (created: 4.0) + + + + Turkish Lira (TRY) (created: 4.0) + + + + Alias of: Try + + + + Plus Square Outlined (created: 4.0) + + + + Space Shuttle (created: 4.1) + + + + Slack Logo (created: 4.1) + + + + Envelope Square (created: 4.1) + + + + WordPress Logo (created: 4.1) + + + + OpenID (created: 4.1) + + + + University (created: 4.1) + + + + Alias of: University + + + + Alias of: University + + + + Graduation Cap (created: 4.1) + + + + Alias of: GraduationCap + + + + Yahoo Logo (created: 4.1) + + + + Google Logo (created: 4.1) + + + + reddit Logo (created: 4.1) + + + + reddit Square (created: 4.1) + + + + StumbleUpon Circle (created: 4.1) + + + + StumbleUpon Logo (created: 4.1) + + + + Delicious Logo (created: 4.1) + + + + Digg Logo (created: 4.1) + + + + Pied Piper PP Logo (Old) (created: 4.1) + + + + Pied Piper Alternate Logo (created: 4.1) + + + + Drupal Logo (created: 4.1) + + + + Joomla Logo (created: 4.1) + + + + Language (created: 4.1) + + + + Fax (created: 4.1) + + + + Building (created: 4.1) + + + + Child (created: 4.1) + + + + Paw (created: 4.1) + + + + spoon (created: 4.1) + + + + Cube (created: 4.1) + + + + Cubes (created: 4.1) + + + + Behance (created: 4.1) + + + + Behance Square (created: 4.1) + + + + Steam (created: 4.1) + + + + Steam Square (created: 4.1) + + + + Recycle (created: 4.1) + + + + Car (created: 4.1) + + + + Alias of: Car + + + + Taxi (created: 4.1) + + + + Alias of: Taxi + + + + Tree (created: 4.1) + + + + Spotify (created: 4.1) + + + + deviantART (created: 4.1) + + + + SoundCloud (created: 4.1) + + + + Database (created: 4.1) + + + + PDF File Outlined (created: 4.1) + + + + Word File Outlined (created: 4.1) + + + + Excel File Outlined (created: 4.1) + + + + Powerpoint File Outlined (created: 4.1) + + + + Image File Outlined (created: 4.1) + + + + Alias of: FileImageOutline + + + + Alias of: FileImageOutline + + + + Archive File Outlined (created: 4.1) + + + + Alias of: FileArchiveOutline + + + + Audio File Outlined (created: 4.1) + + + + Alias of: FileAudioOutline + + + + Video File Outlined (created: 4.1) + + + + Alias of: FileVideoOutline + + + + Code File Outlined (created: 4.1) + + + + Vine (created: 4.1) + + + + Codepen (created: 4.1) + + + + jsFiddle (created: 4.1) + + + + Life Ring (created: 4.1) + + + + Alias of: LifeRing + + + + Alias of: LifeRing + + + + Alias of: LifeRing + + + + Alias of: LifeRing + + + + Circle Outlined Notched (created: 4.1) + + + + Rebel Alliance (created: 4.1) + + + + Alias of: Rebel + + + + Alias of: Rebel + + + + Galactic Empire (created: 4.1) + + + + Alias of: Empire + + + + Git Square (created: 4.1) + + + + Git (created: 4.1) + + + + Hacker News (created: 4.1) + + + + Alias of: HackerNews + + + + Alias of: HackerNews + + + + Tencent Weibo (created: 4.1) + + + + QQ (created: 4.1) + + + + Weixin (WeChat) (created: 4.1) + + + + Alias of: Weixin + + + + Paper Plane (created: 4.1) + + + + Alias of: PaperPlane + + + + Paper Plane Outlined (created: 4.1) + + + + Alias of: PaperPlaneOutline + + + + History (created: 4.1) + + + + Circle Outlined Thin (created: 4.1) + + + + header (created: 4.1) + + + + paragraph (created: 4.1) + + + + Sliders (created: 4.1) + + + + Share Alt (created: 4.1) + + + + Share Alt Square (created: 4.1) + + + + Bomb (created: 4.1) + + + + Futbol Outlined (created: 4.2) + + + + Alias of: FutbolOutline + + + + TTY (created: 4.2) + + + + Binoculars (created: 4.2) + + + + Plug (created: 4.2) + + + + Slideshare (created: 4.2) + + + + Twitch (created: 4.2) + + + + Yelp (created: 4.2) + + + + Newspaper Outlined (created: 4.2) + + + + WiFi (created: 4.2) + + + + Calculator (created: 4.2) + + + + Paypal (created: 4.2) + + + + Google Wallet (created: 4.2) + + + + Visa Credit Card (created: 4.2) + + + + MasterCard Credit Card (created: 4.2) + + + + Discover Credit Card (created: 4.2) + + + + American Express Credit Card (created: 4.2) + + + + Paypal Credit Card (created: 4.2) + + + + Stripe Credit Card (created: 4.2) + + + + Bell Slash (created: 4.2) + + + + Bell Slash Outlined (created: 4.2) + + + + Trash (created: 4.2) + + + + Copyright (created: 4.2) + + + + At (created: 4.2) + + + + Eyedropper (created: 4.2) + + + + Paint Brush (created: 4.2) + + + + Birthday Cake (created: 4.2) + + + + Area Chart (created: 4.2) + + + + Pie Chart (created: 4.2) + + + + Line Chart (created: 4.2) + + + + last.fm (created: 4.2) + + + + last.fm Square (created: 4.2) + + + + Toggle Off (created: 4.2) + + + + Toggle On (created: 4.2) + + + + Bicycle (created: 4.2) + + + + Bus (created: 4.2) + + + + ioxhost (created: 4.2) + + + + AngelList (created: 4.2) + + + + Closed Captions (created: 4.2) + + + + Shekel (ILS) (created: 4.2) + + + + Alias of: Ils + + + + Alias of: Ils + + + + meanpath (created: 4.2) + + + + BuySellAds (created: 4.3) + + + + Connect Develop (created: 4.3) + + + + DashCube (created: 4.3) + + + + Forumbee (created: 4.3) + + + + Leanpub (created: 4.3) + + + + Sellsy (created: 4.3) + + + + Shirts in Bulk (created: 4.3) + + + + SimplyBuilt (created: 4.3) + + + + skyatlas (created: 4.3) + + + + Add to Shopping Cart (created: 4.3) + + + + Shopping Cart Arrow Down (created: 4.3) + + + + Diamond (created: 4.3) + + + + Ship (created: 4.3) + + + + User Secret (created: 4.3) + + + + Motorcycle (created: 4.3) + + + + Street View (created: 4.3) + + + + Heartbeat (created: 4.3) + + + + Venus (created: 4.3) + + + + Mars (created: 4.3) + + + + Mercury (created: 4.3) + + + + Transgender (created: 4.3) + + + + Alias of: Transgender + + + + Transgender Alt (created: 4.3) + + + + Venus Double (created: 4.3) + + + + Mars Double (created: 4.3) + + + + Venus Mars (created: 4.3) + + + + Mars Stroke (created: 4.3) + + + + Mars Stroke Vertical (created: 4.3) + + + + Mars Stroke Horizontal (created: 4.3) + + + + Neuter (created: 4.3) + + + + Genderless (created: 4.4) + + + + Facebook Official (created: 4.3) + + + + Pinterest P (created: 4.3) + + + + What's App (created: 4.3) + + + + Server (created: 4.3) + + + + Add User (created: 4.3) + + + + Remove User (created: 4.3) + + + + Bed (created: 4.3) + + + + Alias of: Bed + + + + Viacoin (created: 4.3) + + + + Train (created: 4.3) + + + + Subway (created: 4.3) + + + + Medium (created: 4.3) + + + + Y Combinator (created: 4.4) + + + + Alias of: YCombinator + + + + Optin Monster (created: 4.4) + + + + OpenCart (created: 4.4) + + + + ExpeditedSSL (created: 4.4) + + + + Battery Full (created: 4.4) + + + + Alias of: BatteryFull + + + + Alias of: BatteryFull + + + + Battery 3/4 Full (created: 4.4) + + + + Alias of: BatteryThreeQuarters + + + + Battery 1/2 Full (created: 4.4) + + + + Alias of: BatteryHalf + + + + Battery 1/4 Full (created: 4.4) + + + + Alias of: BatteryQuarter + + + + Battery Empty (created: 4.4) + + + + Alias of: BatteryEmpty + + + + Mouse Pointer (created: 4.4) + + + + I Beam Cursor (created: 4.4) + + + + Object Group (created: 4.4) + + + + Object Ungroup (created: 4.4) + + + + Sticky Note (created: 4.4) + + + + Sticky Note Outlined (created: 4.4) + + + + JCB Credit Card (created: 4.4) + + + + Diner's Club Credit Card (created: 4.4) + + + + Clone (created: 4.4) + + + + Balance Scale (created: 4.4) + + + + Hourglass Outlined (created: 4.4) + + + + Hourglass Start (created: 4.4) + + + + Alias of: HourglassStart + + + + Hourglass Half (created: 4.4) + + + + Alias of: HourglassHalf + + + + Hourglass End (created: 4.4) + + + + Alias of: HourglassEnd + + + + Hourglass (created: 4.4) + + + + Rock (Hand) (created: 4.4) + + + + Alias of: HandRockOutline + + + + Paper (Hand) (created: 4.4) + + + + Alias of: HandPaperOutline + + + + Scissors (Hand) (created: 4.4) + + + + Lizard (Hand) (created: 4.4) + + + + Spock (Hand) (created: 4.4) + + + + Hand Pointer (created: 4.4) + + + + Hand Peace (created: 4.4) + + + + Trademark (created: 4.4) + + + + Registered Trademark (created: 4.4) + + + + Creative Commons (created: 4.4) + + + + GG Currency (created: 4.4) + + + + GG Currency Circle (created: 4.4) + + + + TripAdvisor (created: 4.4) + + + + Odnoklassniki (created: 4.4) + + + + Odnoklassniki Square (created: 4.4) + + + + Get Pocket (created: 4.4) + + + + Wikipedia W (created: 4.4) + + + + Safari (created: 4.4) + + + + Chrome (created: 4.4) + + + + Firefox (created: 4.4) + + + + Opera (created: 4.4) + + + + Internet-explorer (created: 4.4) + + + + Television (created: 4.4) + + + + Alias of: Television + + + + Contao (created: 4.4) + + + + 500px (created: 4.4) + + + + Amazon (created: 4.4) + + + + Calendar Plus Outlined (created: 4.4) + + + + Calendar Minus Outlined (created: 4.4) + + + + Calendar Times Outlined (created: 4.4) + + + + Calendar Check Outlined (created: 4.4) + + + + Industry (created: 4.4) + + + + Map Pin (created: 4.4) + + + + Map Signs (created: 4.4) + + + + Map Outlined (created: 4.4) + + + + Map (created: 4.4) + + + + Commenting (created: 4.4) + + + + Commenting Outlined (created: 4.4) + + + + Houzz (created: 4.4) + + + + Vimeo (created: 4.4) + + + + Font Awesome Black Tie (created: 4.4) + + + + Fonticons (created: 4.4) + + + + reddit Alien (created: 4.5) + + + + Edge Browser (created: 4.5) + + + + Credit Card (created: 4.5) + + + + Codie Pie (created: 4.5) + + + + MODX (created: 4.5) + + + + Fort Awesome (created: 4.5) + + + + USB (created: 4.5) + + + + Product Hunt (created: 4.5) + + + + Mixcloud (created: 4.5) + + + + Scribd (created: 4.5) + + + + Pause Circle (created: 4.5) + + + + Pause Circle Outlined (created: 4.5) + + + + Stop Circle (created: 4.5) + + + + Stop Circle Outlined (created: 4.5) + + + + Shopping Bag (created: 4.5) + + + + Shopping Basket (created: 4.5) + + + + Hashtag (created: 4.5) + + + + Bluetooth (created: 4.5) + + + + Bluetooth (created: 4.5) + + + + Percent (created: 4.5) + + + + GitLab (created: 4.6) + + + + WPBeginner (created: 4.6) + + + + WPForms (created: 4.6) + + + + Envira Gallery (created: 4.6) + + + + Universal Access (created: 4.6) + + + + Wheelchair Alt (created: 4.6) + + + + Question Circle Outlined (created: 4.6) + + + + Blind (created: 4.6) + + + + Audio Description (created: 4.6) + + + + Volume Control Phone (created: 4.6) + + + + Braille (created: 4.6) + + + + Assistive Listening Systems (created: 4.6) + + + + American Sign Language Interpreting (created: 4.6) + + + + Alias of: AmericanSignLanguageInterpreting + + + + Deaf (created: 4.6) + + + + Alias of: Deaf + + + + Alias of: Deaf + + + + Glide (created: 4.6) + + + + Glide G (created: 4.6) + + + + Sign Language (created: 4.6) + + + + Alias of: SignLanguage + + + + Low Vision (created: 4.6) + + + + Viadeo (created: 4.6) + + + + Viadeo Square (created: 4.6) + + + + Snapchat (created: 4.6) + + + + Snapchat Ghost (created: 4.6) + + + + Snapchat Square (created: 4.6) + + + + Pied Piper Logo (created: 4.6) + + + + First Order (created: 4.6) + + + + Yoast (created: 4.6) + + + + ThemeIsle (created: 4.6) + + + + Google Plus Official (created: 4.6) + + + + Alias of: GooglePlusOfficial + + + + Font Awesome (created: 4.6) + + + + Alias of: FontAwesome + + + + Handshake Outlined (created: 4.7) + + + + Envelope Open (created: 4.7) + + + + Envelope Open Outlined (created: 4.7) + + + + Linode (created: 4.7) + + + + Address Book (created: 4.7) + + + + Address Book Outlined (created: 4.7) + + + + Address Card (created: 4.7) + + + + Alias of: AddressCard + + + + Address Card Outlined (created: 4.7) + + + + Alias of: AddressCardOutline + + + + User Circle (created: 4.7) + + + + User Circle Outlined (created: 4.7) + + + + User Outlined (created: 4.7) + + + + Identification Badge (created: 4.7) + + + + Identification Card (created: 4.7) + + + + Alias of: IdCard + + + + Identification Card Outlined (created: 4.7) + + + + Alias of: IdCardOutline + + + + Quora (created: 4.7) + + + + Free Code Camp (created: 4.7) + + + + Telegram (created: 4.7) + + + + Thermometer Full (created: 4.7) + + + + Alias of: ThermometerFull + + + + Alias of: ThermometerFull + + + + Thermometer 3/4 Full (created: 4.7) + + + + Alias of: ThermometerThreeQuarters + + + + Thermometer 1/2 Full (created: 4.7) + + + + Alias of: ThermometerHalf + + + + Thermometer 1/4 Full (created: 4.7) + + + + Alias of: ThermometerQuarter + + + + Thermometer Empty (created: 4.7) + + + + Alias of: ThermometerEmpty + + + + Shower (created: 4.7) + + + + Bath (created: 4.7) + + + + Alias of: Bath + + + + Alias of: Bath + + + + Podcast (created: 4.7) + + + + Window Maximize (created: 4.7) + + + + Window Minimize (created: 4.7) + + + + Window Restore (created: 4.7) + + + + Window Close (created: 4.7) + + + + Alias of: WindowClose + + + + Window Close Outline (created: 4.7) + + + + Alias of: WindowCloseOutline + + + + Bandcamp (created: 4.7) + + + + Grav (created: 4.7) + + + + Etsy (created: 4.7) + + + + IMDB (created: 4.7) + + + + Ravelry (created: 4.7) + + + + Eercast (created: 4.7) + + + + Microchip (created: 4.7) + + + + Snowflake Outlined (created: 4.7) + + + + Superpowers (created: 4.7) + + + + WPExplorer (created: 4.7) + + + + Meetup (created: 4.7) + + + + + Represents the category of a fontawesome icon. + + + + + Gets or sets the category of the icon. + + + + + Initializes a new instance of the FontAwesome.WPF.IconCategoryAttribute class. + + The icon category. + + + + Represents the field is an alias of another icon. + + + + + Represents the id (css class name) of the icon. + + + + + Gets or sets the id (css class name) of the icon. + + + + + Initializes a new instance of the FontAwesome.WPF.IconIdAttribute class. + + The icon id (css class name). + + + + Defines the different flip orientations that a icon can have. + + + + + Default + + + + + Flip horizontally (on x-achsis) + + + + + Flip vertically (on y-achsis) + + + + + Represents a flippable control + + + + + Gets or sets the current orientation (horizontal, vertical). + + + + + Represents a control that draws an FontAwesome icon as an image. + + + + + FontAwesome FontFamily. + + + + + Typeface used to generate FontAwesome icon. + + + + + Identifies the FontAwesome.WPF.ImageAwesome.Foreground dependency property. + + + + + Identifies the FontAwesome.WPF.ImageAwesome.Icon dependency property. + + + + + Identifies the FontAwesome.WPF.ImageAwesome.Spin dependency property. + + + + + Identifies the FontAwesome.WPF.ImageAwesome.Spin dependency property. + + + + + Identifies the FontAwesome.WPF.ImageAwesome.Rotation dependency property. + + + + + Identifies the FontAwesome.WPF.ImageAwesome.FlipOrientation dependency property. + + + + + Gets or sets the foreground brush of the icon. Changing this property will cause the icon to be redrawn. + + + + + Gets or sets the FontAwesome icon. Changing this property will cause the icon to be redrawn. + + + + + Gets or sets the current spin (angle) animation of the icon. + + + + + Gets or sets the duration of the spinning animation (in seconds). This will stop and start the spin animation. + + + + + Gets or sets the current rotation (angle). + + + + + Gets or sets the current orientation (horizontal, vertical). + + + + + Creates a new System.Windows.Media.ImageSource of a specified FontAwesomeIcon and foreground System.Windows.Media.Brush. + + The FontAwesome icon to be drawn. + The System.Windows.Media.Brush to be used as the foreground. + A new System.Windows.Media.ImageSource + + + + Represents a rotatable control + + + + + Gets or sets the current rotation (angle). + + + + + Represents a spinable control + + + + + Gets or sets the current spin (angle) animation of the icon. + + + + + Gets or sets the duration of the spinning animation (in seconds). This will stop and start the spin animation. + + + + diff --git a/guitarTools/bin/Release/FretboardLibrary.dll b/guitarTools/bin/Release/FretboardLibrary.dll new file mode 100644 index 0000000..c0c9352 Binary files /dev/null and b/guitarTools/bin/Release/FretboardLibrary.dll differ diff --git a/guitarTools/bin/Release/GuitarScales.exe b/guitarTools/bin/Release/GuitarScales.exe new file mode 100644 index 0000000..e8255e2 Binary files /dev/null and b/guitarTools/bin/Release/GuitarScales.exe differ diff --git a/guitarTools/bin/Release/guitarTools.exe.config b/guitarTools/bin/Release/GuitarScales.exe.config similarity index 72% rename from guitarTools/bin/Release/guitarTools.exe.config rename to guitarTools/bin/Release/GuitarScales.exe.config index 88fa402..3902b4a 100644 --- a/guitarTools/bin/Release/guitarTools.exe.config +++ b/guitarTools/bin/Release/GuitarScales.exe.config @@ -1,5 +1,8 @@  + + + diff --git a/guitarTools/bin/Release/ServicesLibrary.dll b/guitarTools/bin/Release/ServicesLibrary.dll new file mode 100644 index 0000000..ae37ddf Binary files /dev/null and b/guitarTools/bin/Release/ServicesLibrary.dll differ diff --git a/guitarTools/bin/Release/guitarTools.pdb b/guitarTools/bin/Release/guitarTools.pdb deleted file mode 100644 index b6acaf4..0000000 Binary files a/guitarTools/bin/Release/guitarTools.pdb and /dev/null differ diff --git a/guitarTools/obj/Debug/CoreCompileInputs.cache b/guitarTools/obj/Debug/CoreCompileInputs.cache index 9ef0454..80a72f5 100644 --- a/guitarTools/obj/Debug/CoreCompileInputs.cache +++ b/guitarTools/obj/Debug/CoreCompileInputs.cache @@ -1 +1 @@ -f740a4b8f668560bdad854117613ab5e91890863 +e207e27134eef6576533318764397619a089948e diff --git a/guitarTools/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/guitarTools/obj/Debug/DesignTimeResolveAssemblyReferences.cache index eaba42d..ba5dc89 100644 Binary files a/guitarTools/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/guitarTools/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/guitarTools/obj/Debug/GuitarScales.Properties.Resources.resources b/guitarTools/obj/Debug/GuitarScales.Properties.Resources.resources index 6c05a97..8ac251f 100644 Binary files a/guitarTools/obj/Debug/GuitarScales.Properties.Resources.resources and b/guitarTools/obj/Debug/GuitarScales.Properties.Resources.resources differ diff --git a/guitarTools/obj/Debug/GuitarScales.csproj.FileListAbsolute.txt b/guitarTools/obj/Debug/GuitarScales.csproj.FileListAbsolute.txt index 1695b9c..0c47fc7 100644 --- a/guitarTools/obj/Debug/GuitarScales.csproj.FileListAbsolute.txt +++ b/guitarTools/obj/Debug/GuitarScales.csproj.FileListAbsolute.txt @@ -24,8 +24,6 @@ C:\Users\hp\Documents\Projects\Visual Studio\C#\Guitar-Tools\guitarTools\obj\Deb C:\Users\hp\Documents\Projects\Visual Studio\C#\Guitar-Tools\guitarTools\obj\Debug\Assets\ComboBoxStyle.baml C:\Users\hp\Documents\Projects\Visual Studio\C#\Guitar-Tools\guitarTools\bin\Debug\FontAwesome.WPF.dll C:\Users\hp\Documents\Projects\Visual Studio\C#\Guitar-Tools\guitarTools\bin\Debug\FontAwesome.WPF.xml -C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bin\Debug\Data.mdf -C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bin\Debug\Data_log.ldf C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bin\Debug\GuitarScales.exe.config C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bin\Debug\GuitarScales.exe C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bin\Debug\GuitarScales.pdb @@ -38,7 +36,6 @@ C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bi C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Debug\GuitarScales.csprojResolveAssemblyReference.cache C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Debug\MainWindow.g.cs C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Debug\App.g.cs -C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Debug\GuitarScales_Content.g.cs C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Debug\GuitarScales_MarkupCompile.cache C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Debug\GuitarScales_MarkupCompile.lref C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Debug\Assets\Animation.baml diff --git a/guitarTools/obj/Debug/GuitarScales.csproj.GenerateResource.Cache b/guitarTools/obj/Debug/GuitarScales.csproj.GenerateResource.Cache index e167cf3..de55234 100644 Binary files a/guitarTools/obj/Debug/GuitarScales.csproj.GenerateResource.Cache and b/guitarTools/obj/Debug/GuitarScales.csproj.GenerateResource.Cache differ diff --git a/guitarTools/obj/Debug/GuitarScales.csprojResolveAssemblyReference.cache b/guitarTools/obj/Debug/GuitarScales.csprojResolveAssemblyReference.cache index 46feb4e..58d9ceb 100644 Binary files a/guitarTools/obj/Debug/GuitarScales.csprojResolveAssemblyReference.cache and b/guitarTools/obj/Debug/GuitarScales.csprojResolveAssemblyReference.cache differ diff --git a/guitarTools/obj/Debug/GuitarScales.exe b/guitarTools/obj/Debug/GuitarScales.exe index 79a26cd..0bc014a 100644 Binary files a/guitarTools/obj/Debug/GuitarScales.exe and b/guitarTools/obj/Debug/GuitarScales.exe differ diff --git a/guitarTools/obj/Debug/GuitarScales.pdb b/guitarTools/obj/Debug/GuitarScales.pdb index 6f0fd86..5381a4f 100644 Binary files a/guitarTools/obj/Debug/GuitarScales.pdb and b/guitarTools/obj/Debug/GuitarScales.pdb differ diff --git a/guitarTools/obj/Debug/GuitarScales_Content.g.cs b/guitarTools/obj/Debug/GuitarScales_Content.g.cs deleted file mode 100644 index 6c327a2..0000000 --- a/guitarTools/obj/Debug/GuitarScales_Content.g.cs +++ /dev/null @@ -1,14 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -[assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("data.mdf")] -[assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("data_log.ldf")] - - diff --git a/guitarTools/obj/Debug/GuitarScales_MarkupCompile.cache b/guitarTools/obj/Debug/GuitarScales_MarkupCompile.cache index 974fb57..179be56 100644 --- a/guitarTools/obj/Debug/GuitarScales_MarkupCompile.cache +++ b/guitarTools/obj/Debug/GuitarScales_MarkupCompile.cache @@ -11,7 +11,7 @@ false DEBUG;TRACE C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\App.xaml 41788127620 -2-1355098232 + 5-2017746502 18-870599001 Assets\Animation.xaml;Assets\ComboBoxStyle.xaml;Assets\Theme.xaml;MainWindow.xaml; diff --git a/guitarTools/obj/Debug/GuitarScales_MarkupCompile.i.cache b/guitarTools/obj/Debug/GuitarScales_MarkupCompile.i.cache index b9cea29..3077ed3 100644 --- a/guitarTools/obj/Debug/GuitarScales_MarkupCompile.i.cache +++ b/guitarTools/obj/Debug/GuitarScales_MarkupCompile.i.cache @@ -16,5 +16,5 @@ C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\Ap 18-870599001 Assets\Animation.xaml;Assets\ComboBoxStyle.xaml;Assets\Theme.xaml;MainWindow.xaml; -True +False diff --git a/guitarTools/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/guitarTools/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 4df96ed..3e83f54 100644 Binary files a/guitarTools/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/guitarTools/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/guitarTools/obj/Release/App.baml b/guitarTools/obj/Release/App.baml deleted file mode 100644 index 5baa86d..0000000 Binary files a/guitarTools/obj/Release/App.baml and /dev/null differ diff --git a/guitarTools/obj/Release/App.g.cs b/guitarTools/obj/Release/App.g.cs index 1a068fa..0761fbd 100644 --- a/guitarTools/obj/Release/App.g.cs +++ b/guitarTools/obj/Release/App.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "41C3A008CAEB9738C71EE7E5044557E3" +#pragma checksum "..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AA777E03449EFCFDD12CD7B5E8C096F4" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -40,29 +40,16 @@ namespace guitarTools { /// public partial class App : System.Windows.Application { - private bool _contentLoaded; - /// /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] public void InitializeComponent() { - if (_contentLoaded) { - return; - } - _contentLoaded = true; #line 5 "..\..\App.xaml" this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative); - #line default - #line hidden - System.Uri resourceLocater = new System.Uri("/guitarTools;component/app.xaml", System.UriKind.Relative); - - #line 1 "..\..\App.xaml" - System.Windows.Application.LoadComponent(this, resourceLocater); - #line default #line hidden } diff --git a/guitarTools/obj/Release/App.g.i.cs b/guitarTools/obj/Release/App.g.i.cs index 1a068fa..0761fbd 100644 --- a/guitarTools/obj/Release/App.g.i.cs +++ b/guitarTools/obj/Release/App.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "41C3A008CAEB9738C71EE7E5044557E3" +#pragma checksum "..\..\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "AA777E03449EFCFDD12CD7B5E8C096F4" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -40,29 +40,16 @@ namespace guitarTools { /// public partial class App : System.Windows.Application { - private bool _contentLoaded; - /// /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] public void InitializeComponent() { - if (_contentLoaded) { - return; - } - _contentLoaded = true; #line 5 "..\..\App.xaml" this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative); - #line default - #line hidden - System.Uri resourceLocater = new System.Uri("/guitarTools;component/app.xaml", System.UriKind.Relative); - - #line 1 "..\..\App.xaml" - System.Windows.Application.LoadComponent(this, resourceLocater); - #line default #line hidden } diff --git a/guitarTools/obj/Release/Assets/Animation.baml b/guitarTools/obj/Release/Assets/Animation.baml new file mode 100644 index 0000000..383a8c5 Binary files /dev/null and b/guitarTools/obj/Release/Assets/Animation.baml differ diff --git a/guitarTools/obj/Release/Assets/ComboBoxStyle.baml b/guitarTools/obj/Release/Assets/ComboBoxStyle.baml new file mode 100644 index 0000000..68b2384 Binary files /dev/null and b/guitarTools/obj/Release/Assets/ComboBoxStyle.baml differ diff --git a/guitarTools/obj/Release/Assets/Theme.baml b/guitarTools/obj/Release/Assets/Theme.baml new file mode 100644 index 0000000..b0415cb Binary files /dev/null and b/guitarTools/obj/Release/Assets/Theme.baml differ diff --git a/guitarTools/obj/Release/CoreCompileInputs.cache b/guitarTools/obj/Release/CoreCompileInputs.cache index e46ccc8..7a289a9 100644 --- a/guitarTools/obj/Release/CoreCompileInputs.cache +++ b/guitarTools/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -63f4b285320e105b7fd11356b3376389a4262d48 +c0ad4868d8788267c55a797981b104024f0f248c diff --git a/guitarTools/obj/Release/DesignTimeResolveAssemblyReferences.cache b/guitarTools/obj/Release/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 0000000..0b38613 Binary files /dev/null and b/guitarTools/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/guitarTools/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/guitarTools/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 7f6bd9f..55eb12d 100644 Binary files a/guitarTools/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/guitarTools/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/guitarTools/obj/Release/GuitarScales.Properties.Resources.resources b/guitarTools/obj/Release/GuitarScales.Properties.Resources.resources new file mode 100644 index 0000000..510fcb7 Binary files /dev/null and b/guitarTools/obj/Release/GuitarScales.Properties.Resources.resources differ diff --git a/guitarTools/obj/Release/GuitarScales.csproj.FileListAbsolute.txt b/guitarTools/obj/Release/GuitarScales.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..f88bdad --- /dev/null +++ b/guitarTools/obj/Release/GuitarScales.csproj.FileListAbsolute.txt @@ -0,0 +1,23 @@ +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bin\Release\GuitarScales.exe.config +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bin\Release\GuitarScales.exe +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bin\Release\GuitarScales.pdb +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bin\Release\FontAwesome.WPF.dll +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bin\Release\FretboardLibrary.dll +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bin\Release\ServicesLibrary.dll +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bin\Release\FretboardLibrary.pdb +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bin\Release\ServicesLibrary.pdb +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\bin\Release\FontAwesome.WPF.xml +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\GuitarScales.csprojResolveAssemblyReference.cache +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\MainWindow.g.cs +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\App.g.cs +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\GuitarScales_MarkupCompile.cache +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\GuitarScales_MarkupCompile.lref +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\Assets\Animation.baml +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\Assets\ComboBoxStyle.baml +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\Assets\Theme.baml +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\MainWindow.baml +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\GuitarScales.g.resources +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\GuitarScales.Properties.Resources.resources +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\GuitarScales.csproj.GenerateResource.Cache +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\GuitarScales.exe +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\GuitarScales.pdb diff --git a/guitarTools/obj/Release/GuitarScales.csproj.GenerateResource.Cache b/guitarTools/obj/Release/GuitarScales.csproj.GenerateResource.Cache new file mode 100644 index 0000000..99d6e85 Binary files /dev/null and b/guitarTools/obj/Release/GuitarScales.csproj.GenerateResource.Cache differ diff --git a/guitarTools/obj/Release/GuitarScales.csprojResolveAssemblyReference.cache b/guitarTools/obj/Release/GuitarScales.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..4afdbbd Binary files /dev/null and b/guitarTools/obj/Release/GuitarScales.csprojResolveAssemblyReference.cache differ diff --git a/guitarTools/obj/Release/GuitarScales.exe b/guitarTools/obj/Release/GuitarScales.exe new file mode 100644 index 0000000..e8255e2 Binary files /dev/null and b/guitarTools/obj/Release/GuitarScales.exe differ diff --git a/guitarTools/bin/Release/guitarTools.exe b/guitarTools/obj/Release/GuitarScales.g.resources similarity index 73% rename from guitarTools/bin/Release/guitarTools.exe rename to guitarTools/obj/Release/GuitarScales.g.resources index ed65fa7..2fa9ccd 100644 Binary files a/guitarTools/bin/Release/guitarTools.exe and b/guitarTools/obj/Release/GuitarScales.g.resources differ diff --git a/guitarTools/obj/Release/GuitarScales.pdb b/guitarTools/obj/Release/GuitarScales.pdb new file mode 100644 index 0000000..ff9e44c Binary files /dev/null and b/guitarTools/obj/Release/GuitarScales.pdb differ diff --git a/guitarTools/obj/Release/GuitarScales_MarkupCompile.cache b/guitarTools/obj/Release/GuitarScales_MarkupCompile.cache new file mode 100644 index 0000000..e89da90 --- /dev/null +++ b/guitarTools/obj/Release/GuitarScales_MarkupCompile.cache @@ -0,0 +1,20 @@ +GuitarScales + + +winexe +C# +.cs +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\ +GuitarScales +none +false +TRACE +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\App.xaml +41788127620 + +5-2017746502 +181986348299 +Assets\Animation.xaml;Assets\ComboBoxStyle.xaml;Assets\Theme.xaml;MainWindow.xaml; + +False + diff --git a/guitarTools/obj/Release/GuitarScales_MarkupCompile.i.cache b/guitarTools/obj/Release/GuitarScales_MarkupCompile.i.cache new file mode 100644 index 0000000..67facc0 --- /dev/null +++ b/guitarTools/obj/Release/GuitarScales_MarkupCompile.i.cache @@ -0,0 +1,20 @@ +GuitarScales + + +winexe +C# +.cs +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\obj\Release\ +GuitarScales +none +false +TRACE +C:\Users\Denis\Documents\Visual Studio 2017\Projects\Guitar-Tools\guitarTools\App.xaml +41788127620 + +9-1002010426 +181986348299 +Assets\Animation.xaml;Assets\ComboBoxStyle.xaml;Assets\Theme.xaml;MainWindow.xaml; + +False + diff --git a/guitarTools/obj/Debug/GuitarScales_MarkupCompile.i.lref b/guitarTools/obj/Release/GuitarScales_MarkupCompile.lref similarity index 100% rename from guitarTools/obj/Debug/GuitarScales_MarkupCompile.i.lref rename to guitarTools/obj/Release/GuitarScales_MarkupCompile.lref diff --git a/guitarTools/obj/Release/MainWindow.baml b/guitarTools/obj/Release/MainWindow.baml index e933915..f066c84 100644 Binary files a/guitarTools/obj/Release/MainWindow.baml and b/guitarTools/obj/Release/MainWindow.baml differ diff --git a/guitarTools/obj/Release/MainWindow.g.cs b/guitarTools/obj/Release/MainWindow.g.cs index acc4408..17f8597 100644 --- a/guitarTools/obj/Release/MainWindow.g.cs +++ b/guitarTools/obj/Release/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D9E22BFCF1C29EE6AD4EF5013870BB61" +#pragma checksum "..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "07B6A83A61B1AB81BC2E7D3164FD308B" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -9,6 +9,8 @@ // //------------------------------------------------------------------------------ +using FontAwesome.WPF; +using FontAwesome.WPF.Converters; using System; using System.Diagnostics; using System.Windows; @@ -32,7 +34,7 @@ using guitarTools; -namespace guitarTools { +namespace GuitarScales { /// @@ -41,137 +43,201 @@ namespace guitarTools { public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 10 "..\..\MainWindow.xaml" + #line 12 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal guitarTools.MainWindow mainWindow; + internal GuitarScales.MainWindow mainWindow; #line default #line hidden - #line 12 "..\..\MainWindow.xaml" + #line 34 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Border WindowTop; + internal System.Windows.Controls.StackPanel Settings1; #line default #line hidden - #line 24 "..\..\MainWindow.xaml" + #line 48 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Button btnMinimize; + internal System.Windows.Controls.ComboBox cbRoot; #line default #line hidden - #line 31 "..\..\MainWindow.xaml" + #line 71 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Button btnClose; + internal System.Windows.Controls.TextBlock lbTuning; #line default #line hidden - #line 42 "..\..\MainWindow.xaml" + #line 73 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Menu menu; + internal System.Windows.Controls.ComboBox cbTuning; #line default #line hidden - #line 47 "..\..\MainWindow.xaml" + #line 81 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Grid Grida; + internal System.Windows.Controls.TextBlock lbScale; #line default #line hidden - #line 54 "..\..\MainWindow.xaml" + #line 85 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Grid mainGrid; + internal System.Windows.Controls.ComboBox cbScale; #line default #line hidden - #line 55 "..\..\MainWindow.xaml" + #line 91 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Grid noteGrid; + internal System.Windows.Controls.StackPanel Settings2; #line default #line hidden - #line 66 "..\..\MainWindow.xaml" + #line 106 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.StackPanel stackPanel; + internal System.Windows.Controls.Grid MenuGrid; #line default #line hidden - #line 68 "..\..\MainWindow.xaml" + #line 113 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Label lbRoot; + internal System.Windows.Controls.ComboBox tbOne; #line default #line hidden - #line 69 "..\..\MainWindow.xaml" + #line 116 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.ComboBox cbRoot; + internal System.Windows.Controls.ComboBox tbTwo; #line default #line hidden - #line 85 "..\..\MainWindow.xaml" + #line 119 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Label lbTuning; + internal System.Windows.Controls.ComboBox tbThree; #line default #line hidden - #line 86 "..\..\MainWindow.xaml" + #line 124 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.ComboBox cbTuning; + internal System.Windows.Controls.ComboBox cbOne; #line default #line hidden - #line 89 "..\..\MainWindow.xaml" + #line 127 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Label lbScale; + internal System.Windows.Controls.ComboBox cbTwo; #line default #line hidden - #line 90 "..\..\MainWindow.xaml" + #line 130 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.ComboBox cbScale; + internal System.Windows.Controls.ComboBox cbThree; + + #line default + #line hidden + + + #line 138 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button btnSearch; + + #line default + #line hidden + + + #line 139 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.ListBox lbResults; + + #line default + #line hidden + + + #line 142 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.StackPanel Settings3; #line default #line hidden - #line 95 "..\..\MainWindow.xaml" + #line 161 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Label lbFrets; + internal System.Windows.Controls.Slider SliderFrets; #line default #line hidden - #line 104 "..\..\MainWindow.xaml" + #line 172 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Label lbStrings; + internal System.Windows.Controls.Slider SliderStrings; + + #line default + #line hidden + + + #line 189 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.StackPanel pnlLeftMenu; + + #line default + #line hidden + + + #line 204 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button btnSettings1; + + #line default + #line hidden + + + #line 216 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button btnSettings2; + + #line default + #line hidden + + + #line 228 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button btnSettings3; + + #line default + #line hidden + + + #line 245 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Grid mainGrid; #line default #line hidden @@ -188,7 +254,7 @@ public void InitializeComponent() { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/guitarTools;component/mainwindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/GuitarScales;component/mainwindow.xaml", System.UriKind.Relative); #line 1 "..\..\MainWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -207,103 +273,185 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object switch (connectionId) { case 1: - this.mainWindow = ((guitarTools.MainWindow)(target)); + this.mainWindow = ((GuitarScales.MainWindow)(target)); - #line 10 "..\..\MainWindow.xaml" - this.mainWindow.StateChanged += new System.EventHandler(this.mainWindow_StateChanged); - - #line default - #line hidden - - #line 10 "..\..\MainWindow.xaml" - this.mainWindow.Activated += new System.EventHandler(this.MainWindow_OnActivated); + #line 16 "..\..\MainWindow.xaml" + this.mainWindow.MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Settings_MouseDown); #line default #line hidden return; case 2: - this.WindowTop = ((System.Windows.Controls.Border)(target)); - - #line 12 "..\..\MainWindow.xaml" - this.WindowTop.MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.WindowTop_MouseDown); - - #line default - #line hidden + this.Settings1 = ((System.Windows.Controls.StackPanel)(target)); return; case 3: - this.btnMinimize = ((System.Windows.Controls.Button)(target)); + this.cbRoot = ((System.Windows.Controls.ComboBox)(target)); - #line 28 "..\..\MainWindow.xaml" - this.btnMinimize.Click += new System.Windows.RoutedEventHandler(this.btnMinimize_Click); + #line 50 "..\..\MainWindow.xaml" + this.cbRoot.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.cbRoot_SelectionChanged); #line default #line hidden return; case 4: - this.btnClose = ((System.Windows.Controls.Button)(target)); + this.lbTuning = ((System.Windows.Controls.TextBlock)(target)); + return; + case 5: + this.cbTuning = ((System.Windows.Controls.ComboBox)(target)); - #line 35 "..\..\MainWindow.xaml" - this.btnClose.Click += new System.Windows.RoutedEventHandler(this.btnClose_Click); + #line 74 "..\..\MainWindow.xaml" + this.cbTuning.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.cbTuning_SelectionChanged); #line default #line hidden return; - case 5: - this.menu = ((System.Windows.Controls.Menu)(target)); - return; case 6: - this.Grida = ((System.Windows.Controls.Grid)(target)); + this.lbScale = ((System.Windows.Controls.TextBlock)(target)); return; case 7: - this.mainGrid = ((System.Windows.Controls.Grid)(target)); + this.cbScale = ((System.Windows.Controls.ComboBox)(target)); + + #line 86 "..\..\MainWindow.xaml" + this.cbScale.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.cbScale_SelectionChanged); + + #line default + #line hidden return; case 8: - this.noteGrid = ((System.Windows.Controls.Grid)(target)); + this.Settings2 = ((System.Windows.Controls.StackPanel)(target)); return; case 9: - this.stackPanel = ((System.Windows.Controls.StackPanel)(target)); + this.MenuGrid = ((System.Windows.Controls.Grid)(target)); return; case 10: - this.lbRoot = ((System.Windows.Controls.Label)(target)); + this.tbOne = ((System.Windows.Controls.ComboBox)(target)); + + #line 113 "..\..\MainWindow.xaml" + this.tbOne.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.SelectionChanged); + + #line default + #line hidden return; case 11: - this.cbRoot = ((System.Windows.Controls.ComboBox)(target)); + this.tbTwo = ((System.Windows.Controls.ComboBox)(target)); - #line 69 "..\..\MainWindow.xaml" - this.cbRoot.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.cbRoot_SelectionChanged); + #line 116 "..\..\MainWindow.xaml" + this.tbTwo.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.SelectionChanged); #line default #line hidden return; case 12: - this.lbTuning = ((System.Windows.Controls.Label)(target)); + this.tbThree = ((System.Windows.Controls.ComboBox)(target)); + + #line 119 "..\..\MainWindow.xaml" + this.tbThree.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.SelectionChanged); + + #line default + #line hidden return; case 13: - this.cbTuning = ((System.Windows.Controls.ComboBox)(target)); + this.cbOne = ((System.Windows.Controls.ComboBox)(target)); - #line 86 "..\..\MainWindow.xaml" - this.cbTuning.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.cbTuning_SelectionChanged); + #line 124 "..\..\MainWindow.xaml" + this.cbOne.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.SelectionChanged); #line default #line hidden return; case 14: - this.lbScale = ((System.Windows.Controls.Label)(target)); + this.cbTwo = ((System.Windows.Controls.ComboBox)(target)); + + #line 127 "..\..\MainWindow.xaml" + this.cbTwo.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.SelectionChanged); + + #line default + #line hidden return; case 15: - this.cbScale = ((System.Windows.Controls.ComboBox)(target)); + this.cbThree = ((System.Windows.Controls.ComboBox)(target)); - #line 90 "..\..\MainWindow.xaml" - this.cbScale.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.cbScale_SelectionChanged); + #line 130 "..\..\MainWindow.xaml" + this.cbThree.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.SelectionChanged); #line default #line hidden return; case 16: - this.lbFrets = ((System.Windows.Controls.Label)(target)); + this.btnSearch = ((System.Windows.Controls.Button)(target)); + + #line 138 "..\..\MainWindow.xaml" + this.btnSearch.Click += new System.Windows.RoutedEventHandler(this.btnSearch_Click); + + #line default + #line hidden return; case 17: - this.lbStrings = ((System.Windows.Controls.Label)(target)); + this.lbResults = ((System.Windows.Controls.ListBox)(target)); + + #line 139 "..\..\MainWindow.xaml" + this.lbResults.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.lbResults_SelectionChanged); + + #line default + #line hidden + return; + case 18: + this.Settings3 = ((System.Windows.Controls.StackPanel)(target)); + return; + case 19: + this.SliderFrets = ((System.Windows.Controls.Slider)(target)); + return; + case 20: + this.SliderStrings = ((System.Windows.Controls.Slider)(target)); + return; + case 21: + + #line 184 "..\..\MainWindow.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.FretboardApply_Click); + + #line default + #line hidden + return; + case 22: + this.pnlLeftMenu = ((System.Windows.Controls.StackPanel)(target)); + return; + case 23: + + #line 192 "..\..\MainWindow.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Menu_Click); + + #line default + #line hidden + return; + case 24: + this.btnSettings1 = ((System.Windows.Controls.Button)(target)); + + #line 205 "..\..\MainWindow.xaml" + this.btnSettings1.Click += new System.Windows.RoutedEventHandler(this.Settings_Click); + + #line default + #line hidden + return; + case 25: + this.btnSettings2 = ((System.Windows.Controls.Button)(target)); + + #line 217 "..\..\MainWindow.xaml" + this.btnSettings2.Click += new System.Windows.RoutedEventHandler(this.Settings_Click); + + #line default + #line hidden + return; + case 26: + this.btnSettings3 = ((System.Windows.Controls.Button)(target)); + + #line 229 "..\..\MainWindow.xaml" + this.btnSettings3.Click += new System.Windows.RoutedEventHandler(this.Settings_Click); + + #line default + #line hidden + return; + case 27: + this.mainGrid = ((System.Windows.Controls.Grid)(target)); return; } this._contentLoaded = true; diff --git a/guitarTools/obj/Release/MainWindow.g.i.cs b/guitarTools/obj/Release/MainWindow.g.i.cs index acc4408..17f8597 100644 --- a/guitarTools/obj/Release/MainWindow.g.i.cs +++ b/guitarTools/obj/Release/MainWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D9E22BFCF1C29EE6AD4EF5013870BB61" +#pragma checksum "..\..\MainWindow.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "07B6A83A61B1AB81BC2E7D3164FD308B" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -9,6 +9,8 @@ // //------------------------------------------------------------------------------ +using FontAwesome.WPF; +using FontAwesome.WPF.Converters; using System; using System.Diagnostics; using System.Windows; @@ -32,7 +34,7 @@ using guitarTools; -namespace guitarTools { +namespace GuitarScales { /// @@ -41,137 +43,201 @@ namespace guitarTools { public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 10 "..\..\MainWindow.xaml" + #line 12 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal guitarTools.MainWindow mainWindow; + internal GuitarScales.MainWindow mainWindow; #line default #line hidden - #line 12 "..\..\MainWindow.xaml" + #line 34 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Border WindowTop; + internal System.Windows.Controls.StackPanel Settings1; #line default #line hidden - #line 24 "..\..\MainWindow.xaml" + #line 48 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Button btnMinimize; + internal System.Windows.Controls.ComboBox cbRoot; #line default #line hidden - #line 31 "..\..\MainWindow.xaml" + #line 71 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Button btnClose; + internal System.Windows.Controls.TextBlock lbTuning; #line default #line hidden - #line 42 "..\..\MainWindow.xaml" + #line 73 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Menu menu; + internal System.Windows.Controls.ComboBox cbTuning; #line default #line hidden - #line 47 "..\..\MainWindow.xaml" + #line 81 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Grid Grida; + internal System.Windows.Controls.TextBlock lbScale; #line default #line hidden - #line 54 "..\..\MainWindow.xaml" + #line 85 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Grid mainGrid; + internal System.Windows.Controls.ComboBox cbScale; #line default #line hidden - #line 55 "..\..\MainWindow.xaml" + #line 91 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Grid noteGrid; + internal System.Windows.Controls.StackPanel Settings2; #line default #line hidden - #line 66 "..\..\MainWindow.xaml" + #line 106 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.StackPanel stackPanel; + internal System.Windows.Controls.Grid MenuGrid; #line default #line hidden - #line 68 "..\..\MainWindow.xaml" + #line 113 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Label lbRoot; + internal System.Windows.Controls.ComboBox tbOne; #line default #line hidden - #line 69 "..\..\MainWindow.xaml" + #line 116 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.ComboBox cbRoot; + internal System.Windows.Controls.ComboBox tbTwo; #line default #line hidden - #line 85 "..\..\MainWindow.xaml" + #line 119 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Label lbTuning; + internal System.Windows.Controls.ComboBox tbThree; #line default #line hidden - #line 86 "..\..\MainWindow.xaml" + #line 124 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.ComboBox cbTuning; + internal System.Windows.Controls.ComboBox cbOne; #line default #line hidden - #line 89 "..\..\MainWindow.xaml" + #line 127 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Label lbScale; + internal System.Windows.Controls.ComboBox cbTwo; #line default #line hidden - #line 90 "..\..\MainWindow.xaml" + #line 130 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.ComboBox cbScale; + internal System.Windows.Controls.ComboBox cbThree; + + #line default + #line hidden + + + #line 138 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button btnSearch; + + #line default + #line hidden + + + #line 139 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.ListBox lbResults; + + #line default + #line hidden + + + #line 142 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.StackPanel Settings3; #line default #line hidden - #line 95 "..\..\MainWindow.xaml" + #line 161 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Label lbFrets; + internal System.Windows.Controls.Slider SliderFrets; #line default #line hidden - #line 104 "..\..\MainWindow.xaml" + #line 172 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Label lbStrings; + internal System.Windows.Controls.Slider SliderStrings; + + #line default + #line hidden + + + #line 189 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.StackPanel pnlLeftMenu; + + #line default + #line hidden + + + #line 204 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button btnSettings1; + + #line default + #line hidden + + + #line 216 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button btnSettings2; + + #line default + #line hidden + + + #line 228 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button btnSettings3; + + #line default + #line hidden + + + #line 245 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Grid mainGrid; #line default #line hidden @@ -188,7 +254,7 @@ public void InitializeComponent() { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/guitarTools;component/mainwindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/GuitarScales;component/mainwindow.xaml", System.UriKind.Relative); #line 1 "..\..\MainWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -207,103 +273,185 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object switch (connectionId) { case 1: - this.mainWindow = ((guitarTools.MainWindow)(target)); + this.mainWindow = ((GuitarScales.MainWindow)(target)); - #line 10 "..\..\MainWindow.xaml" - this.mainWindow.StateChanged += new System.EventHandler(this.mainWindow_StateChanged); - - #line default - #line hidden - - #line 10 "..\..\MainWindow.xaml" - this.mainWindow.Activated += new System.EventHandler(this.MainWindow_OnActivated); + #line 16 "..\..\MainWindow.xaml" + this.mainWindow.MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Settings_MouseDown); #line default #line hidden return; case 2: - this.WindowTop = ((System.Windows.Controls.Border)(target)); - - #line 12 "..\..\MainWindow.xaml" - this.WindowTop.MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.WindowTop_MouseDown); - - #line default - #line hidden + this.Settings1 = ((System.Windows.Controls.StackPanel)(target)); return; case 3: - this.btnMinimize = ((System.Windows.Controls.Button)(target)); + this.cbRoot = ((System.Windows.Controls.ComboBox)(target)); - #line 28 "..\..\MainWindow.xaml" - this.btnMinimize.Click += new System.Windows.RoutedEventHandler(this.btnMinimize_Click); + #line 50 "..\..\MainWindow.xaml" + this.cbRoot.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.cbRoot_SelectionChanged); #line default #line hidden return; case 4: - this.btnClose = ((System.Windows.Controls.Button)(target)); + this.lbTuning = ((System.Windows.Controls.TextBlock)(target)); + return; + case 5: + this.cbTuning = ((System.Windows.Controls.ComboBox)(target)); - #line 35 "..\..\MainWindow.xaml" - this.btnClose.Click += new System.Windows.RoutedEventHandler(this.btnClose_Click); + #line 74 "..\..\MainWindow.xaml" + this.cbTuning.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.cbTuning_SelectionChanged); #line default #line hidden return; - case 5: - this.menu = ((System.Windows.Controls.Menu)(target)); - return; case 6: - this.Grida = ((System.Windows.Controls.Grid)(target)); + this.lbScale = ((System.Windows.Controls.TextBlock)(target)); return; case 7: - this.mainGrid = ((System.Windows.Controls.Grid)(target)); + this.cbScale = ((System.Windows.Controls.ComboBox)(target)); + + #line 86 "..\..\MainWindow.xaml" + this.cbScale.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.cbScale_SelectionChanged); + + #line default + #line hidden return; case 8: - this.noteGrid = ((System.Windows.Controls.Grid)(target)); + this.Settings2 = ((System.Windows.Controls.StackPanel)(target)); return; case 9: - this.stackPanel = ((System.Windows.Controls.StackPanel)(target)); + this.MenuGrid = ((System.Windows.Controls.Grid)(target)); return; case 10: - this.lbRoot = ((System.Windows.Controls.Label)(target)); + this.tbOne = ((System.Windows.Controls.ComboBox)(target)); + + #line 113 "..\..\MainWindow.xaml" + this.tbOne.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.SelectionChanged); + + #line default + #line hidden return; case 11: - this.cbRoot = ((System.Windows.Controls.ComboBox)(target)); + this.tbTwo = ((System.Windows.Controls.ComboBox)(target)); - #line 69 "..\..\MainWindow.xaml" - this.cbRoot.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.cbRoot_SelectionChanged); + #line 116 "..\..\MainWindow.xaml" + this.tbTwo.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.SelectionChanged); #line default #line hidden return; case 12: - this.lbTuning = ((System.Windows.Controls.Label)(target)); + this.tbThree = ((System.Windows.Controls.ComboBox)(target)); + + #line 119 "..\..\MainWindow.xaml" + this.tbThree.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.SelectionChanged); + + #line default + #line hidden return; case 13: - this.cbTuning = ((System.Windows.Controls.ComboBox)(target)); + this.cbOne = ((System.Windows.Controls.ComboBox)(target)); - #line 86 "..\..\MainWindow.xaml" - this.cbTuning.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.cbTuning_SelectionChanged); + #line 124 "..\..\MainWindow.xaml" + this.cbOne.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.SelectionChanged); #line default #line hidden return; case 14: - this.lbScale = ((System.Windows.Controls.Label)(target)); + this.cbTwo = ((System.Windows.Controls.ComboBox)(target)); + + #line 127 "..\..\MainWindow.xaml" + this.cbTwo.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.SelectionChanged); + + #line default + #line hidden return; case 15: - this.cbScale = ((System.Windows.Controls.ComboBox)(target)); + this.cbThree = ((System.Windows.Controls.ComboBox)(target)); - #line 90 "..\..\MainWindow.xaml" - this.cbScale.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.cbScale_SelectionChanged); + #line 130 "..\..\MainWindow.xaml" + this.cbThree.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.SelectionChanged); #line default #line hidden return; case 16: - this.lbFrets = ((System.Windows.Controls.Label)(target)); + this.btnSearch = ((System.Windows.Controls.Button)(target)); + + #line 138 "..\..\MainWindow.xaml" + this.btnSearch.Click += new System.Windows.RoutedEventHandler(this.btnSearch_Click); + + #line default + #line hidden return; case 17: - this.lbStrings = ((System.Windows.Controls.Label)(target)); + this.lbResults = ((System.Windows.Controls.ListBox)(target)); + + #line 139 "..\..\MainWindow.xaml" + this.lbResults.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.lbResults_SelectionChanged); + + #line default + #line hidden + return; + case 18: + this.Settings3 = ((System.Windows.Controls.StackPanel)(target)); + return; + case 19: + this.SliderFrets = ((System.Windows.Controls.Slider)(target)); + return; + case 20: + this.SliderStrings = ((System.Windows.Controls.Slider)(target)); + return; + case 21: + + #line 184 "..\..\MainWindow.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.FretboardApply_Click); + + #line default + #line hidden + return; + case 22: + this.pnlLeftMenu = ((System.Windows.Controls.StackPanel)(target)); + return; + case 23: + + #line 192 "..\..\MainWindow.xaml" + ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Menu_Click); + + #line default + #line hidden + return; + case 24: + this.btnSettings1 = ((System.Windows.Controls.Button)(target)); + + #line 205 "..\..\MainWindow.xaml" + this.btnSettings1.Click += new System.Windows.RoutedEventHandler(this.Settings_Click); + + #line default + #line hidden + return; + case 25: + this.btnSettings2 = ((System.Windows.Controls.Button)(target)); + + #line 217 "..\..\MainWindow.xaml" + this.btnSettings2.Click += new System.Windows.RoutedEventHandler(this.Settings_Click); + + #line default + #line hidden + return; + case 26: + this.btnSettings3 = ((System.Windows.Controls.Button)(target)); + + #line 229 "..\..\MainWindow.xaml" + this.btnSettings3.Click += new System.Windows.RoutedEventHandler(this.Settings_Click); + + #line default + #line hidden + return; + case 27: + this.mainGrid = ((System.Windows.Controls.Grid)(target)); return; } this._contentLoaded = true; diff --git a/guitarTools/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/guitarTools/obj/Release/TempPE/Properties.Resources.Designer.cs.dll index d793b8e..a4694c0 100644 Binary files a/guitarTools/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and b/guitarTools/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ