Merge pull request #23 from ErikEJ/feedback-bugs

Improved label sizes for large font scenarios
ErikEJ · Dec 14, 2015 · 593674b · 593674b
2 parents 18de866 + b277e4f
commit 593674b
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 33 deletions.
diff --git a/src/GUI/SqlCe35Toolbox/Dialogs/ConnectionDialog.xaml b/src/GUI/SqlCe35Toolbox/Dialogs/ConnectionDialog.xaml
@@ -15,29 +15,29 @@
         mc:Ignorable="d" 
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Loaded="Window_Loaded" Height="384" Width="532">
-       <Grid Width="511">
+    <Grid Width="511">
         <Grid.RowDefinitions>
             <RowDefinition Height="94" />
             <RowDefinition Height="52" />
             <RowDefinition Height="52" />
             <RowDefinition Height="103" />
             <RowDefinition Height="85*" />
         </Grid.RowDefinitions>
-        <Label Margin="12,12,0,0" Content="Filename:" HorizontalAlignment="Left" Width="121" Height="28" VerticalAlignment="Top"></Label>
-        <Label Margin="12,0,0,0" Grid.Row="2" x:Name="lblPw" Content="Password:" Height="28" VerticalAlignment="Top" HorizontalAlignment="Left" Width="89"></Label>
-        
+        <Label Margin="12,12,0,0" Content="Filename:" HorizontalAlignment="Left" Width="166" Height="28" VerticalAlignment="Top"></Label>
+        <Label Margin="12,51.6,0,0" Grid.Row="1" x:Name="lblPw" Content="Password:" Height="28" VerticalAlignment="Top" HorizontalAlignment="Left" Width="109" Grid.RowSpan="2"></Label>
+
         <TextBox Name="dataSourceTextBox" TextChanged="textBox_TextChanged" Margin="12,0,12,30" TabIndex="0" Height="23" VerticalAlignment="Bottom" />
         <extToolkit2:IntegerUpDown x:Name="maxSize" IsReadOnly="False" Value="256" Increment="1" Maximum="4091" Minimum="16" Grid.Row="1" Margin="12,29,0,0" TabIndex="2" Height="23" VerticalAlignment="Top" HorizontalAlignment="Left" Width="89" ValueChanged="maxSize_ValueChanged" />
         <TextBox x:Name="password" Grid.Row="2"  TextChanged="password_PasswordChanged" Margin="12,0" TabIndex="3" Height="23" VerticalAlignment="Bottom" />
         <TextBox TextWrapping="Wrap" x:Name="txtConnection" Grid.Row="3" TextChanged="txtConnection_TextChanged" Margin="12,21,12,0" TabIndex="4" Height="48" VerticalAlignment="Top" />
 
         <dw:DialogButton Content="_Browse..." Height="23" Name="btnBrowse" VerticalAlignment="Top" Click="btnBrowse_Click" TabIndex="1" Margin="0,71,12,0" HorizontalAlignment="Right" Width="75" />
-        <Label Content="Connection String:" Grid.Row="3" Margin="12,0,368,75" />
+        <Label Content="Connection String:" Grid.Row="2" Margin="12,51.6,296,74.6" Grid.RowSpan="2" />
         <dw:DialogButton Name="TestButton"  Click="TestButton_Click" Grid.Row="4" TabIndex="5" SnapsToDevicePixels="False" Margin="12,10,0,0" Height="23" VerticalAlignment="Top" HorizontalAlignment="Left" Width="131">_Test Connection</dw:DialogButton>
         <dw:DialogButton Name="CancelButton" IsCancel="True"  Click="CancelButton_Click" Grid.Row="4" TabIndex="6" Margin="0,10,12,0" Height="23" VerticalAlignment="Top" HorizontalAlignment="Right" Width="75">Cancel</dw:DialogButton>
         <dw:DialogButton Name="SaveButton" IsDefault="True"  Click="SaveButton_Click" Grid.Row="4" TabIndex="5" Margin="0,10,93,0" Height="23" VerticalAlignment="Top" HorizontalAlignment="Right" Width="75">OK</dw:DialogButton>
         <dw:DialogButton Content="_Create..." Margin="0,71,93,0" Name="CreateButton" Height="23" VerticalAlignment="Top" HorizontalAlignment="Right" Width="75" Click="CreateButton_Click" />
