WinGui:

- New Message-box alert design. These include Warning, Information and Error Icons just like the standard windows alerts. Along with this, some of the messages have been changed slightly so should easier to understand now.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@630 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/Handbrake.suo b/win/Handbrake.suo
index 462476934c2d01b289137a9868973262b4091f7c..1d2a796856058306fc10d1454f177029b311b0c5 100644 (file)
Binary files a/win/Handbrake.suo and b/win/Handbrake.suo differ

diff --git a/win/Handbrake/frmMain.Designer.vb b/win/Handbrake/frmMain.Designer.vb
index bee414a92241a588d0d292d0a44bc78297029336..1b9ed441d3a5ba802b0fc5fd80bfbeb250faec49 100644 (file)
--- a/win/Handbrake/frmMain.Designer.vb
+++ b/win/Handbrake/frmMain.Designer.vb
@@ -2314,7 +2314,7 @@ Partial Class frmMain
         Me.lbl_update.AutoSize = True\r
         Me.lbl_update.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.lbl_update.ForeColor = System.Drawing.Color.Black\r
-        Me.lbl_update.Location = New System.Drawing.Point(218, 607)\r
+        Me.lbl_update.Location = New System.Drawing.Point(176, 607)\r
         Me.lbl_update.Name = "lbl_update"\r
         Me.lbl_update.Size = New System.Drawing.Size(181, 13)\r
         Me.lbl_update.TabIndex = 413\r

diff --git a/win/Handbrake/frmMain.vb b/win/Handbrake/frmMain.vb
index 2feeb2c669c37c84c4564f7896affbf4c091dd96..e528c0f2414bea3f5f6df66c1819b7c96a85923a 100644 (file)
--- a/win/Handbrake/frmMain.vb
+++ b/win/Handbrake/frmMain.vb
@@ -189,9 +189,9 @@ Public Class frmMain
                 StreamWriter.WriteLine(CRF)\r
                 StreamWriter.WriteLine(advH264)\r
                 StreamWriter.Close()\r
-                MessageBox.Show("STATUS: Your profile has been sucessfully saved.")\r
+                MessageBox.Show("Your profile has been sucessfully saved.", "STATUS", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)\r
             Catch\r
