Implement batch module/charge moving

Because some have different cycle times, easier to compare

.appveyor.yml

@@ -32,7 +32,7 @@ for:
       - sh: export PYFA_VERSION="$(python3 -B scripts/dump_version.py)"
       - sh: mkdir build
       # Download packaging tool
-      - sh: curl -o $APPIMAGE_TOOL -L https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage
+      - sh: curl --fail-with-body -o $APPIMAGE_TOOL -L https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage
       - sh: chmod +x $APPIMAGE_TOOL
     build_script:
       - sh: mkdir -p AppDir/opt/pyfa

.gitattributes

@@ -33,4 +33,4 @@ pyfa.py     text eol=lf
 *.jpg binary
 *.icns binary
 *.ico binary
-
+*.dll filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -126,4 +126,5 @@ gitversion
 /locale/progress.json
 
 # vscode settings
-.vscode
+.vscode
+eve.db

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Pyfa-Mod"]
+	path = Pyfa-Mod
+	url = https://github.com/Eivonz/Pyfa-Mod

build.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+echo "Building pyfa binary..."
+
+# Ensure we're using the local venv
+if [ ! -d ".venv" ]; then
+    echo "Creating virtual environment..."
+    uv venv
+fi
+
+# Install dependencies
+echo "Installing dependencies..."
+uv pip install -r requirements.txt
+uv pip install pyinstaller
+
+# Clean previous builds
+echo "Cleaning previous builds..."
+rm -rf build dist
+
+# Build the binary
+echo "Building binary with PyInstaller..."
+uv run pyinstaller pyfa.spec
+
+# cp oleacc* dist/pyfa/
+
+echo ""
+echo "Build complete! Binary is located at: dist/pyfa/pyfa.exe"
+echo "You can run it with: dist/pyfa/pyfa.exe"

eos/modifiedAttributeDict.py

@@ -324,7 +324,7 @@ class ModifiedAttributeDict(MutableMapping):
                 cappingAttrKeyCache[key] = cappingKey
 
         if cappingKey:
-            cappingValue = self.original.get(cappingKey, self.__calculateValue(cappingKey))
+            cappingValue = self[cappingKey]
             cappingValue = cappingValue.value if hasattr(cappingValue, "value") else cappingValue
         else:
             cappingValue = None

eos/saveddata/drone.py

@@ -82,7 +82,7 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, Mu
         self.__baseVolley = None
         self.__baseRRAmount = None
         self.__miningYield = None
-        self.__miningWaste = None
+        self.__miningDrain = None
         self.__ehp = None
         self.__itemModifiedAttributes = ModifiedAttributeDict()
         self.__itemModifiedAttributes.original = self._item.attributes
@@ -240,15 +240,15 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, Mu
         if not ignoreState and self.amountActive <= 0:
             return 0
         if self.__miningYield is None:
-            self.__miningYield, self.__miningWaste = self.__calculateMining()
+            self.__miningYield, self.__miningDrain = self.__calculateMining()
         return self.__miningYield
 
-    def getMiningWPS(self, ignoreState=False):
+    def getMiningDPS(self, ignoreState=False):
         if not ignoreState and self.amountActive <= 0:
             return 0
-        if self.__miningWaste is None:
-            self.__miningYield, self.__miningWaste = self.__calculateMining()
-        return self.__miningWaste
+        if self.__miningDrain is None:
+            self.__miningYield, self.__miningDrain = self.__calculateMining()
+        return self.__miningDrain
 
     def __calculateMining(self):
         if self.mines is True:
@@ -262,8 +262,8 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, Mu
                 yps = yield_ / (cycleTime / 1000.0)
             wasteChance = self.getModifiedItemAttr("miningWasteProbability")
             wasteMult = self.getModifiedItemAttr("miningWastedVolumeMultiplier")
-            wps = yps * max(0, min(1, wasteChance / 100)) * wasteMult
-            return yps, wps
+            dps = yps * (1 + max(0, min(1, wasteChance / 100)) * wasteMult)
+            return yps, dps
         else:
             return 0, 0
 
@@ -335,7 +335,7 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, Mu
         self.__baseVolley = None
         self.__baseRRAmount = None
         self.__miningYield = None
-        self.__miningWaste = None
+        self.__miningDrain = None
         self.__ehp = None
         self.itemModifiedAttributes.clear()
         self.chargeModifiedAttributes.clear()

eos/saveddata/fit.py

@@ -140,8 +140,8 @@ class Fit:
         self.__remoteRepMap = {}
         self.__minerYield = None
         self.__droneYield = None
-        self.__minerWaste = None
-        self.__droneWaste = None
+        self.__minerDrain = None
+        self.__droneDrain = None
         self.__droneDps = None
         self.__droneVolley = None
         self.__sustainableTank = None
@@ -378,11 +378,11 @@ class Fit:
         return self.__minerYield
 
     @property
-    def minerWaste(self):
-        if self.__minerWaste is None:
+    def minerDrain(self):
+        if self.__minerDrain is None:
             self.calculatemining()
 
-        return self.__minerWaste
+        return self.__minerDrain
 
     @property
     def droneYield(self):
@@ -392,19 +392,19 @@ class Fit:
         return self.__droneYield
 
     @property
-    def droneWaste(self):
-        if self.__droneWaste is None:
+    def droneDrain(self):
+        if self.__droneDrain is None:
             self.calculatemining()
 
-        return self.__droneWaste
+        return self.__droneDrain
 
     @property
     def totalYield(self):
         return self.droneYield + self.minerYield
 
     @property
-    def totalWaste(self):
-        return self.droneWaste + self.minerWaste
+    def totalDrain(self):
+        return self.droneDrain + self.minerDrain
 
     @property
     def maxTargets(self):
@@ -518,8 +518,8 @@ class Fit:
         self.__remoteRepMap = {}
         self.__minerYield = None
         self.__droneYield = None
-        self.__minerWaste = None
-        self.__droneWaste = None
+        self.__minerDrain = None
+        self.__droneDrain = None
         self.__effectiveSustainableTank = None
         self.__sustainableTank = None
         self.__droneDps = None
@@ -702,15 +702,12 @@ class Fit:
                                                                mod.item.requiresSkill("High Speed Maneuvering"),
                                                    "speedFactor", value, stackingPenalties=True)
 
-                if warfareBuffID == 23:  # Mining Burst: Mining Laser Field Enhancement: Mining/Survey Range
+                if warfareBuffID == 23:  # Mining Burst: Mining Laser Field Enhancement: Mining Range
                     self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining") or
                                                                mod.item.requiresSkill("Ice Harvesting") or
                                                                mod.item.requiresSkill("Gas Cloud Harvesting"),
                                                    "maxRange", value, stackingPenalties=True)
 
-                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("CPU Management"),
-                                                   "surveyScanRange", value, stackingPenalties=True)
-
                 if warfareBuffID == 24:  # Mining Burst: Mining Laser Optimization: Mining Capacitor/Duration
                     self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining") or
                                                                mod.item.requiresSkill("Ice Harvesting") or
@@ -925,6 +922,36 @@ class Fit:
                         lambda mod: (mod.item.requiresSkill("Repair Systems")
                                      or mod.item.requiresSkill("Capital Repair Systems")),
                         "armorDamageAmount", value, stackingPenalties=True)
+                if warfareBuffID == 2464:  # Expedition Burst: Probe Strength
+                    self.modules.filteredChargeBoost(
+                        lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                        'baseSensorStrength', value, stackingPenalties=True)
+                if warfareBuffID == 2465:  # Expedition Burst: Directional Scanner, Hacking and Salvager Range
+                    self.ship.boostItemAttr("maxDirectionalScanRange", value)
+                    self.modules.filteredItemBoost(
+                        lambda mod: mod.item.group.name in ("Data Miners", "Salvager"), "maxRange", value, stackingPenalties=True)
+                if warfareBuffID == 2466:  # Expedition Burst: Maximum Scan Deviation Modifier
+                    self.modules.filteredChargeBoost(
+                        lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                        'baseMaxScanDeviation', value, stackingPenalties=True)
+                if warfareBuffID == 2468:  # Expedition Burst: Virus Coherence
+                    self.modules.filteredItemIncrease(
+                        lambda mod: mod.item.group.name == "Data Miners", "virusCoherence", value)
+                if warfareBuffID == 2474:  # Mining burst charges
+                    self.ship.forceItemAttr("miningScannerUpgrade", value)
+                if warfareBuffID == 2481:  # Expedition Burst: Salvager duration bonus
+                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"), "duration", value)
+                if warfareBuffID == 2516:  # Mining Burst: Mining Crit Chance
+                    self.modules.filteredItemBoost(
+                        lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill("Ice Harvesting"),
+                        "miningCritChance", value)
+                if warfareBuffID == 2517:  # Mining Burst: Mining Residue Chance Reduction
+                    self.modules.filteredItemBoost(
+                        lambda mod: (
+                                mod.item.requiresSkill("Mining")
+                                or mod.item.requiresSkill("Ice Harvesting")
+                                or mod.item.requiresSkill("Gas Cloud Harvesting")),
+                        "miningWasteProbability", value, stackingPenalties=True)
 
             del self.commandBonuses[warfareBuffID]
 
@@ -1707,21 +1734,21 @@ class Fit:
 
     def calculatemining(self):
         minerYield = 0
-        minerWaste = 0
+        minerDrain = 0
         droneYield = 0
-        droneWaste = 0
+        droneDrain = 0
 
         for mod in self.modules:
             minerYield += mod.getMiningYPS()
-            minerWaste += mod.getMiningWPS()
+            minerDrain += mod.getMiningDPS()
         for drone in self.drones:
             droneYield += drone.getMiningYPS()
-            droneWaste += drone.getMiningWPS()
+            droneDrain += drone.getMiningDPS()
 
         self.__minerYield = minerYield
-        self.__minerWaste = minerWaste
+        self.__minerDrain = minerDrain
         self.__droneYield = droneYield
-        self.__droneWaste = droneWaste
+        self.__droneDrain = droneDrain
 
     def calculateWeaponDmgStats(self, spoolOptions):
         weaponVolley = DmgTypes.default()

eos/saveddata/module.py

@@ -127,7 +127,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, M
         self.__baseVolley = None
         self.__baseRRAmount = None
         self.__miningYield = None
-        self.__miningWaste = None
+        self.__miningDrain = None
         self.__reloadTime = None
         self.__reloadForce = None
         self.__chargeCycles = None
@@ -418,17 +418,17 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, M
         if not ignoreState and self.state < FittingModuleState.ACTIVE:
             return 0
         if self.__miningYield is None:
-            self.__miningYield, self.__miningWaste = self.__calculateMining()
+            self.__miningYield, self.__miningDrain = self.__calculateMining()
         return self.__miningYield
 
-    def getMiningWPS(self, ignoreState=False):
+    def getMiningDPS(self, ignoreState=False):
         if self.isEmpty:
             return 0
         if not ignoreState and self.state < FittingModuleState.ACTIVE:
             return 0
-        if self.__miningWaste is None:
-            self.__miningYield, self.__miningWaste = self.__calculateMining()
-        return self.__miningWaste
+        if self.__miningDrain is None:
+            self.__miningYield, self.__miningDrain = self.__calculateMining()
+        return self.__miningDrain
 
     def __calculateMining(self):
         yield_ = self.getModifiedItemAttr("miningAmount")
@@ -443,8 +443,11 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, M
             yps = 0
         wasteChance = self.getModifiedItemAttr("miningWasteProbability")
         wasteMult = self.getModifiedItemAttr("miningWastedVolumeMultiplier")
-        wps = yps * max(0, min(1, wasteChance / 100)) * wasteMult
-        return yps, wps
+        dps = yps * (1 + max(0, min(1, wasteChance / 100)) * wasteMult)
+        critChance = self.getModifiedItemAttr("miningCritChance")
+        critBonusMult = self.getModifiedItemAttr("miningCritBonusYield")
+        yps += yps * critChance * critBonusMult
+        return yps, dps
 
     def isDealingDamage(self, ignoreState=False):
         volleyParams = self.getVolleyParameters(ignoreState=ignoreState)
@@ -894,7 +897,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, M
         self.__baseVolley = None
         self.__baseRRAmount = None
         self.__miningYield = None
-        self.__miningWaste = None
+        self.__miningDrain = None
         self.__reloadTime = None
         self.__reloadForce = None
         self.__chargeCycles = None

eos/saveddata/ship.py

