From 4930b40c88ac88ea42e62809ca558f775a6dac2c Mon Sep 17 00:00:00 2001
From: Dummerle <lennardbaeumer@gmail.com>
Date: Fri, 26 Mar 2021 13:29:26 +0100
Subject: [PATCH] Update About page, small style changes

---
 Rare/Components/Tabs/Games/GameInfo/GameInfo.py          | 9 +++++----
 .../Tabs/Games/GameWidgets/BaseInstalledWidget.py        | 8 ++++++--
 .../Tabs/Games/GameWidgets/BaseUninstalledWidget.py      | 6 ++++--
 .../Tabs/Games/GameWidgets/InstalledIconWidget.py        | 2 +-
 Rare/Components/Tabs/Settings/About.py                   | 5 ++++-
 Rare/Styles/RareStyle.qss                                | 2 +-
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/Rare/Components/Tabs/Games/GameInfo/GameInfo.py b/Rare/Components/Tabs/Games/GameInfo/GameInfo.py
index a136a275..3e994968 100644
--- a/Rare/Components/Tabs/Games/GameInfo/GameInfo.py
+++ b/Rare/Components/Tabs/Games/GameInfo/GameInfo.py
@@ -3,7 +3,7 @@ import os
 from PyQt5.QtCore import Qt, pyqtSignal
 from PyQt5.QtGui import QPixmap, QKeyEvent
 from PyQt5.QtWidgets import QWidget, QPushButton, QVBoxLayout, QLabel, QHBoxLayout, QTabWidget, QMessageBox, \
-    QProgressBar, QStackedWidget
+    QProgressBar, QStackedWidget, QGroupBox
 from qtawesome import icon
 
 from Rare.Components.Tabs.Games.GameInfo.GameSettings import GameSettings
@@ -154,13 +154,14 @@ class GameInfo(QWidget):
         self.install_path.setText(self.tr("Install path: ") + self.igame.install_path)
 
 
-class GameActions(QWidget):
+class GameActions(QGroupBox):
     def __init__(self):
         super(GameActions, self).__init__()
+        self.setTitle(f"{self.tr('Game actions')}")
+        self.setStyleSheet("QGroupBox{font-size: 20px}")
         self.layout = QVBoxLayout()
         self.game_actions = QLabel("<h3>Game actions</h3>")
-        self.layout.addWidget(self.game_actions)
-
+        # self.layout.addWidget(self.game_actions)
         uninstall_layout = QHBoxLayout()
         self.uninstall_game = QLabel(self.tr("Uninstall game"))
         uninstall_layout.addWidget(self.uninstall_game)
diff --git a/Rare/Components/Tabs/Games/GameWidgets/BaseInstalledWidget.py b/Rare/Components/Tabs/Games/GameWidgets/BaseInstalledWidget.py
index 03823f8e..800932de 100644
--- a/Rare/Components/Tabs/Games/GameWidgets/BaseInstalledWidget.py
+++ b/Rare/Components/Tabs/Games/GameWidgets/BaseInstalledWidget.py
@@ -1,7 +1,7 @@
 from logging import getLogger
 
 from PyQt5.QtCore import pyqtSignal, QProcess
-from PyQt5.QtWidgets import QWidget
+from PyQt5.QtWidgets import QWidget, QGroupBox
 from custom_legendary.models.game import InstalledGame
 
 from custom_legendary.core import LegendaryCore
@@ -11,7 +11,7 @@ from Rare.utils import LegendaryApi
 logger = getLogger("Game")
 
 
-class BaseInstalledWidget(QWidget):
+class BaseInstalledWidget(QGroupBox):
     launch_signal = pyqtSignal(str)
     show_info = pyqtSignal(str)
     finish_signal = pyqtSignal(str)
@@ -26,6 +26,10 @@ class BaseInstalledWidget(QWidget):
         self.game_running = False
         self.update_available = self.update_available = self.core.get_asset(self.game.app_name, True).build_version != igame.version
 
