-Added dragon scale FS

-Finished selection behavior in compact view -Added the market place calculator as a general tool -- Can now copy value from the market place window
Graveflo · Sep 8, 2019 · 77b6e29 · 77b6e29
1 parent 2b81525
commit 77b6e29
Show file tree

Hide file tree

Showing 8 changed files with 197 additions and 76 deletions.
diff --git a/DlgCompact.py b/DlgCompact.py
@@ -47,9 +47,22 @@ def __init__(self, app, parent=None):
         frmObj.tableWidget.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.ResizeToContents)
         frmObj.tableWidget.verticalHeader().setVisible(False)
         frmObj.tableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        frmObj.tableWidget.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
         frmObj.tableWidget.setAlternatingRowColors(True)
         frmObj.tableWidget.setSortingEnabled(True)
 
+    def select_gear(self, gear_obj):
+        for i in range(0, self.ui.tableWidget.rowCount()):
+            this_gear = self.ui.tableWidget.item(i, 0).__dict__[FrmMain.STR_TW_GEAR]
+            if this_gear is gear_obj:
+                self.select_row(i)
+
+    def select_row(self, int_row):
+        tableWidget = self.ui.tableWidget
+        tableWidget.setSelectionMode(QtWidgets.QAbstractItemView.SingleSelection)
+        tableWidget.selectRow(int_row)
+        tableWidget.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
+
     def show(self):
         super(DlgChoices, self).show()
         self.ui.tableWidget.horizontalHeader().setSortIndicator(1, QtCore.Qt.AscendingOrder)
@@ -198,8 +211,9 @@ def set_frame(self):
         first_col = table_Strat.item(fs_lvl, 1)
         gear_obj = first_col.__dict__[FrmMain.STR_TW_GEAR]
         frmMain.table_Strat_selectionChanged(first_col)
-        self.set_gear(gear_obj)
         self.update_dlg_Choices()
+        self.set_gear(gear_obj)
+
         with QBlockSig(self.dlg_FS_shelf.ui.tableWidget):
             self.dlg_FS_shelf.select_row(fs_lvl)
 
@@ -208,6 +222,7 @@ def set_gear(self, gear_obj):
         self.selected_gear = gear_obj
         frmObj.lblGear.setText(gear_obj.get_full_name())
         row_obj = self.get_strat_enhance_table_item(gear_obj)
+        self.dlg_Choices.select_gear(gear_obj)
 
         if row_obj is None:
             dlg_FS_shelf = self.frmMain.ui.table_Strat
@@ -216,7 +231,8 @@ def set_gear(self, gear_obj):
             while gear_obj == dlg_FS_shelf.item(fs_lvl, 1).__dict__[FrmMain.STR_TW_GEAR]:
                 fs_lvl += gear_obj.fs_gain()
                 fail_times += 1
-            frmObj.lblInfo.setText('Fail: {} times'.format(fail_times-1))
+            fail_times -= 1
+            frmObj.lblInfo.setText('Fail: {} times to {}'.format(fail_times, frmObj.spinFS.value()+fail_times))
         else:
             table_Equip = self.frmMain.ui.table_Strat_Equip
             this_row = row_obj.row()

diff --git a/Forms/Main_Window.py b/Forms/Main_Window.py
@@ -402,6 +402,8 @@ def setupUi(self, MainWindow):
         self.menuView.setObjectName("menuView")
         self.menuHelp = QtWidgets.QMenu(self.menubar)
         self.menuHelp.setObjectName("menuHelp")
+        self.menuTools = QtWidgets.QMenu(self.menubar)
+        self.menuTools.setObjectName("menuTools")
         MainWindow.setMenuBar(self.menubar)
         self.statusbar = QtWidgets.QStatusBar(MainWindow)
         self.statusbar.setObjectName("statusbar")
@@ -436,6 +438,11 @@ def setupUi(self, MainWindow):
         self.actionExport_Excel = QtWidgets.QAction(MainWindow)
         self.actionExport_Excel.setEnabled(False)
         self.actionExport_Excel.setObjectName("actionExport_Excel")
+        self.actionMarket_Tax_Calc = QtWidgets.QAction(MainWindow)
+        self.actionMarket_Tax_Calc.setObjectName("actionMarket_Tax_Calc")
+        self.actionEnhancing_Profit = QtWidgets.QAction(MainWindow)
+        self.actionEnhancing_Profit.setEnabled(False)
+        self.actionEnhancing_Profit.setObjectName("actionEnhancing_Profit")
         self.menuFile.addAction(self.actionSave_Info)
         self.menuFile.addAction(self.actionLoad_Info)
         self.menuFile.addSeparator()
@@ -450,7 +457,10 @@ def setupUi(self, MainWindow):
         self.menuView.addAction(self.actionWindow_Always_on_Top)
         self.menuHelp.addAction(self.actionAbout)
         self.menuHelp.addAction(self.actionGitHub_README)