@@ -126,7 +126,7 @@ class Ship(ItemAttrShortcut, HandledItem):
         valid Item objects, not the Mode objects. Returns None if not a
         t3 dessy
         """
-        if self.item.group.name != "Tactical Destroyer":
+        if self.item.group.name != "Tactical Destroyer" and self.item.name != "Anhinga":
             return None
 
         items = []

graphs/data/fitEwarStats/getter.py

@@ -332,3 +332,78 @@ class Distance2TpStrGetter(SmoothPointGetter):
         strMult = calculateMultiplier(strMults)
         strength = (strMult - 1) * 100
         return strength
+
+
+class Distance2JamChanceGetter(SmoothPointGetter):
+
+    _baseResolution = 50
+    _extraDepth = 2
+
+    ECM_ATTRS_GENERAL = ('scanGravimetricStrengthBonus', 'scanLadarStrengthBonus', 'scanMagnetometricStrengthBonus', 'scanRadarStrengthBonus')
+    ECM_ATTRS_FIGHTERS = ('fighterAbilityECMStrengthGravimetric', 'fighterAbilityECMStrengthLadar', 'fighterAbilityECMStrengthMagnetometric', 'fighterAbilityECMStrengthRadar')
+    SCAN_TYPES = ('Gravimetric', 'Ladar', 'Magnetometric', 'Radar')
+
+    def _getCommonData(self, miscParams, src, tgt):
+        ecms = []
+        for mod in src.item.activeModulesIter():
+            for effectName in ('remoteECMFalloff', 'structureModuleEffectECM'):
+                if effectName in mod.item.effects:
+                    ecms.append((
+                        tuple(mod.getModifiedItemAttr(a) or 0 for a in self.ECM_ATTRS_GENERAL),
+                        mod.maxRange or 0, mod.falloff or 0, True, False))
+            if 'doomsdayAOEECM' in mod.item.effects:
+                ecms.append((
+                    tuple(mod.getModifiedItemAttr(a) or 0 for a in self.ECM_ATTRS_GENERAL),
+                    max(0, (mod.maxRange or 0) + mod.getModifiedItemAttr('doomsdayAOERange')),
+                    mod.falloff or 0, False, False))
+        for drone in src.item.activeDronesIter():
+            if 'entityECMFalloff' in drone.item.effects:
+                ecms.extend(drone.amountActive * ((
+                    tuple(drone.getModifiedItemAttr(a) or 0 for a in self.ECM_ATTRS_GENERAL),
+                    math.inf, 0, True, True),))
+        for fighter, ability in src.item.activeFighterAbilityIter():
+            if ability.effect.name == 'fighterAbilityECM':
+                ecms.append((
+                    tuple(fighter.getModifiedItemAttr(a) or 0 for a in self.ECM_ATTRS_FIGHTERS),
+                    math.inf, 0, True, False))
+        # Determine target's strongest sensor type if target is available
+        targetScanTypeIndex = None
+        if tgt is not None:
+            maxStr = -1
+            for i, scanType in enumerate(self.SCAN_TYPES):
+                currStr = tgt.item.ship.getModifiedItemAttr('scan%sStrength' % scanType) or 0
+                if currStr > maxStr:
+                    maxStr = currStr
+                    targetScanTypeIndex = i
+        return {'ecms': ecms, 'targetScanTypeIndex': targetScanTypeIndex}
+
+    def _calculatePoint(self, x, miscParams, src, tgt, commonData):
+        distance = x
+        inLockRange = checkLockRange(src=src, distance=distance)
+        inDroneRange = checkDroneControlRange(src=src, distance=distance)
+        jamStrengths = []
+        targetScanTypeIndex = commonData['targetScanTypeIndex']
+        for strengths, optimal, falloff, needsLock, needsDcr in commonData['ecms']:
+            if (needsLock and not inLockRange) or (needsDcr and not inDroneRange):
+                continue
+            rangeFactor = calculateRangeFactor(srcOptimalRange=optimal, srcFalloffRange=falloff, distance=distance)
+            # Use the strength matching the target's sensor type
+            if targetScanTypeIndex is not None and targetScanTypeIndex < len(strengths):
+                strength = strengths[targetScanTypeIndex]
+                effectiveStrength = strength * rangeFactor
+                if effectiveStrength > 0:
+                    jamStrengths.append(effectiveStrength)
+        if not jamStrengths:
+            return 0
+        # Get sensor strength from target
+        if tgt is None:
+            return 0
+        sensorStrength = max([tgt.item.ship.getModifiedItemAttr('scan%sStrength' % scanType)
+                             for scanType in self.SCAN_TYPES]) or 0
+        if sensorStrength <= 0:
+            return 100  # If target has no sensor strength, 100% jam chance
+        # Calculate jam chance: 1 - (1 - (ecmStrength / sensorStrength)) ^ numJammers
+        retainLockChance = 1
+        for jamStrength in jamStrengths:
+            retainLockChance *= 1 - min(1, jamStrength / sensorStrength)
+        return (1 - retainLockChance) * 100

graphs/data/fitEwarStats/graph.py

@@ -21,8 +21,8 @@
 import wx
 
 from graphs.data.base import FitGraph, Input, XDef, YDef
-from .getter import (Distance2DampStrLockRangeGetter, Distance2EcmStrMaxGetter, Distance2GdStrRangeGetter, Distance2NeutingStrGetter, Distance2TdStrOptimalGetter,
-                     Distance2TpStrGetter, Distance2WebbingStrGetter)
+from .getter import (Distance2DampStrLockRangeGetter, Distance2EcmStrMaxGetter, Distance2GdStrRangeGetter, Distance2JamChanceGetter, Distance2NeutingStrGetter,
+                     Distance2TdStrOptimalGetter, Distance2TpStrGetter, Distance2WebbingStrGetter)
 
 _t = wx.GetTranslation
 
@@ -31,11 +31,13 @@ class FitEwarStatsGraph(FitGraph):
     # UI stuff
     internalName = 'ewarStatsGraph'
     name = _t('Electronic Warfare Stats')
+    hasTargets = True
     xDefs = [XDef(handle='distance', unit='km', label=_t('Distance'), mainInput=('distance', 'km'))]
     yDefs = [
         YDef(handle='neutStr', unit=None, label=_t('Cap neutralized per second'), selectorLabel=_t('Neuts: cap per second')),
         YDef(handle='webStr', unit='%', label=_t('Speed reduction'), selectorLabel=_t('Webs: speed reduction')),
         YDef(handle='ecmStrMax', unit=None, label=_t('Combined ECM strength'), selectorLabel=_t('ECM: combined strength')),
+        YDef(handle='jamChance', unit='%', label=_t('Jam chance'), selectorLabel=_t('ECM: jam chance')),
         YDef(handle='dampStrLockRange', unit='%', label=_t('Lock range reduction'), selectorLabel=_t('Damps: lock range reduction')),
         YDef(handle='tdStrOptimal', unit='%', label=_t('Turret optimal range reduction'), selectorLabel=_t('TDs: turret optimal range reduction')),
         YDef(handle='gdStrRange', unit='%', label=_t('Missile flight range reduction'), selectorLabel=_t('GDs: missile flight range reduction')),
@@ -53,6 +55,7 @@ class FitEwarStatsGraph(FitGraph):
         ('distance', 'neutStr'): Distance2NeutingStrGetter,
         ('distance', 'webStr'): Distance2WebbingStrGetter,
         ('distance', 'ecmStrMax'): Distance2EcmStrMaxGetter,
+        ('distance', 'jamChance'): Distance2JamChanceGetter,
         ('distance', 'dampStrLockRange'): Distance2DampStrLockRangeGetter,
         ('distance', 'tdStrOptimal'): Distance2TdStrOptimalGetter,
         ('distance', 'gdStrRange'): Distance2GdStrRangeGetter,

gui/builtinAdditionPanes/cargoView.py

@@ -159,11 +159,24 @@ class CargoView(d.Display):
         else:
             dstCargoItemID = None
 
-        self.mainFrame.command.Submit(cmd.GuiLocalModuleToCargoCommand(
-            fitID=self.mainFrame.getActiveFit(),
-            modPosition=modIdx,
-            cargoItemID=dstCargoItemID,
-            copy=wx.GetMouseState().GetModifiers() == wx.MOD_CONTROL))
+        modifiers = wx.GetMouseState().GetModifiers()
+        isCopy = modifiers == wx.MOD_CONTROL
+        isBatch = modifiers == wx.MOD_SHIFT
+        if isBatch:
+            self.mainFrame.command.Submit(
+                cmd.GuiBatchLocalModuleToCargoCommand(
+                    fitID=self.mainFrame.getActiveFit(), modPosition=modIdx, copy=isCopy
+                )
+            )
+        else:
+            self.mainFrame.command.Submit(
+                cmd.GuiLocalModuleToCargoCommand(
+                    fitID=self.mainFrame.getActiveFit(),
+                    modPosition=modIdx,
+                    cargoItemID=dstCargoItemID,
+                    copy=isCopy,
+                )
+            )
 
     def fitChanged(self, event):
         event.Skip()

gui/builtinContextMenus/__init__.py

@@ -18,6 +18,7 @@ from gui.builtinContextMenus import resistMode
 from gui.builtinContextMenus.targetProfile import editor
 # Item info
 from gui.builtinContextMenus import itemStats
+from gui.builtinContextMenus import fitDiff
 from gui.builtinContextMenus import itemMarketJump
 from gui.builtinContextMenus import fitSystemSecurity  # Not really an item info but want to keep it here
 from gui.builtinContextMenus import fitPilotSecurity  # Not really an item info but want to keep it here

gui/builtinContextMenus/fitAddCurrentlyOpen.py

@@ -47,6 +47,8 @@ class AddCurrentlyOpenFit(ContextMenuUnconditional):
             if isinstance(page, BlankPage):
                 continue
             fit = sFit.getFit(page.activeFitID, basic=True)
+            if fit is None:
+                continue
             id = ContextMenuUnconditional.nextID()
             mitem = wx.MenuItem(rootMenu, id, "{}: {}".format(fit.ship.item.name, fit.name))
             bindmenu.Bind(wx.EVT_MENU, self.handleSelection, mitem)

gui/builtinContextMenus/fitDiff.py

@@ -0,0 +1,48 @@
+# =============================================================================
+# Copyright (C) 2025
+#
+# This file is part of pyfa.
+#
+# pyfa is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# pyfa is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
+# =============================================================================
+
+
+# noinspection PyPackageRequirements
+import wx
+
+import gui.mainFrame
+from gui.contextMenu import ContextMenuSingle
+
+_t = wx.GetTranslation
+
+
+class FitDiff(ContextMenuSingle):
+    def __init__(self):
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+
+    def display(self, callingWindow, srcContext, mainItem):
+        # Only show for fittingShip context (right-click on ship)
+        return srcContext == "fittingShip"
+
+    def getText(self, callingWindow, itmContext, mainItem):
+        return _t("Fit Diff...")
+
+    def activate(self, callingWindow, fullContext, mainItem, i):
+        fitID = self.mainFrame.getActiveFit()
+        if fitID is not None:
+            from gui.fitDiffFrame import FitDiffFrame
+            FitDiffFrame(self.mainFrame, fitID)
+
+
+FitDiff.register()

gui/builtinContextMenus/moduleAmmoChange.py

@@ -39,6 +39,7 @@ class ChangeModuleAmmo(ContextMenuCombined):
             ('r16', _t('Moon Uncommon')),
             ('r32', _t('Moon Rare')),
             ('r64', _t('Moon Exceptional')),
+            ('err', _t('Erratic')),
             ('misc', _t('Misc'))])
 
     def display(self, callingWindow, srcContext, mainItem, selection):

gui/builtinContextMenus/shipModeChange.py

@@ -17,7 +17,10 @@ class ChangeShipTacticalMode(ContextMenuUnconditional):
         self.modeMap = {
             'Defense': _t('Defense'),
             'Propulsion': _t('Propulsion'),
-            'Sharpshooter': _t('Sharpshooter')
+            'Sharpshooter': _t('Sharpshooter'),
+            'Primary': _t('Primary'),
+            'Secondary': _t('Secondary'),
+            'Tertiary': _t('Tertiary'),
         }
 
     def display(self, callingWindow, srcContext):

gui/builtinContextMenus/skillAffectors.py

@@ -79,7 +79,7 @@ class ChangeAffectingSkills(ContextMenuSingle):
             label = _t("Level %s") % i
 
         id = ContextMenuSingle.nextID()
-        self.skillIds[id] = (skill, i)
+        self.skillIds[id] = (skill, i, False)  # False = not "up" for individual skills
         menuItem = wx.MenuItem(rootMenu, id, label, kind=wx.ITEM_RADIO)
         rootMenu.Bind(wx.EVT_MENU, self.handleSkillChange, menuItem)
         return menuItem
@@ -89,6 +89,40 @@ class ChangeAffectingSkills(ContextMenuSingle):
         self.skillIds = {}
         sub = wx.Menu()
 
+        # When rootMenu is None (direct menu access), use sub for binding on Windows
+        bindMenu = rootMenu if (rootMenu is not None and msw) else (sub if msw else None)
+
+        # Add "All" entry
+        allItem = wx.MenuItem(sub, ContextMenuSingle.nextID(), _t("All"))
+        grandSubAll = wx.Menu()
+        allItem.SetSubMenu(grandSubAll)
+
+        # For "All", only show levels 1-5 (not "Not Learned")
+        for i in range(1, 6):
+            id = ContextMenuSingle.nextID()
+            self.skillIds[id] = (None, i, False)  # None indicates "All" was selected, False = not "up"
+            label = _t("Level %s") % i
+            menuItem = wx.MenuItem(bindMenu if bindMenu else grandSubAll, id, label, kind=wx.ITEM_RADIO)
+            grandSubAll.Bind(wx.EVT_MENU, self.handleSkillChange, menuItem)
+            grandSubAll.Append(menuItem)
+
+        # Add separator
+        grandSubAll.AppendSeparator()
+
+        # Add "Up Level 1..5" entries
+        for i in range(1, 6):
+            id = ContextMenuSingle.nextID()
+            self.skillIds[id] = (None, i, True)  # None indicates "All" was selected, True = "up" only
+            label = _t("Up Level %s") % i
+            menuItem = wx.MenuItem(bindMenu if bindMenu else grandSubAll, id, label, kind=wx.ITEM_RADIO)
+            grandSubAll.Bind(wx.EVT_MENU, self.handleSkillChange, menuItem)
+            grandSubAll.Append(menuItem)
+
+        sub.Append(allItem)
+
+        # Add separator
+        sub.AppendSeparator()
+
         for skill in self.skills:
             skillItem = wx.MenuItem(sub, ContextMenuSingle.nextID(), skill.item.name)
             grandSub = wx.Menu()
@@ -99,7 +133,7 @@ class ChangeAffectingSkills(ContextMenuSingle):
                     skillItem.SetBitmap(bitmap)
 
             for i in range(-1, 6):
-                levelItem = self.addSkill(rootMenu if msw else grandSub, skill, i)
+                levelItem = self.addSkill(bindMenu if bindMenu else grandSub, skill, i)
                 grandSub.Append(levelItem)
                 if (not skill.learned and i == -1) or (skill.learned and skill.level == i):
                     levelItem.Check(True)
@@ -108,9 +142,24 @@ class ChangeAffectingSkills(ContextMenuSingle):
         return sub
 
     def handleSkillChange(self, event):
-        skill, level = self.skillIds[event.Id]
+        skill, level, up = self.skillIds[event.Id]
+
+        if skill is None:  # "All" was selected
+            for s in self.skills:
+                if up:
+                    # Only increase skill if it's below the target level
+                    if not s.learned or s.level < level:
+                        self.sChar.changeLevel(self.charID, s.item.ID, level)
+                else:
+                    self.sChar.changeLevel(self.charID, s.item.ID, level)
+        else:
+            if up:
+                # Only increase skill if it's below the target level
+                if not skill.learned or skill.level < level:
+                    self.sChar.changeLevel(self.charID, skill.item.ID, level)
+            else:
+                self.sChar.changeLevel(self.charID, skill.item.ID, level)
 
-        self.sChar.changeLevel(self.charID, skill.item.ID, level)
         fitID = self.mainFrame.getActiveFit()
         self.sFit.changeChar(fitID, self.charID)
 

gui/builtinItemStatsViews/itemCompare.py

@@ -9,6 +9,46 @@ from gui.utils.numberFormatter import formatAmount
 
 _t = wx.GetTranslation
 
+# Mapping of repair/transfer amount attributes to their duration attribute and display name
+PER_SECOND_ATTRIBUTES = {
+    "armorDamageAmount": {
+        "durationAttr": "duration",
+        "displayName": "Armor Hitpoints Repaired per second",
+        "unit": "HP/s"
+    },
+    "shieldBonus": {
+        "durationAttr": "duration",
+        "displayName": "Shield Hitpoints Repaired per second",
+        "unit": "HP/s"
+    },
+    "powerTransferAmount": {
+        "durationAttr": "duration",
+        "displayName": "Capacitor Transferred per second",
+        "unit": "GJ/s"
+    }
+}
+
+
+class PerSecondAttributeInfo:
+    """Helper class to store info about computed per-second attributes"""
+    def __init__(self, displayName, unit):
+        self.displayName = displayName
+        self.unit = PerSecondUnit(unit)
+
+
+class PerSecondUnit:
+    """Helper class to mimic the Unit class for per-second attributes"""
+    def __init__(self, displayName):
+        self.displayName = displayName
+        self.name = ""
+
+
+class PerSecondAttributeValue:
+    """Helper class to store computed per-second attribute values"""
+    def __init__(self, value):
+        self.value = value
+        self.info = None  # Will be set when adding to attrs
+
 
 def defaultSort(item):
     return (item.metaLevel or 0, item.name)
@@ -36,8 +76,12 @@ class ItemCompare(wx.Panel):
         self.item = item
         self.items = sorted(items, key=defaultSort)
         self.attrs = {}
+        self.computedAttrs = {}  # Store computed per-second attributes
         self.HighlightOn = wx.Colour(255, 255, 0, wx.ALPHA_OPAQUE)
         self.highlightedNames = []
+        self.bangBuckColumn = None  # Store the column selected for bang/buck calculation
+        self.bangBuckColumnName = None  # Store the display name of the selected column
+        self.columnHighlightColour = wx.Colour(173, 216, 230, wx.ALPHA_OPAQUE)  # Light blue for column highlight
 
         # get a dict of attrName: attrInfo of all unique attributes across all items
         for item in self.items:
@@ -45,23 +89,66 @@ class ItemCompare(wx.Panel):
                 if item.attributes[attr].info.displayName:
                     self.attrs[attr] = item.attributes[attr].info
 
+        # Compute per-second attributes for items that have both the amount and duration
+        for perSecondKey, config in PER_SECOND_ATTRIBUTES.items():
+            amountAttr = perSecondKey
+            durationAttr = config["durationAttr"]
+            perSecondAttrName = f"{perSecondKey}_per_second"
+
+            # Check if any item has both attributes
+            hasPerSecondAttr = False
+            for item in self.items:
+                if amountAttr in item.attributes and durationAttr in item.attributes:
+                    hasPerSecondAttr = True
+                    break
+
+            if hasPerSecondAttr:
+                # Add the per-second attribute info to attrs
+                perSecondInfo = PerSecondAttributeInfo(config["displayName"], config["unit"])
+                self.attrs[perSecondAttrName] = perSecondInfo
+                self.computedAttrs[perSecondAttrName] = {
+                    "amountAttr": amountAttr,
+                    "durationAttr": durationAttr
+                }
+
         # Process attributes for items and find ones that differ
         for attr in list(self.attrs.keys()):
             value = None
 
             for item in self.items:
-                # we can automatically break here if this item doesn't have the attribute,
-                # as that means at least one item did
-                if attr not in item.attributes:
-                    break
+                # Check if this is a computed attribute
+                if attr in self.computedAttrs:
+                    computed = self.computedAttrs[attr]
+                    amountAttr = computed["amountAttr"]
+                    durationAttr = computed["durationAttr"]
 
-                # this is the first attribute for the item set, set the initial value
-                if value is None:
-                    value = item.attributes[attr].value
-                    continue
+                    # Item needs both attributes to compute per-second value
+                    if amountAttr not in item.attributes or durationAttr not in item.attributes:
+                        break
 
-                if attr not in item.attributes or item.attributes[attr].value != value:
-                    break
+                    # Calculate per-second value
+                    amountValue = item.attributes[amountAttr].value
+                    durationValue = item.attributes[durationAttr].value
+                    # Duration is in milliseconds, convert to seconds
+                    perSecondValue = amountValue / (durationValue / 1000.0) if durationValue > 0 else 0
+
+                    if value is None:
+                        value = perSecondValue
+                        continue
+
+                    if perSecondValue != value:
+                        break
+                else:
+                    # Regular attribute handling
+                    if attr not in item.attributes:
+                        break
+
+                    if value is None:
+                        value = item.attributes[attr].value
+                        continue
+
+                    if item.attributes[attr].value != value:
+                        break
             else:
                 # attribute values were all the same, delete
                 del self.attrs[attr]
@@ -89,6 +176,7 @@ class ItemCompare(wx.Panel):
 
         self.toggleViewBtn.Bind(wx.EVT_TOGGLEBUTTON, self.ToggleViewMode)
         self.Bind(wx.EVT_LIST_COL_CLICK, self.SortCompareCols)
+        self.Bind(wx.EVT_LIST_COL_RIGHT_CLICK, self.OnColumnRightClick)
 
         self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.HighlightRow)
 
@@ -105,6 +193,23 @@ class ItemCompare(wx.Panel):
         self.Thaw()
         event.Skip()
 
+    def OnColumnRightClick(self, event):
+        column = event.GetColumn()
+        # Column 0 is "Item", column len(self.attrs) + 1 is "Price", len(self.attrs) + 2 is "Buck/bang"
+        # Only allow selecting attribute columns (1 to len(self.attrs))
+        if 1 <= column <= len(self.attrs):
+            # If clicking the same column, deselect it
+            if self.bangBuckColumn == column:
+                self.bangBuckColumn = None
+                self.bangBuckColumnName = None
+            else:
+                self.bangBuckColumn = column
+                # Get the display name of the selected column
+                attr_key = list(self.attrs.keys())[column - 1]
+                self.bangBuckColumnName = self.attrs[attr_key].displayName if self.attrs[attr_key].displayName else attr_key
+            self.UpdateList()
+        event.Skip()
+
     def SortCompareCols(self, event):
         self.Freeze()
         self.paramList.ClearAll()
@@ -148,12 +253,32 @@ class ItemCompare(wx.Panel):
                     # Remember to reduce by 1, because the attrs array
                     # starts at 0 while the list has the item name as column 0.
                     attr = str(list(self.attrs.keys())[sort - 1])
-                    func = lambda _val: _val.attributes[attr].value if attr in _val.attributes else 0.0
+                    # Handle computed attributes for sorting
+                    if attr in self.computedAttrs:
+                        computed = self.computedAttrs[attr]
+                        amountAttr = computed["amountAttr"]
+                        durationAttr = computed["durationAttr"]
+                        func = lambda _val: (_val.attributes[amountAttr].value / (_val.attributes[durationAttr].value / 1000.0)) if (amountAttr in _val.attributes and durationAttr in _val.attributes and _val.attributes[durationAttr].value > 0) else 0.0
+                    else:
+                        func = lambda _val: _val.attributes[attr].value if attr in _val.attributes else 0.0
                 # Clicked on a column that's not part of our array (price most likely)
                 except IndexError:
                     # Price
                     if sort == len(self.attrs) + 1:
                         func = lambda i: i.price.price if i.price.price != 0 else float("Inf")
+                    # Buck/bang
+                    elif sort == len(self.attrs) + 2:
+                        if self.bangBuckColumn is not None:
+                            attr_key = list(self.attrs.keys())[self.bangBuckColumn - 1]
+                            if attr_key in self.computedAttrs:
+                                computed = self.computedAttrs[attr_key]
+                                amountAttr = computed["amountAttr"]
+                                durationAttr = computed["durationAttr"]
+                                func = lambda i: (i.price.price / (i.attributes[amountAttr].value / (i.attributes[durationAttr].value / 1000.0)) if (amountAttr in i.attributes and durationAttr in i.attributes and i.attributes[durationAttr].value > 0 and (i.attributes[amountAttr].value / (i.attributes[durationAttr].value / 1000.0)) > 0) else float("Inf"))
+                            else:
+                                func = lambda i: (i.price.price / i.attributes[attr_key].value if (attr_key in i.attributes and i.attributes[attr_key].value > 0) else float("Inf"))
+                        else:
+                            func = defaultSort
                     # Something else
                     else:
                         self.sortReverse = False
@@ -166,18 +291,49 @@ class ItemCompare(wx.Panel):
 
         for i, attr in enumerate(self.attrs.keys()):
             name = self.attrs[attr].displayName if self.attrs[attr].displayName else attr
+            # Add indicator if this column is selected for bang/buck calculation
+            if self.bangBuckColumn == i + 1:
+                name = "► " + name
             self.paramList.InsertColumn(i + 1, name)
             self.paramList.SetColumnWidth(i + 1, 120)
 
         self.paramList.InsertColumn(len(self.attrs) + 1, _t("Price"))
         self.paramList.SetColumnWidth(len(self.attrs) + 1, 60)
 
+        # Add Buck/bang column header
+        buckBangHeader = _t("Buck/bang")
+        if self.bangBuckColumnName:
+            buckBangHeader = _t("Buck/bang ({})").format(self.bangBuckColumnName)
+        self.paramList.InsertColumn(len(self.attrs) + 2, buckBangHeader)
+        self.paramList.SetColumnWidth(len(self.attrs) + 2, 80)
+
         toHighlight = []
 
         for item in self.items:
             i = self.paramList.InsertItem(self.paramList.GetItemCount(), item.name)
             for x, attr in enumerate(self.attrs.keys()):
-                if attr in item.attributes:
+                # Handle computed attributes
+                if attr in self.computedAttrs:
+                    computed = self.computedAttrs[attr]
+                    amountAttr = computed["amountAttr"]
+                    durationAttr = computed["durationAttr"]
+
+                    # Item needs both attributes to display per-second value
+                    if amountAttr in item.attributes and durationAttr in item.attributes:
+                        amountValue = item.attributes[amountAttr].value
+                        durationValue = item.attributes[durationAttr].value
+                        # Duration is in milliseconds, convert to seconds
+                        perSecondValue = amountValue / (durationValue / 1000.0) if durationValue > 0 else 0
+
+                        info = self.attrs[attr]
+                        if self.toggleView == 1:
+                            valueUnit = formatAmount(perSecondValue, 3, 0, 0) + " " + info.unit.displayName
+                        else:
+                            valueUnit = str(perSecondValue)
+
+                        self.paramList.SetItem(i, x + 1, valueUnit)
+                    # else: leave cell empty
+                elif attr in item.attributes:
                     info = self.attrs[attr]
                     value = item.attributes[attr].value
                     if self.toggleView != 1:
@@ -191,6 +347,27 @@ class ItemCompare(wx.Panel):
 
             # Add prices
             self.paramList.SetItem(i, len(self.attrs) + 1, formatAmount(item.price.price, 3, 3, 9, currency=True) if item.price.price else "")
+
+            # Add buck/bang values
+            if self.bangBuckColumn is not None and item.price.price and item.price.price > 0:
+                attr_key = list(self.attrs.keys())[self.bangBuckColumn - 1]
+                if attr_key in self.computedAttrs:
+                    computed = self.computedAttrs[attr_key]
+                    amountAttr = computed["amountAttr"]
+                    durationAttr = computed["durationAttr"]
+                    if amountAttr in item.attributes and durationAttr in item.attributes:
+                        amountValue = item.attributes[amountAttr].value
+                        durationValue = item.attributes[durationAttr].value
+                        perSecondValue = amountValue / (durationValue / 1000.0) if durationValue > 0 else 0
+                        if perSecondValue > 0:
+                            buckBangValue = item.price.price / perSecondValue
+                            self.paramList.SetItem(i, len(self.attrs) + 2, formatAmount(buckBangValue, 3, 3, 9, currency=True))
+                elif attr_key in item.attributes:
+                    attrValue = item.attributes[attr_key].value
+                    if attrValue > 0:
+                        buckBangValue = item.price.price / attrValue
+                        self.paramList.SetItem(i, len(self.attrs) + 2, formatAmount(buckBangValue, 3, 3, 9, currency=True))
+
             if item.name in self.highlightedNames:
                 toHighlight.append(i)
 

gui/builtinItemStatsViews/itemSkills.py

@@ -0,0 +1,220 @@
+# noinspection PyPackageRequirements
+import wx
+import itertools
+
+import gui.mainFrame
+from eos.saveddata.character import Skill
+from eos.saveddata.fighter import Fighter as es_Fighter
+from eos.saveddata.module import Module as es_Module
+from eos.saveddata.ship import Ship
+from gui.utils.clipboard import toClipboard
+from gui.utils.numberFormatter import formatAmount
+from service.fit import Fit
+
+_t = wx.GetTranslation
+
+
+class ItemSkills(wx.Panel):
+    def __init__(self, parent, stuff, item):
+        wx.Panel.__init__(self, parent)
+        self.stuff = stuff
+        self.item = item
+
+        mainSizer = wx.BoxSizer(wx.HORIZONTAL)
+
+        leftPanel = wx.Panel(self)
+        leftSizer = wx.BoxSizer(wx.VERTICAL)
+        leftPanel.SetSizer(leftSizer)
+
+        header = wx.StaticText(leftPanel, wx.ID_ANY, _t("Components"))
+        font = header.GetFont()
+        font.SetWeight(wx.FONTWEIGHT_BOLD)
+        header.SetFont(font)
+        leftSizer.Add(header, 0, wx.ALL, 5)
+
+        self.checkboxes = {}
+        components = [
+            ("Ship", "ship"),
+            ("Modules", "modules"),
+            ("Drones", "drones"),
+            ("Fighters", "fighters"),
+            ("Cargo", "cargo"),
+            ("Implants", "appliedImplants"),
+            ("Boosters", "boosters"),
+            ("Necessary", "necessary"),
+        ]
+
+        for label, key in components:
+            cb = wx.CheckBox(leftPanel, wx.ID_ANY, label)
+            cb.SetValue(True)
+            cb.Bind(wx.EVT_CHECKBOX, self.onCheckboxChange)
+            self.checkboxes[key] = cb
+            leftSizer.Add(cb, 0, wx.ALL, 2)
+
+        leftSizer.AddStretchSpacer()
+
+        mainSizer.Add(leftPanel, 0, wx.EXPAND | wx.ALL, 5)
+
+        rightPanel = wx.Panel(self)
+        rightSizer = wx.BoxSizer(wx.VERTICAL)
+        rightPanel.SetSizer(rightSizer)
+
+        headerRight = wx.StaticText(rightPanel, wx.ID_ANY, _t("Skills"))
+        fontRight = headerRight.GetFont()
+        fontRight.SetWeight(wx.FONTWEIGHT_BOLD)
+        headerRight.SetFont(fontRight)
+        rightSizer.Add(headerRight, 0, wx.ALL, 5)
+
+        self.skillsText = wx.TextCtrl(rightPanel, wx.ID_ANY, "", style=wx.TE_MULTILINE | wx.TE_READONLY | wx.TE_DONTWRAP)
+        font = wx.Font(9, wx.FONTFAMILY_TELETYPE, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL)
+        self.skillsText.SetFont(font)
+        rightSizer.Add(self.skillsText, 1, wx.EXPAND | wx.ALL, 5)
+
+        mainSizer.Add(rightPanel, 1, wx.EXPAND | wx.ALL, 5)
+
+        self.SetSizer(mainSizer)
+        
+        self.nbContainer = parent if isinstance(parent, wx.Notebook) else None
+        if self.nbContainer:
+            self.nbContainer.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.onTabChanged)
+        
+        self.updateSkills()
+
+    def onCheckboxChange(self, event):
+        self.updateSkills()
+        self._copyToClipboard()
+
+    def updateSkills(self):
+        fitID = gui.mainFrame.MainFrame.getInstance().getActiveFit()
+        if fitID is None:
+            self.skillsText.SetValue("")
+            self._updateCheckboxStates(None)
+            return
+
+        sFit = Fit.getInstance()
+        fit = sFit.getFit(fitID)
+        if fit is None:
+            self.skillsText.SetValue("")
+            self._updateCheckboxStates(None)
+            return
+
+        if not fit.calculated:
+            fit.calculate()
+
+        self._updateCheckboxStates(fit)
+
+        char = fit.character
+        skillsMap = {}
+
+        items = []
+        if self.checkboxes["ship"].GetValue():
+            items.append(fit.ship)
+        if self.checkboxes["modules"].GetValue():
+            items.extend(fit.modules)
+        if self.checkboxes["drones"].GetValue():
+            items.extend(fit.drones)
+        if self.checkboxes["fighters"].GetValue():
+            items.extend(fit.fighters)
+        if self.checkboxes["cargo"].GetValue():
+            items.extend(fit.cargo)
+        if self.checkboxes["appliedImplants"].GetValue():
+            items.extend(fit.appliedImplants)
+        if self.checkboxes["boosters"].GetValue():
+            items.extend(fit.boosters)
+
+        for thing in items:
+            self._collectAffectingSkills(thing, char, skillsMap)
+        
+        if self.checkboxes["necessary"].GetValue():
+            self._collectRequiredSkills(items, char, skillsMap)
+
+        skillsList = ""
+        for skillName in sorted(skillsMap):
+            charLevel = skillsMap[skillName]
+            for level in range(1, charLevel + 1):
+                skillsList += "%s %d\n" % (skillName, level)
+
+        self.skillsText.SetValue(skillsList)
+        self._copyToClipboard()
+
+    def _copyToClipboard(self):
+        skillsText = self.skillsText.GetValue()
+        if skillsText:
+            toClipboard(skillsText)
+
+    def onTabChanged(self, event):
+        if self.nbContainer:
+            pageIndex = self.nbContainer.FindPage(self)
+            if pageIndex != -1 and event.GetSelection() == pageIndex:
+                self.updateSkills()
+        event.Skip()
+
+    def _updateCheckboxStates(self, fit):
+        if fit is None:
+            for cb in self.checkboxes.values():
+                cb.Enable(False)
+            return
+
+        self.checkboxes["ship"].Enable(True)
+        self.checkboxes["modules"].Enable(len(fit.modules) > 0)
+        self.checkboxes["drones"].Enable(len(fit.drones) > 0)
+        self.checkboxes["fighters"].Enable(len(fit.fighters) > 0)
+        self.checkboxes["cargo"].Enable(len(fit.cargo) > 0)
+        self.checkboxes["appliedImplants"].Enable(len(fit.appliedImplants) > 0)
+        self.checkboxes["boosters"].Enable(len(fit.boosters) > 0)
+        self.checkboxes["necessary"].Enable(True)
+
+    def _collectAffectingSkills(self, thing, char, skillsMap):
+        for attr in ("item", "charge"):
+            if attr == "charge" and isinstance(thing, es_Fighter):
+                continue
+            subThing = getattr(thing, attr, None)
+            if subThing is None:
+                continue
+            if isinstance(thing, es_Fighter) and attr == "charge":
+                continue
+
+            if attr == "charge":
+                cont = getattr(thing, "chargeModifiedAttributes", None)
+            else:
+                cont = getattr(thing, "itemModifiedAttributes", None)
+
+            if cont is not None:
+                for attrName in cont.iterAfflictions():
+                    for fit, afflictors in cont.getAfflictions(attrName).items():
+                        for afflictor, operator, stackingGroup, preResAmount, postResAmount, used in afflictors:
+                            if isinstance(afflictor, Skill) and afflictor.character == char:
+                                skillName = afflictor.item.name
+                                if skillName not in skillsMap:
+                                    skillsMap[skillName] = afflictor.level
+                                elif skillsMap[skillName] < afflictor.level:
+                                    skillsMap[skillName] = afflictor.level
+    
+    def _collectRequiredSkills(self, items, char, skillsMap):
+        """Collect required skills from items (necessary to use them)"""
+        for thing in items:
+            for attr in ("item", "charge"):
+                if attr == "charge" and isinstance(thing, es_Fighter):
+                    continue
+                subThing = getattr(thing, attr, None)
+                if subThing is None:
+                    continue
+                if isinstance(thing, es_Fighter) and attr == "charge":
+                    continue
+                
+                if hasattr(subThing, "requiredSkills"):
+                    for reqSkill, level in subThing.requiredSkills.items():
+                        skillName = reqSkill.name
+                        charSkill = char.getSkill(reqSkill) if char else None
+                        charLevel = charSkill.level if charSkill else 0
+                        
+                        if charLevel > 0:
+                            if skillName not in skillsMap:
+                                skillsMap[skillName] = charLevel
+                            elif skillsMap[skillName] < charLevel:
+                                skillsMap[skillName] = charLevel
+                        else:
+                            if skillName not in skillsMap:
+                                skillsMap[skillName] = level
+                            elif skillsMap[skillName] < level:
+                                skillsMap[skillName] = level

gui/builtinMarketBrowser/itemView.py

@@ -5,6 +5,7 @@ import gui.builtinMarketBrowser.pfSearchBox as SBox
 import gui.globalEvents as GE
 from config import slotColourMap, slotColourMapDark
 from eos.saveddata.module import Module
+from eos.const import FittingSlot
 from gui.builtinMarketBrowser.events import ItemSelected, RECENTLY_USED_MODULES, CHARGES_FOR_FIT
 from gui.contextMenu import ContextMenu
 from gui.display import Display
@@ -22,6 +23,7 @@ class ItemView(Display):
 
     DEFAULT_COLS = ["Base Icon",
                     "Base Name",
+                    "Price",
                     "attr:power,,,True",
                     "attr:cpu,,,True"]
 
@@ -153,19 +155,22 @@ class ItemView(Display):
         # skip the event so the other handlers also get called
         event.Skip()
 
-        if self.marketBrowser.mode != 'charges':
-            return
-
         activeFitID = self.mainFrame.getActiveFit()
         # if it was not the active fitting that was changed, do not do anything
         if activeFitID is not None and activeFitID not in event.fitIDs:
             return
 
-        items = self.getChargesForActiveFit()
+        # Handle charges mode
+        if self.marketBrowser.mode == 'charges':
+            items = self.getChargesForActiveFit()
+            # update the UI
+            self.updateItemStore(items)
+            self.filterItemStore()
+            return
 
-        # update the UI
-        self.updateItemStore(items)
-        self.filterItemStore()
+        # If "Fits" filter is active, re-filter the current view
+        if self.marketBrowser.getFitsFilter():
+            self.filterItemStore()
 
     def updateItemStore(self, items):
         self.unfilteredStore = items
@@ -197,13 +202,115 @@ class ItemView(Display):
             if btn.userSelected:
                 selectedMetas.update(sMkt.META_MAP[btn.metaName])
         filteredItems = sMkt.filterItemsByMeta(self.unfilteredStore, selectedMetas)
+        
+        # Apply slot/fits filters - works IDENTICALLY to meta buttons (filters CURRENT VIEW only)
+        activeSlotFilters = []
+        fitsFilterActive = False
+        for btn in self.marketBrowser.slotButtons:
+            if btn.userSelected and btn.IsEnabled():
+                if btn.filterType == "fits":
+                    fitsFilterActive = True
+                elif btn.filterType == "slot":
+                    activeSlotFilters.append(btn.slotType)
+        
+        # Apply fits filter
+        if fitsFilterActive:
+            filteredItems = self._filterByFits(filteredItems)
+        
+        # Apply slot filters
+        if activeSlotFilters:
+            filteredItems = [item for item in filteredItems if Module.calculateSlot(item) in activeSlotFilters]
+        
         return filteredItems
 
+    def _filterByFits(self, items):
+        """Filter items by remaining CPU/PG - filters CURRENT VIEW only"""
+        fitId = self.mainFrame.getActiveFit()
+        if fitId is None:
+            return []
+        
+        fit = self.sFit.getFit(fitId)
+        
+        # Get remaining CPU and power grid
+        cpuOutput = fit.ship.getModifiedItemAttr("cpuOutput")
+        powerOutput = fit.ship.getModifiedItemAttr("powerOutput")
+        cpuUsed = fit.cpuUsed
+        pgUsed = fit.pgUsed
+        cpuRemaining = cpuOutput - cpuUsed
+        pgRemaining = powerOutput - pgUsed
+        
+        # Get remaining calibration (for rigs)
+        calibrationCapacity = fit.ship.getModifiedItemAttr("upgradeCapacity")
+        calibrationUsed = fit.calibrationUsed
+        calibrationRemaining = None
+        if calibrationCapacity is not None and calibrationCapacity > 0:
+            calibrationRemaining = calibrationCapacity - calibrationUsed
+        
+        fittingItems = []
+        for item in items:
+            # Check if item is a module (has a slot)
+            slot = Module.calculateSlot(item)
+            if slot is None:
+                continue
+            
+            # Rigs don't use CPU/power, they use calibration - check rig size and calibration
+            if slot == FittingSlot.RIG:
+                # Check if item can fit on the ship
+                if not fit.canFit(item):
+                    continue
+                # Check rig size compatibility with ship
+                shipRigSize = fit.ship.getModifiedItemAttr("rigSize")
+                itemRigSize = item.attributes.get("rigSize")
+                if shipRigSize is not None and itemRigSize is not None:
+                    if shipRigSize != itemRigSize.value:
+                        continue
+                # Check calibration requirement
+                if calibrationRemaining is not None and calibrationRemaining > 0:
+                    itemCalibration = item.attributes.get("upgradeCost")
+                    if itemCalibration is not None:
+                        itemCalibrationValue = itemCalibration.value
+                        if itemCalibrationValue > calibrationRemaining:
+                            continue
+                fittingItems.append(item)
+                continue
+            
+            # For non-rigs, check CPU and power requirements
+            itemCpu = item.attributes.get("cpu")
+            itemPower = item.attributes.get("power")
+            
+            # Skip items without CPU or power (not modules)
+            if itemCpu is None and itemPower is None:
+                continue
+            
+            # Check CPU requirement
+            if itemCpu is not None:
+                itemCpuValue = itemCpu.value
+                if itemCpuValue > cpuRemaining:
+                    continue
+            
+            # Check power requirement
+            if itemPower is not None:
+                itemPowerValue = itemPower.value
+                if itemPowerValue > pgRemaining:
+                    continue
+            
+            # Check if item can fit on the ship (most expensive check, do last)
+            if not fit.canFit(item):
+                continue
+            
+            fittingItems.append(item)
+        
+        return fittingItems
+
     def setToggles(self):
         metaIDs = set()
+        slotIDs = set()
         sMkt = self.sMkt
         for item in self.unfilteredStore:
             metaIDs.add(sMkt.getMetaGroupIdByItem(item))
+            slot = Module.calculateSlot(item)
+            if slot is not None:
+                slotIDs.add(slot)
 
         for btn in self.marketBrowser.metaButtons:
             btn.reset()
@@ -212,6 +319,23 @@ class ItemView(Display):
                 btn.setMetaAvailable(True)
             else:
                 btn.setMetaAvailable(False)
+        
+        # Set toggles for slot/fits buttons
+        for btn in self.marketBrowser.slotButtons:
+            btn.reset()
+            if btn.filterType == "fits":
+                # Fits button is available if there's an active fit
+                fitId = self.mainFrame.getActiveFit()
+                isAvailable = fitId is not None
+                btn.setMetaAvailable(isAvailable)
+                if not isAvailable:
+                    btn.setUserSelection(False)
+            elif btn.filterType == "slot":
+                # Slot button is available if items with that slot exist in current view
+                isAvailable = btn.slotType in slotIDs
+                btn.setMetaAvailable(isAvailable)
+                if not isAvailable:
+                    btn.setUserSelection(False)
 
     def scheduleSearch(self, event=None):
         self.searchTimer.Stop()  # Cancel any pending timers

gui/builtinStatsViews/miningyieldViewFull.py

@@ -130,9 +130,9 @@ class MiningYieldViewFull(StatsView):
     def refreshPanel(self, fit):
         # If we did anything intresting, we'd update our labels to reflect the new fit's stats here
 
-        stats = (("labelFullminingyieldMiner", lambda: fit.minerYield, lambda: fit.minerWaste, 3, 0, 0, "{}{} m\u00B3/s", None),
-                 ("labelFullminingyieldDrone", lambda: fit.droneYield, lambda: fit.droneWaste, 3, 0, 0, "{}{} m\u00B3/s", None),
-                 ("labelFullminingyieldTotal", lambda: fit.totalYield, lambda: fit.totalWaste, 3, 0, 0, "{}{} m\u00B3/s", None))
+        stats = (("labelFullminingyieldMiner", lambda: fit.minerYield, lambda: fit.minerDrain, 3, 0, 0, "{} m\u00B3/s", None),
+                 ("labelFullminingyieldDrone", lambda: fit.droneYield, lambda: fit.droneDrain, 3, 0, 0, "{} m\u00B3/s", None),
+                 ("labelFullminingyieldTotal", lambda: fit.totalYield, lambda: fit.totalDrain, 3, 0, 0, "{} m\u00B3/s", None))
 
         def processValue(value):
             value = value() if fit is not None else 0
@@ -140,23 +140,26 @@ class MiningYieldViewFull(StatsView):
             return value
 
         counter = 0
-        for labelName, yieldValue, wasteValue, prec, lowest, highest, valueFormat, altFormat in stats:
+        for labelName, yieldValue, drainValue, prec, lowest, highest, valueFormat, altFormat in stats:
             label = getattr(self, labelName)
             yieldValue = processValue(yieldValue)
-            wasteValue = processValue(wasteValue)
-            if self._cachedValues[counter] != (yieldValue, wasteValue):
+            drainValue = processValue(drainValue)
+            if self._cachedValues[counter] != (yieldValue, drainValue):
+                try:
+                    efficiency = '{}%'.format(formatAmount(yieldValue / drainValue * 100, 4, 0, 0))
+                except ZeroDivisionError:
+                    efficiency = '0%'
                 yps = formatAmount(yieldValue, prec, lowest, highest)
                 yph = formatAmount(yieldValue * 3600, prec, lowest, highest)
-                wps = formatAmount(wasteValue, prec, lowest, highest)
-                wph = formatAmount(wasteValue * 3600, prec, lowest, highest)
-                wasteSuffix = '\u02b7' if wasteValue > 0 else ''
-                label.SetLabel(valueFormat.format(yps, wasteSuffix))
+                dps = formatAmount(drainValue, prec, lowest, highest)
+                dph = formatAmount(drainValue * 3600, prec, lowest, highest)
+                label.SetLabel(valueFormat.format(yps))
                 tipLines = []
-                tipLines.append("{} m\u00B3 mining yield per second ({} m\u00B3 per hour)".format(yps, yph))
-                if wasteValue > 0:
-                    tipLines.append("{} m\u00B3 mining waste per second ({} m\u00B3 per hour)".format(wps, wph))
+                tipLines.append("{} m\u00B3 yield per second ({} m\u00B3 per hour)".format(yps, yph))
+                tipLines.append("{} m\u00B3 drain per second ({} m\u00B3 per hour)".format(dps, dph))
+                tipLines.append(f'{efficiency} efficiency')
                 label.SetToolTip(wx.ToolTip('\n'.join(tipLines)))
-                self._cachedValues[counter] = (yieldValue, wasteValue)
+                self._cachedValues[counter] = (yieldValue, drainValue)
             counter += 1
         self.panel.Layout()
         self.headerPanel.Layout()

gui/builtinStatsViews/targetingMiscViewMinimal.py

@@ -130,6 +130,7 @@ class TargetingMiscViewMinimal(StatsView):
             ("specialPlanetaryCommoditiesHoldCapacity", _t("Planetary goods hold")),
             ("specialQuafeHoldCapacity", _t("Quafe hold")),
             ("specialMobileDepotHoldCapacity", _t("Mobile depot hold")),
+            ("specialExpeditionHoldCapacity", _t("Expedition hold")),
         ))
 
         cargoValues = {
@@ -154,6 +155,7 @@ class TargetingMiscViewMinimal(StatsView):
             "specialPlanetaryCommoditiesHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialPlanetaryCommoditiesHoldCapacity"),
             "specialQuafeHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialQuafeHoldCapacity"),
             "specialMobileDepotHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialMobileDepotHoldCapacity"),
+            "specialExpeditionHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialExpeditionHoldCapacity"),
         }
 
         stats = (("labelTargets", {"main": lambda: fit.maxTargets}, 3, 0, 0, ""),

gui/builtinViewColumns/misc.py

@@ -27,6 +27,7 @@ from gui.viewColumn import ViewColumn
 from gui.bitmap_loader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 from gui.utils.listFormatter import formatList
+from eos.utils.float import floatUnerr
 from eos.utils.spoolSupport import SpoolType, SpoolOptions
 import eos.config
 
@@ -195,7 +196,7 @@ class Miscellanea(ViewColumn):
             tooltip = "Warp core strength modification"
             return text, tooltip
         elif (
-            itemGroup in ("Stasis Web", "Stasis Webifying Drone", "Structure Stasis Webifier") or
+            itemGroup in ("Stasis Web", "Stasis Grappler", "Stasis Webifying Drone", "Structure Stasis Webifier") or
             (itemGroup in ("Structure Burst Projector", "Burst Projectors") and "doomsdayAOEWeb" in item.effects)
         ):
             speedFactor = stuff.getModifiedItemAttr("speedFactor")
@@ -291,7 +292,7 @@ class Miscellanea(ViewColumn):
             "Gyrostabilizer",
             "Magnetic Field Stabilizer",
             "Heat Sink",
-            "Ballistic Control system",
+            "Ballistic Control System",
             "Structure Weapon Upgrade",
             "Entropic Radiation Sink",
             "Vorton Projector Upgrade"
@@ -300,7 +301,7 @@ class Miscellanea(ViewColumn):
                 "Gyrostabilizer": ("damageMultiplier", "speedMultiplier", "Projectile weapon"),
                 "Magnetic Field Stabilizer": ("damageMultiplier", "speedMultiplier", "Hybrid weapon"),
                 "Heat Sink": ("damageMultiplier", "speedMultiplier", "Energy weapon"),
-                "Ballistic Control system": ("missileDamageMultiplierBonus", "speedMultiplier", "Missile"),
+                "Ballistic Control System": ("missileDamageMultiplierBonus", "speedMultiplier", "Missile"),
                 "Structure Weapon Upgrade": ("missileDamageMultiplierBonus", "speedMultiplier", "Missile"),
                 "Entropic Radiation Sink": ("damageMultiplier", "speedMultiplier", "Precursor weapon"),
                 "Vorton Projector Upgrade": ("damageMultiplier", "speedMultiplier", "Vorton projector")}
@@ -547,18 +548,24 @@ class Miscellanea(ViewColumn):
             if not yps:
                 return "", None
             yph = yps * 3600
-            wps = stuff.getMiningWPS(ignoreState=True)
-            wph = wps * 3600
+            dps = stuff.getMiningDPS(ignoreState=True)
+            dph = dps * 3600
+            try:
+                efficiency = yps / dps
+            except ZeroDivisionError:
+                efficiency = 0
             textParts = []
-            textParts.append(formatAmount(yps, 3, 0, 3))
             tipLines = []
+            textParts.append('{} m\u00B3/s'.format(formatAmount(yps, 3, 0, 3)))
             tipLines.append("{} m\u00B3 mining yield per second ({} m\u00B3 per hour)".format(
                 formatAmount(yps, 3, 0, 3), formatAmount(yph, 3, 0, 3)))
-            if wps > 0:
-                textParts.append(formatAmount(wps, 3, 0, 3))
-                tipLines.append("{} m\u00B3 mining waste per second ({} m\u00B3 per hour)".format(
-                    formatAmount(wps, 3, 0, 3), formatAmount(wph, 3, 0, 3)))
-            text = '{} m\u00B3/s'.format('+'.join(textParts))
+            tipLines.append("{} m\u00B3 mining drain per second ({} m\u00B3 per hour)".format(
+                formatAmount(dps, 3, 0, 3), formatAmount(dph, 3, 0, 3)))
+            if floatUnerr(efficiency) != 1:
+                eff_text = '{}%'.format(formatAmount(efficiency * 100, 4, 0, 0))
+                textParts.append(eff_text)
+                tipLines.append(f"{eff_text} mining efficiency")
+            text = '{}'.format(' | '.join(textParts))
             tooltip = '\n'.join(tipLines)
             return text, tooltip
         elif itemGroup == "Logistic Drone":
@@ -701,7 +708,7 @@ class Miscellanea(ViewColumn):
                 formatAmount(itemArmorResistanceShiftHardenerExp, 3, 0, 3),
             )
             return text, tooltip
-        elif itemGroup in ("Cargo Scanner", "Ship Scanner", "Survey Scanner"):
+        elif itemGroup in ("Cargo Scanner", "Ship Scanner"):
             duration = stuff.getModifiedItemAttr("duration")
             if not duration:
                 return "", None
@@ -766,15 +773,36 @@ class Miscellanea(ViewColumn):
                 elif buffId == 22:  # Skirmish Burst: Rapid Deployment: AB/MWD Speed Increase
                     textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
                     tooltipSections.append("AB/MWD speed increase")
-                elif buffId == 23:  # Mining Burst: Mining Laser Field Enhancement: Mining/Survey Range
+                elif buffId == 23:  # Mining Burst: Mining Laser Field Enhancement: Mining Range
                     textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
-                    tooltipSections.append("mining/survey module range")
+                    tooltipSections.append("mining module range")
                 elif buffId == 24:  # Mining Burst: Mining Laser Optimization: Mining Capacitor/Duration
                     textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
                     tooltipSections.append("mining module duration & capacitor use")
                 elif buffId == 25:  # Mining Burst: Mining Equipment Preservation: Crystal Volatility
                     textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
                     tooltipSections.append("mining crystal volatility")
+                elif buffId == 2464:  # Expedition Burst: Probe Strength
+                    textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
+                    tooltipSections.append("scan probe strength")
+                elif buffId == 2465:  # Expedition Burst: Directional Scanner, Hacking and Salvager Range
+                    textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
+                    tooltipSections.append("dscan, hacking & salvaging range")
+                elif buffId == 2466:  # Expedition Burst: Maximum Scan Deviation Modifier
+                    textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
+                    tooltipSections.append("scan probe deviation")
+                elif buffId == 2468:  # Expedition Burst: Virus Coherence
+                    textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}")
+                    tooltipSections.append("virus coherence")
+                elif buffId == 2481:  # Expedition Burst: Salvager duration bonus
+                    textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
+                    tooltipSections.append("salvager cycle time")
+                elif buffId == 2516:  # Mining Burst: Mining Crit Chance
+                    textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
+                    tooltipSections.append("crit chance")
+                elif buffId == 2517:  # Mining Burst: Mining Residue Chance Reduction
+                    textSections.append(f"{formatAmount(buffValue, 3, 0, 3, forceSign=True)}%")
+                    tooltipSections.append("waste chance")
             if not textSections:
                 return '', None
             text = ' | '.join(textSections)

gui/builtinViewColumns/price.py

@@ -20,6 +20,7 @@
 # noinspection PyPackageRequirements
 import wx
 
+from eos.gamedata import Item
 from eos.saveddata.cargo import Cargo
 from eos.saveddata.drone import Drone
 from eos.saveddata.fighter import Fighter
@@ -53,7 +54,14 @@ class Price(ViewColumn):
         self.imageId = fittingView.imageList.GetImageIndex("totalPrice_small", "gui")
 
     def getText(self, stuff):
-        if stuff.item is None or stuff.item.group.name == "Ship Modifiers":
+        if isinstance(stuff, Item):
+            item = stuff
+        else:
+            if not hasattr(stuff, "item") or stuff.item is None:
+                return ""
+            item = stuff.item
+
+        if item.group.name == "Ship Modifiers":
             return ""
 
         if hasattr(stuff, "isEmpty"):
@@ -63,7 +71,7 @@ class Price(ViewColumn):
         if isinstance(stuff, Module) and stuff.isMutated:
             return ""
 
-        priceObj = stuff.item.price
+        priceObj = item.price
 
         if not priceObj.isValid():
             return False
@@ -79,7 +87,11 @@ class Price(ViewColumn):
 
             display.SetItem(colItem)
 
-        sPrice.getPrices([mod.item], callback, waitforthread=True)
+        if isinstance(mod, Item):
+            item = mod
+        else:
+            item = mod.item
+        sPrice.getPrices([item], callback, waitforthread=True)
 
     def getImageId(self, mod):
         return -1

gui/builtinViews/fittingView.py

@@ -497,11 +497,27 @@ class FittingView(d.Display):
             fit = Fit.getInstance().getFit(fitID)
             if mod in fit.modules:
                 position = fit.modules.index(mod)
-                self.mainFrame.command.Submit(cmd.GuiCargoToLocalModuleCommand(
-                    fitID=fitID,
-                    cargoItemID=cargoItemID,
-                    modPosition=position,
-                    copy=wx.GetMouseState().GetModifiers() == wx.MOD_CONTROL))
+                modifiers = wx.GetMouseState().GetModifiers()
+                isCopy = modifiers == wx.MOD_CONTROL
+                isBatch = modifiers == wx.MOD_SHIFT
+                if isBatch:
+                    self.mainFrame.command.Submit(
+                        cmd.GuiBatchCargoToLocalModuleCommand(
+                            fitID=fitID,
+                            cargoItemID=cargoItemID,
+                            targetPosition=position,
+                            copy=isCopy,
+                        )
+                    )
+                else:
+                    self.mainFrame.command.Submit(
+                        cmd.GuiCargoToLocalModuleCommand(
+                            fitID=fitID,
+                            cargoItemID=cargoItemID,
+                            modPosition=position,
+                            copy=isCopy,
+                        )
+                    )
 
     def swapItems(self, x, y, srcIdx):
         """Swap two modules in fitting window"""
@@ -668,6 +684,21 @@ class FittingView(d.Display):
                 contexts.append(fullContext)
         contexts.append(("fittingShip", _t("Ship") if not fit.isStructure else _t("Citadel")))
 
+        # Check if shift is held for direct skills menu access
+        if wx.GetKeyState(wx.WXK_SHIFT):
+            from gui.builtinContextMenus.skillAffectors import ChangeAffectingSkills
+            for fullContext in contexts:
+                srcContext = fullContext[0]
+                itemContext = fullContext[1] if len(fullContext) > 1 else None
+                skillsMenu = ChangeAffectingSkills()
+                if skillsMenu.display(self, srcContext, mainMod):
+                    # On Windows, menu items need to be bound to the menu shown with PopupMenu
+                    # We pass None as rootMenu so items are bound to their parent submenus
+                    sub = skillsMenu.getSubMenu(self, srcContext, mainMod, None, 0, None)
+                    if sub:
+                        self.PopupMenu(sub)
+                        return
+
         menu = ContextMenu.getMenu(self, mainMod, selection, *contexts)
         self.PopupMenu(menu)
 
@@ -780,7 +811,6 @@ class FittingView(d.Display):
                             del mod.restrictionOverridden
                             hasRestrictionOverriden = not hasRestrictionOverriden
 
-
                 if slotMap[mod.slot] or hasRestrictionOverriden:  # Color too many modules as red
                     self.SetItemBackgroundColour(i, errColorDark if isDark() else errColor)
                 elif sFit.serviceFittingOptions["colorFitBySlot"]:  # Color by slot it enabled

gui/characterSelection.py

@@ -29,7 +29,7 @@ import config
 import gui.globalEvents as GE
 import gui.mainFrame
 from gui.bitmap_loader import BitmapLoader
-from gui.utils.clipboard import toClipboard
+from gui.utils.clipboard import toClipboard, fromClipboard
 from service.character import Character
 from service.fit import Fit
 
@@ -49,6 +49,10 @@ class CharacterSelection(wx.Panel):
 
         # cache current selection to fall back in case we choose to open char editor
         self.charCache = None
+        
+        # history for Shift-Tab navigation
+        self.charHistory = []
+        self._updatingFromHistory = False
 
         self.charChoice = wx.Choice(self)
         mainSizer.Add(self.charChoice, 1, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT | wx.LEFT, 3)
@@ -92,7 +96,7 @@ class CharacterSelection(wx.Panel):
         sFit = Fit.getInstance()
         fit = sFit.getFit(self.mainFrame.getActiveFit())
 
-        if not fit or not self.needsSkills:
+        if not fit:
             return
 
         pos = wx.GetMousePosition()
@@ -100,14 +104,23 @@ class CharacterSelection(wx.Panel):
 
         menu = wx.Menu()
 
-        grantItem = menu.Append(wx.ID_ANY, _t("Grant Missing Skills"))
-        self.Bind(wx.EVT_MENU, self.grantMissingSkills, grantItem)
+        if self.needsSkills:
+            grantItem = menu.Append(wx.ID_ANY, _t("Grant Missing Skills"))
+            self.Bind(wx.EVT_MENU, self.grantMissingSkills, grantItem)
 
-        exportItem = menu.Append(wx.ID_ANY, _t("Copy Missing Skills"))
-        self.Bind(wx.EVT_MENU, self.exportSkills, exportItem)
+            exportItem = menu.Append(wx.ID_ANY, _t("Copy Missing Skills"))
+            self.Bind(wx.EVT_MENU, self.exportSkills, exportItem)
 
-        exportItem = menu.Append(wx.ID_ANY, _t("Copy Missing Skills (EVEMon)"))
-        self.Bind(wx.EVT_MENU, self.exportSkillsEveMon, exportItem)
+            exportItem = menu.Append(wx.ID_ANY, _t("Copy Missing Skills (condensed)"))
+            self.Bind(wx.EVT_MENU, self.exportSkillsCondensed, exportItem)
+
+            exportItem = menu.Append(wx.ID_ANY, _t("Copy Missing Skills (EVEMon)"))
+            self.Bind(wx.EVT_MENU, self.exportSkillsEveMon, exportItem)
+
+            menu.AppendSeparator()
+
+        importItem = menu.Append(wx.ID_ANY, _t("Import Skills from Clipboard"))
+        self.Bind(wx.EVT_MENU, self.importSkillsFromClipboard, importItem)
 
         self.PopupMenu(menu, pos)
 
@@ -186,6 +199,13 @@ class CharacterSelection(wx.Panel):
         sFit = Fit.getInstance()
         sFit.changeChar(fitID, charID)
         self.charCache = self.charChoice.GetCurrentSelection()
+        
+        if not self._updatingFromHistory and charID is not None:
+            currentChar = self.getActiveCharacter()
+            if currentChar is not None:
+                if not self.charHistory or self.charHistory[-1] != currentChar:
+                    self.charHistory.append(currentChar)
+        
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
 
     def toggleRefreshButton(self):
@@ -207,6 +227,29 @@ class CharacterSelection(wx.Panel):
                 return True
 
         return False
+    
+    def selectPreviousChar(self):
+        currentChar = self.getActiveCharacter()
+        if currentChar is None:
+            return
+        
+        if not self.charHistory:
+            return
+        
+        if self.charHistory and self.charHistory[-1] == currentChar:
+            self.charHistory.pop()
+        
+        if not self.charHistory:
+            return
+        
+        prevChar = self.charHistory.pop()
+        if currentChar != prevChar:
+            self.charHistory.append(currentChar)
+        
+        self._updatingFromHistory = True
+        if self.selectChar(prevChar):
+            self.charChanged(None)
+        self._updatingFromHistory = False
 
     def fitChanged(self, event):
         """
