Merge branch 'Sander0542-customSteamFolder' into jay

DS4Windows/DS4Control/ScpUtil.cs

@@ -624,6 +624,18 @@ namespace DS4Windows
             get { return m_Config.useWhiteIcon; }
         }
 
+        public static bool UseCustomSteamFolder
+        {
+            set { m_Config.useCustomSteamFolder = value; }
+            get { return m_Config.useCustomSteamFolder; }
+        }
+
+        public static string CustomSteamFolder
+        {
+            set { m_Config.customSteamFolder = value; }
+            get { return m_Config.customSteamFolder; }
+        }
+
         // controller/profile specfic values
         public static int[] ButtonMouseSensitivity => m_Config.buttonMouseSensitivity;
 
@@ -1617,6 +1629,8 @@ namespace DS4Windows
         public int flashWhenLateAt = 20;
         public bool useUDPServ = false;
         public int udpServPort = 26760;
+        public bool useCustomSteamFolder;
+        public string customSteamFolder;
         // Cache whether profile has custom action
         public bool[] containsCustomAction = new bool[5] { false, false, false, false, false };
 
@@ -3206,6 +3220,10 @@ namespace DS4Windows
                     catch { missingSetting = true; }
                     try { Item = m_Xdoc.SelectSingleNode("/Profile/UDPServerPort"); int temp; int.TryParse(Item.InnerText, out temp); udpServPort = Math.Min(Math.Max(temp, 1024), 65535); }
                     catch { missingSetting = true; }
+                    try { Item = m_Xdoc.SelectSingleNode("/Profile/UseCustomSteamFolder"); Boolean.TryParse(Item.InnerText, out useCustomSteamFolder); }
+                    catch { missingSetting = true; }
+                    try { Item = m_Xdoc.SelectSingleNode("/Profile/CustomSteamFolder"); customSteamFolder = Item.InnerText; }
+                    catch { missingSetting = true; }
 
                     for (int i = 0; i < 4; i++)
                     {
@@ -3275,6 +3293,8 @@ namespace DS4Windows
             XmlNode xmlWhiteIcon = m_Xdoc.CreateNode(XmlNodeType.Element, "WhiteIcon", null); xmlWhiteIcon.InnerText = useWhiteIcon.ToString(); Node.AppendChild(xmlWhiteIcon);
             XmlNode xmlUseUDPServ = m_Xdoc.CreateNode(XmlNodeType.Element, "UseUDPServer", null); xmlUseUDPServ.InnerText = useUDPServ.ToString(); Node.AppendChild(xmlUseUDPServ);
             XmlNode xmlUDPServPort = m_Xdoc.CreateNode(XmlNodeType.Element, "UDPServerPort", null); xmlUDPServPort.InnerText = udpServPort.ToString(); Node.AppendChild(xmlUDPServPort);
+            XmlNode xmlUseCustomSteamFolder = m_Xdoc.CreateNode(XmlNodeType.Element, "UseCustomSteamFolder", null); xmlUseCustomSteamFolder.InnerText = useCustomSteamFolder.ToString(); Node.AppendChild(xmlUseCustomSteamFolder);
+            XmlNode xmlCustomSteamFolder = m_Xdoc.CreateNode(XmlNodeType.Element, "CustomSteamFolder", null); xmlCustomSteamFolder.InnerText = customSteamFolder; Node.AppendChild(xmlCustomSteamFolder);
 
             for (int i = 0; i < 4; i++)
             {

DS4Windows/DS4Forms/DS4Form.Designer.cs

@@ -155,6 +155,8 @@
             this.ckUdpServ = new System.Windows.Forms.CheckBox();
             this.nUDUdpPortNum = new System.Windows.Forms.NumericUpDown();
             this.languagePackComboBox1 = new DS4Windows.DS4Forms.LanguagePackComboBox();
+            this.cBCustomSteam = new System.Windows.Forms.CheckBox();
+            this.tBSteamFolder = new System.Windows.Forms.TextBox();
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
             this.linkProfiles = new System.Windows.Forms.LinkLabel();
             this.lnkControllers = new System.Windows.Forms.LinkLabel();
@@ -954,6 +956,8 @@
             this.fLPSettings.Controls.Add(this.pNUpdate);
             this.fLPSettings.Controls.Add(this.panel4);
             this.fLPSettings.Controls.Add(this.languagePackComboBox1);
+            this.fLPSettings.Controls.Add(this.cBCustomSteam);
+            this.fLPSettings.Controls.Add(this.tBSteamFolder);
             this.fLPSettings.Controls.Add(this.flowLayoutPanel1);
             this.fLPSettings.Name = "fLPSettings";
             // 
@@ -1211,6 +1215,19 @@
             this.languagePackComboBox1.Name = "languagePackComboBox1";
             this.languagePackComboBox1.SelectedValueChanged += new System.EventHandler(this.languagePackComboBox1_SelectedValueChanged);
             // 
+            // cBCustomSteam
+            // 
+            resources.ApplyResources(this.cBCustomSteam, "cBCustomSteam");
+            this.cBCustomSteam.Name = "cBCustomSteam";
+            this.cBCustomSteam.UseVisualStyleBackColor = false;
+            this.cBCustomSteam.CheckedChanged += new System.EventHandler(this.cBCustomSteam_CheckedChanged);
+            // 
+            // tBSteamFolder
+            // 
+            resources.ApplyResources(this.tBSteamFolder, "tBSteamFolder");
+            this.tBSteamFolder.Name = "tBSteamFolder";
+            this.tBSteamFolder.TextChanged += new System.EventHandler(this.tBSteamFolder_TextChanged);
+            // 
             // flowLayoutPanel1
             // 
             this.flowLayoutPanel1.BackColor = System.Drawing.SystemColors.Window;
@@ -1513,6 +1530,8 @@
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.CheckBox ckUdpServ;
         private System.Windows.Forms.NumericUpDown nUDUdpPortNum;
+        private System.Windows.Forms.CheckBox cBCustomSteam;
+        private System.Windows.Forms.TextBox tBSteamFolder;
         //private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
     }
 }

