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

Mainfenster stark verändert

bibtalk/bib-talk/MainWindow.xaml

@@ -50,30 +50,72 @@
             </Setter>
         </Style>
     </Window.Resources>
-
     <Border CornerRadius="15" BorderThickness="20" BorderBrush="#FF282828">
         <Grid Margin="-10,-10,-10,-10" Background="#FF282828">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="289*"/>
+                <RowDefinition Height="392*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="747*"/>
+                <ColumnDefinition Width="118*"/>
+                <ColumnDefinition Width="115*"/>
+            </Grid.ColumnDefinitions>
             <!-- Draggable Area -->
-            <Grid VerticalAlignment="Top" Height="45" Background="Transparent" MouseLeftButtonDown="DraggableArea_MouseLeftButtonDown" Margin="0,-21,0,0">
+            <Grid VerticalAlignment="Top" Height="45" Background="Transparent" MouseLeftButtonDown="DraggableArea_MouseLeftButtonDown" Margin="0,-21,0,0" Grid.ColumnSpan="3">
 
             </Grid>
+            <Rectangle HorizontalAlignment="Left" Height="22" Margin="0,-5,0,0" Stroke="Black" Fill="Black" VerticalAlignment="Top" Width="980" Grid.ColumnSpan="3"/>
             <!-- Close Button -->
             <Button Style="{StaticResource InvisibleButtonStyle}"
-                    Width="30" 
+                    Width="21" 
-                    Height="30" 
+                    Height="22" 
                     VerticalAlignment="Top" 
                     HorizontalAlignment="Right" 
-                    Margin="0,0,0,0" 
+                    Click="CloseButton_Click" Grid.Column="2" RenderTransformOrigin="0.057,0.564" Margin="0,-5,0,0">
-                    Click="CloseButton_Click">
                 <TextBlock Text="❌" 
-                           FontSize="20"
+                           FontSize="15"
                            Foreground="White" 
                            FontWeight="Bold" 
                            HorizontalAlignment="Center" 
-                           VerticalAlignment="Center"/>
+                           VerticalAlignment="Top"/>
             </Button>
-            <TextBlock HorizontalAlignment="Left" x:Name="loggedinuser" Margin="32,11,0,0" TextWrapping="Wrap" Text="xxxx" VerticalAlignment="Top" Height="22" Width="146" Foreground="White"/>
+            <Grid Margin="298,17,0,176" Grid.ColumnSpan="3">
-            <ListBox x:Name="onlineUsersListBox" Margin="32,84,728,50" d:ItemsSource="{d:SampleData ItemCount=5}" Background="#FF323134" BorderBrush="{x:Null}">
+                <Rectangle Stroke="#FF6332A0" Fill="#FF6332A0" Width="682"/>
+                <TextBlock Text="Name" Margin="108,18,134,18" FontSize="40"  Foreground="White" />
+                <Image Source="/PICA.jpg" Width="80" Height="80" Stretch="Fill" Margin="10,8,592,7">
+                    <Image.Clip>
+                        <EllipseGeometry Center="40,40" RadiusX="40" RadiusY="40"/>
+                    </Image.Clip>
+                </Image>
+            </Grid>
+            <Grid Margin="76,17,454,176">
+                <Rectangle Stroke="#FF282828" Fill="#FF282828"/>
+                <TextBlock Text="Chats" Foreground="White" FontSize="22" Margin="10,18,134,39" />
+                <TextBox
+              FontSize="20"
+              BorderBrush="Transparent"
+              Margin="10,61,10,10"
+              Background="#FF6332A0"
+              Foreground="White"
+              SelectionBrush="#FF6332A0" KeyDown="messageBOX_KeyDown" RenderTransformOrigin="0.5,0.5">
+                    <TextBox.RenderTransform>
+                        <TransformGroup>
+                            <ScaleTransform ScaleY="-1"/>
+                            <SkewTransform/>
+                            <RotateTransform/>
+                            <TranslateTransform/>
+                        </TransformGroup>
+                    </TextBox.RenderTransform>
+                </TextBox>
+            </Grid>
+            <Grid Margin="0,17,676,0" Grid.RowSpan="2">
+                <Rectangle Stroke="#FF323134" Fill="#FF323134"/>
+
+            </Grid>
+
+
+            <ListBox x:Name="onlineUsersListBox" Margin="76,112,454,0" d:ItemsSource="{d:SampleData ItemCount=5}" Background="#FF323134" BorderBrush="{x:Null}" SelectionChanged="onlineUsersListBox_SelectionChanged" Grid.RowSpan="2">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal" Width="205" Height="60">
@@ -88,8 +130,8 @@
                     </DataTemplate>
                 </ListBox.ItemTemplate>
             </ListBox>