@@ -219,7 +262,7 @@ class CharacterSelection(wx.Panel):
         self.charChoice.Enable(activeFitID is not None)
         choice = self.charChoice
         sFit = Fit.getInstance()
-        currCharID = choice.GetClientData(choice.GetCurrentSelection())
+        currCharID = choice.GetClientData(choice.GetCurrentSelection()) if choice.GetCurrentSelection() != -1 else None
         fit = sFit.getFit(activeFitID)
         newCharID = fit.character.ID if fit is not None else None
 
@@ -253,6 +296,9 @@ class CharacterSelection(wx.Panel):
             self.selectChar(sChar.all5ID())
 
         elif currCharID != newCharID:
+            if currCharID is not None and not self._updatingFromHistory:
+                if not self.charHistory or self.charHistory[-1] != currCharID:
+                    self.charHistory.append(currCharID)
             self.selectChar(newCharID)
             if not fit.calculated:
                 self.charChanged(None)
@@ -268,6 +314,15 @@ class CharacterSelection(wx.Panel):
 
         toClipboard(list)
 
+    def exportSkillsCondensed(self, evt):
+        skillsMap = self._buildSkillsTooltipSuperCondensed(self.reqs, skillsMap={})
+
+        list = ""
+        for key in sorted(skillsMap):
+            list += "%s %d\n" % (key, skillsMap[key][0])
+
+        toClipboard(list)
+
     def exportSkillsEveMon(self, evt):
         skillsMap = self._buildSkillsTooltipCondensed(self.reqs, skillsMap={})
 
