From c00f7c2139d7b95b39d489a77780e9b797a61e4e Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 13 Sep 2017 21:38:34 -0700 Subject: [PATCH] Revise naming to reflect behavior --- MatterControl.csproj | 2 +- .../{SettingsControlBar.cs => PresetsToolbar.cs} | 10 +++++----- SlicerConfiguration/SliceSettingsWidget.cs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) rename SlicerConfiguration/{SettingsControlBar.cs => PresetsToolbar.cs} (94%) diff --git a/MatterControl.csproj b/MatterControl.csproj index ad22ed680..e2712faa0 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -396,7 +396,7 @@ - + diff --git a/SlicerConfiguration/SettingsControlBar.cs b/SlicerConfiguration/PresetsToolbar.cs similarity index 94% rename from SlicerConfiguration/SettingsControlBar.cs rename to SlicerConfiguration/PresetsToolbar.cs index e9dd77128..055efd42b 100644 --- a/SlicerConfiguration/SettingsControlBar.cs +++ b/SlicerConfiguration/PresetsToolbar.cs @@ -1,5 +1,5 @@ /* -Copyright (c) 2014, Kevin Pope +Copyright (c) 2017, Kevin Pope, John Lewin All rights reserved. Redistribution and use in source and binary forms, with or without @@ -27,19 +27,19 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ +using System.Collections.Generic; using MatterHackers.Agg; using MatterHackers.Agg.UI; using MatterHackers.Localizations; -using System; -using System.Collections.Generic; using MatterHackers.MatterControl.PrinterCommunication; namespace MatterHackers.MatterControl.SlicerConfiguration { - public class SettingsControlBar : FlowLayoutWidget + public class PresetsToolbar : FlowLayoutWidget { PrinterConnection printerConnection; - public SettingsControlBar(PrinterConnection printerConnection) + + public PresetsToolbar(PrinterConnection printerConnection) { this.printerConnection = printerConnection; this.HAnchor = HAnchor.Stretch; diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index 0211d976c..dd940fba5 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public class SliceSettingsWidget : GuiWidget { private TabControl topCategoryTabs; - internal SettingsControlBar settingsControlBar; + internal PresetsToolbar settingsControlBar; private FlowLayoutWidget pageTopToBottomLayout; private SettingsContext settingsContext; @@ -96,7 +96,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration pageTopToBottomLayout.AnchorAll(); this.AddChild(pageTopToBottomLayout); - settingsControlBar = new SettingsControlBar(printerConnection) + settingsControlBar = new PresetsToolbar(printerConnection) { HAnchor = HAnchor.Stretch, Padding = new BorderDouble(8, 12, 8, 8)