weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modifiers for ground unit transfer window

Browse Source
This commit is contained in:
Raffson 2023-06-14 03:44:03 +02:00
parent ad227965ea
commit 057ea58d8e
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -24,6 +24,7 @@
* **[UI]** Improved parking space information in air wing configuration dialog. * **[UI]** Improved parking space information in air wing configuration dialog.
* **[Squadrons]** Warning messages when opening up a squadron through the air wing dialog, indicating squadrons that potentially won't fit w.r.t. parking space. * **[Squadrons]** Warning messages when opening up a squadron through the air wing dialog, indicating squadrons that potentially won't fit w.r.t. parking space.
* **[Squadrons Transfers]** Determine number of available parking slots more accurately w.r.t. squadron transfers, taking aircraft dimensions into account which should prevent forced air-starts. * **[Squadrons Transfers]** Determine number of available parking slots more accurately w.r.t. squadron transfers, taking aircraft dimensions into account which should prevent forced air-starts.
* **[UX]** Allow usage of CTRL/SHIFT modifiers in ground unit transfer window.
## Fixes ## Fixes
* **[New Game Wizard]** Settings would not persist when going back to a previous page (obsolete due to overhaul). * **[New Game Wizard]** Settings would not persist when going back to a previous page (obsolete due to overhaul).

25
qt_ui/windows/basemenu/NewUnitTransferDialog.py
View File

@ -19,6 +19,7 @@ from PySide2.QtWidgets import (
QSpacerItem, QSpacerItem,
QVBoxLayout, QVBoxLayout,
QWidget, QWidget,
QApplication,
) )
from dcs.unittype import UnitType from dcs.unittype import UnitType
@ -220,8 +221,16 @@ class ScrollingUnitTransferGrid(QFrame):
if not origin_inventory: if not origin_inventory:
return return
self.transfers[unit_type] += 1 modifiers = QApplication.keyboardModifiers()
origin_inventory -= 1 if modifiers == Qt.ShiftModifier:
amount = 10
elif modifiers == Qt.ControlModifier:
amount = 5
else:
amount = 1
self.transfers[unit_type] += min(origin_inventory, amount)
origin_inventory -= min(origin_inventory, amount)
controls.set_quantity(self.transfers[unit_type]) controls.set_quantity(self.transfers[unit_type])
origin_inventory_label.setText(str(origin_inventory)) origin_inventory_label.setText(str(origin_inventory))
self.transfer_quantity_changed.emit() self.transfer_quantity_changed.emit()
@ -232,8 +241,16 @@ class ScrollingUnitTransferGrid(QFrame):
if not controls.quantity: if not controls.quantity:
return return
self.transfers[unit_type] -= 1 modifiers = QApplication.keyboardModifiers()
origin_inventory += 1 if modifiers == Qt.ShiftModifier:
amount = 10
elif modifiers == Qt.ControlModifier:
amount = 5
else:
amount = 1
self.transfers[unit_type] -= min(self.transfers[unit_type], amount)
origin_inventory += min(self.transfers[unit_type], amount)
controls.set_quantity(self.transfers[unit_type]) controls.set_quantity(self.transfers[unit_type])
origin_inventory_label.setText(str(origin_inventory)) origin_inventory_label.setText(str(origin_inventory))
self.transfer_quantity_changed.emit() self.transfer_quantity_changed.emit()