Merge pull request #4418 from OmrSi/enhance-measurement-converter

Enhance Measurement Converter
This commit is contained in:
Nikolaj Olsson 2020-10-10 12:52:54 +02:00 committed by GitHub
commit d836e9fbe6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 5470 additions and 223 deletions

View File

@ -1583,16 +1583,109 @@ If you have edited this file with Subtitle Edit you might be able to find a back
<ConvertFrom>Convert from</ConvertFrom>
<ConvertTo>Convert to</ConvertTo>
<CopyToClipboard>Copy to clipboard</CopyToClipboard>
<Celsius>Celsius</Celsius>
<Fahrenheit>Fahrenheit</Fahrenheit>
<Miles>Miles</Miles>
<Length>Length</Length>
<Mass>Mass</Mass>
<Volume>Volume</Volume>
<Area>Area</Area>
<Time>Time</Time>
<Temperature>Temperature</Temperature>
<Velocity>Velocity</Velocity>
<Force>Force</Force>
<Energy>Energy</Energy>
<Power>Power</Power>
<Pressure>Pressure</Pressure>
<Kilometers>Kilometers</Kilometers>
<Meters>Meters</Meters>
<Centimeters>Centimeters</Centimeters>
<Millimeters>Millimeters</Millimeters>
<Micrometers>Micrometers</Micrometers>
<Nanometers>Nanometers</Nanometers>
<Angstroms>Angstroms</Angstroms>
<MilesTerrestial>Miles (terrestial)</MilesTerrestial>
<MilesNautical>Miles (nautical)</MilesNautical>
<Yards>Yards</Yards>
<Feet>Feet</Feet>
<Inches>Inches</Inches>
<Chains>Chains</Chains>
<Fathoms>Fathoms</Fathoms>
<Hands>Hands</Hands>
<Rods>Rods</Rods>
<Spans>Spans</Spans>
<LongTonnes>Long tonnes</LongTonnes>
<ShortTonnes>Short tonnes</ShortTonnes>
<Tonnes>Tonnes</Tonnes>
<Kilos>Kilograms</Kilos>
<Grams>Grams</Grams>
<Milligrams>Milligrams</Milligrams>
<Micrograms>Micrograms</Micrograms>
<Pounds>Pounds</Pounds>
<Kilos>Kilos</Kilos>
<Ounces>Ounces</Ounces>
<Carats>Carats</Carats>
<Drams>Drams</Drams>
<Grains>Grains</Grains>
<Stones>Stones</Stones>
<CubicKilometers>Cubic kilometers</CubicKilometers>
<CubicMeters>Cubic meters</CubicMeters>
<Litres>Litres</Litres>
<CubicCentimeters>Cubic centimeters</CubicCentimeters>
<CubicMillimeters>Cubic millimeters</CubicMillimeters>
<CubicMiles>Cubic miles</CubicMiles>
<CubicYards>Cubic yards</CubicYards>
<CubicFTs>Cubic fts</CubicFTs>
<CubicInches>Cubic inches</CubicInches>
<OilBarrels>Oil barrels</OilBarrels>
<GallonUS>Gallon (US)</GallonUS>
<QuartsUS>Quarts (US)</QuartsUS>
<PintsUS>Pints (US)</PintsUS>
<FluidOuncesUS>Fluid ounces (US)</FluidOuncesUS>
<Bushels>Bushels</Bushels>
<Pecks>Pecks</Pecks>
<GallonsUK>Gallons (UK)</GallonsUK>
<QuartsUK>Quarts (UK)</QuartsUK>
<PintsUK>Pints (UK)</PintsUK>
<FluidOuncesUK>Fluid ounces (UK)</FluidOuncesUK>
<SquareKilometers>Square kilometers</SquareKilometers>
<SquareMeters>Square meters</SquareMeters>
<SquareCentimeters>Square Centimeters</SquareCentimeters>
<SquareMillimeters>Square millimeters</SquareMillimeters>
<SquareMiles>Square miles</SquareMiles>
<SquareYards>Square yards</SquareYards>
<SquareFTs>Square fts</SquareFTs>
<SquareInches>Square inches</SquareInches>
<Hectares>Hectares</Hectares>
<Acres>Acres</Acres>
<Ares>Ares</Ares>
<Hours>Hours</Hours>
<Minutes>Minutes</Minutes>
<Seconds>Seconds</Seconds>
<Milliseconds>Milliseconds</Milliseconds>
<Microseconds>Microseconds</Microseconds>
<Fahrenheit>Fahrenheit</Fahrenheit>
<Celsius>Celsius</Celsius>
<Kelvin>Kelvin</Kelvin>
<KilometersPerHour>Kilometers/Hour</KilometersPerHour>
<MetersPerSecond>Meters/Seconds</MetersPerSecond>
<MilesPerHour>Miles/Hour</MilesPerHour>
<YardsPerMinute>Yards/Minute</YardsPerMinute>
<FTsPerSecond>fts/Second</FTsPerSecond>
<Knots>Knots</Knots>
<PoundsForce>Pounds-Force</PoundsForce>
<Newtons>Newtons</Newtons>
<KilosForce>Kilos-Force</KilosForce>
<Jouls>Jouls</Jouls>
<Calories>Calories</Calories>
<Ergs>Ergs</Ergs>
<ElectronVolts>Electron-volts</ElectronVolts>
<Btus>Btus</Btus>
<Watts>Watts</Watts>
<Horsepower>Horsepower</Horsepower>
<Atmospheres>Atmospheres</Atmospheres>
<Bars>Bars</Bars>
<Pascals>Pascals</Pascals>
<MillimetersOfMercury>Millimeters of Mercury</MillimetersOfMercury>
<PoundPerSquareInch>Pound-force per square inch</PoundPerSquareInch>
<KilogramPerSquareCentimeter>Kilogram-force per square centimeter</KilogramPerSquareCentimeter>
<KiloPascals>Kilopascals</KiloPascals>
</MeasurementConverter>
<MergeDoubleLines>
<Title>Merge lines with same text</Title>

