Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion rare/components/dialogs/launch.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from PySide6.QtCore import Qt, Signal, Slot
from PySide6.QtWidgets import QLabel
from requests.exceptions import ConnectionError, HTTPError

from rare.shared import RareCore
Expand Down Expand Up @@ -31,7 +32,18 @@ def __init__(self, rcore: RareCore, parent=None):

self.progress_info = ElideLabel(parent=self)
self.progress_info.setFixedHeight(False)
self.ui.launch_layout.addWidget(self.progress_info)
self.progress_info.setAlignment(Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignTop)
self.ui.launch_layout.insertWidget(
self.ui.launch_layout.indexOf(self.ui.progress_bar) + 1, self.progress_info
)
self.ui.info_label.setObjectName('InfoLabel')

self.ui.launch_layout.setStretch(
self.ui.launch_layout.indexOf(self.ui.title_label), 2
)
self.ui.launch_layout.setStretch(
self.ui.launch_layout.indexOf(self.progress_info), 2
)

self.rcore = rcore
self.rcore.progress.connect(self.__on_progress)
Expand Down
3 changes: 3 additions & 0 deletions rare/components/dialogs/login/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ def __init__(self, parent=None):
self.setFrameStyle(QFrame.Shape.StyledPanel)
self.ui = Ui_LandingPage()
self.ui.setupUi(self)
self.ui.login_browser_label.setObjectName('InfoLabel')
self.ui.login_import_label.setObjectName('InfoLabel')


class LoginDialog(BaseDialog):
Expand Down Expand Up @@ -76,6 +78,7 @@ def __init__(self, args: Namespace, core: LegendaryCore, parent=None):
),
}
self.ui.info_label.setText(self.info_message[self.landing_index])
self.ui.info_label.setObjectName('InfoLabel')

self.login_stack.setMinimumWidth(640)
self.login_stack.setMinimumHeight(180)
Expand Down
8 changes: 6 additions & 2 deletions rare/components/tabs/integrations/egl_sync_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from legendary.models.egl import EGLManifest
from legendary.models.game import InstalledGame
from PySide6.QtCore import QRunnable, Qt, QThreadPool, Signal, Slot
from PySide6.QtGui import QShowEvent
from PySide6.QtGui import QFont, QShowEvent
from PySide6.QtWidgets import (
QFileDialog,
QFormLayout,
Expand Down Expand Up @@ -97,13 +97,15 @@ def showEvent(self, a0: QShowEvent) -> None:
super().showEvent(a0)

def __run_wine_resolver(self):
font = QFont()
font.setItalic(True)
self.egl_path_info.setFont(font)
self.egl_path_info.setText(self.tr('Updating...'))
wine_resolver = WinePathResolver(self.core, 'default', str(PathSpec.egl_programdata()))
wine_resolver.signals.result_ready.connect(self.__on_wine_resolver_result)
QThreadPool.globalInstance().start(wine_resolver)

def __on_wine_resolver_result(self, path):
self.egl_path_info.setText(path)
if not path:
self.egl_path_info.setText(
self.tr('Default Wine prefix is unset, or path does not exist. Create it or configure it in Settings -> Linux.')
Expand All @@ -116,6 +118,8 @@ def __on_wine_resolver_result(self, path):
)
)
else:
self.egl_path_info.setFont(QFont('monospace'))
self.egl_path_info.setText(path)
self.egl_path_edit.setText(path)

@staticmethod
Expand Down
1 change: 1 addition & 0 deletions rare/components/tabs/integrations/eos_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ def __init__(self, overlay: RareEosOverlay, prefix: str | None, parent=None):
self.overlay_label = ElideLabel(parent=self)
self.overlay_label.setDisabled(True)
self.overlay_label.setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter)
self.overlay_label.setObjectName('InfoLabel')

self.path_select = QComboBox(self)
self.path_select.setMaximumWidth(150)
Expand Down
1 change: 1 addition & 0 deletions rare/components/tabs/integrations/import_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ def __init__(self, rcore: RareCore, parent=None):

self.ui = Ui_ImportGroup()
self.ui.setupUi(self)
self.ui.platform_info.setObjectName('InfoLabel')

self.worker: ImportWorker | None = None
self.threadpool = QThreadPool.globalInstance()
Expand Down
3 changes: 3 additions & 0 deletions rare/components/tabs/settings/legendary.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ def __init__(self, settings: RareAppSettings, rcore: RareCore, parent=None):