+        self.setContentsMargins(0,0,0,0)
+
+        # self.setStyleSheet("border-radius: 5px")
+
     def launch(self, offline=False, skip_version_check=False):
 
         logger.info("Launching " + self.igame.title)
diff --git a/Rare/Components/Tabs/Games/GameWidgets/BaseUninstalledWidget.py b/Rare/Components/Tabs/Games/GameWidgets/BaseUninstalledWidget.py
index 2eb6bcce..d57b4097 100644
--- a/Rare/Components/Tabs/Games/GameWidgets/BaseUninstalledWidget.py
+++ b/Rare/Components/Tabs/Games/GameWidgets/BaseUninstalledWidget.py
@@ -1,7 +1,7 @@
 from logging import getLogger
 
 from PyQt5.QtCore import pyqtSignal
-from PyQt5.QtWidgets import QWidget
+from PyQt5.QtWidgets import QWidget, QGroupBox
 
 from Rare.Components.Dialogs.InstallDialog import InstallDialog
 from Rare.utils.Models import InstallOptions
@@ -9,7 +9,7 @@ from Rare.utils.Models import InstallOptions
 logger = getLogger("Uninstalled")
 
 
-class BaseUninstalledWidget(QWidget):
+class BaseUninstalledWidget(QGroupBox):
     install_game = pyqtSignal(InstallOptions)
 
     def __init__(self, game, core, pixmap):
@@ -18,6 +18,8 @@ class BaseUninstalledWidget(QWidget):
         self.core = core
         self.pixmap = pixmap
 
+        self.setContentsMargins(0, 0, 0, 0)
+
     def install(self):
         infos = InstallDialog().get_information()
         if infos != 0:
diff --git a/Rare/Components/Tabs/Games/GameWidgets/InstalledIconWidget.py b/Rare/Components/Tabs/Games/GameWidgets/InstalledIconWidget.py
index 6df549cf..b2dda22a 100644
--- a/Rare/Components/Tabs/Games/GameWidgets/InstalledIconWidget.py
+++ b/Rare/Components/Tabs/Games/GameWidgets/InstalledIconWidget.py
@@ -22,7 +22,7 @@ class GameWidgetInstalled(BaseInstalledWidget):
 
     def __init__(self, game: InstalledGame, core: LegendaryCore, pixmap):
         super(GameWidgetInstalled, self).__init__(game, core, pixmap)
-        self.setObjectName("game_widget_parent")
+        self.setObjectName("game_widget_icon")
 
         self.setContextMenuPolicy(Qt.ActionsContextMenu)
 
diff --git a/Rare/Components/Tabs/Settings/About.py b/Rare/Components/Tabs/Settings/About.py
index ca06b42d..1fa84ae6 100644
--- a/Rare/Components/Tabs/Settings/About.py
+++ b/Rare/Components/Tabs/Settings/About.py
@@ -1,5 +1,5 @@
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel
-
+from Rare import __version__
 
 class About(QWidget):
     def __init__(self):
@@ -9,6 +9,9 @@ class About(QWidget):
         self.title = QLabel("<h2>About</h2>")
         self.layout.addWidget(self.title)
 
+        self.version = QLabel("Version: " + __version__)
+        self.layout.addWidget(self.version)
+
         self.dev = QLabel(self.tr("Developer:") + "<a href='https://github.com/Dummerle'>Dummerle</a>")
         self.dev.setToolTip("Github")
         self.dev.setOpenExternalLinks(True)
diff --git a/Rare/Styles/RareStyle.qss b/Rare/Styles/RareStyle.qss
index 894abe06..49e84d0c 100644
--- a/Rare/Styles/RareStyle.qss
+++ b/Rare/Styles/RareStyle.qss
@@ -13,7 +13,7 @@ QTabBar#main_tab_bar {
 }
 
 QTabBar::tab#main_tab_bar {
-    border-bottom: noneq;
+    border-bottom: none;
 }
 
 QTabBar::tab#main_tab_bar {