diff --git a/butterflow-ui/ButterflowOption.xaml b/butterflow-ui/ButterflowOption.xaml
index 26e5603..0708388 100644
--- a/butterflow-ui/ButterflowOption.xaml
+++ b/butterflow-ui/ButterflowOption.xaml
@@ -14,9 +14,9 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/butterflow-ui/ButterflowOption.xaml.cs b/butterflow-ui/ButterflowOption.xaml.cs
index b2cd56f..8d90c10 100644
--- a/butterflow-ui/ButterflowOption.xaml.cs
+++ b/butterflow-ui/ButterflowOption.xaml.cs
@@ -22,11 +22,11 @@ namespace butterflow_ui
{
#region Properties
- public String LabelValue
+ public string LabelValue
{
get
{
- return (String)GetValue(LabelValueProperty);
+ return (string)GetValue(LabelValueProperty);
}
set
{
@@ -38,7 +38,7 @@ namespace butterflow_ui
#region Dependency Properties
- public static DependencyProperty LabelValueProperty = DependencyProperty.Register("LabelProperty", typeof(String), typeof(ButterflowOption));
+ public static DependencyProperty LabelValueProperty = DependencyProperty.Register("LabelProperty", typeof(string), typeof(ButterflowOption));
#endregion
diff --git a/butterflow-ui/Localization/Localization.Designer.cs b/butterflow-ui/Localization/Localization.Designer.cs
index 233e4ec..5086917 100644
--- a/butterflow-ui/Localization/Localization.Designer.cs
+++ b/butterflow-ui/Localization/Localization.Designer.cs
@@ -60,6 +60,69 @@ namespace butterflow_ui.Localization {
}
}
+ ///
+ /// Looks up a localized string similar to 120 fps.
+ ///
+ public static string _120fpsLabel {
+ get {
+ return ResourceManager.GetString("_120fpsLabel", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 24 fps.
+ ///
+ public static string _24fpsLabel {
+ get {
+ return ResourceManager.GetString("_24fpsLabel", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 2x.
+ ///
+ public static string _2xLabel {
+ get {
+ return ResourceManager.GetString("_2xLabel", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 30 fps.
+ ///
+ public static string _30fpsLabel {
+ get {
+ return ResourceManager.GetString("_30fpsLabel", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 3x.
+ ///
+ public static string _3xLabel {
+ get {
+ return ResourceManager.GetString("_3xLabel", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 4x.
+ ///
+ public static string _4xLabel {
+ get {
+ return ResourceManager.GetString("_4xLabel", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 60 fps.
+ ///
+ public static string _60fpsLabel {
+ get {
+ return ResourceManager.GetString("_60fpsLabel", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Advanced Options.
///
@@ -78,6 +141,15 @@ namespace butterflow_ui.Localization {
}
}
+ ///
+ /// Looks up a localized string similar to Custom Rate.
+ ///
+ public static string CustomPlaybackRateLabel {
+ get {
+ return ResourceManager.GetString("CustomPlaybackRateLabel", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Input.
///
@@ -96,6 +168,24 @@ namespace butterflow_ui.Localization {
}
}
+ ///
+ /// Looks up a localized string similar to Height.
+ ///
+ public static string HeightLabel {
+ get {
+ return ResourceManager.GetString("HeightLabel", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Keep Audio.
+ ///
+ public static string KeepAudioLabel {
+ get {
+ return ResourceManager.GetString("KeepAudioLabel", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Playback Rate.
///
@@ -105,6 +195,15 @@ namespace butterflow_ui.Localization {
}
}
+ ///
+ /// Looks up a localized string similar to Video Scale / Resolution.
+ ///
+ public static string ResolutionLabel {
+ get {
+ return ResourceManager.GetString("ResolutionLabel", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to butterflow-ui.
///
@@ -113,5 +212,14 @@ namespace butterflow_ui.Localization {
return ResourceManager.GetString("Title", resourceCulture);
}
}
+
+ ///
+ /// Looks up a localized string similar to Width.
+ ///
+ public static string WidthLabel {
+ get {
+ return ResourceManager.GetString("WidthLabel", resourceCulture);
+ }
+ }
}
}
diff --git a/butterflow-ui/Localization/Localization.resx b/butterflow-ui/Localization/Localization.resx
index 55a50e2..3435202 100644
--- a/butterflow-ui/Localization/Localization.resx
+++ b/butterflow-ui/Localization/Localization.resx
@@ -123,16 +123,52 @@
Common Options
+
+ Custom Rate
+
Input
Video File
+
+ Height
+
+
+ Keep Audio
+
Playback Rate
+
+ Video Scale / Resolution
+
butterflow-ui
+
+ Width
+
+
+ 120 fps
+
+
+ 24 fps
+
+
+ 2x
+
+
+ 30 fps
+
+
+ 3x
+
+
+ 4x
+
+
+ 60 fps
+
\ No newline at end of file
diff --git a/butterflow-ui/MainWindow.xaml b/butterflow-ui/MainWindow.xaml
index 1868756..fffa9a6 100644
--- a/butterflow-ui/MainWindow.xaml
+++ b/butterflow-ui/MainWindow.xaml
@@ -6,6 +6,7 @@
xmlns:loc="clr-namespace:butterflow_ui.Localization"
xmlns:butterflow_ui="clr-namespace:butterflow_ui"
mc:Ignorable="d"
+ x:Name="butterflowUIWindow"
Title="{x:Static loc:Localization.Title}" Height="450" Width="800">