Remove old exclusive mode workaround

This commit is contained in:
Travis Nickles 2017-11-18 02:54:16 -06:00
parent 6ba2efa5a1
commit b6a58b7b76
27 changed files with 1070 additions and 610 deletions

View File

@ -52,7 +52,6 @@
this.openProfiles = new System.Windows.Forms.OpenFileDialog();
this.tabMain = new System.Windows.Forms.TabControl();
this.tabControllers = new System.Windows.Forms.TabPage();
this.btnConnectDS4Win10 = new System.Windows.Forms.Button();
this.tLPControllers = new System.Windows.Forms.TableLayoutPanel();
this.bnLight3 = new System.Windows.Forms.Button();
this.pBStatus1 = new System.Windows.Forms.PictureBox();
@ -351,20 +350,12 @@
//
// tabControllers
//
this.tabControllers.Controls.Add(this.btnConnectDS4Win10);
this.tabControllers.Controls.Add(this.tLPControllers);
this.tabControllers.Controls.Add(this.lbNoControllers);
resources.ApplyResources(this.tabControllers, "tabControllers");
this.tabControllers.Name = "tabControllers";
this.tabControllers.UseVisualStyleBackColor = true;
//
// btnConnectDS4Win10
//
resources.ApplyResources(this.btnConnectDS4Win10, "btnConnectDS4Win10");
this.btnConnectDS4Win10.Name = "btnConnectDS4Win10";
this.btnConnectDS4Win10.UseVisualStyleBackColor = true;
this.btnConnectDS4Win10.Click += new System.EventHandler(this.btnConnectDS4Win10_Click);
//
// tLPControllers
//
resources.ApplyResources(this.tLPControllers, "tLPControllers");
@ -1277,7 +1268,6 @@
this.cMTaskbar.ResumeLayout(false);
this.tabMain.ResumeLayout(false);
this.tabControllers.ResumeLayout(false);
this.tabControllers.PerformLayout();
this.tLPControllers.ResumeLayout(false);
this.tLPControllers.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pBStatus1)).EndInit();
@ -1429,7 +1419,6 @@
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.NumericUpDown nUDLatency;
private System.Windows.Forms.Label lbMsLatency;
private System.Windows.Forms.Button btnConnectDS4Win10;
private System.Windows.Forms.Button bnLight3;
private System.Windows.Forms.Button bnLight1;
private System.Windows.Forms.Button bnLight2;

View File

@ -196,9 +196,6 @@
<data name="tabControllers.Text" xml:space="preserve">
<value>الأيادي</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>وصل اليد بشكل حصري (تجريبي)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1046, 94</value>
</data>

View File

@ -221,14 +221,6 @@ namespace DS4Windows
hideDS4CheckBox.CheckedChanged -= hideDS4CheckBox_CheckedChanged;
hideDS4CheckBox.Checked = UseExclusiveMode;
hideDS4CheckBox.CheckedChanged += hideDS4CheckBox_CheckedChanged;
if (Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build < 10586)
{
toolTip1.SetToolTip(hideDS4CheckBox, "For Windows 10, use button on the main tab to connect exclusivly");
btnConnectDS4Win10.Visible = hideDS4CheckBox.Checked;
toolTip1.SetToolTip(btnConnectDS4Win10, "This will temporarily kill the taskbar until you connect a controller");
}
else
btnConnectDS4Win10.Visible = false;
cBDisconnectBT.Checked = DCBTatStop;
cBQuickCharge.Checked = QuickCharge;
@ -1596,8 +1588,6 @@ namespace DS4Windows
bool exclusiveMode = hideDS4CheckBox.Checked;
UseExclusiveMode = exclusiveMode;
if (Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build < 10586)
btnConnectDS4Win10.Visible = exclusiveMode;
hideDS4CheckBox.Enabled = false;
Save();
@ -2277,21 +2267,6 @@ namespace DS4Windows
}
Process bat;
private void btnConnectDS4Win10_Click(object sender, EventArgs e)
{
if (!runningBat)
{
StreamWriter w = new StreamWriter(exepath + "\\ConnectDS4.bat");
w.WriteLine("@echo off"); // Turn off echo
w.WriteLine("taskkill /IM explorer.exe /f");
w.WriteLine("echo Connect your DS4 controller"); //
w.WriteLine("pause");
w.WriteLine("start explorer.exe");
w.Close();
runningBat = true;
bat = Process.Start(exepath + "\\ConnectDS4.bat");
}
}
int currentCustomLed;
private void EditCustomLed(object sender, EventArgs e)

View File

@ -184,9 +184,6 @@
<data name="tabControllers.Text" xml:space="preserve">
<value>Ovladače</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Připojit výhradně k DS4 (experimentální funkce)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1072, 94</value>
</data>

View File

@ -184,9 +184,6 @@
<data name="exitToolStripMenuItem.Text" xml:space="preserve">
<value>Beenden (Mittlere Maustaste)</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Verbinde den DS4 exklusiv (experimentell)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1071, 94</value>
</data>

View File

@ -181,9 +181,6 @@
<data name="tabControllers.Text" xml:space="preserve">
<value>Χειριστήρια</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Σύνδεσε το DS4 αποκλειστικά(δοκιμαστικό)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1076, 94</value>
</data>

View File

