mirror of
https://github.com/JDM170/SaveWizard
synced 2025-04-20 22:30:42 +07:00
New functions and some minor changes.
Main Form: * Added checkbox to not save changes if you want to open only garages, cities, dealers and agencies. Second Form: * Added the function to select the size of the garage. * Added check for empty fields.
This commit is contained in:
@@ -11,14 +11,14 @@ from PyQt5 import QtCore, QtGui, QtWidgets
|
||||
class Ui_MainWindow(object):
|
||||
def setupUi(self, MainWindow):
|
||||
MainWindow.setObjectName("MainWindow")
|
||||
MainWindow.resize(380, 380)
|
||||
MainWindow.setMinimumSize(QtCore.QSize(380, 380))
|
||||
MainWindow.setMaximumSize(QtCore.QSize(380, 380))
|
||||
MainWindow.resize(380, 390)
|
||||
MainWindow.setMinimumSize(QtCore.QSize(380, 390))
|
||||
MainWindow.setMaximumSize(QtCore.QSize(380, 390))
|
||||
self.centralwidget = QtWidgets.QWidget(MainWindow)
|
||||
self.centralwidget.setObjectName("centralwidget")
|
||||
self.apply = QtWidgets.QPushButton(self.centralwidget)
|
||||
self.apply.setEnabled(False)
|
||||
self.apply.setGeometry(QtCore.QRect(220, 340, 151, 31))
|
||||
self.apply.setGeometry(QtCore.QRect(216, 352, 151, 31))
|
||||
font = QtGui.QFont()
|
||||
font.setFamily("Times New Roman")
|
||||
font.setPointSize(12)
|
||||
@@ -26,7 +26,7 @@ class Ui_MainWindow(object):
|
||||
self.apply.setObjectName("apply")
|
||||
self.backup = QtWidgets.QPushButton(self.centralwidget)
|
||||
self.backup.setEnabled(False)
|
||||
self.backup.setGeometry(QtCore.QRect(10, 340, 151, 31))
|
||||
self.backup.setGeometry(QtCore.QRect(6, 352, 151, 31))
|
||||
font = QtGui.QFont()
|
||||
font.setFamily("Times New Roman")
|
||||
font.setPointSize(12)
|
||||
@@ -40,7 +40,7 @@ class Ui_MainWindow(object):
|
||||
self.path_button.setFont(font)
|
||||
self.path_button.setObjectName("path_button")
|
||||
self.gridLayoutWidget = QtWidgets.QWidget(self.centralwidget)
|
||||
self.gridLayoutWidget.setGeometry(QtCore.QRect(10, 80, 361, 81))
|
||||
self.gridLayoutWidget.setGeometry(QtCore.QRect(10, 72, 361, 81))
|
||||
self.gridLayoutWidget.setObjectName("gridLayoutWidget")
|
||||
self.basic_inf_layout = QtWidgets.QGridLayout(self.gridLayoutWidget)
|
||||
self.basic_inf_layout.setContentsMargins(0, 0, 0, 0)
|
||||
@@ -85,7 +85,7 @@ class Ui_MainWindow(object):
|
||||
self.money_label.setObjectName("money_label")
|
||||
self.basic_inf_layout.addWidget(self.money_label, 0, 0, 1, 1)
|
||||
self.gridLayoutWidget_3 = QtWidgets.QWidget(self.centralwidget)
|
||||
self.gridLayoutWidget_3.setGeometry(QtCore.QRect(10, 168, 361, 161))
|
||||
self.gridLayoutWidget_3.setGeometry(QtCore.QRect(10, 160, 361, 161))
|
||||
self.gridLayoutWidget_3.setObjectName("gridLayoutWidget_3")
|
||||
self.skills_layout = QtWidgets.QGridLayout(self.gridLayoutWidget_3)
|
||||
self.skills_layout.setContentsMargins(0, 0, 0, 0)
|
||||
@@ -170,7 +170,7 @@ class Ui_MainWindow(object):
|
||||
self.skills_layout.addWidget(self.adr_label, 0, 0, 1, 1)
|
||||
self.second_window = QtWidgets.QToolButton(self.centralwidget)
|
||||
self.second_window.setEnabled(False)
|
||||
self.second_window.setGeometry(QtCore.QRect(174, 348, 31, 21))
|
||||
self.second_window.setGeometry(QtCore.QRect(170, 360, 31, 21))
|
||||
self.second_window.setObjectName("second_window")
|
||||
self.owns_sc = QtWidgets.QCheckBox(self.centralwidget)
|
||||
self.owns_sc.setEnabled(False)
|
||||
@@ -234,6 +234,9 @@ class Ui_MainWindow(object):
|
||||
self.owns_it.setLayoutDirection(QtCore.Qt.RightToLeft)
|
||||
self.owns_it.setCheckable(True)
|
||||
self.owns_it.setObjectName("owns_it")
|
||||
self.dont_change_all_inf = QtWidgets.QCheckBox(self.centralwidget)
|
||||
self.dont_change_all_inf.setGeometry(QtCore.QRect(130, 327, 131, 20))
|
||||
self.dont_change_all_inf.setObjectName("dont_change_all_inf")
|
||||
MainWindow.setCentralWidget(self.centralwidget)
|
||||
|
||||
self.retranslateUi(MainWindow)
|
||||
@@ -267,4 +270,5 @@ class Ui_MainWindow(object):
|
||||
self.owns_sc.setText(_translate("MainWindow", "Owns Scandinavia?"))
|
||||
self.owns_fr.setText(_translate("MainWindow", "Owns France?"))
|
||||
self.owns_it.setText(_translate("MainWindow", "Owns Italia?"))
|
||||
self.dont_change_all_inf.setText(_translate("MainWindow", "Don\'t save all changes"))
|
||||
|
||||
|
||||
@@ -7,19 +7,19 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>380</width>
|
||||
<height>380</height>
|
||||
<height>390</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>380</width>
|
||||
<height>380</height>
|
||||
<height>390</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>380</width>
|
||||
<height>380</height>
|
||||
<height>390</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@@ -32,8 +32,8 @@
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>220</x>
|
||||
<y>340</y>
|
||||
<x>216</x>
|
||||
<y>352</y>
|
||||
<width>151</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
@@ -54,8 +54,8 @@
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>340</y>
|
||||
<x>6</x>
|
||||
<y>352</y>
|
||||
<width>151</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
@@ -93,7 +93,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>80</y>
|
||||
<y>72</y>
|
||||
<width>361</width>
|
||||
<height>81</height>
|
||||
</rect>
|
||||
@@ -174,7 +174,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>168</y>
|
||||
<y>160</y>
|
||||
<width>361</width>
|
||||
<height>161</height>
|
||||
</rect>
|
||||
@@ -326,8 +326,8 @@
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>174</x>
|
||||
<y>348</y>
|
||||
<x>170</x>
|
||||
<y>360</y>
|
||||
<width>31</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
@@ -528,6 +528,19 @@
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="dont_change_all_inf">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>130</x>
|
||||
<y>327</y>
|
||||
<width>131</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Don't save all changes</string>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
</widget>
|
||||
<resources/>
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from PyQt5.QtWidgets import QMainWindow
|
||||
from funcs import *
|
||||
from main_form import *
|
||||
from funcs import *
|
||||
|
||||
|
||||
class MainWindow(QMainWindow, Ui_MainWindow):
|
||||
@@ -48,7 +48,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
||||
# TODO: Custom functions
|
||||
def openSecondWin(self):
|
||||
from second_script import SecondWindow
|
||||
sec_win = SecondWindow(self.ownsSC, self.ownsFR, self.ownsIT, self.ownsATS, self.lines, self)
|
||||
sec_win = SecondWindow(self.lines, self.ownsSC, self.ownsFR, self.ownsIT, self.ownsATS, self)
|
||||
sec_win.show()
|
||||
|
||||
def getADRfromLineedit(self):
|
||||
@@ -141,6 +141,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
||||
self.funcs.searchline(self.lines, "mechanical:"))))
|
||||
|
||||
def applyChanges(self):
|
||||
if not self.ui.dont_change_all_inf.isChecked():
|
||||
self.applyChanges_1()
|
||||
self.applyChanges_2()
|
||||
backup = self.file_path + ".swbak"
|
||||
@@ -227,7 +228,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
||||
self.funcs.showMsgBox("Success", "Backup successfully recovered.")
|
||||
self.checkSaveFile(self.file_path)
|
||||
return
|
||||
except:
|
||||
except IOError:
|
||||
self.funcs.showMsgBox("Error", "Backup not found.")
|
||||
return
|
||||
|
||||
|
||||
@@ -11,10 +11,11 @@ from PyQt5 import QtCore, QtGui, QtWidgets
|
||||
class Ui_SecondWindow(object):
|
||||
def setupUi(self, SecondWindow):
|
||||
SecondWindow.setObjectName("SecondWindow")
|
||||
SecondWindow.setMinimumSize(QtCore.QSize(660, 400))
|
||||
SecondWindow.setMaximumSize(QtCore.QSize(660, 400))
|
||||
SecondWindow.resize(660, 430)
|
||||
SecondWindow.setMinimumSize(QtCore.QSize(660, 430))
|
||||
SecondWindow.setMaximumSize(QtCore.QSize(660, 430))
|
||||
self.gridLayoutWidget_4 = QtWidgets.QWidget(SecondWindow)
|
||||
self.gridLayoutWidget_4.setGeometry(QtCore.QRect(10, 10, 131, 191))
|
||||
self.gridLayoutWidget_4.setGeometry(QtCore.QRect(10, 20, 131, 191))
|
||||
self.gridLayoutWidget_4.setObjectName("gridLayoutWidget_4")
|
||||
self.garages_layout = QtWidgets.QGridLayout(self.gridLayoutWidget_4)
|
||||
self.garages_layout.setContentsMargins(0, 0, 0, 0)
|
||||
@@ -38,7 +39,7 @@ class Ui_SecondWindow(object):
|
||||
self.garages_analyze.setObjectName("garages_analyze")
|
||||
self.garages_layout.addWidget(self.garages_analyze, 2, 0, 1, 1)
|
||||
self.gridLayoutWidget_5 = QtWidgets.QWidget(SecondWindow)
|
||||
self.gridLayoutWidget_5.setGeometry(QtCore.QRect(340, 10, 131, 191))
|
||||
self.gridLayoutWidget_5.setGeometry(QtCore.QRect(340, 20, 131, 171))
|
||||
self.gridLayoutWidget_5.setObjectName("gridLayoutWidget_5")
|
||||
self.cities_layout = QtWidgets.QGridLayout(self.gridLayoutWidget_5)
|
||||
self.cities_layout.setContentsMargins(0, 0, 0, 0)
|
||||
@@ -62,7 +63,7 @@ class Ui_SecondWindow(object):
|
||||
self.cities_visited_label.setObjectName("cities_visited_label")
|
||||
self.cities_layout.addWidget(self.cities_visited_label, 0, 0, 1, 1)
|
||||
self.gridLayoutWidget_2 = QtWidgets.QWidget(SecondWindow)
|
||||
self.gridLayoutWidget_2.setGeometry(QtCore.QRect(10, 220, 131, 171))
|
||||
self.gridLayoutWidget_2.setGeometry(QtCore.QRect(10, 250, 131, 171))
|
||||
self.gridLayoutWidget_2.setObjectName("gridLayoutWidget_2")
|
||||
self.dealerships_layout = QtWidgets.QGridLayout(self.gridLayoutWidget_2)
|
||||
self.dealerships_layout.setContentsMargins(0, 0, 0, 0)
|
||||
@@ -85,7 +86,7 @@ class Ui_SecondWindow(object):
|
||||
self.dealerships_analyze.setObjectName("dealerships_analyze")
|
||||
self.dealerships_layout.addWidget(self.dealerships_analyze, 2, 0, 1, 1)
|
||||
self.gridLayoutWidget_6 = QtWidgets.QWidget(SecondWindow)
|
||||
self.gridLayoutWidget_6.setGeometry(QtCore.QRect(340, 220, 131, 171))
|
||||
self.gridLayoutWidget_6.setGeometry(QtCore.QRect(340, 250, 131, 171))
|
||||
self.gridLayoutWidget_6.setObjectName("gridLayoutWidget_6")
|
||||
self.agencies_layout = QtWidgets.QGridLayout(self.gridLayoutWidget_6)
|
||||
self.agencies_layout.setContentsMargins(0, 0, 0, 0)
|
||||
@@ -108,17 +109,17 @@ class Ui_SecondWindow(object):
|
||||
self.agencies_analyze.setObjectName("agencies_analyze")
|
||||
self.agencies_layout.addWidget(self.agencies_analyze, 2, 0, 1, 1)
|
||||
self.v_line = QtWidgets.QFrame(SecondWindow)
|
||||
self.v_line.setGeometry(QtCore.QRect(320, 10, 20, 381))
|
||||
self.v_line.setGeometry(QtCore.QRect(320, 10, 20, 411))
|
||||
self.v_line.setFrameShape(QtWidgets.QFrame.VLine)
|
||||
self.v_line.setFrameShadow(QtWidgets.QFrame.Sunken)
|
||||
self.v_line.setObjectName("v_line")
|
||||
self.h_line = QtWidgets.QFrame(SecondWindow)
|
||||
self.h_line.setGeometry(QtCore.QRect(10, 200, 641, 16))
|
||||
self.h_line.setGeometry(QtCore.QRect(10, 230, 641, 16))
|
||||
self.h_line.setFrameShape(QtWidgets.QFrame.HLine)
|
||||
self.h_line.setFrameShadow(QtWidgets.QFrame.Sunken)
|
||||
self.h_line.setObjectName("h_line")
|
||||
self.gridLayoutWidget = QtWidgets.QWidget(SecondWindow)
|
||||
self.gridLayoutWidget.setGeometry(QtCore.QRect(150, 10, 171, 107))
|
||||
self.gridLayoutWidget.setGeometry(QtCore.QRect(150, 10, 171, 133))
|
||||
self.gridLayoutWidget.setObjectName("gridLayoutWidget")
|
||||
self.add_garage = QtWidgets.QGridLayout(self.gridLayoutWidget)
|
||||
self.add_garage.setContentsMargins(0, 0, 0, 0)
|
||||
@@ -129,7 +130,7 @@ class Ui_SecondWindow(object):
|
||||
font.setPointSize(10)
|
||||
self.garage_add.setFont(font)
|
||||
self.garage_add.setObjectName("garage_add")
|
||||
self.add_garage.addWidget(self.garage_add, 2, 0, 1, 1)
|
||||
self.add_garage.addWidget(self.garage_add, 3, 0, 1, 1)
|
||||
self.garage_lineedit = QtWidgets.QLineEdit(self.gridLayoutWidget)
|
||||
self.garage_lineedit.setObjectName("garage_lineedit")
|
||||
self.add_garage.addWidget(self.garage_lineedit, 1, 0, 1, 1)
|
||||
@@ -139,7 +140,7 @@ class Ui_SecondWindow(object):
|
||||
font.setPointSize(10)
|
||||
self.garage_unlock_all.setFont(font)
|
||||
self.garage_unlock_all.setObjectName("garage_unlock_all")
|
||||
self.add_garage.addWidget(self.garage_unlock_all, 3, 0, 1, 1)
|
||||
self.add_garage.addWidget(self.garage_unlock_all, 4, 0, 1, 1)
|
||||
self.garage_label = QtWidgets.QLabel(self.gridLayoutWidget)
|
||||
font = QtGui.QFont()
|
||||
font.setFamily("Times New Roman")
|
||||
@@ -147,6 +148,9 @@ class Ui_SecondWindow(object):
|
||||
self.garage_label.setFont(font)
|
||||
self.garage_label.setObjectName("garage_label")
|
||||
self.add_garage.addWidget(self.garage_label, 0, 0, 1, 1)
|
||||
self.garage_size = QtWidgets.QComboBox(self.gridLayoutWidget)
|
||||
self.garage_size.setObjectName("garage_size")
|
||||
self.add_garage.addWidget(self.garage_size, 2, 0, 1, 1)
|
||||
self.gridLayoutWidget_3 = QtWidgets.QWidget(SecondWindow)
|
||||
self.gridLayoutWidget_3.setGeometry(QtCore.QRect(480, 50, 171, 107))
|
||||
self.gridLayoutWidget_3.setObjectName("gridLayoutWidget_3")
|
||||
@@ -178,7 +182,7 @@ class Ui_SecondWindow(object):
|
||||
self.city_unlock_all.setObjectName("city_unlock_all")
|
||||
self.add_city.addWidget(self.city_unlock_all, 3, 0, 1, 1)
|
||||
self.gridLayoutWidget_7 = QtWidgets.QWidget(SecondWindow)
|
||||
self.gridLayoutWidget_7.setGeometry(QtCore.QRect(150, 250, 171, 107))
|
||||
self.gridLayoutWidget_7.setGeometry(QtCore.QRect(150, 280, 171, 107))
|
||||
self.gridLayoutWidget_7.setObjectName("gridLayoutWidget_7")
|
||||
self.add_dealership = QtWidgets.QGridLayout(self.gridLayoutWidget_7)
|
||||
self.add_dealership.setContentsMargins(0, 0, 0, 0)
|
||||
@@ -208,7 +212,7 @@ class Ui_SecondWindow(object):
|
||||
self.dealership_unlock_all.setObjectName("dealership_unlock_all")
|
||||
self.add_dealership.addWidget(self.dealership_unlock_all, 3, 0, 1, 1)
|
||||
self.gridLayoutWidget_8 = QtWidgets.QWidget(SecondWindow)
|
||||
self.gridLayoutWidget_8.setGeometry(QtCore.QRect(480, 250, 171, 107))
|
||||
self.gridLayoutWidget_8.setGeometry(QtCore.QRect(480, 280, 171, 107))
|
||||
self.gridLayoutWidget_8.setObjectName("gridLayoutWidget_8")
|
||||
self.add_agency = QtWidgets.QGridLayout(self.gridLayoutWidget_8)
|
||||
self.add_agency.setContentsMargins(0, 0, 0, 0)
|
||||
@@ -238,7 +242,7 @@ class Ui_SecondWindow(object):
|
||||
self.agency_unlock_all.setObjectName("agency_unlock_all")
|
||||
self.add_agency.addWidget(self.agency_unlock_all, 3, 0, 1, 1)
|
||||
self.gridLayoutWidget_9 = QtWidgets.QWidget(SecondWindow)
|
||||
self.gridLayoutWidget_9.setGeometry(QtCore.QRect(150, 120, 171, 80))
|
||||
self.gridLayoutWidget_9.setGeometry(QtCore.QRect(150, 150, 171, 80))
|
||||
self.gridLayoutWidget_9.setObjectName("gridLayoutWidget_9")
|
||||
self.headquarter_layout = QtWidgets.QGridLayout(self.gridLayoutWidget_9)
|
||||
self.headquarter_layout.setContentsMargins(0, 0, 0, 0)
|
||||
@@ -260,25 +264,13 @@ class Ui_SecondWindow(object):
|
||||
self.headquarter_change.setFont(font)
|
||||
self.headquarter_change.setObjectName("headquarter_change")
|
||||
self.headquarter_layout.addWidget(self.headquarter_change, 2, 0, 1, 1)
|
||||
self.gridLayoutWidget_4.raise_()
|
||||
self.gridLayoutWidget_5.raise_()
|
||||
self.gridLayoutWidget_2.raise_()
|
||||
self.gridLayoutWidget_6.raise_()
|
||||
self.v_line.raise_()
|
||||
self.h_line.raise_()
|
||||
self.gridLayoutWidget.raise_()
|
||||
self.gridLayoutWidget_3.raise_()
|
||||
self.gridLayoutWidget_7.raise_()
|
||||
self.gridLayoutWidget_8.raise_()
|
||||
self.garage_label.raise_()
|
||||
self.gridLayoutWidget_9.raise_()
|
||||
|
||||
self.retranslateUi(SecondWindow)
|
||||
QtCore.QMetaObject.connectSlotsByName(SecondWindow)
|
||||
|
||||
def retranslateUi(self, SecondWindow):
|
||||
_translate = QtCore.QCoreApplication.translate
|
||||
SecondWindow.setWindowTitle(_translate("SecondWindow", "Edit garages, cities and etc..."))
|
||||
SecondWindow.setWindowTitle(_translate("SecondWindow", "Unlock garages, cities and etc..."))
|
||||
self.garages_label.setText(_translate("SecondWindow", "Owned garages:"))
|
||||
self.garages_analyze.setText(_translate("SecondWindow", "Analyze"))
|
||||
self.cities_analyze.setText(_translate("SecondWindow", "Analyze"))
|
||||
|
||||
@@ -2,26 +2,34 @@
|
||||
<ui version="4.0">
|
||||
<class>SecondWindow</class>
|
||||
<widget class="QDialog" name="SecondWindow">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>660</width>
|
||||
<height>430</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>660</width>
|
||||
<height>400</height>
|
||||
<height>430</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>660</width>
|
||||
<height>400</height>
|
||||
<height>430</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Edit garages, cities and etc...</string>
|
||||
<string>Unlock garages, cities and etc...</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="gridLayoutWidget_4">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>10</y>
|
||||
<y>20</y>
|
||||
<width>131</width>
|
||||
<height>191</height>
|
||||
</rect>
|
||||
@@ -66,9 +74,9 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>340</x>
|
||||
<y>10</y>
|
||||
<y>20</y>
|
||||
<width>131</width>
|
||||
<height>191</height>
|
||||
<height>171</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="cities_layout">
|
||||
@@ -111,7 +119,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>220</y>
|
||||
<y>250</y>
|
||||
<width>131</width>
|
||||
<height>171</height>
|
||||
</rect>
|
||||
@@ -152,7 +160,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>340</x>
|
||||
<y>220</y>
|
||||
<y>250</y>
|
||||
<width>131</width>
|
||||
<height>171</height>
|
||||
</rect>
|
||||
@@ -195,7 +203,7 @@
|
||||
<x>320</x>
|
||||
<y>10</y>
|
||||
<width>20</width>
|
||||
<height>381</height>
|
||||
<height>411</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
@@ -206,7 +214,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>200</y>
|
||||
<y>230</y>
|
||||
<width>641</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
@@ -221,11 +229,11 @@
|
||||
<x>150</x>
|
||||
<y>10</y>
|
||||
<width>171</width>
|
||||
<height>107</height>
|
||||
<height>133</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="add_garage">
|
||||
<item row="2" column="0">
|
||||
<item row="3" column="0">
|
||||
<widget class="QPushButton" name="garage_add">
|
||||
<property name="font">
|
||||
<font>
|
||||
@@ -241,7 +249,7 @@
|
||||
<item row="1" column="0">
|
||||
<widget class="QLineEdit" name="garage_lineedit"/>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<item row="4" column="0">
|
||||
<widget class="QPushButton" name="garage_unlock_all">
|
||||
<property name="font">
|
||||
<font>
|
||||
@@ -267,6 +275,9 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QComboBox" name="garage_size"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="gridLayoutWidget_3">
|
||||
@@ -327,7 +338,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>150</x>
|
||||
<y>250</y>
|
||||
<y>280</y>
|
||||
<width>171</width>
|
||||
<height>107</height>
|
||||
</rect>
|
||||
@@ -381,7 +392,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>480</x>
|
||||
<y>250</y>
|
||||
<y>280</y>
|
||||
<width>171</width>
|
||||
<height>107</height>
|
||||
</rect>
|
||||
@@ -435,7 +446,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>150</x>
|
||||
<y>120</y>
|
||||
<y>150</y>
|
||||
<width>171</width>
|
||||
<height>80</height>
|
||||
</rect>
|
||||
@@ -472,18 +483,6 @@
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<zorder>gridLayoutWidget_4</zorder>
|
||||
<zorder>gridLayoutWidget_5</zorder>
|
||||
<zorder>gridLayoutWidget_2</zorder>
|
||||
<zorder>gridLayoutWidget_6</zorder>
|
||||
<zorder>v_line</zorder>
|
||||
<zorder>h_line</zorder>
|
||||
<zorder>gridLayoutWidget</zorder>
|
||||
<zorder>gridLayoutWidget_3</zorder>
|
||||
<zorder>gridLayoutWidget_7</zorder>
|
||||
<zorder>gridLayoutWidget_8</zorder>
|
||||
<zorder>garage_label</zorder>
|
||||
<zorder>gridLayoutWidget_9</zorder>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
#!/usr/bin/python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from funcs import *
|
||||
from second_form import *
|
||||
from PyQt5.QtWidgets import QDialog
|
||||
from second_form import *
|
||||
from funcs import *
|
||||
|
||||
|
||||
class SecondWindow(QDialog, Ui_SecondWindow):
|
||||
# TODO: Constructor
|
||||
def __init__(self, ownsSC, ownsFR, ownsIT, ownsATS, lines, parent=None):
|
||||
def __init__(self, lines, ownsSC, ownsFR, ownsIT, ownsATS, parent=None):
|
||||
QDialog.__init__(self, parent)
|
||||
Ui_SecondWindow.__init__(self)
|
||||
self.ui = Ui_SecondWindow()
|
||||
self.ui.setupUi(self)
|
||||
#
|
||||
self.funcs = Functions()
|
||||
#
|
||||
self.lines = lines
|
||||
self.ownsSC = ownsSC
|
||||
self.ownsFR = ownsFR
|
||||
@@ -51,6 +51,10 @@ class SecondWindow(QDialog, Ui_SecondWindow):
|
||||
"los_angeles", "san_diego", "carson_city", "las_vegas", "phoenix", "tucson", "sierra_vista",
|
||||
"farmington", "santa_fe", "roswell", "carlsbad_nm"]
|
||||
#
|
||||
self.ui.garage_size.addItem("Small")
|
||||
self.ui.garage_size.addItem("Medium")
|
||||
self.ui.garage_size.addItem("Big")
|
||||
#
|
||||
self.ui.garages_analyze.clicked.connect(self.checkGarages)
|
||||
self.ui.garage_add.clicked.connect(self.addGarage)
|
||||
self.ui.garage_unlock_all.clicked.connect(self.addAllGarages)
|
||||
@@ -65,6 +69,22 @@ class SecondWindow(QDialog, Ui_SecondWindow):
|
||||
self.ui.agency_add.clicked.connect(self.addAgency)
|
||||
self.ui.agency_unlock_all.clicked.connect(self.addAllAgency)
|
||||
|
||||
# TODO: Custom functions
|
||||
def check_gsize(self):
|
||||
text = str(self.ui.garage_size.currentText())
|
||||
gsize = 0
|
||||
gstatus = 0
|
||||
if text == "Small":
|
||||
gsize = 1
|
||||
gstatus = 1
|
||||
elif text == "Medium":
|
||||
gsize = 3
|
||||
gstatus = 2
|
||||
elif text == "Big":
|
||||
gsize = 5
|
||||
gstatus = 3
|
||||
return gsize, gstatus
|
||||
|
||||
# TODO: Default functions
|
||||
def purchasedgarages(self):
|
||||
purchased_garages = []
|
||||
@@ -141,14 +161,18 @@ class SecondWindow(QDialog, Ui_SecondWindow):
|
||||
|
||||
def addGarage(self):
|
||||
garage = str(self.ui.garage_lineedit.text()).lower()
|
||||
if garage is "":
|
||||
self.funcs.showMsgBox("Error", "Enter a name for the city.")
|
||||
return
|
||||
gsize, gstatus = self.check_gsize()
|
||||
self.ui.garage_lineedit.setText("")
|
||||
if self.funcs.getvalue(self.lines,
|
||||
self.funcs.searchlineinunit(self.lines, "status:", "garage." + garage)) != "0":
|
||||
if self.funcs.getvalue(self.lines, self.funcs.searchlineinunit(self.lines, "status:", "garage." + garage)) != "0":
|
||||
self.funcs.showMsgBox("Error", "Garage in \"{}\" already unlocked.".format(garage))
|
||||
else:
|
||||
self.funcs.setvalue(self.lines,
|
||||
self.funcs.searchlineinunit(self.lines, "status:", "garage." + garage),
|
||||
"6")
|
||||
str(gstatus))
|
||||
for i in range(gsize):
|
||||
self.funcs.addarrayvalue(self.lines,
|
||||
self.funcs.searchlineinunit(self.lines, "vehicles:", "garage." + garage),
|
||||
"null")
|
||||
@@ -159,6 +183,7 @@ class SecondWindow(QDialog, Ui_SecondWindow):
|
||||
self.checkGarages()
|
||||
|
||||
def addAllGarages(self):
|
||||
gsize, gstatus = self.check_gsize()
|
||||
line = 0
|
||||
try:
|
||||
while True:
|
||||
@@ -169,7 +194,8 @@ class SecondWindow(QDialog, Ui_SecondWindow):
|
||||
self.funcs.setvalue(self.lines,
|
||||
self.funcs.searchlineinunit(self.lines,
|
||||
"status:", self.funcs.getunitname(self.lines, line)),
|
||||
"6")
|
||||
str(gstatus))
|
||||
for i in range(gsize):
|
||||
self.funcs.addarrayvalue(self.lines,
|
||||
self.funcs.searchlineinunit(self.lines,
|
||||
"vehicles:", self.funcs.getunitname(self.lines, line)),
|
||||
@@ -186,6 +212,9 @@ class SecondWindow(QDialog, Ui_SecondWindow):
|
||||
|
||||
def addCity(self):
|
||||
city = str(self.ui.city_lineedit.text()).lower()
|
||||
if city is "":
|
||||
self.funcs.showMsgBox("Error", "Enter a name for the city.")
|
||||
return
|
||||
self.ui.city_lineedit.setText("")
|
||||
if city in self.funcs.getarrayitems(self.lines,
|
||||
self.funcs.searchline(self.lines, "visited_cities:")):
|
||||
@@ -215,6 +244,9 @@ class SecondWindow(QDialog, Ui_SecondWindow):
|
||||
|
||||
def addDealership(self):
|
||||
dealer = str(self.ui.dealership_lineedit.text()).lower()
|
||||
if dealer is "":
|
||||
self.funcs.showMsgBox("Error", "Enter a name for the city.")
|
||||
return
|
||||
self.ui.dealership_lineedit.setText("")
|
||||
if (not self.ownsATS and dealer not in self.dealersets2) or (self.ownsATS and dealer not in self.dealersats):
|
||||
self.funcs.showMsgBox("Error", "There is no dealership in that city.")
|
||||
@@ -247,6 +279,9 @@ class SecondWindow(QDialog, Ui_SecondWindow):
|
||||
|
||||
def addAgency(self):
|
||||
agency = str(self.ui.agency_lineedit.text()).lower()
|
||||
if agency is "":
|
||||
self.funcs.showMsgBox("Error", "Enter a name for the city.")
|
||||
return
|
||||
self.ui.agency_lineedit.setText("")
|
||||
if (not self.ownsATS and agency not in self.agenciesets2) or (self.ownsATS and agency not in self.agenciesats):
|
||||
self.funcs.showMsgBox("Error", "There is no recruitment agency in that city.")
|
||||
@@ -280,6 +315,9 @@ class SecondWindow(QDialog, Ui_SecondWindow):
|
||||
|
||||
def changeHQ(self):
|
||||
hq = str(self.ui.headquarter_lineedit.text()).lower()
|
||||
if hq is "":
|
||||
self.funcs.showMsgBox("Error", "Enter a name for the city.")
|
||||
return
|
||||
if self.funcs.getvalue(self.lines, self.funcs.searchline(self.lines, "hq_city:")) == hq:
|
||||
self.funcs.showMsgBox("Error", "Your headquarter is already in this city")
|
||||
elif hq not in self.purchasedgarages():
|
||||
|
||||
Reference in New Issue
Block a user