From 0d35b56018f88c0ffca3a7b82da18e51f6ab62c1 Mon Sep 17 00:00:00 2001 From: tatiana Date: Tue, 5 Jan 2010 16:38:14 +0000 Subject: [PATCH] FIX: Import empty directory (#81) --- invesalius/control.py | 6 +++++- invesalius/gui/dialogs.py | 24 +++++++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/invesalius/control.py b/invesalius/control.py index cd05380..8742a28 100755 --- a/invesalius/control.py +++ b/invesalius/control.py @@ -106,7 +106,11 @@ class Controller(): # Import project dirpath = dialog.ShowImportDirDialog() - if dirpath: + ### + print dirpath + if dirpath and not os.listdir(dirpath): + dialog.ImportEmptyDirectory(dirpath) + elif dirpath: self.StartImportPanel(dirpath) ps.Publisher().sendMessage("Load data to import panel", dirpath) diff --git a/invesalius/gui/dialogs.py b/invesalius/gui/dialogs.py index 56404bd..72e275e 100644 --- a/invesalius/gui/dialogs.py +++ b/invesalius/gui/dialogs.py @@ -249,7 +249,7 @@ class MessageDialog(wx.Dialog): self.Centre() def SaveChangesDialog__Old(filename): - message = "Save changes to "+filename+"?" + message = "Save changes to %s?"%filename dlg = MessageDialog(message) answer = dlg.ShowModal() @@ -262,14 +262,28 @@ def SaveChangesDialog__Old(filename): return -1 +def ImportEmptyDirectory(dirpath): + if sys.platform == 'darwin': + dlg = wx.MessageDialog(None, "", + "%s is an empty directory." % dirpath, + wx.ICON_INFORMATION | wx.OK) + else: + dlg = wx.MessageDialog(None, "%s is an empty directory." % dirpath, + "InVesalius 3", + wx.ICON_INFORMATION | wx.OK) + dlg.ShowModal() + dlg.Destroy() + + + def SaveChangesDialog(filename): current_dir = os.path.abspath(".") if sys.platform == 'darwin': dlg = wx.MessageDialog(None, "", - "Save changes to "+filename+"?", + "Save changes to %s?"%filename, wx.ICON_QUESTION | wx.YES_NO | wx.CANCEL) else: - dlg = wx.MessageDialog(None, "Save changes to "+filename+"?", + dlg = wx.MessageDialog(None, "Save changes to %s?"%filename, "InVesalius 3", wx.ICON_QUESTION | wx.YES_NO | wx.CANCEL) @@ -288,10 +302,10 @@ def SaveChangesDialog2(filename): current_dir = os.path.abspath(".") if sys.platform == 'darwin': dlg = wx.MessageDialog(None, "", - "Save changes to "+filename+"?", + "Save changes to %s?"%filename, wx.ICON_QUESTION | wx.YES_NO) else: - dlg = wx.MessageDialog(None, "Save changes to "+filename+"?", + dlg = wx.MessageDialog(None, "Save changes to %s?"%filename, "InVesalius 3", wx.ICON_QUESTION | wx.YES_NO) -- libgit2 0.21.2