Egalware/SarmaxWall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SarmaxWall :

Browse Source 
- Aggiornate immagini AboutBox.
- Aggiornata immagine Delete in NumericKeyboard.
- Modificata NumericKeyboard affinchè la window sia grande quanto necessario e non quanto la MainWindow.
- Modificate chiamate alla NumericKeybord in conseguenza delle modifiche ad essa apportate.
This commit is contained in:
Emmanuele Sassi
2015-09-07 11:31:38 +00:00
parent f4948eb226
commit ecb6d7cb18
10 changed files with 96 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AboutBoxWD.xaml
+2 -1
View File
@@ -30,7 +30,8 @@
<RowDefinition Height="0.5*"/>
</Grid.RowDefinitions>
<Image Grid.Column="1" Grid.Row="1" Source="Resources/AboutBoxImage.png" Width="48" Height="48"/>
<Image Grid.Column="1" Grid.Row="0" Grid.RowSpan="3" Source="Resources/AboutBoxImage.png" Width="300"
Height="100" VerticalAlignment="Bottom"/>
<Label Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
VerticalAlignment="Center" FontSize="18" />
<Label Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
AboutBoxWD.xaml.vb
+1 -1
View File
@@ -7,7 +7,7 @@ Public Class AboutBoxWD
Private Sub AboutBoxWD_Initialized(sender As Object, e As EventArgs)
DescriptionLbl.Content = My.Application.Info.Description.ToString()
VersionLbl.Content = My.Application.Info.Version.ToString()
VersionLbl.Content = "Versione: " + My.Application.Info.Version.ToString()
CopirightLbl.Content = My.Application.Info.Copyright.ToString()
ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4) 'Ok
End Sub
DrawPageUC.xaml
+1 -5
View File
@@ -69,11 +69,7 @@
<TextBox Name="TextBox4" Grid.Column="1" Grid.Row="8" Style="{StaticResource NumericKeyboard}"
FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Width="60"
TextAlignment="Right"/>
<Label Name="MessageLabel" Grid.Row="9" Grid.ColumnSpan="2" Content="Label" FontSize="15"/>
<Label Name="MessageLabel" Grid.Row="9" Grid.ColumnSpan="2" Content="Label" FontSize="15" />
<Button Name="AddBtn" Grid.Row="10" FontSize="15" />
<Button Name="CancelBtn" Grid.Column="1" Grid.Row="10" FontSize="15" />
MissingKeyWD.xaml
+20 -14
View File
@@ -1,35 +1,41 @@
<Window x:Class="MissingKeyWD"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="MissingKeyWD" Height="300" Width="450" Initialized="MissingKeyWD_Initialized" WindowStyle="None" ShowInTaskbar="False" ResizeMode="NoResize">
Title="MissingKeyWD" Height="256" Width="409.2" Initialized="MissingKeyWD_Initialized" WindowStyle="None" ShowInTaskbar="False" ResizeMode="NoResize">
<!-- Chiamata al Dictionary -->
<Window.Resources>
<ResourceDictionary Source="SarmaxWallDictionary.xaml"/>
</Window.Resources>
<!-- Definizione della MissingKeyWindow -->
<Border BorderBrush="Black" BorderThickness="1">
<!-- ** Definizione della Grid della MissingKeyWindow ** -->
<Grid Name="MissingKeyGrid">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="8*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="0.5*"/>
<ColumnDefinition Width="5*"/>
<ColumnDefinition Width="0.5*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="0.25*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.25*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
</Grid.RowDefinitions>
<Label Name="ErrorLbl" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center"
Foreground="Red" FontSize="25" />
<Label Name="MissingKeyLbl" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Center"
VerticalAlignment="Center" FontSize="18"/>
<Label Name="InsertKeyLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
VerticalAlignment="Center" FontSize="18" />
<Button Name="ExitBtn" Grid.Column="1" Grid.Row="5" FontSize="18"/>
<Label Name="MissingKeyLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
VerticalAlignment="Center" FontSize="15"/>
<Label Name="InsertKeyLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
VerticalAlignment="Center" FontSize="15" />
<Button Name="ExitBtn" Grid.Column="1" Grid.Row="6" FontSize="18"/>
</Grid>
NumericKeyboardWD.xaml
+53 -65
View File
@@ -1,85 +1,73 @@
<Window x:Class="NumericKeyboardWD"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="NumericKeyboardWD" Height="768" Width="1024" Background="Transparent" ResizeMode="NoResize"
Title="NumericKeyboardWD" Height="320" Width="341.3" Background="Transparent" ResizeMode="NoResize"
ShowInTaskbar="False" AllowsTransparency="True" WindowStyle="None" IsVisibleChanged="NumericKeyboardWD_IsVisibleChanged" Unloaded="NumericKeyboardWD_Unloaded" KeyDown="NumericKeyboardWD_KeyDown" Initialized="NumericKeyboardWD_Initialized">
<!-- Chiamata al Dictionary -->
<Window.Resources>
<ResourceDictionary Source="SarmaxWallDictionary.xaml"/>
</Window.Resources>
<!-- Definizione della NumericKeyboard -->
<Border Grid.Row="2" Grid.Column="2" BorderBrush="Black" BorderThickness="0" Background="Gray" CornerRadius="3">
<!-- Definizione della NumericKeyboard -->
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="7*"/>
<RowDefinition Height="5*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="7*"/>
<ColumnDefinition Width="5*"/>
</Grid.ColumnDefinitions>
<Grid Grid.Row="2" Grid.Column="2" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Border Grid.Row="2" Grid.Column="2" BorderBrush="Black" BorderThickness="0" Background="Gray" CornerRadius="3">
<Grid Grid.Row="2" Grid.Column="2" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="5" BorderThickness="1,1,1,0"
<Border Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="5" BorderThickness="1,1,1,0"
CornerRadius="3,3,0,0" BorderBrush="DarkGray" >
<TextBlock Text="Lato A" FontSize="25" Name="NumericKeyboardWDTitle" Background="#FFDDDDDD"
<TextBlock Text="Lato A" FontSize="25" Name="NumericKeyboardWDTitle" Background="#FFDDDDDD"
Padding="3,0,0,0"/>
</Border>
<TextBox Text="100" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5"
</Border>
<TextBox Text="100" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="5"
TextAlignment="Right" FontSize="25" Name="NumericKeyboardWDTextBox" />
<Button Content="7" Grid.Row="2" Grid.Column="0" FontSize="40" Click="Btn7WD_Click" />
<Button Content="8" Grid.Row="2" Grid.Column="1" FontSize="40" Click="Btn8WD_Click" />
<Button Content="9" Grid.Row="2" Grid.Column="2" FontSize="40" Click="Btn9WD_Click" />
<Button Grid.Row="2" Grid.Column="3" FontSize="40" Click="BtnDeleteWD_Click" >
<Image Source="Resources/NumericKeyboardArrow.png" Width="50" Height="50" HorizontalAlignment="Center"
<Button Content="7" Grid.Row="2" Grid.Column="0" FontSize="40" Click="Btn7WD_Click" />
<Button Content="8" Grid.Row="2" Grid.Column="1" FontSize="40" Click="Btn8WD_Click" />
<Button Content="9" Grid.Row="2" Grid.Column="2" FontSize="40" Click="Btn9WD_Click" />
<Button Grid.Row="2" Grid.Column="3" FontSize="40" Click="BtnDeleteWD_Click" >
<Image Source="Resources/NumericKeyboardArrow.png" Width="50" Height="50" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
<Button Grid.Column="4" Content="C" Grid.Row="2" FontSize="40" Click="BtnCancelWD_Click" />
<Button Grid.Column="0" Content="4" Grid.Row="3" FontSize="40" Click="Btn4WD_Click" />
<Button Grid.Column="1" Content="5" Grid.Row="3" FontSize="40" Click="Btn5WD_Click" />
<Button Grid.Column="2" Content="6" Grid.Row="3" FontSize="40" Click="Btn6WD_Click" />
<Button Grid.Column="3" Content="+" Grid.Row="3" FontSize="40" Click="BtnPlusWD_Click" />
<Button Grid.Column="4" Content="*" Grid.Row="3" FontSize="40" Click="BtnMultiplicationWD_Click" />
<Button Grid.Column="0" Content="1" Grid.Row="4" FontSize="40" Click="Btn1WD_Click" />
<Button Grid.Column="1" Content="2" Grid.Row="4" FontSize="40" Click="Btn2WD_Click" />
<Button Grid.Column="2" Content="3" Grid.Row="4" FontSize="40" Click="Btn3WD_Click" />
<Button Grid.Column="3" Content="-" Grid.Row="4" FontSize="40" Click="BtnMinusWD_Click" />
<Button Grid.Column="4" Content="/" Grid.Row="4" FontSize="40" Click="BtnDivisionWD_Click" />
<Button Grid.Column="0" Content="0" Grid.Row="5" FontSize="40" Click="Btn0WD_Click"/>
<Button Grid.Column="1" Content="." Grid.Row="5" FontSize="40" Click="BtnDotWD_Click" />
<Button Grid.Column="2" Content="=" Grid.Row="5" FontSize="40" Click="BtnEvaluateWD_Click" />
<Button Grid.Row="5" Grid.Column="3" FontSize="40" Click="BtnApplyWD_Click" >
<Image Source="Resources/V.png" Width="65" Height="65" HorizontalAlignment="Center"
</Button>
<Button Grid.Column="4" Content="C" Grid.Row="2" FontSize="40" Click="BtnCancelWD_Click" />
<Button Grid.Column="0" Content="4" Grid.Row="3" FontSize="40" Click="Btn4WD_Click" />
<Button Grid.Column="1" Content="5" Grid.Row="3" FontSize="40" Click="Btn5WD_Click" />
<Button Grid.Column="2" Content="6" Grid.Row="3" FontSize="40" Click="Btn6WD_Click" />
<Button Grid.Column="3" Content="+" Grid.Row="3" FontSize="40" Click="BtnPlusWD_Click" />
<Button Grid.Column="4" Content="*" Grid.Row="3" FontSize="40" Click="BtnMultiplicationWD_Click" />
<Button Grid.Column="0" Content="1" Grid.Row="4" FontSize="40" Click="Btn1WD_Click" />
<Button Grid.Column="1" Content="2" Grid.Row="4" FontSize="40" Click="Btn2WD_Click" />
<Button Grid.Column="2" Content="3" Grid.Row="4" FontSize="40" Click="Btn3WD_Click" />
<Button Grid.Column="3" Content="-" Grid.Row="4" FontSize="40" Click="BtnMinusWD_Click" />
<Button Grid.Column="4" Content="/" Grid.Row="4" FontSize="40" Click="BtnDivisionWD_Click" />
<Button Grid.Column="0" Content="0" Grid.Row="5" FontSize="40" Click="Btn0WD_Click"/>
<Button Grid.Column="1" Content="." Grid.Row="5" FontSize="40" Click="BtnDotWD_Click" />
<Button Grid.Column="2" Content="=" Grid.Row="5" FontSize="40" Click="BtnEvaluateWD_Click" />
<Button Grid.Row="5" Grid.Column="3" FontSize="40" Click="BtnApplyWD_Click" >
<Image Source="Resources/V.png" Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
<Button Grid.Row="5" Grid.Column="4" FontSize="40" Click="BtnExitWD_Click" >
<Image Source="Resources/X.png" Width="65" Height="65" HorizontalAlignment="Center"
</Button>
<Button Grid.Row="5" Grid.Column="4" FontSize="40" Click="BtnExitWD_Click" >
<Image Source="Resources/X.png" Width="65" Height="65" HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Button>
</Button>
</Grid>
</Border>
</Grid>
</Grid>
</Border>
</Window>
NumericKeyboardWD.xaml.vb
+12 -3
View File
@@ -17,6 +17,8 @@ Public Class NumericKeyboardWD
If Me.IsVisible Then
NumericKeyboardWDTextBox.Text = m_CurrentTxBx.Text
NumericKeyboardWDTitle.Text = m_CurrentLbl
Else
NumericKeyboardWDTitle.Foreground = Brushes.Black
End If
End Sub
@@ -105,12 +107,19 @@ Public Class NumericKeyboardWD
End Sub
Private Sub BtnCancelWD_Click(sender As Object, e As RoutedEventArgs)
NumericKeyboardWDTextBox.Text = String.Empty
If m_bErrorState Then
NumericKeyboardWDTextBox.Text = String.Empty
NumericKeyboardWDTitle.Foreground = Brushes.Black
NumericKeyboardWDTitle.Text = m_CurrentLbl
m_bErrorState = False
Else
NumericKeyboardWDTextBox.Text = String.Empty
End If
End Sub
Private Sub BtnExitWD_Click(sender As Object, e As RoutedEventArgs)
NumericKeyboardWDTextBox.Text = String.Empty
Visibility = Windows.Visibility.Hidden
NumericKeyboardWDTextBox.Text = String.Empty
End Sub
Private Sub BtnApplyWD_Click(sender As Object, e As RoutedEventArgs)
@@ -140,4 +149,4 @@ Public Class NumericKeyboardWD
End If
End Sub
End Class
End Class
PlacePageUC.xaml
+4 -3
View File
@@ -34,9 +34,10 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="1*"/>
<RowDefinition Height="4.5*"/>
<RowDefinition Height="4*"/>
</Grid.RowDefinitions>
<Label Name="WallPositioningLbl" Grid.ColumnSpan="3" VerticalAlignment="Center"
@@ -66,9 +67,9 @@
VerticalAlignment="Center" />
</Button>
<Button Name="RemoveWallBtn" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3" FontSize="15" />
<Button Name="RemoveWallBtn" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" FontSize="15" />
<UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2">
<UniformGrid Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="2">
<TextBlock Name="LayerThicknessLbl" Grid.ColumnSpan="3" VerticalAlignment="Center"
HorizontalAlignment="Center" FontSize="15" TextWrapping="WrapWithOverflow" Width="75"
TextAlignment="Center" />
Resources/AboutBoxImage.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Resources/NumericKeyboardArrow.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 520 B

After

Width:  |  Height:  |  Size: 624 B

SarmaxWallDictionary.xaml.vb
+3 -3
View File
@@ -12,10 +12,10 @@
If (Not IsNothing(AssocLabel)) Then
m_NumericKeyboardWD.m_CurrentLbl = AssocLabel.Content
End If
m_NumericKeyboardWD.Top = m_MainWindowUC.Top
m_NumericKeyboardWD.Top = m_MainWindowUC.Top + (m_MainWindowUC.Height / 12)
m_NumericKeyboardWD.Left = m_MainWindowUC.Left
m_NumericKeyboardWD.Height = m_MainWindowUC.Height
m_NumericKeyboardWD.Width = m_MainWindowUC.Width
m_NumericKeyboardWD.Height = m_MainWindowUC.Height / 12 * 5
m_NumericKeyboardWD.Width = m_MainWindowUC.Width / 15 * 5
m_NumericKeyboardWD.Visibility = Visibility.Visible
End Sub