Ver Fonte

+ design generate page

ivana há 7 meses atrás
pai
commit
9e4fd91290
2 ficheiros alterados com 35 adições e 26 exclusões
  1. 34 25
      Views/GeneratePage.axaml
  2. 1 1
      Views/MainWindow.axaml

+ 34 - 25
Views/GeneratePage.axaml

@@ -7,32 +7,41 @@
              xmlns:vm="using:LoginGenerator.ViewModels"
 			       x:DataType="vm:MainWindowViewModel">
 
-  <StackPanel>
-    <TextBox Text="Ермолин Илья Дмитриевич" Watermark="Введите ФИО" Name="FIO"/>
-    <StackPanel Orientation="Horizontal">
-      <Button Content="Ф" Click="OSurnameCopy_Click"/>
-      <Button Content="И" Click="ONameCopy_Click"/>
-      <Button Content="О" Click="OPatronymicCopy_Click"/>
-      <Button Content="ИО" Click="ONamePatronymicCopy_Click"/>
-    </StackPanel>
-    <TextBox Watermark="Логин" Name="Login"/>
-    <StackPanel Orientation="Horizontal">
-      <Button Content="Copy" Click="LoginCopy"/>
-      <Button Content="↺" Click="TMore_Click"/>
-    </StackPanel>
-    <TextBox Watermark="Пароль" Name="Pass"/>
-    <StackPanel Orientation="Horizontal">
-      <Button Content="Copy" Click="PassCopy"/>
-      <Button Content="↺" Click="RegenPass"/>
-    </StackPanel>
-    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-      <Button Content="Execute" Click="WriteIn"/>
-      <Button Content="Copy All" Click="CopyAll_Click"/>
-      <Button Content="Generate"  Click="GenerateAll"/>
-    </StackPanel>
-    <StackPanel HorizontalAlignment="Right">
-      <Button Content="Посмотреть данные пользователей" Command="{Binding ViewUsersData}"/>
+  <StackPanel  VerticalAlignment="Center">
+    <TextBlock FontSize="24" FontWeight="Bold" HorizontalAlignment="Center">ГЕНЕРАТОР ЛОГИНОВ/ПАРОЛЕЙ</TextBlock>
+    <StackPanel>
+      <TextBox Width="700" Watermark="Введите ФИО" Name="FIO"/>
+      <StackPanel Margin="0 10 0 0" HorizontalAlignment="Center" Orientation="Horizontal">
+        <Button Width="167" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Content="Ф" Click="OSurnameCopy_Click"/>
+        <Button Width="167" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Margin="10 0 0 0" Content="И" Click="ONameCopy_Click"/>
+        <Button Width="167" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Margin="10 0 0 0" Content="О" Click="OPatronymicCopy_Click"/>
+        <Button Width="167" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Margin="10 0 0 0" Content="ИО" Click="ONamePatronymicCopy_Click"/>
+      </StackPanel>
+
+      <StackPanel Margin="0 10 0 0" HorizontalAlignment="Center" Orientation="Horizontal">
+        <TextBox Width="529" Watermark="Логин" Name="Login"/>
+        <Button Margin="10 0 0 0" Width="75" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Content="©" Click="LoginCopy"/>
+        <Button Margin="10 0 0 0" Width="75" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Content="↻" Click="TMore_Click"/>
+      </StackPanel>
+
+      <StackPanel Margin="0 10 0 0" HorizontalAlignment="Center" Orientation="Horizontal">
+        <TextBox Width="529" Watermark="Пароль" Name="Pass"/>
+        <Button Margin="10 0 0 0" Width="75" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Content="©" Click="PassCopy"/>
+        <Button Margin="10 0 0 0" Width="75" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Content="↻" Click="RegenPass"/>
+      </StackPanel>
+      
+      <StackPanel Margin="0 10 0 0" Orientation="Horizontal" HorizontalAlignment="Center">
+        <Button Width="226" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Content="Execute" Click="WriteIn"/>
+        <Button Width="226" Margin="10 0 0 0" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Content="Copy all" Click="CopyAll_Click"/>
+        <Button Width="226" Margin="10 0 0 0" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Content="Generate"  Click="GenerateAll"/>
+      </StackPanel>
+
+      <StackPanel Margin="0 10 0 0" HorizontalAlignment="Center">
+        <Button Width="700" HorizontalContentAlignment="Center" FontWeight="Bold" BorderBrush="Black" Background="White" Foreground="#545454" Content="Посмотреть данные пользователей" Command="{Binding ViewUsersData}"/>
+      </StackPanel>
     </StackPanel>
+   
+    
   </StackPanel>
   
 </UserControl>

+ 1 - 1
Views/MainWindow.axaml

@@ -15,6 +15,6 @@
         <vm:MainWindowViewModel/>
     </Design.DataContext>
 
-  <ContentControl Content="{Binding US}"/>
+  <ContentControl Background="#ECE9FF" Content="{Binding US}"/>
 
 </Window>