View File

@ -1839,16 +1839,121 @@ namespace Nikse.SubtitleEdit.Core
ConvertFrom = "Convert from",
ConvertTo = "Convert to",
CopyToClipboard = "Copy to clipboard",
Celsius = "Celsius",
Fahrenheit = "Fahrenheit",
Miles = "Miles",
Length = "Length",
Mass = "Mass",
Volume = "Volume",
Area = "Area",
Time = "Time",
Temperature = "Temperature",
Velocity = "Velocity",
Force = "Force",
Energy = "Energy",
Power = "Power",
Pressure = "Pressure",
Kilometers = "Kilometers",
Meters = "Meters",
Centimeters = "Centimeters",
Millimeters = "Millimeters",
Micrometers = "Micrometers",
Nanometers = "Nanometers",
Angstroms = "Angstroms",
MilesTerrestial = "Miles (terrestial)",
MilesNautical = "Miles (nautical)",
Yards = "Yards",
Feet = "Feet",
Inches = "Inches",
Chains = "Chains",
Fathoms = "Fathoms",
Hands = "Hands",
Rods = "Rods",
Spans = "Spans",
LongTonnes = "Long tonnes",
ShortTonnes = "Short tonnes",
Tonnes = "Tonnes",
Kilos = "Kilograms",
Grams = "Grams",
Milligrams = "Milligrams",
Micrograms = "Micrograms",
Pounds = "Pounds",
Kilos = "Kilos",
Ounces = "Ounces",
Carats = "Carats",
Drams = "Drams",
Grains = "Grains",
Stones = "Stones",
CubicKilometers = "Cubic kilometers",
CubicMeters = "Cubic meters",
Litres = "Litres",
CubicCentimeters = "Cubic centimeters",
CubicMillimeters = "Cubic millimeters",
CubicMiles = "Cubic miles",
CubicYards = "Cubic yards",
CubicFTs = "Cubic fts",
CubicInches = "Cubic inches",
OilBarrels = "Oil barrels",
GallonUS = "Gallon (US)",
QuartsUS = "Quarts (US)",
PintsUS = "Pints (US)",
FluidOuncesUS = "Fluid ounces (US)",
Bushels = "Bushels",
Pecks = "Pecks",
GallonsUK = "Gallons (UK)",
QuartsUK = "Quarts (UK)",
PintsUK = "Pints (UK)",
FluidOuncesUK = "Fluid ounces (UK)",
SquareKilometers = "Square kilometers",
SquareMeters = "Square meters",
SquareCentimeters = "Square Centimeters",
SquareMillimeters = "Square millimeters",
SquareMiles = "Square miles",
SquareYards = "Square yards",
SquareFTs = "Square fts",
SquareInches = "Square inches",
Hectares = "Hectares",
Acres = "Acres",
Ares = "Ares",
Hours = "Hours",
Minutes = "Minutes",
Seconds = "Seconds",
Milliseconds = "Milliseconds",
Microseconds = "Microseconds",
Fahrenheit = "Fahrenheit",
Celsius = "Celsius",
Kelvin = "Kelvin",
KilometersPerHour = "Kilometers/Hour",
MetersPerSecond = "Meters/Seconds",
MilesPerHour = "Miles/Hour",
YardsPerMinute = "Yards/Minute",
FTsPerSecond = "fts/Second",
Knots = "Knots",
PoundsForce = "Pounds-Force",
Newtons = "Newtons",
KilosForce = "Kilos-Force",
Jouls = "Jouls",
Calories = "Calories",
Ergs = "Ergs",
ElectronVolts = "Electron-volts",
Btus = "Btus",
Watts = "Watts",
Horsepower = "Horsepower",
Atmospheres = "Atmospheres",
Bars = "Bars",
Pascals = "Pascals",
MillimetersOfMercury = "Millimeters of Mercury",
PoundPerSquareInch = "Pound-force per square inch",
KilogramPerSquareCentimeter = "Kilogram-force per square centimeter",
KiloPascals = "Kilopascals"
};
MergeDoubleLines = new LanguageStructure.MergeDoubleLines

View File

