chore: minor code cleanups

Author: loathingKernel

rare/components/tabs/__init__.py

@@ -29,8 +29,9 @@ def __init__(self, settings: RareAppSettings, rcore: RareCore, parent):
         self.signals = rcore.signals()
         self.args = rcore.args()
 
-        self.tab_bar = MainTabBar(parent=self)
-        self.setTabBar(self.tab_bar)
+        self.main_bar = MainTabBar(parent=self)
+        self.main_bar.installEventFilter(self)
+        self.setTabBar(self.main_bar)
 
         # Generate Tabs
         self.games_tab = GamesLibrary(self.settings, self.rcore, self)
@@ -52,11 +53,10 @@ def __init__(self, settings: RareAppSettings, rcore: RareCore, parent):
         # Space Tab
         space_index = self.addTab(QWidget(self), "Rare")
         self.setTabEnabled(space_index, False)
-        self.tab_bar.expanded_idx = space_index
+        self.main_bar.expanded_idx = space_index
 
         # Integrations Tab
         self.integrations_tab = IntegrationsTab(self.rcore, self)
-        self.integrations_tab.back_clicked.connect(lambda: self.setCurrentWidget(self.games_tab))
         self.integrations_index = self.addTab(self.integrations_tab, self.tr("Integrations"))
 
         # Account Tab
@@ -74,7 +74,7 @@ def __init__(self, settings: RareAppSettings, rcore: RareCore, parent):
         # Settings Tab
         self.settings_tab = SettingsTab(settings, rcore, self)
         self.settings_index = self.addTab(self.settings_tab, qta_icon("fa.gear", "fa6s.gear"), "")
-        self.settings_tab.about.update_available_ready.connect(lambda: self.tab_bar.setTabText(self.settings_index, "(!)"))
+        self.settings_tab.about.update_available_ready.connect(lambda: self.main_bar.setTabText(self.settings_index, "(!)"))
 
         # Open game list on click on Games tab button
         self.tabBarClicked.connect(self.mouse_clicked)
@@ -88,17 +88,16 @@ def __init__(self, settings: RareAppSettings, rcore: RareCore, parent):
         QShortcut("Alt+5", self).activated.connect(lambda: self.setCurrentIndex(self.settings_index))
 
         self.setCurrentIndex(self.games_index)
-        self.tab_bar.installEventFilter(self)
 
     def eventFilter(self, w: QObject, e: QEvent) -> bool:
         if not isinstance(e, QEvent):
             return True
-        if w is self.tab_bar and e.type() == QEvent.Type.MouseButtonPress:
-            tab_idx = self.tab_bar.tabAt(e.pos())
+        if w is self.main_bar and e.type() == QEvent.Type.MouseButtonPress:
+            tab_idx = self.main_bar.tabAt(e.pos())
             if tab_idx == self.account_index:
                 if e.button() == Qt.MouseButton.LeftButton:
                     self.account_menu.exec(
-                        self.mapToGlobal(self.tab_bar.tabRect(tab_idx).bottomRight() - self.account_menu.rect().topRight())
+                        self.mapToGlobal(self.main_bar.tabRect(tab_idx).bottomRight() - self.account_menu.rect().topRight())
                     )
                 return True
         return False
@@ -138,7 +137,7 @@ def mouse_clicked(self, index):
             self.integrations_tab.show_import()
 
     def resizeEvent(self, event):
-        self.tab_bar.setMinimumWidth(self.width())
+        self.main_bar.setMinimumWidth(self.width())
         super(MainTabWidget, self).resizeEvent(event)
 
     @Slot(int)

rare/components/tabs/integrations/__init__.py

@@ -14,7 +14,7 @@
 
 class IntegrationsTab(SideTabWidget):
     def __init__(self, rcore: RareCore, parent=None):
-        super(IntegrationsTab, self).__init__(show_back=True, parent=parent)
+        super(IntegrationsTab, self).__init__(show_back=False, parent=parent)
         self.import_group = ImportGroup(rcore, self)
         self.import_widget = IntegrationsWidget(
             self.import_group,

rare/components/tabs/library/__init__.py

@@ -114,7 +114,6 @@ def update_count_games_label(self):
 
     def setup_game_list(self):
         for rgame in self.rcore.games:
-            # self.library_list.addItem(QListWidgetItem(QIcon(rgame.get_pixmap(ImageSize.Icon)), rgame.app_title))
             widget = self.add_library_widget(rgame)
             if not widget:
                 logger.warning("Excluding %s from the game list", rgame.app_title)

rare/main.py

@@ -111,7 +111,7 @@ def main() -> int:
     )
 
     # Subreaper command
-    subreaper_parser = subparsers.add_parser("subreaper", aliases=["reaper"])
+    subparsers.add_parser("subreaper", aliases=["reaper"])
 
     args, other = parser.parse_known_args()