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

4 files changed, 21 insertions, 19 deletions

diff --git a/win/Handbrake.suo b/win/Handbrake.suo
index 462476934..1d2a79685 100644
--- a/win/Handbrake.suo
+++ b/win/Handbrake.suo
diff --git a/win/Handbrake/frmMain.Designer.vb b/win/Handbrake/frmMain.Designer.vb
index bee414a92..1b9ed441d 100644
--- a/win/Handbrake/frmMain.Designer.vb
+++ b/win/Handbrake/frmMain.Designer.vb
@@ -2314,7 +2314,7 @@ Partial Class frmMain
         Me.lbl_update.AutoSize = True

         Me.lbl_update.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))

         Me.lbl_update.ForeColor = System.Drawing.Color.Black

-        Me.lbl_update.Location = New System.Drawing.Point(218, 607)

+        Me.lbl_update.Location = New System.Drawing.Point(176, 607)

         Me.lbl_update.Name = "lbl_update"

         Me.lbl_update.Size = New System.Drawing.Size(181, 13)

         Me.lbl_update.TabIndex = 413

diff --git a/win/Handbrake/frmMain.vb b/win/Handbrake/frmMain.vb
index 2feeb2c66..e528c0f24 100644
--- a/win/Handbrake/frmMain.vb
+++ b/win/Handbrake/frmMain.vb
@@ -189,9 +189,9 @@ Public Class frmMain
                 StreamWriter.WriteLine(CRF)

                 StreamWriter.WriteLine(advH264)

                 StreamWriter.Close()

-                MessageBox.Show("STATUS: Your profile has been sucessfully saved.")

+                MessageBox.Show("Your profile has been sucessfully saved.", "STATUS", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)

             Catch

-                MessageBox.Show("ERROR: Unable to write to the file. Please make sure the location has the correct permissions for file writing.")

+                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)

             End Try

         End If

     End Sub

@@ -243,7 +243,7 @@ Public Class frmMain
                 SliderValue.Text = slider_videoQuality.Value & "%"

 

             Catch ex As Exception

-                MessageBox.Show("ERROR: Unable to load profile.")

+                MessageBox.Show("Unable to load profile.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)

             End Try

         End If

 

@@ -450,7 +450,7 @@ Public Class frmMain
                 lAvailableSpace = Drv.AvailableSpace

                 lAvailableSpace = lAvailableSpace / 1024 / 1024 / 1024

                 If lAvailableSpace < 4 Then

-                    MessageBox.Show("Warning: Low on Disk Space. There is: " & lAvailableSpace & "GB Available")

+                    MessageBox.Show("Low on Disk Space. There is: " & lAvailableSpace & "GB Available", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)

                 End If

 

                 Dim lTotalSpace As Long

@@ -497,14 +497,14 @@ Public Class frmMain
         Dim ApplicationPath As String = Application.StartupPath

 

         If (frmQueue.list_queue.Items.Count > 0) Then

-            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.")

+            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)

         End If

 

         Try

             If (QueryEditorText.Text = "") Then

                 query = GenerateTheQuery()

                 Shell("""" + ApplicationPath + "\hbcli.exe""" + query)

-                MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.")

+                MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.", "ALERT", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)

 

                 'Lets start the process monitor to keep an eye on things.

                 hbcliMonitor = New ProcessMonitor()

@@ -513,7 +513,7 @@ Public Class frmMain
             Else

                 query = QueryEditorText.Text

                 Shell("""" + ApplicationPath + "\hbcli.exe""" + query)

-                MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.")

+                MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.", "ALERT", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)

             End If

         Catch ex As Exception

             MessageBox.Show("Unable to Launch the Encoder.")

@@ -538,7 +538,7 @@ Public Class frmMain
 

         Try

             If (chapterFinish < chapterStart) Then

-                MessageBox.Show("Error: Invalid Chapter Range! - Final chapter can not be smaller than the starting chapter.")