@@ -277,6 +332,83 @@ class CharacterSelection(wx.Panel):
 
         toClipboard(list)
 
+    def importSkillsFromClipboard(self, evt):
+        charID = self.getActiveCharacter()
+        if charID is None:
+            return
+
+        sChar = Character.getInstance()
+        char = sChar.getCharacter(charID)
+
+        text = fromClipboard()
+        if not text:
+            with wx.MessageDialog(self, _t("Clipboard is empty"), _t("Error"), wx.OK | wx.ICON_ERROR) as dlg:
+                dlg.ShowModal()
+            return
+
+        try:
+            lines = text.strip().splitlines()
+            imported = 0
+            errors = []
+
+            for line in lines:
+                line = line.strip()
+                if not line:
+                    continue
+
+                try:
+                    parts = line.rsplit(None, 1)
+                    if len(parts) != 2:
+                        errors.append(_t("Invalid format: {}").format(line))
+                        continue
+
+                    skillName = parts[0]
+                    levelStr = parts[1]
+
+                    try:
+                        level = int(levelStr)
+                    except ValueError:
+                        try:
+                            level = roman.fromRoman(levelStr.upper())
+                        except (roman.InvalidRomanNumeralError, ValueError):
+                            errors.append(_t("Invalid level format: {}").format(line))
+                            continue
+
+                    if level < 0 or level > 5:
+                        errors.append(_t("Level must be between 0 and 5: {}").format(line))
+                        continue
+
+                    skill = char.getSkill(skillName)
+                    sChar.changeLevel(charID, skill.item.ID, level)
+                    imported += 1
+
+                except KeyError as e:
+                    errors.append(_t("Skill not found: {}").format(skillName))
+                    pyfalog.error("Skill not found: '{}'", skillName)
+                except Exception as e:
+                    errors.append(_t("Error processing line '{}': {}").format(line, str(e)))
+                    pyfalog.error("Error importing skill from line '{}': {}", line, e)
+
+            if imported > 0:
+                self.refreshCharacterList()
+                wx.PostEvent(self.mainFrame, GE.CharListUpdated())
+                fitID = self.mainFrame.getActiveFit()
+                if fitID is not None:
+                    wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
+
+            if errors:
+                errorMsg = _t("Imported {} skill(s). Errors:\n{}").format(imported, "\n".join(errors))
+                with wx.MessageDialog(self, errorMsg, _t("Import Skills"), wx.OK | wx.ICON_WARNING) as dlg:
+                    dlg.ShowModal()
+            elif imported > 0:
+                with wx.MessageDialog(self, _t("Successfully imported {} skill(s)").format(imported), _t("Import Skills"), wx.OK) as dlg:
+                    dlg.ShowModal()
+
+        except Exception as e:
+            pyfalog.error("Error importing skills from clipboard: {}", e)
+            with wx.MessageDialog(self, _t("Error importing skills. Please check the log file."), _t("Error"), wx.OK | wx.ICON_ERROR) as dlg:
+                dlg.ShowModal()
+
     def _buildSkillsTooltip(self, reqs, currItem="", tabulationLevel=0):
         tip = ""
         sCharacter = Character.getInstance()

