Skip to content

Commit

Permalink
more bug fixese
Browse files Browse the repository at this point in the history
  • Loading branch information
@Llyfrs
Llyfrs committed Oct 23, 2021
1 parent ba4b8d4 commit e633a5a
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 25 deletions.
14 changes: 14 additions & 0 deletions setting_window.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ def setupUi(self, Dialog):
self.line_2.setObjectName("line_2")
self.busts_number = QtWidgets.QSpinBox(Dialog)
self.busts_number.setGeometry(QtCore.QRect(220, 480, 43, 24))
self.busts_number.setMinimum(1)
self.busts_number.setProperty("value", 3)
self.busts_number.setObjectName("busts_number")
self.label_3 = QtWidgets.QLabel(Dialog)
Expand All @@ -57,42 +58,55 @@ def setupUi(self, Dialog):
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
self.verticalLayout.setObjectName("verticalLayout")
self.drug = QtWidgets.QCheckBox(self.layoutWidget)
self.drug.setChecked(True)
self.drug.setObjectName("drug")
self.verticalLayout.addWidget(self.drug)
self.medical = QtWidgets.QCheckBox(self.layoutWidget)
self.medical.setChecked(True)
self.medical.setObjectName("medical")
self.verticalLayout.addWidget(self.medical)
self.booster = QtWidgets.QCheckBox(self.layoutWidget)
self.booster.setChecked(True)
self.booster.setObjectName("booster")
self.verticalLayout.addWidget(self.booster)
self.energy_refill = QtWidgets.QCheckBox(self.layoutWidget)
self.energy_refill.setChecked(True)
self.energy_refill.setObjectName("energy_refill")
self.verticalLayout.addWidget(self.energy_refill)
self.energy = QtWidgets.QCheckBox(self.layoutWidget)
self.energy.setChecked(True)
self.energy.setObjectName("energy")
self.verticalLayout.addWidget(self.energy)
self.nerve = QtWidgets.QCheckBox(self.layoutWidget)
self.nerve.setChecked(True)
self.nerve.setObjectName("nerve")
self.verticalLayout.addWidget(self.nerve)
self.bills = QtWidgets.QCheckBox(self.layoutWidget)
self.bills.setChecked(True)
self.bills.setObjectName("bills")
self.verticalLayout.addWidget(self.bills)
self.race = QtWidgets.QCheckBox(self.layoutWidget)
self.race.setChecked(True)
self.race.setObjectName("race")
self.verticalLayout.addWidget(self.race)
self.rehab = QtWidgets.QCheckBox(self.layoutWidget)
self.rehab.setChecked(True)
self.rehab.setObjectName("rehab")
self.verticalLayout.addWidget(self.rehab)
self.missions = QtWidgets.QCheckBox(self.layoutWidget)
self.missions.setChecked(True)
self.missions.setObjectName("missions")
self.verticalLayout.addWidget(self.missions)
self.busts = QtWidgets.QCheckBox(self.layoutWidget)
self.busts.setChecked(True)
self.busts.setObjectName("busts")
self.verticalLayout.addWidget(self.busts)
self.wheels = QtWidgets.QCheckBox(self.layoutWidget)
self.wheels.setChecked(True)
self.wheels.setObjectName("wheels")
self.verticalLayout.addWidget(self.wheels)
self.npc = QtWidgets.QCheckBox(self.layoutWidget)
self.npc.setChecked(True)
self.npc.setObjectName("npc")
self.verticalLayout.addWidget(self.npc)

Expand Down
58 changes: 33 additions & 25 deletions torn-task-list.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#Forcing setting file back in to the application folder.
#This will make sure that I don't leave any junk files over peoples computers. Since there is no unistall button.
settings = QtCore.QSettings("setting.ini",QtCore.QSettings.IniFormat)
print(settings.allKeys())

