From 7911cbf27a701e50f26af5507ccdba0385717aea Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 24 Apr 2010 15:25:40 +0000 Subject: [PATCH] WinGui: - More stylecop warnings cleaned up git-svn-id: svn://localhost/HandBrake/trunk@3259 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/Functions/QueryParser.cs | 229 ++++++++++++++++++++++++++++++++++++--- win/C#/Model/AudioTrack.cs | 1 - win/C#/Model/DriveInformation.cs | 1 - win/C#/Model/Job.cs | 1 - win/C#/frmQueue.cs | 22 ++-- 5 files changed, 223 insertions(+), 31 deletions(-) diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs index 4e864227..4d01c91d 100644 --- a/win/C#/Functions/QueryParser.cs +++ b/win/C#/Functions/QueryParser.cs @@ -24,71 +24,266 @@ namespace Handbrake.Functions #region Varibles - // Source - public int DVDTitle { get; set; } - public int DVDChapterStart { get; set; } - public int DVDChapterFinish { get; set; } + #region Source Title / Chapters + /// + /// Gets or sets Title. + /// + public int Title { get; set; } + + /// + /// Gets or sets ChapterStart. + /// + public int ChapterStart { get; set; } - // Output Settings + /// + /// Gets or sets ChapterFinish. + /// + public int ChapterFinish { get; set; } + #endregion + + #region Output Settings + /// + /// Gets or sets the file Format. e.g mkv or mp4 + /// public string Format { get; set; } + + /// + /// Gets or sets a value indicating whether LargeMP4 support is enabled. + /// This is the 64bit MP4 file that allows >4GB files + /// public bool LargeMP4 { get; set; } + + /// + /// Gets or sets a value indicating whether IpodAtom is inserted + /// public bool IpodAtom { get; set; } + + /// + /// Gets or sets a value indicating whether OptimizeMP4 is enabed for web streaming + /// public bool OptimizeMP4 { get; set; } + #endregion + + #region Picture Settings - // Picture Settings + /// + /// Gets or sets Width. + /// public int Width { get; set; } + + /// + /// Gets or sets Height. + /// public int Height { get; set; } + + /// + /// Gets or sets MaxWidth. + /// public int MaxWidth { get; set; } + + /// + /// Gets or sets MaxHeight. + /// public int MaxHeight { get; set; } + + /// + /// Gets or sets CropValues. + /// public string CropValues { get; set; } + + /// + /// Gets or sets CropTop. + /// public string CropTop { get; set; } + + /// + /// Gets or sets CropBottom. + /// public string CropBottom { get; set; } + + /// + /// Gets or sets CropLeft. + /// public string CropLeft { get; set; } + + /// + /// Gets or sets CropRight. + /// public string CropRight { get; set; } + + /// + /// Gets or sets AnamorphicMode. + /// public int AnamorphicMode { get; set; } + + /// + /// Gets or sets a value indicating whether KeepDisplayAsect. + /// public bool KeepDisplayAsect { get; set; } + + /// + /// Gets or sets DisplayWidthValue. + /// public double DisplayWidthValue { get; set; } + + /// + /// Gets or sets PixelAspectWidth. + /// public int PixelAspectWidth { get; set; } + + /// + /// Gets or sets PixelAspectHeight. + /// public int PixelAspectHeight { get; set; } + + /// + /// Gets or sets AnamorphicModulus. + /// public int AnamorphicModulus { get; set; } + #endregion + + #region Video Filters - // Video Filters + /// + /// Gets or sets DeTelecine. + /// public string DeTelecine { get; set; } + + /// + /// Gets or sets DeBlock. + /// public int DeBlock { get; set; } + + /// + /// Gets or sets DeInterlace. + /// public string DeInterlace { get; set; } + + /// + /// Gets or sets DeNoise. + /// public string DeNoise { get; set; } + + /// + /// Gets or sets Decomb. + /// public string Decomb { get; set; } + #endregion - // Video Settings + #region Video Settings + /// + /// Gets or sets VideoEncoder. + /// public string VideoEncoder { get; set; } + + /// + /// Gets or sets a value indicating whether Grayscale. + /// public bool Grayscale { get; set; } + + /// + /// Gets or sets a value indicating whether TwoPass. + /// public bool TwoPass { get; set; } + + /// + /// Gets or sets a value indicating whether TurboFirstPass. + /// public bool TurboFirstPass { get; set; } + + /// + /// Gets or sets VideoFramerate. + /// public string VideoFramerate { get; set; } + + /// + /// Gets or sets AverageVideoBitrate. + /// public string AverageVideoBitrate { get; set; } + + /// + /// Gets or sets VideoTargetSize. + /// public string VideoTargetSize { get; set; } + + /// + /// Gets or sets VideoQuality. + /// public float VideoQuality { get; set; } + #endregion - // Audio Settings + #region Audio Settings + + /// + /// Gets or sets AudioInformation. + /// public ArrayList AudioInformation { get; set; } + + /// + /// Gets or sets Subtitles. + /// public string Subtitles { get; set; } + + /// + /// Gets or sets a value indicating whether ForcedSubtitles. + /// public bool ForcedSubtitles { get; set; } + #endregion - // Chapter Markers + #region Other + /// + /// Gets or sets a value indicating whether ChapterMarkers. + /// public bool ChapterMarkers { get; set; } - // Other + /// + /// Gets or sets H264Query. + /// public string H264Query { get; set; } + + /// + /// Gets or sets a value indicating whether Verbose. + /// public bool Verbose { get; set; } + #endregion - // Preset Information + #region Preset Information + + /// + /// Gets or sets PresetBuildNumber. + /// public int PresetBuildNumber { get; set; } + + /// + /// Gets or sets PresetDescription. + /// public string PresetDescription { get; set; } + + /// + /// Gets or sets PresetName. + /// public string PresetName { get; set; } + + /// + /// Gets or sets Type. + /// public string Type { get; set; } + + /// + /// Gets or sets a value indicating whether UsesMaxPictureSettings. + /// public bool UsesMaxPictureSettings { get; set; } + + /// + /// Gets or sets a value indicating whether UsesPictureFilters. + /// public bool UsesPictureFilters { get; set; } + + /// + /// Gets or sets a value indicating whether UsesPictureSettings. + /// public bool UsesPictureSettings { get; set; } + #endregion #endregion @@ -181,19 +376,19 @@ namespace Handbrake.Functions #region Source Tab if (title.Success) - thisQuery.DVDTitle = int.Parse(title.ToString().Replace("-t ", string.Empty)); + thisQuery.Title = int.Parse(title.ToString().Replace("-t ", string.Empty)); if (chapters.Success) { string[] actTitles = chapters.ToString().Replace("-c ", string.Empty).Split('-'); - thisQuery.DVDChapterStart = int.Parse(actTitles[0]); + thisQuery.ChapterStart = int.Parse(actTitles[0]); if (actTitles.Length > 1) { - thisQuery.DVDChapterFinish = int.Parse(actTitles[1]); + thisQuery.ChapterFinish = int.Parse(actTitles[1]); } - if ((thisQuery.DVDChapterStart == 1) && (thisQuery.DVDChapterFinish == 0)) - thisQuery.DVDChapterFinish = thisQuery.DVDChapterStart; + if ((thisQuery.ChapterStart == 1) && (thisQuery.ChapterFinish == 0)) + thisQuery.ChapterFinish = thisQuery.ChapterStart; } #endregion diff --git a/win/C#/Model/AudioTrack.cs b/win/C#/Model/AudioTrack.cs index 410cfa59..04b12ce8 100644 --- a/win/C#/Model/AudioTrack.cs +++ b/win/C#/Model/AudioTrack.cs @@ -12,7 +12,6 @@ namespace Handbrake.Model { /// /// Initializes a new instance of the class. - /// Audio Track instance /// public AudioTrack() { diff --git a/win/C#/Model/DriveInformation.cs b/win/C#/Model/DriveInformation.cs index f22cdf98..d7cef0ee 100644 --- a/win/C#/Model/DriveInformation.cs +++ b/win/C#/Model/DriveInformation.cs @@ -10,7 +10,6 @@ namespace Handbrake.Model /// public class DriveInformation { - /// /// Gets or sets A Unique ID That represemts this model. /// diff --git a/win/C#/Model/Job.cs b/win/C#/Model/Job.cs index a2ccc00b..6f272127 100644 --- a/win/C#/Model/Job.cs +++ b/win/C#/Model/Job.cs @@ -3,7 +3,6 @@ Homepage: . It may be used under the terms of the GNU General Public License. */ - namespace Handbrake.Model { /// diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs index b6d19045..89303b6c 100644 --- a/win/C#/frmQueue.cs +++ b/win/C#/frmQueue.cs @@ -237,17 +237,17 @@ namespace Handbrake QueryParser parsed = Functions.QueryParser.Parse(qItem); // Get the DVD Title - string title = parsed.DVDTitle == 0 ? "Auto" : parsed.DVDTitle.ToString(); + string title = parsed.Title == 0 ? "Auto" : parsed.Title.ToString(); // Get the DVD Chapters string chapters; - if (parsed.DVDChapterStart == 0) + if (parsed.ChapterStart == 0) chapters = "Auto"; else { - chapters = parsed.DVDChapterStart.ToString(); - if (parsed.DVDChapterFinish != 0) - chapters = chapters + " - " + parsed.DVDChapterFinish; + chapters = parsed.ChapterStart.ToString(); + if (parsed.ChapterFinish != 0) + chapters = chapters + " - " + parsed.ChapterFinish; } ListViewItem item = new ListViewItem(); @@ -300,19 +300,19 @@ namespace Handbrake } // found query is a global varible - QueryParser parsed = Functions.QueryParser.Parse(queue.LastEncode.Query); + QueryParser parsed = QueryParser.Parse(queue.LastEncode.Query); lbl_source.Text = queue.LastEncode.Source; lbl_dest.Text = queue.LastEncode.Destination; - lbl_title.Text = parsed.DVDTitle == 0 ? "Auto" : parsed.DVDTitle.ToString(); + lbl_title.Text = parsed.Title == 0 ? "Auto" : parsed.Title.ToString(); - if (Equals(parsed.DVDChapterStart, 0)) + if (Equals(parsed.ChapterStart, 0)) lbl_chapt.Text = "Auto"; else { - string chapters = parsed.DVDChapterStart.ToString(); - if (parsed.DVDChapterFinish != 0) - chapters = chapters + " - " + parsed.DVDChapterFinish; + string chapters = parsed.ChapterStart.ToString(); + if (parsed.ChapterFinish != 0) + chapters = chapters + " - " + parsed.ChapterFinish; lbl_chapt.Text = chapters; } -- 2.11.0