Automagic organization

butterflow-ui/Controls.xaml

@@ -5,19 +5,33 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:ButterflowOption}">
-                    <Grid>
+                    <Grid Height="Auto">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <Label Grid.Column="0" VerticalAlignment="Center" Content="{TemplateBinding LabelValue}" />
+                        <Label Grid.Column="0" Name="Label" VerticalAlignment="Center" Content="{TemplateBinding LabelValue}" />
-                        <ContentControl Grid.Column="1" VerticalAlignment="Center" Content="{TemplateBinding Content}" />
+                        <ContentControl Grid.Column="1" Name="ContentArea" VerticalAlignment="Center" Content="{TemplateBinding Content}" />
-                        <Label x:Name="TheLabel" Grid.Column="2" Visibility="Visible" ToolTip="{TemplateBinding DescriptionValue}" Content="?"/>
+                        <Viewbox Grid.Column="2" Name="InfoBox" Margin="2,0,2,0" Width="16" ToolTip="{TemplateBinding DescriptionValue}">
+                            <Canvas Name="InfoIcon" Width="24" Height="24">
+                                <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="1.4" Canvas.Top="1.4" Width="21.2" Height="21.2" Name="path4524" Fill="#FF0F5777" StrokeThickness="4.02519703" StrokeMiterLimit="4" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Opacity="1"/>
+                                <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Fill="#FFFFFFFF">
+                                    <Path.Data>
+                                        <PathGeometry Figures="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm-.001 5.75c.69 0 1.251.56 1.251 1.25s-.561 1.25-1.251 1.25-1.249-.56-1.249-1.25.559-1.25 1.249-1.25zm2.001 12.25h-4v-1c.484-.179 1-.201 1-.735v-4.467c0-.534-.516-.618-1-.797v-1h3v6.265c0 .535.517.558 1 .735v.999z" FillRule="EvenOdd"/>
+                                    </Path.Data>
+                                </Path>
+                            </Canvas>
+                        </Viewbox>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="DescriptionValue" Value="{x:Null}">
-                            <Setter TargetName="TheLabel" Property="Visibility" Value="Hidden"/>
+                            <Setter TargetName="InfoBox" Property="Visibility" Value="Hidden"/>
+                        </Trigger>
+                        <Trigger Property="LabelValue" Value="{x:Null}">
+                            <Setter TargetName="Label" Property="Grid.Column" Value="2" />
+                            <Setter TargetName="ContentArea" Property="Grid.Column" Value="1" />
+                            <Setter TargetName="InfoBox" Property="Grid.Column" Value="0" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>

butterflow-ui/Localization/Localization.Designer.cs

@@ -177,6 +177,15 @@ namespace butterflow_ui.Localization {
             }
         }
         
+        /// <summary>
+        ///   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..
+        /// </summary>
+        public static string KeepAudioDescription {
+            get {
+                return ResourceManager.GetString("KeepAudioDescription", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Keep Audio.
         /// </summary>
@@ -186,6 +195,15 @@ namespace butterflow_ui.Localization {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Renders the video without lossy compression. The video will not lose any visual quality, but it will result in a very large output file..
+        /// </summary>
+        public static string LosslessDescription {
+            get {
+                return ResourceManager.GetString("LosslessDescription", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Lossless Quality.
         /// </summary>

butterflow-ui/Localization/Localization.resx

@@ -135,9 +135,15 @@
   <data name="HeightLabel" xml:space="preserve">
     <value>Height</value>
   </data>
+  <data name="KeepAudioDescription" xml:space="preserve">
+    <value>Renders the output video with the audio from the original video. In unchecked, no sound will be included in the output video.</value>
+  </data>
   <data name="KeepAudioLabel" xml:space="preserve">
     <value>Keep Audio</value>
   </data>
+  <data name="LosslessDescription" xml:space="preserve">
+    <value>Renders the video without lossy compression. The video will not lose any visual quality, but it will result in a very large output file.</value>
+  </data>
   <data name="LosslessLabel" xml:space="preserve">
     <value>Lossless Quality</value>
   </data>

butterflow-ui/MainWindow.xaml

@@ -7,7 +7,7 @@
         xmlns:butterflow_ui="clr-namespace:butterflow_ui"
         mc:Ignorable="d"
         x:Name="butterflowUIWindow"
-        Title="{x:Static loc:Localization.Title}" Height="450" Width="800">
+        Title="{x:Static loc:Localization.Title}" Height="600" Width="800">
     <DockPanel>
         <Menu DockPanel.Dock="Top">
             <MenuItem Header="_File">
@@ -25,10 +25,10 @@
         </Menu>
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
+                <RowDefinition Height="0.3*" />
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
@@ -81,10 +81,10 @@
                         </butterflow_ui:ButterflowOption>
                         <butterflow_ui:ButterflowOption LabelValue="{x:Static loc:Localization.RenderingLabel}">
                             <StackPanel>
-                                <butterflow_ui:ButterflowOption LabelValue="">
+                                <butterflow_ui:ButterflowOption DescriptionValue="{x:Static loc:Localization.KeepAudioDescription}">
                                     <CheckBox IsChecked="{Binding OptionsConfiguration.KeepAudio, Mode=TwoWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type butterflow_ui:MainWindow}}, UpdateSourceTrigger=PropertyChanged}" Content="{x:Static loc:Localization.KeepAudioLabel}" />
                                 </butterflow_ui:ButterflowOption>
-                                <butterflow_ui:ButterflowOption LabelValue="" DescriptionValue="Renders the video with no compression.">
+                                <butterflow_ui:ButterflowOption DescriptionValue="Renders the video with no compression.">
                                     <CheckBox IsChecked="{Binding OptionsConfiguration.LosslessQuality, Mode=TwoWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type butterflow_ui:MainWindow}}, UpdateSourceTrigger=PropertyChanged}" Content="{x:Static loc:Localization.LosslessLabel}" />
                                 </butterflow_ui:ButterflowOption>
                             </StackPanel>