Meik/CustomerPanel-Test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine tab alignment and rebuild computer information layout

Browse Source
This commit is contained in:
Meik
2026-03-05 10:54:38 +01:00
parent 9180d88a44
commit 03fc189639
6 changed files with 389 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MainWindow.xaml
View File

@@ -474,6 +474,8 @@
Panel.ZIndex="18" Panel.ZIndex="18"
Style="{StaticResource ImageStyle}" Style="{StaticResource ImageStyle}"
Tag="Signal" Tag="Signal"
Width="12"
Height="12"
Stretch="None" Stretch="None"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -530,6 +532,8 @@
Panel.ZIndex="18" Panel.ZIndex="18"
Style="{StaticResource ImageStyle}" Style="{StaticResource ImageStyle}"
Tag="Signal" Tag="Signal"
Width="12"
Height="12"
Stretch="None" Stretch="None"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -585,6 +589,8 @@
Panel.ZIndex="18" Panel.ZIndex="18"
Style="{StaticResource ImageStyle}" Style="{StaticResource ImageStyle}"
Tag="Signal" Tag="Signal"
Width="12"
Height="12"
Stretch="None" Stretch="None"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -641,6 +647,8 @@
Panel.ZIndex="18" Panel.ZIndex="18"
Style="{StaticResource ImageStyle}" Style="{StaticResource ImageStyle}"
Tag="Signal" Tag="Signal"
Width="12"
Height="12"
Stretch="None" Stretch="None"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -697,6 +705,8 @@
Panel.ZIndex="18" Panel.ZIndex="18"
Style="{StaticResource ImageStyle}" Style="{StaticResource ImageStyle}"
Tag="Signal" Tag="Signal"
Width="12"
Height="12"
Stretch="None" Stretch="None"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -747,6 +757,7 @@
<uctrl:CustomLinks x:Name="CustomLinksCtrl" <uctrl:CustomLinks x:Name="CustomLinksCtrl"
Canvas.Left="0" Canvas.Left="0"
Canvas.Top="10"
Visibility="Collapsed" /> Visibility="Collapsed" />
</Canvas> </Canvas>

2
UserControls/AnnouncementListItem.xaml
View File

@@ -39,7 +39,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Background="{Binding Path=PrioColor}" Grid.RowSpan="3" x:Name="annColor"></Grid> <Grid Background="{Binding Path=PrioColor}" Grid.RowSpan="3" x:Name="annColor"></Grid>
<DockPanel Grid.Column="1" > <DockPanel Grid.Column="1" >
<Image Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png" Panel.ZIndex="18" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="signal" Width="15px" Cursor="Hand" ToolTip="{x:Static resx:Resources.removeMarkup}" Margin="5,0,0,0" /> <Image Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png" Panel.ZIndex="18" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="signal" Width="12" Height="12" Cursor="Hand" ToolTip="{x:Static resx:Resources.removeMarkup}" Margin="5,0,0,0" />
<TextBlock x:Name="txtDate" Grid.Row="0" Margin="10,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Text="{Binding Path=CreatedDate,StringFormat={}{0:dd.MM.yyyy},FallbackValue='01.01.2021'}"></TextBlock> <TextBlock x:Name="txtDate" Grid.Row="0" Margin="10,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Text="{Binding Path=CreatedDate,StringFormat={}{0:dd.MM.yyyy},FallbackValue='01.01.2021'}"></TextBlock>
</DockPanel> </DockPanel>

327
UserControls/ComputerInformation.xaml
View File

