diff --git a/FortyOne.AudioSwitcher/AudioSwitcher.Designer.cs b/FortyOne.AudioSwitcher/AudioSwitcher.Designer.cs index a3f9249..8c17cb1 100644 --- a/FortyOne.AudioSwitcher/AudioSwitcher.Designer.cs +++ b/FortyOne.AudioSwitcher/AudioSwitcher.Designer.cs @@ -46,6 +46,7 @@ private void InitializeComponent() this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.tapRecording = new System.Windows.Forms.TabPage(); + this.openControlPanelRecording = new System.Windows.Forms.PictureBox(); this.recordingStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.mnuSetRecordingDefault = new System.Windows.Forms.ToolStripMenuItem(); this.mnuSetRecordingCommunicationDefault = new System.Windows.Forms.ToolStripMenuItem(); @@ -103,7 +104,6 @@ private void InitializeComponent() this.statusLabelUpdate = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.statusLabelDonate = new System.Windows.Forms.ToolStripStatusLabel(); - this.openControlPanelRecording = new System.Windows.Forms.PictureBox(); this.btnSetPlaybackDefault = new FortyOne.AudioSwitcher.Controls.SplitButton(); this.btnSetRecordingDefault = new FortyOne.AudioSwitcher.Controls.SplitButton(); this.deviceNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -114,6 +114,7 @@ private void InitializeComponent() this.tapPlayback.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.openControlPanelPlayback)).BeginInit(); this.tapRecording.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.openControlPanelRecording)).BeginInit(); this.recordingStrip.SuspendLayout(); this.tapSettings.SuspendLayout(); this.tapHotkeys.SuspendLayout(); @@ -123,7 +124,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.notifyIconStrip.SuspendLayout(); this.statusStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.openControlPanelRecording)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.hotKeyBindingSource)).BeginInit(); this.SuspendLayout(); // @@ -212,6 +212,7 @@ private void InitializeComponent() // // openControlPanelPlayback // + this.openControlPanelPlayback.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.openControlPanelPlayback.Cursor = System.Windows.Forms.Cursors.Hand; this.openControlPanelPlayback.Location = new System.Drawing.Point(5, 281); this.openControlPanelPlayback.Name = "openControlPanelPlayback"; @@ -277,6 +278,18 @@ private void InitializeComponent() this.tapRecording.Text = "Recording"; this.tapRecording.UseVisualStyleBackColor = true; // + // openControlPanelRecording + // + this.openControlPanelRecording.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.openControlPanelRecording.Cursor = System.Windows.Forms.Cursors.Hand; + this.openControlPanelRecording.Location = new System.Drawing.Point(5, 281); + this.openControlPanelRecording.Name = "openControlPanelRecording"; + this.openControlPanelRecording.Size = new System.Drawing.Size(25, 25); + this.openControlPanelRecording.TabIndex = 9; + this.openControlPanelRecording.TabStop = false; + this.toolTip1.SetToolTip(this.openControlPanelRecording, "Open Sounds in Control Panel"); + this.openControlPanelRecording.Click += new System.EventHandler(this.openControlPanelRecording_Click); + // // recordingStrip // this.recordingStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -914,17 +927,6 @@ private void InitializeComponent() this.statusLabelDonate.ToolTipText = "Donate via PayPal"; this.statusLabelDonate.Click += new System.EventHandler(this.statusLabelDonate_Click); // - // openControlPanelRecording - // - this.openControlPanelRecording.Cursor = System.Windows.Forms.Cursors.Hand; - this.openControlPanelRecording.Location = new System.Drawing.Point(5, 281); - this.openControlPanelRecording.Name = "openControlPanelRecording"; - this.openControlPanelRecording.Size = new System.Drawing.Size(25, 25); - this.openControlPanelRecording.TabIndex = 9; - this.openControlPanelRecording.TabStop = false; - this.toolTip1.SetToolTip(this.openControlPanelRecording, "Open Sounds in Control Panel"); - this.openControlPanelRecording.Click += new System.EventHandler(this.openControlPanelRecording_Click); - // // btnSetPlaybackDefault // this.btnSetPlaybackDefault.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -1008,6 +1010,7 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.openControlPanelPlayback)).EndInit(); this.tapRecording.ResumeLayout(false); this.tapRecording.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.openControlPanelRecording)).EndInit(); this.recordingStrip.ResumeLayout(false); this.tapSettings.ResumeLayout(false); this.tapSettings.PerformLayout(); @@ -1020,7 +1023,6 @@ private void InitializeComponent() this.notifyIconStrip.ResumeLayout(false); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.openControlPanelRecording)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.hotKeyBindingSource)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/FortyOne.AudioSwitcher/AudioSwitcher.resx b/FortyOne.AudioSwitcher/AudioSwitcher.resx index cf7fe08..5f01798 100644 --- a/FortyOne.AudioSwitcher/AudioSwitcher.resx +++ b/FortyOne.AudioSwitcher/AudioSwitcher.resx @@ -123,11 +123,14 @@ 1006, 17 + + 172, 17 + 713, 17 - - 172, 17 + + 1006, 17 545, 17 @@ -1028,6 +1031,9 @@ 1249, 17 + + 545, 17 + AAABAA0AMDAQAAEABABoBgAA1gAAACAgEAABAAQA6AIAAD4HAAAYGBAAAQAEAOgBAAAmCgAAEBAQAAEA diff --git a/FortyOne.AudioSwitcher/FortyOne.AudioSwitcher.GUI.csproj b/FortyOne.AudioSwitcher/FortyOne.AudioSwitcher.GUI.csproj index e4be48b..1316c52 100644 --- a/FortyOne.AudioSwitcher/FortyOne.AudioSwitcher.GUI.csproj +++ b/FortyOne.AudioSwitcher/FortyOne.AudioSwitcher.GUI.csproj @@ -81,12 +81,12 @@ - - ..\packages\AudioSwitcher.AudioApi.3.1.0-beta2\lib\net452\AudioSwitcher.AudioApi.dll + + ..\packages\AudioSwitcher.AudioApi.4.0.0.0-alpha1\lib\net452\AudioSwitcher.AudioApi.dll True - - ..\packages\AudioSwitcher.AudioApi.CoreAudio.3.1.0-beta2\lib\net452\AudioSwitcher.AudioApi.CoreAudio.dll + + ..\packages\AudioSwitcher.AudioApi.CoreAudio.4.0.0-alpha1\lib\net452\AudioSwitcher.AudioApi.CoreAudio.dll True @@ -221,7 +221,9 @@ Designer - + + Designer + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/FortyOne.AudioSwitcher/Properties/AssemblyInfo.cs b/FortyOne.AudioSwitcher/Properties/AssemblyInfo.cs index 151d491..5742d0e 100644 --- a/FortyOne.AudioSwitcher/Properties/AssemblyInfo.cs +++ b/FortyOne.AudioSwitcher/Properties/AssemblyInfo.cs @@ -36,7 +36,7 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.10.113")] -[assembly: AssemblyFileVersion("1.6.10.113")] -[assembly: AssemblyInformationalVersion("1.6.10.113")] +[assembly: AssemblyVersion("1.7.0.117")] +[assembly: AssemblyFileVersion("1.7.0.117")] +[assembly: AssemblyInformationalVersion("1.7.0.117")] [assembly: NeutralResourcesLanguage("")] \ No newline at end of file diff --git a/FortyOne.AudioSwitcher/packages.config b/FortyOne.AudioSwitcher/packages.config index c023484..81580e6 100644 --- a/FortyOne.AudioSwitcher/packages.config +++ b/FortyOne.AudioSwitcher/packages.config @@ -1,7 +1,7 @@  - - + +