Skip to content

Commit 24369cf

Browse files
loathingKernelloathingKernel
committed
LegendarySettings: remove entitlements UI elements
1 parent c9bef37 commit 24369cf

4 files changed

Lines changed: 61 additions & 93 deletions

File tree

‎rare/components/tabs/settings/legendary.py‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,6 @@ def __init__(self, settings: RareAppSettings, rcore: RareCore, parent=None):
118118
self.ui.exclude_non_asset_check.setChecked(self.settings.get_value(app_settings.exclude_non_asset))
119119
self.ui.exclude_non_asset_check.checkStateChanged.connect(self._on_exclude_non_asset_changed)
120120

121-
self.ui.exclude_entitlements_check.setChecked(self.settings.get_value(app_settings.exclude_entitlements))
122-
self.ui.exclude_entitlements_check.checkStateChanged.connect(self._on_exclude_entitlements_changed)
123-
124121
self.ui.refresh_metadata_button.clicked.connect(self._refresh_metadata)
125122
# FIXME: Disable the button for now because it interferes with RareCore
126123
self.ui.refresh_metadata_button.setEnabled(False)
@@ -279,7 +276,3 @@ def _on_fetch_unreal_changed(self, state: Qt.CheckState):
279276
@Slot(Qt.CheckState)
280277
def _on_exclude_non_asset_changed(self, state: Qt.CheckState):
281278
self.settings.set_value(app_settings.exclude_non_asset, state != Qt.CheckState.Unchecked)
282-
283-
@Slot(Qt.CheckState)
284-
def _on_exclude_entitlements_changed(self, state: Qt.CheckState):
285-
self.settings.set_value(app_settings.exclude_entitlements, state != Qt.CheckState.Unchecked)

‎rare/models/settings.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class Settings(Namespace):
2727
macos_meta = Setting(key='macos_meta', default=pf.system() == 'Darwin', dtype=bool)
2828
unreal_meta = Setting(key='unreal_meta', default=False, dtype=bool)
2929
exclude_non_asset = Setting(key='exclude_non_asset', default=False, dtype=bool)
30-
exclude_entitlements = Setting(key='exclude_entitlements', default=False, dtype=bool)
3130

3231
language = Setting(key='language', default=locale.getlocale()[0], dtype=str)
3332

‎rare/ui/components/tabs/settings/legendary.py‎

Lines changed: 60 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
# -*- coding: utf-8 -*-
21

32
################################################################################
43
## Form generated from reading UI file 'legendary.ui'
54
##
6-
## Created by: Qt User Interface Compiler version 6.9.1
5+
## Created by: Qt User Interface Compiler version 6.10.1
76
##
87
## WARNING! All changes made in this file will be lost when recompiling UI file!
98
################################################################################
@@ -25,32 +24,32 @@
2524
)
2625

2726

28-
class Ui_LegendarySettings(object):
27+
class Ui_LegendarySettings:
2928
def setupUi(self, LegendarySettings):
3029
if not LegendarySettings.objectName():
31-
LegendarySettings.setObjectName(u"LegendarySettings")
32-
LegendarySettings.resize(621, 420)
33-
LegendarySettings.setWindowTitle(u"LegendarySettings")
30+
LegendarySettings.setObjectName("LegendarySettings")
31+
LegendarySettings.resize(641, 420)
32+
LegendarySettings.setWindowTitle("LegendarySettings")
3433
self.legendary_layout = QHBoxLayout(LegendarySettings)
35-
self.legendary_layout.setObjectName(u"legendary_layout")
34+
self.legendary_layout.setObjectName("legendary_layout")
3635
self.left_layout = QVBoxLayout()
37-
self.left_layout.setObjectName(u"left_layout")
36+
self.left_layout.setObjectName("left_layout")
3837
self.install_dir_group = QGroupBox(LegendarySettings)
39-
self.install_dir_group.setObjectName(u"install_dir_group")
38+
self.install_dir_group.setObjectName("install_dir_group")
4039
self.install_dir_group.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignTop)
4140
self.install_dir_layout = QVBoxLayout(self.install_dir_group)
42-
self.install_dir_layout.setObjectName(u"install_dir_layout")
41+
self.install_dir_layout.setObjectName("install_dir_layout")
4342

4443
self.left_layout.addWidget(self.install_dir_group)
4544