@ -4291,14 +4291,38 @@ namespace Nikse.SubtitleEdit.Core
case "MeasurementConverter/CopyToClipboard":
language.MeasurementConverter.CopyToClipboard = reader.Value;
break;
case "MeasurementConverter/Celsius":
language.MeasurementConverter.Celsius = reader.Value;
case "MeasurementConverter/Length":
language.MeasurementConverter.Length = reader.Value;
break;
case "MeasurementConverter/Fahrenheit":
language.MeasurementConverter.Fahrenheit = reader.Value;
case "MeasurementConverter/Mass":
language.MeasurementConverter.Mass = reader.Value;
break;
case "MeasurementConverter/Miles":
language.MeasurementConverter.Miles = reader.Value;
case "MeasurementConverter/Volume":
language.MeasurementConverter.Volume = reader.Value;
break;
case "MeasurementConverter/Area":
language.MeasurementConverter.Area = reader.Value;
break;
case "MeasurementConverter/Time":
language.MeasurementConverter.Time = reader.Value;
break;
case "MeasurementConverter/Temperature":
language.MeasurementConverter.Temperature = reader.Value;
break;
case "MeasurementConverter/Velocity":
language.MeasurementConverter.Velocity = reader.Value;
break;
case "MeasurementConverter/Force":
language.MeasurementConverter.Force = reader.Value;
break;
case "MeasurementConverter/Energy":
language.MeasurementConverter.Energy = reader.Value;
break;
case "MeasurementConverter/Power":
language.MeasurementConverter.Power = reader.Value;
break;
case "MeasurementConverter/Pressure":
language.MeasurementConverter.Pressure = reader.Value;
break;
case "MeasurementConverter/Kilometers":
language.MeasurementConverter.Kilometers = reader.Value;
@ -4306,6 +4330,27 @@ namespace Nikse.SubtitleEdit.Core
case "MeasurementConverter/Meters":
language.MeasurementConverter.Meters = reader.Value;
break;
case "MeasurementConverter/Centimeters":
language.MeasurementConverter.Centimeters = reader.Value;
break;
case "MeasurementConverter/Millimeters":
language.MeasurementConverter.Millimeters = reader.Value;
break;
case "MeasurementConverter/Micrometers":
language.MeasurementConverter.Micrometers = reader.Value;
break;
case "MeasurementConverter/Nanometers":
language.MeasurementConverter.Nanometers = reader.Value;
break;
case "MeasurementConverter/Angstroms":
language.MeasurementConverter.Angstroms = reader.Value;
break;
case "MeasurementConverter/MilesTerrestial":
language.MeasurementConverter.MilesTerrestial = reader.Value;
break;
case "MeasurementConverter/MilesNautical":
language.MeasurementConverter.MilesNautical = reader.Value;
break;
case "MeasurementConverter/Yards":
language.MeasurementConverter.Yards = reader.Value;
break;
@ -4315,12 +4360,246 @@ namespace Nikse.SubtitleEdit.Core
case "MeasurementConverter/Inches":
language.MeasurementConverter.Inches = reader.Value;
break;
case "MeasurementConverter/Pounds":
language.MeasurementConverter.Pounds = reader.Value;
case "MeasurementConverter/Chains":
language.MeasurementConverter.Chains = reader.Value;
break;
case "MeasurementConverter/Fathoms":
language.MeasurementConverter.Fathoms = reader.Value;
break;
case "MeasurementConverter/Hands":
language.MeasurementConverter.Hands = reader.Value;
break;
case "MeasurementConverter/Rods":
language.MeasurementConverter.Rods = reader.Value;
break;
case "MeasurementConverter/Spans":
language.MeasurementConverter.Spans = reader.Value;
break;
case "MeasurementConverter/LongTonnes":
language.MeasurementConverter.LongTonnes = reader.Value;
break;
case "MeasurementConverter/ShortTonnes":
language.MeasurementConverter.ShortTonnes = reader.Value;
break;
case "MeasurementConverter/Tonnes":
language.MeasurementConverter.Tonnes = reader.Value;
break;
case "MeasurementConverter/Kilos":
language.MeasurementConverter.Kilos = reader.Value;
break;
case "MeasurementConverter/Grams":
language.MeasurementConverter.Grams = reader.Value;
break;
case "MeasurementConverter/Milligrams":
language.MeasurementConverter.Milligrams = reader.Value;
break;
case "MeasurementConverter/Micrograms":
language.MeasurementConverter.Micrograms = reader.Value;
break;
case "MeasurementConverter/Pounds":
language.MeasurementConverter.Pounds = reader.Value;
break;
case "MeasurementConverter/Ounces":
language.MeasurementConverter.Ounces = reader.Value;
break;
case "MeasurementConverter/Carats":
language.MeasurementConverter.Carats = reader.Value;
break;
case "MeasurementConverter/Drams":
language.MeasurementConverter.Drams = reader.Value;
break;
case "MeasurementConverter/Grains":
language.MeasurementConverter.Grains = reader.Value;
break;
case "MeasurementConverter/Stones":
language.MeasurementConverter.Stones = reader.Value;
break;
case "MeasurementConverter/CubicKilometers":
language.MeasurementConverter.CubicKilometers = reader.Value;
break;
case "MeasurementConverter/CubicMeters":
language.MeasurementConverter.CubicMeters = reader.Value;
break;
case "MeasurementConverter/Litres":
language.MeasurementConverter.Litres = reader.Value;
break;
case "MeasurementConverter/CubicCentimeters":
language.MeasurementConverter.CubicCentimeters = reader.Value;
break;
case "MeasurementConverter/CubicMillimeters":
language.MeasurementConverter.CubicMillimeters = reader.Value;
break;
case "MeasurementConverter/CubicMiles":
language.MeasurementConverter.CubicMiles = reader.Value;
break;
case "MeasurementConverter/CubicYards":
language.MeasurementConverter.CubicYards = reader.Value;
break;
case "MeasurementConverter/CubicFTs":
language.MeasurementConverter.CubicFTs = reader.Value;
break;
case "MeasurementConverter/CubicInches":
language.MeasurementConverter.CubicInches = reader.Value;
break;
case "MeasurementConverter/OilBarrels":
language.MeasurementConverter.OilBarrels = reader.Value;
break;
case "MeasurementConverter/GallonUS":
language.MeasurementConverter.GallonUS = reader.Value;
break;
case "MeasurementConverter/QuartsUS":
language.MeasurementConverter.QuartsUS = reader.Value;
break;
case "MeasurementConverter/PintsUS":
language.MeasurementConverter.PintsUS = reader.Value;
break;
case "MeasurementConverter/FluidOuncesUS":
language.MeasurementConverter.FluidOuncesUS = reader.Value;
break;
case "MeasurementConverter/Bushels":
language.MeasurementConverter.Bushels = reader.Value;
break;
case "MeasurementConverter/Pecks":
language.MeasurementConverter.Pecks = reader.Value;
break;
case "MeasurementConverter/GallonsUK":
language.MeasurementConverter.GallonsUK = reader.Value;
break;
case "MeasurementConverter/QuartsUK":
language.MeasurementConverter.QuartsUK = reader.Value;
break;
case "MeasurementConverter/PintsUK":
language.MeasurementConverter.PintsUK = reader.Value;
break;
case "MeasurementConverter/FluidOuncesUK":
language.MeasurementConverter.FluidOuncesUK = reader.Value;
break;
case "MeasurementConverter/SquareKilometers":
language.MeasurementConverter.SquareKilometers = reader.Value;
break;
case "MeasurementConverter/SquareMeters":
language.MeasurementConverter.SquareMeters = reader.Value;
break;
case "MeasurementConverter/SquareCentimeters":
language.MeasurementConverter.SquareCentimeters = reader.Value;
break;
case "MeasurementConverter/SquareMillimeters":
language.MeasurementConverter.SquareMillimeters = reader.Value;
break;
case "MeasurementConverter/SquareMiles":
language.MeasurementConverter.SquareMiles = reader.Value;
break;
case "MeasurementConverter/SquareYards":
language.MeasurementConverter.SquareYards = reader.Value;
break;
case "MeasurementConverter/SquareFTs":
language.MeasurementConverter.SquareFTs = reader.Value;
break;
case "MeasurementConverter/SquareInches":
language.MeasurementConverter.SquareInches = reader.Value;
break;
case "MeasurementConverter/Hectares":
language.MeasurementConverter.Hectares = reader.Value;
break;
case "MeasurementConverter/Acres":
language.MeasurementConverter.Acres = reader.Value;
break;
case "MeasurementConverter/Ares":
language.MeasurementConverter.Ares = reader.Value;
break;
case "MeasurementConverter/Hours":
language.MeasurementConverter.Hours = reader.Value;
break;
case "MeasurementConverter/Minutes":
language.MeasurementConverter.Minutes = reader.Value;
break;
case "MeasurementConverter/Seconds":
language.MeasurementConverter.Seconds = reader.Value;
break;
case "MeasurementConverter/Milliseconds":
language.MeasurementConverter.Milliseconds = reader.Value;
break;
case "MeasurementConverter/Microseconds":
language.MeasurementConverter.Microseconds = reader.Value;
break;
case "MeasurementConverter/Fahrenheit":
language.MeasurementConverter.Fahrenheit = reader.Value;
break;
case "MeasurementConverter/Celsius":
language.MeasurementConverter.Celsius = reader.Value;
break;
case "MeasurementConverter/Kelvin":
language.MeasurementConverter.Kelvin = reader.Value;
break;
case "MeasurementConverter/KilometersPerHour":
language.MeasurementConverter.KilometersPerHour = reader.Value;
break;
case "MeasurementConverter/MetersPerSecond":
language.MeasurementConverter.MetersPerSecond = reader.Value;
break;
case "MeasurementConverter/MilesPerHour":
language.MeasurementConverter.MilesPerHour = reader.Value;
break;
case "MeasurementConverter/YardsPerMinute":
language.MeasurementConverter.YardsPerMinute = reader.Value;
break;
case "MeasurementConverter/FTsPerSecond":
language.MeasurementConverter.FTsPerSecond = reader.Value;
break;
case "MeasurementConverter/Knots":
language.MeasurementConverter.Knots = reader.Value;
break;
case "MeasurementConverter/PoundsForce":
language.MeasurementConverter.PoundsForce = reader.Value;
break;
case "MeasurementConverter/Newtons":
language.MeasurementConverter.Newtons = reader.Value;
break;
case "MeasurementConverter/KilosForce":
language.MeasurementConverter.KilosForce = reader.Value;
break;
case "MeasurementConverter/Jouls":
language.MeasurementConverter.Jouls = reader.Value;
break;
case "MeasurementConverter/Calories":
language.MeasurementConverter.Calories = reader.Value;
break;
case "MeasurementConverter/Ergs":
language.MeasurementConverter.Ergs = reader.Value;
break;
case "MeasurementConverter/ElectronVolts":
language.MeasurementConverter.ElectronVolts = reader.Value;
break;
case "MeasurementConverter/Btus":
language.MeasurementConverter.Btus = reader.Value;
break;
case "MeasurementConverter/Watts":
language.MeasurementConverter.Watts = reader.Value;
break;
case "MeasurementConverter/Horsepower":
language.MeasurementConverter.Horsepower = reader.Value;
break;
case "MeasurementConverter/Atmospheres":
language.MeasurementConverter.Atmospheres = reader.Value;
break;
case "MeasurementConverter/Bars":
language.MeasurementConverter.Bars = reader.Value;
break;
case "MeasurementConverter/Pascals":
language.MeasurementConverter.Pascals = reader.Value;
break;
case "MeasurementConverter/MillimetersOfMercury":
language.MeasurementConverter.MillimetersOfMercury = reader.Value;
break;
case "MeasurementConverter/PoundPerSquareInch":
language.MeasurementConverter.PoundPerSquareInch = reader.Value;
break;
case "MeasurementConverter/KilogramPerSquareCentimeter":
language.MeasurementConverter.KilogramPerSquareCentimeter = reader.Value;
break;
case "MeasurementConverter/KiloPascals":
language.MeasurementConverter.KiloPascals = reader.Value;
break;
case "MergeDoubleLines/Title":
language.MergeDoubleLines.Title = reader.Value;
break;

