Incremental checkin.

Nothing functional still.

butterflow-ui/ButterflowOption.xaml

@@ -14,9 +14,9 @@
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <Label Grid.Column="0" Content="{Binding LabelValue, ElementName=userControl}" />
+                <Label Grid.Column="0" VerticalAlignment="Center" Content="{Binding LabelValue, ElementName=userControl}" />
-                <ContentPresenter Grid.Column="1" Content="{TemplateBinding Content}" />
+                <ContentPresenter Grid.Column="1" VerticalAlignment="Center" Content="{TemplateBinding Content}" />
             </Grid>
         </DataTemplate>
     </UserControl.ContentTemplate>
-</UserControl>
+</UserControl>

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
 

butterflow-ui/Localization/Localization.Designer.cs

@@ -60,6 +60,69 @@ namespace butterflow_ui.Localization {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 120 fps.
+        /// </summary>
+        public static string _120fpsLabel {
+            get {
+                return ResourceManager.GetString("_120fpsLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 24 fps.
+        /// </summary>
+        public static string _24fpsLabel {
+            get {
+                return ResourceManager.GetString("_24fpsLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 2x.
+        /// </summary>
+        public static string _2xLabel {
+            get {
+                return ResourceManager.GetString("_2xLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 30 fps.
+        /// </summary>
+        public static string _30fpsLabel {
+            get {
+                return ResourceManager.GetString("_30fpsLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 3x.
+        /// </summary>
+        public static string _3xLabel {
+            get {
+                return ResourceManager.GetString("_3xLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 4x.
+        /// </summary>
+        public static string _4xLabel {
+            get {
+                return ResourceManager.GetString("_4xLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 60 fps.
+        /// </summary>
+        public static string _60fpsLabel {
+            get {
+                return ResourceManager.GetString("_60fpsLabel", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Advanced Options.
         /// </summary>
@@ -78,6 +141,15 @@ namespace butterflow_ui.Localization {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Custom Rate.
+        /// </summary>
+        public static string CustomPlaybackRateLabel {
+            get {
+                return ResourceManager.GetString("CustomPlaybackRateLabel", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Input.
         /// </summary>
@@ -96,6 +168,24 @@ namespace butterflow_ui.Localization {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Height.
+        /// </summary>
+        public static string HeightLabel {
+            get {
+                return ResourceManager.GetString("HeightLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Keep Audio.
+        /// </summary>
+        public static string KeepAudioLabel {
+            get {
+                return ResourceManager.GetString("KeepAudioLabel", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Playback Rate.
         /// </summary>
@@ -105,6 +195,15 @@ namespace butterflow_ui.Localization {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Video Scale / Resolution.
+        /// </summary>
+        public static string ResolutionLabel {
+            get {
+                return ResourceManager.GetString("ResolutionLabel", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to butterflow-ui.
         /// </summary>
@@ -113,5 +212,14 @@ namespace butterflow_ui.Localization {
                 return ResourceManager.GetString("Title", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Width.
+        /// </summary>
+        public static string WidthLabel {
+            get {
+                return ResourceManager.GetString("WidthLabel", resourceCulture);
+            }
+        }
     }
 }

butterflow-ui/Localization/Localization.resx

@@ -123,16 +123,52 @@
   <data name="CommonOptionsGroupBox" xml:space="preserve">
     <value>Common Options</value>
   </data>
+  <data name="CustomPlaybackRateLabel" xml:space="preserve">
+    <value>Custom Rate</value>
+  </data>
   <data name="FileInputGroupBox" xml:space="preserve">
     <value>Input</value>
   </data>
   <data name="FileLabel" xml:space="preserve">
     <value>Video File</value>
   </data>
+  <data name="HeightLabel" xml:space="preserve">
+    <value>Height</value>
+  </data>
+  <data name="KeepAudioLabel" xml:space="preserve">
+    <value>Keep Audio</value>
+  </data>
   <data name="PlaybackRateLabel" xml:space="preserve">
     <value>Playback Rate</value>
   </data>
+  <data name="ResolutionLabel" xml:space="preserve">
+    <value>Video Scale / Resolution</value>
+  </data>
   <data name="Title" xml:space="preserve">
     <value>butterflow-ui</value>
   </data>
+  <data name="WidthLabel" xml:space="preserve">
+    <value>Width</value>
+  </data>
+  <data name="_120fpsLabel" xml:space="preserve">
+    <value>120 fps</value>
+  </data>
+  <data name="_24fpsLabel" xml:space="preserve">
+    <value>24 fps</value>
+  </data>
+  <data name="_2xLabel" xml:space="preserve">
+    <value>2x</value>
+  </data>
+  <data name="_30fpsLabel" xml:space="preserve">
+    <value>30 fps</value>
+  </data>
+  <data name="_3xLabel" xml:space="preserve">
+    <value>3x</value>
+  </data>
+  <data name="_4xLabel" xml:space="preserve">
+    <value>4x</value>
+  </data>
+  <data name="_60fpsLabel" xml:space="preserve">
+    <value>60 fps</value>
+  </data>
 </root>

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">
     <DockPanel>
         <Menu DockPanel.Dock="Top">
@@ -41,25 +42,62 @@
                 </Grid>
             </GroupBox>
             <GroupBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Header="{x:Static loc:Localization.CommonOptionsGroupBox}">
-                <StackPanel>
+                <ScrollViewer>
-                    <butterflow_ui:ButterflowOption LabelValue="{x:Static loc:Localization.PlaybackRateLabel}">
+                    <StackPanel>
-                        <TextBox />
+                        <butterflow_ui:ButterflowOption LabelValue="{x:Static loc:Localization.PlaybackRateLabel}">
-                    </butterflow_ui:ButterflowOption>
+                            <StackPanel Orientation="Vertical">
-                    <Grid>
+                                <butterflow_ui:ButterflowOption LabelValue="{x:Static loc:Localization._2xLabel}">
-                        <Grid.ColumnDefinitions>
+                                    <RadioButton GroupName="PlaybackRate" />
-                            <ColumnDefinition Width="Auto" />
+                                </butterflow_ui:ButterflowOption>
-                            <ColumnDefinition Width="*" />
+                                <butterflow_ui:ButterflowOption LabelValue="{x:Static loc:Localization._3xLabel}">
-                            <ColumnDefinition Width="Auto" />
+                                    <RadioButton GroupName="PlaybackRate" />
-                        </Grid.ColumnDefinitions>
+                                </butterflow_ui:ButterflowOption>
-                        <Label Grid.Column="0" Content="{x:Static loc:Localization.PlaybackRateLabel}" />
+                                <butterflow_ui:ButterflowOption LabelValue="{x:Static loc:Localization._4xLabel}">
-                        <TextBox Grid.Column="1" />
+                                    <RadioButton GroupName="PlaybackRate" />
-                    </Grid>
+                                </butterflow_ui:ButterflowOption>
-                </StackPanel>
+                                <butterflow_ui:ButterflowOption LabelValue="{x:Static loc:Localization._24fpsLabel}">
+                                    <RadioButton GroupName="PlaybackRate" />
+                                </butterflow_ui:ButterflowOption>
+                                <butterflow_ui:ButterflowOption LabelValue="{x:Static loc:Localization._30fpsLabel}">
+                                    <RadioButton GroupName="PlaybackRate" />
+                                </butterflow_ui:ButterflowOption>
+                                <butterflow_ui:ButterflowOption LabelValue="{x:Static loc:Localization._60fpsLabel}">
+                                    <RadioButton GroupName="PlaybackRate" />
+                                </butterflow_ui:ButterflowOption>
+                                <butterflow_ui:ButterflowOption LabelValue="{x:Static loc:Localization._120fpsLabel}">
+                                    <RadioButton GroupName="PlaybackRate" />
+                                </butterflow_ui:ButterflowOption>
+                                <butterflow_ui:ButterflowOption LabelValue="{x:Static loc:Localization.CustomPlaybackRateLabel}">
+                                    <TextBox Text="{Binding PlaybackRate, ElementName=butterflowUIWindow}"  />
+                                </butterflow_ui:ButterflowOption>
+                            </StackPanel>
+                        </butterflow_ui:ButterflowOption>
+                        <butterflow_ui:ButterflowOption LabelValue="{x:Static loc:Localization.KeepAudioLabel}">
+                            <CheckBox />
+                        </butterflow_ui:ButterflowOption>
+                        <butterflow_ui:ButterflowOption LabelValue="{x:Static loc:Localization.ResolutionLabel}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <butterflow_ui:ButterflowOption Grid.Column="0" LabelValue="{x:Static loc:Localization.WidthLabel}">
+                                    <TextBox />
+                                </butterflow_ui:ButterflowOption>
+                                <butterflow_ui:ButterflowOption Grid.Column="1" LabelValue="{x:Static loc:Localization.HeightLabel}">
+                                    <TextBox />
+                                </butterflow_ui:ButterflowOption>
+                            </Grid>
+                        </butterflow_ui:ButterflowOption>
+                    </StackPanel>
+                </ScrollViewer>
             </GroupBox>
             <GroupBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Header="{x:Static loc:Localization.AdvancedOptionsGroupBox}">
-                <StackPanel>
+                <ScrollViewer>
+                    <StackPanel>
 
-                </StackPanel>
+                    </StackPanel>
+                </ScrollViewer>
             </GroupBox>
             <MediaElement Grid.Row="1" Grid.RowSpan="2" Grid.Column="2" Grid.ColumnSpan="2" Name="mediaPreview" />
         </Grid>

butterflow-ui/MainWindow.xaml.cs

@@ -21,6 +21,28 @@ namespace butterflow_ui
     /// </summary>
     public partial class MainWindow : Window
     {
+        #region Properties
+
+        public string PlaybackRate
+        {
+            get
+            {
+                return (string)GetValue(PlaybackRateProperty);
+            }
+            set
+            {
+                SetValue(PlaybackRateProperty, value);
+            }
+        }
+
+        #endregion
+
+        #region Dependency Properties
+
+        public static DependencyProperty PlaybackRateProperty = DependencyProperty.Register("PlaybackRateProperty", typeof(string), typeof(MainWindow));
+
+        #endregion
+
         public MainWindow()
         {
             InitializeComponent();