+        self.menuTools.addAction(self.actionMarket_Tax_Calc)
+        self.menuTools.addAction(self.actionEnhancing_Profit)
         self.menubar.addAction(self.menuFile.menuAction())
+        self.menubar.addAction(self.menuTools.menuAction())
         self.menubar.addAction(self.menuView.menuAction())
         self.menubar.addAction(self.menuHelp.menuAction())
 
@@ -560,6 +570,7 @@ def retranslateUi(self, MainWindow):
         self.menuFile.setTitle(_translate("MainWindow", "File"))
         self.menuView.setTitle(_translate("MainWindow", "View"))
         self.menuHelp.setTitle(_translate("MainWindow", "Help"))
+        self.menuTools.setTitle(_translate("MainWindow", "Tools"))
         self.actionExport_XLSX.setText(_translate("MainWindow", "Export XLSX"))
         self.actionSave_Info.setText(_translate("MainWindow", "Save Info"))
         self.actionLoad_Info.setText(_translate("MainWindow", "Load Info"))
@@ -572,4 +583,6 @@ def retranslateUi(self, MainWindow):
         self.actionWindow_Always_on_Top.setText(_translate("MainWindow", "Window Always on Top"))
         self.actionExport_CSV.setText(_translate("MainWindow", "Export CSV"))
         self.actionExport_Excel.setText(_translate("MainWindow", "Export Excel"))
+        self.actionMarket_Tax_Calc.setText(_translate("MainWindow", "Market Tax Calc"))
+        self.actionEnhancing_Profit.setText(_translate("MainWindow", "Enhancing Profit"))
 
diff --git a/Forms/Main_Window.ui b/Forms/Main_Window.ui
@@ -868,7 +868,15 @@
     <addaction name="actionAbout"/>
     <addaction name="actionGitHub_README"/>
    </widget>
+   <widget class="QMenu" name="menuTools">
+    <property name="title">
+     <string>Tools</string>
+    </property>
+    <addaction name="actionMarket_Tax_Calc"/>
+    <addaction name="actionEnhancing_Profit"/>
+   </widget>
    <addaction name="menuFile"/>
+   <addaction name="menuTools"/>
    <addaction name="menuView"/>
    <addaction name="menuHelp"/>
   </widget>
@@ -951,6 +959,19 @@
     <string>Export Excel</string>
    </property>
   </action>
+  <action name="actionMarket_Tax_Calc">
+   <property name="text">
+    <string>Market Tax Calc</string>
+   </property>
+  </action>
+  <action name="actionEnhancing_Profit">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Enhancing Profit</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

diff --git a/Forms/dlg_Sale_Balance.py b/Forms/dlg_Sale_Balance.py
@@ -11,17 +11,14 @@
 class Ui_DlgSaleBalance(object):
     def setupUi(self, DlgSaleBalance):
         DlgSaleBalance.setObjectName("DlgSaleBalance")
-        DlgSaleBalance.resize(470, 159)
+        DlgSaleBalance.resize(470, 160)
         self.verticalLayout = QtWidgets.QVBoxLayout(DlgSaleBalance)
         self.verticalLayout.setObjectName("verticalLayout")
         self.widget = QtWidgets.QWidget(DlgSaleBalance)
         self.widget.setObjectName("widget")
         self.gridLayout = QtWidgets.QGridLayout(self.widget)
         self.gridLayout.setContentsMargins(0, 0, 0, 0)
         self.gridLayout.setObjectName("gridLayout")
-        self.lblSaleVale = QtWidgets.QLabel(self.widget)
-        self.lblSaleVale.setObjectName("lblSaleVale")
-        self.gridLayout.addWidget(self.lblSaleVale, 0, 0, 1, 1)
         self.spinValue = QtWidgets.QSpinBox(self.widget)
         self.spinValue.setProperty("showGroupSeparator", True)
         self.spinValue.setMaximum(1000000000)
@@ -30,25 +27,39 @@ def setupUi(self, DlgSaleBalance):
         self.lblPercent = QtWidgets.QLabel(self.widget)
         self.lblPercent.setObjectName("lblPercent")
         self.gridLayout.addWidget(self.lblPercent, 1, 0, 1, 1)
+        self.spinPercent = QtWidgets.QDoubleSpinBox(self.widget)
+        self.spinPercent.setPrefix("")
+        self.spinPercent.setMaximum(100.0)
+        self.spinPercent.setProperty("value", 65.0)
+        self.spinPercent.setObjectName("spinPercent")
+        self.gridLayout.addWidget(self.spinPercent, 1, 1, 1, 1)
+        self.lblSaleVale = QtWidgets.QLabel(self.widget)
+        self.lblSaleVale.setObjectName("lblSaleVale")
+        self.gridLayout.addWidget(self.lblSaleVale, 0, 0, 1, 1)
         self.chkValuePack = QtWidgets.QCheckBox(self.widget)
         self.chkValuePack.setChecked(True)
         self.chkValuePack.setObjectName("chkValuePack")
         self.gridLayout.addWidget(self.chkValuePack, 2, 0, 1, 1)
