/

Kusach/AddUserWindow.xaml

@@ -1,64 +0,0 @@
-<Window x:Class="Kusach.AddUserWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Kusach"
-        mc:Ignorable="d"
-        Title="AddUserWindow" 
-        Height="250" 
-        Width="300"
-        ResizeMode="NoResize"
-        WindowStyle="None"
-        WindowStartupLocation="CenterScreen">
-    <Grid>
-        <StackPanel
-            Margin="0,10,0,0"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Top">
-            <Label 
-            Content="Логин:" 
-            HorizontalAlignment="Left" 
-            VerticalAlignment="Top" 
-            Height="30" 
-            Width="190"/>
-            <TextBox 
-            x:Name="logbox" 
-            HorizontalAlignment="Left" 
-            TextWrapping="Wrap" 
-            VerticalAlignment="Top" 
-            Height="30" 
-            Width="190"/>
-            <Label 
-            Content="Пароль:" 
-            HorizontalAlignment="Left" 
-            VerticalAlignment="Top" 
-            Height="30" 
-            Width="190"/>
-            <TextBox 
-            x:Name="passbox"
-            HorizontalAlignment="Left" 
-            VerticalAlignment="Top" 
-            Height="30" 
-            Width="190"/>
-        </StackPanel>
-        <Button 
-            x:Name="AddUserButton" 
-            Content="Создать &#xD;&#xA;пользователя" 
-            HorizontalAlignment="Left"
-            Margin="170,200,0,0" 
-            VerticalAlignment="Top" 
-            Height="40" 
-            Width="120" 
-            Click="AddUserButton_Click"/>
-        <Button 
-            x:Name="BackButton"
-            Content="Отмена"
-            HorizontalAlignment="Left" 
-            Margin="10,200,0,0" 
-            VerticalAlignment="Top" 
-            Height="40" 
-            Width="120" 
-            Click="BackButton_Click"/>
-    </Grid>
-</Window>

Kusach/AddUserWindow.xaml.cs

@@ -1,43 +0,0 @@
-using System.Linq;
-using System.Windows;
-
-
-namespace Kusach
-{
-    /// <summary>
-    /// Логика взаимодействия для AddUserWindow.xaml
-    /// </summary>
-    public partial class AddUserWindow : Window
-    {
-        public AddUserWindow()
-        {
-            InitializeComponent();
-        }
-
-        private void AddUserButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (logbox.Text == "" || passbox.Text == "")
-                MessageBox.Show("Поля не могут быть пустыми.");
-            else if (cnt.db.Dispatcher.Select(item => item.Login).Contains(logbox.Text))
-                MessageBox.Show("Данный логин уже занят");
-            else
-            {
-                Dispatcher newUser = new Dispatcher()
-                {
-                    IdDispatcher = cnt.db.Dispatcher.Select(p => p.IdDispatcher).DefaultIfEmpty(0).Max() + 1,
-                    Login = logbox.Text,
-                    Password = passbox.Text
-                };
-                cnt.db.Dispatcher.Add(newUser);
-                cnt.db.SaveChanges();
-                MessageBox.Show("Пользователь успешно создан.");
-                this.Close();
-            }
-        }
-
-        private void BackButton_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close();
-        }
-    }
-}

Kusach/DeleteUserWindow.xaml

@@ -1,60 +0,0 @@
-<Window x:Class="Kusach.DeleteUserWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Kusach"
-        mc:Ignorable="d"
-        Title="AddUserWindow" 
-        Height="200" 
-        Width="300"
-        ResizeMode="NoResize"
-        WindowStyle="None"
-        WindowStartupLocation="CenterScreen">
-    <Grid>
-        <StackPanel
-            Margin="0,10,0,0"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Top">
-            <Label 
-            Content="Удалить по: " 
-            HorizontalAlignment="Left" 
-            VerticalAlignment="Top" 
-            Height="30" 
-            Width="190"/>
-            <ComboBox
-                Name="DeleteList"
-                Margin="0,10,0,0"
-                Height="30" 
-                VerticalAlignment="Top">
-                <TextBlock>id</TextBlock>
-                <TextBlock>Логину</TextBlock>
-            </ComboBox>
-            <TextBox 
-            x:Name="DeleteBox"
-            Margin="0,10,0,0"
-            HorizontalAlignment="Left" 
-            VerticalAlignment="Top" 
-            Height="30" 
-            Width="190"/>
-        </StackPanel>
-        <Button 
-            x:Name="DeleteUserButton" 
-            Content="Удалить &#xD;&#xA;пользователя" 
-            HorizontalAlignment="Left"
-            Margin="170,145,0,0" 
-            VerticalAlignment="Top" 
-            Height="40" 
-            Width="120" 
-            Click="DeleteUserButton_Click"/>
-        <Button 
-            x:Name="BackButton"
-            Content="Отмена"
-            HorizontalAlignment="Left" 
-            Margin="10,145,0,0" 
-            VerticalAlignment="Top" 
-            Height="40" 
-            Width="120" 
-            Click="BackButton_Click"/>
-    </Grid>
-</Window>

Kusach/DeleteUserWindow.xaml.cs

@@ -1,33 +0,0 @@
-using System.Windows;
-
-namespace Kusach
-{
-    /// <summary>
-    /// Логика взаимодействия для DeleteUserWindow.xaml
-    /// </summary>
-    public partial class DeleteUserWindow : Window
-    {
-        public DeleteUserWindow()
-        {
-            InitializeComponent();
-        }
-
-        private void DeleteUserButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (DeleteList.Text == "" || DeleteBox.Text == "")
-                MessageBox.Show("Поля не могут быть пустыми.");
-            else
-            {
-                //cnt.db.Users.Remove();
-                //cnt.db.SaveChanges();
-                MessageBox.Show("Пользователь успешно удален.");
-                this.Close();
-            }
-        }
-
-        private void BackButton_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close();
-        }
-    }
-}

Kusach/Kusach.csproj

@@ -136,15 +136,9 @@
     <Compile Include="Windows\AddTransportWindow.xaml.cs">
       <DependentUpon>AddTransportWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="AddUserWindow.xaml.cs">
-      <DependentUpon>AddUserWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="cnt.cs" />
-    <Compile Include="DeleteUserWindow.xaml.cs">
-      <DependentUpon>DeleteUserWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Encrypt.cs" />
-    <Compile Include="LogWindow.xaml.cs">
+    <Compile Include="Windows\LogWindow.xaml.cs">
       <DependentUpon>LogWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="MainWindow.xaml.cs">
@@ -153,7 +147,7 @@
     <Compile Include="Pages\RoutesListPage.xaml.cs">
       <DependentUpon>RoutesListPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="RegWindow.xaml.cs">
+    <Compile Include="Windows\RegWindow.xaml.cs">
       <DependentUpon>RegWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="Windows\DriverEditWindow.xaml.cs">
@@ -204,15 +198,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="AddUserWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DeleteUserWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="LogWindow.xaml">
+    <Page Include="Windows\LogWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -228,7 +214,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="RegWindow.xaml">
+    <Page Include="Windows\RegWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>