Rev 2357 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2357 | Rev 2364 | ||
---|---|---|---|
Line 173... | Line 173... | ||
173 | <Grid Grid.ColumnSpan="2" Grid.Row="4"> |
173 | <Grid Grid.ColumnSpan="2" Grid.Row="4"> |
174 | <Border Style="{StaticResource buttonBorder}" Background="Black" CornerRadius="4" /> |
174 | <Border Style="{StaticResource buttonBorder}" Background="Black" CornerRadius="4" /> |
175 | <Button x:Name="button17" Background="WhiteSmoke" |
175 | <Button x:Name="button17" Background="WhiteSmoke" |
176 | Command="{Binding PressAndRelease}" CommandParameter="NUMPAD0" Click="button_Click" Content="0" /> |
176 | Command="{Binding PressAndRelease}" CommandParameter="NUMPAD0" Click="button_Click" Content="0" /> |
177 | </Grid> |
177 | </Grid> |
178 | <Grid Grid.Column="2" Grid.Row="4"> |
178 | <Grid x:Name="gDecimal" Grid.Column="2" Grid.Row="4"> |
179 | <Border Style="{StaticResource buttonBorder}" Background="Black" CornerRadius="4" /> |
179 | <Border Style="{StaticResource buttonBorder}" Background="Black" CornerRadius="4" /> |
180 | <Button x:Name="button19" Background="WhiteSmoke" |
180 | <Button x:Name="button19" Background="WhiteSmoke" |
181 | Command="{Binding PressAndRelease}" CommandParameter="DECIMAL" Click="button_Click" Content="." /> |
181 | Command="{Binding PressAndRelease}" CommandParameter="DECIMAL" Click="button_Click" Content="," /> |
182 | </Grid> |
182 | </Grid> |
183 | <Grid Grid.ColumnSpan="3"> |
183 | <Grid Grid.ColumnSpan="3"> |
184 | <Border Style="{StaticResource buttonBorder}" Background="Black" CornerRadius="0" /> |
184 | <Border Style="{StaticResource buttonBorder}" Background="Black" CornerRadius="0" > |
- | 185 | <!--<TextBox x:Name="textBox" HorizontalAlignment="Left" Height="49" Text="{Binding Result}" VerticalAlignment="Top" Width="212" AllowDrop="False" IsUndoEnabled="False" IsReadOnly="True"/>--> |
|
- | 186 | </Border> |
|
185 | <Label Content="{Binding Result}" HorizontalContentAlignment="Right" Background="WhiteSmoke" Margin="4"/> |
187 | <Label Content="{Binding Result}" HorizontalContentAlignment="Right" Background="WhiteSmoke" Margin="4"/> |
- | 188 | ||
186 | </Grid> |
189 | </Grid> |
187 | <Grid Grid.Column="3" > |
190 | <Grid Grid.Column="3" > |
188 | <Border Style="{StaticResource buttonBorder}" Background="Black" CornerRadius="4" /> |
191 | <Border Style="{StaticResource buttonBorder}" Background="Black" CornerRadius="4" /> |
189 | <Button x:Name="buttonEsc" Grid.Row="0" |
192 | <Button x:Name="buttonEsc" Grid.Row="0" |
190 | Command="{Binding PressAndRelease}" CommandParameter="ESC" Click="button_Click" Content="Esc"/> |
193 | Command="{Binding PressAndRelease}" CommandParameter="ESC" Click="button_Click" Content="Esc"/> |