From b277e4faf2b9615cad4d8b0659c867cb074696d0 Mon Sep 17 00:00:00 2001
From: ErikEJ <ejlskov@hotmail.com>
Date: Mon, 14 Dec 2015 14:02:30 +0100
Subject: [PATCH] Improved label sizes for large font scenarios BUG: Missing
 default value in table builder BUG: No default value for identity

---
 .../Dialogs/ConnectionDialog.xaml             | 12 +++++-----
 .../Dialogs/DataContextDialog.xaml            |  6 ++---
 .../SqlCe35Toolbox/Dialogs/EdmxDialog.xaml    |  4 ++--
 .../Dialogs/ForeignKeyDialog.xaml             |  2 +-
 .../SqlCe35Toolbox/Dialogs/ImportDialog.xaml  |  6 ++---
 .../Dialogs/PasswordDialog.xaml               |  2 +-
 .../SqlCe35Toolbox/Dialogs/RenameDialog.xaml  |  2 +-
 .../SqlCe35Toolbox/Dialogs/SyncFxDialog.xaml  |  2 +-
 .../SqlCe35Toolbox/Properties/AssemblyInfo.cs |  4 ++--
 .../ToolWindows/SubscriptionControl.xaml      | 22 +++++++++----------
 .../source.extension.vsixmanifest             |  2 +-
 .../Helpers/TableColumn.cs                    |  3 ++-
 12 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/GUI/SqlCe35Toolbox/Dialogs/ConnectionDialog.xaml b/src/GUI/SqlCe35Toolbox/Dialogs/ConnectionDialog.xaml
index da5666bb..3d56d69c 100644
--- a/src/GUI/SqlCe35Toolbox/Dialogs/ConnectionDialog.xaml
+++ b/src/GUI/SqlCe35Toolbox/Dialogs/ConnectionDialog.xaml
@@ -15,7 +15,7 @@
         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" />
@@ -23,21 +23,21 @@
             <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
index 0690ed87..08148452 100644
--- 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
index 13ade752..cee32088 100644
--- 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
index 2838770c..3f28edf8 100644
--- 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
index b572a65e..540a78b7 100644
--- 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
index 82a63783..b43ae510 100644
--- 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
index 02a211ab..c93f26a9 100644
--- 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
index 63e026e8..37c46c45 100644
--- 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
index ca47d1d6..ea6777a5 100644
--- 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")]
 
diff --git a/src/GUI/SqlCe35Toolbox/ToolWindows/SubscriptionControl.xaml b/src/GUI/SqlCe35Toolbox/ToolWindows/SubscriptionControl.xaml
index 097d740a..c41a8f18 100644
--- a/src/GUI/SqlCe35Toolbox/ToolWindows/SubscriptionControl.xaml
+++ b/src/GUI/SqlCe35Toolbox/ToolWindows/SubscriptionControl.xaml
@@ -21,7 +21,7 @@
             </Style.Triggers>
         </Style>
     </UserControl.Resources>
-        <Grid Height="800" Width="640">
+    <Grid Height="800" Width="640">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -43,9 +43,9 @@
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="146" />
         </Grid.ColumnDefinitions>
-        <Label Content="Internet URL *" Height="28" HorizontalAlignment="Left" Margin="12,10,0,0" Name="label1" VerticalAlignment="Top" />
+        <Label Content="Internet URL *" Height="28" HorizontalAlignment="Left" Margin="12,10,0,0" Name="label1" VerticalAlignment="Top" Width="110" />
         <TextBox Style="{StaticResource requiredFieldValidationStyle}" Height="26" Margin="7,10,0,0" Name="txtUrl" VerticalAlignment="Top" Grid.Column="1" TabIndex="1" ToolTip="The URL used to connect to the SQL Server Compact 3.5 Server Agent. http://&lt;hostname&gt;/&lt;virtualdir&gt;/sqlcesa35.dll" />
-        <Label Content="Publisher *" Height="28" HorizontalAlignment="Left" Margin="12,11,0,0" Name="label2" VerticalAlignment="Top" Grid.Row="1" />
+        <Label Content="Publisher *" Height="28" HorizontalAlignment="Left" Margin="12,10.6,0,0" Name="label2" VerticalAlignment="Top" Grid.Row="1" Width="110" />
         <TextBox Style="{StaticResource requiredFieldValidationStyle}" Height="26" Margin="7,10,0,0" Name="txtPublisher" VerticalAlignment="Top" Grid.Column="1" Grid.Row="1" TabIndex="2" ToolTip="The Publisher is the computer that is running SQL Server and that contains the publication."/>
         <StackPanel Grid.Column="2" Margin="0,4,0,0" Grid.RowSpan="8" >
             <Button Content="Sync" Height="Auto" HorizontalAlignment="Stretch" Margin="6" Name="btnSync" VerticalAlignment="Stretch" Width="Auto" Padding="7,3" TabIndex="12" Click="btnSync_Click" ToolTip="Invokes merge replication between the SQL Server Compact 3.5 subscription and the SQL Server Publisher."/>
