Index: core/details/mux/baseMuxWindow.cs =================================================================== --- core/details/mux/baseMuxWindow.cs (revision 385) +++ core/details/mux/baseMuxWindow.cs (working copy) @@ -48,7 +48,6 @@ private MeGUISettings settings; // private int lastSubtitle = 0; protected Label videoInputLabel; - protected OpenFileDialog openFileDialog; protected Button muxButton; protected Label MuxFPSLabel; protected Label chaptersInputLabel; @@ -210,7 +209,6 @@ this.splitting = new MeGUI.core.gui.TargetSizeSCBox(); this.output = new MeGUI.FileBar(); this.muxedOutputLabel = new System.Windows.Forms.Label(); - this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); this.cancelButton = new System.Windows.Forms.Button(); this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); this.audioPanel = new System.Windows.Forms.Panel(); Index: core/details/mux/baseMuxWindow.resx =================================================================== --- core/details/mux/baseMuxWindow.resx (revision 385) +++ core/details/mux/baseMuxWindow.resx (working copy) @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - 141, 17 Index: core/gui/FileBar.cs =================================================================== --- core/gui/FileBar.cs (revision 385) +++ core/gui/FileBar.cs (working copy) @@ -86,14 +86,26 @@ } else { - FileDialog dialog = saveMode ? - (FileDialog)new SaveFileDialog() : - (FileDialog)new OpenFileDialog(); + if (saveMode) + { + FileDialog dialog = new SaveFileDialog(); + /* (FileDialog)new SaveFileDialog() : + (FileDialog)new OpenFileDialog();*/ - dialog.Filter = filter; - dialog.Title = title; - if (dialog.ShowDialog() == DialogResult.OK) - setFilename(dialog.FileName); + dialog.Filter = filter; + dialog.Title = title; + if (dialog.ShowDialog() == DialogResult.OK) + setFilename(dialog.FileName); + } + else + { + CmdOpenFileDialog dialog = new CmdOpenFileDialog(); + dialog.Filter = filter; + dialog.Title = title; + if (dialog.ShowDialog() == DialogResult.OK) + setFilename(dialog.FileName); + + } } } Index: core/gui/FileSCBox.cs =================================================================== --- core/gui/FileSCBox.cs (revision 385) +++ core/gui/FileSCBox.cs (working copy) @@ -13,7 +13,7 @@ base.Getter = new Getter(getter); } - OpenFileDialog ofd = new OpenFileDialog(); + CmdOpenFileDialog ofd = new CmdOpenFileDialog(); private object getter() { Index: core/gui/Form1.cs =================================================================== --- core/gui/Form1.cs (revision 385) +++ core/gui/Form1.cs (working copy) @@ -67,7 +67,6 @@ private System.Windows.Forms.MenuItem mnuFile; private System.Windows.Forms.MenuItem mnuFileExit; private System.Windows.Forms.MenuItem mnuTools; - private System.Windows.Forms.OpenFileDialog openFileDialog; private System.Windows.Forms.SaveFileDialog saveFileDialog; private System.Windows.Forms.MenuItem mnuView; private System.Windows.Forms.MenuItem progressMenu; @@ -165,7 +164,11 @@ this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); this.autoEncodeButton = new System.Windows.Forms.Button(); this.resetButton = new System.Windows.Forms.Button(); + this.helpButton1 = new MeGUI.core.gui.HelpButton(); + this.audioEncodingComponent1 = new MeGUI.AudioEncodingComponent(); + this.videoEncodingComponent1 = new MeGUI.VideoEncodingComponent(); this.tabPage2 = new System.Windows.Forms.TabPage(); + this.jobControl1 = new MeGUI.core.details.JobControl(); this.logTab = new System.Windows.Forms.TabPage(); this.logTree1 = new MeGUI.core.gui.LogTree(); this.mnuMuxers = new System.Windows.Forms.MenuItem(); @@ -204,17 +207,12 @@ this.mnuForum = new System.Windows.Forms.MenuItem(); this.mnuBugTracker = new System.Windows.Forms.MenuItem(); this.mnuFeaturesReq = new System.Windows.Forms.MenuItem(); - this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); this.trayIcon = new System.Windows.Forms.NotifyIcon(this.components); this.trayMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.openMeGUIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.exitMeGUIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.helpButton1 = new MeGUI.core.gui.HelpButton(); - this.audioEncodingComponent1 = new MeGUI.AudioEncodingComponent(); - this.videoEncodingComponent1 = new MeGUI.VideoEncodingComponent(); - this.jobControl1 = new MeGUI.core.details.JobControl(); this.tabControl1.SuspendLayout(); this.inputTab.SuspendLayout(); this.flowLayoutPanel2.SuspendLayout(); @@ -232,7 +230,7 @@ this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(508, 464); + this.tabControl1.Size = new System.Drawing.Size(508, 466); this.tabControl1.TabIndex = 0; // // inputTab @@ -243,7 +241,7 @@ this.inputTab.Controls.Add(this.videoEncodingComponent1); this.inputTab.Location = new System.Drawing.Point(4, 22); this.inputTab.Name = "inputTab"; - this.inputTab.Size = new System.Drawing.Size(500, 438); + this.inputTab.Size = new System.Drawing.Size(500, 440); this.inputTab.TabIndex = 0; this.inputTab.Text = "Input"; this.inputTab.UseVisualStyleBackColor = true; @@ -257,7 +255,7 @@ this.flowLayoutPanel2.Controls.Add(this.helpButton1); this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom; this.flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; - this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 409); + this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 411); this.flowLayoutPanel2.Name = "flowLayoutPanel2"; this.flowLayoutPanel2.Size = new System.Drawing.Size(500, 29); this.flowLayoutPanel2.TabIndex = 2; @@ -288,22 +286,65 @@ this.resetButton.Text = "Reset"; this.resetButton.Click += new System.EventHandler(this.resetButton_Click); // + // helpButton1 + // + this.helpButton1.ArticleName = "Main window#Input"; + this.helpButton1.AutoSize = true; + this.helpButton1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.helpButton1.Location = new System.Drawing.Point(327, 3); + this.helpButton1.Name = "helpButton1"; + this.helpButton1.Size = new System.Drawing.Size(38, 23); + this.helpButton1.TabIndex = 0; + // + // audioEncodingComponent1 + // + this.audioEncodingComponent1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.audioEncodingComponent1.AutoScroll = true; + this.audioEncodingComponent1.Location = new System.Drawing.Point(0, 168); + this.audioEncodingComponent1.MinimumSize = new System.Drawing.Size(400, 192); + this.audioEncodingComponent1.Name = "audioEncodingComponent1"; + this.audioEncodingComponent1.Size = new System.Drawing.Size(500, 237); + this.audioEncodingComponent1.TabIndex = 1; + // + // videoEncodingComponent1 + // + this.videoEncodingComponent1.Dock = System.Windows.Forms.DockStyle.Top; + this.videoEncodingComponent1.Location = new System.Drawing.Point(0, 0); + this.videoEncodingComponent1.MinimumSize = new System.Drawing.Size(500, 168); + this.videoEncodingComponent1.Name = "videoEncodingComponent1"; + this.videoEncodingComponent1.PrerenderJob = false; + this.videoEncodingComponent1.Size = new System.Drawing.Size(500, 168); + this.videoEncodingComponent1.TabIndex = 0; + this.videoEncodingComponent1.VideoInput = ""; + this.videoEncodingComponent1.VideoOutput = ""; + // // tabPage2 // this.tabPage2.Controls.Add(this.jobControl1); this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Size = new System.Drawing.Size(500, 440); + this.tabPage2.Size = new System.Drawing.Size(500, 438); this.tabPage2.TabIndex = 12; this.tabPage2.Text = "Queue"; this.tabPage2.UseVisualStyleBackColor = true; // + // jobControl1 + // + this.jobControl1.BackColor = System.Drawing.SystemColors.Control; + this.jobControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.jobControl1.Location = new System.Drawing.Point(0, 0); + this.jobControl1.Name = "jobControl1"; + this.jobControl1.Size = new System.Drawing.Size(500, 438); + this.jobControl1.TabIndex = 0; + // // logTab // this.logTab.Controls.Add(this.logTree1); this.logTab.Location = new System.Drawing.Point(4, 22); this.logTab.Name = "logTab"; - this.logTab.Size = new System.Drawing.Size(500, 440); + this.logTab.Size = new System.Drawing.Size(500, 438); this.logTab.TabIndex = 13; this.logTab.Text = "Log"; this.logTab.UseVisualStyleBackColor = true; @@ -313,7 +354,7 @@ this.logTree1.Dock = System.Windows.Forms.DockStyle.Fill; this.logTree1.Location = new System.Drawing.Point(0, 0); this.logTree1.Name = "logTree1"; - this.logTree1.Size = new System.Drawing.Size(500, 440); + this.logTree1.Size = new System.Drawing.Size(500, 438); this.logTree1.TabIndex = 0; // // mnuMuxers @@ -605,55 +646,12 @@ this.exitMeGUIToolStripMenuItem.Text = "Exit MeGUI"; this.exitMeGUIToolStripMenuItem.Click += new System.EventHandler(this.exitMeGUIToolStripMenuItem_Click); // - // helpButton1 - // - this.helpButton1.ArticleName = "Main window#Input"; - this.helpButton1.AutoSize = true; - this.helpButton1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.helpButton1.Location = new System.Drawing.Point(327, 3); - this.helpButton1.Name = "helpButton1"; - this.helpButton1.Size = new System.Drawing.Size(38, 23); - this.helpButton1.TabIndex = 0; - // - // audioEncodingComponent1 - // - this.audioEncodingComponent1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.audioEncodingComponent1.AutoScroll = true; - this.audioEncodingComponent1.Location = new System.Drawing.Point(0, 168); - this.audioEncodingComponent1.MinimumSize = new System.Drawing.Size(400, 192); - this.audioEncodingComponent1.Name = "audioEncodingComponent1"; - this.audioEncodingComponent1.Size = new System.Drawing.Size(500, 235); - this.audioEncodingComponent1.TabIndex = 1; - // - // videoEncodingComponent1 - // - this.videoEncodingComponent1.Dock = System.Windows.Forms.DockStyle.Top; - this.videoEncodingComponent1.Location = new System.Drawing.Point(0, 0); - this.videoEncodingComponent1.MinimumSize = new System.Drawing.Size(500, 168); - this.videoEncodingComponent1.Name = "videoEncodingComponent1"; - this.videoEncodingComponent1.PrerenderJob = false; - this.videoEncodingComponent1.Size = new System.Drawing.Size(500, 168); - this.videoEncodingComponent1.TabIndex = 0; - this.videoEncodingComponent1.VideoInput = ""; - this.videoEncodingComponent1.VideoOutput = ""; - // - // jobControl1 - // - this.jobControl1.BackColor = System.Drawing.SystemColors.Control; - this.jobControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.jobControl1.Location = new System.Drawing.Point(0, 0); - this.jobControl1.Name = "jobControl1"; - this.jobControl1.Size = new System.Drawing.Size(500, 447); - this.jobControl1.TabIndex = 0; - // // MainForm // this.AllowDrop = true; this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.ClientSize = new System.Drawing.Size(508, 464); + this.ClientSize = new System.Drawing.Size(508, 466); this.Controls.Add(this.tabControl1); this.DataBindings.Add(new System.Windows.Forms.Binding("Location", global::MeGUI.Properties.Settings.Default, "MainFormLocation", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -1059,6 +1057,7 @@ #region menu actions private void mnuFileOpen_Click(object sender, EventArgs e) { + CmdOpenFileDialog openFileDialog = new CmdOpenFileDialog(); openFileDialog.Filter = "AviSynth Scripts (*.avs)|*.avs|" + "Audio Files (*.ac3, *.mp2, *.mpa, *.wav)|*.ac3;*.mp2;*.mpa;*.wav|" + "MPEG-2 Files (*.vob, *.mpg, *.mpeg, *.m2ts, *.m2v, *.mpv, *.tp, *.ts, *.trp, *.pva, *.vro)|" + Index: core/gui/Form1.resx =================================================================== --- core/gui/Form1.resx (revision 385) +++ core/gui/Form1.resx (working copy) @@ -120,9 +120,6 @@ 17, 17 - - 126, 17 - 250, 17 Index: core/gui/ProfilePorter.cs =================================================================== --- core/gui/ProfilePorter.cs (revision 385) +++ core/gui/ProfilePorter.cs (working copy) @@ -322,7 +322,7 @@ { if (string.IsNullOrEmpty(inputFileName)) { - OpenFileDialog inputChooser = new OpenFileDialog(); + CmdOpenFileDialog inputChooser = new CmdOpenFileDialog(); inputChooser.Filter = "Zip archives|*.zip"; inputChooser.Title = "Select your input file"; Index: core/gui/SettingsForm.cs =================================================================== --- core/gui/SettingsForm.cs (revision 385) +++ core/gui/SettingsForm.cs (working copy) @@ -5,6 +5,7 @@ using System.ComponentModel; using System.Windows.Forms; using System.IO; +using MeGUI.core.util; namespace MeGUI { @@ -14,6 +15,7 @@ public class SettingsForm : System.Windows.Forms.Form { #region variables + private CmdOpenFileDialog openExecutableDialog = new CmdOpenFileDialog(); private System.Windows.Forms.Button saveButton; private System.Windows.Forms.Button cancelButton; private MeGUISettings internalSettings = new MeGUISettings(); @@ -33,8 +35,7 @@ private CheckBox chkboxUseAdvancedTooltips; private Button configSourceDetector; private System.Windows.Forms.GroupBox otherGroupBox; - private System.Windows.Forms.ComboBox priority; - private System.Windows.Forms.OpenFileDialog openExecutableDialog; + private System.Windows.Forms.ComboBox priority; private System.Windows.Forms.CheckBox autostartQueue; private System.Windows.Forms.CheckBox openScript; private System.Windows.Forms.Label priorityLabel; @@ -216,7 +217,6 @@ this.percentLabel = new System.Windows.Forms.Label(); this.forceFilmPercentage = new System.Windows.Forms.NumericUpDown(); this.autoForceFilm = new System.Windows.Forms.CheckBox(); - this.openExecutableDialog = new System.Windows.Forms.OpenFileDialog(); this.openFolderDialog = new System.Windows.Forms.FolderBrowserDialog(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); @@ -250,6 +250,9 @@ this.x264ExePath = new System.Windows.Forms.TextBox(); this.selectX264ExecutableButton = new System.Windows.Forms.Button(); this.tabPage5 = new System.Windows.Forms.TabPage(); + this.tbAften = new System.Windows.Forms.TextBox(); + this.lbAften = new System.Windows.Forms.Label(); + this.selectAftenExecutableButton = new System.Windows.Forms.Button(); this.textBox7 = new System.Windows.Forms.TextBox(); this.label10 = new System.Windows.Forms.Label(); this.button7 = new System.Windows.Forms.Button(); @@ -307,9 +310,6 @@ this.nbPassesLabel = new System.Windows.Forms.Label(); this.nbPasses = new System.Windows.Forms.NumericUpDown(); this.helpButton1 = new MeGUI.core.gui.HelpButton(); - this.tbAften = new System.Windows.Forms.TextBox(); - this.lbAften = new System.Windows.Forms.Label(); - this.selectAftenExecutableButton = new System.Windows.Forms.Button(); groupBox1 = new System.Windows.Forms.GroupBox(); groupBox1.SuspendLayout(); this.otherGroupBox.SuspendLayout(); @@ -1094,6 +1094,32 @@ this.tabPage5.Text = "Audio"; this.tabPage5.UseVisualStyleBackColor = true; // + // tbAften + // + this.tbAften.Location = new System.Drawing.Point(89, 178); + this.tbAften.Name = "tbAften"; + this.tbAften.ReadOnly = true; + this.tbAften.Size = new System.Drawing.Size(322, 21); + this.tbAften.TabIndex = 26; + this.tbAften.Text = "aften.exe"; + // + // lbAften + // + this.lbAften.Location = new System.Drawing.Point(3, 182); + this.lbAften.Name = "lbAften"; + this.lbAften.Size = new System.Drawing.Size(80, 13); + this.lbAften.TabIndex = 25; + this.lbAften.Text = "aften"; + // + // selectAftenExecutableButton + // + this.selectAftenExecutableButton.Location = new System.Drawing.Point(417, 177); + this.selectAftenExecutableButton.Name = "selectAftenExecutableButton"; + this.selectAftenExecutableButton.Size = new System.Drawing.Size(24, 23); + this.selectAftenExecutableButton.TabIndex = 27; + this.selectAftenExecutableButton.Text = "..."; + this.selectAftenExecutableButton.Click += new System.EventHandler(this.selectAftenExecutableButton_Click); + // // textBox7 // this.textBox7.Location = new System.Drawing.Point(89, 151); @@ -1638,32 +1664,6 @@ this.helpButton1.Size = new System.Drawing.Size(38, 23); this.helpButton1.TabIndex = 1; // - // tbAften - // - this.tbAften.Location = new System.Drawing.Point(89, 178); - this.tbAften.Name = "tbAften"; - this.tbAften.ReadOnly = true; - this.tbAften.Size = new System.Drawing.Size(322, 21); - this.tbAften.TabIndex = 26; - this.tbAften.Text = "aften.exe"; - // - // lbAften - // - this.lbAften.Location = new System.Drawing.Point(3, 182); - this.lbAften.Name = "lbAften"; - this.lbAften.Size = new System.Drawing.Size(80, 13); - this.lbAften.TabIndex = 25; - this.lbAften.Text = "aften"; - // - // selectAftenExecutableButton - // - this.selectAftenExecutableButton.Location = new System.Drawing.Point(417, 177); - this.selectAftenExecutableButton.Name = "selectAftenExecutableButton"; - this.selectAftenExecutableButton.Size = new System.Drawing.Size(24, 23); - this.selectAftenExecutableButton.TabIndex = 27; - this.selectAftenExecutableButton.Text = "..."; - this.selectAftenExecutableButton.Click += new System.EventHandler(this.selectAftenExecutableButton_Click); - // // SettingsForm // this.AutoScaleBaseSize = new System.Drawing.Size(5, 14); @@ -1892,7 +1892,7 @@ private void button9_Click(object sender, EventArgs e) { - OpenFileDialog d = new OpenFileDialog(); + CmdOpenFileDialog d = new CmdOpenFileDialog(); d.Filter = "yadif library|yadif.dll|Any library|*.dll"; d.DefaultExt = "dll"; d.FileName = "yadif.dll"; Index: core/gui/SettingsForm.resx =================================================================== --- core/gui/SettingsForm.resx (revision 385) +++ core/gui/SettingsForm.resx (working copy) @@ -120,11 +120,8 @@ False - - 155, 17 - - 17, 17 + 178, 17 81 Index: core/util/CmdOpenFileDialog.cs =================================================================== --- core/util/CmdOpenFileDialog.cs (revision 0) +++ core/util/CmdOpenFileDialog.cs (revision 0) @@ -0,0 +1,73 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Windows.Forms; +using System.Diagnostics; +using System.IO; + +namespace MeGUI.core.util +{ + class CmdOpenFileDialog + { + private string initialDirectory; + + public string InitialDirectory + { + get { return initialDirectory; } + set { initialDirectory = value; } + } + + + private string title; + + public string Title + { + get { return title; } + set { title = value; } + } + + private string defaultExt; + + public string DefaultExt + { + get { return defaultExt; } + set { defaultExt = value; } + } + + + private string filename; + public string FileName + { + get { return filename; } + set { filename = value; } + } + + + private string filter; + + public string Filter + { + get { return filter; } + set { filter = value; } + } + + public DialogResult ShowDialog() + { + string args = string.Format(@"""{0}"" ""{1}"" ""{2}"" ""{3}"" ""{4}""", initialDirectory, title, defaultExt, filename, filter); + ProcessStartInfo pstart = new ProcessStartInfo(Path.Combine(MainForm.Instance.MeGUIPath, "openfiledialog.exe"), args); + pstart.RedirectStandardOutput = true; + pstart.UseShellExecute = false; + Process p = Process.Start(pstart); + p.WaitForExit(); + string[] r = p.StandardOutput.ReadToEnd().Split('\n'); + initialDirectory = r[0]; + title = r[1]; + defaultExt = r[2]; + filename = r[3]; + filter = r[4]; + if (r[5] == "OK") + return DialogResult.OK; + return DialogResult.Cancel; + } + } +} Index: MeGUI.csproj =================================================================== --- MeGUI.csproj (revision 385) +++ MeGUI.csproj (working copy) @@ -421,6 +421,7 @@ + @@ -928,4 +929,4 @@ - + \ No newline at end of file Index: packages/AviSynthWindow.cs =================================================================== --- packages/AviSynthWindow.cs (revision 385) +++ packages/AviSynthWindow.cs (working copy) @@ -59,8 +59,7 @@ private System.Windows.Forms.TextBox videoInput; private System.Windows.Forms.Button openVideoButton; private System.Windows.Forms.Label inputDARLabel; - private System.Windows.Forms.Label tvTypeLabel; - private System.Windows.Forms.OpenFileDialog openVideoDialog; + private System.Windows.Forms.Label tvTypeLabel; private System.Windows.Forms.SaveFileDialog saveAvisynthScriptDialog; private System.Windows.Forms.TextBox avisynthScript; private System.Windows.Forms.NumericUpDown horizontalResolution; @@ -68,12 +67,12 @@ private System.Windows.Forms.NumericUpDown cropLeft; private System.Windows.Forms.NumericUpDown cropRight; private System.Windows.Forms.NumericUpDown cropBottom; - private System.Windows.Forms.NumericUpDown cropTop; - private System.Windows.Forms.OpenFileDialog openFilterDialog; + private System.Windows.Forms.NumericUpDown cropTop; private System.Windows.Forms.CheckBox suggestResolution; private CheckBox signalAR; - + private CmdOpenFileDialog openVideoDialog = new CmdOpenFileDialog(); + private CmdOpenFileDialog openFilterDialog = new CmdOpenFileDialog(); private List controlsToDisable; private TabPage filterTab; private GroupBox deinterlacingGroupBox; @@ -298,9 +297,7 @@ this.dllPath = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.avisynthScript = new System.Windows.Forms.TextBox(); - this.openVideoDialog = new System.Windows.Forms.OpenFileDialog(); this.saveAvisynthScriptDialog = new System.Windows.Forms.SaveFileDialog(); - this.openFilterDialog = new System.Windows.Forms.OpenFileDialog(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.deintProgressBar = new System.Windows.Forms.ToolStripProgressBar(); this.deintStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); @@ -627,6 +624,7 @@ // // arChooser // + this.arChooser.CustomDARs = new MeGUI.core.util.Dar[0]; this.arChooser.HasLater = false; this.arChooser.Location = new System.Drawing.Point(96, 88); this.arChooser.MaximumSize = new System.Drawing.Size(1000, 29); @@ -1019,22 +1017,12 @@ this.avisynthScript.Size = new System.Drawing.Size(400, 340); this.avisynthScript.TabIndex = 0; // - // openVideoDialog - // - this.openVideoDialog.FilterIndex = 5; - this.openVideoDialog.Title = "Select a source file"; - // // saveAvisynthScriptDialog // this.saveAvisynthScriptDialog.DefaultExt = "avs"; this.saveAvisynthScriptDialog.Filter = "AviSynth Script Files|*.avs"; this.saveAvisynthScriptDialog.Title = "Select a name for the AviSynth script"; // - // openFilterDialog - // - this.openFilterDialog.Filter = "AviSynth Filters|*.dll"; - this.openFilterDialog.Title = "Select an AviSynth Filter"; - // // statusStrip1 // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { Index: packages/AviSynthWindow.resx =================================================================== --- packages/AviSynthWindow.resx (revision 385) +++ packages/AviSynthWindow.resx (working copy) @@ -129,15 +129,9 @@ False - - 324, 17 - 149, 17 - - 17, 17 - 459, 17 Index: packages/tools/calculator/AudioTrackSizeTab.cs =================================================================== --- packages/tools/calculator/AudioTrackSizeTab.cs (revision 385) +++ packages/tools/calculator/AudioTrackSizeTab.cs (working copy) @@ -90,6 +90,7 @@ private void selectAudio1Button_Click(object sender, EventArgs e) { + CmdOpenFileDialog openFileDialog = new CmdOpenFileDialog(); openFileDialog.Filter = this.filter; if (openFileDialog.ShowDialog() == DialogResult.OK) { Index: packages/tools/calculator/AudioTrackSizeTab.Designer.cs =================================================================== --- packages/tools/calculator/AudioTrackSizeTab.Designer.cs (revision 385) +++ packages/tools/calculator/AudioTrackSizeTab.Designer.cs (working copy) @@ -35,7 +35,6 @@ this.audio1Type = new System.Windows.Forms.ComboBox(); this.audio1TypeLabel = new System.Windows.Forms.Label(); this.clearAudio1Button = new System.Windows.Forms.Button(); - this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); this.size = new MeGUI.core.gui.TargetSizeSCBox(); ((System.ComponentModel.ISupportInitialize)(this.audio1Bitrate)).BeginInit(); this.SuspendLayout(); @@ -162,7 +161,6 @@ private System.Windows.Forms.ComboBox audio1Type; private System.Windows.Forms.Label audio1TypeLabel; private System.Windows.Forms.Button clearAudio1Button; - private System.Windows.Forms.OpenFileDialog openFileDialog; private MeGUI.core.gui.TargetSizeSCBox size; } }