From 1c5e1feebd01a49490659e2d136d2cce36bb4190 Mon Sep 17 00:00:00 2001
From: Micah Morrison <micahmorrison95@gmail.com>
Date: Fri, 23 Aug 2019 14:05:10 -0400
Subject: [PATCH] Add ability to change number of sound buttons per page (with
 undo)

---
 SoundBoard/ButtonGridDialog.xaml            |  84 ++++
 SoundBoard/ButtonGridDialog.xaml.cs         | 132 +++++
 SoundBoard/Buttons.cs                       |  18 +
 SoundBoard/ChildWindowBase.cs               |  39 ++
 SoundBoard/Extensions.cs                    |  79 +++
 SoundBoard/MainWindow.xaml.cs               | 511 ++++++++++----------
 SoundBoard/Properties/Resources.Designer.cs |  18 +
 SoundBoard/Properties/Resources.resx        |   6 +
 SoundBoard/SoundBoard.csproj                |  28 ++
 SoundBoard/Styles.xaml                      |  15 +-
 SoundBoard/TwoDimensionalList.cs            |  62 +++
 SoundBoard/Utilities.cs                     |  11 +
 SoundBoard/WaitCursor.cs                    |  44 ++
 SoundBoard/packages.config                  |   2 +
 14 files changed, 802 insertions(+), 247 deletions(-)
 create mode 100644 SoundBoard/ButtonGridDialog.xaml
 create mode 100644 SoundBoard/ButtonGridDialog.xaml.cs
 create mode 100644 SoundBoard/ChildWindowBase.cs
 create mode 100644 SoundBoard/TwoDimensionalList.cs
 create mode 100644 SoundBoard/WaitCursor.cs

diff --git a/SoundBoard/ButtonGridDialog.xaml b/SoundBoard/ButtonGridDialog.xaml
new file mode 100644
index 0000000..f70794b
--- /dev/null
+++ b/SoundBoard/ButtonGridDialog.xaml
@@ -0,0 +1,84 @@
+<soundBoard:ChildWindowBase x:Class="SoundBoard.ButtonGridDialog" x:ClassModifier="internal"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
+             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             xmlns:soundBoard="clr-namespace:SoundBoard"
+             mc:Ignorable="d"
+             
+             Title="Change Button Grid"
+             IsModal="true"
+             Padding="100"
+             ShowCloseButton="true"
+             AllowMove="true"
+             CloseByEscape="true">
+
+    <simpleChildWindow:ChildWindow.OverlayBrush>
+        <SolidColorBrush Opacity="0.7" Color="{StaticResource BlackColor}" />
+    </simpleChildWindow:ChildWindow.OverlayBrush>
+
+    <!-- Content -->
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="20"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="50"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="10"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="20"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="100"/>
+            </Grid.ColumnDefinitions>
+
+            <xctk:IntegerUpDown x:Name="RowUpDown"
+                                Grid.Column="1"
+                                Minimum="1" 
+                                ValueChanged="RowUpDown_ValueChanged"
+                                DefaultValue="5"
+                                DisplayDefaultValueOnEmptyText="true"
+                                KeyUp="RowUpDown_KeyUp"/>
+            <Label Grid.Column="2" Content="Row(s)"/>
+            <Label Grid.Column="4" Content="✖"/>
+            <xctk:IntegerUpDown x:Name="ColumnUpDown"
+                                Grid.Column="6"
+                                Minimum="1" 
+                                ValueChanged="ColumnUpDown_ValueChanged"
+                                DefaultValue="2"
+                                DisplayDefaultValueOnEmptyText="true"
+                                KeyUp="ColumnUpDown_KeyUp"/>
+            <Label Grid.Column="7" Content="Column(s)"/>
+        </Grid>
+
+        <Label x:Name="WarningLabel" 
+               HorizontalAlignment="Center"
+               Grid.Row="4" Content="Warning! Removing row(s) or column(s) could result in losing sounds!" 
+               Foreground="Red" 
+               FontWeight="Medium"
+               Visibility="Hidden"/>
+
+        <Grid Grid.Row="5" Margin="20, 20, 20, 20">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="10"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+
+            <Button Grid.Column="1" Content="OK" Style="{StaticResource MyAccentedSquareButtonStyle}" Width="80" Height="35" Click="OKButton_Click"/>
+            <Button Grid.Column="3" Content="Cancel" Style="{StaticResource MySquareButtonStyle}" Width="80" Height="35" Click="CancelButton_Click"/>
+        </Grid>
+    </Grid>
+</soundBoard:ChildWindowBase>
diff --git a/SoundBoard/ButtonGridDialog.xaml.cs b/SoundBoard/ButtonGridDialog.xaml.cs
new file mode 100644
index 0000000..9ddd1b0
--- /dev/null
+++ b/SoundBoard/ButtonGridDialog.xaml.cs
@@ -0,0 +1,132 @@
+#region Usings
+
+using System.Windows;
+using System.Windows.Forms;
+using System.Windows.Input;
+
+#endregion
+
+namespace SoundBoard
+{
+    /// <summary>
+    /// Interaction logic for ButtonGridDialog.xaml
+    /// </summary>
+    internal partial class ButtonGridDialog
+    {
+        #region Constructor
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public ButtonGridDialog()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="startingRowCount"></param>
+        /// <param name="startingColumnCount"></param>
+        public ButtonGridDialog(int startingRowCount, int startingColumnCount) : this()
+        {
+            RowCount = _startingRowCount = startingRowCount;
+            ColumnCount = _startingColumnCount = startingColumnCount;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        /// <summary>
+        /// The result of the dialog
+        /// </summary>
+        public DialogResult DialogResult;
+
+        /// <summary>
+        /// Number of rows
+        /// </summary>
+        public int RowCount
+        {
+            get => RowUpDown.Value ?? default;
+            set => RowUpDown.Value = value;
+        }
+
+        /// <summary>
+        /// Number of columns
+        /// </summary>
+        public int ColumnCount
+        {
+            get => ColumnUpDown.Value ?? default;
+            set => ColumnUpDown.Value = value;
+        }
+
+        #endregion
+
+        #region Private fields
+
+        private readonly int _startingRowCount;
+
+        private readonly int _startingColumnCount;
+
+        #endregion
+
+        #region Event handlers
+
+        private void OKButton_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = DialogResult.OK;
+            Close();
+        }
+
+        private void CancelButton_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+
+        private void ColumnUpDown_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+        }
+
+        private void RowUpDown_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+        }
+
+        private void RowUpDown_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            ShowHideWarningLabel();
+        }
+
+        private void ColumnUpDown_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            ShowHideWarningLabel();
+        }
+
+        #endregion
+
+        #region Private methods
+
+        private void ShowHideWarningLabel()
+        {
+            if (WarningLabel is null == false)
+            {
+                WarningLabel.Visibility = RowUpDown.Value < _startingRowCount || ColumnUpDown.Value < _startingColumnCount
+                        ? Visibility.Visible
+                        : Visibility.Hidden;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/SoundBoard/Buttons.cs b/SoundBoard/Buttons.cs
index 6607b55..bda368c 100644
--- a/SoundBoard/Buttons.cs
+++ b/SoundBoard/Buttons.cs
@@ -1077,6 +1077,24 @@ void timer_Elapsed(object sender, EventArgs e)
             };
         }
 
