diff --git a/gui/second_page.py b/gui/second_page.py index 23a157a..3489ea5 100644 --- a/gui/second_page.py +++ b/gui/second_page.py @@ -43,8 +43,8 @@ class SecondPage(wx.Frame): # Virtual event handlers, overide them in your derived class def lab1(self, event): - from gui import third_page - nex_page = third_page.MainFrame() + from lab1 import lab1 + nex_page = lab1.MainFrame() nex_page.Show() diff --git a/gui/third_page.py b/gui/third_page.py deleted file mode 100644 index e76640c..0000000 --- a/gui/third_page.py +++ /dev/null @@ -1,52 +0,0 @@ -import wx - - -# Some classes to use for the notebook pages. Obviously you would -# want to use something more meaningful for your application, these -# are just for illustration. - -class PageOne(wx.Panel): - def __init__(self, parent): - wx.Panel.__init__(self, parent) - t = wx.StaticText(self, -1, "This is a PageOne object", (20,20)) - -class PageTwo(wx.Panel): - def __init__(self, parent): - wx.Panel.__init__(self, parent) - t = wx.StaticText(self, -1, "This is a PageTwo object", (40,40)) - -class PageThree(wx.Panel): - def __init__(self, parent): - wx.Panel.__init__(self, parent) - t = wx.StaticText(self, -1, "This is a PageThree object", (60,60)) - - -class MainFrame(wx.Frame): - def __init__(self): - wx.Frame.__init__(self, None, title="Simple Notebook Example") - - # Here we create a panel and a notebook on the panel - p = wx.Panel(self) - nb = wx.Notebook(p) - - # create the page windows as children of the notebook - page1 = PageOne(nb) - page2 = PageTwo(nb) - page3 = PageThree(nb) - - # add the pages to the notebook with the label to show on the tab - nb.AddPage(page1, "Page 1") - nb.AddPage(page2, "Page 2") - nb.AddPage(page3, "Page 3") - - # finally, put the notebook in a sizer for the panel to manage - # the layout - sizer = wx.BoxSizer() - sizer.Add(nb, 1, wx.EXPAND) - p.SetSizer(sizer) - - -if __name__ == "__main__": - app = wx.App() - MainFrame().Show() - app.MainLoop() \ No newline at end of file diff --git a/gui/lab1.py b/lab1/lab1.py similarity index 57% rename from gui/lab1.py rename to lab1/lab1.py index e76640c..6eb0bde 100644 --- a/gui/lab1.py +++ b/lab1/lab1.py @@ -1,24 +1,18 @@ import wx - -# Some classes to use for the notebook pages. Obviously you would -# want to use something more meaningful for your application, these -# are just for illustration. - -class PageOne(wx.Panel): +class Ttheory(wx.Panel): def __init__(self, parent): wx.Panel.__init__(self, parent) - t = wx.StaticText(self, -1, "This is a PageOne object", (20,20)) -class PageTwo(wx.Panel): + +class Labs(wx.Panel): def __init__(self, parent): wx.Panel.__init__(self, parent) - t = wx.StaticText(self, -1, "This is a PageTwo object", (40,40)) -class PageThree(wx.Panel): +class Results(wx.Panel): def __init__(self, parent): wx.Panel.__init__(self, parent) - t = wx.StaticText(self, -1, "This is a PageThree object", (60,60)) + class MainFrame(wx.Frame): @@ -30,14 +24,14 @@ class MainFrame(wx.Frame): nb = wx.Notebook(p) # create the page windows as children of the notebook - page1 = PageOne(nb) - page2 = PageTwo(nb) - page3 = PageThree(nb) + page1 = Ttheory(nb) + page2 = Labs(nb) + page3 = Results(nb) # add the pages to the notebook with the label to show on the tab - nb.AddPage(page1, "Page 1") - nb.AddPage(page2, "Page 2") - nb.AddPage(page3, "Page 3") + nb.AddPage(page1, "Теория") + nb.AddPage(page2, "Задание") + nb.AddPage(page3, "Отчёт") # finally, put the notebook in a sizer for the panel to manage # the layout