View File

@ -1710,16 +1710,109 @@
public string ConvertFrom { get; set; }
public string ConvertTo { get; set; }
public string CopyToClipboard { get; set; }
public string Celsius { get; set; }
public string Fahrenheit { get; set; }
public string Miles { get; set; }
public string Length { get; set; }
public string Mass { get; set; }
public string Volume { get; set; }
public string Area { get; set; }
public string Time { get; set; }
public string Temperature { get; set; }
public string Velocity { get; set; }
public string Force { get; set; }
public string Energy { get; set; }
public string Power { get; set; }
public string Pressure { get; set; }
public string Kilometers { get; set; }
public string Meters { get; set; }
public string Centimeters { get; set; }
public string Millimeters { get; set; }
public string Micrometers { get; set; }
public string Nanometers { get; set; }
public string Angstroms { get; set; }
public string MilesTerrestial { get; set; }
public string MilesNautical { get; set; }
public string Yards { get; set; }
public string Feet { get; set; }
public string Inches { get; set; }
public string Pounds { get; set; }
public string Chains { get; set; }
public string Fathoms { get; set; }
public string Hands { get; set; }
public string Rods { get; set; }
public string Spans { get; set; }
public string LongTonnes { get; set; }
public string ShortTonnes { get; set; }
public string Tonnes { get; set; }
public string Kilos { get; set; }
public string Grams { get; set; }
public string Milligrams { get; set; }
public string Micrograms { get; set; }
public string Pounds { get; set; }
public string Ounces { get; set; }
public string Carats { get; set; }
public string Drams { get; set; }
public string Grains { get; set; }
public string Stones { get; set; }
public string CubicKilometers { get; set; }
public string CubicMeters { get; set; }
public string Litres { get; set; }
public string CubicCentimeters { get; set; }
public string CubicMillimeters { get; set; }
public string CubicMiles { get; set; }
public string CubicYards { get; set; }
public string CubicFTs { get; set; }
public string CubicInches { get; set; }
public string OilBarrels { get; set; }
public string GallonUS { get; set; }
public string QuartsUS { get; set; }
public string PintsUS { get; set; }
public string FluidOuncesUS { get; set; }
public string Bushels { get; set; }
public string Pecks { get; set; }
public string GallonsUK { get; set; }
public string QuartsUK { get; set; }
public string PintsUK { get; set; }
public string FluidOuncesUK { get; set; }
public string SquareKilometers { get; set; }
public string SquareMeters { get; set; }
public string SquareCentimeters { get; set; }
public string SquareMillimeters { get; set; }
public string SquareMiles { get; set; }
public string SquareYards { get; set; }
public string SquareFTs { get; set; }
public string SquareInches { get; set; }
public string Hectares { get; set; }
public string Acres { get; set; }
public string Ares { get; set; }
public string Hours { get; set; }
public string Minutes { get; set; }
public string Seconds { get; set; }
public string Milliseconds { get; set; }
public string Microseconds { get; set; }
public string Fahrenheit { get; set; }
public string Celsius { get; set; }
public string Kelvin { get; set; }
public string KilometersPerHour { get; set; }
public string MetersPerSecond { get; set; }
public string MilesPerHour { get; set; }
public string YardsPerMinute { get; set; }
public string FTsPerSecond { get; set; }
public string Knots { get; set; }
public string PoundsForce { get; set; }
public string Newtons { get; set; }
public string KilosForce { get; set; }
public string Jouls { get; set; }
public string Calories { get; set; }
public string Ergs { get; set; }
public string ElectronVolts { get; set; }
public string Btus { get; set; }
public string Watts { get; set; }
public string Horsepower { get; set; }
public string Atmospheres { get; set; }
public string Bars { get; set; }
public string Pascals { get; set; }
public string MillimetersOfMercury { get; set; }
public string PoundPerSquareInch { get; set; }
public string KilogramPerSquareCentimeter { get; set; }
public string KiloPascals { get; set; }
}
public class MergeDoubleLines