4645
self.download_group = QGroupBox(LegendarySettings)
47-
self.download_group.setObjectName(u"download_group")
46+
self.download_group.setObjectName("download_group")
4847
self.download_group.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignTop)
4948
self.download_layout = QFormLayout(self.download_group)
50-
self.download_layout.setObjectName(u"download_layout")
49+
self.download_layout.setObjectName("download_layout")
5150
self.download_layout.setLabelAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
5251
self.max_workers_label = QLabel(self.download_group)
53-
self.max_workers_label.setObjectName(u"max_workers_label")
52+
self.max_workers_label.setObjectName("max_workers_label")
5453
sizePolicy = QSizePolicy(QSizePolicy.Policy.Maximum, QSizePolicy.Policy.Preferred)
5554
sizePolicy.setHorizontalStretch(0)
5655
sizePolicy.setVerticalStretch(0)
@@ -60,9 +59,9 @@ def setupUi(self, LegendarySettings):
6059
self.download_layout.setWidget(0, QFormLayout.ItemRole.LabelRole, self.max_workers_label)
6160

6261
self.max_workers_layout = QHBoxLayout()
63-
self.max_workers_layout.setObjectName(u"max_workers_layout")
62+
self.max_workers_layout.setObjectName("max_workers_layout")
6463
self.max_worker_spin = QSpinBox(self.download_group)
65-
self.max_worker_spin.setObjectName(u"max_worker_spin")
64+
self.max_worker_spin.setObjectName("max_worker_spin")
6665
sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
6766
sizePolicy1.setHorizontalStretch(0)
6867
sizePolicy1.setVerticalStretch(0)
@@ -75,7 +74,7 @@ def setupUi(self, LegendarySettings):
7574
self.max_workers_layout.addWidget(self.max_worker_spin)
7675

7776
self.max_workers_info_label = QLabel(self.download_group)
78-
self.max_workers_info_label.setObjectName(u"max_workers_info_label")
77+
self.max_workers_info_label.setObjectName("max_workers_info_label")
7978
font = QFont()
8079
font.setItalic(True)
8180
self.max_workers_info_label.setFont(font)
@@ -86,14 +85,14 @@ def setupUi(self, LegendarySettings):
8685
self.download_layout.setLayout(0, QFormLayout.ItemRole.FieldRole, self.max_workers_layout)
8786

8887
self.max_memory_label = QLabel(self.download_group)
89-
self.max_memory_label.setObjectName(u"max_memory_label")
88+
self.max_memory_label.setObjectName("max_memory_label")
9089

9190
self.download_layout.setWidget(1, QFormLayout.ItemRole.LabelRole, self.max_memory_label)
9291

9392
self.max_memory_layout = QHBoxLayout()
94-
self.max_memory_layout.setObjectName(u"max_memory_layout")
93+
self.max_memory_layout.setObjectName("max_memory_layout")
9594
self.max_memory_spin = QSpinBox(self.download_group)
96-
self.max_memory_spin.setObjectName(u"max_memory_spin")
95+
self.max_memory_spin.setObjectName("max_memory_spin")
9796
sizePolicy1.setHeightForWidth(self.max_memory_spin.sizePolicy().hasHeightForWidth())
9897
self.max_memory_spin.setSizePolicy(sizePolicy1)
9998
self.max_memory_spin.setMinimum(0)
@@ -104,7 +103,7 @@ def setupUi(self, LegendarySettings):
104103
self.max_memory_layout.addWidget(self.max_memory_spin)
105104

106105
self.max_memory_info_label = QLabel(self.download_group)
107-
self.max_memory_info_label.setObjectName(u"max_memory_info_label")
106+
self.max_memory_info_label.setObjectName("max_memory_info_label")
108107
self.max_memory_info_label.setFont(font)
109108

110109
self.max_memory_layout.addWidget(self.max_memory_info_label)
@@ -113,22 +112,22 @@ def setupUi(self, LegendarySettings):
113112
self.download_layout.setLayout(1, QFormLayout.ItemRole.FieldRole, self.max_memory_layout)
114113

115114
self.preferred_cdn_label = QLabel(self.download_group)
116-
self.preferred_cdn_label.setObjectName(u"preferred_cdn_label")
115+
self.preferred_cdn_label.setObjectName("preferred_cdn_label")
117116

118117
self.download_layout.setWidget(2, QFormLayout.ItemRole.LabelRole, self.preferred_cdn_label)
119118

