Merge branch 'release-2.1.2'
This commit is contained in:
commit
f382a8738b
10
HISTORY.md
10
HISTORY.md
@ -1,3 +1,13 @@
|
|||||||
|
Version 2.1.2 (2015-09-11)
|
||||||
|
========================================================================
|
||||||
|
|
||||||
|
- GEÄNDERT: Sammelurin-Proteinurie als Prot abgekürzt.
|
||||||
|
- VERBESSERT: Ambulanzstil überarbeitet.
|
||||||
|
- VERBESSERT: Evtl. vorgegebener Kommentartext wird jetzt automatisch markiert, damit er b.B. einfach durch Lostippen überschrieben werden kann.
|
||||||
|
|
||||||
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||||
|
|
||||||
|
|
||||||
Version 2.1.1 (2015-09-07)
|
Version 2.1.1 (2015-09-07)
|
||||||
========================================================================
|
========================================================================
|
||||||
|
|
||||||
|
@ -41,8 +41,8 @@
|
|||||||
<AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
|
<AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Bovender, Version=0.2.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
|
<Reference Include="Bovender, Version=0.3.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Bovender.0.2.0.0\lib\net40\Bovender.dll</HintPath>
|
<HintPath>..\packages\Bovender.0.3.1.0\lib\net40\Bovender.dll</HintPath>
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="Bovender" version="0.2.0.0" targetFramework="net40" />
|
<package id="Bovender" version="0.3.1.0" targetFramework="net40" />
|
||||||
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
|
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
|
||||||
<package id="NUnit" version="2.6.4" targetFramework="net40" />
|
<package id="NUnit" version="2.6.4" targetFramework="net40" />
|
||||||
</packages>
|
</packages>
|
@ -1,4 +1,4 @@
|
|||||||
2.1.1
|
2.1.2
|
||||||
http://zaa.nephrowiki.de/downloads/zaaReloaded-2.1.1.exe
|
http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
|
||||||
c92e8d47387961f965ca16c52f2ce1f8642df42d publish/release/zaaReloaded-2.1.1.exe
|
057270076d9bebb896866e5ce12ad76bb3ea7a7b publish/release/zaaReloaded-2.1.2.exe
|
||||||
|
|
||||||
|
@ -3,17 +3,17 @@
|
|||||||
<a1:Settings id="ref-1" xmlns:a1="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
|
<a1:Settings id="ref-1" xmlns:a1="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
|
||||||
<Version>2</Version>
|
<Version>2</Version>
|
||||||
<Uid xsi:type="a2:Guid" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
|
<Uid xsi:type="a2:Guid" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
|
||||||
<_a>1589012381</_a>
|
<_a>-1928431729</_a>
|
||||||
<_b>-32256</_b>
|
<_b>-21948</_b>
|
||||||
<_c>16464</_c>
|
<_c>18512</_c>
|
||||||
<_d>150</_d>
|
<_d>140</_d>
|
||||||
<_e>15</_e>
|
<_e>76</_e>
|
||||||
<_f>13</_f>
|
<_f>210</_f>
|
||||||
<_g>38</_g>
|
<_g>176</_g>
|
||||||
<_h>102</_h>
|
<_h>1</_h>
|
||||||
<_i>193</_i>
|
<_i>125</_i>
|
||||||
<_j>167</_j>
|
<_j>44</_j>
|
||||||
<_k>220</_k>
|
<_k>143</_k>
|
||||||
</Uid>
|
</Uid>
|
||||||
<Name id="ref-3">Kopie von Standard für NepA</Name>
|
<Name id="ref-3">Kopie von Standard für NepA</Name>
|
||||||
<ReferenceStyle xsi:type="a3:ReferenceStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">IfSpecialItem</ReferenceStyle>
|
<ReferenceStyle xsi:type="a3:ReferenceStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">IfSpecialItem</ReferenceStyle>
|
||||||
@ -98,11 +98,11 @@
|
|||||||
</a4:Items>
|
</a4:Items>
|
||||||
<a4:Items id="ref-13" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
|
<a4:Items id="ref-13" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
|
||||||
<Version>2</Version>
|
<Version>2</Version>
|
||||||
<Content id="ref-37">Sammelurin: SU-Proteinurie, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Natrium, SU-Zeit, SU-Volumen</Content>
|
<Content id="ref-37">Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen</Content>
|
||||||
</a4:Items>
|
</a4:Items>
|
||||||
<a4:Items id="ref-14" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
|
<a4:Items id="ref-14" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
|
||||||
<Version>2</Version>
|
<Version>2</Version>
|
||||||
<Content id="ref-38">Spot-Urin: U-TPCR, U-ACR, U-Ery, U-Leu, U-Bakt</Content>
|
<Content id="ref-38">Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt</Content>
|
||||||
</a4:Items>
|
</a4:Items>
|
||||||
<a4:Items id="ref-15" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
|
<a4:Items id="ref-15" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
|
||||||
<Version>2</Version>
|
<Version>2</Version>
|
||||||
|
@ -50,7 +50,7 @@ Gesamt-Bilirubin Bilirubin S
|
|||||||
Gesamt-Eiweiss Protein S
|
Gesamt-Eiweiss Protein S
|
||||||
"Gesamt-Eiweiss (PU)" Protein U
|
"Gesamt-Eiweiss (PU)" Protein U
|
||||||
"Gesamt-Eiweiss (SU)" Protein SU
|
"Gesamt-Eiweiss (SU)" Protein SU
|
||||||
"Gesamt-Eiweiss (SU)/die" Proteinurie SU
|
"Gesamt-Eiweiss (SU)/die" Prot SU
|
||||||
"Gesamt-Eiweiss/Creatinin (PU)" TPCR U 0
|
"Gesamt-Eiweiss/Creatinin (PU)" TPCR U 0
|
||||||
GGT GGT S 0
|
GGT GGT S 0
|
||||||
"glomerul. Filtrationsr. (MDRD)" "eGFR (MDRD)" S --- --- X
|
"glomerul. Filtrationsr. (MDRD)" "eGFR (MDRD)" S --- --- X
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
settings:WindowState.Save="True"
|
settings:WindowState.Save="True"
|
||||||
>
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
|
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<DockPanel Margin="10">
|
<DockPanel Margin="10">
|
||||||
<StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,0,0">
|
<StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,0,0">
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
Title="Fehlerbericht versenden"
|
Title="Fehlerbericht versenden"
|
||||||
>
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
|
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<StackPanel Margin="10" Orientation="Horizontal">
|
<StackPanel Margin="10" Orientation="Horizontal">
|
||||||
<TextBlock FontSize="72" FontWeight="Bold" Foreground="Red" Margin="0,0,10,0"
|
<TextBlock FontSize="72" FontWeight="Bold" Foreground="Red" Margin="0,0,10,0"
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
SizeToContent="WidthAndHeight"
|
SizeToContent="WidthAndHeight"
|
||||||
>
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
|
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<i:Interaction.Triggers>
|
<i:Interaction.Triggers>
|
||||||
<i:EventTrigger SourceObject="{Binding CompletedMessage}" EventName="Sent">
|
<i:EventTrigger SourceObject="{Binding CompletedMessage}" EventName="Sent">
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
Title="Fehlerbericht versenden"
|
Title="Fehlerbericht versenden"
|
||||||
>
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
|
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<StackPanel Margin="10" Orientation="Horizontal">
|
<StackPanel Margin="10" Orientation="Horizontal">
|
||||||
<TextBlock FontSize="48" FontWeight="Bold" Foreground="GreenYellow" Margin="0,0,10,0"
|
<TextBlock FontSize="48" FontWeight="Bold" Foreground="GreenYellow" Margin="0,0,10,0"
|
||||||
|
@ -45,7 +45,7 @@ namespace zaaReloaded2
|
|||||||
private void ThisAddIn_Startup(object sender, System.EventArgs e)
|
private void ThisAddIn_Startup(object sender, System.EventArgs e)
|
||||||
{
|
{
|
||||||
Bovender.ExceptionHandler.CentralHandler.ManageExceptionCallback += CentralHandler_ManageExceptionCallback;
|
Bovender.ExceptionHandler.CentralHandler.ManageExceptionCallback += CentralHandler_ManageExceptionCallback;
|
||||||
RegisterTextBoxSelectAll();
|
Bovender.WpfHelpers.RegisterTextBoxSelectAll();
|
||||||
CheckForUpdates();
|
CheckForUpdates();
|
||||||
_oldCaption = Globals.ThisAddIn.Application.Caption;
|
_oldCaption = Globals.ThisAddIn.Application.Caption;
|
||||||
Globals.ThisAddIn.Application.Caption =
|
Globals.ThisAddIn.Application.Caption =
|
||||||
@ -155,49 +155,5 @@ namespace zaaReloaded2
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Make text boxes select all text on focus.
|
|
||||||
/// </summary>
|
|
||||||
/// <remarks>
|
|
||||||
/// http://stackoverflow.com/a/2553297/270712
|
|
||||||
/// </remarks>
|
|
||||||
void RegisterTextBoxSelectAll()
|
|
||||||
{
|
|
||||||
// Select the text in a TextBox when it receives focus.
|
|
||||||
EventManager.RegisterClassHandler(typeof(TextBox), TextBox.PreviewMouseLeftButtonDownEvent,
|
|
||||||
new MouseButtonEventHandler(SelectivelyIgnoreMouseButton));
|
|
||||||
EventManager.RegisterClassHandler(typeof(TextBox), TextBox.GotKeyboardFocusEvent,
|
|
||||||
new RoutedEventHandler(SelectAllText));
|
|
||||||
EventManager.RegisterClassHandler(typeof(TextBox), TextBox.MouseDoubleClickEvent,
|
|
||||||
new RoutedEventHandler(SelectAllText));
|
|
||||||
}
|
|
||||||
|
|
||||||
void SelectivelyIgnoreMouseButton(object sender, MouseButtonEventArgs e)
|
|
||||||
{
|
|
||||||
// Find the TextBox
|
|
||||||
DependencyObject parent = e.OriginalSource as UIElement;
|
|
||||||
while (parent != null && !(parent is TextBox))
|
|
||||||
parent = VisualTreeHelper.GetParent(parent);
|
|
||||||
|
|
||||||
if (parent != null)
|
|
||||||
{
|
|
||||||
var textBox = (TextBox)parent;
|
|
||||||
if (!textBox.IsKeyboardFocusWithin)
|
|
||||||
{
|
|
||||||
// If the text box is not yet focused, give it the focus and
|
|
||||||
// stop further processing of this click event.
|
|
||||||
textBox.Focus();
|
|
||||||
e.Handled = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void SelectAllText(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
var textBox = e.OriginalSource as TextBox;
|
|
||||||
if (textBox != null)
|
|
||||||
textBox.SelectAll();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
2.1.1
|
2.1.2
|
||||||
2.1.1.0
|
2.1.2.0
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
Title="Über..."
|
Title="Über..."
|
||||||
>
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
|
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<StackPanel Margin="20">
|
<StackPanel Margin="20">
|
||||||
<Image Source="/zaaReloaded2;component/Icons/icon.png" Width="64" VerticalAlignment="Center" Margin="0 0 0 10" />
|
<Image Source="/zaaReloaded2;component/Icons/icon.png" Width="64" VerticalAlignment="Center" Margin="0 0 0 10" />
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
FocusManager.FocusedElement="{Binding ElementName=treeview}"
|
FocusManager.FocusedElement="{Binding ElementName=treeview}"
|
||||||
>
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
|
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<DockPanel Margin="10">
|
<DockPanel Margin="10">
|
||||||
<Label DockPanel.Dock="Top" Content="Verfügbare Elemente:" Target="{Binding ElementName=ElementsTreeView}" />
|
<Label DockPanel.Dock="Top" Content="Verfügbare Elemente:" Target="{Binding ElementName=ElementsTreeView}" />
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
FocusManager.FocusedElement="{Binding ElementName=ContentTextBox}"
|
FocusManager.FocusedElement="{Binding ElementName=ContentTextBox}"
|
||||||
>
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
|
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<DockPanel Margin="10">
|
<DockPanel Margin="10">
|
||||||
<Label DockPanel.Dock="Top" Content="Inhalt:" Target="{Binding ElementName=ContentTextBox}" />
|
<Label DockPanel.Dock="Top" Content="Inhalt:" Target="{Binding ElementName=ContentTextBox}" />
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
Title="Willkommen bei zaaReloaded"
|
Title="Willkommen bei zaaReloaded"
|
||||||
>
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
|
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<StackPanel Margin="10">
|
<StackPanel Margin="10">
|
||||||
<TextBlock FontWeight="Bold" FontSize="20" Margin="0 0 0 5">
|
<TextBlock FontWeight="Bold" FontSize="20" Margin="0 0 0 5">
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
Title="Import/Export-Fehler"
|
Title="Import/Export-Fehler"
|
||||||
>
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
|
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<DockPanel Margin="10">
|
<DockPanel Margin="10">
|
||||||
<TextBlock DockPanel.Dock="Left" Margin="0 0 20 0" LineHeight="72" LineStackingStrategy="BlockLineHeight"
|
<TextBlock DockPanel.Dock="Left" Margin="0 0 20 0" LineHeight="72" LineStackingStrategy="BlockLineHeight"
|
||||||
|
@ -23,28 +23,26 @@
|
|||||||
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
|
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
|
||||||
ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
|
ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
|
||||||
WindowStyle="ToolWindow" Topmost="True"
|
WindowStyle="ToolWindow" Topmost="True"
|
||||||
SizeToContent="WidthAndHeight"
|
SizeToContent="WidthAndHeight" MaxWidth="500"
|
||||||
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
|
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
|
||||||
Title="Kommentar angeben"
|
Title="Kommentar angeben"
|
||||||
FocusManager.FocusedElement="{Binding ElementName=ValueTextBox}"
|
FocusManager.FocusedElement="{Binding ElementName=ValueTextBox}"
|
||||||
>
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
|
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<DockPanel Margin="10">
|
<DockPanel Margin="10">
|
||||||
<Label DockPanel.Dock="Top" Content="{Binding Item}"
|
<Label DockPanel.Dock="Top" Content="{Binding Item}"
|
||||||
FontSize="16" FontWeight="Bold"
|
FontSize="16" FontWeight="Bold" Margin="0 0 0 10"
|
||||||
Target="{Binding ElementName=ValueTextBox}" Padding="0" />
|
Target="{Binding ElementName=ValueTextBox}" Padding="0" />
|
||||||
<UniformGrid DockPanel.Dock="Bottom" HorizontalAlignment="Right" Columns="2" Rows="1" Margin="0 10 0 0">
|
<UniformGrid DockPanel.Dock="Bottom" HorizontalAlignment="Right" Columns="2" Rows="1" Margin="0 15 0 0">
|
||||||
<Button Content="OK" Command="{Binding SaveCommand}" IsDefault="True" Margin="0 0 5 0" />
|
<Button Content="OK" Command="{Binding SaveCommand}" IsDefault="True" Margin="0 0 5 0" />
|
||||||
<Button Content="Abbrechen" Command="{Binding CloseViewCommand}" IsCancel="True" Margin="5 0 0 0" />
|
<Button Content="Abbrechen" Command="{Binding CloseViewCommand}" IsCancel="True" Margin="5 0 0 0" />
|
||||||
</UniformGrid>
|
</UniformGrid>
|
||||||
<DockPanel Margin="0 10 0 10">
|
|
||||||
<TextBlock DockPanel.Dock="Left" Text="{Binding Prefix}" VerticalAlignment="Center" />
|
<TextBlock DockPanel.Dock="Left" Text="{Binding Prefix}" VerticalAlignment="Center" />
|
||||||
<TextBlock DockPanel.Dock="Right" Text="{Binding Suffix}" VerticalAlignment="Center" />
|
<TextBlock DockPanel.Dock="Right" Text="{Binding Suffix}" VerticalAlignment="Center" />
|
||||||
<TextBox Text="{Binding Value,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
|
<TextBox Text="{Binding Value,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
|
||||||
MinWidth="120" MaxWidth="240" VerticalAlignment="Center"
|
MinWidth="120" MaxWidth="240" VerticalAlignment="Center"
|
||||||
x:Name="ValueTextBox" Margin="5 0 5 0" />
|
x:Name="ValueTextBox" Margin="5 0 5 0" />
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
</DockPanel>
|
|
||||||
</Window>
|
</Window>
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
Title="Einstellungen"
|
Title="Einstellungen"
|
||||||
>
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
|
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<DockPanel Margin="10">
|
<DockPanel Margin="10">
|
||||||
<UniformGrid DockPanel.Dock="Bottom" Columns="2" Rows="1"
|
<UniformGrid DockPanel.Dock="Bottom" Columns="2" Rows="1"
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
FocusManager.FocusedElement="{Binding ElementName=settingsList}"
|
FocusManager.FocusedElement="{Binding ElementName=settingsList}"
|
||||||
>
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary Source="/zaaReloaded2;component/style.xaml" />
|
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<i:Interaction.Triggers>
|
<i:Interaction.Triggers>
|
||||||
<i:EventTrigger SourceObject="{Binding EditSettingsMessage}" EventName="Sent">
|
<i:EventTrigger SourceObject="{Binding EditSettingsMessage}" EventName="Sent">
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
FocusManager.FocusedElement="{Binding ElementName=NameTextBox}"
|
FocusManager.FocusedElement="{Binding ElementName=NameTextBox}"
|
||||||
>
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
|
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<i:Interaction.Triggers>
|
<i:Interaction.Triggers>
|
||||||
<i:EventTrigger SourceObject="{Binding AddElementMessage}" EventName="Sent">
|
<i:EventTrigger SourceObject="{Binding AddElementMessage}" EventName="Sent">
|
||||||
|
@ -19,6 +19,6 @@
|
|||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<packages>
|
<packages>
|
||||||
<package id="Bovender" version="0.2.0.0" targetFramework="net40" />
|
<package id="Bovender" version="0.3.1.0" targetFramework="net40" />
|
||||||
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
|
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
|
||||||
</packages>
|
</packages>
|
@ -134,8 +134,9 @@
|
|||||||
-->
|
-->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Accessibility" />
|
<Reference Include="Accessibility" />
|
||||||
<Reference Include="Bovender">
|
<Reference Include="Bovender, Version=0.3.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Bovender.0.2.0.0\lib\net40\Bovender.dll</HintPath>
|
<HintPath>..\packages\Bovender.0.3.1.0\lib\net40\Bovender.dll</HintPath>
|
||||||
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
|
||||||
<Reference Include="PresentationCore" />
|
<Reference Include="PresentationCore" />
|
||||||
|
Loading…
Reference in New Issue
Block a user