Changeset 160032f


Ignore:
Timestamp:
07/18/10 16:38:23 (6 years ago)
Author:
sr55 <sr55.hb@…>
Branches:
master
Children:
06d7190
Parents:
706ac8f
Message:

WinGui:

  • Fix 2010 sln, rebuild resharper files.

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

Location:
win/C#
Files:
3 added
7 edited

Legend:

Unmodified
Added
Removed
  • win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj

    r706ac8f r160032f  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     15    <FileUpgradeFlags>
     16    </FileUpgradeFlags>
     17    <OldToolsVersion>3.5</OldToolsVersion>
     18    <UpgradeBackupLocation />
    1519  </PropertyGroup>
    1620  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  • win/C#/HandBrake.ApplicationServices/Properties/Resources.Designer.cs

    r0c9a71f r160032f  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.4927
     4//     Runtime Version:4.0.30319.1
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    2020    // To add or remove a member, edit your .ResX file then rerun ResGen
    2121    // with the /str option, or rebuild your VS project.
    22     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
     22    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    2323    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    2424    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    25     internal class Resources {
     25    public class Resources {
    2626       
    2727        private static global::System.Resources.ResourceManager resourceMan;
     
    3737        /// </summary>
    3838        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
    39         internal static global::System.Resources.ResourceManager ResourceManager {
     39        public static global::System.Resources.ResourceManager ResourceManager {
    4040            get {
    4141                if (object.ReferenceEquals(resourceMan, null)) {
     
    5252        /// </summary>
    5353        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
    54         internal static global::System.Globalization.CultureInfo Culture {
     54        public static global::System.Globalization.CultureInfo Culture {
    5555            get {
    5656                return resourceCulture;
     
    6161        }
    6262       
    63         internal static System.Drawing.Bitmap copy {
     63        public static System.Drawing.Bitmap copy {
    6464            get {
    6565                object obj = ResourceManager.GetObject("copy", resourceCulture);
     
    6868        }
    6969       
    70         internal static System.Drawing.Bitmap ErrorX {
     70        public static System.Drawing.Bitmap ErrorX {
    7171            get {
    7272                object obj = ResourceManager.GetObject("ErrorX", resourceCulture);
     
    7575        }
    7676       
    77         internal static System.Drawing.Bitmap logo64 {
     77        public static System.Drawing.Bitmap logo64 {
    7878            get {
    7979                object obj = ResourceManager.GetObject("logo64", resourceCulture);
  • win/C#/HandBrakeCS.csproj

    r561aa6e r160032f  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
     2<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
    33  <PropertyGroup>
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
  • win/C#/Properties/Resources.Designer.cs

    r4cacc7fd r160032f  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.4927
     4//     Runtime Version:4.0.30319.1
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    2020    // To add or remove a member, edit your .ResX file then rerun ResGen
    2121    // with the /str option, or rebuild your VS project.
    22     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
     22    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    2323    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    2424    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
  • win/C#/Properties/Settings.Designer.cs

    r07de1ce r160032f  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.4927
     4//     Runtime Version:4.0.30319.1
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    1313   
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
    1616    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
    1717       
  • win/C#/frmMain.Designer.cs

    r4cacc7fd r160032f  
    4040            System.Windows.Forms.ContextMenuStrip notifyIconMenu;
    4141            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
    42             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
     42            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
    4343            this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();
    4444            this.DVD_Save = new System.Windows.Forms.SaveFileDialog();
     
    280280            this.check_turbo.Location = new System.Drawing.Point(146, 143);
    281281            this.check_turbo.Name = "check_turbo";
    282             this.check_turbo.Size = new System.Drawing.Size(101, 17);
     282            this.check_turbo.Size = new System.Drawing.Size(99, 17);
    283283            this.check_turbo.TabIndex = 7;
    284284            this.check_turbo.Text = "Turbo first Pass";
     
    405405            // number
    406406            //
    407             dataGridViewCellStyle2.Format = "N0";
    408             dataGridViewCellStyle2.NullValue = null;
    409             this.number.DefaultCellStyle = dataGridViewCellStyle2;
     407            dataGridViewCellStyle1.Format = "N0";
     408            dataGridViewCellStyle1.NullValue = null;
     409            this.number.DefaultCellStyle = dataGridViewCellStyle1;
    410410            this.number.Frozen = true;
    411411            this.number.HeaderText = "Chapter Number";
     
    874874            this.checkMaximumFramerate.Location = new System.Drawing.Point(125, 89);
    875875            this.checkMaximumFramerate.Name = "checkMaximumFramerate";
    876             this.checkMaximumFramerate.Size = new System.Drawing.Size(132, 17);
     876            this.checkMaximumFramerate.Size = new System.Drawing.Size(131, 17);
    877877            this.checkMaximumFramerate.TabIndex = 19;
    878878            this.checkMaximumFramerate.Text = "Peak Framerate (VFR)";
     
    885885            this.radio_cq.Location = new System.Drawing.Point(365, 97);
    886886            this.radio_cq.Name = "radio_cq";
    887             this.radio_cq.Size = new System.Drawing.Size(110, 17);
     887            this.radio_cq.Size = new System.Drawing.Size(105, 17);
    888888            this.radio_cq.TabIndex = 18;
    889889            this.radio_cq.Text = "Constant Quality:";
     
    898898            this.radio_avgBitrate.Location = new System.Drawing.Point(365, 64);
    899899            this.radio_avgBitrate.Name = "radio_avgBitrate";
    900             this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17);
     900            this.radio_avgBitrate.Size = new System.Drawing.Size(112, 17);
    901901            this.radio_avgBitrate.TabIndex = 17;
    902902            this.radio_avgBitrate.TabStop = true;
     
    911911            this.radio_targetFilesize.Location = new System.Drawing.Point(365, 37);
    912912            this.radio_targetFilesize.Name = "radio_targetFilesize";
    913             this.radio_targetFilesize.Size = new System.Drawing.Size(108, 17);
     913            this.radio_targetFilesize.Size = new System.Drawing.Size(107, 17);
    914914            this.radio_targetFilesize.TabIndex = 16;
    915915            this.radio_targetFilesize.Text = "Target Size (MB):";
     
    934934            this.check_2PassEncode.Location = new System.Drawing.Point(125, 120);
    935935            this.check_2PassEncode.Name = "check_2PassEncode";
    936             this.check_2PassEncode.Size = new System.Drawing.Size(104, 17);
     936            this.check_2PassEncode.Size = new System.Drawing.Size(106, 17);
    937937            this.check_2PassEncode.TabIndex = 6;
    938938            this.check_2PassEncode.Text = "2-Pass Encoding";
     
    10021002            this.Check_ChapterMarkers.Location = new System.Drawing.Point(16, 32);
    10031003            this.Check_ChapterMarkers.Name = "Check_ChapterMarkers";
    1004             this.Check_ChapterMarkers.Size = new System.Drawing.Size(140, 17);
     1004            this.Check_ChapterMarkers.Size = new System.Drawing.Size(136, 17);
    10051005            this.Check_ChapterMarkers.TabIndex = 1;
    10061006            this.Check_ChapterMarkers.Text = "Create chapter markers";
     
    12261226            this.treeView_presets.Size = new System.Drawing.Size(240, 424);
    12271227            this.treeView_presets.TabIndex = 0;
    1228             this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp);
    12291228            this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);
    12301229            this.treeView_presets.KeyUp += new System.Windows.Forms.KeyEventHandler(this.treeView_presets_deleteKey);
     1230            this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp);
    12311231            //
    12321232            // presets_menu
  • win/C#/frmMain.resx

    red057cf r160032f  
    118118    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    119119  </resheader>
     120  <metadata name="notifyIconMenu.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     121    <value>False</value>
     122  </metadata>
    120123  <metadata name="notifyIconMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    121124    <value>17, 54</value>
    122   </metadata>
    123   <metadata name="notifyIconMenu.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    124     <value>False</value>
    125125  </metadata>
    126126  <metadata name="DVD_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
Note: See TracChangeset for help on using the changeset viewer.