120119
self.preferred_cdn_line = QLineEdit(self.download_group)
121-
self.preferred_cdn_line.setObjectName(u"preferred_cdn_line")
120+
self.preferred_cdn_line.setObjectName("preferred_cdn_line")
122121

123122
self.download_layout.setWidget(2, QFormLayout.ItemRole.FieldRole, self.preferred_cdn_line)
124123

125124
self.disable_https_label = QLabel(self.download_group)
126-
self.disable_https_label.setObjectName(u"disable_https_label")
125+
self.disable_https_label.setObjectName("disable_https_label")
127126

128127
self.download_layout.setWidget(3, QFormLayout.ItemRole.LabelRole, self.disable_https_label)
129128

130129
self.disable_https_check = QCheckBox(self.download_group)
131-
self.disable_https_check.setObjectName(u"disable_https_check")
130+
self.disable_https_check.setObjectName("disable_https_check")
132131

133132
self.download_layout.setWidget(3, QFormLayout.ItemRole.FieldRole, self.disable_https_check)
134133

@@ -143,75 +142,70 @@ def setupUi(self, LegendarySettings):
143142
self.legendary_layout.addLayout(self.left_layout)
144143

145144
self.right_layout = QVBoxLayout()
146-
self.right_layout.setObjectName(u"right_layout")
145+
self.right_layout.setObjectName("right_layout")
147146
self.locale_group = QGroupBox(LegendarySettings)
148-
self.locale_group.setObjectName(u"locale_group")
147+
self.locale_group.setObjectName("locale_group")
149148
sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)
150149
sizePolicy2.setHorizontalStretch(0)
151150
sizePolicy2.setVerticalStretch(0)
152151
sizePolicy2.setHeightForWidth(self.locale_group.sizePolicy().hasHeightForWidth())
153152
self.locale_group.setSizePolicy(sizePolicy2)
154153
self.locale_group.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignTop)
155154
self.locale_layout = QVBoxLayout(self.locale_group)
156-
self.locale_layout.setObjectName(u"locale_layout")
155+
self.locale_layout.setObjectName("locale_layout")
157156

158157
self.right_layout.addWidget(self.locale_group)
159158

160159
self.cleanup_group = QGroupBox(LegendarySettings)
161-
self.cleanup_group.setObjectName(u"cleanup_group")
160+
self.cleanup_group.setObjectName("cleanup_group")
162161
self.cleanup_group.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignTop)
163162
self.cleanup_layout = QVBoxLayout(self.cleanup_group)
164-
self.cleanup_layout.setObjectName(u"cleanup_layout")
163+
self.cleanup_layout.setObjectName("cleanup_layout")
165164
self.clean_keep_manifests_button = QPushButton(self.cleanup_group)
166-
self.clean_keep_manifests_button.setObjectName(u"clean_keep_manifests_button")
165+
self.clean_keep_manifests_button.setObjectName("clean_keep_manifests_button")
167166

168167
self.cleanup_layout.addWidget(self.clean_keep_manifests_button)
169168

170169
self.clean_button = QPushButton(self.cleanup_group)
171-
self.clean_button.setObjectName(u"clean_button")
170+
self.clean_button.setObjectName("clean_button")
172171

173172
self.cleanup_layout.addWidget(self.clean_button)
174173

175174

176175
self.right_layout.addWidget(self.cleanup_group)
177176

178177
self.metadata_group = QGroupBox(LegendarySettings)
179-
self.metadata_group.setObjectName(u"metadata_group")
178+
self.metadata_group.setObjectName("metadata_group")
180179
self.metadata_layout = QVBoxLayout(self.metadata_group)
181-
self.metadata_layout.setObjectName(u"metadata_layout")
180+
self.metadata_layout.setObjectName("metadata_layout")
182181
self.fetch_win32_check = QCheckBox(self.metadata_group)
183-
self.fetch_win32_check.setObjectName(u"fetch_win32_check")
182+
self.fetch_win32_check.setObjectName("fetch_win32_check")
184183

185184
self.metadata_layout.addWidget(self.fetch_win32_check)
186185

187186
self.fetch_macos_check = QCheckBox(self.metadata_group)
188-
self.fetch_macos_check.setObjectName(u"fetch_macos_check")
187+
self.fetch_macos_check.setObjectName("fetch_macos_check")
189188

190189
self.metadata_layout.addWidget(self.fetch_macos_check)
191190

