X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=dialog.py;h=a1a250baccfee84758f3ecd5329cc5c12efdaa92;hp=e21c0f6e9286adcf8a353625b84d297016986971;hb=342d693d835ba1077fe0f31824664a807cafa3bb;hpb=23c18d65a858461bfb5b62b948522640d6d52507

diff --git a/dialog.py b/dialog.py
index e21c0f6..a1a250b 100755
--- a/dialog.py
+++ b/dialog.py
@@ -1152,8 +1152,7 @@ class StatDialog(wx.Dialog):
         dial = AlcOptFrame(self, self.parent.parent)
         dial.CenterOnParent()
         dial.ShowModal()
-	dial.Destroy()
-        print 'zerazer'
+        #dial.Destroy()
 
 class LexDialog( wx.Dialog ):
     
@@ -1722,7 +1721,7 @@ class OptLexi(wx.Dialog):
         self.choice_indice =  wx.Choice(self, -1, (100,50), choices = indices)
         if not self.force_chi :
             self.label = wx.StaticText(self, -1, u"effectif minimum")
-            self.spin = wx.SpinCtrl(self, -1, min = 1, max = 10000)
+            self.spin = wx.SpinCtrl(self, -1, min = 1, max = 10000, initial = 10)
         self.Bind(wx.EVT_CHOICE, self.onselect, self.choice)
         self.__set_properties()
         self.__do_layout()
@@ -1734,6 +1733,7 @@ class OptLexi(wx.Dialog):
         if not self.force_chi :
             self.spin.SetValue(10)
         self.choice.SetSelection(0)
+        self.choice_indice.SetSelection(0)
         #self.SetMinSize(wx.Size(300, 400))
         # end wxGlade
 
@@ -1954,6 +1954,21 @@ class PrefWordCloud ( wx.Dialog ):
         self.m_staticline4 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
         fgSizer1.Add( self.m_staticline4, 0, wx.EXPAND |wx.ALL, 5 )
         
+        self.m_staticText11 = wx.StaticText( self, wx.ID_ANY, u"Format de l'image", wx.DefaultPosition, wx.DefaultSize, 0 )
+        self.m_staticText11.Wrap( -1 )
+        fgSizer1.Add( self.m_staticText11, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+        
+        formatChoices = [ u"png", u"svg" ]
+        self.format = wx.Choice( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, formatChoices, 0 )
+        self.format.SetSelection( 0 )
+        fgSizer1.Add( self.format, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+        
+        self.m_staticline13 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
+        fgSizer1.Add( self.m_staticline13, 0, wx.EXPAND |wx.ALL, 5 )
+        
+        self.m_staticline14 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
+        fgSizer1.Add( self.m_staticline14, 0, wx.EXPAND |wx.ALL, 5 )
+
         self.m_staticText5 = wx.StaticText( self, wx.ID_ANY, u"Nombre maximum de formes", wx.DefaultPosition, wx.DefaultSize, 0 )
         self.m_staticText5.Wrap( -1 )
         fgSizer1.Add( self.m_staticText5, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 )