added image to main DS4 Controller if rainbow mode is on

This commit is contained in:
jays2kings 2014-05-04 22:25:53 -04:00
parent fda3c65dcd
commit 35f322598c
6 changed files with 79 additions and 83 deletions

View File

@ -153,6 +153,7 @@
<Content Include="Resources\DS4.ico" />
<None Include="Resources\mouse.png" />
<None Include="Resources\rainbow.png" />
<None Include="Resources\rainbowC.png" />
<Content Include="Resources\Scp_All.ico" />
</ItemGroup>
<ItemGroup>

View File

@ -58,7 +58,10 @@
this.fullColorLabel = new System.Windows.Forms.Label();
this.lowColorLabel = new System.Windows.Forms.Label();
this.lowLedPanel = new System.Windows.Forms.Panel();
this.lowBlueBar = new System.Windows.Forms.TrackBar();
this.lowColorChooserButton = new System.Windows.Forms.Button();
this.lowGreenBar = new System.Windows.Forms.TrackBar();
this.lowRedBar = new System.Windows.Forms.TrackBar();
this.fullLedPanel = new System.Windows.Forms.Panel();
this.colorChooserButton = new System.Windows.Forms.Button();
this.label11 = new System.Windows.Forms.Label();
@ -135,9 +138,6 @@
this.tBMouseSens = new System.Windows.Forms.TrackBar();
this.tBProfile = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.lowRedBar = new System.Windows.Forms.TrackBar();
this.lowGreenBar = new System.Windows.Forms.TrackBar();
this.lowBlueBar = new System.Windows.Forms.TrackBar();
this.advColorDialog = new ScpServer.AdvancedColorDialog();
((System.ComponentModel.ISupportInitialize)(this.blueBar)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.greenBar)).BeginInit();
@ -146,6 +146,9 @@
((System.ComponentModel.ISupportInitialize)(this.leftMotorBar)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rumbleBoostBar)).BeginInit();
this.lowLedPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.lowBlueBar)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lowGreenBar)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lowRedBar)).BeginInit();
this.fullLedPanel.SuspendLayout();
this.tabOptions.SuspendLayout();
this.tabControls.SuspendLayout();
@ -164,9 +167,6 @@
this.tabOther.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.idleDisconnectTimeout)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tBMouseSens)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lowRedBar)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lowGreenBar)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lowBlueBar)).BeginInit();
this.SuspendLayout();
//
// BlueLabel
@ -385,7 +385,7 @@
//
this.colorLabel.AutoSize = true;
this.colorLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.colorLabel.Location = new System.Drawing.Point(16, 13);
this.colorLabel.Location = new System.Drawing.Point(16, 7);
this.colorLabel.Name = "colorLabel";
this.colorLabel.Size = new System.Drawing.Size(36, 13);
this.colorLabel.TabIndex = 29;
@ -478,7 +478,6 @@
this.fullColorLabel.TabIndex = 43;
this.fullColorLabel.Text = "When Full";
this.fullColorLabel.Visible = false;
this.fullColorLabel.Click += new System.EventHandler(this.fullColorLabel_Click);
//
// lowColorLabel
//
@ -506,6 +505,21 @@
this.lowLedPanel.TabIndex = 46;
this.lowLedPanel.Visible = false;
//
// lowBlueBar
//
this.lowBlueBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lowBlueBar.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.lowBlueBar.Location = new System.Drawing.Point(0, 94);
this.lowBlueBar.Maximum = 255;
this.lowBlueBar.Name = "lowBlueBar";
this.lowBlueBar.Size = new System.Drawing.Size(144, 45);
this.lowBlueBar.TabIndex = 12;
this.lowBlueBar.TickFrequency = 25;
this.lowBlueBar.TickStyle = System.Windows.Forms.TickStyle.None;
this.lowBlueBar.Value = 255;
this.lowBlueBar.ValueChanged += new System.EventHandler(this.lowBlueBar_ValueChanged);
//
// lowColorChooserButton
//
this.lowColorChooserButton.BackColor = System.Drawing.Color.White;
@ -517,6 +531,36 @@
this.lowColorChooserButton.UseVisualStyleBackColor = false;
this.lowColorChooserButton.Click += new System.EventHandler(this.lowColorChooserButton_Click);
//
// lowGreenBar
//
this.lowGreenBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lowGreenBar.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.lowGreenBar.Location = new System.Drawing.Point(0, 64);
this.lowGreenBar.Maximum = 255;
this.lowGreenBar.Name = "lowGreenBar";
this.lowGreenBar.Size = new System.Drawing.Size(144, 45);
this.lowGreenBar.TabIndex = 11;
this.lowGreenBar.TickFrequency = 25;
this.lowGreenBar.TickStyle = System.Windows.Forms.TickStyle.None;
this.lowGreenBar.Value = 255;
this.lowGreenBar.ValueChanged += new System.EventHandler(this.lowGreenBar_ValueChanged);
//
// lowRedBar
//
this.lowRedBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lowRedBar.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.lowRedBar.Location = new System.Drawing.Point(0, 34);
this.lowRedBar.Maximum = 255;
this.lowRedBar.Name = "lowRedBar";
this.lowRedBar.Size = new System.Drawing.Size(144, 45);
this.lowRedBar.TabIndex = 10;
this.lowRedBar.TickFrequency = 25;
this.lowRedBar.TickStyle = System.Windows.Forms.TickStyle.None;
this.lowRedBar.Value = 255;
this.lowRedBar.ValueChanged += new System.EventHandler(this.lowRedBar_ValueChanged);
//
// fullLedPanel
//
this.fullLedPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@ -735,6 +779,7 @@
this.btnLightbar.TabIndex = 91;
this.btnLightbar.Text = "Lightbar";
this.btnLightbar.UseVisualStyleBackColor = false;
this.btnLightbar.Click += new System.EventHandler(this.btnLightbar_Click);
//
// btnTouchtab
//
@ -1627,7 +1672,6 @@
this.tabLightBar.TabIndex = 0;
this.tabLightBar.Text = "Light Bar";
this.tabLightBar.UseVisualStyleBackColor = true;
this.tabLightBar.Click += new System.EventHandler(this.tabLightBar_Click);
//
// numUDRainbow
//
@ -1802,51 +1846,6 @@
this.label4.TabIndex = 84;
this.label4.Text = "Profile Name:";
//
// lowRedBar
//
this.lowRedBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lowRedBar.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.lowRedBar.Location = new System.Drawing.Point(0, 34);
this.lowRedBar.Maximum = 255;
this.lowRedBar.Name = "lowRedBar";
this.lowRedBar.Size = new System.Drawing.Size(144, 45);
this.lowRedBar.TabIndex = 10;
this.lowRedBar.TickFrequency = 25;
this.lowRedBar.TickStyle = System.Windows.Forms.TickStyle.None;
this.lowRedBar.Value = 255;
this.lowRedBar.ValueChanged += new System.EventHandler(this.lowRedBar_ValueChanged);
//
// lowGreenBar
//
this.lowGreenBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lowGreenBar.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.lowGreenBar.Location = new System.Drawing.Point(0, 64);
this.lowGreenBar.Maximum = 255;
this.lowGreenBar.Name = "lowGreenBar";
this.lowGreenBar.Size = new System.Drawing.Size(144, 45);
this.lowGreenBar.TabIndex = 11;
this.lowGreenBar.TickFrequency = 25;
this.lowGreenBar.TickStyle = System.Windows.Forms.TickStyle.None;
this.lowGreenBar.Value = 255;
this.lowGreenBar.ValueChanged += new System.EventHandler(this.lowGreenBar_ValueChanged);
//
// lowBlueBar
//
this.lowBlueBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lowBlueBar.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.lowBlueBar.Location = new System.Drawing.Point(0, 94);
this.lowBlueBar.Maximum = 255;
this.lowBlueBar.Name = "lowBlueBar";
this.lowBlueBar.Size = new System.Drawing.Size(144, 45);
this.lowBlueBar.TabIndex = 12;
this.lowBlueBar.TickFrequency = 25;
this.lowBlueBar.TickStyle = System.Windows.Forms.TickStyle.None;
this.lowBlueBar.Value = 255;
this.lowBlueBar.ValueChanged += new System.EventHandler(this.lowBlueBar_ValueChanged);
//
// advColorDialog
//
this.advColorDialog.AnyColor = true;
@ -1878,6 +1877,9 @@
((System.ComponentModel.ISupportInitialize)(this.rumbleBoostBar)).EndInit();
this.lowLedPanel.ResumeLayout(false);
this.lowLedPanel.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.lowBlueBar)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.lowGreenBar)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.lowRedBar)).EndInit();
this.fullLedPanel.ResumeLayout(false);
this.fullLedPanel.PerformLayout();
this.tabOptions.ResumeLayout(false);
@ -1903,9 +1905,6 @@
this.tabOther.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.idleDisconnectTimeout)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tBMouseSens)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.lowRedBar)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.lowGreenBar)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.lowBlueBar)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();

