Артем Гавриленко 3 년 전
부모
커밋
f4d590e10e
9개의 변경된 파일215개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      Kusach/App.xaml
  2. 2 1
      Kusach/DataWindow.xaml
  3. 25 0
      Kusach/Kusach.csproj
  4. 56 0
      Kusach/MainWindow.xaml
  5. 38 0
      Kusach/MainWindow.xaml.cs
  6. 19 0
      Kusach/TestPGPage.xaml
  7. 28 0
      Kusach/TestPGPage.xaml.cs
  8. 19 0
      Kusach/TestPGWindow.xaml
  9. 27 0
      Kusach/TestPGWindow.xaml.cs

+ 1 - 1
Kusach/App.xaml

@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Kusach"
-             StartupUri="TestWindow.xaml">
+             StartupUri="MainWindow.xaml">
     <Application.Resources>
          
     </Application.Resources>

+ 2 - 1
Kusach/DataWindow.xaml

@@ -44,7 +44,8 @@
                             Text="Поиск..."
                             Width="94"
                             Foreground="#808080"
-                            VerticalAlignment="Top" TextChanged="UserSearch_TextChanged"/>
+                            VerticalAlignment="Top" 
+                            TextChanged="UserSearch_TextChanged"/>
                         <Button 
                             Content="Добавить" 
                             HorizontalAlignment="Stretch" 

+ 25 - 0
Kusach/Kusach.csproj

@@ -117,6 +117,9 @@
     <Compile Include="LogWindow.xaml.cs">
       <DependentUpon>LogWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Points.cs">
       <DependentUpon>EDM.tt</DependentUpon>
     </Compile>
@@ -132,6 +135,12 @@
     <Compile Include="Routes.cs">
       <DependentUpon>EDM.tt</DependentUpon>
     </Compile>
+    <Compile Include="TestPGPage.xaml.cs">
+      <DependentUpon>TestPGPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="TestPGWindow.xaml.cs">
+      <DependentUpon>TestPGWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="TestRouteEditWindow.xaml.cs">
       <DependentUpon>TestRouteEditWindow.xaml</DependentUpon>
     </Compile>
@@ -177,10 +186,22 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="MainWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="RegWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="TestPGPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TestPGWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="TestRouteEditWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -240,6 +261,10 @@
       <LastGenOutput>EDM.cs</LastGenOutput>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Pages\" />
+    <Folder Include="Windows\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

+ 56 - 0
Kusach/MainWindow.xaml

@@ -0,0 +1,56 @@
+<Window x:Class="Kusach.MainWindow"
+        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="Главное меню" 
+        Loaded="OnLoad"
+        Height="450" 
+        Width="800"
+        MinHeight="450"
+        MinWidth="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="25*" />
+            <ColumnDefinition Width="173*"/>
+        </Grid.ColumnDefinitions>
+        <Grid Grid.Column="0">
+            <Button 
+            x:Name="BackButton"
+            VerticalAlignment="Top"
+            Margin="0,0,0,10"
+            Content="Выход"
+            Height="50"
+            Click="BackButton_Click"/>
+            <StackPanel
+            Margin="3,10,3,10"
+            Orientation="Vertical"
+            VerticalAlignment="Center">
+                <Button 
+                Margin="0,0,0,10"
+                Content="Маршруты"
+                Height="40"
+                Click="BackButton_Click"/>
+                <Button
+                Margin="0,0,0,10"
+                Content="Водители"
+                Height="40"
+                Click="BackButton_Click"/>
+                <Button
+                Margin="0,0,0,10"
+                Content="Пользователи"
+                Height="40"
+                Click="BackButton_Click"/>
+                <Button
+                Content="Транспорт"
+                Height="40"
+                Click="BackButton_Click"/>
+            </StackPanel>
+        </Grid>
+        <Frame 
+            Name="MainFrame"
+            />
+    </Grid>
+</Window>

+ 38 - 0
Kusach/MainWindow.xaml.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Kusach
+{
+    /// <summary>
+    /// Логика взаимодействия для MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+        
+        private void BackButton_Click(object sender, RoutedEventArgs e)
+        {
+            LogWindow lw = new LogWindow();
+            lw.Show();
+            this.Close();
+        }
+        private void OnLoad(object sender, RoutedEventArgs e)
+        {
+            MessageBox.Show("loaded");
+        }
+    }
+}

+ 19 - 0
Kusach/TestPGPage.xaml

@@ -0,0 +1,19 @@
+<Page x:Class="Kusach.TestPGPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:Kusach"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" 
+      d:DesignWidth="800"
+      Title="TestPGPage">
+
+    <Grid Background="White">
+        <StackPanel Margin="5">
+            <Label Margin="5">Пример обычной страницы</Label>
+            <Button Margin="5,0,5,0" Padding="5">OK</Button>
+            <Button Padding="5" Margin="5">Close</Button>
+        </StackPanel>
+    </Grid>
+</Page>

+ 28 - 0
Kusach/TestPGPage.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Kusach
+{
+    /// <summary>
+    /// Логика взаимодействия для TestPGPage.xaml
+    /// </summary>
+    public partial class TestPGPage : Page
+    {
+        public TestPGPage()
+        {
+            InitializeComponent();
+        }
+    }
+}

+ 19 - 0
Kusach/TestPGWindow.xaml

@@ -0,0 +1,19 @@
+<Window x:Class="Kusach.TestPGWindow"
+        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="TestPGWindow" Height="450" Width="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="127*"/>
+            <ColumnDefinition Width="665*"/>
+        </Grid.ColumnDefinitions>
+        <Frame
+            Name="Main"
+            Grid.Column="1">
+        </Frame>
+    </Grid>
+</Window>

+ 27 - 0
Kusach/TestPGWindow.xaml.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Kusach
+{
+    /// <summary>
+    /// Логика взаимодействия для TestPGWindow.xaml
+    /// </summary>
+    public partial class TestPGWindow : Window
+    {
+        public TestPGWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}