+        /// <summary>
+        /// Returns the row
+        /// </summary>
+        /// <returns></returns>
+        public int GetRow()
+        {
+            return Grid.GetRow(this);
+        }
+
+        /// <summary>
+        /// Returns the column
+        /// </summary>
+        /// <returns></returns>
+        public int GetColumn()
+        {
+            return Grid.GetColumn(this);
+        }
+
         #endregion
 
         #region Private methods
diff --git a/SoundBoard/ChildWindowBase.cs b/SoundBoard/ChildWindowBase.cs
new file mode 100644
index 0000000..f3edfda
--- /dev/null
+++ b/SoundBoard/ChildWindowBase.cs
@@ -0,0 +1,39 @@
+#region Usings
+
+using System.Collections.Generic;
+using MahApps.Metro.SimpleChildWindow;
+
+#endregion
+
+namespace SoundBoard
+{
+    /// <summary>
+    /// Defines a ChildWindow from which all other ChildWindows in this project shall derive
+    /// </summary>
+    internal class ChildWindowBase : ChildWindow
+    {
+        #region Constructor
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public ChildWindowBase()
+        {
+            _instances.Add(this);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        public static IEnumerable<ChildWindowBase> Instances => _instances;
+
+        #endregion
+
+        #region Private fields
+
+        private static readonly List<ChildWindowBase> _instances = new List<ChildWindowBase>();
+
+        #endregion
+    }
+}
diff --git a/SoundBoard/Extensions.cs b/SoundBoard/Extensions.cs
index 8284bf1..7b23c17 100644
--- a/SoundBoard/Extensions.cs
+++ b/SoundBoard/Extensions.cs
@@ -90,6 +90,85 @@ public static bool IsSelectedItem(this TabItem tabItem)
         {
             return tabItem == (tabItem.Parent as TabControl)?.SelectedItem;
         }
+
+        #region Rows property
+
+        /// <summary>
+        /// Get the Rows property
+        /// </summary>
+        /// <param name="tabItem"></param>
+        /// <returns></returns>
+        public static int GetRows(this TabItem tabItem)
+        {
+            if (_rows.TryGetValue(tabItem, out int result))
+            {
+                return result;
+            }
+            else return GetDefaultRows(tabItem);
+        }
+
+        /// <summary>
+        /// Set the Rows property
+        /// </summary>
+        /// <param name="tabItem"></param>
+        /// <param name="value"></param>
+        public static void SetRows(this TabItem tabItem, int value)
+        {
+            _rows[tabItem] = value;
+        }
+
+        /// <summary>
+        /// Get the default value for the Rows property
+        /// </summary>
+        /// <param name="tabItem"></param>
+        public static int GetDefaultRows(this TabItem tabItem)
+        {
+            return 5;
+        }
+
+        private static readonly Dictionary<TabItem, int> _rows = new Dictionary<TabItem, int>();
+
+        #endregion
+
+        #region Columns property
+
+        /// <summary>
+        /// Get the Columns property
+        /// </summary>
+        /// <param name="tabItem"></param>
+        /// <returns></returns>
+        public static int GetColumns(this TabItem tabItem)
+        {
+            if (_columns.TryGetValue(tabItem, out int result))
+            {
+                return result;
+            }
+            else return GetDefaultColumns(tabItem);
+        }
+
+        /// <summary>
+        /// Set the Columns property
+        /// </summary>
+        /// <param name="tabItem"></param>
+        /// <param name="value"></param>
+        public static void SetColumns(this TabItem tabItem, int value)
+        {
+            _columns[tabItem] = value;
+        }
+
+        /// <summary>
+        /// Get the default value for the Columns property
+        /// </summary>
+        /// <param name="tabItem"></param>
+        /// <returns></returns>
+        public static int GetDefaultColumns(this TabItem tabItem)
+        {
+            return 2;
+        }
+
+        private static readonly Dictionary<TabItem, int> _columns = new Dictionary<TabItem, int>();
+
+        #endregion
     }
 
     #endregion
diff --git a/SoundBoard/MainWindow.xaml.cs b/SoundBoard/MainWindow.xaml.cs
index c8162b9..0a4347b 100644
--- a/SoundBoard/MainWindow.xaml.cs
+++ b/SoundBoard/MainWindow.xaml.cs
@@ -18,6 +18,7 @@
 using System.Windows.Automation.Peers;
 using System.Windows.Automation.Provider;
 using Gma.System.MouseKeyHook;
+using MahApps.Metro.SimpleChildWindow;
 using Microsoft.Win32;
 using Color = System.Windows.Media.Color;
 using Timer = System.Timers.Timer;
@@ -195,36 +196,66 @@ private void LoadSettings(string configFilePath)
                                 selectedTab = tab;
                             }
 
-                            List<SoundButtonUndoState> buttons = new List<SoundButtonUndoState>();
+                            if (node.Attributes?["rows"]?.Value is string rowsString &&
+                                int.TryParse(rowsString, out int rows))
+                            {
+                                tab.SetRows(rows);
+                            }
 