-
+            <TextBlock HorizontalAlignment="Left" x:Name="loggedinuser" Margin="247,113,0,0" TextWrapping="Wrap" Text="xxxx" VerticalAlignment="Top" Height="84" Width="46" Foreground="White" RenderTransformOrigin="0.6,0.591"/>
-            <ListBox x:Name="chatlistbox" Margin="244,84,0,50" d:ItemsSource="{d:SampleData ItemCount=5}" Background="#FF323134" BorderBrush="{x:Null}" Foreground="#FF6332A0" ScrollViewer.VerticalScrollBarVisibility="Hidden" ScrollViewer.HorizontalScrollBarVisibility="Hidden">
+            <ListBox x:Name="chatlistbox" Margin="298,112,0,50" d:ItemsSource="{d:SampleData ItemCount=5}" Background="#FF323134" BorderBrush="{x:Null}" Foreground="#FF6332A0" ScrollViewer.VerticalScrollBarVisibility="Hidden" ScrollViewer.HorizontalScrollBarVisibility="Hidden" Grid.ColumnSpan="3" Grid.RowSpan="2">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Margin="5">
@@ -109,20 +151,12 @@
                          x:Name="messageBOX"
                          FontSize="20"
                          BorderBrush="Transparent"
-                         Margin="244,642,154,10"
+                         Margin="298,346,76,10"
                          Background="#FF323134"
                          Foreground="White"
-                         SelectionBrush="#FF6332A0" KeyDown="messageBOX_KeyDown"/>
+                         SelectionBrush="#FF6332A0" KeyDown="messageBOX_KeyDown" Grid.ColumnSpan="3" Grid.Row="1"/>
-            <Button x:Name="weiterbutton" Click="send_Click" Content="Weiter" Foreground="White"  Background="#FF6332A0" BorderThickness="0" Margin="831,643,44,11" BorderBrush="{x:Null}" Style="{StaticResource NoHoverButtonStyle}" RenderTransformOrigin="0.279,0.633"/>
+            <Button x:Name="weiterbutton" Click="send_Click" Content="Weiter" Foreground="White"  Background="#FF6332A0" BorderThickness="0" Margin="44,346,10,10" BorderBrush="{x:Null}" Style="{StaticResource NoHoverButtonStyle}" RenderTransformOrigin="0.279,0.633" Grid.Column="2" Grid.Row="1"/>
-            
+
-                <Button Content="⋮" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="#FFFFF8F8" Margin="847,22,109,602" FontSize="36" Click="ChatFenster_Click"/>
-            <Popup x:Name="popup" Placement="Center" IsOpen="False" LostFocus="Popup_LostFocus">
-                <StackPanel Background="White" Orientation="Vertical" Width="200" Height="150" Margin="10">
-                    <Button Content="Button 1" Click="Button1_Click" Margin="5"/>
-                    <Button Content="Button 2" Click="Button2_Click" Margin="5"/>
-                    <Button Content="Button 3" Click="Button3_Click" Margin="5"/>
-                </StackPanel>
-            </Popup>
 
 
 

bibtalk/bib-talk/MainWindow.xaml.cs

@@ -189,45 +189,9 @@ namespace bib_talk
             public string IsOnline { get; set; }
         }
 
-        private void ChatFenster_Click(object sender, RoutedEventArgs e)
+        private void onlineUsersListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if(popup.IsOpen = true)
-            {
-                popup.Focus();
-            }
-            else
-            {
-               popup.IsOpen = true;
-            }   
-            
-        }
-        private void Button1_Click(object sender, RoutedEventArgs e)
-        {
-            MessageBox.Show("Button 1 wurde geklickt!");
-            ClosePopup();
-        }
 
-        private void Button2_Click(object sender, RoutedEventArgs e)
-        {
-            MessageBox.Show("Button 2 wurde geklickt!");
-            ClosePopup();
-        }
-
-        private void Button3_Click(object sender, RoutedEventArgs e)
-        {
-            MessageBox.Show("Button 3 wurde geklickt!");
-            ClosePopup();
-        }
-
-        private void Popup_LostFocus(object sender, RoutedEventArgs e)
-        {
-           
-            ClosePopup();
-        }
-
-        private void ClosePopup()
-        {
-            popup.IsOpen = false;
         }
     }
 }