gui/fitCommands/__init__.py

@@ -59,6 +59,12 @@ from .gui.localModule.mutatedRevert import GuiRevertMutatedLocalModuleCommand
 from .gui.localModule.remove import GuiRemoveLocalModuleCommand
 from .gui.localModule.replace import GuiReplaceLocalModuleCommand
 from .gui.localModule.swap import GuiSwapLocalModulesCommand
+from .gui.localModuleCargo.batchCargoToLocalModule import (
+    GuiBatchCargoToLocalModuleCommand,
+)
+from .gui.localModuleCargo.batchLocalModuleToCargo import (
+    GuiBatchLocalModuleToCargoCommand,
+)
 from .gui.localModuleCargo.cargoToLocalModule import GuiCargoToLocalModuleCommand
 from .gui.localModuleCargo.localModuleToCargo import GuiLocalModuleToCargoCommand
 from .gui.projectedChangeProjectionRange import GuiChangeProjectedItemsProjectionRangeCommand

gui/fitCommands/gui/localModuleCargo/batchCargoToLocalModule.py

@@ -0,0 +1,325 @@
+import wx
+
+import eos.db
+import gui.mainFrame
+from gui import globalEvents as GE
+from gui.fitCommands.calc.cargo.add import CalcAddCargoCommand
+from gui.fitCommands.calc.cargo.remove import CalcRemoveCargoCommand
+from gui.fitCommands.calc.module.changeCharges import CalcChangeModuleChargesCommand
+from gui.fitCommands.calc.module.localReplace import CalcReplaceLocalModuleCommand
+from gui.fitCommands.helpers import (
+    CargoInfo,
+    InternalCommandHistory,
+    ModuleInfo,
+    restoreRemovedDummies,
+)
+from service.fit import Fit
+
+
+class GuiBatchCargoToLocalModuleCommand(wx.Command):
+    def __init__(self, fitID, cargoItemID, targetPosition, copy):
+        wx.Command.__init__(self, True, "Batch Cargo to Local Modules")
+        self.internalHistory = InternalCommandHistory()
+        self.fitID = fitID
+        self.srcCargoItemID = cargoItemID
+        self.targetPosition = targetPosition
+        self.copy = copy
+        self.replacedModItemIDs = []
+        self.savedRemovedDummies = None
+
+    def Do(self):
+        sFit = Fit.getInstance()
+        fit = sFit.getFit(self.fitID)
+        if fit is None:
+            return False
+
+        srcCargo = next((c for c in fit.cargo if c.itemID == self.srcCargoItemID), None)
+        if srcCargo is None:
+            return False
+
+        if srcCargo.item.isCharge:
+            return self._handleCharges(fit, srcCargo)
+
+        if not srcCargo.item.isModule:
+            return False
+
+        if self.targetPosition >= len(fit.modules):
+            return False
+
+        targetMod = fit.modules[self.targetPosition]
+
+        if targetMod.isEmpty:
+            return self._fillEmptySlots(fit, srcCargo, targetMod.slot)
+        else:
+            return self._replaceSimilarModules(fit, srcCargo, targetMod)
+
+    def _getSimilarModulePositions(self, fit, targetMod):
+        targetItemID = targetMod.itemID
+        matchingPositions = []
+        for position, mod in enumerate(fit.modules):
+            if mod.isEmpty:
+                continue
+            if mod.itemID == targetItemID:
+                matchingPositions.append(position)
+        return matchingPositions
+
+    def _replaceSimilarModules(self, fit, srcCargo, targetMod):
+        availableAmount = srcCargo.amount if not self.copy else float("inf")
+
+        matchingPositions = self._getSimilarModulePositions(fit, targetMod)
+
+        if not matchingPositions:
+            return False
+
+        positionsToReplace = matchingPositions[: int(availableAmount)]
+
+        if not positionsToReplace:
+            return False
+
+        self.replacedModItemIDs = []
+        commands = []
+        cargoToRemove = 0
+
+        for position in positionsToReplace:
+            mod = fit.modules[position]
+            if mod.isEmpty:
+                continue
+            dstModItemID = mod.itemID
+
+            newModInfo = ModuleInfo.fromModule(mod, unmutate=True)
+            newModInfo.itemID = self.srcCargoItemID
+            newCargoModItemID = ModuleInfo.fromModule(mod, unmutate=True).itemID
+
+            commands.append(
+                CalcAddCargoCommand(
+                    fitID=self.fitID,
+                    cargoInfo=CargoInfo(itemID=newCargoModItemID, amount=1),
+                )
+            )
+            cmdReplace = CalcReplaceLocalModuleCommand(
+                fitID=self.fitID,
+                position=position,
+                newModInfo=newModInfo,
+                unloadInvalidCharges=True,
+            )
+            commands.append(cmdReplace)
+            self.replacedModItemIDs.append(dstModItemID)
+            cargoToRemove += 1
+
+        if not self.copy and cargoToRemove > 0:
+            commands.insert(
+                0,
+                CalcRemoveCargoCommand(
+                    fitID=self.fitID,
+                    cargoInfo=CargoInfo(
+                        itemID=self.srcCargoItemID, amount=cargoToRemove
+                    ),
+                ),
+            )
+
+        success = self.internalHistory.submitBatch(*commands)
+
+        if not success:
+            self.internalHistory.undoAll()
+            return False
+
+        eos.db.flush()
+        sFit = Fit.getInstance()
+        sFit.recalc(self.fitID)
+        self.savedRemovedDummies = sFit.fill(self.fitID)
+        eos.db.commit()
+
+        events = []
+        for removedModItemID in self.replacedModItemIDs:
+            events.append(
+                GE.FitChanged(
+                    fitIDs=(self.fitID,), action="moddel", typeID=removedModItemID
+                )
+            )
+        if self.srcCargoItemID is not None:
+            events.append(
+                GE.FitChanged(
+                    fitIDs=(self.fitID,), action="modadd", typeID=self.srcCargoItemID
+                )
+            )
+        if not events:
+            events.append(GE.FitChanged(fitIDs=(self.fitID,)))
+        for event in events:
+            wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
+
+        return True
+
+    def _fillEmptySlots(self, fit, srcCargo, targetSlot):
+        availableAmount = srcCargo.amount if not self.copy else float("inf")
+
+        emptyPositions = []
+        for position, mod in enumerate(fit.modules):
+            if mod.isEmpty and mod.slot == targetSlot:
+                emptyPositions.append(position)
+
+        if not emptyPositions:
+            return False
+
+        positionsToFill = emptyPositions[: int(availableAmount)]
+
+        if not positionsToFill:
+            return False
+
+        commands = []
+        cargoToRemove = 0
+
+        for position in positionsToFill:
+            newModInfo = ModuleInfo(itemID=self.srcCargoItemID)
+            cmdReplace = CalcReplaceLocalModuleCommand(
+                fitID=self.fitID,
+                position=position,
+                newModInfo=newModInfo,
+                unloadInvalidCharges=True,
+            )
+            commands.append(cmdReplace)
+            cargoToRemove += 1
+
+        if not self.copy and cargoToRemove > 0:
+            commands.insert(
+                0,
+                CalcRemoveCargoCommand(
+                    fitID=self.fitID,
+                    cargoInfo=CargoInfo(
+                        itemID=self.srcCargoItemID, amount=cargoToRemove
+                    ),
+                ),
+            )
+
+        success = self.internalHistory.submitBatch(*commands)
+
+        if not success:
+            self.internalHistory.undoAll()
+            return False
+
+        eos.db.flush()
+        sFit = Fit.getInstance()
+        sFit.recalc(self.fitID)
+        self.savedRemovedDummies = sFit.fill(self.fitID)
+        eos.db.commit()
+
+        events = []
+        if self.srcCargoItemID is not None:
+            events.append(
+                GE.FitChanged(
+                    fitIDs=(self.fitID,), action="modadd", typeID=self.srcCargoItemID
+                )
+            )
+        if not events:
+            events.append(GE.FitChanged(fitIDs=(self.fitID,)))
+        for event in events:
+            wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
+
+        return True
+
+    def _handleCharges(self, fit, srcCargo):
+        availableAmount = srcCargo.amount if not self.copy else float("inf")
+
+        targetMod = fit.modules[self.targetPosition]
+        if targetMod.isEmpty:
+            return False
+
+        targetItemID = targetMod.itemID
+        matchingPositions = []
+        for position, mod in enumerate(fit.modules):
+            if mod.isEmpty:
+                continue
+            if mod.itemID == targetItemID:
+                matchingPositions.append(position)
+
+        if not matchingPositions:
+            return False
+
+        positionsToReplace = matchingPositions[: int(availableAmount)]
+        if not positionsToReplace:
+            return False
+
+        commands = []
+        chargeMap = {}
+        totalChargesNeeded = 0
+
+        for position in positionsToReplace:
+            mod = fit.modules[position]
+            if mod.isEmpty:
+                continue
+
+            oldChargeID = mod.chargeID
+            oldChargeAmount = mod.numCharges
+            newChargeAmount = mod.getNumCharges(srcCargo.item)
+
+            if oldChargeID is not None and oldChargeID != srcCargo.itemID:
+                commands.append(
+                    CalcAddCargoCommand(
+                        fitID=self.fitID,
+                        cargoInfo=CargoInfo(itemID=oldChargeID, amount=oldChargeAmount),
+                    )
+                )
+
+            chargeMap[position] = srcCargo.itemID
+            totalChargesNeeded += newChargeAmount
+
+        if not self.copy and totalChargesNeeded > 0:
+            commands.append(
+                CalcRemoveCargoCommand(
+                    fitID=self.fitID,
+                    cargoInfo=CargoInfo(
+                        itemID=srcCargo.itemID, amount=totalChargesNeeded
+                    ),
+                )
+            )
+
+        commands.append(
+            CalcChangeModuleChargesCommand(
+                fitID=self.fitID, projected=False, chargeMap=chargeMap
+            )
+        )
+
+        success = self.internalHistory.submitBatch(*commands)
+
+        if not success:
+            self.internalHistory.undoAll()
+            return False
+
+        eos.db.flush()
+        sFit = Fit.getInstance()
+        sFit.recalc(self.fitID)
+        self.savedRemovedDummies = sFit.fill(self.fitID)
+        eos.db.commit()
+
+        events = [GE.FitChanged(fitIDs=(self.fitID,))]
+        for event in events:
+            wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
+
+        return True
+
+    def Undo(self):
+        sFit = Fit.getInstance()
+        fit = sFit.getFit(self.fitID)
+        restoreRemovedDummies(fit, self.savedRemovedDummies)
+        success = self.internalHistory.undoAll()
+        eos.db.flush()
+        sFit.recalc(self.fitID)
+        sFit.fill(self.fitID)
+        eos.db.commit()
+        events = []
+        if self.srcCargoItemID is not None:
+            events.append(
+                GE.FitChanged(
+                    fitIDs=(self.fitID,), action="moddel", typeID=self.srcCargoItemID
+                )
+            )
+        for removedModItemID in self.replacedModItemIDs:
+            events.append(
+                GE.FitChanged(
+                    fitIDs=(self.fitID,), action="modadd", typeID=removedModItemID
+                )
+            )
+        if not events:
+            events.append(GE.FitChanged(fitIDs=(self.fitID,)))
+        for event in events:
+            wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
+        return success

