- migliorata finestra copia multipla

Effector.Plugin.DoorArreda/MultipleCopyWnd/MultipleCopyWndV.xaml

@@ -1,25 +1,38 @@
 <Window x:Class="MultipleCopyWndV"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Height="200"
-        Width="400">
-   <Grid>
+        SizeToContent="WidthAndHeight"
+        WindowStartupLocation="CenterOwner">
+   <Grid Margin="5">
       <Grid.RowDefinitions>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
-      <Grid>
+      <Grid Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
-         <TextBlock Text="Numero di copie"/>
+         <TextBlock Text="Numero di copie"
+                    Margin="0,0,2.5,0"/>
          <TextBox Grid.Column="1"
-                  Text="{Binding sCopyNumber}"/>
+                  Text="{Binding sCopyNumber}"
+                  Width="40"
+                  Margin="2.5,0,0,0"/>
+      </Grid>
+      <Grid Grid.Row="1">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Button Content="Ok"
+                 Command="{Binding Ok_Command}"
+                 Margin="0,0,2.5,0"/>
+         <Button Grid.Column="1"
+                 Content="Annulla"
+                 Command="{Binding Cancel_Command}"
+                 Margin="2.5,0,0,0"/>
       </Grid>
-      <Button Grid.Row="1"
-              Content="Ok"
-              Command="{Binding Ok_Command}"/>
    </Grid>
 
 </Window>

Effector.Plugin.DoorArreda/MultipleCopyWnd/MultipleCopyWndVM.vb

@@ -23,6 +23,7 @@
 
    ' Definizione comandi
    Private m_cmdOk As ICommand
+   Private m_cmdCancel As ICommand
 
 #Region "COMMANDS"
 
@@ -43,6 +44,23 @@
 
 #End Region ' Ok
 
+#Region "Cancel"
+
+   Public ReadOnly Property Cancel_Command As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   Public Sub Cancel()
+      RaiseEvent m_CloseWindow(False)
+   End Sub
+
+#End Region ' Cancel
+
 #End Region    ' COMMANDS
 
 End Class