DS4Windows/DS4Forms/DS4Form.cs

@@ -199,6 +199,8 @@ namespace DS4Windows
 
             cBDisconnectBT.Checked = DCBTatStop;
             cBQuickCharge.Checked = QuickCharge;
+            cBCustomSteam.Checked = UseCustomSteamFolder;
+            tBSteamFolder.Text = CustomSteamFolder;
             // New settings
             this.Width = FormWidth;
             this.Height = FormHeight;
@@ -2035,6 +2037,17 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
             }
         }
 
+        private void cBCustomSteam_CheckedChanged(object sender, EventArgs e)
+        {
+            UseCustomSteamFolder = cBCustomSteam.Checked;
+            tBSteamFolder.Enabled = cBCustomSteam.Checked;
+        }
+
+        private void tBSteamFolder_TextChanged(object sender, EventArgs e)
+        {
+            CustomSteamFolder = tBSteamFolder.Text;
+        }
+
         private void nUDUpdateTime_ValueChanged(object sender, EventArgs e)
         {
             int currentIndex = cBUpdateTime.SelectedIndex;

DS4Windows/DS4Forms/DS4Form.resx

@@ -2832,6 +2832,63 @@
   <data name="&gt;&gt;languagePackComboBox1.ZOrder" xml:space="preserve">
     <value>15</value>
   </data>
+  <data name="cBCustomSteam.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="cBCustomSteam.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="cBCustomSteam.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="cBCustomSteam.Location" type="System.Drawing.Point, System.Drawing">
+    <value>274, 144</value>
+  </data>
+  <data name="cBCustomSteam.Size" type="System.Drawing.Size, System.Drawing">
+    <value>147, 17</value>
+  </data>
+  <data name="cBCustomSteam.TabIndex" type="System.Int32, mscorlib">
+    <value>65</value>
+  </data>
+  <data name="cBCustomSteam.Text" xml:space="preserve">
+    <value>Use custom Steam Folder</value>
+  </data>
+  <data name="&gt;&gt;cBCustomSteam.Name" xml:space="preserve">
+    <value>cBCustomSteam</value>
+  </data>
+  <data name="&gt;&gt;cBCustomSteam.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cBCustomSteam.Parent" xml:space="preserve">
+    <value>fLPSettings</value>
+  </data>
+  <data name="&gt;&gt;cBCustomSteam.ZOrder" xml:space="preserve">
+    <value>16</value>
+  </data>
+  <data name="tBSteamFolder.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="tBSteamFolder.Location" type="System.Drawing.Point, System.Drawing">
+    <value>274, 167</value>
+  </data>
+  <data name="tBSteamFolder.Size" type="System.Drawing.Size, System.Drawing">
+    <value>260, 20</value>
+  </data>
+  <data name="tBSteamFolder.TabIndex" type="System.Int32, mscorlib">
+    <value>53</value>
+  </data>
+  <data name="&gt;&gt;tBSteamFolder.Name" xml:space="preserve">
+    <value>tBSteamFolder</value>
+  </data>
+  <data name="&gt;&gt;tBSteamFolder.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tBSteamFolder.Parent" xml:space="preserve">
+    <value>fLPSettings</value>
+  </data>
+  <data name="&gt;&gt;tBSteamFolder.ZOrder" xml:space="preserve">
+    <value>17</value>
+  </data>
   <data name="linkProfiles.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>

DS4Windows/DS4Forms/WinProgs.cs

@@ -10,6 +10,7 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using System.Diagnostics;
 using System.Threading.Tasks;
+using static DS4Windows.Global;
 
 namespace DS4Windows
 {
@@ -25,13 +26,22 @@ namespace DS4Windows
         List<string> programpaths = new List<string>();
         List<string> lodsf = new List<string>();
         bool appsloaded = false;
-        const string steamCommx86Loc = @"C:\Program Files (x86)\Steam\steamapps\common";
+        public const string steamCommx86Loc = @"C:\Program Files (x86)\Steam\steamapps\common";
-        const string steamCommLoc = @"C:\Program Files\Steam\steamapps\common";
+        public const string steamCommLoc = @"C:\Program Files\Steam\steamapps\common";
         const string originx86Loc = @"C:\Program Files (x86)\Origin Games";
         const string originLoc = @"C:\Program Files\Origin Games";
 
         public WinProgs(string[] oc, DS4Form main)
         {
+            Global.FindConfigLocation();
+
+            if (Global.firstRun)
+            {
+                new SaveWhere(Global.multisavespots).ShowDialog();
+            }
+
+            Global.Load();
+
             InitializeComponent();
             openProgram.Filter =  Properties.Resources.Programs+"|*.exe|" + Properties.Resources.Shortcuts + "|*.lnk";
             form = main;
@@ -48,7 +58,9 @@ namespace DS4Windows
 
             LoadP();
 
-            if (Directory.Exists(steamCommx86Loc))
+            if (UseCustomSteamFolder && Directory.Exists(CustomSteamFolder))
+                steamgamesdir = CustomSteamFolder;
+            else if (Directory.Exists(steamCommx86Loc))
                 steamgamesdir = steamCommx86Loc;
             else if (Directory.Exists(steamCommLoc))
                 steamgamesdir = steamCommLoc;