Mopy/bash/basher/patcher_dialog.py patchers -> gui_patchers EEE patcher->p

Author: Utumno

Mopy/bash/basher/patcher_dialog.py

@@ -50,7 +50,7 @@
 class PatchDialog(balt.Dialog):
     """Bash Patch update dialog.
 
-    :type patchers: list[basher.gui_patchers._PatcherPanel]
+    :type _gui_patchers: list[basher.gui_patchers._PatcherPanel]
     """
 
     def __init__(self, parent, patchInfo, doCBash, importConfig,
@@ -80,15 +80,15 @@ def __init__(self, parent, patchInfo, doCBash, importConfig,
                 patchConfigs = {}
         isFirstLoad = 0 == len(patchConfigs)
         self.patchInfo = patchInfo
-        self.patchers = [copy.deepcopy(p) for p in (
+        self._gui_patchers = [copy.deepcopy(p) for p in (
             CBash_gui_patchers if doCBash else PBash_gui_patchers)]
-        self.patchers.sort(key=lambda a: a.__class__.name)
-        self.patchers.sort(key=lambda a: groupOrder[a.__class__.group])
-        for patcher in self.patchers:
+        self._gui_patchers.sort(key=lambda a: a.__class__.name)
+        self._gui_patchers.sort(key=lambda a: groupOrder[a.__class__.group])
+        for patcher in self._gui_patchers:
             patcher.getConfig(patchConfigs) #--Will set patcher.isEnabled
             patcher.SetIsFirstLoad(isFirstLoad)
         self.currentPatcher = None
-        patcherNames = [patcher.getName() for patcher in self.patchers]
+        patcherNames = [patcher.getName() for patcher in self._gui_patchers]
         #--GUI elements
         self.gExecute = OkButton(self, label=_(u'Build Patch'))
         self.gExecute.on_clicked.subscribe(self.PatchExecute)
@@ -116,7 +116,7 @@ def __init__(self, parent, patchInfo, doCBash, importConfig,
         self.gRevertToDefault = RevertButton(self,
                                              label=_(u'Revert To Default'))
         self.gRevertToDefault.on_clicked.subscribe(self.DefaultConfig)
-        for index,patcher in enumerate(self.patchers):
+        for index,patcher in enumerate(self._gui_patchers):
             self.gPatchers.Check(index,patcher.isEnabled)
         self.defaultTipText = _(u'Items that are new since the last time this patch was built are displayed in bold')
         self.gTipText = Label(self,self.defaultTipText)
@@ -144,19 +144,19 @@ def __init__(self, parent, patchInfo, doCBash, importConfig,
         ]).apply_to(self)
         self.SetIcons(Resources.bashMonkey)
         #--Patcher panels
-        for patcher in self.patchers:
+        for patcher in self._gui_patchers:
             patcher.GetConfigPanel(self, self.config_layout,
                                    self.gTipText).Hide()
-        initial_select = min(len(self.patchers)-1,1)
+        initial_select = min(len(self._gui_patchers) - 1, 1)
         if initial_select >= 0:
             self.gPatchers.SetSelection(initial_select) # callback not fired
-            self.ShowPatcher(self.patchers[initial_select]) # so this is needed
+            self.ShowPatcher(self._gui_patchers[initial_select]) # so this is needed
         self.SetOkEnable()
 
     #--Core -------------------------------
     def SetOkEnable(self):
-        """Sets enable state for Ok button."""
-        self.gExecute.enabled = any(p.isEnabled for p in self.patchers)
+        """Enable Build Patch button if at least one patcher is enabled."""
+        self.gExecute.enabled = any(p.isEnabled for p in self._gui_patchers)
 
     def ShowPatcher(self,patcher):
         """Show patcher panel."""
@@ -182,7 +182,7 @@ def PatchExecute(self): # TODO(ut): needs more work to reduce P/C differences to
             self._saveConfig(patch_name)
             #--Do it
             log = bolt.LogFile(StringIO.StringIO())
-            patchers = [patcher for patcher in self.patchers if patcher.isEnabled]
+            patchers = [p for p in self._gui_patchers if p.isEnabled]
             patchFile = CBash_PatchFile(patch_name, patchers) if self.doCBash \
                    else PatchFile(self.patchInfo, patchers)
             patchFile.init_patchers_data(SubProgress(progress, 0, 0.1)) #try to speed this up!
@@ -345,7 +345,7 @@ def _cretry(self, patch_name):
 
     def __config(self):
         config = {'ImportedMods': set()}
-        for patcher in self.patchers: patcher.saveConfig(config)
+        for p in self._gui_patchers: p.saveConfig(config)
         return config
 
     def _saveConfig(self, patch_name):
@@ -397,7 +397,7 @@ def ImportConfig(self):
         self._load_config(patchConfigs)
 
     def _load_config(self, patchConfigs, set_first_load=False, default=False):
-        for index, patcher in enumerate(self.patchers):
+        for index, patcher in enumerate(self._gui_patchers):
             patcher.import_config(patchConfigs, set_first_load=set_first_load,
                                   default=default)
             self.gPatchers.Check(index, patcher.isEnabled)
@@ -438,14 +438,14 @@ def DefaultConfig(self):
 
     def SelectAll(self):
         """Select all patchers and entries in patchers with child entries."""
-        for index,patcher in enumerate(self.patchers):
+        for index,patcher in enumerate(self._gui_patchers):
             self.gPatchers.Check(index,True)
             patcher.mass_select()
         self.gExecute.enabled = True
 
     def DeselectAll(self):
         """Deselect all patchers and entries in patchers with child entries."""
-        for index,patcher in enumerate(self.patchers):
+        for index,patcher in enumerate(self._gui_patchers):
             self.gPatchers.Check(index,False)
             patcher.mass_select(select=False)
         self.gExecute.enabled = False
@@ -458,26 +458,26 @@ def OnSize(self,event):
     def OnSelect(self,event):
         """Responds to patchers list selection."""
         itemDex = event.GetSelection()
-        self.ShowPatcher(self.patchers[itemDex])
+        self.ShowPatcher(self._gui_patchers[itemDex])
         self.gPatchers.SetSelection(itemDex)
 
     def CheckPatcher(self, patcher):
         """Enable a patcher - Called from a patcher's OnCheck method."""
-        index = self.patchers.index(patcher)
+        index = self._gui_patchers.index(patcher)
         self.gPatchers.Check(index)
         self.SetOkEnable()
 
     def BoldPatcher(self, patcher):
         """Set the patcher label to bold font.  Called from a patcher when
         it realizes it has something new in its list"""
-        index = self.patchers.index(patcher)
+        index = self._gui_patchers.index(patcher)
         get_font = self.gPatchers.GetFont()
         self.gPatchers.SetItemFont(index, balt.Font.Style(get_font, bold=True))
 
     def OnCheck(self,event):
         """Toggle patcher activity state."""
         index = event.GetSelection()
-        patcher = self.patchers[index]
+        patcher = self._gui_patchers[index]
         patcher.isEnabled = self.gPatchers.IsChecked(index)
         self.gPatchers.SetSelection(index)
         self.ShowPatcher(patcher) # SetSelection does not fire the callback
@@ -492,8 +492,8 @@ def OnMouse(self,event):
                 self.mouse_dex = mouseItem
         elif event.Leaving():
             pass # will be set to defaultTipText
-        if 0 <= mouseItem < len(self.patchers):
-            patcherClass = self.patchers[mouseItem].__class__
+        if 0 <= mouseItem < len(self._gui_patchers):
+            patcherClass = self._gui_patchers[mouseItem].__class__
             tip = patcherClass.tip or re.sub(u'' r'\..*', u'.',
                             patcherClass.text.split(u'\n')[0], flags=re.U)
             self.gTipText.label_text = tip