diff --git a/gui_base.py b/gui_base.py
index 6dfe587..bf2ab0e 100644
--- a/gui_base.py
+++ b/gui_base.py
@@ -150,12 +150,12 @@ class Ui_MainWindow(object):
self.scrollArea = QtWidgets.QScrollArea(self.Fissures)
self.scrollArea.setWidgetResizable(True)
self.scrollArea.setObjectName("scrollArea")
- self.scrollAreaWidgetContents = QtWidgets.QWidget()
- self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 244, 449))
- self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
- self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents)
- self.verticalLayout_6.setObjectName("verticalLayout_6")
- self.Fissure = Fissure(self.scrollAreaWidgetContents)
+ self.FissureHolder = QtWidgets.QWidget()
+ self.FissureHolder.setGeometry(QtCore.QRect(0, 0, 244, 449))
+ self.FissureHolder.setObjectName("FissureHolder")
+ self.FissureList = QtWidgets.QVBoxLayout(self.FissureHolder)
+ self.FissureList.setObjectName("FissureList")
+ self.Fissure = Fissure(self.FissureHolder)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@@ -165,8 +165,8 @@ class Ui_MainWindow(object):
self.Fissure.setObjectName("Fissure")
self.gridLayout_3 = QtWidgets.QGridLayout(self.Fissure)
self.gridLayout_3.setObjectName("gridLayout_3")
- self.verticalLayout_6.addWidget(self.Fissure)
- self.scrollArea.setWidget(self.scrollAreaWidgetContents)
+ self.FissureList.addWidget(self.Fissure)
+ self.scrollArea.setWidget(self.FissureHolder)
self.verticalLayout_5.addWidget(self.scrollArea)
self.horizontalLayout_2.addWidget(self.Fissures)
self.Invasions = QtWidgets.QWidget(self.MissionTimers)
@@ -185,12 +185,12 @@ class Ui_MainWindow(object):
self.scrollArea_2 = QtWidgets.QScrollArea(self.Invasions)
self.scrollArea_2.setWidgetResizable(True)
self.scrollArea_2.setObjectName("scrollArea_2")
- self.scrollAreaWidgetContents_2 = QtWidgets.QWidget()
- self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 245, 449))
- self.scrollAreaWidgetContents_2.setObjectName("scrollAreaWidgetContents_2")
- self.verticalLayout_8 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents_2)
- self.verticalLayout_8.setObjectName("verticalLayout_8")
- self.Invasion = Invasion(self.scrollAreaWidgetContents_2)
+ self.InvasionHolder = QtWidgets.QWidget()
+ self.InvasionHolder.setGeometry(QtCore.QRect(0, 0, 245, 449))
+ self.InvasionHolder.setObjectName("InvasionHolder")
+ self.InvasionList = QtWidgets.QVBoxLayout(self.InvasionHolder)
+ self.InvasionList.setObjectName("InvasionList")
+ self.Invasion = Invasion(self.InvasionHolder)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@@ -200,8 +200,8 @@ class Ui_MainWindow(object):
self.Invasion.setObjectName("Invasion")
self.gridLayout_4 = QtWidgets.QGridLayout(self.Invasion)
self.gridLayout_4.setObjectName("gridLayout_4")
- self.verticalLayout_8.addWidget(self.Invasion)
- self.scrollArea_2.setWidget(self.scrollAreaWidgetContents_2)
+ self.InvasionList.addWidget(self.Invasion)
+ self.scrollArea_2.setWidget(self.InvasionHolder)
self.verticalLayout_7.addWidget(self.scrollArea_2)
self.horizontalLayout_2.addWidget(self.Invasions)
self.Sorties = QtWidgets.QWidget(self.MissionTimers)
@@ -333,8 +333,8 @@ class Ui_MainWindow(object):
self.label_6.setAlignment(QtCore.Qt.AlignCenter)
self.label_6.setObjectName("label_6")
self.verticalLayout_14.addWidget(self.label_6)
- self.stackedWidget = QtWidgets.QStackedWidget(self.Arbitration)
- self.stackedWidget.setObjectName("stackedWidget")
+ self.ArbitrationTabs = QtWidgets.QStackedWidget(self.Arbitration)
+ self.ArbitrationTabs.setObjectName("ArbitrationTabs")
self.ArbitrationNA = QtWidgets.QWidget()
self.ArbitrationNA.setObjectName("ArbitrationNA")
self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.ArbitrationNA)
@@ -343,7 +343,7 @@ class Ui_MainWindow(object):
self.label_8.setAlignment(QtCore.Qt.AlignCenter)
self.label_8.setObjectName("label_8")
self.horizontalLayout_3.addWidget(self.label_8)
- self.stackedWidget.addWidget(self.ArbitrationNA)
+ self.ArbitrationTabs.addWidget(self.ArbitrationNA)
self.ArbitrationData = QtWidgets.QWidget()
self.ArbitrationData.setObjectName("ArbitrationData")
self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.ArbitrationData)
@@ -364,8 +364,8 @@ class Ui_MainWindow(object):
self.ArbitrationFaction.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.ArbitrationFaction.setObjectName("ArbitrationFaction")
self.horizontalLayout_4.addWidget(self.ArbitrationFaction)
- self.stackedWidget.addWidget(self.ArbitrationData)
- self.verticalLayout_14.addWidget(self.stackedWidget)
+ self.ArbitrationTabs.addWidget(self.ArbitrationData)
+ self.verticalLayout_14.addWidget(self.ArbitrationTabs)
self.verticalLayout_13.addWidget(self.Arbitration)
self.Alerts = QtWidgets.QWidget(self.Misc)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
@@ -383,12 +383,12 @@ class Ui_MainWindow(object):
self.scrollArea_3 = QtWidgets.QScrollArea(self.Alerts)
self.scrollArea_3.setWidgetResizable(True)
self.scrollArea_3.setObjectName("scrollArea_3")
- self.scrollAreaWidgetContents_3 = QtWidgets.QWidget()
- self.scrollAreaWidgetContents_3.setGeometry(QtCore.QRect(0, 0, 226, 307))
- self.scrollAreaWidgetContents_3.setObjectName("scrollAreaWidgetContents_3")
- self.verticalLayout_16 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents_3)
- self.verticalLayout_16.setObjectName("verticalLayout_16")
- self.Alert = Alert(self.scrollAreaWidgetContents_3)
+ self.AlertHolder = QtWidgets.QWidget()
+ self.AlertHolder.setGeometry(QtCore.QRect(0, 0, 226, 307))
+ self.AlertHolder.setObjectName("AlertHolder")
+ self.AlertList = QtWidgets.QVBoxLayout(self.AlertHolder)
+ self.AlertList.setObjectName("AlertList")
+ self.Alert = Alert(self.AlertHolder)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@@ -398,8 +398,8 @@ class Ui_MainWindow(object):
self.Alert.setObjectName("Alert")
self.horizontalLayout_6 = QtWidgets.QHBoxLayout(self.Alert)
self.horizontalLayout_6.setObjectName("horizontalLayout_6")
- self.verticalLayout_16.addWidget(self.Alert)
- self.scrollArea_3.setWidget(self.scrollAreaWidgetContents_3)
+ self.AlertList.addWidget(self.Alert)
+ self.scrollArea_3.setWidget(self.AlertHolder)
self.verticalLayout_15.addWidget(self.scrollArea_3)
self.verticalLayout_13.addWidget(self.Alerts)
self.horizontalLayout_2.addWidget(self.Misc)
@@ -409,8 +409,8 @@ class Ui_MainWindow(object):
self.Baro.setObjectName("Baro")
self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.Baro)
self.verticalLayout_2.setObjectName("verticalLayout_2")
- self.stackedWidget_2 = QtWidgets.QStackedWidget(self.Baro)
- self.stackedWidget_2.setObjectName("stackedWidget_2")
+ self.BaroTabs = QtWidgets.QStackedWidget(self.Baro)
+ self.BaroTabs.setObjectName("BaroTabs")
self.BaroNA = QtWidgets.QWidget()
self.BaroNA.setObjectName("BaroNA")
self.verticalLayout_17 = QtWidgets.QVBoxLayout(self.BaroNA)
@@ -424,7 +424,7 @@ class Ui_MainWindow(object):
self.label_10.setAlignment(QtCore.Qt.AlignCenter)
self.label_10.setObjectName("label_10")
self.verticalLayout_17.addWidget(self.label_10)
- self.stackedWidget_2.addWidget(self.BaroNA)
+ self.BaroTabs.addWidget(self.BaroNA)
self.BaroData = QtWidgets.QWidget()
self.BaroData.setObjectName("BaroData")
self.gridLayout_6 = QtWidgets.QGridLayout(self.BaroData)
@@ -435,15 +435,15 @@ class Ui_MainWindow(object):
self.gridLayout_7 = QtWidgets.QGridLayout(self.BaroItem)
self.gridLayout_7.setObjectName("gridLayout_7")
self.gridLayout_6.addWidget(self.BaroItem, 0, 0, 1, 1)
- self.stackedWidget_2.addWidget(self.BaroData)
- self.verticalLayout_2.addWidget(self.stackedWidget_2)
+ self.BaroTabs.addWidget(self.BaroData)
+ self.verticalLayout_2.addWidget(self.BaroTabs)
self.tabWidget.addTab(self.Baro, "")
self.Nightwave = QtWidgets.QWidget()
self.Nightwave.setObjectName("Nightwave")
self.horizontalLayout_7 = QtWidgets.QHBoxLayout(self.Nightwave)
self.horizontalLayout_7.setObjectName("horizontalLayout_7")
- self.stackedWidget_3 = QtWidgets.QStackedWidget(self.Nightwave)
- self.stackedWidget_3.setObjectName("stackedWidget_3")
+ self.NightwaveTabs = QtWidgets.QStackedWidget(self.Nightwave)
+ self.NightwaveTabs.setObjectName("NightwaveTabs")
self.NightwaveNA = QtWidgets.QWidget()
self.NightwaveNA.setObjectName("NightwaveNA")
self.horizontalLayout_8 = QtWidgets.QHBoxLayout(self.NightwaveNA)
@@ -457,7 +457,7 @@ class Ui_MainWindow(object):
self.label_11.setAlignment(QtCore.Qt.AlignCenter)
self.label_11.setObjectName("label_11")
self.horizontalLayout_8.addWidget(self.label_11)
- self.stackedWidget_3.addWidget(self.NightwaveNA)
+ self.NightwaveTabs.addWidget(self.NightwaveNA)
self.NightwaveData = QtWidgets.QWidget()
self.NightwaveData.setObjectName("NightwaveData")
self.gridLayout_8 = QtWidgets.QGridLayout(self.NightwaveData)
@@ -652,8 +652,8 @@ class Ui_MainWindow(object):
self.verticalLayout_27.addWidget(self.Elite2Desc)
self.horizontalLayout_9.addWidget(self.NightwaveElite2)
self.gridLayout_8.addWidget(self.widget_4, 1, 0, 1, 1)
- self.stackedWidget_3.addWidget(self.NightwaveData)
- self.horizontalLayout_7.addWidget(self.stackedWidget_3)
+ self.NightwaveTabs.addWidget(self.NightwaveData)
+ self.horizontalLayout_7.addWidget(self.NightwaveTabs)
self.tabWidget.addTab(self.Nightwave, "")
self.NewsAndEvents = QtWidgets.QWidget()
self.NewsAndEvents.setObjectName("NewsAndEvents")
@@ -675,12 +675,12 @@ class Ui_MainWindow(object):
self.scrollArea_4 = QtWidgets.QScrollArea(self.Events)
self.scrollArea_4.setWidgetResizable(True)
self.scrollArea_4.setObjectName("scrollArea_4")
- self.scrollAreaWidgetContents_4 = QtWidgets.QWidget()
- self.scrollAreaWidgetContents_4.setGeometry(QtCore.QRect(0, 0, 528, 730))
- self.scrollAreaWidgetContents_4.setObjectName("scrollAreaWidgetContents_4")
- self.verticalLayout_31 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents_4)
- self.verticalLayout_31.setObjectName("verticalLayout_31")
- self.Event = Event(self.scrollAreaWidgetContents_4)
+ self.EventHolder = QtWidgets.QWidget()
+ self.EventHolder.setGeometry(QtCore.QRect(0, 0, 528, 730))
+ self.EventHolder.setObjectName("EventHolder")
+ self.EventsList = QtWidgets.QVBoxLayout(self.EventHolder)
+ self.EventsList.setObjectName("EventsList")
+ self.Event = Event(self.EventHolder)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@@ -690,8 +690,8 @@ class Ui_MainWindow(object):
self.Event.setObjectName("Event")
self.horizontalLayout_11 = QtWidgets.QHBoxLayout(self.Event)
self.horizontalLayout_11.setObjectName("horizontalLayout_11")
- self.verticalLayout_31.addWidget(self.Event)
- self.scrollArea_4.setWidget(self.scrollAreaWidgetContents_4)
+ self.EventsList.addWidget(self.Event)
+ self.scrollArea_4.setWidget(self.EventHolder)
self.verticalLayout_30.addWidget(self.scrollArea_4)
self.horizontalLayout_10.addWidget(self.Events)
self.News = QtWidgets.QWidget(self.NewsAndEvents)
@@ -710,12 +710,12 @@ class Ui_MainWindow(object):
self.scrollArea_5 = QtWidgets.QScrollArea(self.News)
self.scrollArea_5.setWidgetResizable(True)
self.scrollArea_5.setObjectName("scrollArea_5")
- self.scrollAreaWidgetContents_5 = QtWidgets.QWidget()
- self.scrollAreaWidgetContents_5.setGeometry(QtCore.QRect(0, 0, 527, 730))
- self.scrollAreaWidgetContents_5.setObjectName("scrollAreaWidgetContents_5")
- self.verticalLayout_33 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents_5)
- self.verticalLayout_33.setObjectName("verticalLayout_33")
- self.NewsBlurb = NewsBlurb(self.scrollAreaWidgetContents_5)
+ self.NewsHolder = QtWidgets.QWidget()
+ self.NewsHolder.setGeometry(QtCore.QRect(0, 0, 527, 730))
+ self.NewsHolder.setObjectName("NewsHolder")
+ self.NewsList = QtWidgets.QVBoxLayout(self.NewsHolder)
+ self.NewsList.setObjectName("NewsList")
+ self.NewsBlurb = NewsBlurb(self.NewsHolder)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@@ -725,8 +725,8 @@ class Ui_MainWindow(object):
self.NewsBlurb.setObjectName("NewsBlurb")
self.horizontalLayout_12 = QtWidgets.QHBoxLayout(self.NewsBlurb)
self.horizontalLayout_12.setObjectName("horizontalLayout_12")
- self.verticalLayout_33.addWidget(self.NewsBlurb)
- self.scrollArea_5.setWidget(self.scrollAreaWidgetContents_5)
+ self.NewsList.addWidget(self.NewsBlurb)
+ self.scrollArea_5.setWidget(self.NewsHolder)
self.verticalLayout_32.addWidget(self.scrollArea_5)
self.horizontalLayout_10.addWidget(self.News)
self.tabWidget.addTab(self.NewsAndEvents, "")
diff --git a/gui_base.ui b/gui_base.ui
index 1514591..7eca9db 100644
--- a/gui_base.ui
+++ b/gui_base.ui
@@ -218,7 +218,7 @@
true
-
+
0
@@ -227,7 +227,7 @@
449
-
+
-
@@ -276,7 +276,7 @@
true
-
+
0
@@ -285,7 +285,7 @@
449
-
+
-
@@ -529,7 +529,7 @@
-
-
+
-
@@ -607,7 +607,7 @@
true
-
+
0
@@ -616,7 +616,7 @@
307
-
+
-
@@ -655,7 +655,7 @@
-
-
+
-
@@ -702,7 +702,7 @@
-
-
+
-
@@ -1103,7 +1103,7 @@
true
-
+
0
@@ -1112,7 +1112,7 @@
730
-
+
-
@@ -1161,7 +1161,7 @@
true
-
+
0
@@ -1170,7 +1170,7 @@
730
-
+
-
diff --git a/main.py b/main.py
index a0fb258..864f1ab 100644
--- a/main.py
+++ b/main.py
@@ -32,27 +32,27 @@ class App(GUI):
self.redraw_content_static()
def redraw_content_dynamic(self):
- self.Fissure_list = [Fissure(self.scrollAreaWidgetContents, fissure_info, fissure_i) for (fissure_i, fissure_info) in enumerate(self.ws.fissures)]
- [self.verticalLayout_6.addWidget(i) for i in self.Fissure_list]
+ self.Fissure_list = [Fissure(self.FissureHolder, fissure_info, fissure_i) for (fissure_i, fissure_info) in enumerate(self.ws.fissures)]
+ [self.FissureList.addWidget(i) for i in self.Fissure_list]
- self.Invasion_list = [Invasion(self.scrollAreaWidgetContents_2, invasion_info, invasion_i) for (invasion_i, invasion_info) in enumerate(self.ws.invasions)]
- [self.verticalLayout_8.addWidget(i) for i in self.Invasion_list]
+ self.Invasion_list = [Invasion(self.InvasionHolder, invasion_info, invasion_i) for (invasion_i, invasion_info) in enumerate(self.ws.invasions)]
+ [self.InvasionList.addWidget(i) for i in self.Invasion_list]
- self.Alert_list = [Alert(self.scrollAreaWidgetContents_3, alert_info, alert_i) for (alert_i, alert_info) in enumerate(self.ws.alerts)]
- [self.verticalLayout_16.addWidget(i) for i in self.Alert_list]
+ self.Alert_list = [Alert(self.AlertHolder, alert_info, alert_i) for (alert_i, alert_info) in enumerate(self.ws.alerts)]
+ [self.AlertList.addWidget(i) for i in self.Alert_list]
if len(self.ws.baro_items) == 0:
- self.stackedWidget_2.setCurrentIndex(0)
+ self.BaroTabs.setCurrentIndex(0)
else:
- self.stackedWidget_2.setCurrentIndex(1)
+ self.BaroTabs.setCurrentIndex(1)
self.baro_items_list = [BaroItem(self.BaroData, item_info, item_i) for (item_i, item_info) in enumerate(self.ws.baro_items)]
[self.gridLayout_6.addWidget(i, index // 7, index % 7, 1, 1) for (index, i) in enumerate(self.baro_items_list)]
- self.events_list = [Event(self.scrollAreaWidgetContents_4, event_info, event_i) for (event_i, event_info) in enumerate(self.ws.events)]
- [self.verticalLayout_31.addWidget(i) for i in self.events_list]
+ self.events_list = [Event(self.EventHolder, event_info, event_i) for (event_i, event_info) in enumerate(self.ws.events)]
+ [self.EventsList.addWidget(i) for i in self.events_list]
- self.newsblurb_list = [NewsBlurb(self.scrollAreaWidgetContents_5, newsblurb_info, newsblurb_i) for (newsblurb_i, newsblurb_info) in enumerate(self.ws.news)]
- [self.verticalLayout_33.addWidget(i) for i in self.newsblurb_list]
+ self.newsblurb_list = [NewsBlurb(self.NewsHolder, newsblurb_info, newsblurb_i) for (newsblurb_i, newsblurb_info) in enumerate(self.ws.news)]
+ [self.NewsList.addWidget(i) for i in self.newsblurb_list]
def redraw_content_static(self):
for i in range(1, 4):
@@ -64,9 +64,9 @@ class App(GUI):
getattr(self, 'ArchonHuntM' + str(i)).setText(self.ws.archon_hunt['missions'][i - 1]['type'])
if not self.ws.arbitration:
- self.stackedWidget.setCurrentIndex(0)
+ self.ArbitrationTabs.setCurrentIndex(0)
else:
- self.stackedWidget.setCurrentIndex(1)
+ self.ArbitrationTabs.setCurrentIndex(1)
self.ArbitrationMT.setText(self.ws.arbitration['type'])
self.ArbitrationFaction.setText(self.ws.arbitration['enemy'])
@@ -74,7 +74,7 @@ class App(GUI):
weekly_i = 1
elite_i = 1
if self.ws.nightwave:
- self.stackedWidget_3.setCurrentIndex(1)
+ self.NightwaveTabs.setCurrentIndex(1)
for challenge in self.ws.nightwave['activeChallenges']:
if challenge.get('isDaily'):
challenge_type = 'Daily'
@@ -91,7 +91,7 @@ class App(GUI):
getattr(self, challenge_type + str(challenge_i) + 'Name').setText(challenge['title'])
getattr(self, challenge_type + str(challenge_i) + 'Desc').setText(challenge['desc'])
else:
- self.stackedWidget_3.setCurrentIndex(0)
+ self.NightwaveTabs.setCurrentIndex(0)
def update_timers(self):
[i.update_timer() for i in self.Fissure_list]