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

Always show factor reload time menu item

Browse Source
This commit is contained in:
DarkPhoenix
2019-04-16 19:41:52 +03:00
parent f100971fbe
commit 82adccadda
3 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui/builtinContextMenus/factorReload.py
View File

@@ -14,9 +14,6 @@ class FactorReload(ContextMenu):
self.settings = ContextMenuSettings.getInstance() self.settings = ContextMenuSettings.getInstance()
def display(self, srcContext, selection): def display(self, srcContext, selection):
if not self.settings.get('factorReload'):
return False
return srcContext == "firepowerViewFull" return srcContext == "firepowerViewFull"
@property @property

42
gui/builtinPreferenceViews/pyfaContextMenuPreferences.py
View File

@@ -44,8 +44,8 @@ class PFContextMenuPref(PreferenceView):
rbSizerRow1.Add(self.rbBox2, 1, wx.ALL, 5) rbSizerRow1.Add(self.rbBox2, 1, wx.ALL, 5)
self.rbBox2.Bind(wx.EVT_RADIOBOX, self.OnSetting2Change) self.rbBox2.Bind(wx.EVT_RADIOBOX, self.OnSetting2Change)
self.rbBox3 = wx.RadioBox(panel, -1, "Factor in Reload Time", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) self.rbBox3 = wx.RadioBox(panel, -1, "Variations", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox3.SetSelection(self.settings.get('factorReload')) self.rbBox3.SetSelection(self.settings.get('metaSwap'))
rbSizerRow1.Add(self.rbBox3, 1, wx.ALL, 5) rbSizerRow1.Add(self.rbBox3, 1, wx.ALL, 5)
self.rbBox3.Bind(wx.EVT_RADIOBOX, self.OnSetting3Change) self.rbBox3.Bind(wx.EVT_RADIOBOX, self.OnSetting3Change)
@@ -54,32 +54,27 @@ class PFContextMenuPref(PreferenceView):
# Row 2 # Row 2
rbSizerRow2 = wx.BoxSizer(wx.HORIZONTAL) rbSizerRow2 = wx.BoxSizer(wx.HORIZONTAL)
self.rbBox4 = wx.RadioBox(panel, -1, "Variations", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) self.rbBox4 = wx.RadioBox(panel, -1, "Project onto Fit", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox4.SetSelection(self.settings.get('metaSwap')) self.rbBox4.SetSelection(self.settings.get('project'))
rbSizerRow2.Add(self.rbBox4, 1, wx.ALL, 5) rbSizerRow2.Add(self.rbBox4, 1, wx.ALL, 5)
self.rbBox4.Bind(wx.EVT_RADIOBOX, self.OnSetting4Change) self.rbBox4.Bind(wx.EVT_RADIOBOX, self.OnSetting4Change)
self.rbBox5 = wx.RadioBox(panel, -1, "Project onto Fit", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) self.rbBox5 = wx.RadioBox(panel, -1, "Fill with module", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox5.SetSelection(self.settings.get('project')) self.rbBox5.SetSelection(self.settings.get('moduleFill'))
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)
#
self.rbBox8 = wx.RadioBox(panel, -1, "Fill with module", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS) # mainSizer.Add(rbSizerRow3, 1, wx.ALL | wx.EXPAND, 0)
self.rbBox8.SetSelection(self.settings.get('moduleFill'))
rbSizerRow3.Add(self.rbBox8, 1, wx.ALL, 5)
self.rbBox8.Bind(wx.EVT_RADIOBOX, self.OnSetting8Change)
self.rbBox9 = wx.RadioBox(panel, -1, "Spoolup", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox9.SetSelection(self.settings.get('spoolup'))
rbSizerRow3.Add(self.rbBox9, 1, wx.ALL, 5)
self.rbBox9.Bind(wx.EVT_RADIOBOX, self.OnSetting9Change)
mainSizer.Add(rbSizerRow3, 1, wx.ALL | wx.EXPAND, 0)
panel.SetSizer(mainSizer) panel.SetSizer(mainSizer)
panel.Layout() panel.Layout()
@@ -91,18 +86,15 @@ class PFContextMenuPref(PreferenceView):
self.settings.set('changeAffectingSkills', event.GetInt()) self.settings.set('changeAffectingSkills', event.GetInt())
def OnSetting3Change(self, event): def OnSetting3Change(self, event):
self.settings.set('factorReload', event.GetInt())
def OnSetting4Change(self, event):
self.settings.set('metaSwap', event.GetInt()) self.settings.set('metaSwap', event.GetInt())
def OnSetting5Change(self, event): def OnSetting4Change(self, event):
self.settings.set('project', event.GetInt()) self.settings.set('project', event.GetInt())
def OnSetting8Change(self, event): def OnSetting5Change(self, event):
self.settings.set('moduleFill', event.GetInt()) self.settings.set('moduleFill', event.GetInt())
def OnSetting9Change(self, event): def OnSetting6Change(self, event):
self.settings.set('spoolup', event.GetInt()) self.settings.set('spoolup', event.GetInt())
def getImage(self): def getImage(self):

1
service/settings.py
View File

@@ -474,7 +474,6 @@ class ContextMenuSettings(object):
"droneRemoveStack" : 1, "droneRemoveStack" : 1,
"droneSplit" : 1, "droneSplit" : 1,
"droneStack" : 1, "droneStack" : 1,
"factorReload" : 1,
"fighterAbilities" : 1, "fighterAbilities" : 1,
"implantSets" : 1, "implantSets" : 1,
"itemStats" : 1, "itemStats" : 1,