@@ -76,305 +76,328 @@
<!--ComputerInformation--> <!--ComputerInformation-->
<Grid x:Name="GridInfo" x:FieldModifier="private" <Grid x:Name="GridInfo" x:FieldModifier="private"
Width="500" Width="500">
Height="560"
Canvas.Left="0"
Canvas.Top="0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="100*" /> <ColumnDefinition Width="100*" />
<ColumnDefinition Width="185*" /> <ColumnDefinition Width="185*" />
<ColumnDefinition Width="134*" /> <ColumnDefinition Width="185*" />
<ColumnDefinition Width="51*" />
<ColumnDefinition Width="30*" /> <ColumnDefinition Width="30*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="56" /> <RowDefinition Height="6*" />
<RowDefinition Height="72" /> <RowDefinition Height="7*" />
<RowDefinition Height="72" />
<RowDefinition Height="72" />
<RowDefinition Height="72" />
<RowDefinition Height="72" />
<RowDefinition Height="72" />
<RowDefinition Height="72" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Canvas Grid.Column="1"
Grid.ColumnSpan="3" <Canvas x:Name="CanvasInfo"
Grid.Row="1" Grid.Column="1"
Height="70"> Grid.ColumnSpan="2"
<Image Source="{DynamicResource appbar_monitor}" Grid.Row="0"
Height="34" Height="560">
x:Name="icoComputer_Inline" x:FieldModifier="private" /> <Image Source="{DynamicResource appbar_information}"
Width="36"
Height="36"
Margin="0,6,0,0"
Tag="MAINICO" />
<Label Foreground="{DynamicResource sectionTitleColor}" <Label Foreground="{DynamicResource sectionTitleColor}"
x:Name="LblComputername" x:FieldModifier="private" Content="{x:Static resx:Resources.information}"
FontSize="19"
FontWeight="SemiBold"
Canvas.Top="8"
Canvas.Left="40" />
<StackPanel Canvas.Top="56"
Canvas.Left="0"
Width="350">
<Canvas Width="350"
Height="54">
<Image Source="{DynamicResource appbar_monitor}"
Height="30"
x:Name="icoComputer_Inline"
x:FieldModifier="private" />
<Label Foreground="{DynamicResource sectionTitleColor}"
x:Name="LblComputername"
x:FieldModifier="private"
Content="{x:Static resx:Resources.computername}" Content="{x:Static resx:Resources.computername}"
FontSize="16" FontSize="16"
Canvas.Top="10" Canvas.Top="4"
Canvas.Left="40" /> Canvas.Left="40" />
<TextBox Canvas.Left="15" <TextBox Canvas.Left="15"
Width="300" Width="300"
Height="24"
FontSize="16" FontSize="16"
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource InfoTextBoxStyle}" Style="{StaticResource InfoTextBoxStyle}"
x:Name="TxtComputername" x:FieldModifier="private" x:Name="TxtComputername"
x:FieldModifier="private"
IsReadOnly="true" IsReadOnly="true"
Canvas.Top="45" Canvas.Top="26"
Height="25"
PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" /> PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
<Image Cursor="Hand" <Image Cursor="Hand"
Source="{DynamicResource appbar_page_copy}" Source="{DynamicResource appbar_page_copy}"
Height="25" Height="22"
x:Name="icoCopyComputer" x:FieldModifier="private" x:Name="icoCopyComputer"
x:FieldModifier="private"
Tag="MAINICO" Tag="MAINICO"
HorizontalAlignment="Right"
Canvas.Left="315" Canvas.Left="315"
Canvas.Top="45" Canvas.Top="26"
Width="28" Width="24"
PreviewMouseDown="ClickCopyIcon" /> PreviewMouseDown="ClickCopyIcon" />
</Canvas> </Canvas>
<Canvas Grid.Column="1"
Grid.ColumnSpan="3" <Canvas Width="350"
Grid.Row="2" Height="54">
Height="70">
<Image Source="{DynamicResource appbar_network}" <Image Source="{DynamicResource appbar_network}"
Height="34" Height="30"
x:Name="icoNetwork_Inline" x:FieldModifier="private" /> x:Name="icoNetwork_Inline"
x:FieldModifier="private" />
<Label Foreground="{DynamicResource sectionTitleColor}" <Label Foreground="{DynamicResource sectionTitleColor}"
FontSize="16" FontSize="16"
x:Name="LblIpaddress" x:FieldModifier="private" x:Name="LblIpaddress"
x:FieldModifier="private"
Content="{x:Static resx:Resources.ipaddress}" Content="{x:Static resx:Resources.ipaddress}"
Canvas.Top="10" Canvas.Top="4"
Canvas.Left="40" /> Canvas.Left="40" />
<TextBox Canvas.Left="15" <TextBox Canvas.Left="15"
Width="300" Width="300"
Height="25" Height="24"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="16" FontSize="16"
Style="{StaticResource InfoTextBoxStyle}" Style="{StaticResource InfoTextBoxStyle}"
x:Name="TxtIpaddress" x:FieldModifier="private" x:Name="TxtIpaddress"
x:FieldModifier="private"
IsReadOnly="true" IsReadOnly="true"
Canvas.Top="45" Canvas.Top="26"
PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" /> PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
<Image Cursor="Hand" <Image Cursor="Hand"
Source="{DynamicResource appbar_page_copy}" Source="{DynamicResource appbar_page_copy}"
Height="25" Height="22"
x:Name="icoCopyNetwork" x:FieldModifier="private" x:Name="icoCopyNetwork"
x:FieldModifier="private"
Tag="MAINICO" Tag="MAINICO"
HorizontalAlignment="Right" Canvas.Left="315"
Canvas.Left="312" Canvas.Top="26"
Canvas.Top="45" Width="24"
Width="28"
PreviewMouseDown="ClickCopyIcon" /> PreviewMouseDown="ClickCopyIcon" />
</Canvas> </Canvas>
<Canvas Grid.Column="1"
Grid.ColumnSpan="3" <Canvas Width="350"
Grid.Row="3" Height="54"
Height="70" x:Name="CanvasHostname"
x:Name="CanvasHostname" x:FieldModifier="private"> x:FieldModifier="private">
<Image Source="{DynamicResource appbar_remotehost}" <Image Source="{DynamicResource appbar_remotehost}"
Height="34" Height="30"
x:Name="icoHost_Inline" x:FieldModifier="private"/> x:Name="icoHost_Inline"
x:FieldModifier="private" />
<Label Foreground="{DynamicResource sectionTitleColor}" <Label Foreground="{DynamicResource sectionTitleColor}"
x:Name="LblHostname" x:FieldModifier="private" x:Name="LblHostname"
x:FieldModifier="private"
Content="{x:Static resx:Resources.Hostname}" Content="{x:Static resx:Resources.Hostname}"
FontSize="16" FontSize="16"
Canvas.Top="10" Canvas.Top="4"
Canvas.Left="40" /> Canvas.Left="40" />
<TextBox Canvas.Left="15" <TextBox Canvas.Left="15"
Width="300" Width="300"
Height="24"
FontSize="16" FontSize="16"
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource InfoTextBoxStyle}" Style="{StaticResource InfoTextBoxStyle}"
x:Name="TxtHostname" x:FieldModifier="private" x:Name="TxtHostname"
x:FieldModifier="private"
IsReadOnly="true" IsReadOnly="true"
Canvas.Top="45" Canvas.Top="26"
Height="25"
PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" /> PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
<Image Cursor="Hand" <Image Cursor="Hand"
Source="{DynamicResource appbar_page_copy}" Source="{DynamicResource appbar_page_copy}"
Height="25" Height="22"
x:Name="icoCopyHost" x:FieldModifier="private" x:Name="icoCopyHost"
x:FieldModifier="private"
Tag="MAINICO" Tag="MAINICO"
HorizontalAlignment="Right"
Canvas.Left="315" Canvas.Left="315"
Canvas.Top="45" Canvas.Top="26"
Width="28" Width="24"
PreviewMouseDown="ClickCopyIcon" /> PreviewMouseDown="ClickCopyIcon" />
</Canvas> </Canvas>
<Canvas Grid.Column="1"
Grid.ColumnSpan="3" <Canvas Width="350"
Grid.Row="4" Height="54">
Height="70">
<Image Source="{DynamicResource appbar_people}" <Image Source="{DynamicResource appbar_people}"
Height="34" Height="30"
x:Name="icoUser_Inline" x:FieldModifier="private" /> x:Name="icoUser_Inline"
x:FieldModifier="private" />
<Label Foreground="{DynamicResource sectionTitleColor}" <Label Foreground="{DynamicResource sectionTitleColor}"
FontSize="16" FontSize="16"
x:Name="LblUsername" x:FieldModifier="private" x:Name="LblUsername"
x:FieldModifier="private"
Content="{x:Static resx:Resources.username}" Content="{x:Static resx:Resources.username}"
Canvas.Top="10" Canvas.Top="4"
Canvas.Left="40" /> Canvas.Left="40" />
<TextBox Canvas.Left="15" <TextBox Canvas.Left="15"
Width="300" Width="300"
Height="25" Height="24"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="16" FontSize="16"
Style="{StaticResource InfoTextBoxStyle}" Style="{StaticResource InfoTextBoxStyle}"
x:Name="TxtUsername" x:FieldModifier="private" x:Name="TxtUsername"
x:FieldModifier="private"
IsEnabled="true" IsEnabled="true"
IsReadOnly="true" IsReadOnly="true"
Canvas.Top="45" Canvas.Top="26"
PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" /> PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
<Image Cursor="Hand" <Image Cursor="Hand"
Source="{DynamicResource appbar_page_copy}" Source="{DynamicResource appbar_page_copy}"
Height="25" Height="22"
x:Name="icoCopyUser" x:FieldModifier="private" x:Name="icoCopyUser"
x:FieldModifier="private"
Tag="MAINICO" Tag="MAINICO"
HorizontalAlignment="Right" Canvas.Left="315"
Canvas.Left="312" Canvas.Top="26"
Canvas.Top="45" Width="24"
Width="28"
PreviewMouseDown="ClickCopyIcon" /> PreviewMouseDown="ClickCopyIcon" />
</Canvas> </Canvas>
<Canvas Grid.Column="1"
Grid.ColumnSpan="3" <Canvas Width="350"
Grid.Row="5" Height="54">
Height="70">
<Image Source="{DynamicResource appbar_reset}" <Image Source="{DynamicResource appbar_reset}"
Height="34" Height="30"
x:Name="icoRestart_Inline" x:FieldModifier="private" x:Name="icoRestart_Inline"
x:FieldModifier="private"
Tag="MAINICO" /> Tag="MAINICO" />
<Label Foreground="{DynamicResource sectionTitleColor}" <Label Foreground="{DynamicResource sectionTitleColor}"
FontSize="16" FontSize="16"
x:Name="LblLastreboot" x:FieldModifier="private" x:Name="LblLastreboot"
x:FieldModifier="private"
Content="{x:Static resx:Resources.lastreboot}" Content="{x:Static resx:Resources.lastreboot}"
Canvas.Top="10" Canvas.Top="4"
Canvas.Left="40" /> Canvas.Left="40" />
<TextBox Canvas.Left="15" <TextBox Canvas.Left="15"
Width="300" Width="300"
Height="25" Height="24"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="16" FontSize="16"
Style="{StaticResource InfoTextBoxStyle}" Style="{StaticResource InfoTextBoxStyle}"
x:Name="TxtLastreboot" x:FieldModifier="private" x:Name="TxtLastreboot"
x:FieldModifier="private"
IsReadOnly="true" IsReadOnly="true"
Canvas.Top="45" Canvas.Top="26"
MouseDoubleClick="Info_TXT_OnMouseDoubleClick" /> MouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
<Image Cursor="Hand" <Image Cursor="Hand"
Source="{DynamicResource appbar_page_copy}" Source="{DynamicResource appbar_page_copy}"
Height="25" Height="22"
x:Name="icoCopyRestart" x:FieldModifier="private" x:Name="icoCopyRestart"
x:FieldModifier="private"
Tag="MAINICO" Tag="MAINICO"
HorizontalAlignment="Right" Canvas.Left="315"
Canvas.Left="312" Canvas.Top="26"
Canvas.Top="45" Width="24"
Width="28"
PreviewMouseDown="ClickCopyIcon" /> PreviewMouseDown="ClickCopyIcon" />
</Canvas> </Canvas>
<Canvas Grid.Column="1"
Grid.ColumnSpan="3" <Canvas Width="350"
Grid.Row="6" Height="74">
Height="70">
<Image Source="{DynamicResource appbar_folder_ellipsis}" <Image Source="{DynamicResource appbar_folder_ellipsis}"
Height="34" Height="30"
x:Name="icoDrive_Inline" x:FieldModifier="private" x:Name="icoDrive_Inline"
x:FieldModifier="private"
Tag="MAINICO" /> Tag="MAINICO" />
<Label Foreground="{DynamicResource sectionTitleColor}" <Label Foreground="{DynamicResource sectionTitleColor}"
x:Name="LblDrives" x:FieldModifier="private" x:Name="LblDrives"
x:FieldModifier="private"
Content="{x:Static resx:Resources.drives}" Content="{x:Static resx:Resources.drives}"
FontSize="16" FontSize="16"
Canvas.Top="10" Canvas.Top="4"
Canvas.Left="40" /> Canvas.Left="40" />
<StackPanel Canvas.Left="15" <StackPanel Canvas.Left="15"
Canvas.Top="40" Canvas.Top="28"
Orientation="Vertical" Orientation="Vertical"
Width="300"> Width="300">
<StackPanel x:Name="StPaDrives" x:FieldModifier="private" <StackPanel x:Name="StPaDrives"
x:FieldModifier="private"
Width="300"
CanHorizontallyScroll="True" CanHorizontallyScroll="True"
CanVerticallyScroll="True" CanVerticallyScroll="True"
MinHeight="30" MinHeight="30"
MaxHeight="30"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
MaxHeight="30"
Orientation="Horizontal" /> Orientation="Horizontal" />
<StackPanel x:Name="StPaDrives2" x:FieldModifier="private" <StackPanel x:Name="StPaDrives2"
x:FieldModifier="private"
Width="300"
CanHorizontallyScroll="True" CanHorizontallyScroll="True"
CanVerticallyScroll="True" CanVerticallyScroll="True"
MinHeight="30" MinHeight="30"
MaxHeight="30"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
MaxHeight="30"
Orientation="Horizontal" /> Orientation="Horizontal" />
</StackPanel> </StackPanel>
</Canvas> </Canvas>
<Canvas Grid.Column="1"
Grid.ColumnSpan="3" <Canvas Width="350"
Grid.Row="7" Height="130">
Height="70">
<Label Content="{x:Static resx:Resources.genReportHeader}" <Label Content="{x:Static resx:Resources.genReportHeader}"
Foreground="{DynamicResource sectionTitleColor}" Foreground="{DynamicResource sectionTitleColor}"
Canvas.Left="53" Canvas.Left="58"
Canvas.Top="15" Canvas.Top="0"
FontSize="16" FontSize="16"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Top" /> VerticalAlignment="Top" />
<Grid Width="300"
Canvas.Left="15"
Canvas.Top="50">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="43*" />
<ColumnDefinition Width="57*" />
</Grid.ColumnDefinitions>
<Button Foreground="{DynamicResource buttonTextColor}" <Button Foreground="{DynamicResource buttonTextColor}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Style="{StaticResource ButtonStyle}" Style="{StaticResource ButtonStyle}"
Width="250" Width="250"
Height="40" Height="38"
x:Name="BtnClientReport" x:FieldModifier="private" x:Name="BtnClientReport"
x:FieldModifier="private"
Content="{x:Static resx:Resources.genReport}" Content="{x:Static resx:Resources.genReport}"
FontSize="18" FontSize="16"
Click="OnReportClicked" Click="OnReportClicked"
Grid.ColumnSpan="2" Canvas.Left="50"
Margin="25,0,0,0" /> Canvas.Top="24" />
</Grid>
<Grid Width="300"
Canvas.Left="15"
Canvas.Top="110">
<Button Foreground="{DynamicResource buttonTextColor}" <Button Foreground="{DynamicResource buttonTextColor}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Style="{StaticResource ButtonStyle}" Style="{StaticResource ButtonStyle}"
Width="250" Width="250"
Height="40" Height="38"
x:Name="BtnRemoteSupport" x:FieldModifier="private" x:Name="BtnRemoteSupport"
x:FieldModifier="private"
Tag="LABEL" Tag="LABEL"
Content="Remote Support" Content="Remote Support"
FontSize="18" FontSize="16"
Click="OnRemoteSupportClicked" Click="OnRemoteSupportClicked"
Visibility="Visible" />
</Grid>
<Grid Panel.ZIndex="100"
x:Name="PRGSGrid" x:FieldModifier="private"
Visibility="Hidden"
Canvas.Left="90"
Canvas.Top="57">
<uctrl:CustomProgressBar x:Name="PRGS" x:FieldModifier="private"
Visibility="Visible" Visibility="Visible"
Canvas.Left="300" Canvas.Left="50"
Canvas.Top="70" />
<Grid Panel.ZIndex="100"
x:Name="PRGSGrid"
x:FieldModifier="private"
Visibility="Hidden"
Canvas.Left="100"
Canvas.Top="31">
<uctrl:CustomProgressBar x:Name="PRGS"
x:FieldModifier="private"
Visibility="Visible"
Width="150" Width="150"
Height="25" Height="25"
VerticalAlignment="Bottom" /> VerticalAlignment="Bottom" />
<TextBlock x:Name="PRGSText" x:FieldModifier="private" <TextBlock x:Name="PRGSText"
x:FieldModifier="private"
Text="" Text=""
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" /> VerticalAlignment="Center" />
</Grid> </Grid>
<Label x:Name="LblCustomerPanelVersion" x:FieldModifier="private" <Label x:Name="LblCustomerPanelVersion"
x:FieldModifier="private"
FontSize="12" FontSize="12"
Margin="115 205 0 0" /> Canvas.Left="118"
Canvas.Top="112" />
</Canvas> </Canvas>
</StackPanel>
<Canvas Margin="150 0 0 0" <Canvas Canvas.Left="150"
Canvas.Top="10" Canvas.Top="10"
x:Name="copied" x:FieldModifier="private" x:Name="copied"
x:FieldModifier="private"
Opacity="0" Opacity="0"
Visibility="Collapsed"> Visibility="Collapsed">
<Border BorderThickness="1" <Border BorderThickness="1"
@@ -393,7 +416,7 @@
HorizontalAlignment="Center" /> HorizontalAlignment="Center" />
</Border> </Border>
</Canvas> </Canvas>
</Canvas>
</Grid> </Grid>
<!--ComputerInformation--> <!--ComputerInformation-->
</UserControl> </UserControl>