@@ -53,29 +53,29 @@
             <Button Content="Reinitialize no upload" x:Name="btnReinitNoUpload" Click="btnReinitNoUpload_Click" Grid.Column="1" Height="Auto" HorizontalAlignment="Stretch" Margin="6"  VerticalAlignment="Stretch" Width="Auto" Padding="7,3" TabIndex="14" ToolTip="Reinitialize the subscription, do not upload subscriber changes first." />
             <Button Content="Code sample" Height="Auto" HorizontalAlignment="Stretch" Margin="6" Name="btnSample" VerticalAlignment="Stretch" Width="Auto" Padding="7,3" TabIndex="15" ToolTip="Creates C# / VB.NET sample code for the current subscription." Click="btnSample_Click" />
             <Label Content="Last sync: N/A" Name="lblLastSync" Margin="4,4"  />
-        </StackPanel>        
+        </StackPanel>
 
         <Label Content="Publication Database *" Grid.Row="3" Height="28" HorizontalAlignment="Left" Margin="12,8,0,0" Name="label3" VerticalAlignment="Top" />
         <TextBox Style="{StaticResource requiredFieldValidationStyle}" Height="26" Margin="7,10,0,0" Name="txtPublisherDatabase" VerticalAlignment="Top" Grid.Column="1" Grid.Row="3" TabIndex="3" ToolTip="The name of the publication database." />
-        <Label Content="Publication *" Grid.Row="4" Height="28" HorizontalAlignment="Left" Margin="12,8,0,0" Name="label4" VerticalAlignment="Top" ClipToBounds="False" />
-        <Label Content="Subscriber *" Grid.Row="6" Height="28" HorizontalAlignment="Left" Margin="12,8,0,0" Name="label5" VerticalAlignment="Top" Grid.RowSpan="2" ClipToBounds="False" />
-        <Label Content="Internet Username" Grid.Row="8" Height="28" HorizontalAlignment="Left" Margin="12,8,0,0" Name="label6" VerticalAlignment="Top" />
+        <Label Content="Publication *" Grid.Row="4" Height="28" HorizontalAlignment="Left" Margin="12,8.4,0,0" Name="label4" VerticalAlignment="Top" ClipToBounds="False" Width="110" />
+        <Label Content="Subscriber *" Grid.Row="6" Height="28" HorizontalAlignment="Left" Margin="12,8.4,0,0" Name="label5" VerticalAlignment="Top" Grid.RowSpan="2" ClipToBounds="False" Width="118" />
+        <Label Content="Internet Username" Grid.Row="8" Height="28" HorizontalAlignment="Left" Margin="12,8.4,0,0" Name="label6" VerticalAlignment="Top" Grid.RowSpan="2" Width="118" />
         <TextBox Style="{StaticResource requiredFieldValidationStyle}" Height="26" Margin="7,10,0,0" Name="txtSubscriber" VerticalAlignment="Top" Grid.Column="1" Grid.Row="6" TabIndex="5" ToolTip="The name of the Subscriber." />
         <TextBox Style="{StaticResource requiredFieldValidationStyle}"  Height="26" Margin="7,10,0,0" Name="txtPublication" VerticalAlignment="Top" Grid.Column="1" Grid.Row="4" TabIndex="4" ToolTip="The SQL Server publication name that has been enabled for SQL Server Compact 3.5 subscribers."/>
         <TextBox Height="26" Margin="7,10,0,0" Name="txtInternetUsername" VerticalAlignment="Top" Grid.Column="1" Grid.Row="8" TabIndex="7" ToolTip="The login name used when connecting to the SQL Server Compact 3.5 Server Agent." />
-        <Label Content="Filter (HostName)" Grid.Row="7" Height="28" HorizontalAlignment="Left" Margin="12,8,0,0" Name="label8" VerticalAlignment="Top" />
+        <Label Content="Filter (HostName)" Grid.Row="7" Height="28" HorizontalAlignment="Left" Margin="12,8.4,0,0" Name="label8" VerticalAlignment="Top" Grid.RowSpan="2" Width="118" />
         <TextBox Height="26" Margin="7,10,0,0" Name="txtHostname" VerticalAlignment="Top" Grid.Column="1" Grid.Row="7" TabIndex="6" ToolTip="The host name (filter) used when connecting to the Publisher."/>
         <Label Content="Internet Password" Grid.Row="9" Height="28" HorizontalAlignment="Left" Margin="12,8,0,0" Name="label9" VerticalAlignment="Top" Width="129" />
         <Label Content="Publisher Username" Grid.Row="11" Height="26" HorizontalAlignment="Left" Margin="12,8,0,0" Name="label10" VerticalAlignment="Top" Width="129" ClipToBounds="False" />
