Naming tweaks and exit confimation

PS2ModLauncher/AboutBox1.Designer.cs

@@ -53,7 +53,7 @@
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(328, 23);
             this.label1.TabIndex = 26;
-            this.label1.Text = "PlanetSide 1 Launcher";
+            this.label1.Text = "PS1 GameLauncher";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // label2
@@ -63,7 +63,7 @@
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(328, 23);
             this.label2.TabIndex = 27;
-            this.label2.Text = "Designed by Chord for PSEmu";
+            this.label2.Text = "Designed by Chord for PSForever";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.label2.Click += new System.EventHandler(this.label2_Click);
             // 
@@ -75,7 +75,7 @@
             this.linkLabel1.Size = new System.Drawing.Size(328, 22);
             this.linkLabel1.TabIndex = 28;
             this.linkLabel1.TabStop = true;
-            this.linkLabel1.Text = "http://www.planetside-universe.com/showthread.php?p=961247";
+            this.linkLabel1.Text = "http://psforever.net";
             this.linkLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
             // 
@@ -107,7 +107,7 @@
             this.ShowIcon = false;
             this.ShowInTaskbar = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "AboutBox1";
+            this.Text = "About PS1 GameLauncher";
             this.ResumeLayout(false);
 
         }

PS2ModLauncher/LauncherForm.Designer.cs

@@ -39,7 +39,6 @@
             this.usernameLabel = new System.Windows.Forms.Label();
             this.password = new System.Windows.Forms.TextBox();
             this.username = new System.Windows.Forms.TextBox();
-            this.loggingCheckBox = new System.Windows.Forms.CheckBox();
             this.label10 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.launchGame = new System.Windows.Forms.Button();
@@ -87,7 +86,6 @@
             this.splitContainer1.Panel1.Controls.Add(this.usernameLabel);
             this.splitContainer1.Panel1.Controls.Add(this.password);
             this.splitContainer1.Panel1.Controls.Add(this.username);
-            this.splitContainer1.Panel1.Controls.Add(this.loggingCheckBox);
             this.splitContainer1.Panel1.Controls.Add(this.label10);
             this.splitContainer1.Panel1.Controls.Add(this.label2);
             this.splitContainer1.Panel1.Controls.Add(this.launchGame);
@@ -177,18 +175,6 @@
             this.username.TabIndex = 0;
             this.username.TextChanged += new System.EventHandler(this.loginFormChanged);
             // 
-            // loggingCheckBox
-            // 
-            this.loggingCheckBox.AutoSize = true;
-            this.loggingCheckBox.Location = new System.Drawing.Point(205, 36);
-            this.loggingCheckBox.Name = "loggingCheckBox";
-            this.loggingCheckBox.Size = new System.Drawing.Size(64, 17);
-            this.loggingCheckBox.TabIndex = 15;
-            this.loggingCheckBox.Text = "Logging";
-            this.loggingCheckBox.UseVisualStyleBackColor = true;
-            this.loggingCheckBox.Visible = false;
-            this.loggingCheckBox.CheckedChanged += new System.EventHandler(this.loggingCheckBox_CheckedChanged);
-            // 
             // label10
             // 
             this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -329,7 +315,8 @@
             this.MainMenuStrip = this.menuStrip1;
             this.MinimumSize = new System.Drawing.Size(600, 350);
             this.Name = "LauncherForm";
-            this.Text = "Planetside 1 Launcher";
+            this.Text = "PS1 GameLauncher";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.LauncherForm_FormClosing);
             this.Load += new System.EventHandler(this.Form1_Load);
             this.ResizeBegin += new System.EventHandler(this.LauncherForm_ResizeBegin);
             this.ResizeEnd += new System.EventHandler(this.LauncherForm_ResizeEnd);
@@ -354,7 +341,6 @@
         #endregion
         private System.Windows.Forms.FolderBrowserDialog findPTRDirDialogue;
         private System.Windows.Forms.SplitContainer splitContainer1;
-        private System.Windows.Forms.CheckBox loggingCheckBox;
         private System.Windows.Forms.Label label10;
         private System.Windows.Forms.TextBox launchArgs;
         private System.Windows.Forms.Label label2;

PS2ModLauncher/LauncherForm.cs

@@ -37,6 +37,7 @@ namespace PSLauncher
         int DEFAULT_WEB_TIMEOUT = 5000;
         string planetsidePath = "";
         bool planetsidePathValid = false;
+        bool bGameRunning = false;
         GameState gameState = GameState.Stopped;
 
         LaunchDomain domain = LaunchDomain.Live;
@@ -66,7 +67,18 @@ namespace PSLauncher
 
             planetside2PathTextField.Text = Settings.Default.PSPath;
             launchArgs.Text = Settings.Default.ExtraArgs;
-            loggingCheckBox.Checked = Settings.Default.Logging;
+        }
+
+        private void LauncherForm_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (this.bGameRunning)
+            {
+                DialogResult res = MessageBox.Show( "Are you sure you want to exit while managing PlanetSide PID " + psProcess.Id + "?" +
+                    Environment.NewLine + "You won't see any debugging output if you do.", "Confirm exit", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
+
+                if (res == DialogResult.No)
+                    e.Cancel = true;
+            }
         }
 
         private void button1_Click(object sender, EventArgs e)
@@ -618,12 +630,14 @@ namespace PSLauncher
                 this.launchGame.Text = "Running";
             }
 
+            bGameRunning = true;
             gameState = GameState.Running;
         }
 
         void gameStopped()
         {
             this.stopLaunching();
+            bGameRunning = false;
         }
 
         void ps_Exited(object sender, EventArgs e)
@@ -694,11 +708,6 @@ namespace PSLauncher
             return Environment.GetEnvironmentVariable("ProgramFiles");
         }
 
-        private void loggingCheckBox_CheckedChanged(object sender, EventArgs e)
-        {
-            Settings.Default.Logging = loggingCheckBox.Checked;
-        }
-
         private void loginWebBrowser_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
         {
 

PS2ModLauncher/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("PSEmu LaunchPad")]
+[assembly: AssemblyTitle("PS1 GameLauncher")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("PSEmu")]
+[assembly: AssemblyCompany("PSForever")]
-[assembly: AssemblyProduct("PSEmu LaunchPad")]
+[assembly: AssemblyProduct("PS1 GameLauncher")]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.2")]
+[assembly: AssemblyVersion("1.0.0.3")]
-[assembly: AssemblyFileVersion("1.0.0.2")]
+[assembly: AssemblyFileVersion("1.0.0.3")]

PS2ModLauncher/Properties/Settings.Designer.cs

@@ -35,18 +35,6 @@ namespace PSLauncher.Properties {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool Logging {
-            get {
-                return ((bool)(this["Logging"]));
-            }
-            set {
-                this["Logging"] = value;
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("")]

PS2ModLauncher/Properties/Settings.settings

@@ -5,11 +5,8 @@
     <Setting Name="PSPath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="Logging" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
     <Setting Name="ExtraArgs" Type="System.String" Scope="User">
-      <Value Profile="(Default)">               </Value>
+      <Value Profile="(Default)" />
     </Setting>
   </Settings>
 </SettingsFile>

PS2ModLauncher/app.config

@@ -10,12 +10,8 @@
             <setting name="PSPath" serializeAs="String">
                 <value />
             </setting>
-            <setting name="Logging" serializeAs="String">
-                <value>False</value>
-            </setting>
             <setting name="ExtraArgs" serializeAs="String">
-                <value>
+                <value />
-                </value>
             </setting>
         </PSLauncher.Properties.Settings>
     </userSettings>