View File

@ -1136,6 +1136,8 @@ $HorzAlign = Center
public bool ShowFormatRequiresUtf8Warning { get; set; }
public long CurrentVideoOffsetInMs { get; set; }
public string TitleBarAsterisk { get; set; } // Show asteriks "before" or "after" file name (any other value will hide asteriks)
public bool MeasurementConverterCloseOnInsert { get; set; }
public string MeasurementConverterCategories { get; set; }
public bool UseDarkTheme { get; set; }
public bool ShowBetaStuff { get; set; }
@ -1263,6 +1265,8 @@ $HorzAlign = Center
ShowFormatRequiresUtf8Warning = true;
UseDarkTheme = false;
TitleBarAsterisk = "before";
MeasurementConverterCloseOnInsert = true;
MeasurementConverterCategories = "Length;Kilometers;Meters";
PreviewAssaText = "ABCDEFGHIJKL abcdefghijkl 123";
ShowBetaStuff = false;
NewEmptyDefaultMs = 2000;
@ -1806,6 +1810,7 @@ $HorzAlign = Center
public string MainToolsChangeCasing { get; set; }
public string MainToolsAutoDuration { get; set; }
public string MainToolsBatchConvert { get; set; }
public string MainToolsMeasurementConverter { get; set; }
public string MainToolsSplit { get; set; }
public string MainToolsAppend { get; set; }
public string MainToolsJoin { get; set; }
@ -3379,6 +3384,18 @@ $HorzAlign = Center
settings.General.TitleBarAsterisk = subNode.InnerText.Trim();
}
subNode = node.SelectSingleNode("MeasurementConverterCloseOnInsert");
if (subNode != null)
{
settings.General.MeasurementConverterCloseOnInsert = Convert.ToBoolean(subNode.InnerText.Trim());
}
subNode = node.SelectSingleNode("MeasurementConverterCategories");
if (subNode != null)
{
settings.General.MeasurementConverterCategories = subNode.InnerText.Trim();
}
subNode = node.SelectSingleNode("UseDarkTheme");
if (subNode != null)
{
@ -6159,6 +6176,12 @@ $HorzAlign = Center
settings.Shortcuts.MainToolsBatchConvert = subNode.InnerText;
}
subNode = node.SelectSingleNode("MainToolsMeasurementConverter");
if (subNode != null)
{
settings.Shortcuts.MainToolsMeasurementConverter = subNode.InnerText;
}
subNode = node.SelectSingleNode("MainToolsSplit");
if (subNode != null)
{
@ -7611,6 +7634,8 @@ $HorzAlign = Center
textWriter.WriteElementString("ShowNegativeDurationInfoOnSave", settings.General.ShowNegativeDurationInfoOnSave.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ShowFormatRequiresUtf8Warning", settings.General.ShowFormatRequiresUtf8Warning.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("TitleBarAsterisk", settings.General.TitleBarAsterisk);
textWriter.WriteElementString("MeasurementConverterCloseOnInsert", settings.General.MeasurementConverterCloseOnInsert.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("MeasurementConverterCategories", settings.General.MeasurementConverterCategories);
textWriter.WriteElementString("UseDarkTheme", settings.General.UseDarkTheme.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ShowBetaStuff", settings.General.ShowBetaStuff.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("NewEmptyDefaultMs", settings.General.NewEmptyDefaultMs.ToString(CultureInfo.InvariantCulture));
@ -8128,6 +8153,7 @@ $HorzAlign = Center
textWriter.WriteElementString("MainToolsChangeCasing", settings.Shortcuts.MainToolsChangeCasing);
textWriter.WriteElementString("MainToolsAutoDuration", settings.Shortcuts.MainToolsAutoDuration);
textWriter.WriteElementString("MainToolsBatchConvert", settings.Shortcuts.MainToolsBatchConvert);
textWriter.WriteElementString("MainToolsMeasurementConverter", settings.Shortcuts.MainToolsMeasurementConverter);
textWriter.WriteElementString("MainToolsSplit", settings.Shortcuts.MainToolsSplit);
textWriter.WriteElementString("MainToolsAppend", settings.Shortcuts.MainToolsAppend);
textWriter.WriteElementString("MainToolsJoin", settings.Shortcuts.MainToolsJoin);

View File

@ -118,6 +118,7 @@ namespace Nikse.SubtitleEdit.Forms
private NetworkChat _networkChat;
private ShowEarlierLater _showEarlierOrLater;
private MeasurementConverter _measurementConverter;
private bool _isVideoControlsUndocked;
private VideoPlayerUndocked _videoPlayerUndocked;
@ -20429,7 +20430,6 @@ namespace Nikse.SubtitleEdit.Forms
toolStripMenuItemInverseSelection.Visible = showBeta;
toolStripMenuItemSpellCheckFromCurrentLine.Visible = showBeta;
toolStripMenuItemImportOcrHardSub.Visible = showBeta;
toolStripMenuItemMeasurementConverter.Visible = showBeta;
toolStripMenuItemOpenDvd.Visible = showBeta;
if (Configuration.Settings.General.StartRememberPositionAndSize &&
@ -20652,6 +20652,7 @@ namespace Nikse.SubtitleEdit.Forms
ChangeCasingToolStripMenuItem.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainToolsChangeCasing);
toolStripMenuItemShowOriginalInPreview.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainEditToggleTranslationOriginalInPreviews);
toolStripMenuItemBatchConvert.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainToolsBatchConvert);
toolStripMenuItemMeasurementConverter.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainToolsMeasurementConverter);
splitToolStripMenuItem.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainToolsSplit);
appendTextVisuallyToolStripMenuItem.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainToolsAppend);
joinSubtitlesToolStripMenuItem.ShortcutKeys = UiUtil.GetKeys(Configuration.Settings.Shortcuts.MainToolsJoin);
@ -26775,8 +26776,46 @@ namespace Nikse.SubtitleEdit.Forms
private void toolStripMenuItemMeasurementConverter_Click(object sender, EventArgs e)
{
var form = new MeasurementConverter();
form.Show(this);
var selectedText = string.Empty;
if (tabControlSubtitle.SelectedIndex == TabControlSourceView)
{
selectedText = textBoxSource.SelectedText;
}
else
{
if (textBoxListViewTextAlternate.Focused)
{
selectedText = textBoxListViewTextAlternate.SelectedText;
}
else
{
selectedText = textBoxListViewText.SelectedText;
}
}
if (_measurementConverter != null && !_measurementConverter.IsDisposed)
{
_measurementConverter.WindowState = FormWindowState.Normal;
_measurementConverter.Input = selectedText;
_measurementConverter.Focus();
return;
}
_measurementConverter = new MeasurementConverter
{
Input = selectedText
};
_measurementConverter.Show(this);
_measurementConverter.ReplaceClicked += measurementConverter_ReplaceClicked;
}
private void measurementConverter_ReplaceClicked(object sender, MeasurementConverter.ReplaceEventArgs e)
{
if (IsSubtitleLoaded)
{
textBoxListViewText.SelectedText = e.Result;
}
}
private void toolStripMenuItemImportSceneChanges_Click(object sender, EventArgs e)

