diff --git a/butterflow-ui/App.xaml b/butterflow-ui/App.xaml
index 97d5d62..6b0f03f 100644
--- a/butterflow-ui/App.xaml
+++ b/butterflow-ui/App.xaml
@@ -7,6 +7,7 @@
+
diff --git a/butterflow-ui/ButterflowOption.cs b/butterflow-ui/ButterflowOption.cs
index 9f17366..0025f6b 100644
--- a/butterflow-ui/ButterflowOption.cs
+++ b/butterflow-ui/ButterflowOption.cs
@@ -12,29 +12,26 @@ namespace butterflow_ui
{
#region Properties
+ /// Gets or sets the label value.
+ /// The label value.
public string LabelValue { get; set; }
+ /// Gets or sets the description value.
+ /// The description value.
public string DescriptionValue { get; set; }
- public Visibility ToolTipVisibility
- {
- get
- {
- //return string.IsNullOrWhiteSpace(this.DescriptionValue) ? Visibility.Hidden : Visibility.Visible;
- return Visibility.Hidden;
- }
- }
-
#endregion
#region Dependency Properties
+ /// The label value property.
public static DependencyProperty LabelValueProperty = DependencyProperty.Register("LabelValue", typeof(string), typeof(ButterflowOption));
+ /// The description value property.
public static DependencyProperty DescriptionValueProperty = DependencyProperty.Register("DescriptionValue", typeof(string), typeof(ButterflowOption));
- public static DependencyProperty ToolTipVisibilityProperty = DependencyProperty.Register("ToolTipVisibility", typeof(Visibility), typeof(ButterflowOption));
#endregion
+ /// Default constructor.
public ButterflowOption()
{
//
diff --git a/butterflow-ui/Controls.xaml b/butterflow-ui/Controls.xaml
index 7cb9e80..0372c63 100644
--- a/butterflow-ui/Controls.xaml
+++ b/butterflow-ui/Controls.xaml
@@ -13,16 +13,11 @@
-
-
-
+
+
+
+
+
@@ -39,4 +34,20 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/butterflow-ui/Icons.xaml b/butterflow-ui/Icons.xaml
new file mode 100644
index 0000000..2126e1c
--- /dev/null
+++ b/butterflow-ui/Icons.xaml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/butterflow-ui/Localization/Localization.Designer.cs b/butterflow-ui/Localization/Localization.Designer.cs
index 249749c..4e2debd 100644
--- a/butterflow-ui/Localization/Localization.Designer.cs
+++ b/butterflow-ui/Localization/Localization.Designer.cs
@@ -123,6 +123,33 @@ namespace butterflow_ui.Localization {
}
}
+ ///
+ /// Looks up a localized string similar to More about butterflow....
+ ///
+ public static string AboutButterflowMenu {
+ get {
+ return ResourceManager.GetString("AboutButterflowMenu", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to More about butterflow-ui....
+ ///
+ public static string AboutButterflowUIMenu {
+ get {
+ return ResourceManager.GetString("AboutButterflowUIMenu", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to About butterflow-ui.
+ ///
+ public static string AboutMenu {
+ get {
+ return ResourceManager.GetString("AboutMenu", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Advanced Options.
///
@@ -150,6 +177,15 @@ namespace butterflow_ui.Localization {
}
}
+ ///
+ /// Looks up a localized string similar to _Edit.
+ ///
+ public static string EditMenu {
+ get {
+ return ResourceManager.GetString("EditMenu", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Input.
///
@@ -168,6 +204,15 @@ namespace butterflow_ui.Localization {
}
}
+ ///
+ /// Looks up a localized string similar to _File.
+ ///
+ public static string FileMenu {
+ get {
+ return ResourceManager.GetString("FileMenu", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Height.
///
@@ -177,6 +222,15 @@ namespace butterflow_ui.Localization {
}
}
+ ///
+ /// Looks up a localized string similar to _Help.
+ ///
+ public static string HelpMenu {
+ get {
+ return ResourceManager.GetString("HelpMenu", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Renders the output video with the audio from the original video. In unchecked, no sound will be included in the output video..
///
@@ -214,7 +268,7 @@ namespace butterflow_ui.Localization {
}
///
- /// Looks up a localized string similar to Some description of playback rate goes here..
+ /// Looks up a localized string similar to Controls the new framerate of the output video. This can be set in both absolute and relative terms..
///
public static string PlaybackRateDescription {
get {
diff --git a/butterflow-ui/Localization/Localization.resx b/butterflow-ui/Localization/Localization.resx
index ed8329a..9a9b545 100644
--- a/butterflow-ui/Localization/Localization.resx
+++ b/butterflow-ui/Localization/Localization.resx
@@ -117,6 +117,15 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ More about butterflow...
+
+
+ More about butterflow-ui...
+
+
+ About butterflow-ui
+
Advanced Options
@@ -126,15 +135,24 @@
Custom Rate
+
+ _Edit
+
InputVideo File
+
+ _File
+
Height
+
+ _Help
+
Renders the output video with the audio from the original video. In unchecked, no sound will be included in the output video.
@@ -148,7 +166,7 @@
Lossless Quality
- Some description of playback rate goes here.
+ Controls the new framerate of the output video. This can be set in both absolute and relative terms.Playback Rate
diff --git a/butterflow-ui/MainWindow.xaml b/butterflow-ui/MainWindow.xaml
index d6fae79..4c00cce 100644
--- a/butterflow-ui/MainWindow.xaml
+++ b/butterflow-ui/MainWindow.xaml
@@ -10,17 +10,29 @@
Title="{x:Static loc:Localization.Title}" Height="600" Width="800">
@@ -99,7 +111,7 @@
-
+
diff --git a/butterflow-ui/MainWindow.xaml.cs b/butterflow-ui/MainWindow.xaml.cs
index 972e4b8..662827b 100644
--- a/butterflow-ui/MainWindow.xaml.cs
+++ b/butterflow-ui/MainWindow.xaml.cs
@@ -49,6 +49,9 @@ namespace butterflow_ui
{
txtFileName.Text = ofd.FileName;
mediaPreview.Source = new Uri(ofd.FileName);
+ this.OptionsConfiguration.Width = mediaPreview.NaturalVideoWidth.ToString();
+ this.OptionsConfiguration.Height = mediaPreview.NaturalVideoHeight.ToString();
+
}
}
diff --git a/butterflow-ui/butterflow-ui.csproj b/butterflow-ui/butterflow-ui.csproj
index ac71ec0..c35472f 100644
--- a/butterflow-ui/butterflow-ui.csproj
+++ b/butterflow-ui/butterflow-ui.csproj
@@ -57,6 +57,10 @@
MSBuild:CompileDesigner
+
+ MSBuild:Compile
+ Designer
+ DesignerMSBuild:Compile