@ -628,9 +628,6 @@
<data name="cMCustomLed.Size" type="System.Drawing.Size, System.Drawing">
<value>197, 56</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Conectar DS4 exclusivamente (experimental)</value>
</data>
<data name="cBoxNotifications.Items" xml:space="preserve">
<value>Ninguna</value>
</data>

View File

@ -190,9 +190,6 @@
<data name="tabControllers.Text" xml:space="preserve">
<value>Ohjaimet</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Liitä vain DS4-ohjain (exclusive mode) (kokeellinen)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1074, 94</value>
</data>

View File

@ -199,9 +199,6 @@
<data name="cMTaskbar.Size" type="System.Drawing.Size, System.Drawing">
<value>287, 192</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Connecter DS4 exclusivement (expérimental)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1077, 94</value>
</data>

View File

@ -193,9 +193,6 @@
<data name="tabControllers.Text" xml:space="preserve">
<value>בקרים</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>התחבר ל-DS4 בלעדית (ניסיוני)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1084, 94</value>
</data>

View File

@ -181,9 +181,6 @@
<data name="tabControllers.Text" xml:space="preserve">
<value>Vezérlők</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>DS4 exkluzív csatlakoztatása (kísérleti)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1077, 94</value>
</data>

View File

@ -190,9 +190,6 @@
<data name="tabControllers.Text" xml:space="preserve">
<value>Controller</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Sambung secara khusus (eksperimental)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1070, 94</value>
</data>

View File

@ -604,9 +604,6 @@
<data name="tabLog.Text" xml:space="preserve">
<value>Registro</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Connetti Solo DS4 (sperimentale)</value>
</data>
<data name="cBoxNotifications.Items" xml:space="preserve">
<value>Nessuno</value>
</data>

View File

@ -144,9 +144,6 @@
<data name="btnClear.Text" xml:space="preserve">
<value>삭제</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>DS4 만 연결하기 ( 실험버전 )</value>
</data>
<data name="btnStartStop.Text" xml:space="preserve">
<value>시작</value>
</data>

View File

@ -187,9 +187,6 @@
<data name="exitToolStripMenuItem.Text" xml:space="preserve">
<value>Sluiten (Scroll klik)</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Alleen de DS4 Controller Aansluiten (experimenteel)</value>
</data>
<data name="pBStatus1.Location" type="System.Drawing.Point, System.Drawing">
<value>483, 26</value>
</data>

View File

@ -190,9 +190,6 @@
<data name="tabControllers.Text" xml:space="preserve">
<value>Kontrolery</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Podłącz kontroler DS4 na wyłączność (eksperymentalne)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1085, 94</value>
</data>

View File

@ -187,9 +187,6 @@
<data name="cMTaskbar.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 192</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Conectar exclusivamente o DS4 (experimental)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1038, 94</value>
</data>

File diff suppressed because it is too large Load Diff

View File

@ -6368,9 +6368,6 @@
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Особое подключение DS4 (экспериментально, для Windows 10 и выше)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1085, 94</value>
</data>

View File

@ -196,9 +196,6 @@
<data name="tabControllers.Text" xml:space="preserve">
<value>Krmilniki</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Poveži izključno z DS4</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1079, 94</value>
</data>

View File

@ -141,9 +141,6 @@
<data name="cMTaskbar.ToolTip" xml:space="preserve">
<value />
</data>
<data name="btnConnectDS4Win10.ToolTip" xml:space="preserve">
<value />
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1083, 94</value>

View File

@ -196,9 +196,6 @@
<data name="cMTaskbar.Size" type="System.Drawing.Size, System.Drawing">
<value>322, 192</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Ексклюзивне підключення DS4 (експерементальне)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1069, 94</value>
</data>

View File

@ -6362,9 +6362,6 @@
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>Kết nối DS4 qua cmd (thử nghiệm)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1083, 94</value>
</data>

View File

@ -6764,9 +6764,6 @@
<data name="tabLog.Text" xml:space="preserve">
<value>日志</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>仅连接DS4 (实验性功能)</value>
</data>
<data name="cBoxNotifications.Items" xml:space="preserve">
<value>不显示</value>
</data>

View File

@ -6362,9 +6362,6 @@
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
</value>
</data>
<data name="btnConnectDS4Win10.Text" xml:space="preserve">
<value>獨佔地連接 DS4 (實驗功能)</value>
</data>
<data name="bnLight3.Location" type="System.Drawing.Point, System.Drawing">
<value>1082, 94</value>
</data>

View File

@ -255,51 +255,66 @@
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.ar.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.cs.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.de-DE.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.el.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.es.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.fi.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.fr-FR.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.he.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.hu.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.id.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.it-IT.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.ja.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.ko.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.nl.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.pl.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.pt-BR.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
@ -309,27 +324,34 @@
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.ru-RU.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.sl.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.sv.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.tr.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.uk.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.vi.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.zh-Hans.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Form.zh-Hant.resx">
<DependentUpon>DS4Form.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DS4Forms\DS4Keyboard.resx">
<DependentUpon>DS4Keyboard.cs</DependentUpon>

View File

@ -2,6 +2,6 @@
* Integrate HidGuardian
* Experiment with ViGEm driver
* Remove button for older exclusive mode workaround
* ~~Remove button for older exclusive mode workaround~~
* ~~Test TabControl to contain isolated panels in Options~~