-                            // Read the button data
-                            for (int i = 0; i < 10; ++i)
+                            if (node.Attributes?["columns"]?.Value is string columnsString &&
+                                int.TryParse(columnsString, out int columns))
                             {
-                                SoundButtonUndoState soundButtonUndoState = new SoundButtonUndoState
-                                {
-                                    SoundName = node["button" + i]?.Attributes["name"].Value,
-                                    SoundPath = node["button" + i]?.Attributes["path"].Value,
-                                };
+                                tab.SetColumns(columns);
+                            }
 
-                                if (node["button" + i]?.Attributes["color"]?.Value is string colorString && string.IsNullOrEmpty(colorString) == false)
-                                {
-                                    var drawingColor = ColorTranslator.FromHtml(colorString);
-                                    soundButtonUndoState.Color = Color.FromArgb(drawingColor.A, drawingColor.R, drawingColor.G, drawingColor.B);
-                                }
+                            TwoDimensionalList<SoundButtonUndoState> buttons = new TwoDimensionalList<SoundButtonUndoState>();
 
-                                if (node["button" + i]?.Attributes["volumeOffset"]?.Value is string volumeOffsetString &&
-                                    string.IsNullOrEmpty(volumeOffsetString) == false && int.TryParse(volumeOffsetString, out int volumeOffset))
-                                {
-                                    soundButtonUndoState.VolumeOffset = volumeOffset;
-                                }
-
-                                if (node["button" + i]?.Attributes["loop"]?.Value is string loopString &&
-                                    string.IsNullOrEmpty(loopString) == false && bool.TryParse(loopString, out bool loop))
+                            // Read the button data
+                            int i = 0;
+                            for (int rowIndex = 0; rowIndex < tab.GetRows() || node["button" + (i + 1)] is null == false; ++rowIndex)
+                            {
+                                for (int columnIndex = 0; columnIndex < tab.GetColumns(); ++columnIndex, ++i)
                                 {
-                                    soundButtonUndoState.Loop = loop;
+                                    SoundButtonUndoState soundButtonUndoState = new SoundButtonUndoState
+                                    {
+                                        SoundName = node["button" + i]?.Attributes["name"].Value,
+                                        SoundPath = node["button" + i]?.Attributes["path"].Value,
+                                    };
+
+                                    if (node["button" + i]?.Attributes["color"]?.Value is string colorString && string.IsNullOrEmpty(colorString) == false)
+                                    {
+                                        var drawingColor = ColorTranslator.FromHtml(colorString);
+                                        soundButtonUndoState.Color = Color.FromArgb(drawingColor.A, drawingColor.R, drawingColor.G, drawingColor.B);
+                                    }
+
+                                    if (node["button" + i]?.Attributes["volumeOffset"]?.Value is string volumeOffsetString &&
+                                        string.IsNullOrEmpty(volumeOffsetString) == false && int.TryParse(volumeOffsetString, out int volumeOffset))
+                                    {
+                                        soundButtonUndoState.VolumeOffset = volumeOffset;
+                                    }
+
+                                    if (node["button" + i]?.Attributes["loop"]?.Value is string loopString &&
+                                        string.IsNullOrEmpty(loopString) == false && bool.TryParse(loopString, out bool loop))
+                                    {
+                                        soundButtonUndoState.Loop = loop;
+                                    }
+
+                                    int buttonRow = rowIndex;
+                                    if (node["button" + i]?.Attributes["row"]?.Value is string rowString &&
+                                        string.IsNullOrEmpty(rowString) == false && int.TryParse(rowString, out int row))
+                                    {
+                                        buttonRow = row;
+                                    }
+
+                                    int buttonColumn = columnIndex;
+                                    if (node["button" + i]?.Attributes["column"]?.Value is string columnString &&
+                                        string.IsNullOrEmpty(columnString) == false && int.TryParse(columnString, out int column))
+                                    {
+                                        buttonColumn = column;
+                                    }
+
+                                    buttons.Add(soundButtonUndoState, buttonRow, buttonColumn);
                                 }
-
-                                buttons.Add(soundButtonUndoState);
                             }
 
                             CreatePageContent(tab, buttons);
@@ -272,6 +303,12 @@ private void CreateTabContextMenus()
                     MenuItem clearAllSoundsMenuItem = new MenuItem { Header = Properties.Resources.ClearAllSounds };
                     clearAllSoundsMenuItem.Click += ClearAllSoundsMenuItem_Click;
                     contextMenu.Items.Add(clearAllSoundsMenuItem);
+
+                    contextMenu.Items.Add(new Separator());
+
+                    MenuItem changeButtonGrid = new MenuItem {Header = Properties.Resources.ChangeButtonGrid};
+                    changeButtonGrid.Click += ChangeButtonGridMenuItem_Click;
+                    contextMenu.Items.Add(changeButtonGrid);
                 }
 
                 // Handle showing the context menu manually (instead of assigning it to the tab's ContextMenu property)
@@ -292,147 +329,90 @@ private void CreateTabContextMenus()
             }
         }
 
-        private void CreatePageContent(MetroTabItem tab, List<SoundButtonUndoState> buttons = null)
+        private void CreatePageContent(MetroTabItem tab, TwoDimensionalList<SoundButtonUndoState> buttons = null)
         {
             Grid parentGrid = new Grid();
 
-            ColumnDefinition col1 = new ColumnDefinition {Width = new GridLength(1, GridUnitType.Star)};
-            parentGrid.ColumnDefinitions.Add(col1);
-
-            ColumnDefinition col2 = new ColumnDefinition {Width = new GridLength(1, GridUnitType.Star)};
-            parentGrid.ColumnDefinitions.Add(col2);
+            // Add column definitions to the grid
+            for (int i = 0; i < tab.GetColumns(); ++i)
+            {
+                ColumnDefinition col = new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) };
+                parentGrid.ColumnDefinitions.Add(col);
+            }
 
-            for (int i = 0; i < 5; ++i)
+            // Add row definitions to the grid
+            for (int i = 0; i < tab.GetRows(); ++i)
             {
-                RowDefinition row = new RowDefinition {Height = new GridLength(1, GridUnitType.Star)};
+                RowDefinition row = new RowDefinition { Height = new GridLength(1, GridUnitType.Star) };
                 parentGrid.RowDefinitions.Add(row);
-
-                // Sound button
-                SoundButton soundButton = new SoundButton(parentTab: tab);
-
-                Grid.SetColumn(soundButton, 0);
-                Grid.SetRow(soundButton, i);
-                parentGrid.Children.Add(soundButton);
-
-                if (buttons is null == false)
-                {
-                    soundButton.LoadState(buttons[i]);
-                }
-
-                // Menu button
-                MenuButton menuButton = new MenuButton(soundButton);
-
-                Grid.SetColumn(menuButton, 0);
-                Grid.SetRow(menuButton, i);
-                parentGrid.Children.Add(menuButton);
-                soundButton.ChildButtons.Add(menuButton);
-
-                // Play/pause button
-                PlayPauseButton playPauseButton = new PlayPauseButton(soundButton);
-
-                Grid.SetColumn(playPauseButton, 0);
-                Grid.SetRow(playPauseButton, i);
-                parentGrid.Children.Add(playPauseButton);
-                soundButton.ChildButtons.Add(playPauseButton);
-
-                // Stop button
-                StopButton stopButton = new StopButton(soundButton);
-
-                Grid.SetColumn(stopButton, 0);
-                Grid.SetRow(stopButton, i);
-                parentGrid.Children.Add(stopButton);
-                soundButton.ChildButtons.Add(stopButton);
-
-                // Loop icon
-                LoopIconButton loopIconButton = new LoopIconButton(soundButton);
-
-                Grid.SetColumn(loopIconButton, 0);
-                Grid.SetRow(loopIconButton, i);
-                parentGrid.Children.Add(loopIconButton);
-                soundButton.ChildButtons.Add(loopIconButton);
-
-                // Volume offset icon
-                VolumeOffsetIconButton volumeOffsetIconButton = new VolumeOffsetIconButton(soundButton);
-
-                Grid.SetColumn(volumeOffsetIconButton, 0);
-                Grid.SetRow(volumeOffsetIconButton, i);
-                parentGrid.Children.Add(volumeOffsetIconButton);
-                soundButton.ChildButtons.Add(volumeOffsetIconButton);
-
-                // Progress bar
-                SoundProgressBar progressBar = new SoundProgressBar();
-
-                Grid.SetColumn(progressBar, 0);
-                Grid.SetRow(progressBar, i);
-                parentGrid.Children.Add(progressBar);
-
-                soundButton.SoundProgressBar = progressBar;
             }
 
-            for (int i = 0; i < 5; ++i)
+            // Add the buttons to the grid
+            for (int columnIndex = 0; columnIndex < tab.GetColumns(); ++columnIndex)
             {
-                // Only have to add the rows once (above)
-
-                // Sound button
-                SoundButton soundButton = new SoundButton(parentTab: tab);
+                for (int rowIndex = 0; rowIndex < tab.GetRows(); ++rowIndex)
+                {
+                    // Sound button
+                    SoundButton soundButton = new SoundButton(parentTab: tab);
 
-                Grid.SetColumn(soundButton, 1);
-                Grid.SetRow(soundButton, i);
-                parentGrid.Children.Add(soundButton);
+                    if (buttons is null == false && buttons.TryGet(rowIndex, columnIndex, out var buttonState))
+                    {
+                        soundButton.LoadState(buttonState);
+                    }
 
-                if (buttons is null == false)
-                {
-                    soundButton.LoadState(buttons[i + 5]);
-                }
+                    Grid.SetColumn(soundButton, columnIndex);
+                    Grid.SetRow(soundButton, rowIndex);
+                    parentGrid.Children.Add(soundButton);
 
-                // Menu button
-                MenuButton menuButton = new MenuButton(soundButton);
+                    // Menu button
+                    MenuButton menuButton = new MenuButton(soundButton);
 
-                Grid.SetColumn(menuButton, 1);
-                Grid.SetRow(menuButton, i);
-                parentGrid.Children.Add(menuButton);
-                soundButton.ChildButtons.Add(menuButton);
+                    Grid.SetColumn(menuButton, columnIndex);
+                    Grid.SetRow(menuButton, rowIndex);
+                    parentGrid.Children.Add(menuButton);
+                    soundButton.ChildButtons.Add(menuButton);
 
-                // Play/pause button
-                PlayPauseButton playPauseButton = new PlayPauseButton(soundButton);
+                    // Play/pause button
+                    PlayPauseButton playPauseButton = new PlayPauseButton(soundButton);
 
-                Grid.SetColumn(playPauseButton, 1);
-                Grid.SetRow(playPauseButton, i);
-                parentGrid.Children.Add(playPauseButton);
-                soundButton.ChildButtons.Add(playPauseButton);
+                    Grid.SetColumn(playPauseButton, columnIndex);
+                    Grid.SetRow(playPauseButton, rowIndex);
+                    parentGrid.Children.Add(playPauseButton);
+                    soundButton.ChildButtons.Add(playPauseButton);
 
-                // Stop button
-                StopButton stopButton = new StopButton(soundButton);
+                    // Stop button
+                    StopButton stopButton = new StopButton(soundButton);
 
-                Grid.SetColumn(stopButton, 1);
-                Grid.SetRow(stopButton, i);
-                parentGrid.Children.Add(stopButton);
-                soundButton.ChildButtons.Add(stopButton);
+                    Grid.SetColumn(stopButton, columnIndex);
+                    Grid.SetRow(stopButton, rowIndex);
+                    parentGrid.Children.Add(stopButton);
+                    soundButton.ChildButtons.Add(stopButton);
 
-                // Loop icon
-                LoopIconButton loopIconButton = new LoopIconButton(soundButton);
+                    // Loop icon
+                    LoopIconButton loopIconButton = new LoopIconButton(soundButton);
 
-                Grid.SetColumn(loopIconButton, 1);
-                Grid.SetRow(loopIconButton, i);
-                parentGrid.Children.Add(loopIconButton);
-                soundButton.ChildButtons.Add(loopIconButton);
+                    Grid.SetColumn(loopIconButton, columnIndex);
+                    Grid.SetRow(loopIconButton, rowIndex);
+                    parentGrid.Children.Add(loopIconButton);
+                    soundButton.ChildButtons.Add(loopIconButton);
 
-                // Volume offset icon
-                VolumeOffsetIconButton volumeOffsetIconButton = new VolumeOffsetIconButton(soundButton);
+                    // Volume offset icon
+                    VolumeOffsetIconButton volumeOffsetIconButton = new VolumeOffsetIconButton(soundButton);
 
-                Grid.SetColumn(volumeOffsetIconButton, 1);
-                Grid.SetRow(volumeOffsetIconButton, i);
-                parentGrid.Children.Add(volumeOffsetIconButton);
-                soundButton.ChildButtons.Add(volumeOffsetIconButton);
+                    Grid.SetColumn(volumeOffsetIconButton, columnIndex);
+                    Grid.SetRow(volumeOffsetIconButton, rowIndex);
+                    parentGrid.Children.Add(volumeOffsetIconButton);
+                    soundButton.ChildButtons.Add(volumeOffsetIconButton);
 
-                // Progress bar
-                SoundProgressBar progressBar = new SoundProgressBar();
+                    // Progress bar
+                    SoundProgressBar progressBar = new SoundProgressBar();
 
-                Grid.SetColumn(progressBar, 1);
-                Grid.SetRow(progressBar, i);
-                parentGrid.Children.Add(progressBar);
+                    Grid.SetColumn(progressBar, columnIndex);
+                    Grid.SetRow(progressBar, rowIndex);
+                    parentGrid.Children.Add(progressBar);
 
-                soundButton.SoundProgressBar = progressBar;
+                    soundButton.SoundProgressBar = progressBar;
+                }
             }
 
             tab.Content = parentGrid;
@@ -552,6 +532,8 @@ private void SaveSettings(string configFilePath)
                         string name = tab.Header.ToString();
                         textWriter.WriteStartElement("tab");
                         textWriter.WriteAttributeString("focused", tab.IsSelectedItem().ToString());
+                        textWriter.WriteAttributeString("rows", tab.GetRows().ToString());
+                        textWriter.WriteAttributeString("columns", tab.GetColumns().ToString());
 
                         textWriter.WriteElementString("name", name);
 
@@ -566,6 +548,8 @@ private void SaveSettings(string configFilePath)
                                 textWriter.WriteAttributeString("color", button.Color.ToString());
                                 textWriter.WriteAttributeString("volumeOffset", button.VolumeOffset.ToString());
                                 textWriter.WriteAttributeString("loop", button.Loop.ToString());
+                                textWriter.WriteAttributeString("row", button.GetRow().ToString());
+                                textWriter.WriteAttributeString("column", button.GetColumn().ToString());
                                 textWriter.WriteEndElement();
                             }
                         }
@@ -648,142 +632,179 @@ private void ClearAllSoundsMenuItem_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void RoutedKeyDownHandler(object sender, RoutedEventArgs args)
+        private async void ChangeButtonGridMenuItem_Click(object sender, EventArgs e)
         {
-            if (args is KeyEventArgs e)
-            {
-                Mouse.Capture(null);
+            ButtonGridDialog buttonGridDialog = new ButtonGridDialog(SelectedTab.GetRows(),SelectedTab.GetColumns());
+            await this.ShowChildWindowAsync(buttonGridDialog);
 
-                char c = GetCharFromKey(e.Key);
-                if (char.IsLetter(c) || char.IsPunctuation(c) || char.IsNumber(c))
-                {
-                    _searchString += c;
-                }
-                else if (e.Key == Key.Space)
-                {
-                    _searchString += ' ';
-                }
-                else if (e.Key == Key.Back && _searchString.Length > 0)
+            if (buttonGridDialog.DialogResult == System.Windows.Forms.DialogResult.OK)
+            {
+                using (new WaitCursor())
                 {
-                    _searchString = _searchString.Substring(0, _searchString.Length - 1);
+                    // Stop all sounds
+                    foreach (SoundButton soundButton in GetSoundButtons())
+                    {
+                        soundButton.Stop();
+                    }
+
+                    ConfigUndoState configUndoState = (this as IUndoable<ConfigUndoState>).SaveState();
+
+                    // Set up our UndoAction
+                    SetUndoAction(() => { LoadState(configUndoState); });
+
+                    // Create and show a snackbar
+                    string message = Properties.Resources.ButtonLayoutWasChanged;
+                    string truncatedMessage = Utilities.Truncate(message, SnackbarMessageFont, (int)Width - 50);
+                    ShowUndoSnackbar(truncatedMessage);
+
+                    // Do the change
+                    SelectedTab.SetRows(buttonGridDialog.RowCount);
+                    SelectedTab.SetColumns(buttonGridDialog.ColumnCount);
+                    SaveSettings();
+                    LoadSettings();
                 }
-                else if (e.Key == Key.Escape)
+            }
+        }
+
+        private void RoutedKeyDownHandler(object sender, RoutedEventArgs args)
+        {
+            if (Utilities.AreAnyDialogsVisible() == false)
+            { 
+                if (args is KeyEventArgs e)
                 {
-                    // If the search bar is open, close it
-                    if (Search.IsOpen)
+                    Mouse.Capture(null);
+
+                    char c = GetCharFromKey(e.Key);
+                    if (char.IsLetter(c) || char.IsPunctuation(c) || char.IsNumber(c))
                     {
-                        CloseSearch();
+                        _searchString += c;
                     }
-                    // Otherwise, stop any playing sounds
-                    else
+                    else if (e.Key == Key.Space)
                     {
-                        ButtonAutomationPeer peer = new ButtonAutomationPeer(Silence);
-                        IInvokeProvider invokeProv = peer.GetPattern(PatternInterface.Invoke) as IInvokeProvider;
-                        invokeProv?.Invoke();
+                        _searchString += ' ';
                     }
-                    return;
-                }
-                else if (e.Key == Key.Down)
-                {
-                    bool foundFocused = false;
-                    
-                    // Loop through the buttons and focus the next one
-                    foreach (var child in ResultsPanel.Children)
+                    else if (e.Key == Key.Back && _searchString.Length > 0)
+                    {
+                        _searchString = _searchString.Substring(0, _searchString.Length - 1);
+                    }
+                    else if (e.Key == Key.Escape)
                     {
-                        if (child is SoundButton soundButton)
+                        // If the search bar is open, close it
+                        if (Search.IsOpen)
                         {
-                            if (foundFocused)
-                            {
-                                // We found the last focused button, so focus this one
-                                soundButton.Focus();
-                                _focusedButton = soundButton;
-                                break;
-                            }
-                            if (soundButton.IsFocused)
+                            CloseSearch();
+                        }
+                        // Otherwise, stop any playing sounds
+                        else
+                        {
+                            ButtonAutomationPeer peer = new ButtonAutomationPeer(Silence);
+                            IInvokeProvider invokeProv = peer.GetPattern(PatternInterface.Invoke) as IInvokeProvider;
+                            invokeProv?.Invoke();
+                        }
+                        return;
+                    }
+                    else if (e.Key == Key.Down)
+                    {
+                        bool foundFocused = false;
+                        
+                        // Loop through the buttons and focus the next one
+                        foreach (var child in ResultsPanel.Children)
+                        {
+                            if (child is SoundButton soundButton)
                             {
-                                // We found the focused button! focus the next one
-                                foundFocused = true;
+                                if (foundFocused)
+                                {
+                                    // We found the last focused button, so focus this one
+                                    soundButton.Focus();
+                                    _focusedButton = soundButton;
+                                    break;
+                                }
+                                if (soundButton.IsFocused)
+                                {
+                                    // We found the focused button! focus the next one
+                                    foundFocused = true;
+                                }
                             }
                         }
+                        return;
                     }
-                    return;
-                }
-                else if (e.Key == Key.Up)
-                {
-                    SoundButton previousButton = null;
-                    
-                    // Loop through the buttons and focus the previous one
-                    foreach (var child in ResultsPanel.Children)
+                    else if (e.Key == Key.Up)
                     {
-                        if (child is SoundButton soundButton)
+                        SoundButton previousButton = null;
+                        
+                        // Loop through the buttons and focus the previous one
+                        foreach (var child in ResultsPanel.Children)
                         {
-                            if (soundButton.IsFocused)
+                            if (child is SoundButton soundButton)
                             {
-                                // Focus the previous one!
-                                if (previousButton != null)
+                                if (soundButton.IsFocused)
                                 {
-                                    previousButton.Focus();
-                                    _focusedButton = previousButton;
-                                    break;
+                                    // Focus the previous one!
+                                    if (previousButton != null)
+                                    {
+                                        previousButton.Focus();
+                                        _focusedButton = previousButton;
+                                        break;
+                                    }
                                 }
+                                previousButton = soundButton;
                             }
-                            previousButton = soundButton;
                         }
+                        return;
                     }
-                    return;
-                }
-                else if (e.Key == Key.Enter)
-                {
-                    // Play the sound!
-                    foreach (var child in ResultsPanel.Children)
+                    else if (e.Key == Key.Enter)
                     {
-                        if (child is SoundButton soundButton && soundButton.IsFocused)
+                        // Play the sound!
+                        foreach (var child in ResultsPanel.Children)
                         {
-                            ButtonAutomationPeer peer = new ButtonAutomationPeer(soundButton);
-                            IInvokeProvider invokeProv = peer.GetPattern(PatternInterface.Invoke) as IInvokeProvider;
-                            invokeProv?.Invoke();
+                            if (child is SoundButton soundButton && soundButton.IsFocused)
+                            {
+                                ButtonAutomationPeer peer = new ButtonAutomationPeer(soundButton);
+                                IInvokeProvider invokeProv = peer.GetPattern(PatternInterface.Invoke) as IInvokeProvider;
+                                invokeProv?.Invoke();
+                            }
                         }
+                        return;
+                    }
+                    else
+                    {
+                        return;
                     }
-                    return;
-                }
-                else
-                {
-                    return;
-                }
 
-                Query.Text = _searchString;
-                Query.CaretIndex = Query.Text.Length;
+                    Query.Text = _searchString;
+                    Query.CaretIndex = Query.Text.Length;
 
-                Search.IsOpen = true;
+                    Search.IsOpen = true;
 
-                // Get rid of any previous buttons (do reverse iteration to prevent collection modified errors)
-                for (int i = ResultsPanel.Children.Count - 1; i >= 0; --i)
-                {
-                    if (ResultsPanel.Children[i] is SoundButton soundButton)
+                    // Get rid of any previous buttons (do reverse iteration to prevent collection modified errors)
+                    for (int i = ResultsPanel.Children.Count - 1; i >= 0; --i)
                     {
-                        ResultsPanel.Children.Remove(soundButton);
+                        if (ResultsPanel.Children[i] is SoundButton soundButton)
+                        {
+                            ResultsPanel.Children.Remove(soundButton);
+                        }
                     }
-                }
 
-                // Perform search
-                if (string.IsNullOrEmpty(_searchString) == false)
-                {
-                    foreach (SoundButton soundButton in GetSoundButtons())
+                    // Perform search
+                    if (string.IsNullOrEmpty(_searchString) == false)
                     {
-                        if (soundButton.SoundName.ToLower().Contains(_searchString.ToLower()))
+                        foreach (SoundButton soundButton in GetSoundButtons())
                         {
-                            SoundButton button = new SoundButton(SoundButtonMode.Search, sourceTabAndButton: (soundButton.ParentTab, soundButton));
-                            button.SetFile(soundButton.SoundPath, soundButton.SoundName);
+                            if (soundButton.SoundName.ToLower().Contains(_searchString.ToLower()))
+                            {
+                                SoundButton button = new SoundButton(SoundButtonMode.Search, sourceTabAndButton: (soundButton.ParentTab, soundButton));
+                                button.SetFile(soundButton.SoundPath, soundButton.SoundName);
 
-                            ResultsPanel.Children.Add(button);
+                                ResultsPanel.Children.Add(button);
+                            }
                         }
-                    }
 
-                    // If we've added at least one button, focus the first one
-                    if (ResultsPanel.Children.Count > 0)
-                    {
-                        (ResultsPanel.Children[0] as SoundButton)?.Focus();
-                        _focusedButton = ResultsPanel.Children[0] as SoundButton;
+                        // If we've added at least one button, focus the first one
+                        if (ResultsPanel.Children.Count > 0)
+                        {
+                            (ResultsPanel.Children[0] as SoundButton)?.Focus();
+                            _focusedButton = ResultsPanel.Children[0] as SoundButton;
+                        }
                     }
                 }
             }
@@ -974,9 +995,6 @@ private async void ImportConfig_Click(object sender, RoutedEventArgs e)
 
                     // Immediately save the settings to overwrite our file
                     SaveSettings();
-
-                    // Select the first tab, if any
-                    if (Tabs.Items.Count >= 1) (Tabs.Items[0] as MetroTabItem)?.Focus();
                 }
                 catch (Exception ex)
                 {
@@ -1139,6 +1157,8 @@ public void ShowUndoSnackbar(string message = "", int timeout = 5000)
 
         private string ApplicationName => @"SoundBoard";
 
+        private MetroTabItem SelectedTab => Tabs.SelectedItem as MetroTabItem;
+
         #endregion
 
         #region Consts
@@ -1154,7 +1174,7 @@ public void ShowUndoSnackbar(string message = "", int timeout = 5000)
         /// <inheritdoc />
         public TabPageUndoState SaveState()
         {
-            return new TabPageUndoState {MetroTabItem = Tabs.SelectedItem as MetroTabItem, Index = Tabs.SelectedIndex};
+            return new TabPageUndoState {MetroTabItem = SelectedTab, Index = Tabs.SelectedIndex};
         }
 
         /// <inheritdoc />
@@ -1184,7 +1204,6 @@ public void LoadState(ConfigUndoState undoState)
 
             LoadSettings(undoState.SavedConfigStatePath);
             SaveSettings();
-            if (Tabs.Items.Count >= 1) (Tabs.Items[0] as MetroTabItem)?.Focus();
         }
 
         /// <inheritdoc />
@@ -1193,7 +1212,7 @@ TabPageSoundsUndoState IUndoable<TabPageSoundsUndoState>.SaveState()
             var soundButtonUndoStates = new List<(SoundButtonUndoState, int)>();
 
             int index = 0;
-            foreach (SoundButton soundButton in GetSoundButtons(Tabs.SelectedItem as MetroTabItem))
+            foreach (SoundButton soundButton in GetSoundButtons(SelectedTab))
             {
                 soundButtonUndoStates.Add((soundButton.SaveState(), index));
                 ++index;
@@ -1205,7 +1224,7 @@ TabPageSoundsUndoState IUndoable<TabPageSoundsUndoState>.SaveState()
         /// <inheritdoc />
         public void LoadState(TabPageSoundsUndoState undoState)
         {
-            IList<SoundButton> soundButtons = GetSoundButtons(Tabs.SelectedItem as MetroTabItem).ToList();
+            IList<SoundButton> soundButtons = GetSoundButtons(SelectedTab).ToList();
 
             foreach (var soundButtonUndoState in undoState.SoundButtonUndoStates)
             {
diff --git a/SoundBoard/Properties/Resources.Designer.cs b/SoundBoard/Properties/Resources.Designer.cs
index fab4449..51ea7cf 100644
--- a/SoundBoard/Properties/Resources.Designer.cs
+++ b/SoundBoard/Properties/Resources.Designer.cs
@@ -96,6 +96,24 @@ internal static string AudioFiles {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Button layout was changed..
+        /// </summary>
+        internal static string ButtonLayoutWasChanged {
+            get {
+                return ResourceManager.GetString("ButtonLayoutWasChanged", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Change button grid....
+        /// </summary>
+        internal static string ChangeButtonGrid {
+            get {
+                return ResourceManager.GetString("ChangeButtonGrid", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Choose sound.
         /// </summary>
diff --git a/SoundBoard/Properties/Resources.resx b/SoundBoard/Properties/Resources.resx
index 70cbffc..e7affcb 100644
--- a/SoundBoard/Properties/Resources.resx
+++ b/SoundBoard/Properties/Resources.resx
@@ -252,4 +252,10 @@
     <value>The volume of this sound is offset by {0}</value>
     <comment>{0} is an offset (like -2 or +1)</comment>
   </data>
+  <data name="ButtonLayoutWasChanged" xml:space="preserve">
+    <value>Button layout was changed.</value>
+  </data>
+  <data name="ChangeButtonGrid" xml:space="preserve">
+    <value>Change button grid...</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/SoundBoard/SoundBoard.csproj b/SoundBoard/SoundBoard.csproj
index c4ba84f..7d60476 100644
--- a/SoundBoard/SoundBoard.csproj
+++ b/SoundBoard/SoundBoard.csproj
@@ -59,6 +59,9 @@
     <Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MahApps.Metro.1.6.5\lib\net47\MahApps.Metro.dll</HintPath>
     </Reference>
+    <Reference Include="MahApps.Metro.SimpleChildWindow, Version=1.5.0.16, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MahApps.Metro.SimpleChildWindow.1.5.0\lib\net45\MahApps.Metro.SimpleChildWindow.dll</HintPath>
+    </Reference>
     <Reference Include="NAudio, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\NAudio.1.9.0\lib\net35\NAudio.dll</HintPath>
     </Reference>
@@ -81,6 +84,21 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -90,9 +108,15 @@
     <Compile Include="Buttons.cs" />
     <Compile Include="LoopStream.cs" />
     <Compile Include="Extensions.cs" />
+    <Compile Include="ChildWindowBase.cs" />
     <Compile Include="MyMetroTabItem.cs" />
+    <Compile Include="ButtonGridDialog.xaml.cs">
+      <DependentUpon>ButtonGridDialog.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="TwoDimensionalList.cs" />
     <Compile Include="UndoClasses.cs" />
     <Compile Include="Utilities.cs" />
+    <Compile Include="WaitCursor.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -106,6 +130,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="ButtonGridDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Styles.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/SoundBoard/Styles.xaml b/SoundBoard/Styles.xaml
index fe7d4c9..3182ec1 100644
--- a/SoundBoard/Styles.xaml
+++ b/SoundBoard/Styles.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls">
 
     <SolidColorBrush x:Key="HighlightColor" Color="DarkGray"/>
 
@@ -9,4 +10,16 @@
         <Setter Property="Background" Value="{DynamicResource HighlightColor}"/>
     </Style>
 
+    <Style xmlns:markup="http://schemas.microsoft.com/winfx/2006/xaml"
+           x:Key="MyAccentedSquareButtonStyle" TargetType="{markup:Type ButtonBase}"
+           BasedOn="{StaticResource AccentedSquareButtonStyle}">
+        <Setter Property="mah:ButtonHelper.PreserveTextCase" Value="True"/>
+    </Style>
+
+    <Style xmlns:markup="http://schemas.microsoft.com/winfx/2006/xaml"
+           x:Key="MySquareButtonStyle" TargetType="{markup:Type ButtonBase}"
+           BasedOn="{StaticResource SquareButtonStyle}">
+        <Setter Property="mah:ButtonHelper.PreserveTextCase" Value="True"/>
+    </Style>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/SoundBoard/TwoDimensionalList.cs b/SoundBoard/TwoDimensionalList.cs
new file mode 100644
index 0000000..2d6e40b
--- /dev/null
+++ b/SoundBoard/TwoDimensionalList.cs
@@ -0,0 +1,62 @@
+#region Usings
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+#endregion
+
+namespace SoundBoard
+{
+    /// <summary>
+    /// Defines a custom data structure which stores objects with a row and column index
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class TwoDimensionalList<T>
+    {
+        #region Public methods
+
+        /// <summary>
+        /// Adds an item to the list
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="row"></param>
+        /// <param name="column"></param>
+        public void Add(T item, int row, int column)
+        {
+            _list.Add((item, row, column));
+        }
+
+        /// <summary>
+        /// Tries to gets the item at the specified <paramref name="row"/> and <paramref name="column"/>.
+        /// If found, sets <paramref name="value"/> to the item and returns <see langword="true"/>.
+        /// If not found, returns <see langword="false"/> and sets <paramref name="value"/> to <code>default(<typeparamref name="T"/>)</code>.
+        /// </summary>
+        /// <param name="row"></param>
+        /// <param name="column"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public bool TryGet(int row, int column, out T value)
+        {
+            try
+            {
+                value = _list.First(item => item.row == row && item.column == column).item;
+                return true;
+            }
+            // Catch the exceptions thrown by IEnumerable.First() when no item is found.
+            catch (Exception ex) when (ex is ArgumentNullException || ex is InvalidOperationException)
+            {
+                value = default;
+                return false;
+            }
+        }
+
+        #endregion
+        
+        #region Private fields
+
+        private readonly List<(T item, int row, int column)> _list = new List<(T item, int row, int column)>();
+
+        #endregion
+    }
+}
diff --git a/SoundBoard/Utilities.cs b/SoundBoard/Utilities.cs
index 3b87126..2b3a843 100644
--- a/SoundBoard/Utilities.cs
+++ b/SoundBoard/Utilities.cs
@@ -1,8 +1,10 @@
 #region Usings
 
 using System;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
+using MahApps.Metro.SimpleChildWindow;
 using NAudio.CoreAudioApi;
 using Point = System.Windows.Point;
 
@@ -85,6 +87,15 @@ public static System.Windows.Media.Color ToSystemWindowsMediaColor(this System.D
             return System.Windows.Media.Color.FromArgb(color.A, color.R, color.G, color.B);
         }
 
+        /// <summary>
+        /// Returns <see langword="true"/> if any instances of <see cref="ChildWindowBase"/> are currently visible.
+        /// </summary>
+        /// <returns></returns>
+        public static bool AreAnyDialogsVisible()
+        {
+            return ChildWindowBase.Instances.Any(childWindowBase => childWindowBase.IsOpen);
+        }
+
         #endregion
 
         #region P/Invoke utilities
diff --git a/SoundBoard/WaitCursor.cs b/SoundBoard/WaitCursor.cs
new file mode 100644
index 0000000..6df879a
--- /dev/null
+++ b/SoundBoard/WaitCursor.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Windows.Input;
+
+namespace SoundBoard
+{
+    /// <summary>
+    /// Shows a WaitCursor. Dispose to restore the previous cursor.
+    /// Use in a using block to automatically restore cursor after a long-running operation.
+    /// </summary>
+    /// <remarks>
+    /// Lifted from StackOverflow: https://stackoverflow.com/a/3481274/4206279
+    /// </remarks>
+    internal class WaitCursor : IDisposable
+    {
+        #region Constructor
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public WaitCursor()
+        {
+            _previousCursor = Mouse.OverrideCursor;
+            Mouse.OverrideCursor = Cursors.Wait;
+        }
+        
+        #endregion
+
+        #region IDisposable members
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            Mouse.OverrideCursor = _previousCursor;
+        }
+
+        #endregion
+
+        #region Private fields
+
+        private readonly Cursor _previousCursor;
+
+        #endregion
+    }
+}
diff --git a/SoundBoard/packages.config b/SoundBoard/packages.config
index 6364f18..57b9067 100644
--- a/SoundBoard/packages.config
+++ b/SoundBoard/packages.config
@@ -2,8 +2,10 @@
 <packages>
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net472" />
   <package id="Costura.Fody" version="4.0.0" targetFramework="net472" developmentDependency="true" />
+  <package id="Extended.Wpf.Toolkit" version="3.5.0" targetFramework="net472" />
   <package id="Fody" version="5.1.1" targetFramework="net472" developmentDependency="true" />
   <package id="MahApps.Metro" version="1.6.5" targetFramework="net472" />
+  <package id="MahApps.Metro.SimpleChildWindow" version="1.5.0" targetFramework="net472" />
   <package id="MouseKeyHook" version="5.6.0" targetFramework="net472" />
   <package id="NAudio" version="1.9.0" targetFramework="net472" />
 </packages>
\ No newline at end of file