View File

@ -196,7 +196,6 @@ namespace ScpServer
btnLeftStick.Enter += btnSticks_Enter;
btnRightStick.Enter += btnSticks_Enter;
btnTouchtab.Enter += btnTouchtab_Enter;
btnLightbar.Click += btnLightbar_Click;
UpdateLists();
}
@ -307,7 +306,7 @@ namespace ScpServer
}
private void btnLightbar_Click(object sender, EventArgs e)
{
tabOptions.SelectTab(3);
}
private void Set()
@ -478,10 +477,6 @@ namespace ScpServer
{
Global.setScrollSensitivity(device, (byte)numUDScroll.Value);
}
private void lowBatteryLed_CheckedChanged(object sender, EventArgs e)
{
}
private void ledAsBatteryIndicator_CheckedChanged(object sender, EventArgs e)
{
Global.setLedAsBatteryIndicator(device, batteryLed.Checked);
@ -521,11 +516,6 @@ namespace ScpServer
Global.setTouchpadJitterCompensation(device, touchpadJitterCompensation.Checked);
}
private void pictureBox_Click(object sender, EventArgs e)
{
colorChooserButton_Click(sender, e);
}
private void colorChooserButton_Click(object sender, EventArgs e)
{
advColorDialog.Color = Color.FromArgb(redBar.Value, greenBar.Value, blueBar.Value);
@ -674,11 +664,6 @@ namespace ScpServer
saveButton_Click(sender, e);
}
private void lBControls_SelectedIndexChanged(object sender, EventArgs e)
{
}
public void UpdateLists()
{
lBControls.Items[0] = "Cross : " + bnCross.Text;
@ -784,6 +769,12 @@ namespace ScpServer
private void numUDRainbow_ValueChanged(object sender, EventArgs e)
{
Global.setRainbow(device, (double)numUDRainbow.Value);
if ((double)numUDRainbow.Value <= 0.5)
{
pBRainbow.Image = greyscale;
ToggleRainbow(false);
numUDRainbow.Value = 0;
}
}
private void pictureBox2_Click(object sender, EventArgs e)
@ -808,11 +799,13 @@ namespace ScpServer
if (on)
{
pBRainbow.Location = new Point(137, 139);
pBController.BackgroundImage = Properties.Resources.rainbowC;
batteryLed.Text = "Battery Level Dim";
}
else
{
pBRainbow.Location = new Point(215, 139);
pBController.BackgroundImage = null;
batteryLed.Text = "Battery Level Color";
}
lBspc.Visible = on;
@ -838,15 +831,5 @@ namespace ScpServer
}
return d;
}
private void fullColorLabel_Click(object sender, EventArgs e)
{
}
private void tabLightBar_Click(object sender, EventArgs e)
{
}
}
}

View File

@ -147,4 +147,7 @@
<data name="rainbow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\rainbow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="rainbowC" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\rainbowC.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

View File

@ -110,6 +110,16 @@ namespace ScpServer.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap rainbowC {
get {
object obj = ResourceManager.GetObject("rainbowC", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized string similar to Start.
/// </summary>

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB