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

Make new context menus disablable

Browse Source
This commit is contained in:
DarkPhoenix
2019-08-21 15:14:49 +03:00
parent 3793721dc3
commit 7dc17543df
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui/builtinContextMenus/additionsExportAll.py
View File

@@ -3,6 +3,7 @@ from gui.contextMenu import ContextMenuUnconditional
from gui.utils.clipboard import toClipboard from gui.utils.clipboard import toClipboard
from service.fit import Fit from service.fit import Fit
from service.port.eft import exportDrones, exportFighters, exportCargo, exportImplants, exportBoosters from service.port.eft import exportDrones, exportFighters, exportCargo, exportImplants, exportBoosters
from service.settings import ContextMenuSettings
viewSpecMap = { viewSpecMap = {
@@ -20,6 +21,8 @@ class AdditionsExportAll(ContextMenuUnconditional):
self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.mainFrame = gui.mainFrame.MainFrame.getInstance()
def display(self, callingWindow, srcContext): def display(self, callingWindow, srcContext):
if not ContextMenuSettings.getInstance().get('additionsCopyPaste'):
return False
if srcContext not in viewSpecMap: if srcContext not in viewSpecMap:
return False return False
fit = Fit.getInstance().getFit(self.mainFrame.getActiveFit()) fit = Fit.getInstance().getFit(self.mainFrame.getActiveFit())

3
gui/builtinContextMenus/additionsExportSelection.py
View File

@@ -3,6 +3,7 @@ from gui.contextMenu import ContextMenuSelection
from gui.utils.clipboard import toClipboard from gui.utils.clipboard import toClipboard
from service.fit import Fit from service.fit import Fit
from service.port.eft import exportDrones, exportFighters, exportCargo, exportImplants, exportBoosters from service.port.eft import exportDrones, exportFighters, exportCargo, exportImplants, exportBoosters
from service.settings import ContextMenuSettings
viewSpecMap = { viewSpecMap = {
@@ -20,6 +21,8 @@ class AdditionsExportAll(ContextMenuSelection):
self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.mainFrame = gui.mainFrame.MainFrame.getInstance()
def display(self, callingWindow, srcContext, selection): def display(self, callingWindow, srcContext, selection):
if not ContextMenuSettings.getInstance().get('additionsCopyPaste'):
return False
if srcContext not in viewSpecMap: if srcContext not in viewSpecMap:
return False return False
if not selection: if not selection:

24
gui/builtinPreferenceViews/pyfaContextMenuPreferences.py
View File

@@ -64,17 +64,22 @@ class PFContextMenuPref(PreferenceView):
rbSizerRow2.Add(self.rbBox5, 1, wx.ALL, 5) rbSizerRow2.Add(self.rbBox5, 1, wx.ALL, 5)
self.rbBox5.Bind(wx.EVT_RADIOBOX, self.OnSetting5Change) self.rbBox5.Bind(wx.EVT_RADIOBOX, self.OnSetting5Change)
self.rbBox6 = wx.RadioBox(panel, -1, "Spoolup", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox6.SetSelection(self.settings.get('spoolup'))
rbSizerRow2.Add(self.rbBox6, 1, wx.ALL, 5)
self.rbBox6.Bind(wx.EVT_RADIOBOX, self.OnSetting6Change)
mainSizer.Add(rbSizerRow2, 1, wx.ALL | wx.EXPAND, 0) mainSizer.Add(rbSizerRow2, 1, wx.ALL | wx.EXPAND, 0)
# Row 3 # Row 3
# rbSizerRow3 = wx.BoxSizer(wx.HORIZONTAL) rbSizerRow3 = wx.BoxSizer(wx.HORIZONTAL)
#
# mainSizer.Add(rbSizerRow3, 1, wx.ALL | wx.EXPAND, 0) self.rbBox6 = wx.RadioBox(panel, -1, "Spoolup", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox6.SetSelection(self.settings.get('spoolup'))
rbSizerRow3.Add(self.rbBox6, 1, wx.ALL, 5)
self.rbBox6.Bind(wx.EVT_RADIOBOX, self.OnSetting6Change)
self.rbBox7 = wx.RadioBox(panel, -1, "Additions Panel Copy/Paste", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox7.SetSelection(self.settings.get('additionsCopyPaste'))
rbSizerRow3.Add(self.rbBox7, 1, wx.ALL, 5)
self.rbBox7.Bind(wx.EVT_RADIOBOX, self.OnSetting7Change)
mainSizer.Add(rbSizerRow3, 1, wx.ALL | wx.EXPAND, 0)
panel.SetSizer(mainSizer) panel.SetSizer(mainSizer)
panel.Layout() panel.Layout()
@@ -97,6 +102,9 @@ class PFContextMenuPref(PreferenceView):
def OnSetting6Change(self, event): def OnSetting6Change(self, event):
self.settings.set('spoolup', event.GetInt()) self.settings.set('spoolup', event.GetInt())
def OnSetting7Change(self, event):
self.settings.set('additionsCopyPaste', event.GetInt())
def getImage(self): def getImage(self):
return BitmapLoader.getBitmap("settings_menu", "gui") return BitmapLoader.getBitmap("settings_menu", "gui")

1
service/settings.py
View File

@@ -474,6 +474,7 @@ class ContextMenuSettings:
"project" : 1, "project" : 1,
"moduleFill" : 1, "moduleFill" : 1,
"spoolup" : 1, "spoolup" : 1,
"additionsCopyPaste" : 1,
} }
self.ContextMenuDefaultSettings = SettingsProvider.getInstance().getSettings("pyfaContextMenuSettings", ContextMenuDefaultSettings) self.ContextMenuDefaultSettings = SettingsProvider.getInstance().getSettings("pyfaContextMenuSettings", ContextMenuDefaultSettings)