self.ui = Ui_LegendarySettings()
self.ui.setupUi(self)
self.ui.max_workers_info_label.setObjectName('InfoLabel')
self.ui.max_memory_info_label.setObjectName('InfoLabel')
self.ui.metadata_info.setObjectName('InfoLabel')

self.settings = settings
self.rcore = rcore
Expand Down
1 change: 1 addition & 0 deletions rare/components/tabs/settings/rare.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def __init__(self, settings: RareAppSettings, rcore: RareCore, parent=None):

self.ui = Ui_RareSettings()
self.ui.setupUi(self)
self.ui.interface_info.setObjectName('InfoLabel')

# Select lang
self.ui.lang_select.addItem(self.tr('System default'), app_settings.language.default)
Expand Down
118 changes: 59 additions & 59 deletions rare/resources/static_css/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,65 +6,65 @@
from PySide6 import QtCore

qt_resource_data = b"\
\x00\x00\x03\x82\
\x00\x00\x03\x88\
\x00\
\x00\x0f\xa5x\x9c\xbdW]\x8f\xd2@\x14}\xe7W\xcc\
BH\xdc\x8d`?h\x81\x1a_V\x8d1q]7\
\xa0>\x18\x1f\xa6\x9dK;\xd92\xd3L\xa7\x02\x1a\xff\
\xbbSZ\xa0\x85v@\xa3n\x08t\xe7\xe3\x9c{\xcf\
\xbd\xbdw\xe6\xd9\x0d\x9aG4E\x0b\x1a\x03R\xbf8\
\x93|\x10\x02\x03\x81%\x10\xb4\x10|\x89\xba\xa9\xdc\xc4\
\x90F\x00r\x98l\xbaC\xf4\xea\x1e\xbd\xbf\x9f\xa3\xd7\
\xaf\xde\xce\xaf\xae\xae\xd0\xcd\xb3N\xe7\xe1C\x96F\xb7\
\x99\x94\x9c\xa1\x1f\x1d\xa4\xfe\x96\x94\x0d\x22\xa0a$=\
d\x0d\xc7\x0e\xac\x9fw~\xaau\x82\x87\x02\xd2\xf4\x16\
\x0b\xfd\xc2YB\xd9-_\xeb\x17\xcd9\x8f/a}\
G\x19\xbc&T\xeaW\xbd\xe4K\x9f\x9f\xe5<x\xfa\
e\x11c\xf9\xa2+E\x06\xdd\xaf\xe5&\x9f\x0b\x02\xc2\
CF\xa2V\x1f\x06\x06\x02\x13\x9a\xa5\x1er\xf6\xe38\
x\x0c\x05\xcf\x18\x19\x04<\xe6j\x8b\x08}\xfc\xc4r\
\x9c\xa7\xe8\xf0\xe5\xf4\xaf\x0b\x07\xb0\x0fq\xef-[\xf0\
\xedSIVn\xecM\xa7\xd3\x02t\xc1\x99\x1cl\xc3\
\xe5!*qL\x83\xca\xf8\xaa\xf4\x85q\xb1\xc4\xf1\x91\
/\x0a;U\x1b\xeaj\x96\xb6\xefh\x0c\xc3\x1f\x19F\
\x9b\xf9j\xda\xddNkp\xbd\x88\x7f\x03\xd1\x86>\x19\
k\xd1G\xee9tBS\xec\xc7*o[\x08\xec@\
K`MN\x09>2z^\x98\x5c\x16\x0d\xb2[N\
k\x91u\xd2\xe4\xc2h\xf0sa\xce\xe3\xeb\xc5\xc9\xa5\
\xd1P\xe4\xd2\x9cR|\x02A\x17\x1b\x9d2\xae\xef\x8c\
\xad\xa0\x15\xd6v\xac\xc0tu\xb0:YFc\x1b\x9b\
\xa4\xddf\xdf\xb2MS\x0b~F\x93\xd2\xba6\xfc\x91\
I\x0c8\xc6\xbfS\xf6\xea\x14\xb1\x0c\xd7q\xdb\x151\
\x0d\xdb\xb2O\x149\x80\xea\xf40\xdd\x91=\x9a\xb4'\
8\xb1&\x96\xaf\x81\xd6\xab\xb1\xb3\xac\x0d\xdd\xb7,k\
T)V\x0f\x19d\xf0\x99\x8bG\x10\xd5\x9aU\xa2\xae\
(\x91\x91\x87\xcc\xa32Y\xd6\xae\x94\xc7\x944\xd6O\
;Yk8\xbe\xac\xb6\xcfr\x93\xc0\x8bn\x11\xe9b\
\xf6\xa8>\xffA~^@\x98K\xa9\xa7\xbb<\xf8\x17\
\xd0\xbd\x8cyFf\x1b\x16\x9cq\x91\xb8S\xb7=+\
\xec\xb1\xed\xd8\xd5\xb8\xed:\xf4\xe5A\xdb\xf7\xb6~C\
\xb7\xf1yL\xaa\xcd\x89~W\xf15\xddDV\xfbZ\
\xc0\xd9gJB\x903\x89eV\xa3n\x01+\xcd_\
ET\x82\xb6\xa1\x1aOQ\xf1q\xb7\xbdTcv9\
,y2\x88a!\xf7\xf3\xa6y\xba@\xe4\xf6\xd4W\
(o\x0a\x1f*\xee\xdcQF\x8b\xa7z\xc7V\x96=\
\xb1\xec\x89j\xf2\xe5\xd7\xf5\xdf\xf5\xc1\xe7\xea\x85^\xd6\
\xdd\x986.\xa9;2\xed7FeNe\x0c\xff$\
(F\xfd|s`T\x07;I\x93\x86\xc3\xce\x1f\x80\
W\xcf\x0b{\x86\x86\x1a\xbd\xcd\xec\xa2\xf6 ?V\xe0\
\x8dR\x9bF\xffw\x82\xa5\xe7\xd7\x94\xf3P\xe0ME\
\x9bw4\x95\x97G\xa3a\xdb?|\xb5\xc6Gi\xb9\
=\xfe\x9e\x15\xd2\xde\x95\x91\x04\x13BY\xb8MW\xb5\
uh\xc3\xb2>!\x0a\x13\xcb\x99&I\xfeF\xba\xfc\
w/*yqp\xa5\x96\x97\x12\xd6r\xa0\x8e\xf1!\
\xf3P\x8e\xdb\xe8\xbc\xf6V\x90_\x92\xb0\xafn[\xbd\
;LY\xf1\xe8y\x12\xfb\xcd\xdd\xbezq9\x91K\
\x0a\xcc\xd2\x04\x0b`\xf2\xd8\xfe\x19\xc4\x10\xc8O\x14V\
\x9a\xb7\x8bq\xd6\x1a\x0a\x0dv\xf1\xb3\xbb\xc2\xd5\x91\xf5\
8\x8d~\x95\xe1(G\xf2k_\x04\xc1\xa3\xba\xf6\xf5\
\xde\xe0%\xccq\xb8\xfb\x7fw\x0d\xc4\x22\xa4\xec\xb4\xeb\
\xfd\xee\x09\xa64\xf0\xf2L\xda\x1fv~\x01\xd3a\xec\
\xde\
\x00\x0f\xffx\x9c\xbdWmo\xda0\x10\xfe\xde_\xe1\
R!\xadS\xa1y!\x012\xf5K\xb7i\xaa\xd4n\
\xab\xca\xb6\x0f\xd5>8\xf1\x91X\x0dv\xe48\xa3l\
\xda\x7f\x9fC\x02$\x90\x18Z\xb5C\x88\x04\xbf<w\
\xf7\xdc\xf9\xee|\xfe\x16M\x22\x9a\xa2)\x8d\x01\xa9'\
\xce$\xef\x85\xc0@`\x09\x04M\x05\x9f\xa1N*\x17\
1\xa4\x11\x80\xec'\x8bN\x1f}\xf8\x82>\x7f\x99\xa0\
\x8f\x1f\xae&\xc7\xc7\xc7\xe8\xed\xf9\xd1\xd1\xed\xd7,\x8d\
.3)9C\x7f\x8e\x90\xfa\xcc(\xebE@\xc3H\
z\xc8\xea\x0f\x1dx|w\xf4W\xad\x13<\x14\x90\xa6\
\x97X\xe8\x17\xde%\x94]\xf2G\xfd\xa2\x09\xe7\xf1!\
R\xaf)\x83\x8f\x84J\xfd\xaa\xf7|\xe6\xf3\xbd27\
\x96\xdeOc,/:Rd\xd0\xf9Yn\xf2\xb9 \
<d$j\xf5f\xa0'0\xa1Y\xea!g=\
\x8e\x83\x87P\xf0\x8c\x91^\xc0c\xae\xb6\x88\xd0\xc7o\
,\xc79C\x9b\x1f\xa7{Z\x18\x80}\x88O\xae\xd8\
\x94/\xdfJa\xe5\xc6\x93\xf1x\x5c\x80N9\x93\xbd\
\xa5\xbb<D%\x8eiP\x19\x9f\x97\xb60.f8\
.,\x8e xP\x16\xbf<\xf2\x86%\x85\x9d\xaa\x0d\
u?\x95\xac\xac\xc4\x18\x86?0\x8c6b\xd4\xb4\xbb\
\x9c\xd6\xe0z\x11\xff\x05\xa2\x0d}4\xd4\xa2\x0f\xdc}\
\xe8\x84\xa6\xd8\x8f\xd5\x89h\x11`\x07Z\x01\xd6hW\
\xc07F\xf7\x13\x93\xd3\xa2Av\xcbi-\xb2\x8e\x9a\
\x9c\x18\x0d~N\xcc~|=995\x1a\x1195\
\xbb\x22\xbe\x83\xa0\xd3\x85\x8e\x19\xd7w\x86V\xd0\x0ak\
;V`\xba:X\x1d-\x83\xa1\x8dM\xd2\xae\xb3o\
\xd9\xa6\xa9\x05\xdf\xc3I\xa9]\x1b\xfe\xc0$\x06l\xe3\
\xdf(}u\x8cX\x86\xeb\xb8\xed\x8c\x98\x86m\xd9;\
\x8cl@u|\x98\xee\xc0\x1e\x8c\xda\x03\x9cX#\xcb\
\xd7@\xeb\xd9Xi\xd6\x86\xee[\x965\xa8\xa4\xc1\xdb\
\x0c2\xf8\xc1\xc5\x03\x88j\xce*Q\xe7\x94\xc8\xc8C\
\xe6V\x02.sW\xcacJj\x13\xab\xccl'\x8f\
\x1a\x19\xf7\xf3\xe5\xbb\x5c$p\xd1)<]\xccne\
\xfeg\xc4\xe7\x01\x02s*\xf5\xe2\x0ew\xfe\x01\xe2\xde\
\xc7<#w\x0b\x16\xec1\x91\xb8c\xb7=*\xec\xa1\
\xed\xd8U\xbf\xadj\xff\xe1N[W\xcdnC\xb5\xf1\
yL\xaa\xc5\x89\xfeV\xfe5\xddDV+f\xc0\xd9\
\x0fJB\x90w\x12\xcb\xac&\xba\x05\xacT\x7f\x1eQ\
\x09\xdaRm\x9c\xa1\xe2\xeb.\xab\xb4F\xedrX\xf2\
\xa4\x17\xc3T\xae\xe7Msw\x81\xc8\xf5\xa9\xafP\xd6\
\x146T\xcc\xb9\xa1\x8c\x16o\xf5\x8a\xad4{c\xd9\
#\xd5>\x94?\xa7/k\x83\xcf\xd5\x81\x9e\xd5\xcd\x18\
7.\xa9\x1b2\xee6zeBe\x0c\xaf\xe2\x14\xa3\
\xde9m$\xaa\x96Q\xd2\xa4\xa1\xd9y\x06x\xb5_\
XKh\xc8\xd1\xcb\xc8.r\x0f\xf2c\x05\xdeH\xb5\
it\x9f\xe2,\xbd|M:\x0f\x05^T\xb8\xb9\xa6\
\xa9<\xdc\x1b\x0d\xdb^\xf1h\x0d\xb7\xc2r\xd9X\xef\
%\xd2^\xa5\x91\x04\x13BY\xb8\x0cW\xb5\xb5o\xc3\
\xac>!\x0a\x15\xcb\x99&J^\x22\x5c\xfe\xbb\x15\x95\
\xb8\xd8\x98R\x8bK\x09\x8f\xb2\xa7\xda\xf8\x90y(\xc7\
m4^{+\xc8\xaf_\xd8W\xf7\xb8\x93\x1bLY\
\xf1\xeay\x12\xfb\xcd\xd5\xbez%\xda\xa1K\x0a\xcc\xd2\
\x04\x0b`r[\xff;\x88!\x90\xdf)\xcc5\xa7\x8b\
q\xd6\xea\x0a\x0dv\xf1X]\x0e\xeb\xc8z\x9cF\xbb\
Jw\x94#\xd5\xeb\xd5'<\x83\x09\x0eW\xffW\x17\
L,B\xcav\xab\xdeS;\x98R\xc1\xc3#i\xdd\
\xec\xfc\x03\x95\x03\x08\xca\
"