192191
self.fetch_unreal_check = QCheckBox(self.metadata_group)
193-
self.fetch_unreal_check.setObjectName(u"fetch_unreal_check")
192+
self.fetch_unreal_check.setObjectName("fetch_unreal_check")
194193

195194
self.metadata_layout.addWidget(self.fetch_unreal_check)
196195

197196
self.exclude_non_asset_check = QCheckBox(self.metadata_group)
198-
self.exclude_non_asset_check.setObjectName(u"exclude_non_asset_check")
197+
self.exclude_non_asset_check.setObjectName("exclude_non_asset_check")
199198

200199
self.metadata_layout.addWidget(self.exclude_non_asset_check)
201200

202-
self.exclude_entitlements_check = QCheckBox(self.metadata_group)
203-
self.exclude_entitlements_check.setObjectName(u"exclude_entitlements_check")
204-
205-
self.metadata_layout.addWidget(self.exclude_entitlements_check)
206-
207201
self.metadata_info = QLabel(self.metadata_group)
208-
self.metadata_info.setObjectName(u"metadata_info")
202+
self.metadata_info.setObjectName("metadata_info")
209203
self.metadata_info.setFont(font)
210204

211205
self.metadata_layout.addWidget(self.metadata_info)
212206

213207
self.refresh_metadata_button = QPushButton(self.metadata_group)
214-
self.refresh_metadata_button.setObjectName(u"refresh_metadata_button")
208+
self.refresh_metadata_button.setObjectName("refresh_metadata_button")
215209

216210
self.metadata_layout.addWidget(self.refresh_metadata_button)
217211

@@ -230,39 +224,33 @@ def setupUi(self, LegendarySettings):
230224
# setupUi
231225

