From b97b227a7f3f45bf2258f12853e4de9d7aa39f96 Mon Sep 17 00:00:00 2001 From: Pierre Ratinaud Date: Mon, 15 Dec 2014 01:14:15 +0100 Subject: [PATCH] ... --- iramuteq.py | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/iramuteq.py b/iramuteq.py index 7f1dd9b..e5d145b 100644 --- a/iramuteq.py +++ b/iramuteq.py @@ -1203,7 +1203,7 @@ class IntroPanel(wx.Panel): col = randint(0, 255) col1 = randint(0,255) col2 = randint(0,255) - col = 57 + #col = 57 bckgrdcolor = wx.Colour(col, col1, col2) self.SetBackgroundColour(bckgrdcolor) txtcolour = wx.Colour(250, 250, 250) @@ -1211,16 +1211,19 @@ class IntroPanel(wx.Panel): sizer1 = wx.BoxSizer(wx.VERTICAL) sizer2 = wx.BoxSizer(wx.VERTICAL) sizer3 = wx.BoxSizer(wx.HORIZONTAL) - sizer4 = wx.BoxSizer(wx.VERTICAL) + sizer4 = wx.BoxSizer(wx.HORIZONTAL) sizer5 = wx.BoxSizer(wx.HORIZONTAL) grid_sizer_1 = wx.FlexGridSizer(1, 4, 0, 0) grid_sizer_3 = wx.FlexGridSizer(1, 4, 0, 0) - grid_sizer_2 = wx.FlexGridSizer(1, 3, 0, 0) + grid_sizer_2 = wx.BoxSizer(wx.HORIZONTAL) PanelPres = wx.Panel(self) + bckgrdcolor = wx.Colour(randint(0, 255), randint(0, 255), randint(0, 255)) PanelPres.SetBackgroundColour(bckgrdcolor) label_1 = wx.StaticText(self, -1, u"IRaMuTeQ", size=(-1, -1)) label_1.SetFont(wx.Font(46, wx.TELETYPE, wx.NORMAL, wx.BOLD, 0, "Purisa")) label_1.SetForegroundColour(wx.RED) + iraicone = wx.Image(os.path.join(ImagePath,'iraicone248x248.png'), wx.BITMAP_TYPE_ANY).ConvertToBitmap() + but_ira = wx.StaticBitmap(self, -1, bitmap = iraicone) label2 = wx.StaticText(PanelPres, -1 , u'\nVersion ' + ConfigGlob.get('DEFAULT', 'version') + '\n') label2.SetForegroundColour(txtcolour) label2.SetBackgroundColour(bckgrdcolor) @@ -1267,7 +1270,8 @@ class IntroPanel(wx.Panel): grid_sizer_1.Add(self.hyper2, 0, wx.EXPAND | wx.ALIGN_CENTER_HORIZONTAL, 0) grid_sizer_3.Add(label_lerass, 0, wx.EXPAND | wx.ALIGN_CENTER_HORIZONTAL, 0) grid_sizer_3.Add(self.hyper_lerass, 0, wx.EXPAND | wx.ALIGN_CENTER_HORIZONTAL, 0) - sizer4.Add(label_1, 0, wx.ALIGN_CENTER, 5) + sizer4.Add(label_1, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL, 5) + sizer2.Add(label2, 0, wx.ALIGN_CENTER, 5) #sizer2.Add(wx.StaticText(PanelPres, -1, u''), 0, wx.ALIGN_CENTER, 5) sizer2.Add(wx.StaticText(PanelPres, -1, u''), 0, wx.ALIGN_CENTER, 5) @@ -1279,17 +1283,19 @@ class IntroPanel(wx.Panel): sizer2.Add(grid_sizer_1, 0, wx.ALIGN_CENTER, 5) sizer2.Add(labellicence, 0, wx.ALIGN_CENTER, 5) sizer2.Add(labelcopy, 0, wx.ALIGN_CENTER, 5) - sizer1.Add(sizer4, 1, wx.EXPAND | wx.ALIGN_CENTER_HORIZONTAL, 0) + sizer1.Add(sizer4, 1, wx.ALIGN_CENTER_HORIZONTAL, 0) + sizer1.Add(but_ira, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL, 5) + sizer2.Add(wx.StaticText(PanelPres, -1, u''), 0, wx.ALIGN_CENTER, 5) PanelPres.SetSizer(sizer2) - sizer5.Add(blank, 1, wx.EXPAND | wx.ALL | wx.ALIGN_CENTER_HORIZONTAL, 2) + #sizer5.Add(blank, 1, wx.EXPAND | wx.ALL | wx.ALIGN_CENTER_HORIZONTAL, 2) sizer5.Add(PanelPres, 1, wx.EXPAND | wx.ALIGN_CENTER_HORIZONTAL, 0) - sizer5.Add(blank1, 1, wx.ALIGN_CENTER_HORIZONTAL,2) - grid_sizer_2.Add(but_python, 1, wx.ALIGN_CENTER_HORIZONTAL| wx.ALIGN_CENTER_VERTICAL) - grid_sizer_2.Add(but_lexique, 1,wx.ALIGN_CENTER_HORIZONTAL| wx.ALIGN_CENTER_VERTICAL) - grid_sizer_2.Add(but_r, 1, wx.ALIGN_CENTER_HORIZONTAL| wx.ALIGN_CENTER_VERTICAL) + #sizer5.Add(blank1, 1, wx.ALIGN_CENTER_HORIZONTAL,2) + grid_sizer_2.Add(but_python, 1, wx.ALIGN_BOTTOM) + grid_sizer_2.Add(but_lexique, 1, wx.ALIGN_BOTTOM) + grid_sizer_2.Add(but_r, 1, wx.ALIGN_BOTTOM) - sizer1.Add(sizer5, 3, wx.EXPAND | wx.ALIGN_CENTER_HORIZONTAL, 1) - sizer1.Add(grid_sizer_2, 1, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL) + sizer1.Add(sizer5, 0, wx.EXPAND |wx.ALL, 10) + sizer1.Add(grid_sizer_2, 2, wx.ALIGN_CENTER_HORIZONTAL|wx.ALL, 1) self.SetSizer(sizer1) sizer1.Fit(self) -- 2.7.4