View File

@ -28,107 +28,146 @@
/// </summary>
private void InitializeComponent()
{
this.buttonOK = new System.Windows.Forms.Button();
this.comboBoxFrom = new System.Windows.Forms.ComboBox();
this.listBoxCategory = new System.Windows.Forms.ListBox();
this.labelConvertFrom = new System.Windows.Forms.Label();
this.comboBoxTo = new System.Windows.Forms.ComboBox();
this.comboBoxFrom = new System.Windows.Forms.ComboBox();
this.textBoxInput = new System.Windows.Forms.TextBox();
this.labelConvertTo = new System.Windows.Forms.Label();
this.comboBoxTo = new System.Windows.Forms.ComboBox();
this.textBoxResult = new System.Windows.Forms.TextBox();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.textBoxInput = new System.Windows.Forms.TextBox();
this.checkBoxCloseOnInsert = new System.Windows.Forms.CheckBox();
this.buttonReplace = new System.Windows.Forms.Button();
this.buttonOK = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// buttonOK
// listBoxCategory
//
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonOK.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.buttonOK.Location = new System.Drawing.Point(323, 143);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(75, 23);
this.buttonOK.TabIndex = 2;
this.buttonOK.Text = "&OK";
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
this.listBoxCategory.FormattingEnabled = true;
this.listBoxCategory.ItemHeight = 16;
this.listBoxCategory.Location = new System.Drawing.Point(10, 10);
this.listBoxCategory.Name = "listBoxCategory";
this.listBoxCategory.Size = new System.Drawing.Size(106, 170);
this.listBoxCategory.TabIndex = 0;
this.listBoxCategory.SelectedIndexChanged += new System.EventHandler(this.listBoxCategory_SelectedIndexChanged);
this.listBoxCategory.LostFocus += new System.EventHandler(this.listBoxCategory_LostFocus);
//
// labelConvertFrom
//
this.labelConvertFrom.AutoSize = true;
this.labelConvertFrom.Location = new System.Drawing.Point(124, 32);
this.labelConvertFrom.Name = "labelConvertFrom";
this.labelConvertFrom.Size = new System.Drawing.Size(89, 17);
this.labelConvertFrom.TabIndex = 1;
this.labelConvertFrom.Text = "Convert from:";
//
// comboBoxFrom
//
this.comboBoxFrom.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxFrom.FormattingEnabled = true;
this.comboBoxFrom.Location = new System.Drawing.Point(22, 43);
this.comboBoxFrom.Location = new System.Drawing.Point(127, 54);
this.comboBoxFrom.Name = "comboBoxFrom";
this.comboBoxFrom.Size = new System.Drawing.Size(182, 21);
this.comboBoxFrom.TabIndex = 3;
this.comboBoxFrom.Size = new System.Drawing.Size(132, 24);
this.comboBoxFrom.TabIndex = 2;
this.comboBoxFrom.SelectedIndexChanged += new System.EventHandler(this.comboBoxFrom_SelectedIndexChanged);
//
// labelConvertFrom
// textBoxInput
//
this.labelConvertFrom.AutoSize = true;
this.labelConvertFrom.Location = new System.Drawing.Point(22, 24);
this.labelConvertFrom.Name = "labelConvertFrom";
this.labelConvertFrom.Size = new System.Drawing.Size(67, 13);
this.labelConvertFrom.TabIndex = 4;
this.labelConvertFrom.Text = "Convert from";
this.textBoxInput.Location = new System.Drawing.Point(127, 86);
this.textBoxInput.Name = "textBoxInput";
this.textBoxInput.Size = new System.Drawing.Size(132, 22);
this.textBoxInput.TabIndex = 3;
this.textBoxInput.TextChanged += new System.EventHandler(this.textBoxInput_TextChanged);
this.textBoxInput.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBoxInput_KeyPress);
this.textBoxInput.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxInput_KeyUp);
//
// labelConvertTo
//
this.labelConvertTo.AutoSize = true;
this.labelConvertTo.Location = new System.Drawing.Point(264, 32);
this.labelConvertTo.Name = "labelConvertTo";
this.labelConvertTo.Size = new System.Drawing.Size(56, 13);
this.labelConvertTo.TabIndex = 4;
this.labelConvertTo.Text = "Convert to:";
//
// comboBoxTo
//
this.comboBoxTo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxTo.FormattingEnabled = true;
this.comboBoxTo.Location = new System.Drawing.Point(210, 43);
this.comboBoxTo.Location = new System.Drawing.Point(267, 54);
this.comboBoxTo.Name = "comboBoxTo";
this.comboBoxTo.Size = new System.Drawing.Size(182, 21);
this.comboBoxTo.Size = new System.Drawing.Size(132, 24);
this.comboBoxTo.TabIndex = 5;
this.comboBoxTo.SelectedIndexChanged += new System.EventHandler(this.comboBoxTo_SelectedIndexChanged);
//
// labelConvertTo
//
this.labelConvertTo.AutoSize = true;
this.labelConvertTo.Location = new System.Drawing.Point(207, 27);
this.labelConvertTo.Name = "labelConvertTo";
this.labelConvertTo.Size = new System.Drawing.Size(56, 13);
this.labelConvertTo.TabIndex = 6;
this.labelConvertTo.Text = "Convert to";
//
// textBoxResult
//
this.textBoxResult.Location = new System.Drawing.Point(211, 70);
this.textBoxResult.Location = new System.Drawing.Point(267, 86);
this.textBoxResult.Name = "textBoxResult";
this.textBoxResult.ReadOnly = true;
this.textBoxResult.Size = new System.Drawing.Size(181, 20);
this.textBoxResult.TabIndex = 8;
this.textBoxResult.Size = new System.Drawing.Size(132, 22);
this.textBoxResult.TabIndex = 6;
//
// linkLabel1
//
this.linkLabel1.Location = new System.Drawing.Point(211, 97);
this.linkLabel1.Location = new System.Drawing.Point(218, 112);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(181, 23);
this.linkLabel1.TabIndex = 9;
this.linkLabel1.TabIndex = 7;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "Copy to clipboard";
this.linkLabel1.TextAlign = System.Drawing.ContentAlignment.TopRight;
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// textBoxInput
// checkBoxCloseOnInsert
//
this.textBoxInput.Location = new System.Drawing.Point(25, 69);
this.textBoxInput.Name = "textBoxInput";
this.textBoxInput.Size = new System.Drawing.Size(179, 20);
this.textBoxInput.TabIndex = 10;
this.textBoxInput.TextChanged += new System.EventHandler(this.textBoxInput_TextChanged);
this.textBoxInput.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBoxInput_KeyPress);
this.textBoxInput.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxInput_KeyUp);
this.checkBoxCloseOnInsert.AutoSize = true;
this.checkBoxCloseOnInsert.Location = new System.Drawing.Point(127, 158);
this.checkBoxCloseOnInsert.Name = "checkBoxCloseOnInsert";
this.checkBoxCloseOnInsert.Size = new System.Drawing.Size(83, 17);
this.checkBoxCloseOnInsert.TabIndex = 8;
this.checkBoxCloseOnInsert.Text = "Close on insert";
this.checkBoxCloseOnInsert.UseVisualStyleBackColor = true;
//
// buttonReplace
//
this.buttonReplace.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonReplace.DialogResult = System.Windows.Forms.DialogResult.Yes;
this.buttonReplace.Location = new System.Drawing.Point(245, 155);
this.buttonReplace.Name = "buttonInsert";
this.buttonReplace.Size = new System.Drawing.Size(75, 23);
this.buttonReplace.TabIndex = 9;
this.buttonReplace.Text = "&Insert";
this.buttonReplace.UseVisualStyleBackColor = true;
this.buttonReplace.Click += new System.EventHandler(this.buttonReplace_Click);
//
// buttonOK
//
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonOK.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.buttonOK.Location = new System.Drawing.Point(323, 155);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(75, 23);
this.buttonOK.TabIndex = 10;
this.buttonOK.Text = "&OK";
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
//
// MeasurementConverter
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(410, 178);
this.Controls.Add(this.textBoxInput);
this.Controls.Add(this.linkLabel1);
this.Controls.Add(this.textBoxResult);
this.Controls.Add(this.labelConvertTo);
this.Controls.Add(this.comboBoxTo);
this.ClientSize = new System.Drawing.Size(410, 190);
this.Controls.Add(this.listBoxCategory);
this.Controls.Add(this.labelConvertFrom);
this.Controls.Add(this.comboBoxFrom);
this.Controls.Add(this.textBoxInput);
this.Controls.Add(this.labelConvertTo);
this.Controls.Add(this.comboBoxTo);
this.Controls.Add(this.textBoxResult);
this.Controls.Add(this.linkLabel1);
this.Controls.Add(this.checkBoxCloseOnInsert);
this.Controls.Add(this.buttonReplace);
this.Controls.Add(this.buttonOK);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.KeyPreview = true;
@ -136,8 +175,13 @@
this.MinimizeBox = false;
this.Name = "MeasurementConverter";
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Measurement converter";
this.Activated += new System.EventHandler(this.MeasurementConverter_Activated);
this.Deactivate += new System.EventHandler(this.MeasurementConverter_Deactivate);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MeasurementConverter_FormClosed);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MeasurementConverter_KeyDown);
this.ResumeLayout(false);
this.PerformLayout();
@ -145,13 +189,16 @@
#endregion
private System.Windows.Forms.Button buttonOK;
private System.Windows.Forms.ComboBox comboBoxFrom;
private System.Windows.Forms.ListBox listBoxCategory;
private System.Windows.Forms.Label labelConvertFrom;
private System.Windows.Forms.ComboBox comboBoxTo;
private System.Windows.Forms.ComboBox comboBoxFrom;
private System.Windows.Forms.TextBox textBoxInput;
private System.Windows.Forms.Label labelConvertTo;
private System.Windows.Forms.ComboBox comboBoxTo;
private System.Windows.Forms.TextBox textBoxResult;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.TextBox textBoxInput;
private System.Windows.Forms.CheckBox checkBoxCloseOnInsert;
private System.Windows.Forms.Button buttonReplace;
private System.Windows.Forms.Button buttonOK;
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1181,6 +1181,7 @@ namespace Nikse.SubtitleEdit.Forms
AddNode(toolsNode, Configuration.Settings.Language.Main.Menu.Tools.MergeSameTimeCodes, nameof(Configuration.Settings.Shortcuts.MainToolsMergeSameTimeCodes), true);
AddNode(toolsNode, Configuration.Settings.Language.Main.Menu.Tools.SplitLongLines, nameof(Configuration.Settings.Shortcuts.MainToolsSplitLongLines), true);
AddNode(toolsNode, Configuration.Settings.Language.Main.Menu.Tools.BatchConvert, nameof(Configuration.Settings.Shortcuts.MainToolsBatchConvert));
AddNode(toolsNode, Configuration.Settings.Language.Main.Menu.Tools.MeasurementConverter, nameof(Configuration.Settings.Shortcuts.MainToolsMeasurementConverter), true);
AddNode(toolsNode, Configuration.Settings.Language.Main.Menu.Tools.SplitSubtitle, nameof(Configuration.Settings.Shortcuts.MainToolsSplit), true);
AddNode(toolsNode, Configuration.Settings.Language.Main.Menu.Tools.AppendSubtitle, nameof(Configuration.Settings.Shortcuts.MainToolsAppend), true);
AddNode(toolsNode, Configuration.Settings.Language.Main.Menu.Tools.JoinSubtitles, nameof(Configuration.Settings.Shortcuts.MainToolsJoin), true);