WinGui:

- Improved some error messages.
- Updated Installer Script

git-svn-id: svn://localhost/HandBrake/trunk@2755 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 9f1667c..9cd0c74 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -78,6 +78,8 @@
     <PlatformTarget>x86</PlatformTarget>\r
     <OutputPath>bin\x86\Release\</OutputPath>\r
     <UseVSHostingProcess>false</UseVSHostingProcess>\r
+    <DefineConstants>TRACE;DEBUG</DefineConstants>\r
+    <Optimize>true</Optimize>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Build|AnyCPU' ">\r
     <OutputPath>bin\Build\</OutputPath>\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index dd612e2..584764f 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -157,7 +157,7 @@ namespace Handbrake
             catch (Exception ex)\r
             {\r
                 if ((bool)result.AsyncState)\r
-                    MessageBox.Show("Unable to check for updates, Please try again later. \n" + ex, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                    MessageBox.Show("Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
         }\r
 \r
@@ -279,7 +279,7 @@ namespace Handbrake
                 if (fileList[0].StartsWith("\\"))\r
                 {\r
                     MessageBox.Show(\r
-                        "Sorry, HandBrake does not support UNC file paths. \nTry mounting the share as a network drive in My Computer",\r
+                        "Sorry, HandBrake does not support UNC file paths. \nTry mounting the network share as a network drive in My Computer",\r
                         "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
                     UpdateSourceLabel();\r
                 }\r
@@ -451,7 +451,7 @@ namespace Handbrake
             catch (Exception ex)\r
             {\r
                 if ((bool)result.AsyncState)\r
-                    MessageBox.Show("Unable to check for updates, Please try again later. \n" + ex, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                    MessageBox.Show("Unable to check for updates, Please try again later.\n\nDetailed Error Information:\n" + ex, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
             }\r
         }\r
         private void mnu_about_Click(object sender, EventArgs e)\r
@@ -935,7 +935,7 @@ namespace Handbrake
                 if (autoPath != null)\r
                     text_destination.Text = autoPath;\r
                 else\r
-                    MessageBox.Show("You currently have automatic file naming enabled for the destination box, but you do not have a default direcotry set. You should set this in the program options (see Tools Menu)", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+                    MessageBox.Show("You currently have \"Automatically name output files\" enabled for the destination file box, but you do not have a default direcotry set.\n\nYou should set a \"Default Path\" in HandBrakes preferences. (See 'Tools' menu -> 'Options' -> 'General' Tab -> 'Default Path')", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             }\r
 \r
             data_chpt.Rows.Clear();\r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 231a23d..ec7065e 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -404,7 +404,8 @@ namespace Handbrake
             this.text_an_path.Name = "text_an_path";\r
             this.text_an_path.Size = new System.Drawing.Size(293, 21);\r
             this.text_an_path.TabIndex = 76;\r
-            this.ToolTip.SetToolTip(this.text_an_path, "The default location where auto named files are stored.");\r
+            this.ToolTip.SetToolTip(this.text_an_path, "This is the default location where your encoded files will be stored if \"Automati" +\r
+                    "cally name output files\" is enabled.");\r
             this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged);\r
             // \r
             // label10\r

diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx
index 427cdd9..139d824 100644 (file)
--- a/win/C#/frmOptions.resx
+++ b/win/C#/frmOptions.resx
@@ -120,9 +120,6 @@
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>132, 18</value>\r
   </metadata>\r
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>132, 18</value>\r
-  </metadata>\r
   <metadata name="pathFinder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>17, 17</value>\r
   </metadata>\r