26
UserControls/CustomLinks.xaml
View File

@@ -9,20 +9,22 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800"> d:DesignWidth="800">
<Grid Width="500" <Grid Width="500">
Height="560">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="100*" /> <ColumnDefinition Width="100*" />
<ColumnDefinition Width="370*" /> <ColumnDefinition Width="185*" />
<ColumnDefinition Width="185*" />
<ColumnDefinition Width="30*" /> <ColumnDefinition Width="30*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="110" /> <RowDefinition Height="6*" />
<RowDefinition Height="450" /> <RowDefinition Height="7*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Canvas Grid.Column="1" <Canvas x:Name="CanvasLinks"
Grid.Column="1"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Grid.Row="0"> Grid.Row="0"
Height="560">
<Image Source="{DynamicResource appbar_star}" <Image Source="{DynamicResource appbar_star}"
Width="36" Width="36"
Height="36" Height="36"
@@ -34,15 +36,11 @@
Canvas.Top="8" Canvas.Top="8"
Canvas.Left="40" Canvas.Left="40"
Content="{x:Static resx:Resources.CustomLink}" /> Content="{x:Static resx:Resources.CustomLink}" />
</Canvas>
<Canvas Grid.Column="1"
Grid.ColumnSpan="2"
Grid.Row="1"
Height="450">
<ScrollViewer Canvas.Top="56" <ScrollViewer Canvas.Top="56"
Canvas.Left="0" Canvas.Left="0"
Width="350" Width="{Binding ActualWidth, ElementName=CanvasLinks, Mode=OneWay}"
Height="374" MinHeight="60"
MaxHeight="494"
HorizontalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto"> VerticalScrollBarVisibility="Auto">
<StackPanel x:Name="CustomLinkPanel" <StackPanel x:Name="CustomLinkPanel"