#Setting window contains setting for the program
#Here you can chose what tasks will be shown and more.
Expand All @@ -27,29 +26,28 @@ def __init__(self, parent=None):
super().__init__(parent)
self.setupUi(self)
self.buttonBox.accepted.connect(self.save)
print(settings.value("bills"))
#Quick fix so None variables don't load, not yet sure how to implement better.
#This leads to a bug where when you delete one line from your settin it will reset it.
#Hope user wont really do that but I would still like it to be working better.
#if len(settings.allKeys()) == 15:
if len(settings.allKeys()) > 13:
#Displayed Tasks setting
self.bills.setChecked(int(settings.value("bills")))
self.booster.setChecked(int(settings.value("booster")))
self.busts.setChecked(int(settings.value("busts")))
self.drug.setChecked(int(settings.value("drug")))
self.energy.setChecked(int(settings.value("energy")))
self.energy_refill.setChecked(int(settings.value("energy_refill")))
self.medical.setChecked(int(settings.value("medical")))
self.missions.setChecked(int(settings.value("missions")))
self.nerve.setChecked(int(settings.value("nerve")))
self.npc.setChecked(int(settings.value("npc")))
self.race.setChecked(int(settings.value("race")))
self.rehab.setChecked(int(settings.value("rehab")))
self.wheels.setChecked(int(settings.value("wheels")))
self.bills.setChecked(int(settings.value("bills")))
self.booster.setChecked(int(settings.value("booster")))
self.busts.setChecked(int(settings.value("busts")))
self.drug.setChecked(int(settings.value("drug")))
self.energy.setChecked(int(settings.value("energy")))
self.energy_refill.setChecked(int(settings.value("energy_refill")))
self.medical.setChecked(int(settings.value("medical")))
self.missions.setChecked(int(settings.value("missions")))
self.nerve.setChecked(int(settings.value("nerve")))
self.npc.setChecked(int(settings.value("npc")))
self.race.setChecked(int(settings.value("race")))
self.rehab.setChecked(int(settings.value("rehab")))
self.wheels.setChecked(int(settings.value("wheels")))

#Advanced Options
#Advanced Options

self.busts_number.setValue(int(settings.value("busts_number")))
self.busts_number.setValue(int(settings.value("busts_number")))



Expand All @@ -72,7 +70,7 @@ def save(self): #Saves check box states in to a setting.ini
settings.setValue("busts_number", self.busts_number.value())


update_tasks()
the_button_was_clicked() #Running this function since it has all necessary checks.



Expand All @@ -89,9 +87,14 @@ def __init__(self, parent=None):
self.frame.hide()
self.error.hide()


def open_setting(self):
self.dialog = SettingWindow(self)
self.dialog.open()
def generate_save_file(self):
self.dialog = SettingWindow(self)
self.dialog.save()



class Task():
Expand Down Expand Up @@ -156,7 +159,7 @@ def reorder_task(): # first actually working pice of code :D Sorts Task based on
task.move(offset)
offset += 1

def get_request(url): #Code that waits and retryes request when error occurs (most comonly running out off AP calls)
def get_request(url): #Code that waits and retryes request when error occurs (most comonly running out off API calls)
json_info = requests.get(url).json()

while True:
Expand Down Expand Up @@ -255,11 +258,12 @@ def update_tasks():
tasks.append(Task("Complete your daily mission",9,ID=6,image="icons/mission.png"))

#Bust people task
busts = count_logs.count("g\': 5360")
busts_number = int(settings.value("busts_number"))
if busts < busts_number and bool(settings.value("busts")):
tasks.append(Task("Do {} more busts".format(busts_number-busts),7,link=link("https://www.torn.com/jailview.php"),ID=7,image="icons/busts.png"))
pass
if settings.value("busts_number")!= None: #Just in case value doesn't exists in setting.
busts = count_logs.count("g\': 5360")
busts_number = int(settings.value("busts_number"))
if busts < busts_number and bool(settings.value("busts")):
tasks.append(Task("Do {} more busts".format(busts_number-busts),7,link=link("https://www.torn.com/jailview.php"),ID=7,image="icons/busts.png"))
pass


#Wheel of Fortune
Expand All @@ -286,6 +290,10 @@ def update_tasks():
window.show()


if len(settings.allKeys()) == 0: #Checks if setting file exists if no forces window to generate new one.
window.generate_save_file()


if settings.value("API_key") != None : # inserst key in to field if it exists.
window.textEdit.setText(settings.value("API_key"))

Expand Down

0 comments on commit e633a5a

Please sign in to comment.