-        <Label x:Name="lblMax" Content="Max database size in MB (From 16 to 4091) :" Margin="12,0,0,0" Grid.Row="1" Height="28" VerticalAlignment="Top" HorizontalAlignment="Left" Width="248" />
+        <Label x:Name="lblMax" Content="Max database size in MB (From 16 to 4091) :" Margin="12,94,0,0" Height="28" VerticalAlignment="Top" HorizontalAlignment="Left" Width="331" Grid.RowSpan="2" />
         <TextBlock Visibility="Collapsed" x:Name="txtDDEX" TextWrapping="Wrap" Text="This database connection will be added to Server Explorer, enabling you to use it with the Entity Framework Tools" Height="40" Margin="12,67,12,0" VerticalAlignment="Top" Grid.Row="3" Grid.RowSpan="2" />
     </Grid>
 </dw:DialogWindow>
diff --git a/src/GUI/SqlCe35Toolbox/Dialogs/DataContextDialog.xaml b/src/GUI/SqlCe35Toolbox/Dialogs/DataContextDialog.xaml
@@ -15,19 +15,19 @@
             <RowDefinition Height="47*" />
             <RowDefinition Height="35*" />
         </Grid.RowDefinitions>
-        <Label Content="Context name" HorizontalAlignment="Left" Margin="12,0,0,0" Name="label1" Width="112" Height="28" VerticalAlignment="Top" />
+        <Label Content="Context name" HorizontalAlignment="Left" Margin="12,0,0,0" Name="label1" Width="151" Height="28" VerticalAlignment="Top" />
         <TextBox Height="23" Margin="13,47,0,0" Name="textBox1" VerticalAlignment="Top" TabIndex="1" HorizontalAlignment="Left" Width="371" />
         <CheckBox Content="Pluralize or singularize class and member names"  Grid.Row="3" Height="23" HorizontalAlignment="Left" Margin="13,9,0,0" Name="chkPlural" VerticalAlignment="Top" TabIndex="4" Width="328" />
         <CheckBox Content="Add Schema Version table to database" ToolTip="For use with the DbSchemaUpdater class on the device" Grid.Row="6" Height="23" HorizontalAlignment="Left" Margin="40,0,0,0" Name="chkAddVersion" VerticalAlignment="Top" TabIndex="6" Width="290" />
         <dw:DialogButton Content="OK" IsDefault="True" Grid.Row="8" Height="23" Margin="0,0,94,12" Name="button1" VerticalAlignment="Bottom" TabIndex="9" Click="button1_Click" HorizontalAlignment="Right" Width="75" />
         <dw:DialogButton Content="Cancel" IsCancel="True" Grid.Row="8" Height="23" HorizontalAlignment="Right" Margin="0,0,12,12" Name="button2" VerticalAlignment="Bottom" Width="75" TabIndex="10" SnapsToDevicePixels="False" Click="button2_Click" />
         <TextBox Height="23" HorizontalAlignment="Left" Margin="13,25,0,0" Name="txtNameSpace" TabIndex="2" VerticalAlignment="Top" Width="371" Grid.Row="1" />
-        <Label Content="Namespace (optional)" HorizontalAlignment="Left" Margin="12,0,0,0" Name="label2" Width="150" Grid.Row="1" Height="28" VerticalAlignment="Top" />
+        <Label Content="Namespace (optional)" HorizontalAlignment="Left" Margin="12,71,0,0" Name="label2" Width="197" Height="28" VerticalAlignment="Top" Grid.RowSpan="2" />
         <CheckBox Name="chkMultipleFiles" Content="Create a file per table" Height="23" HorizontalAlignment="Left" Margin="12,9,0,0"  TabIndex="5" VerticalAlignment="Top" Grid.Row="4" Checked="chkMultipleFiles_Checked" Unchecked="chkMultipleFiles_Unchecked" Width="297" />
         <ComboBox Grid.Row="2" Height="23" HorizontalAlignment="Left" Margin="13,26,0,0" Name="cmbLanguage" VerticalAlignment="Top" Width="150" ItemsSource="{Binding}" IsEditable="False" SelectionChanged="cmbLanguage_SelectionChanged" TabIndex="3" />
         <Label Content="Language" Grid.Row="2" Height="28" HorizontalAlignment="Left" Margin="12,0,0,0" Name="label3" VerticalAlignment="Top" Width="197" />
         <Label Name="lblAdv" Content="Advanced options:" Grid.Row="5" Height="26" HorizontalAlignment="Left" Margin="12,1,0,0"  VerticalAlignment="Top" Width="224" Grid.RowSpan="2" />
         <CheckBox Content="Add rowversion column to all tables" ToolTip="To improve UPDATE performance" Height="23" HorizontalAlignment="Left" Margin="40,25,0,0" Name="chkAddRowVersion" TabIndex="7" VerticalAlignment="Top" Width="290" Grid.Row="6" Grid.RowSpan="2" />
