Rare: rename icon function to qta_icon

rare/commands/launcher/cloud_sync_dialog.py

@@ -9,7 +9,7 @@ from legendary.core import LegendaryCore
 from legendary.models.game import InstalledGame
 
 from rare.ui.components.tabs.games.game_info.cloud_sync_widget import Ui_CloudSyncWidget
-from rare.utils.misc import icon
+from rare.utils.misc import qta_icon
 from rare.widgets.dialogs import ButtonDialog, game_title
 
 logger = getLogger("CloudSyncDialog")
@@ -41,7 +41,7 @@ class CloudSyncDialog(ButtonDialog):
         layout.addWidget(sync_widget)
 
         self.accept_button.setText(self.tr("Skip"))
-        self.accept_button.setIcon(icon("fa.chevron-right"))
+        self.accept_button.setIcon(qta_icon("fa.chevron-right"))
 
         self.setCentralLayout(layout)
 
@@ -62,8 +62,8 @@ class CloudSyncDialog(ButtonDialog):
         self.sync_ui.date_info_local.setText(dt_local.strftime("%A, %d. %B %Y %X") if dt_local else "None")
         self.sync_ui.date_info_remote.setText(dt_remote.strftime("%A, %d. %B %Y %X") if dt_remote else "None")
 
-        self.sync_ui.icon_local.setPixmap(icon("mdi.harddisk", "fa.desktop").pixmap(128, 128))
+        self.sync_ui.icon_local.setPixmap(qta_icon("mdi.harddisk", "fa.desktop").pixmap(128, 128))
-        self.sync_ui.icon_remote.setPixmap(icon("mdi.cloud-outline", "ei.cloud").pixmap(128, 128))
+        self.sync_ui.icon_remote.setPixmap(qta_icon("mdi.cloud-outline", "ei.cloud").pixmap(128, 128))
 
         self.sync_ui.upload_button.clicked.connect(self.__on_upload)
         self.sync_ui.download_button.clicked.connect(self.__on_download)

rare/components/dialogs/install_dialog.py

@@ -13,7 +13,7 @@ from rare.models.install import InstallDownloadModel, InstallQueueItemModel, Ins
 from rare.shared.workers.install_info import InstallInfoWorker
 from rare.ui.components.dialogs.install_dialog import Ui_InstallDialog
 from rare.ui.components.dialogs.install_dialog_advanced import Ui_InstallDialogAdvanced
-from rare.utils.misc import format_size, icon
+from rare.utils.misc import format_size, qta_icon
 from rare.widgets.collapsible_widget import CollapsibleFrame
 from rare.widgets.dialogs import ActionDialog, game_title
 from rare.widgets.indicator_edit import PathEdit, IndicatorReasonsCommon
@@ -63,17 +63,17 @@ class InstallDialog(ActionDialog):
         super(InstallDialog, self).__init__(parent=parent)
 
         header = self.tr("Install")
-        bicon = icon("ri.install-line")
+        bicon = qta_icon("ri.install-line")
         if options.repair_mode:
             header = self.tr("Repair")
-            bicon = icon("fa.wrench")
+            bicon = qta_icon("fa.wrench")
             if options.repair_and_update:
                 header = self.tr("Repair and update")
         elif options.update:
             header = self.tr("Update")
         elif options.reset_sdl:
             header = self.tr("Modify")
-            bicon = icon("fa.gear")
+            bicon = qta_icon("fa.gear")
         self.setWindowTitle(game_title(header, rgame.app_title))
         self.setSubtitle(game_title(header, rgame.app_title))
 
@@ -198,7 +198,7 @@ class InstallDialog(ActionDialog):
         self.accept_button.setObjectName("InstallButton")
 
         self.action_button.setText(self.tr("Verify"))
-        self.action_button.setIcon(icon("fa.check"))
+        self.action_button.setIcon(qta_icon("fa.check"))
 
         self.setCentralWidget(install_widget)
 

rare/components/dialogs/login/__init__.py

@@ -7,7 +7,7 @@ from legendary.core import LegendaryCore
 from rare.shared import ArgumentsSingleton
 from rare.ui.components.dialogs.login.landing_page import Ui_LandingPage
 from rare.ui.components.dialogs.login.login_dialog import Ui_LoginDialog
-from rare.utils.misc import icon
+from rare.utils.misc import qta_icon
 from rare.widgets.dialogs import BaseDialog
 from rare.widgets.sliding_stack import SlidingStackedWidget
 from .browser_login import BrowserLogin
@@ -99,9 +99,9 @@ class LoginDialog(BaseDialog):
 
         self.login_stack.setCurrentWidget(self.landing_page)
 
-        self.ui.exit_button.setIcon(icon("fa.remove"))
+        self.ui.exit_button.setIcon(qta_icon("fa.remove"))
-        self.ui.back_button.setIcon(icon("fa.chevron-left"))
+        self.ui.back_button.setIcon(qta_icon("fa.chevron-left"))
-        self.ui.next_button.setIcon(icon("fa.chevron-right"))
+        self.ui.next_button.setIcon(qta_icon("fa.chevron-right"))
 
         # lk: Set next as the default button only to stop closing the dialog when pressing enter
         self.ui.exit_button.setAutoDefault(False)

