Changeset 10842fd


Ignore:
Timestamp:
07/15/09 13:47:20 (7 years ago)
Author:
sr55 <sr55.hb@…>
Branches:
master
Children:
32f2eebc
Parents:
742df70
Message:

WinGui:

  • Experimental MacGUI preset import. (Single preset export only)

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

Location:
win/C#
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • win/C#/Functions/QueryParser.cs

    rfafb7a7 r10842fd  
    1919        #region Varibles
    2020
    21         #region Source
    22         public int DVDTitle { get; private set; }
    23         public int DVDChapterStart { get; private set; }
    24         public int DVDChapterFinish { get; private set; }
    25         #endregion
    26 
    27         #region Output Settings
    28         public string Format { get; private set; }
    29         public Boolean LargeMP4 { get; private set; }
    30         public Boolean IpodAtom { get; private set; }
    31         public Boolean OptimizeMP4 { get; private set; }
    32         #endregion
    33 
    34         #region Picture Settings
    35         public int Width { get; private set; }
    36         public int Height { get; private set; }
    37         public int MaxWidth { get; private set; }
    38         public int MaxHeight { get; private set; }
    39         public string CropValues { get; private set; }
    40         public string CropTop { get; private set; }
    41         public string CropBottom { get; private set; }
    42         public string CropLeft { get; private set; }
    43         public string CropRight { get; private set; }
    44         public int AnamorphicMode { get; private set; }
    45         public Boolean keepDisplayAsect { get; private set; }
    46         public double displayWidthValue { get; private set; }
    47         public int pixelAspectWidth { get; private set; }
    48         public int pixelAspectHeight { get; private set; }
    49         public int AnamorphicModulus { get; private set; }
    50         #endregion
    51 
    52         #region Video Filters
    53         public string DeTelecine { get; private set; }
    54         public int DeBlock { get; private set; }
    55         public string DeInterlace { get; private set; }
    56         public string DeNoise { get; private set; }
    57         public string Decomb { get; private set; }
    58         #endregion
    59 
    60         #region Video Settings
    61         public string VideoEncoder { get; private set; }
    62         public Boolean Grayscale { get; private set; }
    63         public Boolean TwoPass { get; private set; }
    64         public Boolean TurboFirstPass { get; private set; }
    65         public string VideoFramerate { get; private set; }
    66         public string AverageVideoBitrate { get; private set; }
    67         public string VideoTargetSize { get; private set; }
    68         public float VideoQuality { get; private set; }
    69         #endregion
    70 
    71         #region Audio Settings
    72         public ArrayList AudioInformation { get; private set; }
    73         public string Subtitles { get; private set; }
    74         public Boolean ForcedSubtitles { get; private set; }
    75         #endregion
    76 
    77         #region Chapter Markers
    78         public Boolean ChapterMarkers { get; private set; }
    79         #endregion
    80 
    81         #region Other
    82         public string H264Query { get; private set; }
    83         public Boolean Verbose { get; private set; }
    84         #endregion
     21        // Source
     22        public int DVDTitle { get; set; }
     23        public int DVDChapterStart { get; set; }
     24        public int DVDChapterFinish { get; set; }
     25
     26        // Output Settings
     27        public string Format { get; set; }
     28        public Boolean LargeMP4 { get; set; }
     29        public Boolean IpodAtom { get; set; }
     30        public Boolean OptimizeMP4 { get; set; }
     31
     32        // Picture Settings
     33        public int Width { get; set; }
     34        public int Height { get; set; }
     35        public int MaxWidth { get; set; }
     36        public int MaxHeight { get; set; }
     37        public string CropValues { get; set; }
     38        public string CropTop { get; set; }
     39        public string CropBottom { get; set; }
     40        public string CropLeft { get; set; }
     41        public string CropRight { get; set; }
     42        public int AnamorphicMode { get; set; }
     43        public Boolean keepDisplayAsect { get; set; }
     44        public double displayWidthValue { get; set; }
     45        public int pixelAspectWidth { get; set; }
     46        public int pixelAspectHeight { get; set; }
     47        public int AnamorphicModulus { get; set; }
     48
     49        // Video Filters
     50        public string DeTelecine { get; set; }
     51        public int DeBlock { get; set; }
     52        public string DeInterlace { get; set; }
     53        public string DeNoise { get; set; }
     54        public string Decomb { get; set; }
     55
     56        // Video Settings
     57        public string VideoEncoder { get; set; }
     58        public Boolean Grayscale { get; set; }
     59        public Boolean TwoPass { get; set; }
     60        public Boolean TurboFirstPass { get; set; }
     61        public string VideoFramerate { get; set; }
     62        public string AverageVideoBitrate { get; set; }
     63        public string VideoTargetSize { get; set; }
     64        public float VideoQuality { get; set; }
     65
     66        // Audio Settings
     67        public ArrayList AudioInformation { get; set; }
     68        public string Subtitles { get; set; }
     69        public Boolean ForcedSubtitles { get; set; }
     70
     71        // Chapter Markers
     72        public Boolean ChapterMarkers { get; set; }
     73
     74        // Other
     75        public string H264Query { get; set; }
     76        public Boolean Verbose { get; set; }
     77
     78        // Preset Information
     79        public int PresetBuildNumber { get; set; }
     80        public string PresetDescription { get; set; }
     81        public string PresetName { get; set; }
     82        public string Type { get; set; }
     83        public Boolean UsesMaxPictureSettings { get; set; }
     84        public Boolean UsesPictureFilters { get; set; }
     85        public Boolean UsesPictureSettings { get; set; }
    8586
    8687        #endregion
     
    205206                if (width.Success)
    206207                    thisQuery.Width = int.Parse(width.Groups[0].Value.Replace("-w ", ""));
    207                                                              
     208
    208209                if (height.Success)
    209210                    thisQuery.Height = int.Parse(height.Groups[0].Value.Replace("-l ", ""));
     
    223224                    thisQuery.CropLeft = actCropValues[2];
    224225                    thisQuery.CropRight = actCropValues[3];
    225                 } 
     226                }
    226227
    227228                if (strictAnamorphic.Success)
  • win/C#/HandBrakeCS.csproj

    rc013dff r10842fd  
    196196    <Compile Include="Functions\UpdateCheckInformation.cs" />
    197197    <Compile Include="Functions\Win32.cs" />
     198    <Compile Include="Presets\Import.cs" />
    198199    <Compile Include="Presets\preset.cs" />
    199200    <Compile Include="Presets\PresetsHandler.cs" />
  • win/C#/frmMain.Designer.cs

    r742df70 r10842fd  
    4141            System.Windows.Forms.ContextMenuStrip notifyIconMenu;
    4242            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
    43             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
     43            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
    4444            this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();
    4545            this.DVD_Save = new System.Windows.Forms.SaveFileDialog();
     
    6565            this.drop_chapterStart = new System.Windows.Forms.ComboBox();
    6666            this.drop_angle = new System.Windows.Forms.ComboBox();
     67            this.drp_dvdtitle = new System.Windows.Forms.ComboBox();
    6768            this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();
    6869            this.File_Open = new System.Windows.Forms.OpenFileDialog();
     
    152153            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
    153154            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
     155            this.Label10 = new System.Windows.Forms.Label();
    154156            this.lbl_angle = new System.Windows.Forms.Label();
    155157            this.Label9 = new System.Windows.Forms.Label();
     
    159161            this.labelStaticDestination = new System.Windows.Forms.Label();
    160162            this.labelPreset = new System.Windows.Forms.Label();
    161             this.drp_dvdtitle = new System.Windows.Forms.ComboBox();
    162163            this.labelSource = new System.Windows.Forms.Label();
    163             this.Label10 = new System.Windows.Forms.Label();
    164164            this.labelStaticSource = new System.Windows.Forms.Label();
    165165            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
     166            this.mnu_importMacPreset = new System.Windows.Forms.ToolStripMenuItem();
     167            this.openPreset = new System.Windows.Forms.OpenFileDialog();
    166168            this.PictureSettings = new Handbrake.Controls.PictureSettings();
    167169            this.Filters = new Handbrake.Controls.Filters();
     
    202204            notifyIconMenu.Name = "notifyIconMenu";
    203205            notifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
    204             notifyIconMenu.Size = new System.Drawing.Size(114, 26);
     206            notifyIconMenu.Size = new System.Drawing.Size(124, 26);
    205207            //
    206208            // btn_restore
    207209            //
    208210            this.btn_restore.Name = "btn_restore";
    209             this.btn_restore.Size = new System.Drawing.Size(113, 22);
     211            this.btn_restore.Size = new System.Drawing.Size(123, 22);
    210212            this.btn_restore.Text = "Restore";
    211213            this.btn_restore.Click += new System.EventHandler(this.btn_restore_Click);
     
    391393            // number
    392394            //
    393             dataGridViewCellStyle1.Format = "N0";
    394             dataGridViewCellStyle1.NullValue = null;
    395             this.number.DefaultCellStyle = dataGridViewCellStyle1;
     395            dataGridViewCellStyle3.Format = "N0";
     396            dataGridViewCellStyle3.NullValue = null;
     397            this.number.DefaultCellStyle = dataGridViewCellStyle3;
    396398            this.number.Frozen = true;
    397399            this.number.HeaderText = "Chapter Number";
     
    483485            this.ToolTip.SetToolTip(this.drop_angle, "Select the chapter range you would like to enocde. (default: All Chapters)");
    484486            //
     487            // drp_dvdtitle
     488            //
     489            this.drp_dvdtitle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     490            this.drp_dvdtitle.FormattingEnabled = true;
     491            this.drp_dvdtitle.Items.AddRange(new object[] {
     492            "Automatic"});
     493            this.drp_dvdtitle.Location = new System.Drawing.Point(40, 3);
     494            this.drp_dvdtitle.Name = "drp_dvdtitle";
     495            this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);
     496            this.drp_dvdtitle.TabIndex = 7;
     497            this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\nThe longest title is selected by default af" +
     498                    "ter you have scanned a source.");
     499            this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged);
     500            this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click);
     501            //
    485502            // DVD_Open
    486503            //
     
    505522            this.mnu_exit});
    506523            this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";
    507             this.FileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
     524            this.FileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
    508525            this.FileToolStripMenuItem.Text = "&File";
    509526            //
     
    511528            //
    512529            this.mnu_killCLI.Name = "mnu_killCLI";
    513             this.mnu_killCLI.Size = new System.Drawing.Size(138, 22);
     530            this.mnu_killCLI.Size = new System.Drawing.Size(143, 22);
    514531            this.mnu_killCLI.Text = "Cancel Scan";
    515532            this.mnu_killCLI.Visible = false;
     
    519536            //
    520537            this.mnu_exit.Name = "mnu_exit";
    521             this.mnu_exit.Size = new System.Drawing.Size(138, 22);
     538            this.mnu_exit.Size = new System.Drawing.Size(143, 22);
    522539            this.mnu_exit.Text = "E&xit";
    523540            this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);
     
    536553            this.mnu_options});
    537554            this.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem";
    538             this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
     555            this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
    539556            this.ToolsToolStripMenuItem.Text = "&Tools";
    540557            //
     
    544561            this.mnu_encode.Name = "mnu_encode";
    545562            this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));
    546             this.mnu_encode.Size = new System.Drawing.Size(184, 22);
     563            this.mnu_encode.Size = new System.Drawing.Size(186, 22);
    547564            this.mnu_encode.Text = "Show Queue";
    548565            this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);
     
    552569            this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;
    553570            this.mnu_encodeLog.Name = "mnu_encodeLog";
    554             this.mnu_encodeLog.Size = new System.Drawing.Size(184, 22);
     571            this.mnu_encodeLog.Size = new System.Drawing.Size(186, 22);
    555572            this.mnu_encodeLog.Text = "Activity Window";
    556573            this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);
     
    559576            //
    560577            this.ToolStripSeparator5.Name = "ToolStripSeparator5";
    561             this.ToolStripSeparator5.Size = new System.Drawing.Size(181, 6);
     578            this.ToolStripSeparator5.Size = new System.Drawing.Size(183, 6);
    562579            //
    563580            // mnu_options
     
    565582            this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;
    566583            this.mnu_options.Name = "mnu_options";
    567             this.mnu_options.Size = new System.Drawing.Size(184, 22);
     584            this.mnu_options.Size = new System.Drawing.Size(186, 22);
    568585            this.mnu_options.Text = "Options";
    569586            this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);
     
    576593            this.toolStripSeparator7,
    577594            this.btn_new_preset,
     595            this.mnu_importMacPreset,
    578596            this.mnu_SelectDefault});
    579597            this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem";
    580             this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(56, 20);
     598            this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
    581599            this.PresetsToolStripMenuItem.Text = "&Presets";
    582600            //
     
    627645            this.mnu_about});
    628646            this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem";
    629             this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
     647            this.HelpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
    630648            this.HelpToolStripMenuItem.Text = "&Help";
    631649            //
     
    634652            this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;
    635653            this.mnu_user_guide.Name = "mnu_user_guide";
    636             this.mnu_user_guide.Size = new System.Drawing.Size(194, 22);
     654            this.mnu_user_guide.Size = new System.Drawing.Size(192, 22);
    637655            this.mnu_user_guide.Text = "HandBrake User Guide";
    638656            this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click);
     
    642660            this.mnu_handbrake_home.Image = global::Handbrake.Properties.Resources.info16;
    643661            this.mnu_handbrake_home.Name = "mnu_handbrake_home";
    644             this.mnu_handbrake_home.Size = new System.Drawing.Size(194, 22);
     662            this.mnu_handbrake_home.Size = new System.Drawing.Size(192, 22);
    645663            this.mnu_handbrake_home.Text = "HandBrake Homepage";
    646664            this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click);
     
    649667            //
    650668            this.mnu_handbrake_forums.Name = "mnu_handbrake_forums";
    651             this.mnu_handbrake_forums.Size = new System.Drawing.Size(194, 22);
     669            this.mnu_handbrake_forums.Size = new System.Drawing.Size(192, 22);
    652670            this.mnu_handbrake_forums.Text = "HandBrake Forums";
    653671            this.mnu_handbrake_forums.Click += new System.EventHandler(this.mnu_handbrake_forums_Click);
     
    656674            //
    657675            this.ToolStripSeparator3.Name = "ToolStripSeparator3";
    658             this.ToolStripSeparator3.Size = new System.Drawing.Size(191, 6);
     676            this.ToolStripSeparator3.Size = new System.Drawing.Size(189, 6);
    659677            //
    660678            // mnu_UpdateCheck
    661679            //
    662680            this.mnu_UpdateCheck.Name = "mnu_UpdateCheck";
    663             this.mnu_UpdateCheck.Size = new System.Drawing.Size(194, 22);
     681            this.mnu_UpdateCheck.Size = new System.Drawing.Size(192, 22);
    664682            this.mnu_UpdateCheck.Text = "Check for Updates";
    665683            this.mnu_UpdateCheck.Click += new System.EventHandler(this.mnu_UpdateCheck_Click);
     
    668686            //
    669687            this.toolStripSeparator6.Name = "toolStripSeparator6";
    670             this.toolStripSeparator6.Size = new System.Drawing.Size(191, 6);
     688            this.toolStripSeparator6.Size = new System.Drawing.Size(189, 6);
    671689            //
    672690            // mnu_about
     
    674692            this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;
    675693            this.mnu_about.Name = "mnu_about";
    676             this.mnu_about.Size = new System.Drawing.Size(194, 22);
     694            this.mnu_about.Size = new System.Drawing.Size(192, 22);
    677695            this.mnu_about.Text = "About...";
    678696            this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);
     
    873891            this.tab_picture.UseVisualStyleBackColor = true;
    874892            //
    875             //
    876893            // Check_ChapterMarkers
    877894            //
     
    10881105            this.pmnu_delete});
    10891106            this.presets_menu.Name = "presets_menu";
    1090             this.presets_menu.Size = new System.Drawing.Size(148, 98);
     1107            this.presets_menu.Size = new System.Drawing.Size(155, 98);
    10911108            this.presets_menu.Text = ";";
    10921109            this.presets_menu.Opening += new System.ComponentModel.CancelEventHandler(this.presets_menu_Opening);
     
    10951112            //
    10961113            this.pmnu_expandAll.Name = "pmnu_expandAll";
    1097             this.pmnu_expandAll.Size = new System.Drawing.Size(147, 22);
     1114            this.pmnu_expandAll.Size = new System.Drawing.Size(154, 22);
    10981115            this.pmnu_expandAll.Text = "Expand All";
    10991116            this.pmnu_expandAll.Click += new System.EventHandler(this.pmnu_expandAll_Click);
     
    11021119            //
    11031120            this.pmnu_collapse.Name = "pmnu_collapse";
    1104             this.pmnu_collapse.Size = new System.Drawing.Size(147, 22);
     1121            this.pmnu_collapse.Size = new System.Drawing.Size(154, 22);
    11051122            this.pmnu_collapse.Text = "Collapse All";
    11061123            this.pmnu_collapse.Click += new System.EventHandler(this.pmnu_collapse_Click);
     
    11091126            //
    11101127            this.sep1.Name = "sep1";
    1111             this.sep1.Size = new System.Drawing.Size(144, 6);
     1128            this.sep1.Size = new System.Drawing.Size(151, 6);
    11121129            //
    11131130            // pmnu_saveChanges
    11141131            //
    11151132            this.pmnu_saveChanges.Name = "pmnu_saveChanges";
    1116             this.pmnu_saveChanges.Size = new System.Drawing.Size(147, 22);
     1133            this.pmnu_saveChanges.Size = new System.Drawing.Size(154, 22);
    11171134            this.pmnu_saveChanges.Text = "Save Changes";
    11181135            this.pmnu_saveChanges.Click += new System.EventHandler(this.pmnu_saveChanges_Click);
     
    11211138            //
    11221139            this.pmnu_delete.Name = "pmnu_delete";
    1123             this.pmnu_delete.Size = new System.Drawing.Size(147, 22);
     1140            this.pmnu_delete.Size = new System.Drawing.Size(154, 22);
    11241141            this.pmnu_delete.Text = "Delete";
    11251142            this.pmnu_delete.Click += new System.EventHandler(this.pmnu_delete_click);
     
    11551172            this.btn_source.ImageTransparentColor = System.Drawing.Color.Magenta;
    11561173            this.btn_source.Name = "btn_source";
    1157             this.btn_source.Size = new System.Drawing.Size(88, 36);
     1174            this.btn_source.Size = new System.Drawing.Size(85, 36);
    11581175            this.btn_source.Text = "Source";
    11591176            this.btn_source.ToolTipText = "Open a new source file or folder.";
     
    11641181            this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;
    11651182            this.btn_file_source.Name = "btn_file_source";
    1166             this.btn_file_source.Size = new System.Drawing.Size(192, 22);
     1183            this.btn_file_source.Size = new System.Drawing.Size(194, 22);
    11671184            this.btn_file_source.Text = "Video File";
    11681185            this.btn_file_source.Click += new System.EventHandler(this.btn_file_source_Click);
     
    11731190            this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta;
    11741191            this.btn_dvd_source.Name = "btn_dvd_source";
    1175             this.btn_dvd_source.Size = new System.Drawing.Size(192, 22);
     1192            this.btn_dvd_source.Size = new System.Drawing.Size(194, 22);
    11761193            this.btn_dvd_source.Text = "DVD/ VIDEO_TS Folder";
    11771194            this.btn_dvd_source.Click += new System.EventHandler(this.btn_dvd_source_Click);
     
    11801197            //
    11811198            this.toolStripSeparator1.Name = "toolStripSeparator1";
    1182             this.toolStripSeparator1.Size = new System.Drawing.Size(189, 6);
     1199            this.toolStripSeparator1.Size = new System.Drawing.Size(191, 6);
    11831200            //
    11841201            // mnu_dvd_drive
     
    11861203            this.mnu_dvd_drive.Image = global::Handbrake.Properties.Resources.disc_small;
    11871204            this.mnu_dvd_drive.Name = "mnu_dvd_drive";
    1188             this.mnu_dvd_drive.Size = new System.Drawing.Size(192, 22);
     1205            this.mnu_dvd_drive.Size = new System.Drawing.Size(194, 22);
    11891206            this.mnu_dvd_drive.Text = "[No DVD Drive Ready]";
    11901207            this.mnu_dvd_drive.Visible = false;
     
    12131230            this.btn_add2Queue.ImageTransparentColor = System.Drawing.Color.Magenta;
    12141231            this.btn_add2Queue.Name = "btn_add2Queue";
    1215             this.btn_add2Queue.Size = new System.Drawing.Size(117, 36);
     1232            this.btn_add2Queue.Size = new System.Drawing.Size(110, 36);
    12161233            this.btn_add2Queue.Text = "Add to Queue";
    12171234            this.btn_add2Queue.ToolTipText = "Add a new item to the Queue";
     
    12241241            this.btn_showQueue.ImageTransparentColor = System.Drawing.Color.Magenta;
    12251242            this.btn_showQueue.Name = "btn_showQueue";
    1226             this.btn_showQueue.Size = new System.Drawing.Size(110, 36);
     1243            this.btn_showQueue.Size = new System.Drawing.Size(104, 36);
    12271244            this.btn_showQueue.Tag = "";
    12281245            this.btn_showQueue.Text = "Show Queue";
     
    12401257            this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta;
    12411258            this.tb_preview.Name = "tb_preview";
    1242             this.tb_preview.Size = new System.Drawing.Size(84, 36);
     1259            this.tb_preview.Size = new System.Drawing.Size(81, 36);
    12431260            this.tb_preview.Text = "Preview";
    12441261            this.tb_preview.Click += new System.EventHandler(this.tb_preview_Click);
     
    12501267            this.btn_ActivityWindow.ImageTransparentColor = System.Drawing.Color.Magenta;
    12511268            this.btn_ActivityWindow.Name = "btn_ActivityWindow";
    1252             this.btn_ActivityWindow.Size = new System.Drawing.Size(130, 36);
     1269            this.btn_ActivityWindow.Size = new System.Drawing.Size(120, 36);
    12531270            this.btn_ActivityWindow.Text = "Activity Window";
    12541271            this.btn_ActivityWindow.ToolTipText = "Displays the activity window which displays the log of the last completed or curr" +
     
    13921409            this.tableLayoutPanel1.TabIndex = 49;
    13931410            //
     1411            // Label10
     1412            //
     1413            this.Label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
     1414            this.Label10.AutoSize = true;
     1415            this.Label10.ForeColor = System.Drawing.Color.Black;
     1416            this.Label10.Location = new System.Drawing.Point(3, 7);
     1417            this.Label10.Name = "Label10";
     1418            this.Label10.Size = new System.Drawing.Size(31, 13);
     1419            this.Label10.TabIndex = 6;
     1420            this.Label10.Text = "Title:";
     1421            //
    13941422            // lbl_angle
    13951423            //
     
    14661494            this.labelPreset.Text = "Output Settings (Preset: None)";
    14671495            //
    1468             // drp_dvdtitle
    1469             //
    1470             this.drp_dvdtitle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    1471             this.drp_dvdtitle.FormattingEnabled = true;
    1472             this.drp_dvdtitle.Items.AddRange(new object[] {
    1473             "Automatic"});
    1474             this.drp_dvdtitle.Location = new System.Drawing.Point(40, 3);
    1475             this.drp_dvdtitle.Name = "drp_dvdtitle";
    1476             this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);
    1477             this.drp_dvdtitle.TabIndex = 7;
    1478             this.ToolTip.SetToolTip(this.drp_dvdtitle, "Select the title you wish to encode.\r\nThe longest title is selected by default af" +
    1479                     "ter you have scanned a source.");
    1480             this.drp_dvdtitle.SelectedIndexChanged += new System.EventHandler(this.drp_dvdtitle_SelectedIndexChanged);
    1481             this.drp_dvdtitle.Click += new System.EventHandler(this.drp_dvdtitle_Click);
    1482             //
    14831496            // labelSource
    14841497            //
     
    14891502            this.labelSource.TabIndex = 52;
    14901503            this.labelSource.Text = "Select \"Source\" to continue";
    1491             //
    1492             // Label10
    1493             //
    1494             this.Label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
    1495             this.Label10.AutoSize = true;
    1496             this.Label10.ForeColor = System.Drawing.Color.Black;
    1497             this.Label10.Location = new System.Drawing.Point(3, 7);
    1498             this.Label10.Name = "Label10";
    1499             this.Label10.Size = new System.Drawing.Size(31, 13);
    1500             this.Label10.TabIndex = 6;
    1501             this.Label10.Text = "Title:";
    15021504            //
    15031505            // labelStaticSource
     
    15231525            this.flowLayoutPanel1.Size = new System.Drawing.Size(195, 13);
    15241526            this.flowLayoutPanel1.TabIndex = 55;
     1527            //
     1528            // mnu_importMacPreset
     1529            //
     1530            this.mnu_importMacPreset.Name = "mnu_importMacPreset";
     1531            this.mnu_importMacPreset.Size = new System.Drawing.Size(194, 22);
     1532            this.mnu_importMacPreset.Text = "Import";
     1533            this.mnu_importMacPreset.Click += new System.EventHandler(this.mnu_importMacPreset_Click);
     1534            //
     1535            // openPreset
     1536            //
     1537            this.openPreset.DefaultExt = "plist";
     1538            this.openPreset.Filter = "Plist Files|*.plist";
    15251539            //
    15261540            // PictureSettings
     
    17621776        private Label labelStaticSource;
    17631777        private FlowLayoutPanel flowLayoutPanel1;
     1778        private ToolStripMenuItem mnu_importMacPreset;
     1779        private OpenFileDialog openPreset;
    17641780    }
    17651781}
  • win/C#/frmMain.cs

    r742df70 r10842fd  
    367367        {
    368368            loadNormalPreset();
     369        }
     370        private void mnu_importMacPreset_Click(object sender, EventArgs e)
     371        {
     372            Import imp = new Import();
     373            if (openPreset.ShowDialog() == DialogResult.OK)
     374            {
     375                QueryParser parsed = imp.importMacPreset(openPreset.FileName);
     376                PresetLoader.presetLoader(this, parsed, parsed.PresetName, parsed.UsesPictureSettings);
     377            }
    369378        }
    370379        private void btn_new_preset_Click(object sender, EventArgs e)
     
    17071716        #endregion
    17081717
    1709 
    17101718        // This is the END of the road ****************************************
    17111719    }
  • win/C#/frmMain.resx

    r742df70 r10842fd  
    167167    <value>
    168168        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    169         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVDhPlZNdSNNRGMb/F110ZZEVhVBgeeHNICiiuggp
    170         olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdPKMgr7kApFItTUkWZqVhSVYmao5Nev/xyoQ4k88Nyc
    171         8z6/93nP4QjCfy6lwc4ltZVso4P/tMyXRcmMHqZ0EeY6jZQVInzuf0e1Tb9Ina3P/tkpLD6XkNg8BJe5
    172         u93C+HDVrP4M2ZkcMOOw5tLZ9nxJyJE4HSExBoKkBQhVpTrGhso9zNPfiph0JlB+U01ZcRbmwnRMeWlc
    173         08opUCV6QissGsZ+WOY6z4hmuuXglC6pRYBbJSp+fzXNxnaZ66o1s3rkyKHWruJuWRYOcwZ2kxKr8TI3
    174         DCkU6+QYNUnuNGWmLEY+5uOK3degoKZcx3SfEvozPfVB3OtNhi4ZvI2nrTIc23U9gtmYwa8eNXzScq8i
    175         l6bHWnfRwhHeREJzGFONgYw/CeB9qQSZNNR9FyUGBT87lfQ3plJj1zLTq4COGDegLVo0HmeqKZjx+gOM
    176         PNzDYPU2lLF+4jhyN6BIl8pgexK3bRpaXopJuhJEwGloiWDmVSgTLw4xWreXoZrtfK/wp/nKak4E+s6/
    177         hDFHTkd9GndsOdCTBq1i3NdHmWgIYvRpAMO1OxlwSPhi2YpT641CuoWzsSfnAfnZiVRZ1Tjvx9GsF+bU
    178         pF1BvWolD9JXUZmyDnOiD1cvbCZiYXfXCPrMi+gVZ8hOiiL53DHORwdzKnw/hw/uYt9uCTskfvj7+rBp
    179         41rWr/Fig7fX8j/Tsn/fcgx/ARfG3ml6M3rzAAAAAElFTkSuQmCC
     169        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I
     170        k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC
     171        TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p
     172        AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0
     173        BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr
     174        UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG
     175        CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5
     176        F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS
     177        rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt
     178        NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp
     179        59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W
     180        AAAAAElFTkSuQmCC
    180181</value>
    181182  </data>
     
    571572    <value>98</value>
    572573  </metadata>
     574  <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     575    <value>664, 15</value>
     576  </metadata>
     577  <metadata name="openPreset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     578    <value>680, 54</value>
     579  </metadata>
     580  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     581    <value>98</value>
     582  </metadata>
    573583  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    574584    <value>
     
    950960</value>
    951961  </data>
    952   <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    953     <value>664, 15</value>
    954   </metadata>
    955962</root>
Note: See TracChangeset for help on using the changeset viewer.