-        <Label Content="Publisher Password" Grid.Row="12" Height="28" HorizontalAlignment="Left" Margin="12,8,0,0" Name="label11" VerticalAlignment="Top" />
+        <Label Content="Publisher Password" Grid.Row="12" Height="28" HorizontalAlignment="Left" Margin="12,8.2,0,0" Name="label11" VerticalAlignment="Top" Grid.RowSpan="2" Width="118" />
         <PasswordBox PasswordChar="*" Height="26" Margin="7,10,0,0" Name="txtInternetPassword" VerticalAlignment="Bottom" Grid.Column="1" Grid.Row="9" TabIndex="8" ToolTip="The password used when connecting to the SQL Server Compact 3.5 Server Agent."/>
         <TextBox Height="26" HorizontalAlignment="Left" Margin="7,10,0,0" Name="txtPublisherUsername" VerticalAlignment="Bottom" Width="357" Grid.Column="1" Grid.Row="11" TabIndex="10" ToolTip="The login name used when connecting to the Publisher."/>
         <PasswordBox PasswordChar="*" Height="26" Margin="7,10,0,0" Name="txtPublisherPassword" VerticalAlignment="Bottom" Grid.Column="1" Grid.Row="12" TabIndex="11" ToolTip="The password used when connecting to the Publisher." />
         <ComboBox Grid.Column="1" Grid.Row="10" Height="23" Margin="7,8,0,0" Name="comboBox1" VerticalAlignment="Top"  SelectedIndex="0" ToolTip="The SQL Server security mode used when connecting to the Publisher.">
             <ComboBoxItem Content="SQL Server Authentication" />
             <ComboBoxItem Content="Integrated Windows Authentication" />
-        </ComboBox>        
+        </ComboBox>
         <TextBox Margin="4,4" Grid.ColumnSpan="3" Grid.Row="13" VerticalAlignment="Stretch" MinHeight="200" HorizontalAlignment="Stretch" Name="txtStatus" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible" />
-        
+
     </Grid>
 </UserControl>
diff --git a/src/GUI/SqlCe35Toolbox/source.extension.vsixmanifest b/src/GUI/SqlCe35Toolbox/source.extension.vsixmanifest
index 4f550e21..6b7b36cc 100644
--- a/src/GUI/SqlCe35Toolbox/source.extension.vsixmanifest
+++ b/src/GUI/SqlCe35Toolbox/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
   <Identifier Id="41521019-e4c7-480c-8ea8-fc4a2c6f50aa">
     <Name>SQL Server Compact/SQLite Toolbox</Name>
     <Author>ErikEJ</Author>
-    <Version>4.4.0.10</Version>
+    <Version>4.4.0.11</Version>
     <Description xml:space="preserve">SQL Server Compact/SQLite Toolbox add-in for Visual Studio. This add-in adds several features to help your embedded database development efforts: Scripting of tables and data, import from SQL Server and CSV files and much, much more.</Description>
     <Locale>1033</Locale>
     <MoreInfoUrl>http://sqlcetoolbox.codeplex.com/</MoreInfoUrl>
diff --git a/src/GUI/SqlCeToolbox.Common/Helpers/TableColumn.cs b/src/GUI/SqlCeToolbox.Common/Helpers/TableColumn.cs
index e2bd44de..ba0853b4 100644
--- a/src/GUI/SqlCeToolbox.Common/Helpers/TableColumn.cs
+++ b/src/GUI/SqlCeToolbox.Common/Helpers/TableColumn.cs
@@ -132,7 +132,8 @@ public static List<Column> BuildColumns(List<TableColumn> columns, string tableN
                 col.AutoIncrementBy = item.Identity ? 1 : 0;
                 col.AutoIncrementSeed = item.Identity ? 1 : 0;
                 col.CharacterMaxLength = item.Length;
-                col.ColumnHasDefault = !string.IsNullOrEmpty(item.DefaultValue);
+                col.ColumnHasDefault = item.DefaultValue != null && !item.Identity;
+                col.ColumnDefault = item.DefaultValue;
                 col.ColumnName = item.Name;
                 col.DataType = item.DataType;
                 col.DateFormat = DateFormat.DateTime;