From 17f537832606d06041a4e8cb6ad599f42993852a Mon Sep 17 00:00:00 2001 From: Donnie Date: Sat, 27 Jun 2020 23:54:27 -0400 Subject: [PATCH] Modified recruit button layout --- qt_ui/windows/basemenu/QRecruitBehaviour.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/qt_ui/windows/basemenu/QRecruitBehaviour.py b/qt_ui/windows/basemenu/QRecruitBehaviour.py index 096caeff..97c1d56e 100644 --- a/qt_ui/windows/basemenu/QRecruitBehaviour.py +++ b/qt_ui/windows/basemenu/QRecruitBehaviour.py @@ -28,13 +28,13 @@ class QRecruitBehaviour: existing_units = QLabel(str(existing_units)) existing_units.setSizePolicy(QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)) - amount_bought = QLabel("[{}]".format(str(scheduled_units))) + amount_bought = QLabel("{}".format(str(scheduled_units))) amount_bought.setSizePolicy(QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)) self.existing_units_labels[unit_type] = existing_units self.bought_amount_labels[unit_type] = amount_bought - price = QLabel("{}m".format(db.PRICES[unit_type])) + price = QLabel("$ {} m".format(db.PRICES[unit_type])) price.setSizePolicy(QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)) buy = QPushButton("+") @@ -52,17 +52,18 @@ class QRecruitBehaviour: layout.addWidget(unitName, row, 0) layout.addItem(QSpacerItem(20, 0, QSizePolicy.Minimum, QSizePolicy.Minimum), row, 1) layout.addWidget(existing_units, row, 2) - layout.addWidget(amount_bought, row, 3) + layout.addItem(QSpacerItem(20, 0, QSizePolicy.Minimum, QSizePolicy.Minimum), row, 3) layout.addWidget(price, row, 4) - layout.addItem(QSpacerItem(20, 0, QSizePolicy.Minimum, QSizePolicy.Minimum), row, 5) - layout.addWidget(buy, row, 6) - layout.addWidget(sell, row, 7) + + layout.addWidget(sell, row, 5) + layout.addWidget(amount_bought, row, 6) + layout.addWidget(buy, row, 7) return row + 1 def _update_count_label(self, unit_type: UnitType): - self.bought_amount_labels[unit_type].setText("[{}]".format( + self.bought_amount_labels[unit_type].setText("{}".format( unit_type in self.deliveryEvent.units and "{}".format(self.deliveryEvent.units[unit_type]) or "0" ))