dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 12 Wiki Activity

Merge remote-tracking branch 'origin/master' into test-3

Browse Source 
# Conflicts:
#	gui/characterEditor.py
This commit is contained in:
blitzmann
2018-02-23 23:28:33 -05:00
parent 96c13c344a cb4fadf84c
commit 73d59569ff
3 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/mainFrame.py
View File

@@ -49,7 +49,7 @@ from gui.multiSwitch import MultiSwitch
from gui.statsPane import StatsPane
from gui.shipBrowser import ShipBrowser
from gui.builtinShipBrowser.events import FitSelected, ImportSelected, Stage3Selected
from gui.characterEditor import CharacterEditor, SaveCharacterAs
from gui.characterEditor import CharacterEditor
from gui.characterSelection import CharacterSelection
from gui.patternEditor import DmgPatternEditorDlg
from gui.resistsEditor import ResistsEditorDlg
@@ -692,8 +692,8 @@ class MainFrame(wx.Frame):
def saveCharAs(self, event):
charID = self.charSelection.getActiveCharacter()
dlg = SaveCharacterAs(self, charID)
dlg.ShowModal()
CharacterEditor.SaveCharacterAs(self, charID)
wx.PostEvent(self, GE.CharListUpdated())
def revertChar(self, event):
sChr = Character.getInstance()