-        self.lblSale = QtWidgets.QLabel(self.widget)
+        self.widget_2 = QtWidgets.QWidget(self.widget)
+        self.widget_2.setObjectName("widget_2")
+        self.horizontalLayout = QtWidgets.QHBoxLayout(self.widget_2)
+        self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout.setSpacing(6)
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.lblSale = QtWidgets.QLabel(self.widget_2)
         font = QtGui.QFont()
         font.setPointSize(12)
         font.setBold(True)
         font.setWeight(75)
         self.lblSale.setFont(font)
         self.lblSale.setObjectName("lblSale")
-        self.gridLayout.addWidget(self.lblSale, 3, 1, 1, 1)
-        self.spinPercent = QtWidgets.QDoubleSpinBox(self.widget)
-        self.spinPercent.setPrefix("")
-        self.spinPercent.setMaximum(100.0)
-        self.spinPercent.setProperty("value", 65.0)
-        self.spinPercent.setObjectName("spinPercent")
-        self.gridLayout.addWidget(self.spinPercent, 1, 1, 1, 1)
-        self.gridLayout.setColumnStretch(1, 1)
+        self.horizontalLayout.addWidget(self.lblSale)
+        self.txtProfit = QtWidgets.QLineEdit(self.widget_2)
+        self.txtProfit.setCursor(QtGui.QCursor(QtCore.Qt.IBeamCursor))
+        self.txtProfit.setReadOnly(True)
+        self.txtProfit.setObjectName("txtProfit")
+        self.horizontalLayout.addWidget(self.txtProfit)
+        self.gridLayout.addWidget(self.widget_2, 3, 1, 1, 1)
         self.verticalLayout.addWidget(self.widget)
         self.buttonBox = QtWidgets.QDialogButtonBox(DlgSaleBalance)
         self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
@@ -64,9 +75,9 @@ def setupUi(self, DlgSaleBalance):
     def retranslateUi(self, DlgSaleBalance):
         _translate = QtCore.QCoreApplication.translate
         DlgSaleBalance.setWindowTitle(_translate("DlgSaleBalance", "Sale Balance Calculator"))
+        self.lblPercent.setText(_translate("DlgSaleBalance", "Base %:"))
+        self.spinPercent.setSuffix(_translate("DlgSaleBalance", "%"))
         self.lblSaleVale.setText(_translate("DlgSaleBalance", "Sale Value:"))
-        self.lblPercent.setText(_translate("DlgSaleBalance", "Return %:"))
         self.chkValuePack.setText(_translate("DlgSaleBalance", "Value Pack"))
         self.lblSale.setText(_translate("DlgSaleBalance", "Sale Balance:"))
-        self.spinPercent.setSuffix(_translate("DlgSaleBalance", "%"))
 
diff --git a/Forms/dlg_Sale_Balance.ui b/Forms/dlg_Sale_Balance.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>470</width>
-    <height>159</height>
+    <height>160</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,14 +16,7 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QWidget" name="widget" native="true">
-     <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0" columnstretch="0,1">
-      <item row="0" column="0">
-       <widget class="QLabel" name="lblSaleVale">
-        <property name="text">
-         <string>Sale Value:</string>
-        </property>
-       </widget>
-      </item>
+     <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0" columnstretch="0,0">
       <item row="0" column="1">
        <widget class="QSpinBox" name="spinValue">
         <property name="showGroupSeparator" stdset="0">
@@ -37,31 +30,7 @@
       <item row="1" column="0">
        <widget class="QLabel" name="lblPercent">
         <property name="text">
-         <string>Return %:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="chkValuePack">
-        <property name="text">
-         <string>Value Pack</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QLabel" name="lblSale">
-        <property name="font">
-         <font>
-          <pointsize>12</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>Sale Balance:</string>
+         <string>Base %:</string>
         </property>
        </widget>
       </item>
@@ -81,6 +50,68 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="lblSaleVale">
+        <property name="text">
+         <string>Sale Value:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="chkValuePack">
+        <property name="text">
+         <string>Value Pack</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QWidget" name="widget_2" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <property name="spacing">
+          <number>6</number>
+         </property>
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="lblSale">
+           <property name="font">
+            <font>
+             <pointsize>12</pointsize>
+             <weight>75</weight>
+             <bold>true</bold>
+            </font>
+           </property>
+           <property name="text">
+            <string>Sale Balance:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="txtProfit">
+           <property name="cursor">
+            <cursorShape>IBeamCursor</cursorShape>
+           </property>
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>