WinGui:

- Got rid of the DVD info window. DVD information can now be read from the activity window.
- Removed some unused code calls to frmDvdInfo.
- Changed frmActivityWindow design, removed all buttons, text window now expands as the window size grows. Basically, the window is identical to the MacGUI window now.

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

1 files changed, 5 insertions, 7 deletions

diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index 4c62658f6..d825d1c56 100644
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -23,16 +23,14 @@ namespace Handbrake
     {

         private string inputFile;

         private frmMain mainWindow;

-        private frmDvdInfo dvdInfo;

         private Parsing.DVD thisDvd;

         private delegate void UpdateUIHandler();

 

-        public frmReadDVD(string inputFile, frmMain parent, frmDvdInfo dvdInfoWindow)

+        public frmReadDVD(string inputFile, frmMain parent)

         {

             InitializeComponent();

             this.inputFile = inputFile;

             this.mainWindow = parent;

-            this.dvdInfo = dvdInfoWindow;

             startScan();

 

         }

@@ -100,11 +98,9 @@ namespace Handbrake
                             }

                         }

                     }

-            

                 }

 

-

-                    mainWindow.drp_dvdtitle.SelectedItem = title2Select;

+                mainWindow.drp_dvdtitle.SelectedItem = title2Select;

 

                 this.Close();

             }

@@ -136,7 +132,7 @@ namespace Handbrake
                 {

                     hbproc.WaitForExit();

                     // TODO: Verify exit code if the CLI supports it properly

-                } 

+                }

 

                 if (!File.Exists(dvdInfoPath))

                 {

@@ -146,6 +142,8 @@ namespace Handbrake
                 using (StreamReader sr = new StreamReader(dvdInfoPath))

                 {

                     thisDvd = Parsing.DVD.Parse(sr);

+                    sr.Close();

+                    sr.Dispose();

                 }

 

                 updateUIElements();