X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=iramuteq.py;h=08ce86c07145ef91ca9de880181d17b3ec5c216d;hp=8fa06d680a38748fccdfda9dd4344f43e50e8b39;hb=1f82fb8e9ed83b8524b00039f1a8c51c2b12a8be;hpb=a503f041dc4947ee21c1d353ddd05ddb13a5e322 diff --git a/iramuteq.py b/iramuteq.py index 8fa06d6..08ce86c 100644 --- a/iramuteq.py +++ b/iramuteq.py @@ -13,7 +13,6 @@ parser.add_option("-f", "--file", dest="filename", #print args #print options - import sys reload(sys) import locale @@ -104,8 +103,9 @@ if sys.platform == 'darwin' : else : sys.setdefaultencoding(locale.getpreferredencoding()) #chemin de l'application - +#print 'ATTENTION APPLIPATH' AppliPath = os.path.abspath(os.path.dirname(os.path.realpath(sys.argv[0]))) +#AppliPath = '/home/pierre/workspace/iramuteqNG' #chemin des images ImagePath = os.path.join(AppliPath, 'images') #configuration generale @@ -281,9 +281,9 @@ class IraFrame(wx.Frame): # CenterPane()) self._mgr.AddPane(IntroPanel(self), aui.AuiPaneInfo().Name("Intro_Text"). CenterPane()) - if not os.path.exists(os.path.join(UserConfigPath, 'history.db')) : - with open(os.path.join(UserConfigPath, 'history.db'), 'w') as f : - f.write('') + #if not os.path.exists(os.path.join(UserConfigPath, 'history.db')) : + # with open(os.path.join(UserConfigPath, 'history.db'), 'w') as f : + # f.write('') self.history = History(os.path.join(UserConfigPath, 'history.db')) self.tree = LeftTree(self) self._mgr.AddPane(self.tree, aui.AuiPaneInfo().Name("lefttree").Caption("Navigateur"). @@ -1096,7 +1096,7 @@ class MySplashScreen(wx.SplashScreen): bmp = wx.Image(os.path.join(ImagePath, 'splash.png')).ConvertToBitmap() wx.SplashScreen.__init__(self, bmp, wx.SPLASH_CENTRE_ON_SCREEN | wx.SPLASH_TIMEOUT, - 3000, None, -1) + 1000, None, -1) self.Bind(wx.EVT_CLOSE, self.OnClose) self.fc = wx.FutureCall(1500, self.ShowMain) @@ -1109,7 +1109,7 @@ class MySplashScreen(wx.SplashScreen): self.ShowMain() def ShowMain(self): - frame = IraFrame(None, -1, "IRaMuTeQ " + ConfigGlob.get('DEFAULT', 'version'), size=(950, 650)) + frame = IraFrame(None, -1, "IRaMuTeQ " + ConfigGlob.get('DEFAULT', 'version'), size=(1100, 800)) frame.Show() frame.Upgrade() frame.OnOpenFromCmdl() @@ -1123,7 +1123,6 @@ class MyApp(wx.App): Create and show the splash screen. It will then create and show the main frame when it is time to do so. """ - wx.SystemOptions.SetOptionInt("mac.window-plain-transition", 1) self.SetAppName("Iramuteq") splash = MySplashScreen()