X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=dialog.py;h=451873490cd1e992f4959a152f361ef2250924f9;hp=17a002567b9e993bd0ba4d845c2912ba1badeb40;hb=2560c66bef5e023dbce18c556363ec956bd15e47;hpb=2301b7f97349d29b07fe4f51d30af2721280687a diff --git a/dialog.py b/dialog.py index 17a0025..4518734 100755 --- a/dialog.py +++ b/dialog.py @@ -375,7 +375,7 @@ releases at startup""").decode('utf8') self.m_staticText46.Wrap( -1 ) fgSizer1.Add( self.m_staticText46, 0, wx.ALL, 5 ) - self.listlangues = [ u"french", u"english", u"spanish", u"portuguese", u"italian" ] + self.listlangues = [ u"english",u"french", u"italian", u"portuguese", u"spanish"] self.langues = wx.Choice( self, wx.ID_ANY, (200, -1), choices = self.listlangues) #self.langues.SetSelection( 0 ) fgSizer1.Add( self.langues, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) @@ -1051,34 +1051,34 @@ class StatDialog ( wx.Dialog ): self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, _(u"Lemmatization").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText1.Wrap( -1 ) - gSizer1.Add( self.m_staticText1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + gSizer1.Add( self.m_staticText1, 0, wx.ALIGN_CENTER_VERTICAL, 1 ) radio_lemChoices = [ _(u"yes").decode('utf8'), _(u"no").decode('utf8') ] self.radio_lem = wx.RadioBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, radio_lemChoices, 1, wx.RA_SPECIFY_COLS ) self.radio_lem.SetSelection( 0 ) - gSizer1.Add( self.radio_lem, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) + gSizer1.Add( self.radio_lem, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT, 1 ) self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, _(u"Keys properties").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText2.Wrap( -1 ) - gSizer1.Add( self.m_staticText2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + gSizer1.Add( self.m_staticText2, 0, wx.ALIGN_CENTER_VERTICAL, 1 ) self.button_5 = wx.Button( self, wx.ID_PREFERENCES, _(u"properties").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) - gSizer1.Add( self.button_5, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) + gSizer1.Add( self.button_5, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT, 1 ) self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, _(u"Dictionary").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText3.Wrap( -1 ) - gSizer1.Add( self.m_staticText3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + gSizer1.Add( self.m_staticText3, 0, wx.ALIGN_CENTER_VERTICAL, 1 ) radio_dictchoiceChoices = [ _(u"indexation").decode('utf8'), _(u"other").decode('utf8') ] self.radio_dictchoice = wx.RadioBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, radio_dictchoiceChoices, 1, wx.RA_SPECIFY_COLS ) self.radio_dictchoice.SetSelection( 0 ) - gSizer1.Add( self.radio_dictchoice, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) + gSizer1.Add( self.radio_dictchoice, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT, 1 ) - bSizer1.Add( gSizer1, 1, wx.EXPAND, 5 ) + bSizer1.Add( gSizer1, 1, wx.EXPAND, 1 ) self.dictpath = filebrowse.FileBrowseButton(self, -1, size=(350, -1), labelText = _(u"Path").decode('utf8'), fileMode = 2, fileMask = '*') - bSizer1.Add( self.dictpath, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + bSizer1.Add( self.dictpath, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL, 1 ) self.dictpath.Enable(False) m_sdbSizer1 = wx.StdDialogButtonSizer() @@ -1088,7 +1088,7 @@ class StatDialog ( wx.Dialog ): m_sdbSizer1.AddButton( self.m_sdbSizer1Cancel ) m_sdbSizer1.Realize(); - bSizer1.Add( m_sdbSizer1, 0, wx.EXPAND, 5 ) + bSizer1.Add( m_sdbSizer1, 0, wx.EXPAND, 0 ) self.SetSizer( bSizer1 ) @@ -2623,24 +2623,25 @@ class message(wx.Frame): self.uceids = uceids self.ira = wx.GetApp().GetTopWindow() self.SetIcon(self.ira._icon) - self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) + #self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) self.items = items self.html = "" #self.HtmlPage=wx.html.HtmlWindow(self, -1) - self.HtmlPage = ConcordList(self, items) + self.panel = wx.Panel(self, wx.ID_ANY) + self.HtmlPage = ConcordList(self.panel, items) #self.HtmlPage.SetMinSize( size ) #if "gtk2" in wx.PlatformInfo: # self.HtmlPage.SetStandardFonts() #self.HtmlPage.SetFonts('Courier','Courier') - self.button_1 = wx.Button(self, wx.ID_CANCEL) + self.button_1 = wx.Button(self.panel, wx.ID_CANCEL) self.Bind(wx.EVT_BUTTON, self.OnCloseMe, self.button_1) if self.save : - self.button_2 = wx.Button(self, wx.ID_SAVE) + self.button_2 = wx.Button(self.panel, wx.ID_SAVE) self.Bind(wx.EVT_BUTTON, self.OnSavePage, self.button_2) if self.uceids is not None : - self.butsub = wx.Button(self, -1, _(u"Build sub corpus").decode('utf8')) + self.butsub = wx.Button(self.panel, -1, _(u"Build sub corpus").decode('utf8')) self.Bind(wx.EVT_BUTTON, self.OnSub, self.butsub) self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) self.__do_layout() @@ -2650,15 +2651,16 @@ class message(wx.Frame): sizer_2.Add(self.HtmlPage, 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0) #m_sdbSizer1 = wx.StdDialogButtonSizer() m_sdbSizer1 = wx.BoxSizer(wx.HORIZONTAL) - m_sdbSizer1.Add( self.button_1 , 0, wx.RIGHT | wx.EXPAND) + m_sdbSizer1.Add( self.button_1 , 0, wx.ALIGN_RIGHT | wx.EXPAND) if self.save : - m_sdbSizer1.Add( self.button_2 , 0, wx.RIGHT | wx.EXPAND) + m_sdbSizer1.Add( self.button_2 , 0, wx.ALIGN_RIGHT | wx.EXPAND) if self.uceids is not None : - m_sdbSizer1.Add( self.butsub , 0, wx.RIGHT | wx.EXPAND) + m_sdbSizer1.Add( self.butsub , 0, wx.ALIGN_RIGHT | wx.EXPAND) #m_sdbSizer1.Realize() - sizer_2.Add(m_sdbSizer1, 0, wx.RIGHT | wx.EXPAND, 5) - self.SetSizer(sizer_2) - self.Layout() + #self.panel.SetSizer( m_sdbSizer1 ) + sizer_2.Add( m_sdbSizer1, 0, wx.ALIGN_RIGHT, 5) + self.panel.SetSizer(sizer_2) + self.panel.Layout() sizer_2.Fit( self ) def OnSavePage(self, evt) :