2
UserControls/IncidentListItem.xaml
View File

@@ -35,7 +35,7 @@
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<DockPanel Margin="-10,0,0,0"> <DockPanel Margin="-10,0,0,0">
<Image Margin="5,0,5,0" Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png" Panel.ZIndex="18" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="signal" Width="15px" Cursor="Hand" ToolTip="{x:Static resx:Resources.removeMarkup}"/> <Image Margin="5,0,5,0" Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png" Panel.ZIndex="18" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="signal" Width="12" Height="12" Cursor="Hand" ToolTip="{x:Static resx:Resources.removeMarkup}"/>
<TextBlock x:Name="txtTicketType" Margin="5,0,0,0" Grid.Column="0" HorizontalAlignment="Left" Text="{Binding Path=TicketType,FallbackValue='Störung'}" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Width="95"></TextBlock> <TextBlock x:Name="txtTicketType" Margin="5,0,0,0" Grid.Column="0" HorizontalAlignment="Left" Text="{Binding Path=TicketType,FallbackValue='Störung'}" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Width="95"></TextBlock>
</DockPanel> </DockPanel>
<DockPanel Grid.Column="1" Margin="10,0,0,0"> <DockPanel Grid.Column="1" Margin="10,0,0,0">

25
UserControls/PortalSearch.xaml
View File