gui/fitCommands/gui/localModuleCargo/batchLocalModuleToCargo.py

@@ -0,0 +1,167 @@
+import wx
+
+import eos.db
+import gui.mainFrame
+from gui import globalEvents as GE
+from gui.fitCommands.calc.cargo.add import CalcAddCargoCommand
+from gui.fitCommands.calc.module.localRemove import CalcRemoveLocalModulesCommand
+from gui.fitCommands.helpers import (
+    CargoInfo,
+    InternalCommandHistory,
+    ModuleInfo,
+    restoreRemovedDummies,
+)
+from service.fit import Fit
+
+
+class GuiBatchLocalModuleToCargoCommand(wx.Command):
+    def __init__(self, fitID, modPosition, copy):
+        wx.Command.__init__(self, True, "Batch Local Module to Cargo")
+        self.internalHistory = InternalCommandHistory()
+        self.fitID = fitID
+        self.srcModPosition = modPosition
+        self.copy = copy
+        self.removedModItemIDs = []
+        self.savedRemovedDummies = None
+
+    def Do(self):
+        fit = Fit.getInstance().getFit(self.fitID)
+        srcMod = fit.modules[self.srcModPosition]
+        if srcMod.isEmpty:
+            return False
+
+        if srcMod.chargeID is not None:
+            return self._unloadCharges(fit, srcMod)
+        else:
+            return self._moveModulesToCargo(fit, srcMod)
+
+    def _getSimilarModulePositions(self, fit, targetMod):
+        targetItemID = targetMod.itemID
+        matchingPositions = []
+        for position, mod in enumerate(fit.modules):
+            if mod.isEmpty:
+                continue
+            if mod.itemID == targetItemID:
+                matchingPositions.append(position)
+        return matchingPositions
+
+    def _unloadCharges(self, fit, srcMod):
+        matchingPositions = self._getSimilarModulePositions(fit, srcMod)
+        if not matchingPositions:
+            return False
+
+        commands = []
+        for position in matchingPositions:
+            mod = fit.modules[position]
+            if mod.isEmpty:
+                continue
+            if mod.chargeID is not None:
+                commands.append(
+                    CalcAddCargoCommand(
+                        fitID=self.fitID,
+                        cargoInfo=CargoInfo(itemID=mod.chargeID, amount=mod.numCharges),
+                    )
+                )
+
+        if not self.copy:
+            from gui.fitCommands.calc.module.changeCharges import (
+                CalcChangeModuleChargesCommand,
+            )
+
+            chargeMap = {pos: None for pos in matchingPositions}
+            commands.append(
+                CalcChangeModuleChargesCommand(
+                    fitID=self.fitID, projected=False, chargeMap=chargeMap
+                )
+            )
+
+        success = self.internalHistory.submitBatch(*commands)
+        if not success:
+            self.internalHistory.undoAll()
+            return False
+
+        eos.db.flush()
+        sFit = Fit.getInstance()
+        sFit.recalc(self.fitID)
+        self.savedRemovedDummies = sFit.fill(self.fitID)
+        eos.db.commit()
+
+        events = [GE.FitChanged(fitIDs=(self.fitID,))]
+        for event in events:
+            wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
+        return success
+
+    def _moveModulesToCargo(self, fit, srcMod):
+        matchingPositions = self._getSimilarModulePositions(fit, srcMod)
+        if not matchingPositions:
+            return False
+
+        commands = []
+        for position in matchingPositions:
+            mod = fit.modules[position]
+            if mod.isEmpty:
+                continue
+
+            commands.append(
+                CalcAddCargoCommand(
+                    fitID=self.fitID,
+                    cargoInfo=CargoInfo(
+                        itemID=ModuleInfo.fromModule(mod, unmutate=True).itemID,
+                        amount=1,
+                    ),
+                )
+            )
+            self.removedModItemIDs.append(mod.itemID)
+
+        if not self.copy:
+            commands.append(
+                CalcRemoveLocalModulesCommand(
+                    fitID=self.fitID, positions=matchingPositions
+                )
+            )
+
+        success = self.internalHistory.submitBatch(*commands)
+        if not success:
+            self.internalHistory.undoAll()
+            return False
+
+        eos.db.flush()
+        sFit = Fit.getInstance()
+        sFit.recalc(self.fitID)
+        self.savedRemovedDummies = sFit.fill(self.fitID)
+        eos.db.commit()
+
+        events = []
+        for removedModItemID in self.removedModItemIDs:
+            events.append(
+                GE.FitChanged(
+                    fitIDs=(self.fitID,), action="moddel", typeID=removedModItemID
+                )
+            )
+        if not events:
+            events.append(GE.FitChanged(fitIDs=(self.fitID,)))
+        for event in events:
+            wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
+        return success
+
+    def Undo(self):
+        sFit = Fit.getInstance()
+        fit = sFit.getFit(self.fitID)
+        restoreRemovedDummies(fit, self.savedRemovedDummies)
+        success = self.internalHistory.undoAll()
+        eos.db.flush()
+        sFit.recalc(self.fitID)
+        sFit.fill(self.fitID)
+        eos.db.commit()
+        events = []
+        for removedModItemID in self.removedModItemIDs:
+            events.append(
+                GE.FitChanged(
+                    fitIDs=(self.fitID,), action="modadd", typeID=removedModItemID
+                )
+            )
+        if not events:
+            events.append(GE.FitChanged(fitIDs=(self.fitID,)))
+        for event in events:
+            wx.PostEvent(gui.mainFrame.MainFrame.getInstance(), event)
+        return success

gui/fitDiffFrame.py