qt_resource_name = b"\
Expand All @@ -84,7 +84,7 @@
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
\x00\x00\x00\x00\x00\x00\x00\x00\
\x00\x00\x00\x1a\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\
\x00\x00\x01\x9c]y\xf9\xe9\
\x00\x00\x01\x9d\xc9~\xe1\xf2\
"

def qInitResources():
Expand Down
12 changes: 9 additions & 3 deletions rare/resources/static_css/stylesheet.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,16 @@ def css_name(widget: wrappertype | QObject | type, subwidget: str = ''):


# InfoLabel
info_label_props = {
'color': '#999',
'fontStyle': 'italic',
'fontWeight': 'normal',
}
style.QLabel['#InfoLabel'].setValues(
color='#999',
fontStyle='italic',
fontWeight='normal',
**info_label_props
)
style.QCheckBox['#InfoLabel'].setValues(
**info_label_props
)


Expand Down
5 changes: 5 additions & 0 deletions rare/resources/static_css/stylesheet.qss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ QLabel#InfoLabel {
font-style: italic;
font-weight: normal;
}
QCheckBox#InfoLabel {
color: #999;
font-style: italic;
font-weight: normal;
}
QPushButton#InstallButton {
border-color: #00b400;
background-color: #006400;
Expand Down
27 changes: 18 additions & 9 deletions rare/ui/components/dialogs/launch_dialog.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# -*- coding: utf-8 -*-