-        <CheckBox Content="Include ConnectionStringBuilder" Height="23" HorizontalAlignment="Left" Margin="40,11,0,0" Name="chkConnStringBuilder" TabIndex="8" ToolTip="Includes a class file with a ConnectionStringBuilder in your project" VerticalAlignment="Top" Width="209" Grid.Row="7" />
+        <CheckBox Content="Include ConnectionStringBuilder" Height="23" HorizontalAlignment="Left" Margin="40,11.2,0,0" Name="chkConnStringBuilder" TabIndex="8" ToolTip="Includes a class file with a ConnectionStringBuilder in your project" VerticalAlignment="Top" Width="277" Grid.Row="7" />
     </Grid>
 </dw:DialogWindow>
diff --git a/src/GUI/SqlCe35Toolbox/Dialogs/EdmxDialog.xaml b/src/GUI/SqlCe35Toolbox/Dialogs/EdmxDialog.xaml
@@ -16,8 +16,8 @@
         </Grid.RowDefinitions>
         <Label Content="Model name:" HorizontalAlignment="Left" Margin="12,0,0,32" Name="label1" Width="112" Height="28"  />
         <TextBox Height="23" Margin="12,0,12,9" Name="textBox1" VerticalAlignment="Bottom" TabIndex="1" />
-        <CheckBox Content="Pluralize or singularize generated object names" Grid.Row="1" Height="24" HorizontalAlignment="Left" Margin="12,5,0,0" Name="chkPlural" VerticalAlignment="Top" TabIndex="2" />
-        <CheckBox Content="Include foreign key columns in the model" IsChecked="True" Grid.Row="2" Height="24" HorizontalAlignment="Left" Margin="12,6,0,0" Name="chkFks2" VerticalAlignment="Top" TabIndex="3" />
+        <CheckBox Content="Pluralize or singularize generated object names" Grid.Row="1" Height="24" HorizontalAlignment="Left" Margin="12,5.4,0,0" Name="chkPlural" VerticalAlignment="Top" TabIndex="2" Width="326" />
+        <CheckBox Content="Include foreign key columns in the model" IsChecked="True" Grid.Row="2" Height="24" HorizontalAlignment="Left" Margin="12,5.6,0,0" Name="chkFks2" VerticalAlignment="Top" TabIndex="3" Width="307" />
         <extToolkit2:CheckListBox x:Name="chkTables" Grid.Row="3" Margin="12,0" DisplayMemberPath="Label" SelectedMemberPath="IsChecked" TabIndex="4" />
         <dw:DialogButton Content="OK" IsDefault="True" Grid.Row="5" HorizontalAlignment="Left" Margin="230,0,0,12" Name="button1" TabIndex="6" Click="button1_Click" VerticalAlignment="Bottom" Width="75" />
         <dw:DialogButton Content="Cancel" IsCancel="True" Grid.Row="5" HorizontalAlignment="Right" Margin="0,0,12,12" Name="button2" TabIndex="7" SnapsToDevicePixels="False" Click="button2_Click" Height="23" VerticalAlignment="Bottom" />

diff --git a/src/GUI/SqlCe35Toolbox/Dialogs/ForeignKeyDialog.xaml b/src/GUI/SqlCe35Toolbox/Dialogs/ForeignKeyDialog.xaml
@@ -24,7 +24,7 @@
             <RowDefinition Height="60" />
             <RowDefinition Height="43*" />
         </Grid.RowDefinitions>
-        <Label Margin="12,0,0,0" Content="Foreign key name:" HorizontalAlignment="Left" Width="121" Height="28" VerticalAlignment="Top"></Label>
+        <Label Margin="12,0,0,0" Content="Foreign key name:" HorizontalAlignment="Left" Width="173" Height="28" VerticalAlignment="Top"></Label>
         <TextBox Name="dataSourceTextBox" Margin="16,0,35,6" TabIndex="0" Height="24" VerticalAlignment="Bottom" />
         <dw:DialogButton Name="CancelButton" IsCancel="True"  Click="CancelButton_Click" Grid.Row="5" TabIndex="6" Margin="0,0,35,0" Height="23" VerticalAlignment="Top" HorizontalAlignment="Right" Width="75">Cancel</dw:DialogButton>
         <dw:DialogButton Name="SaveButton" IsDefault="True"  Click="SaveButton_Click" Grid.Row="5" TabIndex="5" Margin="0,0,116,0" Height="23" VerticalAlignment="Top" HorizontalAlignment="Right" Width="75">Script!</dw:DialogButton>

diff --git a/src/GUI/SqlCe35Toolbox/Dialogs/ImportDialog.xaml b/src/GUI/SqlCe35Toolbox/Dialogs/ImportDialog.xaml
@@ -16,7 +16,7 @@
         d:DesignHeight="286" 
         d:DesignWidth="405" 
         SizeToContent="WidthAndHeight" Loaded="Window_Loaded">
