diff --git a/Application/VixenApplication/CheckForUpdates.cs b/Application/VixenApplication/CheckForUpdates.cs index de5a00e39..c350a9737 100644 --- a/Application/VixenApplication/CheckForUpdates.cs +++ b/Application/VixenApplication/CheckForUpdates.cs @@ -153,7 +153,6 @@ private async Task PopulateChangeLog() } } - int i = 0; releaseVersionNames.Reverse(); //We are going to create a list to hold all of our parallel tasks that we spin up diff --git a/Application/VixenApplication/Setup/SetupElementsPreview.Designer.cs b/Application/VixenApplication/Setup/SetupElementsPreview.Designer.cs deleted file mode 100644 index 2934982ed..000000000 --- a/Application/VixenApplication/Setup/SetupElementsPreview.Designer.cs +++ /dev/null @@ -1,59 +0,0 @@ -namespace VixenApplication.Setup -{ - partial class SetupElementsPreview - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.label1 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 64); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(224, 13); - this.label1.TabIndex = 0; - this.label1.Text = "TODO: this should be the preview setup view."; - // - // SetupElementsPreview - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.label1); - this.DoubleBuffered = true; - this.Name = "SetupElementsPreview"; - this.Size = new System.Drawing.Size(250, 550); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Label label1; - } -} diff --git a/Application/VixenApplication/Setup/SetupElementsPreview.cs b/Application/VixenApplication/Setup/SetupElementsPreview.cs deleted file mode 100644 index bb7f25af1..000000000 --- a/Application/VixenApplication/Setup/SetupElementsPreview.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; -using System.Windows.Forms; -using Vixen.Sys; - -namespace VixenApplication.Setup -{ - public partial class SetupElementsPreview : UserControl, ISetupElementsControl - { - public SetupElementsPreview() - { - InitializeComponent(); - } - - public event EventHandler ElementSelectionChanged; - public event EventHandler ElementsChanged; - IEnumerable ISetupElementsControl.SelectedElements { get; set; } - - public IEnumerable SelectedElements - { - get { throw new NotImplementedException(); } - } - - public Control SetupElementsControl - { - get { return this; } - } - - public DisplaySetup MasterForm { get; set; } - - public void UpdatePatching() - { - throw new NotImplementedException(); - } - - public void UpdateScrollPosition() - { - throw new NotImplementedException(); - } - } -} diff --git a/Application/VixenApplication/Setup/SetupElementsPreview.resx b/Application/VixenApplication/Setup/SetupElementsPreview.resx deleted file mode 100644 index 29dcb1b3a..000000000 --- a/Application/VixenApplication/Setup/SetupElementsPreview.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Application/VixenApplication/VixenApplication.cs b/Application/VixenApplication/VixenApplication.cs index 166f2f830..04b0464f1 100644 --- a/Application/VixenApplication/VixenApplication.cs +++ b/Application/VixenApplication/VixenApplication.cs @@ -50,7 +50,6 @@ public partial class VixenApplication : BaseForm, IApplication private bool _testBuild; private string _rootDataDirectory; private CpuUsage _cpuUsage; - private bool _perfCountersAvailable; private int _currentBuildVersion; private string _currentReleaseVersion; @@ -283,6 +282,7 @@ internal static bool IsProfileLocked(string path) } catch (Exception e) { + Logging.Error(e, "Error getting the process id to determine lock file removal."); //No process with that id so release the lock. RemoveLockFile(lockFilePath); } @@ -1059,30 +1059,12 @@ private void viewInstalledModulesToolStripMenuItem_Click(object sender, EventArg private const int StatsUpdateInterval = 1000; // ms private Timer _statsTimer; - private Process _thisProc; - private PerformanceCounter _committedRamCounter; - private PerformanceCounter _reservedRamCounter; - + private void InitStats() { - _thisProc = Process.GetCurrentProcess(); _cpuUsage = new CpuUsage(); - //try - //{ - // if (PerformanceCounterCategory.Exists(".NET CLR Memory")) - // { - // _committedRamCounter = new PerformanceCounter(".NET CLR Memory", "# Total committed Bytes", _thisProc.ProcessName); - // _reservedRamCounter = new PerformanceCounter(".NET CLR Memory", "# Total reserved Bytes", _thisProc.ProcessName); - // _perfCountersAvailable = true; - // } - //} - //catch (Exception ex) - //{ - // Logging.Error("Cannot access performance counters. Refresh the counter list with lodctr /R"); - //} - _statsTimer = new Timer(); _statsTimer.Interval = StatsUpdateInterval; _statsTimer.Tick += statsTimer_Tick; diff --git a/Application/VixenApplication/VixenApplication.csproj b/Application/VixenApplication/VixenApplication.csproj index cb8df2903..ccc057fdb 100644 --- a/Application/VixenApplication/VixenApplication.csproj +++ b/Application/VixenApplication/VixenApplication.csproj @@ -305,12 +305,6 @@ SetupControllersSimple.cs - - UserControl - - - SetupElementsPreview.cs - UserControl @@ -425,9 +419,6 @@ SetupControllersSimple.cs - - SetupElementsPreview.cs - SetupElementsTree.cs diff --git a/Common/Controls/Theme/ThemeColorTable.cs b/Common/Controls/Theme/ThemeColorTable.cs index cc2d55331..90ccb511e 100644 --- a/Common/Controls/Theme/ThemeColorTable.cs +++ b/Common/Controls/Theme/ThemeColorTable.cs @@ -16,8 +16,7 @@ public class ThemeColorTable : ProfessionalColorTable private static Color _buttonBorderColor = Color.FromArgb(40, 40, 40); private static Color _buttonBackColor = Color.FromArgb(20, 20, 20); private static Color _buttonBackColorHover = Color.FromArgb(40, 40, 40); - private static Color _buttonTextColor; - + //Text private static Color _foreColorDisabled = Color.FromArgb(119, 119, 119); @@ -86,7 +85,7 @@ public static Color ButtonBackColorHover public static Color ButtonTextColor { - get { return _buttonTextColor; } + get { return _foreColor; } } //Text diff --git a/Common/Controls/TimeLineControl/Grid.cs b/Common/Controls/TimeLineControl/Grid.cs index 540af2349..cc5756b27 100644 --- a/Common/Controls/TimeLineControl/Grid.cs +++ b/Common/Controls/TimeLineControl/Grid.cs @@ -44,7 +44,6 @@ public partial class Grid : TimelineControlBase, IEnumerable private Row m_mouseDownElementRow = null; // the row that the clicked m_mouseDownElement belongs to (a single element may be in multiple rows) - private TimeSpan m_cursorPosition; // the current grid 'cursor' position (line drawn vertically); private BackgroundWorker renderWorker; private BlockingCollection _blockingElementQueue = new BlockingCollection(); private ManualResetEventSlim renderWorkerFinished; @@ -57,7 +56,6 @@ public partial class Grid : TimelineControlBase, IEnumerable public bool isColorDrop { get; set; } public bool isCurveDrop { get; set; } public bool isGradientDrop { get; set; } - private MouseButtons MouseButtonDown; public string alignmentHelperWarning = @"Too many effects selected on the same row for this action.\nMax selected effects per row for this action is 4"; public bool aCadStyleSelectionBox { get; set; } diff --git a/Common/Controls/TimeLineControl/Ruler.cs b/Common/Controls/TimeLineControl/Ruler.cs index 3dd4cb66d..e8cb2cc6b 100644 --- a/Common/Controls/TimeLineControl/Ruler.cs +++ b/Common/Controls/TimeLineControl/Ruler.cs @@ -448,9 +448,6 @@ private enum MouseState private int m_mouseDownX; private MouseButtons m_button; - private TimeSpan m_mark; - private Mark _selectedMark = null; - //public SortedDictionary selectedMarks = new SortedDictionary(); protected override void OnMouseDown(MouseEventArgs e) { diff --git a/Modules/Analysis/BeatsAndBars/BeatsAndBars.cs b/Modules/Analysis/BeatsAndBars/BeatsAndBars.cs index 8160954e5..4ead7c9b8 100644 --- a/Modules/Analysis/BeatsAndBars/BeatsAndBars.cs +++ b/Modules/Analysis/BeatsAndBars/BeatsAndBars.cs @@ -38,7 +38,6 @@ public BeatsAndBars(Audio module) private IDictionary> GenerateFeatures(ManagedPlugin plugin, float[] fSampleData, bool showProgress = true) { - int i = 0; int j = 0; IDictionary> retVal = new ConcurrentDictionary>(); diff --git a/Modules/App/ColorGradients/ColorGradient.cs b/Modules/App/ColorGradients/ColorGradient.cs index 0be1e943d..f4ac4079a 100644 --- a/Modules/App/ColorGradients/ColorGradient.cs +++ b/Modules/App/ColorGradients/ColorGradient.cs @@ -926,7 +926,6 @@ public ColorGradient GetSubGradient(double start, double end) result.Colors.Add(new ColorPoint(GetColorAt(start), 0)); - ColorPoint previous = null; foreach (ColorPoint cp in Colors) { if (cp.Position > start && cp.Position < end) diff --git a/Modules/App/CustomPropEditor/CustomPropEditorModule.cs b/Modules/App/CustomPropEditor/CustomPropEditorModule.cs index c4129066a..840a8f520 100644 --- a/Modules/App/CustomPropEditor/CustomPropEditorModule.cs +++ b/Modules/App/CustomPropEditor/CustomPropEditorModule.cs @@ -10,7 +10,6 @@ namespace VixenModules.App.CustomPropEditor public class CustomPropEditorModule : AppModuleInstanceBase { private IApplication _application; - private CustomPropEditorData _data; private const string MenuIdRoot = "CustomPropRoot"; public override void Loading() diff --git a/Modules/App/CustomPropEditor/ViewModels/DrawingPanelViewModel.cs b/Modules/App/CustomPropEditor/ViewModels/DrawingPanelViewModel.cs index 0ea708e31..04b09c48d 100644 --- a/Modules/App/CustomPropEditor/ViewModels/DrawingPanelViewModel.cs +++ b/Modules/App/CustomPropEditor/ViewModels/DrawingPanelViewModel.cs @@ -19,8 +19,7 @@ public class DrawingPanelViewModel : ViewModelBase { private readonly ElementTreeViewModel _elementTreeViewModel; private readonly Dictionary> _elementModelMap; - private readonly Configuration _config; - + public DrawingPanelViewModel(ElementTreeViewModel elementTreeViewModel) { _elementTreeViewModel = elementTreeViewModel; diff --git a/Modules/App/ExportWizard/BulkExportOutputFormatStage.cs b/Modules/App/ExportWizard/BulkExportOutputFormatStage.cs index d800695a6..1f1dd8f4d 100644 --- a/Modules/App/ExportWizard/BulkExportOutputFormatStage.cs +++ b/Modules/App/ExportWizard/BulkExportOutputFormatStage.cs @@ -252,6 +252,7 @@ private bool CanTestPath() } catch (Exception e) { + Logging.Error(e, "Error determining if path can be tested."); success = false; } diff --git a/Modules/App/LipSync/LipSyncMapMatrixEditor.cs b/Modules/App/LipSync/LipSyncMapMatrixEditor.cs index 2a553010e..253c74713 100644 --- a/Modules/App/LipSync/LipSyncMapMatrixEditor.cs +++ b/Modules/App/LipSync/LipSyncMapMatrixEditor.cs @@ -122,9 +122,12 @@ public bool CloneMappingFiles(string newName) { try { - Directory.Delete(newDirName,true); + Directory.Delete(newDirName, true); + } + catch (Exception err) + { + Logging.Error(err, "Error cloning mapping files."); } - catch (Exception err) { } } if (Directory.Exists(PictureDirPath)) diff --git a/Modules/App/LipSync/LipSyncMultiPicSelect.cs b/Modules/App/LipSync/LipSyncMultiPicSelect.cs index 4661e2fed..a541c90b7 100644 --- a/Modules/App/LipSync/LipSyncMultiPicSelect.cs +++ b/Modules/App/LipSync/LipSyncMultiPicSelect.cs @@ -33,8 +33,6 @@ public LipSyncMultiPicSelect() private void LipSyncMultiPicSelect_Load(object sender, EventArgs e) { - int boxNum = 0; - infoLabel.Text = "Multiple images detected, " + Environment.NewLine + "Please select the desired mapping"; diff --git a/Modules/App/Shows/ShowEditorForm.cs b/Modules/App/Shows/ShowEditorForm.cs index c1b75e643..f2c229dad 100644 --- a/Modules/App/Shows/ShowEditorForm.cs +++ b/Modules/App/Shows/ShowEditorForm.cs @@ -487,9 +487,5 @@ private void buttonCancel_Click(object sender, EventArgs e) } } - // The size of the X in each tab's upper right corner. - private int Xwid = 8; - private const int tab_margin = 0; - } } diff --git a/Modules/App/WebServer/Module.cs b/Modules/App/WebServer/Module.cs index 7fc30f921..3124017c3 100644 --- a/Modules/App/WebServer/Module.cs +++ b/Modules/App/WebServer/Module.cs @@ -21,8 +21,7 @@ public class Module : AppModuleInstanceBase private IDisposable _server; private Data _data; private IApplication _application; - private AppCommand _showCommand; - + public override IModuleDataModel StaticModuleData { get { return _data; } diff --git a/Modules/Editor/EffectEditor/Controls/InlineGradientEditor.cs b/Modules/Editor/EffectEditor/Controls/InlineGradientEditor.cs index 1c6a53a02..f8c79412b 100644 --- a/Modules/Editor/EffectEditor/Controls/InlineGradientEditor.cs +++ b/Modules/Editor/EffectEditor/Controls/InlineGradientEditor.cs @@ -10,8 +10,7 @@ public class InlineGradientEditor : BaseInlineGradientEditor { private static readonly Logger Logging = LogManager.GetCurrentClassLogger(); private static readonly Type ThisType = typeof(InlineGradientEditor); - private BadImageFormatException _image; - + static InlineGradientEditor() { DefaultStyleKeyProperty.OverrideMetadata(ThisType, new FrameworkPropertyMetadata(ThisType)); diff --git a/Modules/Editor/EffectEditor/Input/DragDropManager.cs b/Modules/Editor/EffectEditor/Input/DragDropManager.cs index ffe7ac188..59e415fdc 100644 --- a/Modules/Editor/EffectEditor/Input/DragDropManager.cs +++ b/Modules/Editor/EffectEditor/Input/DragDropManager.cs @@ -25,7 +25,6 @@ public static class DragDropManager private static UIElement _draggedElt; private static Point _dragStartPoint; - private static bool _isMouseDown; private static Point _offsetPoint; private static DropPreviewAdorner _overlayElt; private static IDragSourceAdvisor s_currentDragSourceAdvisor; diff --git a/Modules/Editor/EffectEditor/Internal/CollectionItemValue.cs b/Modules/Editor/EffectEditor/Internal/CollectionItemValue.cs index 304213800..edc09c391 100644 --- a/Modules/Editor/EffectEditor/Internal/CollectionItemValue.cs +++ b/Modules/Editor/EffectEditor/Internal/CollectionItemValue.cs @@ -95,7 +95,7 @@ public string StringValue } catch (Exception exception) { - + Logging.Error(exception, "Get: Unable to convert property to string."); } return str; @@ -108,7 +108,7 @@ public string StringValue } catch (Exception exception) { - Logging.Error(exception,"Unable to convert property to string."); + Logging.Error(exception,"Set: Unable to convert property to string."); } } } diff --git a/Modules/Editor/TimedSequenceEditor/TimedSequenceEditorForm.cs b/Modules/Editor/TimedSequenceEditor/TimedSequenceEditorForm.cs index a041812ab..e048e0d2a 100644 --- a/Modules/Editor/TimedSequenceEditor/TimedSequenceEditorForm.cs +++ b/Modules/Editor/TimedSequenceEditor/TimedSequenceEditorForm.cs @@ -130,8 +130,7 @@ public partial class TimedSequenceEditorForm : BaseForm, IEditorUserInterface, I //Used for color collections private static Random rnd = new Random(); - private PreCachingSequenceEngine _preCachingSequenceEngine; - + //Used for setting a mouse location to do repeat actions on. private Point _mouseOriginalPoint = new Point(0,0); diff --git a/Modules/Effect/Dissolve/Dissolve.cs b/Modules/Effect/Dissolve/Dissolve.cs index 4e00647cc..4bac22c97 100644 --- a/Modules/Effect/Dissolve/Dissolve.cs +++ b/Modules/Effect/Dissolve/Dissolve.cs @@ -827,7 +827,6 @@ private void InitializeDissolveClasses(int intervals) elementIndex.Add(node); } - int i = 0; int colorIndex = 0; for (int x = 0; x < _totalNodes; x++) { diff --git a/Modules/Effect/SnowStorm/SnowStorm.cs b/Modules/Effect/SnowStorm/SnowStorm.cs index 376436827..0cb236add 100644 --- a/Modules/Effect/SnowStorm/SnowStorm.cs +++ b/Modules/Effect/SnowStorm/SnowStorm.cs @@ -19,8 +19,7 @@ public class SnowStorm : PixelEffectBase private SnowStormData _data; private double _gradientPosition = 0; private List _snowstormItems; - private int _lastSnowstormCount = 0; - + public SnowStorm() { _data = new SnowStormData(); diff --git a/Modules/Property/Face/FaceMapItem.cs b/Modules/Property/Face/FaceMapItem.cs index b85bfae9c..7c55e23a1 100644 --- a/Modules/Property/Face/FaceMapItem.cs +++ b/Modules/Property/Face/FaceMapItem.cs @@ -32,9 +32,6 @@ public FaceMapItem Clone() [DataMember] public System.Drawing.Color ElementColor { get; set; } - [DataMember] - private string _stringName; - [DataMember] public Guid ElementGuid { get; set; }