Merge branch '3.0' of http://www.iramuteq.org/git/iramuteq into 3.0

diff --git a/iramuteq.py b/iramuteq.py
index d0bfb72..a8afd32 100755 (executable)
--- a/iramuteq.py
+++ b/iramuteq.py
@@ -238,6 +238,7 @@ class IraFrame(wx.Frame):
                        wx.CLIP_CHILDREN):
         log.info('Starting Iramuteq... ' )
         log.info('version : %s' % ConfigGlob.get('DEFAULT', 'version'))
+        print(size)
         wx.Frame.__init__(self, parent, id, title, pos, size, style)
         #Font
         self.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
@@ -432,7 +433,7 @@ class IraFrame(wx.Frame):
         # min size for the frame itself isn't completely done.
         # see the end up FrameManager::Update() for the test
         # code. For now, just hard code a frame minimum size
-        self.SetMinSize(wx.Size(400, 400))
+        self.SetMinSize(wx.Size(800, 600))
 
         #--------------------------------------------------------------------
         # barre d'outils : le menu de petits icones en haut de la fenetre
@@ -707,10 +708,14 @@ class IraFrame(wx.Frame):
         BestRPath = False
         if not CheckRPath(self.PathPath) :
             if sys.platform == 'win32':
-                if os.path.exists(self.AppliPath + '\\R\\R') :
+                if os.path.exists(self.AppliPath + '\\R\\R\\x64\\R.exe') :
                     BestRPath = self.AppliPath + '\\R\\R\\bin\\x64\\R.exe'
+                elif os.path.exists(self.AppliPath + '\\R\\R\\i386\\R.exe') :
+                    BestRPath = self.AppliPath + '\\R\\R\\bin\\i386\\R.exe'
                 else :
                     BestRPath = FindRPAthWin32()
+            elif os.path.exists(self.AppliPath + '/R/R') :
+                BestRPath = self.AppliPath + '/R/R'
             else:
                 BestRPath = FindRPathNix()
             if BestRPath:

diff --git a/setup.py b/setup.py
index eafb3ab..177f3d3 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -7,13 +7,14 @@ Usage:
 
 from setuptools import setup
 import os
-DATA_FILES=['configuration','Rscripts','images','dictionnaires','locale','son_fin.wav', 'gpl-2.0.txt', 'gpl-2.0-fr.txt']
+DATA_FILES=['configuration','Rscripts','R','images','dictionnaires','locale','son_fin.wav', 'gpl-2.0.txt', 'gpl-2.0-fr.txt']
 #DATA_FILES=['configuration','Rscripts','images','dictionnaires','locale', 'Rlib','son_fin.wav', 'gpl-2.0.txt', 'gpl-2.0-fr.txt']
 APP = ['iramuteq.py']
-OPTIONS = {'argv_emulation': True,
+OPTIONS = {'argv_emulation': False,
          'emulate_shell_environment': True,
          'iconfile':('images/iraicone.icns'),
-         'optimize': 2}
+         'optimize': 2,
+        'arch': 'universal2'}
 
 setup(
     app=APP,