################################################################################
## Form generated from reading UI file 'launch_dialog.ui'
##
## Created by: Qt User Interface Compiler version 6.9.1
## Created by: Qt User Interface Compiler version 6.10.1
##
## WARNING! All changes made in this file will be lost when recompiling UI file!
################################################################################

from PySide6.QtCore import QCoreApplication, QSize
from PySide6.QtGui import QFont
from PySide6.QtWidgets import QLabel, QProgressBar, QSizePolicy, QVBoxLayout


class Ui_LaunchDialog(object):
class Ui_LaunchDialog:
def setupUi(self, LaunchDialog):
if not LaunchDialog.objectName():
LaunchDialog.setObjectName(u"LaunchDialog")
LaunchDialog.setObjectName("LaunchDialog")
LaunchDialog.resize(400, 160)
sizePolicy = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
sizePolicy.setHorizontalStretch(0)
Expand All @@ -25,24 +25,33 @@ def setupUi(self, LaunchDialog):
LaunchDialog.setMinimumSize(QSize(400, 160))
LaunchDialog.setMaximumSize(QSize(400, 160))
self.launch_layout = QVBoxLayout(LaunchDialog)
self.launch_layout.setObjectName(u"launch_layout")
self.launch_layout.setObjectName("launch_layout")
self.title_label = QLabel(LaunchDialog)
self.title_label.setObjectName(u"title_label")
self.title_label.setObjectName("title_label")