@@ -0,0 +1,326 @@
+# =============================================================================
+# Copyright (C) 2025
+#
+# This file is part of pyfa.
+#
+# pyfa is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# pyfa is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
+# =============================================================================
+
+
+# noinspection PyPackageRequirements
+import wx
+from collections import Counter
+
+from eos.const import FittingSlot
+from service.fit import Fit as svcFit
+from service.port.eft import exportEft, importEft, _importPrepare
+from service.const import PortEftOptions
+
+_t = wx.GetTranslation
+
+
+class FitDiffFrame(wx.Frame):
+    """A frame to display differences between two fits."""
+
+    def __init__(self, parent, fitID):
+        super().__init__(
+            parent,
+            title=_t("Fit Diff"),
+            style=wx.DEFAULT_FRAME_STYLE | wx.RESIZE_BORDER,
+            size=(1000, 600)
+        )
+        self.parent = parent
+        self.fitID = fitID
+        self.sFit = svcFit.getInstance()
+
+        # EFT export options (same as CTRL-C)
+        self.eftOptions = {
+            PortEftOptions.LOADED_CHARGES: True,
+            PortEftOptions.MUTATIONS: True,
+            PortEftOptions.IMPLANTS: True,
+            PortEftOptions.BOOSTERS: True,
+            PortEftOptions.CARGO: True,
+        }
+
+        self.initUI()
+        self.Centre()
+        self.Show()
+
+    def initUI(self):
+        panel = wx.Panel(self)
+        mainSizer = wx.BoxSizer(wx.VERTICAL)
+
+        # Instructions and flip button at the top
+        topSizer = wx.BoxSizer(wx.HORIZONTAL)
+        instructions = wx.StaticText(
+            panel,
+            label=_t("Paste fits in EFT format to compare")
+        )
+        topSizer.Add(instructions, 1, wx.ALL | wx.EXPAND, 5)
+        
+        flipButton = wx.Button(panel, label=_t("Flip"))
+        flipButton.Bind(wx.EVT_BUTTON, self.onFlip)
+        topSizer.Add(flipButton, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
+        
+        mainSizer.Add(topSizer, 0, wx.EXPAND)
+
+        # Three panes: Fit 1 | Diff | Fit 2
+        panesSizer = wx.BoxSizer(wx.HORIZONTAL)
+
+        # Pane 1: Fit 1 (editable)
+        fit1Box = wx.StaticBox(panel, label=_t("Fit 1"))
+        fit1Sizer = wx.StaticBoxSizer(fit1Box, wx.VERTICAL)
+        self.fit1Text = wx.TextCtrl(
+            panel,
+            style=wx.TE_MULTILINE | wx.TE_DONTWRAP
+        )
+        fit1Sizer.Add(self.fit1Text, 1, wx.EXPAND)
+        panesSizer.Add(fit1Sizer, 1, wx.ALL | wx.EXPAND, 5)
+
+        # Bind text changed event to update diff
+        self.fit1Text.Bind(wx.EVT_TEXT, self.onFitChanged)
+
+        # Pane 2: Diff (simple text format)
+        diffBox = wx.StaticBox(panel, label=_t("Differences"))
+        diffSizer = wx.StaticBoxSizer(diffBox, wx.VERTICAL)
+        self.diffText = wx.TextCtrl(
+            panel,
+            style=wx.TE_MULTILINE | wx.TE_READONLY | wx.TE_DONTWRAP
+        )
+        diffSizer.Add(self.diffText, 1, wx.EXPAND)
+        panesSizer.Add(diffSizer, 1, wx.ALL | wx.EXPAND, 5)
+
+        # Pane 3: Fit 2 (user input)
+        fit2Box = wx.StaticBox(panel, label=_t("Fit 2"))
+        fit2Sizer = wx.StaticBoxSizer(fit2Box, wx.VERTICAL)
+        self.fit2Text = wx.TextCtrl(
+            panel,
+            style=wx.TE_MULTILINE | wx.TE_DONTWRAP
+        )
+        fit2Sizer.Add(self.fit2Text, 1, wx.EXPAND)
+
+        # Bind text changed event to update diff
+        self.fit2Text.Bind(wx.EVT_TEXT, self.onFitChanged)
+
+        panesSizer.Add(fit2Sizer, 1, wx.ALL | wx.EXPAND, 5)
+
+        mainSizer.Add(panesSizer, 1, wx.EXPAND | wx.ALL, 5)
+
+        panel.SetSizer(mainSizer)
+
+        # Load current fit into pane 1
+        self.loadFit1()
+
+    def loadFit1(self):
+        """Load the current fit into pane 1 as EFT format."""
+        fit = self.sFit.getFit(self.fitID)
+        if fit:
+            eftText = exportEft(fit, self.eftOptions, callback=None)
+            self.fit1Text.SetValue(eftText)
+
+    def onFitChanged(self, event):
+        """Handle text change in either fit pane - update diff."""
+        self.updateDiff()
+        event.Skip()
+
+    def onFlip(self, event):
+        """Swap Fit 1 and Fit 2."""
+        fit1Value = self.fit1Text.GetValue()
+        fit2Value = self.fit2Text.GetValue()
+        self.fit1Text.SetValue(fit2Value)
+        self.fit2Text.SetValue(fit1Value)
+        self.updateDiff()
+        event.Skip()
+
+    def updateDiff(self):
+        """Calculate and display the differences between the two fits."""
+        self.diffText.Clear()
+
+        fit1Text = self.fit1Text.GetValue().strip()
+        fit2Text = self.fit2Text.GetValue().strip()
+
+        if not fit1Text or not fit2Text:
+            return
+
+        # Parse both fits
+        fit1 = self.parsePastedFit(fit1Text)
+        fit2 = self.parsePastedFit(fit2Text)
+
+        if fit1 is None:
+            self.diffText.SetValue(_t("Error: Fit 1 has invalid EFT format"))
+            return
+        if fit2 is None:
+            self.diffText.SetValue(_t("Error: Fit 2 has invalid EFT format"))
+            return
+
+        # Calculate differences and format as simple text list
+        diffLines = self.calculateDiff(fit1, fit2)
+        self.diffText.SetValue('\n'.join(diffLines))
+
+    def parsePastedFit(self, text):
+        """Parse pasted EFT text into a fit object."""
+        try:
+            lines = _importPrepare(text.splitlines())
+            if not lines:
+                return None
+            return importEft(lines)
+        except Exception:
+            return None
+
+    def calculateDiff(self, fit1, fit2):
+        """Calculate items needed to transform fit1 into fit2.
+
+        Returns a list of strings in the format: "<item> <quantity>"
+        Only shows items that need to be added (no negative values).
+        """
+        diffLines = []
+
+        # Get module counts by type for each fit (grouped by slot type)
+        fit1_modules = self.getModuleCounts(fit1)
+        fit2_modules = self.getModuleCounts(fit2)
+
+        # Slot order
+        slotOrder = [
+            FittingSlot.HIGH,
+            FittingSlot.MED,
+            FittingSlot.LOW,
+            FittingSlot.RIG,
+            FittingSlot.SUBSYSTEM,
+            FittingSlot.SERVICE,
+        ]
+
+        # Diff modules by slot - only show items needed to add
+        for slot in slotOrder:
+            fit1_slot_modules = fit1_modules.get(slot, Counter())
+            fit2_slot_modules = fit2_modules.get(slot, Counter())
+            
+            all_module_types = set(fit1_slot_modules.keys()) | set(fit2_slot_modules.keys())
+            slot_diff_lines = []
+            for module_type in sorted(all_module_types):
+                count1 = fit1_slot_modules.get(module_type, 0)
+                count2 = fit2_slot_modules.get(module_type, 0)
+                if count2 > count1:
+                    slot_diff_lines.append(f"{module_type} x{count2 - count1}")
+            
+            if slot_diff_lines:
+                if diffLines:
+                    diffLines.append("")
+                diffLines.extend(slot_diff_lines)
+
+        # Get drone counts
+        fit1_drones = self.getDroneCounts(fit1)
+        fit2_drones = self.getDroneCounts(fit2)
+
+        all_drone_types = set(fit1_drones.keys()) | set(fit2_drones.keys())
+        for drone_type in sorted(all_drone_types):
+            count1 = fit1_drones.get(drone_type, 0)
+            count2 = fit2_drones.get(drone_type, 0)
+            if count2 > count1:
+                diffLines.append(f"{drone_type} x{count2 - count1}")
+
+        # Get fighter counts
+        fit1_fighters = self.getFighterCounts(fit1)
+        fit2_fighters = self.getFighterCounts(fit2)
+
+        all_fighter_types = set(fit1_fighters.keys()) | set(fit2_fighters.keys())
+        for fighter_type in sorted(all_fighter_types):
+            count1 = fit1_fighters.get(fighter_type, 0)
+            count2 = fit2_fighters.get(fighter_type, 0)
+            if count2 > count1:
+                diffLines.append(f"{fighter_type} x{count2 - count1}")
+
+        # Get cargo counts
+        fit1_cargo = self.getCargoCounts(fit1)
+        fit2_cargo = self.getCargoCounts(fit2)
+
+        all_cargo_types = set(fit1_cargo.keys()) | set(fit2_cargo.keys())
+        for cargo_type in sorted(all_cargo_types):
+            count1 = fit1_cargo.get(cargo_type, 0)
+            count2 = fit2_cargo.get(cargo_type, 0)
+            if count2 > count1:
+                diffLines.append(f"{cargo_type} x{count2 - count1}")
+
+        # Get implants
+        fit1_implants = self.getImplantNames(fit1)
+        fit2_implants = self.getImplantNames(fit2)
+
+        for implant in sorted(fit2_implants - fit1_implants):
+            diffLines.append(f"{implant} x1")
+
+        # Get boosters
+        fit1_boosters = self.getBoosterNames(fit1)
+        fit2_boosters = self.getBoosterNames(fit2)
+
+        for booster in sorted(fit2_boosters - fit1_boosters):
+            diffLines.append(f"{booster} x1")
+
+        return diffLines
+
+    def getModuleCounts(self, fit):
+        """Get a counter of module types for a fit, grouped by slot type.
+
+        Returns a dict mapping FittingSlot -> Counter of module names.
+        Position doesn't matter, just counts by module name.
+        """
+        counts_by_slot = {}
+        for module in fit.modules:
+            if module.isEmpty:
+                continue
+            slot = module.slot
+            if slot not in counts_by_slot:
+                counts_by_slot[slot] = Counter()
+            # Use item type name for comparison
+            name = module.item.typeName if module.item else ""
+            counts_by_slot[slot][name] += 1
+        return counts_by_slot
+
+    def getDroneCounts(self, fit):
+        """Get a counter of drone types for a fit."""
+        counts = Counter()
+        for drone in fit.drones:
+            if drone.item:
+                counts[drone.item.typeName] += drone.amount
+        return counts
+
+    def getFighterCounts(self, fit):
+        """Get a counter of fighter types for a fit."""
+        counts = Counter()
+        for fighter in fit.fighters:
+            if fighter.item:
+                counts[fighter.item.typeName] += fighter.amount
+        return counts
+
+    def getCargoCounts(self, fit):
+        """Get a counter of cargo items for a fit."""
+        counts = Counter()
+        for cargo in fit.cargo:
+            if cargo.item:
+                counts[cargo.item.typeName] += cargo.amount
+        return counts
+
+    def getImplantNames(self, fit):
+        """Get a set of implant names for a fit."""
+        names = set()
+        for implant in fit.implants:
+            if implant.item:
+                names.add(implant.item.typeName)
+        return names
+
+    def getBoosterNames(self, fit):
+        """Get a set of booster names for a fit."""
+        names = set()
+        for booster in fit.boosters:
+            if booster.item:
+                names.add(booster.item.typeName)
+        return names

gui/itemStats.py

@@ -24,6 +24,7 @@ import config
 import gui.mainFrame
 from eos.saveddata.drone import Drone
 from eos.saveddata.module import Module
+from eos.saveddata.ship import Ship
 from gui.auxWindow import AuxiliaryFrame
 from gui.bitmap_loader import BitmapLoader
 from gui.builtinItemStatsViews.itemAffectedBy import ItemAffectedBy
@@ -35,6 +36,7 @@ from gui.builtinItemStatsViews.itemEffects import ItemEffects
 from gui.builtinItemStatsViews.itemMutator import ItemMutatorPanel
 from gui.builtinItemStatsViews.itemProperties import ItemProperties
 from gui.builtinItemStatsViews.itemRequirements import ItemRequirements
+from gui.builtinItemStatsViews.itemSkills import ItemSkills
 from gui.builtinItemStatsViews.itemTraits import ItemTraits
 from service.market import Market
 
@@ -156,6 +158,8 @@ class ItemStatsContainer(wx.Panel):
     def __init__(self, parent, stuff, item, context=None):
         wx.Panel.__init__(self, parent)
         sMkt = Market.getInstance()
+        self.stuff = stuff
+        self.context = context
 
         mainSizer = wx.BoxSizer(wx.VERTICAL)
 
@@ -196,6 +200,10 @@ class ItemStatsContainer(wx.Panel):
             self.affectedby = ItemAffectedBy(self.nbContainer, stuff, item)
             self.nbContainer.AddPage(self.affectedby, _t("Affected by"))
 
+        if stuff is not None and isinstance(stuff, Ship):
+            self.skills = ItemSkills(self.nbContainer, stuff, item)
+            self.nbContainer.AddPage(self.skills, _t("Skills"))
+
         if config.debug:
             self.properties = ItemProperties(self.nbContainer, stuff, item, context)
             self.nbContainer.AddPage(self.properties, _t("Properties"))

gui/mainFrame.py

@@ -18,6 +18,7 @@
 # =============================================================================
 
 import datetime
+import itertools
 import os.path
 import threading
 import time
@@ -60,8 +61,12 @@ from gui.shipBrowser import ShipBrowser
 from gui.statsPane import StatsPane
 from gui.targetProfileEditor import TargetProfileEditor
 from gui.updateDialog import UpdateDialog
-from gui.utils.clipboard import fromClipboard
+from gui.utils.clipboard import fromClipboard, toClipboard
 from gui.utils.progressHelper import ProgressHelper
+from eos.const import FittingSlot as es_Slot
+from eos.saveddata.character import Skill
+from eos.saveddata.fighter import Fighter as es_Fighter
+from eos.saveddata.module import Module as es_Module
 from service.character import Character
 from service.esi import Esi
 from service.fit import Fit
@@ -522,6 +527,8 @@ class MainFrame(wx.Frame):
         self.Bind(wx.EVT_MENU, self.backupToXml, id=menuBar.backupFitsId)
         # Export skills needed
         self.Bind(wx.EVT_MENU, self.exportSkillsNeeded, id=menuBar.exportSkillsNeededId)
+        # Copy skills needed
+        self.Bind(wx.EVT_MENU, self.copySkillsNeeded, id=menuBar.copySkillsNeededId)
         # Import character
         self.Bind(wx.EVT_MENU, self.importCharacter, id=menuBar.importCharacterId)
         # Export HTML
@@ -558,7 +565,8 @@ class MainFrame(wx.Frame):
         self.Bind(wx.EVT_MENU, self.toggleOverrides, id=menuBar.toggleOverridesId)
 
         # Clipboard exports
-        self.Bind(wx.EVT_MENU, self.exportToClipboard, id=wx.ID_COPY)
+        self.Bind(wx.EVT_MENU, self.exportToClipboardDirectEft, id=menuBar.copyDirectEftId)
+        self.Bind(wx.EVT_MENU, self.exportToClipboard, id=menuBar.copyWithDialogId)
 
         # Fitting Restrictions
         self.Bind(wx.EVT_MENU, self.toggleIgnoreRestriction, id=menuBar.toggleIgnoreRestrictionID)
@@ -571,6 +579,7 @@ class MainFrame(wx.Frame):
         toggleShipMarketId = wx.NewId()
         ctabnext = wx.NewId()
         ctabprev = wx.NewId()
+        charPrevId = wx.NewId()
 
         # Close Page
         self.Bind(wx.EVT_MENU, self.CloseCurrentPage, id=self.closePageId)
@@ -580,6 +589,7 @@ class MainFrame(wx.Frame):
         self.Bind(wx.EVT_MENU, self.toggleShipMarket, id=toggleShipMarketId)
         self.Bind(wx.EVT_MENU, self.CTabNext, id=ctabnext)
         self.Bind(wx.EVT_MENU, self.CTabPrev, id=ctabprev)
+        self.Bind(wx.EVT_MENU, self.selectPreviousCharacter, id=charPrevId)
 
         actb = [(wx.ACCEL_CTRL, ord('T'), self.addPageId),
                 (wx.ACCEL_CMD, ord('T'), self.addPageId),
@@ -613,7 +623,19 @@ class MainFrame(wx.Frame):
                 (wx.ACCEL_CMD, wx.WXK_PAGEDOWN, ctabnext),
                 (wx.ACCEL_CMD, wx.WXK_PAGEUP, ctabprev),
 
-                (wx.ACCEL_CMD | wx.ACCEL_SHIFT, ord("Z"), wx.ID_REDO)
+                (wx.ACCEL_CMD | wx.ACCEL_SHIFT, ord("Z"), wx.ID_REDO),
+
+                # Ctrl+Shift+C for copy with dialog (must come before Ctrl+C)
+                # Note: use lowercase 'c' because SHIFT is already in flags
+                (wx.ACCEL_CTRL | wx.ACCEL_SHIFT, ord('c'), menuBar.copyWithDialogId),
+                (wx.ACCEL_CMD | wx.ACCEL_SHIFT, ord('c'), menuBar.copyWithDialogId),
+
+                # Ctrl+C for direct EFT copy
+                (wx.ACCEL_CTRL, ord('c'), menuBar.copyDirectEftId),
+                (wx.ACCEL_CMD, ord('c'), menuBar.copyDirectEftId),
+
+                # Shift+Tab for previous character
+                (wx.ACCEL_SHIFT, wx.WXK_TAB, charPrevId)
                 ]
 
         # Ctrl/Cmd+# for addition pane selection
@@ -739,6 +761,9 @@ class MainFrame(wx.Frame):
 
     def CTabPrev(self, event):
         self.fitMultiSwitch.PrevPage()
+    
+    def selectPreviousCharacter(self, event):
+        self.charSelection.selectPreviousChar()
 
     def HAddPage(self, event):
         self.fitMultiSwitch.AddPage()
@@ -798,6 +823,32 @@ class MainFrame(wx.Frame):
         else:
             self._openAfterImport(importData)
 
+    def exportToClipboardDirectEft(self, event):
+        """ Copy fit to clipboard in EFT format without showing dialog """
+        from eos.db import getFit
+        from service.const import PortEftOptions
+        from service.settings import SettingsProvider
+
+        fit = getFit(self.getActiveFit())
+        if fit is None:
+            return
+
+        # Get the default EFT export options from settings
+        defaultOptions = {
+            PortEftOptions.LOADED_CHARGES: True,
+            PortEftOptions.MUTATIONS: True,
+            PortEftOptions.IMPLANTS: True,
+            PortEftOptions.BOOSTERS: True,
+            PortEftOptions.CARGO: True,
+        }
+        settings = SettingsProvider.getInstance().getSettings("pyfaExport", {"format": CopySelectDialog.copyFormatEft, "options": {CopySelectDialog.copyFormatEft: defaultOptions}})
+        options = settings["options"].get(CopySelectDialog.copyFormatEft, defaultOptions)
+
+        def copyToClipboard(text):
+            toClipboard(text)
+
+        Port.exportEft(fit, options, callback=copyToClipboard)
+
     def exportToClipboard(self, event):
         with CopySelectDialog(self) as dlg:
             dlg.ShowModal()
@@ -832,6 +883,61 @@ class MainFrame(wx.Frame):
                 self.waitDialog = wx.BusyInfo(_t("Exporting skills needed..."), parent=self)
                 sCharacter.backupSkills(filePath, saveFmt, self.getActiveFit(), self.closeWaitDialog)
 
+    def copySkillsNeeded(self, event):
+        """ Copies skills used by the fit that the character has to clipboard """
+        activeFitID = self.getActiveFit()
+        if activeFitID is None:
+            return
+
+        sFit = Fit.getInstance()
+        fit = sFit.getFit(activeFitID)
+        if fit is None:
+            return
+
+        if not fit.calculated:
+            fit.calculate()
+
+        char = fit.character
+        skillsMap = {}
+        # for thing in itertools.chain(fit.modules, fit.drones, fit.fighters, [fit.ship], fit.appliedImplants, fit.boosters, fit.cargo):
+        for thing in itertools.chain(fit.modules, fit.drones, fit.fighters, fit.appliedImplants, fit.boosters, fit.cargo):
+            self._collectAffectingSkills(thing, char, skillsMap)
+
+        skillsList = ""
+        for skillName in sorted(skillsMap):
+            charLevel = skillsMap[skillName]
+            for level in range(1, charLevel + 1):
+                skillsList += "%s %d\n" % (skillName, level)
+
+        toClipboard(skillsList)
+
+    def _collectAffectingSkills(self, thing, char, skillsMap):
+        """ Collect skills that affect items in the fit that the character has """
+        for attr in ("item", "charge"):
+            if attr == "charge" and isinstance(thing, es_Fighter):
+                continue
+            subThing = getattr(thing, attr, None)
+            if subThing is None:
+                continue
+            if isinstance(thing, es_Fighter) and attr == "charge":
+                continue
+
+            if attr == "charge":
+                cont = getattr(thing, "chargeModifiedAttributes", None)
+            else:
+                cont = getattr(thing, "itemModifiedAttributes", None)
+
+            if cont is not None:
+                for attrName in cont.iterAfflictions():
+                    for fit, afflictors in cont.getAfflictions(attrName).items():
+                        for afflictor, operator, stackingGroup, preResAmount, postResAmount, used in afflictors:
+                            if isinstance(afflictor, Skill) and afflictor.character == char:
+                                skillName = afflictor.item.name
+                                if skillName not in skillsMap:
+                                    skillsMap[skillName] = afflictor.level
+                                elif skillsMap[skillName] < afflictor.level:
+                                    skillsMap[skillName] = afflictor.level
+
     def fileImportDialog(self, event):
         """Handles importing single/multiple EVE XML / EFT cfg fit files"""
         with wx.FileDialog(

gui/mainMenuBar.py

@@ -42,6 +42,7 @@ class MainMenuBar(wx.MenuBar):
         self.graphFrameId = wx.NewId()
         self.backupFitsId = wx.NewId()
         self.exportSkillsNeededId = wx.NewId()
+        self.copySkillsNeededId = wx.NewId()
         self.importCharacterId = wx.NewId()
         self.exportHtmlId = wx.NewId()
         self.wikiId = wx.NewId()
@@ -57,6 +58,8 @@ class MainMenuBar(wx.MenuBar):
         self.toggleIgnoreRestrictionID = wx.NewId()
         self.devToolsId = wx.NewId()
         self.optimizeFitPrice = wx.NewId()
+        self.copyWithDialogId = wx.NewId()
+        self.copyDirectEftId = wx.NewId()
 
         self.mainFrame = mainFrame
         wx.MenuBar.__init__(self)
@@ -84,7 +87,8 @@ class MainMenuBar(wx.MenuBar):
         fitMenu.Append(wx.ID_REDO, _t("&Redo") + "\tCTRL+Y", _t("Redo the most recent undone action"))
 
         fitMenu.AppendSeparator()
-        fitMenu.Append(wx.ID_COPY, _t("&To Clipboard") + "\tCTRL+C", _t("Export a fit to the clipboard"))
+        fitMenu.Append(self.copyDirectEftId, _t("&To Clipboard (EFT)") + "\tCTRL+C", _t("Export a fit to the clipboard in EFT format"))
+        fitMenu.Append(self.copyWithDialogId, _t("&To Clipboard (Select Format)") + "\tCTRL+SHIFT+C", _t("Export a fit to the clipboard with format selection"))
         fitMenu.Append(wx.ID_PASTE, _t("&From Clipboard") + "\tCTRL+V", _t("Import a fit from the clipboard"))
 
         fitMenu.AppendSeparator()
@@ -117,6 +121,7 @@ class MainMenuBar(wx.MenuBar):
         characterMenu.AppendSeparator()
         characterMenu.Append(self.importCharacterId, _t("&Import Character File"), _t("Import characters into pyfa from file"))
         characterMenu.Append(self.exportSkillsNeededId, _t("&Export Skills Needed"), _t("Export skills needed for this fitting"))
+        characterMenu.Append(self.copySkillsNeededId, _t("&Copy Skills Needed"), _t("Copy skills needed for this fitting to clipboard"))
 
         characterMenu.AppendSeparator()
         characterMenu.Append(self.ssoLoginId, _t("&Manage ESI Characters"))
@@ -176,8 +181,10 @@ class MainMenuBar(wx.MenuBar):
             return
         enable = activeFitID is not None
         self.Enable(wx.ID_SAVEAS, enable)
-        self.Enable(wx.ID_COPY, enable)
+        self.Enable(self.copyDirectEftId, enable)
+        self.Enable(self.copyWithDialogId, enable)
         self.Enable(self.exportSkillsNeededId, enable)
+        self.Enable(self.copySkillsNeededId, enable)
 
         self.refreshUndo()
 

gui/marketBrowser.py

@@ -54,6 +54,7 @@ class MarketBrowser(wx.Panel):
         self.settings = MarketPriceSettings.getInstance()
         self.__mode = 'normal'
         self.__normalBtnMap = {}
+        self.__normalSlotBtnMap = {}
         self.marketView = MarketTree(self.splitter, self)
         self.itemView = ItemView(self.splitter, self)
 
@@ -64,22 +65,61 @@ class MarketBrowser(wx.Panel):
         # Same fix as for search box on macs,
         # need some pixels of extra space or everything clips and is ugly
         p = wx.Panel(self)
-        box = wx.BoxSizer(wx.HORIZONTAL)
-        p.SetSizer(box)
+        vbox_panel = wx.BoxSizer(wx.VERTICAL)
+        p.SetSizer(vbox_panel)
         vbox.Add(p, 0, wx.EXPAND)
+        
+        # First row: meta buttons
+        metaBox = wx.BoxSizer(wx.HORIZONTAL)
+        vbox_panel.Add(metaBox, 0, wx.EXPAND)
         self.metaButtons = []
         btn = None
         for name in list(self.sMkt.META_MAP.keys()):
             btn = MetaButton(p, wx.ID_ANY, name.capitalize(), style=wx.BU_EXACTFIT)
             setattr(self, name, btn)
-            box.Add(btn, 1, wx.ALIGN_CENTER)
+            metaBox.Add(btn, 1, wx.ALIGN_CENTER)
             btn.Bind(wx.EVT_TOGGLEBUTTON, self.toggleMetaButton)
             btn.metaName = name
             self.metaButtons.append(btn)
+        
+        # Second row: slot/fits filter buttons (BELOW meta buttons)
+        slotBox = wx.BoxSizer(wx.HORIZONTAL)
+        vbox_panel.Add(slotBox, 0, wx.EXPAND)
+        self.slotButtons = []
+        from eos.const import FittingSlot
+        
+        # Fits button
+        fitsBtn = MetaButton(p, wx.ID_ANY, "Fits", style=wx.BU_EXACTFIT)
+        setattr(self, "fits", fitsBtn)
+        slotBox.Add(fitsBtn, 1, wx.ALIGN_CENTER)
+        fitsBtn.Bind(wx.EVT_TOGGLEBUTTON, self.toggleSlotButton)
+        fitsBtn.filterType = "fits"
+        # Fits button starts deselected (checkbox, off by default)
+        fitsBtn.setUserSelection(False)
+        self.slotButtons.append(fitsBtn)
+        
+        # High, Med, Low, Rig buttons
+        slotMap = {
+            FittingSlot.HIGH: "High",
+            FittingSlot.MED: "Med",
+            FittingSlot.LOW: "Low",
+            FittingSlot.RIG: "Rig"
+        }
+        for slot, label in slotMap.items():
+            slotBtn = MetaButton(p, wx.ID_ANY, label, style=wx.BU_EXACTFIT)
+            setattr(self, "slot_%s" % label.lower(), slotBtn)
+            slotBox.Add(slotBtn, 1, wx.ALIGN_CENTER)
+            slotBtn.Bind(wx.EVT_TOGGLEBUTTON, self.toggleSlotButton)
+            slotBtn.filterType = "slot"
+            slotBtn.slotType = slot
+            # Slot buttons start deselected (unlike meta buttons which start selected)
+            slotBtn.setUserSelection(False)
+            self.slotButtons.append(slotBtn)
+        
         # Make itemview to set toggles according to list contents
         self.itemView.setToggles()
 
-        p.SetMinSize((wx.SIZE_AUTO_WIDTH, btn.GetSize()[1] + 5))
+        p.SetMinSize((wx.SIZE_AUTO_WIDTH, btn.GetSize()[1] * 2 + 10))
 
     def toggleMetaButton(self, event):
         """Process clicks on toggle buttons"""
@@ -100,6 +140,21 @@ class MarketBrowser(wx.Panel):
 
             self.itemView.filterItemStore()
 
+    def toggleSlotButton(self, event):
+        """Process clicks on slot/fits filter buttons"""
+        clickedBtn = event.EventObject
+
+        # All buttons (Fits, High, Med, Low, Rig) work as checkboxes (independent toggles)
+        clickedBtn.setUserSelection(clickedBtn.GetValue())
+        self.itemView.filterItemStore()
+
+    def getFitsFilter(self):
+        """Check if Fits button is active"""
+        for btn in self.slotButtons:
+            if btn.filterType == "fits" and btn.userSelected:
+                return True
+        return False
+
     def jump(self, item):
         self.mode = 'normal'
         self.marketView.jump(item)
@@ -141,6 +196,9 @@ class MarketBrowser(wx.Panel):
             self.__normalBtnMap.clear()
             for btn in self.metaButtons:
                 self.__normalBtnMap[btn] = btn.userSelected
+            self.__normalSlotBtnMap.clear()
+            for btn in self.slotButtons:
+                self.__normalSlotBtnMap[btn] = btn.userSelected
         if newMode == 'search':
             self.marketView.UnselectAll()
         setting = self.settings.get('marketMGSearchMode')
@@ -149,12 +207,16 @@ class MarketBrowser(wx.Panel):
             if newMode in ('search', 'recent', 'charges'):
                 for btn in self.metaButtons:
                     btn.setUserSelection(True)
+                # Clear slot button selections when searching (search can return any item type)
+                for btn in self.slotButtons:
+                    btn.setUserSelection(False)
             if newMode == 'normal':
                 for btn, state in self.__normalBtnMap.items():
                     btn.setUserSelection(state)
+                for btn, state in self.__normalSlotBtnMap.items():
+                    btn.setUserSelection(state)
         # We turn on all meta buttons permanently
         if setting == 2:
             for btn in self.metaButtons:
                 btn.setUserSelection(True)
         self.__mode = newMode
-

gui/utils/clipboard.py

@@ -1,22 +1,68 @@
 # noinspection PyPackageRequirements
 import wx
+from logbook import Logger
+
+logger = Logger(__name__)
 
 
 def toClipboard(text):
-    clip = wx.TheClipboard
-    clip.Open()
-    data = wx.TextDataObject(text)
-    clip.SetData(data)
-    clip.Close()
+    """
+    Copy text to clipboard. Explicitly uses CLIPBOARD selection, not PRIMARY.
+
+    On X11 systems, wxPython can confuse between PRIMARY and CLIPBOARD selections,
+    causing "already open" errors. This function ensures we always use CLIPBOARD.
+
+    See: https://discuss.wxpython.org/t/wx-theclipboard-pasting-different-content-on-every-second-paste/35361
+    """
+    clipboard = wx.TheClipboard
+    try:
+        # Explicitly use CLIPBOARD selection, not PRIMARY selection
+        # This prevents X11 confusion between the two clipboard types
+        clipboard.UsePrimarySelection(False)
+
+        if clipboard.Open():
+            try:
+                data = wx.TextDataObject(text)
+                clipboard.SetData(data)
+                return True
+            finally:
+                clipboard.Close()
+        else:
+            logger.debug("Failed to open clipboard for writing")
+            return False
+    except Exception as e:
+        logger.warning("Error writing to clipboard: {}", e)
+        return False
 
 
 def fromClipboard():
-    clip = wx.TheClipboard
-    clip.Open()
-    data = wx.TextDataObject("")
-    if clip.GetData(data):
-        clip.Close()
-        return data.GetText()
-    else:
-        clip.Close()
+    """
+    Read text from clipboard. Explicitly uses CLIPBOARD selection, not PRIMARY.
+
+    On X11 systems, wxPython can confuse between PRIMARY and CLIPBOARD selections,
+    causing "already open" errors. This function ensures we always use CLIPBOARD.
+
+    See: https://discuss.wxpython.org/t/wx-theclipboard-pasting-different-content-on-every-second-paste/35361
+    """
+    clipboard = wx.TheClipboard
+    try:
+        # Explicitly use CLIPBOARD selection, not PRIMARY selection
+        # This prevents X11 confusion between the two clipboard types
+        clipboard.UsePrimarySelection(False)
+
+        if clipboard.Open():
+            try:
+                data = wx.TextDataObject()
+                if clipboard.GetData(data):
+                    return data.GetText()
+                else:
+                    logger.debug("Clipboard open but no CLIPBOARD data available")
+                    return None
+            finally:
+                clipboard.Close()
+        else:
+            logger.debug("Failed to open clipboard for reading")
+            return None
+    except Exception as e:
+        logger.warning("Error reading from clipboard: {}", e)
         return None