From 44b113f6ed2cd7871cb2302478e7d4136b674802 Mon Sep 17 00:00:00 2001 From: Sandra Borst <108298114+VerfluchteZocke@users.noreply.github.com> Date: Fri, 27 Dec 2024 21:55:53 +0100 Subject: [PATCH] basic structure for distractionlistscreen --- .../.vs/InnoLabProjektDektopApp/v17/.suo | Bin 352768 -> 352768 bytes .../FirstLaunch/03_1DistractionsList.xaml | 69 ++++++++++++++++-- 2 files changed, 63 insertions(+), 6 deletions(-) diff --git a/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo b/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo index 981170bec1aad2ab6ab98eeac31d790ef426d6ed..45089bc425e03e9b00e4cb4951adf9320e0c9fbf 100644 GIT binary patch delta 451 zcmZoTBHD07bb<jR(?mmQM&^ya@@#w#T-*08h`7zz#=yY9&^ft^sftl~^H(-uMh|-i z28O@?A>iNt|NjLT7#Knr7#P?X7#N%w7#Kh@(hLj?AUP!l28I$So0EZoK>{kz&%nSi zIe<lBash|P<QA3yM()X1S=<?gC(E*mPd4FnVHF1{oLtK)&&V-(E~`Bw&*r<FvzbKY znHU%pm>3uonHU(9m>_oi+gMo4xJZm?kpR;qDHjeN1_lNrkn#8O#U>{(3r#MOy1)T) zlP-#&^oGqUB6pZ4X?RRdXcd|KE}spgcyozb596dCDw9<XEMaLz*6`&(&*TOX4Mxk! zicI2@9nP7s$}ur8NNxTp&CW7iXby|P^Z;`fp6Rn3ShN(PL{@AwbJ~}?^4>O)m^qxL zcJCvrUwxiZa`Ql+%ZrtM(UTSQ#3s*CP!X7Eb-_G6K~MC#WSiwOH`A2O7ZeQGCof7m zHu+fAF2*O*6{T70rz=^r9Gh&gRAw^I5|d^z?RGJ3#&$7nrgkxH=5{e{mhEENtgp-f DOH`X{ delta 425 zcmZoTBHD07bb<jR!$d=AM#hc4@@&irv3i^HnI<w$;^0W&U|?YQ`yT@S{r~@8n1O*I zgn@y9je&u|iGhIuBqPAUz`)JGz@Wsyz)-@#z+l6`z`)7Cz#svYmu6sK&}Lv@aA#m( zu!f4sGcYiuF)%Pp&ft*Y<YZ!CkONsXxtGP617r=z*vU6oR9HZaNvtxWCQyA|3=9lr zQ1<`HhMew<l9MZ0l^J;^&t*;C#8ttxxq_>Manpt)j2x^C3=F&=EAHisO-^7IV)JHT zU<hN_{EMHBX%fH8WSNHLoD3jyMUWJ2{?fq1I7v=zvzo{)=1F`<IE)w=7!*(x@bNKD zW)gCme1yqha*5Cd4ju*u23;f-lS_m*Y*vxE!#r6;QDC#cqz{aXl-MRoc(53tD3b7> y?0n94ktE}EC2N*rlMR;2Oy*f)(k!OkE~d@cE~d@YE~d@gE~d@0T}+$xl^Fmt1%bH$ diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml index 9994e9c..fa64c32 100644 --- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml +++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml @@ -6,14 +6,71 @@ xmlns:local="clr-namespace:InnoLabProjektDektopApp" xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates" mc:Ignorable="d" - Height="550" Width="900"> + Height="550" Width="900"> <Grid> - <header:HeaderTemplate VerticalAlignment="Top"/> + <!-- Header --> + <header:HeaderTemplate VerticalAlignment="Top" /> - <Button Content="Subscription" Style="{StaticResource TopMenuButon}" HorizontalAlignment="Right" Margin="0,4,100,0" VerticalAlignment="Top" Height="26" Width="80" Click="Option2_Click"/> - <Button Content="Contract" Style="{StaticResource TopMenuButon}" HorizontalAlignment="Right" Margin="0,4,20,0" VerticalAlignment="Top" Height="26" Width="80" Click="Option3_Click"/> + <!-- Top Buttons --> + <Button Content="Subscription" + Style="{StaticResource TopMenuButon}" + HorizontalAlignment="Right" + Margin="0,4,100,0" + VerticalAlignment="Top" + Height="26" + Width="80" + Click="Option2_Click" /> + <Button Content="Contract" + Style="{StaticResource TopMenuButon}" + HorizontalAlignment="Right" + Margin="0,4,20,0" + VerticalAlignment="Top" + Height="26" + Width="80" + Click="Option3_Click" /> - <!-- DELETE --> - <Label Content="DistractionsList" HorizontalAlignment="Center" Margin="0,234,0,0" VerticalAlignment="Top" Height="108" Width="439" FontSize="48" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/> + <!-- Main Content --> + <StackPanel Margin="20,70,20,20"> + <Grid> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="*" /> + <ColumnDefinition Width="Auto" /> + </Grid.ColumnDefinitions> + + <!-- Überschrift --> + <TextBlock Grid.Column="0" + Style="{StaticResource Header1}" + Text="Edit the list of websites and programs for this category" + HorizontalAlignment="Left" /> + + <!-- Suchfeld --> + <DockPanel Grid.Column="1" HorizontalAlignment="Right" Margin="10,0,0,0"> + <!-- TextBox für Suche --> + <TextBox Width="150" + Height="30" + FontSize="14" + VerticalAlignment="Center" + Padding="5" + HorizontalAlignment="Left" + Text="Search..." + Foreground="Gray" /> + + <!-- Lupe-Symbol --> + <Button Width="30" + Height="30" + Margin="5,0,0,0" + VerticalAlignment="Center" + HorizontalAlignment="Right"> + <TextBlock Text="🔍" + FontSize="14" + VerticalAlignment="Center" + HorizontalAlignment="Center" /> + </Button> + </DockPanel> + </Grid> + + <TextBlock Style="{StaticResource StandardText}" + Text="By clicking on a toggle, you can change the programs/websites that should be marked as distracting." /> + </StackPanel> </Grid> </Window> -- GitLab