rare/components/dialogs/login/browser_login.py

@@ -9,7 +9,7 @@ from legendary.utils import webview_login
 
 from rare.lgndr.core import LegendaryCore
 from rare.ui.components.dialogs.login.browser_login import Ui_BrowserLogin
-from rare.utils.misc import icon
+from rare.utils.misc import qta_icon
 from rare.utils.paths import get_rare_executable
 from rare.widgets.indicator_edit import IndicatorLineEdit, IndicatorReasonsCommon
 
@@ -34,7 +34,7 @@ class BrowserLogin(QFrame):
         )
         self.sid_edit.line_edit.setEchoMode(QLineEdit.Password)
         self.ui.link_text.setText(self.login_url)
-        self.ui.copy_button.setIcon(icon("mdi.content-copy", "fa.copy"))
+        self.ui.copy_button.setIcon(qta_icon("mdi.content-copy", "fa.copy"))
         self.ui.copy_button.clicked.connect(self.copy_link)
         self.ui.form_layout.setWidget(
             self.ui.form_layout.getWidgetPosition(self.ui.sid_label)[0],

rare/components/dialogs/move_dialog.py

@@ -10,7 +10,7 @@ from PyQt5.QtWidgets import QVBoxLayout, QHBoxLayout, QLabel, QFileDialog, QLayo
 from rare.models.install import MoveGameModel
 from rare.models.game import RareGame
 from rare.shared import RareCore
-from rare.utils.misc import path_size, format_size, icon
+from rare.utils.misc import path_size, format_size, qta_icon
 from rare.widgets.dialogs import ActionDialog, game_title
 from rare.widgets.elide_label import ElideLabel
 from rare.widgets.indicator_edit import PathEdit, IndicatorReasons, IndicatorReasonsCommon
@@ -76,7 +76,7 @@ class MoveDialog(ActionDialog):
         self.setCentralLayout(layout)
 
         self.accept_button.setText(self.tr("Move"))
-        self.accept_button.setIcon(icon("mdi.folder-move-outline"))
+        self.accept_button.setIcon(qta_icon("mdi.folder-move-outline"))
 
         self.action_button.setHidden(True)
 

rare/components/dialogs/selective_dialog.py

@@ -3,7 +3,7 @@ from PyQt5.QtWidgets import QVBoxLayout, QGroupBox
 
 from rare.models.game import RareGame
 from rare.models.install import SelectiveDownloadsModel
-from rare.utils.misc import icon
+from rare.utils.misc import qta_icon
 from rare.widgets.dialogs import ButtonDialog, game_title
 from rare.widgets.selective_widget import SelectiveWidget
 
@@ -31,7 +31,7 @@ class SelectiveDialog(ButtonDialog):
         self.setCentralLayout(layout)
 
         self.accept_button.setText(self.tr("Verify"))
-        self.accept_button.setIcon(icon("fa.check"))
+        self.accept_button.setIcon(qta_icon("fa.check"))
 
         self.options: SelectiveDownloadsModel = SelectiveDownloadsModel(rgame.app_name)
 

rare/components/dialogs/uninstall_dialog.py

@@ -6,7 +6,7 @@ from PyQt5.QtWidgets import (
 
 from rare.models.game import RareGame
 from rare.models.install import UninstallOptionsModel
-from rare.utils.misc import icon
+from rare.utils.misc import qta_icon
 from rare.widgets.dialogs import ButtonDialog, game_title
 
 
@@ -39,7 +39,7 @@ class UninstallDialog(ButtonDialog):
         self.setCentralLayout(layout)
 
         self.accept_button.setText(self.tr("Uninstall"))
-        self.accept_button.setIcon(icon("ri.uninstall-line"))
+        self.accept_button.setIcon(qta_icon("ri.uninstall-line"))
         self.accept_button.setObjectName("UninstallButton")
 
         if rgame.sdl_name is not None:

rare/components/tabs/account/__init__.py

@@ -4,7 +4,7 @@ from PyQt5.QtCore import pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QPushButton
 
 from rare.shared import LegendaryCoreSingleton, GlobalSignalsSingleton
-from rare.utils.misc import icon, ExitCodes
+from rare.utils.misc import qta_icon, ExitCodes
 
 
 class AccountWidget(QWidget):
@@ -20,7 +20,7 @@ class AccountWidget(QWidget):
         if not username:
             username = "Offline"
 
-        self.open_browser = QPushButton(icon("fa.external-link"), self.tr("Account settings"))
+        self.open_browser = QPushButton(qta_icon("fa.external-link"), self.tr("Account settings"))
         self.open_browser.clicked.connect(
             lambda: webbrowser.open(
                 "https://www.epicgames.com/account/personal?productName=epicgames"

rare/components/tabs/games/game_info/cloud_saves.py

@@ -22,7 +22,7 @@ from rare.shared import RareCore
 from rare.shared.workers.wine_resolver import WineSavePathResolver
 from rare.ui.components.tabs.games.game_info.cloud_settings_widget import Ui_CloudSettingsWidget
 from rare.ui.components.tabs.games.game_info.cloud_sync_widget import Ui_CloudSyncWidget
-from rare.utils.misc import icon
+from rare.utils.misc import qta_icon
 from rare.utils.metrics import timelogger
 from rare.widgets.indicator_edit import PathEdit, IndicatorReasonsCommon
 from rare.widgets.loading_widget import LoadingWidget
@@ -45,8 +45,8 @@ class CloudSaves(QWidget, SideTabContents):
         self.core = RareCore.instance().core()
         self.settings = QSettings()
 
-        self.sync_ui.icon_local.setPixmap(icon("mdi.harddisk", "fa.desktop").pixmap(128, 128))
+        self.sync_ui.icon_local.setPixmap(qta_icon("mdi.harddisk", "fa.desktop").pixmap(128, 128))
-        self.sync_ui.icon_remote.setPixmap(icon("mdi.cloud-outline", "ei.cloud").pixmap(128, 128))
+        self.sync_ui.icon_remote.setPixmap(qta_icon("mdi.cloud-outline", "ei.cloud").pixmap(128, 128))
 
         self.sync_ui.upload_button.clicked.connect(self.upload)
         self.sync_ui.download_button.clicked.connect(self.download)
@@ -73,7 +73,7 @@ class CloudSaves(QWidget, SideTabContents):
             self.cloud_save_path_edit
         )
 
-        self.compute_save_path_button = QPushButton(icon("fa.magic"), self.tr("Calculate path"))
+        self.compute_save_path_button = QPushButton(qta_icon("fa.magic"), self.tr("Calculate path"))
         self.compute_save_path_button.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Fixed)
         self.compute_save_path_button.clicked.connect(self.compute_save_path)
         self.cloud_ui.main_layout.addRow(None, self.compute_save_path_button)

rare/components/tabs/games/game_info/game_dlc.py

@@ -10,7 +10,7 @@ from rare.ui.components.tabs.games.game_info.game_dlc import Ui_GameDlc
 from rare.ui.components.tabs.games.game_info.game_dlc_widget import Ui_GameDlcWidget
 from rare.widgets.image_widget import ImageWidget, ImageSize
 from rare.widgets.side_tab import SideTabContents
-from rare.utils.misc import widget_object_name, icon
+from rare.utils.misc import widget_object_name, qta_icon
 
 
 class GameDlcWidget(QFrame):
@@ -57,7 +57,7 @@ class InstalledGameDlcWidget(GameDlcWidget):
         self.ui.action_button.setObjectName("UninstallButton")
         self.ui.action_button.clicked.connect(self.uninstall_dlc)
         self.ui.action_button.setText(self.tr("Uninstall DLC"))
-        self.ui.action_button.setIcon(icon("ri.uninstall-line"))
+        self.ui.action_button.setIcon(qta_icon("ri.uninstall-line"))
         # lk: don't reference `self.rdlc` here because the object has been deleted
         rdlc.signals.game.uninstalled.connect(self.__uninstalled)
 
@@ -78,7 +78,7 @@ class AvailableGameDlcWidget(GameDlcWidget):
         self.ui.action_button.setObjectName("InstallButton")
         self.ui.action_button.clicked.connect(self.install_dlc)
         self.ui.action_button.setText(self.tr("Install DLC"))
-        self.ui.action_button.setIcon(icon("ri.install-line"))
+        self.ui.action_button.setIcon(qta_icon("ri.install-line"))
 
         # lk: don't reference `self.rdlc` here because the object has been deleted
         rdlc.signals.game.installed.connect(self.__installed)

rare/components/tabs/games/game_info/game_info.py

@@ -20,7 +20,7 @@ from rare.models.game import RareGame
 from rare.shared import RareCore
 from rare.shared.workers import VerifyWorker, MoveWorker
 from rare.ui.components.tabs.games.game_info.game_info import Ui_GameInfo
-from rare.utils.misc import format_size, icon, style_hyperlink
+from rare.utils.misc import format_size, qta_icon, style_hyperlink
 from rare.widgets.image_widget import ImageWidget, ImageSize
 from rare.widgets.side_tab import SideTabContents
 from rare.components.dialogs.move_dialog import MoveDialog, is_game_dir
@@ -41,14 +41,14 @@ class GameInfo(QWidget, SideTabContents):
         self.ui.modify_button.setObjectName("InstallButton")
         self.ui.uninstall_button.setObjectName("UninstallButton")
 
-        self.ui.install_button.setIcon(icon("ri.install-line"))
+        self.ui.install_button.setIcon(qta_icon("ri.install-line"))
-        self.ui.import_button.setIcon(icon("mdi.application-import"))
+        self.ui.import_button.setIcon(qta_icon("mdi.application-import"))
 
-        self.ui.modify_button.setIcon(icon("fa.gear"))
+        self.ui.modify_button.setIcon(qta_icon("fa.gear"))
-        self.ui.verify_button.setIcon(icon("fa.check"))
+        self.ui.verify_button.setIcon(qta_icon("fa.check"))
-        self.ui.repair_button.setIcon(icon("fa.wrench"))
+        self.ui.repair_button.setIcon(qta_icon("fa.wrench"))
-        self.ui.move_button.setIcon(icon("mdi.folder-move-outline"))
+        self.ui.move_button.setIcon(qta_icon("mdi.folder-move-outline"))
-        self.ui.uninstall_button.setIcon(icon("ri.uninstall-line"))
+        self.ui.uninstall_button.setIcon(qta_icon("ri.uninstall-line"))
 
         self.rcore = RareCore.instance()
         self.core = RareCore.instance().core()

rare/components/tabs/games/game_widgets/icon_widget.py

@@ -10,7 +10,7 @@ from PyQt5.QtWidgets import (
     QPushButton,
 )
 
-from rare.utils.misc import icon, widget_object_name
+from rare.utils.misc import qta_icon, widget_object_name
 from rare.widgets.elide_label import ElideLabel
 
 
@@ -59,13 +59,13 @@ class IconWidget(object):
         # play button
         self.launch_btn = QPushButton(parent=self.mini_widget)
         self.launch_btn.setObjectName(f"{type(self).__name__}Button")
-        self.launch_btn.setIcon(icon("ei.play-alt", color="white"))
+        self.launch_btn.setIcon(qta_icon("ei.play-alt", color="white"))
         self.launch_btn.setIconSize(QSize(20, 20))
         self.launch_btn.setFixedSize(QSize(widget.width() // 4, widget.width() // 4))
 
         self.install_btn = QPushButton(parent=self.mini_widget)
         self.install_btn.setObjectName(f"{type(self).__name__}Button")
-        self.install_btn.setIcon(icon("ri.install-fill", color="white"))
+        self.install_btn.setIcon(qta_icon("ri.install-fill", color="white"))
         self.install_btn.setIconSize(QSize(20, 20))
         self.install_btn.setFixedSize(QSize(widget.width() // 4, widget.width() // 4))
 

rare/components/tabs/games/game_widgets/list_widget.py

@@ -9,7 +9,7 @@ from PyQt5.QtWidgets import (
     QWidget,
 )
 
-from rare.utils.misc import icon
+from rare.utils.misc import qta_icon
 from rare.widgets.elide_label import ElideLabel
 
 
@@ -40,13 +40,13 @@ class ListWidget(object):
 
         self.install_btn = QPushButton(parent=widget)
         self.install_btn.setObjectName(f"{type(self).__name__}Button")
-        self.install_btn.setIcon(icon("ri.install-line"))
+        self.install_btn.setIcon(qta_icon("ri.install-line"))
         self.install_btn.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
         self.install_btn.setFixedWidth(120)
 
         self.launch_btn = QPushButton(parent=widget)
         self.launch_btn.setObjectName(f"{type(self).__name__}Button")
-        self.launch_btn.setIcon(icon("ei.play-alt"))
+        self.launch_btn.setIcon(qta_icon("ei.play-alt"))
         self.launch_btn.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
         self.launch_btn.setFixedWidth(120)
 

rare/components/tabs/games/head_bar.py

@@ -13,7 +13,7 @@ from PyQt5.QtWidgets import (
 from rare.models.options import options, LibraryFilter, LibraryOrder
 from rare.shared import RareCore
 from rare.utils.extra_widgets import ButtonLineEdit
-from rare.utils.misc import icon
+from rare.utils.misc import qta_icon
 
 
 class GameListHeadBar(QWidget):
@@ -83,15 +83,15 @@ class GameListHeadBar(QWidget):
 
         integrations_menu = QMenu(parent=self)
         import_action = QAction(
-            icon("mdi.import", "fa.arrow-down"), self.tr("Import Game"), integrations_menu
+            qta_icon("mdi.import", "fa.arrow-down"), self.tr("Import Game"), integrations_menu
         )
 
         import_action.triggered.connect(self.goto_import)
-        egl_sync_action = QAction(icon("mdi.sync", "fa.refresh"), self.tr("Sync with EGL"), integrations_menu)
+        egl_sync_action = QAction(qta_icon("mdi.sync", "fa.refresh"), self.tr("Sync with EGL"), integrations_menu)
         egl_sync_action.triggered.connect(self.goto_egl_sync)
 
         eos_ubisoft_action = QAction(
-            icon("mdi.rocket", "fa.rocket"), self.tr("Epic Overlay and Ubisoft"), integrations_menu
+            qta_icon("mdi.rocket", "fa.rocket"), self.tr("Epic Overlay and Ubisoft"), integrations_menu
         )
         eos_ubisoft_action.triggered.connect(self.goto_eos_ubisoft)
 
@@ -104,15 +104,14 @@ class GameListHeadBar(QWidget):
         integrations.setMenu(integrations_menu)
         integrations.setPopupMode(QToolButton.InstantPopup)
 
-        self.search_bar = ButtonLineEdit("fa.search", placeholder_text=self.tr("Search Game"))
+        self.search_bar = ButtonLineEdit("fa.search", placeholder_text=self.tr("Search"))
         self.search_bar.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Preferred)
         self.search_bar.setObjectName("SearchBar")
-        self.search_bar.setFrame(False)
         self.search_bar.setMinimumWidth(250)
 
         installed_tooltip = self.tr("Installed games")
         self.installed_icon = QLabel(parent=self)
-        self.installed_icon.setPixmap(icon("ph.floppy-disk-back-fill").pixmap(QSize(16, 16)))
+        self.installed_icon.setPixmap(qta_icon("ph.floppy-disk-back-fill").pixmap(QSize(16, 16)))
         self.installed_icon.setToolTip(installed_tooltip)
         self.installed_label = QLabel(parent=self)
         font = self.installed_label.font()
@@ -121,13 +120,13 @@ class GameListHeadBar(QWidget):
         self.installed_label.setToolTip(installed_tooltip)
         available_tooltip = self.tr("Available games")
         self.available_icon = QLabel(parent=self)
-        self.available_icon.setPixmap(icon("ph.floppy-disk-back-light").pixmap(QSize(16, 16)))
+        self.available_icon.setPixmap(qta_icon("ph.floppy-disk-back-light").pixmap(QSize(16, 16)))
         self.available_icon.setToolTip(available_tooltip)
         self.available_label = QLabel(parent=self)
         self.available_label.setToolTip(available_tooltip)
 
         self.refresh_list = QPushButton(parent=self)
-        self.refresh_list.setIcon(icon("fa.refresh"))  # Reload icon
+        self.refresh_list.setIcon(qta_icon("fa.refresh"))  # Reload icon
         self.refresh_list.clicked.connect(self.__refresh_clicked)
 
         layout = QHBoxLayout(self)

rare/components/tabs/games/integrations/eos_group.py

@@ -22,7 +22,7 @@ from rare.models.game import RareEosOverlay
 from rare.shared import RareCore
 from rare.ui.components.tabs.games.integrations.eos_widget import Ui_EosWidget
 from rare.utils import config_helper as config
-from rare.utils.misc import icon
+from rare.utils.misc import qta_icon
 from rare.widgets.elide_label import ElideLabel
 
 logger = getLogger("EpicOverlay")
@@ -102,15 +102,15 @@ class EosPrefixWidget(QFrame):
 
         if not self.overlay.is_installed and not self.overlay.available_paths(self.prefix):
             self.setDisabled(True)
-            self.indicator.setPixmap(icon("fa.circle-o", color="grey").pixmap(20, 20))
+            self.indicator.setPixmap(qta_icon("fa.circle-o", color="grey").pixmap(20, 20))
             self.overlay_label.setText(self.overlay.active_path(self.prefix))
             self.button.setText(self.tr("Unavailable"))
             return
 
         if self.overlay.is_enabled(self.prefix):
-            self.indicator.setPixmap(icon("fa.check-circle-o", color="green").pixmap(QSize(20, 20)))
+            self.indicator.setPixmap(qta_icon("fa.check-circle-o", color="green").pixmap(QSize(20, 20)))
         else:
-            self.indicator.setPixmap(icon("fa.times-circle-o", color="red").pixmap(QSize(20, 20)))
+            self.indicator.setPixmap(qta_icon("fa.times-circle-o", color="red").pixmap(QSize(20, 20)))
 
         install_path = os.path.normpath(p) if (p := self.overlay.install_path) else ""
 
@@ -171,8 +171,8 @@ class EosGroup(QGroupBox):
         self.ui.install_page_layout.setAlignment(Qt.AlignTop)
         self.ui.info_page_layout.setAlignment(Qt.AlignTop)
 
-        self.ui.install_button.setIcon(icon("ri.install-line"))
+        self.ui.install_button.setIcon(qta_icon("ri.install-line"))
-        self.ui.uninstall_button.setIcon(icon("ri.uninstall-line"))
+        self.ui.uninstall_button.setIcon(qta_icon("ri.uninstall-line"))
 
         self.installed_path_label = ElideLabel(parent=self)
         self.installed_version_label = ElideLabel(parent=self)

rare/components/tabs/games/integrations/ubisoft_group.py

@@ -20,7 +20,7 @@ from rare.lgndr.core import LegendaryCore
 from rare.shared import RareCore
 from rare.shared.workers.worker import Worker
 from rare.utils.metrics import timelogger
-from rare.utils.misc import icon
+from rare.utils.misc import qta_icon
 from rare.widgets.elide_label import ElideLabel
 from rare.widgets.loading_widget import LoadingWidget
 
@@ -104,7 +104,7 @@ class UbiLinkWidget(QFrame):
         self.ubi_account_id = ubi_account_id
 
         self.ok_indicator = QLabel(parent=self)
-        self.ok_indicator.setPixmap(icon("fa.circle-o", color="grey").pixmap(20, 20))
+        self.ok_indicator.setPixmap(qta_icon("fa.circle-o", color="grey").pixmap(20, 20))
         self.ok_indicator.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Preferred)
 
         self.title_label = ElideLabel(game.app_title, parent=self)
@@ -116,7 +116,7 @@ class UbiLinkWidget(QFrame):
         if activated:
             self.link_button.setText(self.tr("Already activated"))
             self.link_button.setDisabled(True)
-            self.ok_indicator.setPixmap(icon("fa.check-circle-o", color="green").pixmap(QSize(20, 20)))
+            self.ok_indicator.setPixmap(qta_icon("fa.check-circle-o", color="green").pixmap(QSize(20, 20)))
 
         layout = QHBoxLayout(self)
         layout.setContentsMargins(-1, 0, 0, 0)
@@ -127,7 +127,7 @@ class UbiLinkWidget(QFrame):
     def activate(self):
         self.link_button.setDisabled(True)
         # self.ok_indicator.setPixmap(icon("mdi.loading", color="grey").pixmap(20, 20))
-        self.ok_indicator.setPixmap(icon("mdi.transit-connection-horizontal", color="grey").pixmap(20, 20))
+        self.ok_indicator.setPixmap(qta_icon("mdi.transit-connection-horizontal", color="grey").pixmap(20, 20))
 
         if self.args.debug:
             worker = UbiConnectWorker(RareCore.instance().core(), None, None)
@@ -140,11 +140,11 @@ class UbiLinkWidget(QFrame):
 
     def worker_finished(self, error):
         if not error:
-            self.ok_indicator.setPixmap(icon("fa.check-circle-o", color="green").pixmap(QSize(20, 20)))
+            self.ok_indicator.setPixmap(qta_icon("fa.check-circle-o", color="green").pixmap(QSize(20, 20)))
             self.link_button.setDisabled(True)
             self.link_button.setText(self.tr("Already activated"))
         else:
-            self.ok_indicator.setPixmap(icon("fa.times-circle-o", color="red").pixmap(QSize(20, 20)))
+            self.ok_indicator.setPixmap(qta_icon("fa.times-circle-o", color="red").pixmap(QSize(20, 20)))
             self.ok_indicator.setToolTip(error)
             self.link_button.setText(self.tr("Try again"))
             self.link_button.setDisabled(False)

rare/components/tabs/settings/widgets/env_vars_model.py

@@ -8,7 +8,7 @@ from PyQt5.QtCore import Qt, QModelIndex, QAbstractTableModel, pyqtSlot
 from PyQt5.QtGui import QFont
 
 from rare.lgndr.core import LegendaryCore
-from rare.utils.misc import icon
+from rare.utils.misc import qta_icon
 
 if platform.system() != "Windows":
     from rare.utils.compat.wine import get_wine_environment
@@ -139,12 +139,12 @@ class EnvVarsTableModel(QAbstractTableModel):
             if orientation == Qt.Vertical:
                 if section < self.__data_length():
                     if self.__is_readonly(section) or not self.__is_local(section):
-                        return icon("mdi.lock", "ei.lock")
+                        return qta_icon("mdi.lock", "ei.lock")
                     if self.__is_global(section) and self.__is_local(section):
-                        return icon("mdi.refresh", "ei.refresh")
+                        return qta_icon("mdi.refresh", "ei.refresh")
                     if self.__is_local(section):
-                        return icon("mdi.delete", "ei.remove-sign")
+                        return qta_icon("mdi.delete", "ei.remove-sign")
-                return icon("mdi.plus", "ei.plus-sign")
+                return qta_icon("mdi.plus", "ei.plus-sign")
         if role == Qt.TextAlignmentRole:
             return Qt.AlignVCenter + Qt.AlignHCenter
         return None

rare/components/tabs/settings/widgets/wrappers.py

@@ -21,7 +21,7 @@ from PyQt5.QtWidgets import (
 
 from rare.models.wrapper import Wrapper
 from rare.shared import RareCore
-from rare.utils.misc import icon
+from rare.utils.misc import qta_icon
 from rare.widgets.dialogs import ButtonDialog, game_title
 
 if pf.system() in {"Linux", "FreeBSD"}:
@@ -45,7 +45,7 @@ class WrapperEditDialog(ButtonDialog):
         self.setCentralLayout(self.widget_layout)
 
         self.accept_button.setText(self.tr("Save"))
-        self.accept_button.setIcon(icon("fa.edit"))
+        self.accept_button.setIcon(qta_icon("fa.edit"))
         self.accept_button.setEnabled(False)
 
         self.result: Tuple = ()
@@ -108,7 +108,7 @@ class WrapperWidget(QFrame):
         text_lbl.setEnabled(wrapper.is_editable)
 
         image_lbl = QLabel(parent=self)
-        image_lbl.setPixmap(icon("mdi.drag-vertical").pixmap(QSize(20, 20)))
+        image_lbl.setPixmap(qta_icon("mdi.drag-vertical").pixmap(QSize(20, 20)))
 
         edit_action = QAction("Edit", parent=self)
         edit_action.triggered.connect(self.__on_edit)
@@ -119,7 +119,7 @@ class WrapperWidget(QFrame):
         manage_menu.addActions([edit_action, delete_action])
 
         manage_button = QToolButton(parent=self)
-        manage_button.setIcon(icon("mdi.menu"))
+        manage_button.setIcon(qta_icon("mdi.menu"))
         manage_button.setMenu(manage_menu)
         manage_button.setPopupMode(QToolButton.InstantPopup)
         manage_button.setEnabled(wrapper.is_editable)

rare/ui/components/tabs/games/integrations/eos_widget.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'rare/ui/components/tabs/games/integrations/eos_widget.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.9
+# Created by: PyQt5 UI code generator 5.15.10
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_EosWidget(object):
     def setupUi(self, EosWidget):
         EosWidget.setObjectName("EosWidget")
-        EosWidget.resize(464, 98)
+        EosWidget.resize(465, 98)
         EosWidget.setWindowTitle("GroupBox")
         self.eos_layout = QtWidgets.QVBoxLayout(EosWidget)
         self.eos_layout.setSizeConstraint(QtWidgets.QLayout.SetDefaultConstraint)
@@ -27,8 +27,8 @@ class Ui_EosWidget(object):
         self.install_page_layout.setContentsMargins(0, 0, 0, 0)
         self.install_page_layout.setObjectName("install_page_layout")
         self.install_label_layout = QtWidgets.QFormLayout()
-        self.install_label_layout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.install_label_layout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTop|QtCore.Qt.AlignTrailing)
-        self.install_label_layout.setFormAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
+        self.install_label_layout.setFormAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
         self.install_label_layout.setObjectName("install_label_layout")
         self.install_label = QtWidgets.QLabel(self.install_page)
         self.install_label.setObjectName("install_label")
@@ -43,7 +43,7 @@ class Ui_EosWidget(object):
         self.install_button = QtWidgets.QPushButton(self.install_page)
         self.install_button.setMinimumSize(QtCore.QSize(140, 0))
         self.install_button.setObjectName("install_button")
-        self.install_button_layout.addWidget(self.install_button)
+        self.install_button_layout.addWidget(self.install_button, 0, QtCore.Qt.AlignTop)
         self.install_page_layout.addLayout(self.install_button_layout)
         self.install_page_layout.setStretch(0, 1)
         self.overlay_stack.addWidget(self.install_page)
@@ -53,8 +53,8 @@ class Ui_EosWidget(object):
         self.info_page_layout.setContentsMargins(0, 0, 0, 0)
         self.info_page_layout.setObjectName("info_page_layout")
         self.info_label_layout = QtWidgets.QFormLayout()
-        self.info_label_layout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.info_label_layout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTop|QtCore.Qt.AlignTrailing)
-        self.info_label_layout.setFormAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
+        self.info_label_layout.setFormAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
         self.info_label_layout.setObjectName("info_label_layout")
         self.version_label = QtWidgets.QLabel(self.info_page)
         self.version_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
@@ -70,11 +70,11 @@ class Ui_EosWidget(object):
         self.update_button = QtWidgets.QPushButton(self.info_page)
         self.update_button.setMinimumSize(QtCore.QSize(140, 0))
         self.update_button.setObjectName("update_button")
-        self.info_button_layout.addWidget(self.update_button)
+        self.info_button_layout.addWidget(self.update_button, 0, QtCore.Qt.AlignTop)
         self.uninstall_button = QtWidgets.QPushButton(self.info_page)
         self.uninstall_button.setMinimumSize(QtCore.QSize(140, 0))
         self.uninstall_button.setObjectName("uninstall_button")
-        self.info_button_layout.addWidget(self.uninstall_button)
+        self.info_button_layout.addWidget(self.uninstall_button, 0, QtCore.Qt.AlignTop)
         self.info_page_layout.addLayout(self.info_button_layout)
         self.info_page_layout.setStretch(0, 1)
         self.overlay_stack.addWidget(self.info_page)
@@ -86,11 +86,11 @@ class Ui_EosWidget(object):
     def retranslateUi(self, EosWidget):
         _translate = QtCore.QCoreApplication.translate
         EosWidget.setTitle(_translate("EosWidget", "Epic Overlay"))
-        self.install_label.setText(_translate("EosWidget", "Status:"))
+        self.install_label.setText(_translate("EosWidget", "Version"))
         self.install_text.setText(_translate("EosWidget", "Epic Online Services Overlay is not installed"))
         self.install_button.setText(_translate("EosWidget", "Install"))
-        self.version_label.setText(_translate("EosWidget", "Version:"))
+        self.version_label.setText(_translate("EosWidget", "Version"))
-        self.path_label.setText(_translate("EosWidget", "Path:"))
+        self.path_label.setText(_translate("EosWidget", "Install folder"))
         self.update_button.setText(_translate("EosWidget", "Update"))
         self.uninstall_button.setText(_translate("EosWidget", "Uninstall"))
 

rare/ui/components/tabs/games/integrations/eos_widget.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>464</width>
+    <width>465</width>
     <height>98</height>
    </rect>
   </property>
@@ -42,15 +42,15 @@
        <item>
         <layout class="QFormLayout" name="install_label_layout">
          <property name="labelAlignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
          </property>
          <property name="formAlignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
          <item row="0" column="0">
           <widget class="QLabel" name="install_label">
            <property name="text">
-            <string>Status:</string>
+            <string>Version</string>
            </property>
           </widget>
          </item>
@@ -68,7 +68,7 @@
          <property name="rightMargin">
           <number>0</number>
          </property>
-         <item>
+         <item alignment="Qt::AlignTop">
           <widget class="QPushButton" name="install_button">
            <property name="minimumSize">
             <size>
@@ -102,15 +102,15 @@
        <item>
         <layout class="QFormLayout" name="info_label_layout">
          <property name="labelAlignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
          </property>
          <property name="formAlignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
          <item row="0" column="0">
           <widget class="QLabel" name="version_label">
            <property name="text">
-            <string>Version:</string>
+            <string>Version</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -120,7 +120,7 @@
          <item row="1" column="0">
           <widget class="QLabel" name="path_label">
            <property name="text">
-            <string>Path:</string>
+            <string>Install folder</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -131,7 +131,7 @@
        </item>
        <item>
         <layout class="QVBoxLayout" name="info_button_layout">
-         <item>
+         <item alignment="Qt::AlignTop">
           <widget class="QPushButton" name="update_button">
            <property name="minimumSize">
             <size>
@@ -144,7 +144,7 @@
            </property>
           </widget>
          </item>
-         <item>
+         <item alignment="Qt::AlignTop">
           <widget class="QPushButton" name="uninstall_button">
            <property name="minimumSize">
             <size>

rare/utils/misc.py

@@ -157,7 +157,7 @@ def format_size(b: Union[int, float]) -> str:
         b /= 1024
 
 
-def icon(icn_str: str, fallback: str = None, **kwargs):
+def qta_icon(icn_str: str, fallback: str = None, **kwargs):
     try:
         return qtawesome.icon(icn_str, **kwargs)
     except Exception as e:

rare/widgets/collapsible_widget.py

@@ -13,7 +13,7 @@ from PyQt5.QtWidgets import (
     QLabel,
 )
 
-from rare.utils.misc import icon
+from rare.utils.misc import qta_icon
 
 
 class CollapsibleBase(object):
@@ -108,7 +108,7 @@ class CollapsibleFrame(QFrame, CollapsibleBase):
 
         self.toggle_button = QToolButton(self)
         self.toggle_button.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
-        self.toggle_button.setIcon(icon("fa.arrow-right"))
+        self.toggle_button.setIcon(qta_icon("fa.arrow-right"))
         self.toggle_button.setCheckable(True)
         self.toggle_button.setChecked(False)
 
@@ -150,7 +150,7 @@ class CollapsibleFrame(QFrame, CollapsibleBase):
         return super(CollapsibleFrame, self).sizeHint()
 
     def animationStart(self, checked):
-        arrow_type = icon("fa.arrow-down") if checked else icon("fa.arrow-right")
+        arrow_type = qta_icon("fa.arrow-down") if checked else qta_icon("fa.arrow-right")
         self.toggle_button.setIcon(arrow_type)
         super(CollapsibleFrame, self).animationStart(checked)
 

rare/widgets/dialogs.py

@@ -14,7 +14,7 @@ from PyQt5.QtWidgets import (
     QLayout, QSpacerItem, QSizePolicy, QLabel,
 )
 
-from rare.utils.misc import icon
+from rare.utils.misc import qta_icon
 
 
 def game_title(text: str, app_title: str) -> str:
@@ -79,7 +79,7 @@ class ButtonDialog(BaseDialog):
 
         self.reject_button = QPushButton(self)
         self.reject_button.setText(self.tr("Cancel"))
-        self.reject_button.setIcon(icon("fa.remove"))
+        self.reject_button.setIcon(qta_icon("fa.remove"))
         self.reject_button.setAutoDefault(False)
         self.reject_button.clicked.connect(self.reject)
 

rare/widgets/indicator_edit.py

@@ -27,7 +27,7 @@ from PyQt5.QtWidgets import (
     QFileIconProvider,
 )
 
-from rare.utils.misc import icon as qta_icon
+from rare.utils.misc import qta_icon
 
 logger = getLogger("IndicatorEdit")
 

rare/widgets/side_tab.py

@@ -21,7 +21,7 @@ from PyQt5.QtWidgets import (
     QScrollArea, QLayout, QSizePolicy,
 )
 
-from rare.utils.misc import icon as qta_icon
+from rare.utils.misc import qta_icon
 
 logger = getLogger("SideTab")
 
@@ -29,7 +29,7 @@ logger = getLogger("SideTab")
 class SideTabBar(QTabBar):
     def __init__(self, padding: int = -1, parent=None):
         super(SideTabBar, self).__init__(parent=parent)
-        self.setObjectName("SideTabBar")
+        self.setObjectName(type(self).__name__)
         self.padding = padding
         self.fm = QFontMetrics(self.font())