The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-02-03 10:32:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'JarnoVgr-trayChanges' into jay

Browse Source
This commit is contained in:
Travis Nickles 2018-12-28 02:09:55 -06:00
commit aa6fa36fae
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -183,6 +183,7 @@ namespace DS4Windows
cBUseWhiteIcon.Checked = UseWhiteIcon;
Icon = Properties.Resources.DS4W;
notifyIcon1.Icon = UseWhiteIcon ? Properties.Resources.DS4W___White : Properties.Resources.DS4W;
populateNotifyText();
foreach (ToolStripMenuItem t in shortcuts)
t.DropDownItemClicked += Profile_Changed_Menu;
@ -1163,7 +1164,7 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
string temp = Program.rootHub.getShortDS4ControllerInfo(i);
if (temp != Properties.Resources.NoneText)
{
notifyText[i + 1] = (i + 1) + ": " + temp; // Carefully stay under the 63 character limit.
notifyText[i + 1] = (i + 1) + ": " + temp;
}
else
{
@ -1179,7 +1180,7 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
string temp = Program.rootHub.getShortDS4ControllerInfo(index);
if (temp != Properties.Resources.NoneText)
{
notifyText[index + 1] = (index + 1) + ": " + temp; // Carefully stay under the 63 character limit.
notifyText[index + 1] = (index + 1) + ": " + temp;
}
else
{
@ -1195,14 +1196,11 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
string temp = notifyText[i];
if (!string.IsNullOrEmpty(temp))
{
tooltip += "\n" + notifyText[i]; // Carefully stay under the 63 character limit.
tooltip += "\n" + notifyText[i];
}
}
if (tooltip.Length > 63)
notifyIcon1.Text = tooltip.Substring(0, 63);
else
notifyIcon1.Text = tooltip;
notifyIcon1.Text = tooltip.Length > 63 ? tooltip.Substring(0, 63) : tooltip; // Carefully stay under the 63 character limit.
}
protected void DeviceSerialChanged(object sender, SerialChangeArgs args)

2
DS4Windows/DS4Forms/DS4Form.resx
View File

@ -418,7 +418,7 @@
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="notifyIcon1.Text" xml:space="preserve">
<value>DS4 Xinput Tool</value>
<value>DS4Windows</value>
</data>
<data name="notifyIcon1.Visible" type="System.Boolean, mscorlib">
<value>True</value>