From 325e8451f957919a25b89d5c6bedfe04996a1ab1 Mon Sep 17 00:00:00 2001
From: danamir <danamir522@gmail.com>
Date: Thu, 8 Mar 2018 18:59:38 +0300
Subject: [PATCH] aded mainpage

---
 .gitignore      |  2 +-
 gui/mainpage.py | 45 ---------------------------------------------
 main.py         | 15 ++++++++++++++-
 3 files changed, 15 insertions(+), 47 deletions(-)
 delete mode 100644 gui/mainpage.py

diff --git a/.gitignore b/.gitignore
index 82195aa..4c0cc0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-venv
+venv1
 .idea
\ No newline at end of file
diff --git a/gui/mainpage.py b/gui/mainpage.py
deleted file mode 100644
index c605d6d..0000000
--- a/gui/mainpage.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import wx
-
-class MainWindow(wx.Frame):
-
-    def __init__(self, *args, **kwds):
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
-        wx.Frame.__init__(self, *args, **kwds)
-        self.SetSize((300, 200))
-        self.layout()
-
-    def layout(self):
-        sizer_hor = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_vert_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_vert_2 = wx.BoxSizer(wx.VERTICAL)
-        sizer_vert_3 = wx.BoxSizer(wx.VERTICAL)
-
-        sizer_hor.Add(sizer_vert_1)
-        sizer_hor.Add(sizer_vert_2)
-        sizer_hor.Add(sizer_vert_3)
-
-        lgn_label = wx.StaticText(self, wx.NewId(), "Login")
-        pswd_label = wx.StaticText(self, wx.NewId(), "Password")
-        lgn_text = wx.TextCtrl(self, wx.NewId())
-        pswd_text = wx.TextCtrl(self, wx.NewId())
-
-        next_btn = wx.Button(self, wx.NewId(), "Далее")
-        sizer_vert_1.Add(lgn_label, flag=wx.ALL)
-        sizer_vert_1.AddSpacer(10)
-        sizer_vert_1.Add(pswd_label, flag=wx.ALL)
-
-        sizer_vert_2.Add(lgn_text)
-        sizer_vert_2.Add(pswd_text)
-        sizer_vert_3.Add(next_btn,  flag=wx.ALIGN_RIGHT)
-
-        self.SetSizer(sizer_hor)
-        self.layout()
-
-
-if __name__ == "__main__":
-    app = wx.App(0)
-    wx.InitAllImageHandlers()
-    mainWnd = MainWindow(None, -1, "")
-    app.SetTopWindow(mainWnd)
-    mainWnd.Show()
-    app.MainLoop()
diff --git a/main.py b/main.py
index 5a6347c..0397739 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,19 @@
-from gui import mainpage
 import wx
 
+class Page1(wx.Panel):
+    def __init__(self, parent):
+        wx.Panel.__init__(self, parent)
+
+        sizer_all = wx.BoxSizer(wx.HORIZONTAL)
 
 
 
+
+
+app = wx.App(False)
+frame = wx.Frame(None)
+panel =Page1(frame)
+frame.Show()
+app.MainLoop()
+
+