X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=guifunct.py;h=64c572ccc4c4f185e3a4a5366042cc488d5f3840;hp=c20ee7051f24f8e879855b8bedbbde7b3d50f982;hb=1e07c566398282f130a753283ddf8e85d1f6837e;hpb=773ca4248f17f17098e34b3c21004713e09e3109

diff --git a/guifunct.py b/guifunct.py
index c20ee70..64c572c 100644
--- a/guifunct.py
+++ b/guifunct.py
@@ -41,7 +41,7 @@ def OnOpen(self, type):
             elif type == "Texte":
                 return False, [False]
             elif type == "Analyse":
-                return [False]
+                return False
 
 def getfileextension(file) :
     return os.path.splitext(file)[1]
@@ -149,6 +149,7 @@ class SelectColumn :
             else :
                 self.ok = False
         else :
+            self.ok = True
             if selected is None :
                 selected = [i for i in range(0, len(actives))]
             with open(pathout, 'w') as f :
@@ -329,7 +330,7 @@ class PrefSimi ( wx.Dialog ):
         self.m_staticline40 = wx.StaticLine( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
         fgSizer3.Add( self.m_staticline40, 0, wx.EXPAND |wx.ALL, 5 )
         
-        self.m_staticText321 = wx.StaticText( self.m_panel2, wx.ID_ANY, _(u"Edge curved"), wx.DefaultPosition, wx.DefaultSize, 0 )
+        self.m_staticText321 = wx.StaticText( self.m_panel2, wx.ID_ANY, _(u"Edge curved").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 )
         self.m_staticText321.Wrap( -1 )
         fgSizer3.Add( self.m_staticText321, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
         
@@ -622,7 +623,7 @@ class PrefSimi ( wx.Dialog ):
         self.m_staticText21.Wrap( -1 )
         bSizer5.Add( self.m_staticText21, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
         
-        self.cols = wx.ColourPickerCtrl( self.m_panel3, wx.ID_ANY, wx.Colour( 255, 0, 0 ), wx.DefaultPosition, wx.Size( 10,10 ), wx.CLRP_DEFAULT_STYLE )
+        self.cols = wx.ColourPickerCtrl( self.m_panel3, wx.ID_ANY, wx.Colour( 255, 0, 0 ), wx.DefaultPosition, wx.DefaultSize, wx.CLRP_DEFAULT_STYLE )
         bSizer5.Add( self.cols, 0, wx.ALL, 5 )
         
         
@@ -1079,7 +1080,7 @@ class CreateTgenDialog ( wx.Frame ):
 class TGenFrame ( wx.Frame ):
     
     def __init__( self, parent, corpus, Tgen ):
-        wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = u"Tgen", pos = wx.DefaultPosition, size = wx.Size( 600,434 ), style = wx.DEFAULT_FRAME_STYLE|wx.TAB_TRAVERSAL|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP )
+        wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = u"Tgen", pos = wx.DefaultPosition, size = wx.Size( -1, -1 ), style = wx.CLOSE_BOX|wx.DEFAULT_FRAME_STYLE|wx.TAB_TRAVERSAL|wx.STAY_ON_TOP )
         
         self.Tgen = Tgen
         self.parent = parent
@@ -1104,15 +1105,15 @@ class TGenFrame ( wx.Frame ):
         
         tgensChoices = Tgen.tgen.keys()
         self.tgens = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, tgensChoices, 0 )
-        self.tgens.SetMinSize( wx.Size( 200,250 ) )
+        #self.tgens.SetMinSize( wx.Size( 200,250 ) )
         
-        fgSizer1.Add( self.tgens, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+        fgSizer1.Add( self.tgens, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 )
         
         tgencontentChoices = []
         self.tgencontent = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, tgencontentChoices, 0|wx.VSCROLL )
-        self.tgencontent.SetMinSize( wx.Size( 200,250 ) )
+        #self.tgencontent.SetMinSize( wx.Size( 200,250 ) )
         
-        fgSizer1.Add( self.tgencontent, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+        fgSizer1.Add( self.tgencontent, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 )
         
         fgSizer2 = wx.FlexGridSizer( 0, 2, 0, 0 )
         fgSizer2.SetFlexibleDirection( wx.BOTH )
@@ -1125,7 +1126,7 @@ class TGenFrame ( wx.Frame ):
         fgSizer2.Add( self.but_del, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
         
         
-        fgSizer1.Add( fgSizer2, 0, wx.EXPAND, 5 )
+        fgSizer1.Add( fgSizer2, 0, wx.EXPAND, 0 )
         
         fgSizer3 = wx.FlexGridSizer( 0, 2, 0, 0 )
         fgSizer3.SetFlexibleDirection( wx.BOTH )
@@ -1136,7 +1137,7 @@ class TGenFrame ( wx.Frame ):
         self.but_compute = wx.Button( self, wx.ID_ANY, u"Compute", wx.DefaultPosition, wx.DefaultSize, 0 )
         fgSizer3.Add( self.but_compute, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )      
 
-        fgSizer1.Add( fgSizer3, 0, wx.EXPAND, 5 )
+        fgSizer1.Add( fgSizer3, 0, wx.EXPAND, 0 )
 
         bSizer1.Add( fgSizer1, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
         
@@ -1152,6 +1153,7 @@ class TGenFrame ( wx.Frame ):
         
         self.SetSizer( bSizer1 )
         self.Layout()
+        bSizer1.Fit( self )
         
         self.Centre( wx.BOTH )