-       <Grid Height="246" Width="384">
+    <Grid Height="246" Width="384">
 
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="90" />
@@ -29,8 +29,8 @@
             <RowDefinition Height="76" />
             <RowDefinition Height="71*" />
         </Grid.RowDefinitions>
-        <Label Margin="4,7,14,0" Content="Filename:" Height="28" VerticalAlignment="Top"></Label>
-        <Label Margin="4,5,10,0" Grid.Row="1" Content="Separator:" Height="26" VerticalAlignment="Top"></Label>
+        <Label Margin="4,7,4.6,0" Content="Filename:" Height="28" VerticalAlignment="Top"></Label>
+        <Label Margin="4,4.8,294,0" Grid.Row="1" Content="Separator:" Height="26" VerticalAlignment="Top" Grid.ColumnSpan="2"></Label>
         <Label Margin="4,6,235,0" Grid.Row="2" Content="Sample CSV format:" Grid.ColumnSpan="2" Height="28" VerticalAlignment="Top"></Label>
         <TextBox Margin="12,0" IsReadOnly="True" Name="txtSample" Grid.Row="3" Grid.ColumnSpan="2" Background="Transparent" BorderBrush="Transparent" Text="test" Height="76" VerticalAlignment="Top" />
         <TextBox Name="FileName" Grid.Column="1" TextChanged="FileName_TextChanged" Margin="0,7,12,0" TabIndex="0" Height="23" VerticalAlignment="Top" />

diff --git a/src/GUI/SqlCe35Toolbox/Dialogs/PasswordDialog.xaml b/src/GUI/SqlCe35Toolbox/Dialogs/PasswordDialog.xaml
@@ -17,7 +17,7 @@
         d:DesignWidth="296" 
         SizeToContent="WidthAndHeight" Loaded="Window_Loaded">
        <Grid>
-        <Label Margin="9,12,0,0" Height="23" VerticalAlignment="Top" HorizontalAlignment="Left" Width="136">Database password:</Label>
+        <Label Margin="9,12,0,0" Height="28" VerticalAlignment="Top" HorizontalAlignment="Left" Width="163">Database password:</Label>
 
         <PasswordBox Name="PasswordInput" Height="23" Margin="12,40,12,0" VerticalAlignment="Top" />
         <StackPanel Margin="0,114,0,3" Orientation="Horizontal" HorizontalAlignment="Right"></StackPanel>

diff --git a/src/GUI/SqlCe35Toolbox/Dialogs/RenameDialog.xaml b/src/GUI/SqlCe35Toolbox/Dialogs/RenameDialog.xaml
@@ -18,7 +18,7 @@
             <RowDefinition Height="44" />
             <RowDefinition Height="123*" />
         </Grid.RowDefinitions>
-        <Label Margin="12,10,0,0" HorizontalAlignment="Left" Width="72" Height="23" VerticalAlignment="Top">New Name:</Label>
+        <Label Margin="12,10,0,0" HorizontalAlignment="Left" Width="89" Height="25" VerticalAlignment="Top">New Name:</Label>
 
         <TextBox Name="ServerName" Margin="0,12,12,0" Height="23" VerticalAlignment="Top" HorizontalAlignment="Right" Width="248" MaxLength="512" />
         <StackPanel Margin="0,65,2,3" Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="1"></StackPanel>

diff --git a/src/GUI/SqlCe35Toolbox/Dialogs/SyncFxDialog.xaml b/src/GUI/SqlCe35Toolbox/Dialogs/SyncFxDialog.xaml
@@ -21,7 +21,7 @@
                     </ListView.ItemTemplate>
                 </ListView>-->
                 <StackPanel Orientation="Horizontal">
-                    <TextBlock Margin="12,4">Scope Name</TextBlock>
+                    <TextBlock Margin="12,4" Width="96">Scope Name</TextBlock>
                     <TextBox Name="txtModel" Margin="12,4" Width="290"></TextBox>
                 </StackPanel>
                 <CheckBox x:Name="chkAdvanced" Content="Advanced" Margin="12,12" Visibility="Collapsed"></CheckBox>

diff --git a/src/GUI/SqlCe35Toolbox/Properties/AssemblyInfo.cs b/src/GUI/SqlCe35Toolbox/Properties/AssemblyInfo.cs
@@ -18,6 +18,6 @@
     // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("4.4.0.10")]
-[assembly: AssemblyFileVersion("4.4.0.10")]
+[assembly: AssemblyVersion("4.4.0.11")]
+[assembly: AssemblyFileVersion("4.4.0.11")]