소스 검색

Made reset festure could be canceled

Gyedo Jeon 16 년 전
부모
커밋
78942f54ae
2개의 변경된 파일8개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 1
      direct/src/leveleditor/LevelEditorBase.py
  2. 5 1
      direct/src/leveleditor/LevelEditorUIBase.py

+ 3 - 1
direct/src/leveleditor/LevelEditorBase.py

@@ -248,7 +248,9 @@ class LevelEditorBase(DirectObject):
             reply = wx.MessageBox("Do you want to save current scene?", "Save?",
                                wx.YES_NO | wx.ICON_QUESTION)
             if reply == wx.YES:
-                self.ui.onSave()
+                result = self.ui.onSave()
+                if result == False:
+                    return
 
         base.direct.deselectAll()
         self.objectMgr.reset()

+ 5 - 1
direct/src/leveleditor/LevelEditorUIBase.py

@@ -363,15 +363,19 @@ class LevelEditorUIBase(WxAppShell):
 
     def onSave(self, evt=None):
         if self.editor.currentFile is None:
-            self.onSaveAs(evt)
+            return self.onSaveAs(evt)
         else:
             self.editor.save()
 
     def onSaveAs(self, evt):
         dialog = wx.FileDialog(None, "Choose a file", os.getcwd(), "", "*.py", wx.SAVE)
+        result = True
         if dialog.ShowModal() == wx.ID_OK:
             self.editor.saveAs(dialog.GetPath())
+        else:
+            result = False
         dialog.Destroy()
+        return result
 
     def onDuplicate(self, evt):
         self.editor.objectMgr.duplicateSelected()