+                MessageBox.Show("Invalid Chapter Range! - Final chapter can not be smaller than the starting chapter.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)

             End If

         Catch ex As Exception

             MessageBox.Show("Invalid Character Entered")

@@ -551,10 +551,10 @@ Public Class frmMain
 

         Try

             If (chapterStart > chapterFinish) Then

-                MessageBox.Show("Error: Invalid Chapter Range! - Start chapter can not be larger than the Final chapter.")

+                MessageBox.Show("Invalid Chapter Range! - Start chapter can not be larger than the Final chapter.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)

             End If

         Catch ex As Exception

-            MessageBox.Show("Invalid Character Entered")

+            MessageBox.Show("Invalid Character Entered", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)

         End Try

     End Sub

 

@@ -892,7 +892,7 @@ Public Class frmMain
 

 

         If (source = "") Then

-            MessageBox.Show("ERROR: No Source has been selected.")

+            MessageBox.Show("No Source has been selected.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)

         Else

             source = " -i " + """" + source + """"

         End If

@@ -924,7 +924,7 @@ Public Class frmMain
         Dim height As String = text_height.Text

 

         If (destination = "") Then

-            MessageBox.Show("ERROR: No destination has been selected.")

+            MessageBox.Show("No destination has been selected.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)

         Else

             destination = " -o " + """" + destination + """"

         End If

@@ -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.

     Sub TheadCompletedMonitor(ByVal isRunning As Integer) Handles hbcliMonitor.ThreadComplete

         Dim ApplicationPath As String = Application.StartupPath ' The applications start parth

-        MessageBox.Show("Status: The encoding process has ended.")

+        MessageBox.Show("The encoding process has ended.", "ALERT", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)

+

     End Sub

     '------------------------------------------------

 

diff --git a/win/Handbrake/frmReadDVD.vb b/win/Handbrake/frmReadDVD.vb
index b5a5cf1a3..0a46d0b22 100644
--- a/win/Handbrake/frmReadDVD.vb
+++ b/win/Handbrake/frmReadDVD.vb
@@ -16,7 +16,7 @@ Public Class frmReadDVD
         Try

             Shell("cmd /c """"" + ApplicationPath + "\hbcli.exe"" -i """ + frmMain.text_source.Text + """" & " -t0 >" + """" + ApplicationPath + "\dvdinfo.dat""" + " 2>&1""")

         Catch ex As Exception

-            MessageBox.Show("ERROR: There was a problem launching the encoder. Code: frmS-1")

+            MessageBox.Show("Unable to launch the CLI encoder.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)

             MessageBox.Show(ex.ToString)

         End Try

     End Sub

@@ -184,11 +184,12 @@ Public Class frmReadDVD
         '# Stage 4 - Write the parsed data out into a file. 

         '# But, if theres a problem, display an error message instead

         If errStatus = 1 Then

-            MessageBox.Show("ERROR: Error Reading the DVD. Some Title information may not be available.")

+            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)

         End If

 

         If titleError = True Then

-            MessageBox.Show("ERROR: No Title(s) found.")

+            MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)

+

         End If

 

         Try

@@ -203,7 +204,7 @@ Public Class frmReadDVD
             DataWriter.Close()

 

         Catch ex As Exception

-            MessageBox.Show("ERROR: Unable to write Data file. Please make sure the application has admin privileges.")

+            MessageBox.Show("Unable to write Data file. Please make sure the application has admin privileges.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)

         End Try

 

         Me.Close()

@@ -221,7 +222,7 @@ Public Class frmReadDVD
             str(1) = titleInfo(1).Trim.Substring(12) ' Duration

         Catch ex As Exception

             MessageBox.Show(ex.ToString)

-            MessageBox.Show("ERROR: Incomplete DVD data found. Please copy the data on the View DVD Information tab and report this error.")

+            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)

         End Try

 

         'Now lets add the info to the main form dropdowns