232226
def retranslateUi(self, LegendarySettings):
233-
self.install_dir_group.setTitle(QCoreApplication.translate("LegendarySettings", u"Installation folder", None))
234-
self.download_group.setTitle(QCoreApplication.translate("LegendarySettings", u"Download settings", None))
235-
self.max_workers_label.setText(QCoreApplication.translate("LegendarySettings", u"Max workers", None))
236-
self.max_workers_info_label.setText(QCoreApplication.translate("LegendarySettings", u"Less is slower (0: Default)", None))
237-
self.max_memory_label.setText(QCoreApplication.translate("LegendarySettings", u"Max shared memory", None))
238-
self.max_memory_spin.setSuffix(QCoreApplication.translate("LegendarySettings", u"MiB", None))
239-
self.max_memory_info_label.setText(QCoreApplication.translate("LegendarySettings", u"Less is slower (0: Default)", None))
240-
self.preferred_cdn_label.setText(QCoreApplication.translate("LegendarySettings", u"Preferred CDN", None))
241-
self.preferred_cdn_line.setPlaceholderText(QCoreApplication.translate("LegendarySettings", u"Default", None))
242-
self.disable_https_label.setText(QCoreApplication.translate("LegendarySettings", u"Disable HTTPS", None))
227+
self.install_dir_group.setTitle(QCoreApplication.translate("LegendarySettings", "Installation folder", None))
228+
self.download_group.setTitle(QCoreApplication.translate("LegendarySettings", "Download settings", None))
229+
self.max_workers_label.setText(QCoreApplication.translate("LegendarySettings", "Max workers", None))
230+
self.max_workers_info_label.setText(QCoreApplication.translate("LegendarySettings", "Less is slower (0: Default)", None))
231+
self.max_memory_label.setText(QCoreApplication.translate("LegendarySettings", "Max shared memory", None))
232+
self.max_memory_spin.setSuffix(QCoreApplication.translate("LegendarySettings", "MiB", None))
233+
self.max_memory_info_label.setText(QCoreApplication.translate("LegendarySettings", "Less is slower (0: Default)", None))
234+
self.preferred_cdn_label.setText(QCoreApplication.translate("LegendarySettings", "Preferred CDN", None))
235+
self.preferred_cdn_line.setPlaceholderText(QCoreApplication.translate("LegendarySettings", "Default", None))
236+
self.disable_https_label.setText(QCoreApplication.translate("LegendarySettings", "Disable HTTPS", None))
243237
self.disable_https_check.setText("")
244-
self.locale_group.setTitle(QCoreApplication.translate("LegendarySettings", u"Locale", None))
245-
self.cleanup_group.setTitle(QCoreApplication.translate("LegendarySettings", u"Cleanup", None))
246-
self.clean_keep_manifests_button.setText(QCoreApplication.translate("LegendarySettings", u"Clean, but keep manifests", None))
247-
self.clean_button.setText(QCoreApplication.translate("LegendarySettings", u"Remove everything", None))
248-
self.metadata_group.setTitle(QCoreApplication.translate("LegendarySettings", u"Platforms", None))
249-
self.fetch_win32_check.setText(QCoreApplication.translate("LegendarySettings", u"Include Win32 games", None))
250-
self.fetch_macos_check.setText(QCoreApplication.translate("LegendarySettings", u"Include macOS games", None))
251-
self.fetch_unreal_check.setText(QCoreApplication.translate("LegendarySettings", u"Include Unreal engine", None))
238+
self.locale_group.setTitle(QCoreApplication.translate("LegendarySettings", "Locale", None))
239+
self.cleanup_group.setTitle(QCoreApplication.translate("LegendarySettings", "Cleanup", None))
240+
self.clean_keep_manifests_button.setText(QCoreApplication.translate("LegendarySettings", "Clean, but keep manifests", None))
241+
self.clean_button.setText(QCoreApplication.translate("LegendarySettings", "Remove everything", None))
242+
self.metadata_group.setTitle(QCoreApplication.translate("LegendarySettings", "Platforms", None))
243+
self.fetch_win32_check.setText(QCoreApplication.translate("LegendarySettings", "Include Win32 games", None))
244+
self.fetch_macos_check.setText(QCoreApplication.translate("LegendarySettings", "Include macOS games", None))
245+
self.fetch_unreal_check.setText(QCoreApplication.translate("LegendarySettings", "Include Unreal engine", None))
252246
#if QT_CONFIG(tooltip)
253-
self.exclude_non_asset_check.setToolTip(QCoreApplication.translate("LegendarySettings", u"Do not load metadata for non-asset games (i.e. Origin games) on start-up.\n"
247+
self.exclude_non_asset_check.setToolTip(QCoreApplication.translate("LegendarySettings", "Do not load metadata for non-asset games (i.e. Origin games) on start-up.\n"
254248
"\n"
255249
"Disabling this greatly improves start-up time, but some games might not be visible in your library.", None))
256250
#endif // QT_CONFIG(tooltip)
257-
self.exclude_non_asset_check.setText(QCoreApplication.translate("LegendarySettings", u"Exclude non-asset games", None))
258-
#if QT_CONFIG(tooltip)
259-
self.exclude_entitlements_check.setToolTip(QCoreApplication.translate("LegendarySettings", u"Do not load entitlement data (i.e game's date of purchase) on start-up.\n"
260-
"\n"
261-
"Disabling this greatly improves start-up time, but some library filters may not work.", None))
262-
#endif // QT_CONFIG(tooltip)
263-
self.exclude_entitlements_check.setText(QCoreApplication.translate("LegendarySettings", u"Exclude entitlements", None))
264-
self.metadata_info.setText(QCoreApplication.translate("LegendarySettings", u"Restart Rare to apply", None))
265-
self.refresh_metadata_button.setText(QCoreApplication.translate("LegendarySettings", u"Refresh metadata", None))
251+
self.exclude_non_asset_check.setText(QCoreApplication.translate("LegendarySettings", "Exclude non-asset games", None))
252+
self.metadata_info.setText(QCoreApplication.translate("LegendarySettings", "Restart Rare to apply", None))
253+
self.refresh_metadata_button.setText(QCoreApplication.translate("LegendarySettings", "Refresh metadata", None))
266254
pass
267255
# retranslateUi
268256

‎rare/ui/components/tabs/settings/legendary.ui‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>621</width>
9+
<width>641</width>
1010
<height>420</height>
1111
</rect>
1212
</property>
@@ -265,18 +265,6 @@ Disabling this greatly improves start-up time, but some games might not be visib
265265
</property>
266266
</widget>
267267
</item>
268-
<item>
269-
<widget class="QCheckBox" name="exclude_entitlements_check">
270-
<property name="toolTip">
271-
<string>Do not load entitlement data (i.e game's date of purchase) on start-up.
272-
273-
Disabling this greatly improves start-up time, but some library filters may not work.</string>
274-
</property>
275-
<property name="text">
276-
<string>Exclude entitlements</string>
277-
</property>
278-
</widget>
279-
</item>
280268
<item>
281269
<widget class="QLabel" name="metadata_info">
282270
<property name="font">

0 commit comments

Comments
 (0)