PBA3H22APE/bib_Talk_Chatprogramm
1
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

Merge branch 'main' of https://git.bib.de/PBA3H22APE/bib_Talk_Chatprogramm

Browse Source
This commit is contained in:
BlackViron
2024-06-18 12:32:17 +02:00
parent 1dad331471 f2b84ec28e
commit 3feff69b9e
6 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bibtalk/bib-talk/Login.xaml
View File

@@ -49,6 +49,14 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style x:Key="HoverUnderlineTextBlockStyle" TargetType="TextBlock">
<Setter Property="TextDecorations" Value="None"/>
<Style.Triggers>
<DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=Button}}" Value="True">
<Setter Property="TextDecorations" Value="Underline"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Window.Resources> </Window.Resources>
<Border CornerRadius="15" BorderThickness="20" BorderBrush="#FF282828"> <Border CornerRadius="15" BorderThickness="20" BorderBrush="#FF282828">
@@ -121,8 +129,8 @@
Foreground="#FF6332A0" Foreground="#FF6332A0"
FontSize="12" FontSize="12"
Width="66" Width="66"
Margin="8,5,0,0"/> Margin="8,5,0,0"
Style="{StaticResource HoverUnderlineTextBlockStyle}"/>
</Button> </Button>
</StackPanel> </StackPanel>

35
bibtalk/bib-talk/RegisterWindow.xaml
View File

@@ -87,6 +87,17 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style x:Key="HoverUnderlineTextBlockStyle" TargetType="TextBlock">
<Setter Property="TextDecorations" Value="None"/>
<Style.Triggers>
<DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=Button}}" Value="True">
<Setter Property="TextDecorations" Value="Underline"/>
</DataTrigger>
</Style.Triggers>
</Style>
<Style TargetType="Hyperlink">
<EventSetter Event="RequestNavigate" Handler="Hyperlink_RequestNavigate"/>
</Style>
</Window.Resources> </Window.Resources>
<Border CornerRadius="15" BorderThickness="20" BorderBrush="#FF282828"> <Border CornerRadius="15" BorderThickness="20" BorderBrush="#FF282828">
@@ -196,25 +207,25 @@
</StackPanel> </StackPanel>
<!-- Checkbox --> <!-- Checkbox -->
<StackPanel Orientation="Horizontal" Margin="0,20,0,0" Height="29"> <Grid Margin="0,20,0,0" Height="30.1" Width="250">
<CheckBox x:Name="checkboxAGB" Style="{StaticResource CustomCheckBoxStyle}" Checked="CheckBox_Checked" Unchecked="CheckBox_Unchecked"/> <CheckBox x:Name="checkboxAGB" Style="{StaticResource CustomCheckBoxStyle}" Checked="CheckBox_Checked" Unchecked="CheckBox_Unchecked" Margin="-25,0,235,0"/>
<TextBlock FontSize="9" TextWrapping="Wrap" VerticalAlignment="Center" Height="24" Width="269"> <TextBlock FontSize="9" TextWrapping="Wrap" VerticalAlignment="Center" Height="24" Margin="15,0,-28,0">
<Run Text="Ich habe die " Foreground="White"/> <Run Text="Ich habe die " Foreground="White"/>
<Run Text="Nutzungsbedingungen" Foreground="#FF6332A0"/> <Run x:Name="nutzungsbedingungenRun" Text="Nutzungsbedingungen" Foreground="#FF6332A0"/>
<Run Text=" und die " Foreground="White"/> <Run Text=" und die " Foreground="White"/>
<Run Text="Datenschutzerklärung" Foreground="#FF6332A0"/> <Run x:Name="datenschutzRun" Text="Datenschutzerklärung" Foreground="#FF6332A0"/>
<Run Text=" von bib-talk gelesen und akzeptiert." Foreground="White"/> <Run Text=" von bib-talk gelesen und akzeptiert." Foreground="White"/>
</TextBlock> </TextBlock>
</Grid>
</StackPanel>
<Button x:Name="weiterbutton" Content="Weiter" Foreground="Gray" Background="#FF323134" BorderThickness="0" Margin="0,20,0,0" Height="30" BorderBrush="{x:Null}" Click="WeiterButton_Click" Style="{StaticResource NoHoverButtonStyle}"/> <Button x:Name="weiterbutton" Content="Weiter" Foreground="Gray" Background="#FF323134" BorderThickness="0" Margin="0,20,0,0" Height="30" BorderBrush="{x:Null}" Click="WeiterButton_Click" Style="{StaticResource NoHoverButtonStyle}"/>
<Button Style="{StaticResource InvisibleButtonStyle}" Click="Login_Click"> <Button Style="{StaticResource InvisibleButtonStyle}" Click="Login_Click">
<TextBlock Text="Ich habe bereits einen Account" <TextBlock Text="Ich habe bereits einen Account"
Foreground="#FF6332A0" Foreground="#FF6332A0"
FontSize="12" FontSize="12"
Width="167" Width="167"
Margin="-130,5,0,0"/> Margin="-130,5,0,0"
Style="{StaticResource HoverUnderlineTextBlockStyle}"/>
</Button> </Button>
</StackPanel> </StackPanel>

11
bibtalk/bib-talk/RegisterWindow.xaml.cs
View File

@@ -1,6 +1,7 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Net.Http;
using System.Text; using System.Text;
@@ -25,7 +26,13 @@ namespace bib_talk
InitializeComponent(); InitializeComponent();
} }
private void CloseButton_Click(object sender, RoutedEventArgs e) private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
{
Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri) { UseShellExecute = true });
e.Handled = true;
}
private void CloseButton_Click(object sender, RoutedEventArgs e)
{ {
this.Close(); this.Close();
} }
@@ -142,5 +149,5 @@ namespace bib_talk
} }
} }
} }
} }
} }

0
test.txt
View File

1
testpush daddypig.txt
View File

@@ -1 +0,0 @@
erik stinkt

1
text.txt
View File

@@ -1 +0,0 @@
hello