@@ -74,10 +74,7 @@
<Grid x:Name="GridSsp" <Grid x:Name="GridSsp"
x:FieldModifier="private" x:FieldModifier="private"
Canvas.Left="0" Width="500">
Width="500"
Height="560"
Canvas.Top="0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="100*" /> <ColumnDefinition Width="100*" />
<ColumnDefinition Width="185*" /> <ColumnDefinition Width="185*" />
@@ -85,15 +82,15 @@
<ColumnDefinition Width="30*" /> <ColumnDefinition Width="30*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="110" /> <RowDefinition Height="6*" />
<RowDefinition Height="450" /> <RowDefinition Height="7*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Canvas x:Name="CanvasSearch" <Canvas x:Name="CanvasSearch"
x:FieldModifier="private" x:FieldModifier="private"
Grid.Column="1" Grid.Column="1"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Grid.Row="0" Grid.Row="0"
Height="70"> Height="560">
<Image Source="{DynamicResource appbar_magnify}" <Image Source="{DynamicResource appbar_magnify}"
Width="36" Width="36"
Height="36" Height="36"
@@ -126,11 +123,10 @@
Cursor="Hand" Cursor="Hand"
Visibility="Collapsed" /> Visibility="Collapsed" />
</StackPanel> </StackPanel>
</Canvas> <Canvas Canvas.Top="120"
<Canvas Grid.Column="1" Canvas.Left="0"
Grid.ColumnSpan="2" Width="350"
Grid.Row="1" Height="360">
Height="400">
<Button Style="{StaticResource ButtonStyle}" <Button Style="{StaticResource ButtonStyle}"
x:Name="BtnSspLink" x:Name="BtnSspLink"
x:FieldModifier="private" x:FieldModifier="private"
@@ -139,7 +135,7 @@
Height="40" Height="40"
Content="Self Service Portal" Content="Self Service Portal"
FontSize="16" FontSize="16"
Canvas.Top="40" Canvas.Top="0"
Click="OnSSPLinkClicked" /> Click="OnSSPLinkClicked" />
<Button Foreground="{DynamicResource buttonTextColor}" <Button Foreground="{DynamicResource buttonTextColor}"
x:Name="BtnMyserviceLink" x:Name="BtnMyserviceLink"
@@ -151,11 +147,12 @@
Content="{x:Static resx:Resources.myservices}" Content="{x:Static resx:Resources.myservices}"
Tag="LABEL" Tag="LABEL"
FontSize="16" FontSize="16"
Canvas.Top="90" Canvas.Top="50"
Click="OnMyServiceLinkClicked" /> Click="OnMyServiceLinkClicked" />
<!--<Separator Canvas.Left="15" Width="320" Canvas.Top="140" Height="2" />--> <!--<Separator Canvas.Left="15" Width="320" Canvas.Top="140" Height="2" />-->
<!--<StackPanel x:Name="CustomLinkPanel" Orientation="Vertical" Canvas.Top="150"/>--> <!--<StackPanel x:Name="CustomLinkPanel" Orientation="Vertical" Canvas.Top="150"/>-->
</Canvas> </Canvas>
</Canvas>
</Grid> </Grid>
</UserControl> </UserControl>