-                MessageBox.Show("ERROR: Unable to write to the file. Please make sure the location has the correct permissions for file writing.")\r
+                MessageBox.Show("Unable to write to the file. Please make sure the location has the correct permissions for file writing.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
             End Try\r
         End If\r
     End Sub\r
@@ -243,7 +243,7 @@ Public Class frmMain
                 SliderValue.Text = slider_videoQuality.Value & "%"\r
 \r
             Catch ex As Exception\r
-                MessageBox.Show("ERROR: Unable to load profile.")\r
+                MessageBox.Show("Unable to load profile.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
             End Try\r
         End If\r
 \r
@@ -450,7 +450,7 @@ Public Class frmMain
                 lAvailableSpace = Drv.AvailableSpace\r
                 lAvailableSpace = lAvailableSpace / 1024 / 1024 / 1024\r
                 If lAvailableSpace < 4 Then\r
-                    MessageBox.Show("Warning: Low on Disk Space. There is: " & lAvailableSpace & "GB Available")\r
+                    MessageBox.Show("Low on Disk Space. There is: " & lAvailableSpace & "GB Available", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
                 End If\r
 \r
                 Dim lTotalSpace As Long\r
@@ -497,14 +497,14 @@ Public Class frmMain
         Dim ApplicationPath As String = Application.StartupPath\r
 \r
         If (frmQueue.list_queue.Items.Count > 0) Then\r
-            MessageBox.Show("ALERT: You have items on the video queue. If you wish to run the queue, click the Enocde Videos button on the Queue window.")\r
+            MessageBox.Show("You have items on the video queue. If you wish to run the queue, click the Enocde Videos button on the Queue window.", "ALERT", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)\r
         End If\r
 \r
         Try\r
             If (QueryEditorText.Text = "") Then\r
                 query = GenerateTheQuery()\r
                 Shell("""" + ApplicationPath + "\hbcli.exe""" + query)\r
-                MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.")\r
+                MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.", "ALERT", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)\r
 \r
                 'Lets start the process monitor to keep an eye on things.\r
                 hbcliMonitor = New ProcessMonitor()\r
@@ -513,7 +513,7 @@ Public Class frmMain
             Else\r
                 query = QueryEditorText.Text\r
                 Shell("""" + ApplicationPath + "\hbcli.exe""" + query)\r
-                MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.")\r
+                MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.", "ALERT", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)\r
             End If\r
         Catch ex As Exception\r
             MessageBox.Show("Unable to Launch the Encoder.")\r
@@ -538,7 +538,7 @@ Public Class frmMain
 \r
         Try\r
             If (chapterFinish < chapterStart) Then\r
-                MessageBox.Show("Error: Invalid Chapter Range! - Final chapter can not be smaller than the starting chapter.")\r
+                MessageBox.Show("Invalid Chapter Range! - Final chapter can not be smaller than the starting chapter.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
             End If\r
         Catch ex As Exception\r
             MessageBox.Show("Invalid Character Entered")\r
@@ -551,10 +551,10 @@ Public Class frmMain
 \r
         Try\r
             If (chapterStart > chapterFinish) Then\r
-                MessageBox.Show("Error: Invalid Chapter Range! - Start chapter can not be larger than the Final chapter.")\r
+                MessageBox.Show("Invalid Chapter Range! - Start chapter can not be larger than the Final chapter.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
             End If\r
         Catch ex As Exception\r
-            MessageBox.Show("Invalid Character Entered")\r
+            MessageBox.Show("Invalid Character Entered", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
         End Try\r
     End Sub\r
 \r
@@ -892,7 +892,7 @@ Public Class frmMain
 \r
 \r
         If (source = "") Then\r
-            MessageBox.Show("ERROR: No Source has been selected.")\r
+            MessageBox.Show("No Source has been selected.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
         Else\r
             source = " -i " + """" + source + """"\r
         End If\r
@@ -924,7 +924,7 @@ Public Class frmMain
         Dim height As String = text_height.Text\r
 \r
         If (destination = "") Then\r
-            MessageBox.Show("ERROR: No destination has been selected.")\r
+            MessageBox.Show("No destination has been selected.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
         Else\r
             destination = " -o " + """" + destination + """"\r
         End If\r
@@ -1192,7 +1192,8 @@ Public Class frmMain
     ' The hbcli processes has exited at this point. Lets throw a messagebox at the user telling him the enocode has completed.\r
     Sub TheadCompletedMonitor(ByVal isRunning As Integer) Handles hbcliMonitor.ThreadComplete\r
         Dim ApplicationPath As String = Application.StartupPath ' The applications start parth\r
-        MessageBox.Show("Status: The encoding process has ended.")\r
+        MessageBox.Show("The encoding process has ended.", "ALERT", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)\r
+\r
     End Sub\r
     '------------------------------------------------\r
 \r

diff --git a/win/Handbrake/frmReadDVD.vb b/win/Handbrake/frmReadDVD.vb
index b5a5cf1a3f8acc2dde83795a668e1c004fdb2148..0a46d0b22353e19c13e2df8fdbf4948f62782d70 100644 (file)
--- a/win/Handbrake/frmReadDVD.vb
+++ b/win/Handbrake/frmReadDVD.vb
@@ -16,7 +16,7 @@ Public Class frmReadDVD
         Try\r
             Shell("cmd /c """"" + ApplicationPath + "\hbcli.exe"" -i """ + frmMain.text_source.Text + """" & " -t0 >" + """" + ApplicationPath + "\dvdinfo.dat""" + " 2>&1""")\r
         Catch ex As Exception\r
-            MessageBox.Show("ERROR: There was a problem launching the encoder. Code: frmS-1")\r
+            MessageBox.Show("Unable to launch the CLI encoder.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
             MessageBox.Show(ex.ToString)\r
         End Try\r
     End Sub\r
@@ -184,11 +184,12 @@ Public Class frmReadDVD
         '# Stage 4 - Write the parsed data out into a file. \r
         '# But, if theres a problem, display an error message instead\r
         If errStatus = 1 Then\r
-            MessageBox.Show("ERROR: Error Reading the DVD. Some Title information may not be available.")\r
+            MessageBox.Show("Some DVD Title information may be missing however you may still be able to select your required title for encoding!", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)\r
         End If\r
 \r
         If titleError = True Then\r
-            MessageBox.Show("ERROR: No Title(s) found.")\r
+            MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
+\r
         End If\r
 \r
         Try\r
@@ -203,7 +204,7 @@ Public Class frmReadDVD
             DataWriter.Close()\r
 \r
         Catch ex As Exception\r
-            MessageBox.Show("ERROR: Unable to write Data file. Please make sure the application has admin privileges.")\r
+            MessageBox.Show("Unable to write Data file. Please make sure the application has admin privileges.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
         End Try\r
 \r
         Me.Close()\r
@@ -221,7 +222,7 @@ Public Class frmReadDVD
             str(1) = titleInfo(1).Trim.Substring(12) ' Duration\r
         Catch ex As Exception\r
             MessageBox.Show(ex.ToString)\r
-            MessageBox.Show("ERROR: Incomplete DVD data found. Please copy the data on the View DVD Information tab and report this error.")\r
+            MessageBox.Show("ERROR: Incomplete DVD data found. Please copy the data on the View DVD Information tab and report this error.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
         End Try\r
 \r
         'Now lets add the info to the main form dropdowns\r