self.launch_layout.addWidget(self.title_label)

self.progress_bar = QProgressBar(LaunchDialog)
self.progress_bar.setObjectName(u"progress_bar")
self.progress_bar.setObjectName("progress_bar")
self.progress_bar.setValue(0)

self.launch_layout.addWidget(self.progress_bar)

self.info_label = QLabel(LaunchDialog)
self.info_label.setObjectName("info_label")
font = QFont()
font.setItalic(True)
self.info_label.setFont(font)

self.launch_layout.addWidget(self.info_label)


self.retranslateUi(LaunchDialog)
# setupUi

def retranslateUi(self, LaunchDialog):
LaunchDialog.setWindowTitle(QCoreApplication.translate("LaunchDialog", u"Launching", None))
self.title_label.setText(QCoreApplication.translate("LaunchDialog", u"<h2>Launching Rare</h2>", None))
LaunchDialog.setWindowTitle(QCoreApplication.translate("LaunchDialog", "Launching", None))
self.title_label.setText(QCoreApplication.translate("LaunchDialog", "<h2>Launching Rare</h2>", None))
self.info_label.setText(QCoreApplication.translate("LaunchDialog", "Progress might look stuck when launching for the first time.", None))
# retranslateUi

12 changes: 12 additions & 0 deletions rare/ui/components/dialogs/launch_dialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="info_label">
<property name="font">
<font>
<italic>true</italic>
</font>
</property>
<property name="text">
<string>Progress might look stuck when launching for the first time.</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
Expand Down
Loading
Loading