CodeMirror/Rare
1
0
Fork 0
mirror of synced 2024-06-29 03:31:06 +12:00
Code Issues Projects Releases Wiki Activity

Remove proton layout from global linux settings.

Browse source
This commit is contained in:
Stelios Tsampas 2021-04-29 23:07:28 +03:00
parent 748d51f31f
commit 1f92beb285
4 changed files with 91 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rare/components/tabs/games/game_info/game_settings.py
View file

@ -83,21 +83,21 @@ class GameSettings(QScrollArea):
self.layout.addWidget(self.wrapper_widget)
if os.name != "nt":
self.linux_settings = LinuxAppSettings(core)
self.layout.addWidget(self.linux_settings)
self.possible_proton_wrappers = find_proton_wrappers()
self.select_proton = QComboBox()
self.select_proton.addItems(["Don't use Proton"] + self.possible_proton_wrappers)
self.select_proton.currentIndexChanged.connect(self.change_proton)
self.select_proton_widget = SettingsWidget(self.tr("Proton Wrapper"), self.select_proton)
self.linux_settings.layout_proton.addWidget(self.select_proton_widget)
self.layout.addWidget(self.select_proton_widget)
self.proton_prefix = PathEdit("x", QFileDialog.DirectoryOnly)
self.proton_prefix.save_path_button.clicked.connect(self.update_prefix)
self.proton_prefix_widget = SettingsWidget(self.tr("Proton prefix"), self.proton_prefix)
self.linux_settings.layout_proton.addWidget(self.proton_prefix_widget)
self.layout.addWidget(self.proton_prefix_widget)
self.linux_settings = LinuxAppSettings(core)
self.layout.addWidget(self.linux_settings)
# startparams, skip_update_check

6
rare/components/tabs/settings/linux.py
View file

@ -28,7 +28,7 @@ class LinuxSettings(QWidget, Ui_LinuxSettings):
lambda: self.save_setting(self.wine_prefix, "wine_prefix")
)
self.wine_prefix.save_path_button.setDisabled(True)
self.layout_prefix.addWidget(self.wine_prefix)
self.prefix_layout.addWidget(self.wine_prefix)
# Wine executable
self.wine_exec = PathEdit(self.core.lgd.config.get(self.name, "wine_executable", fallback=""),
@ -41,7 +41,7 @@ class LinuxSettings(QWidget, Ui_LinuxSettings):
lambda: self.save_setting(self.wine_exec, "wine_executable")
)
self.wine_exec.save_path_button.setDisabled(True)
self.layout_exec.addWidget(self.wine_exec)
self.exec_layout.addWidget(self.wine_exec)
# dxvk
# FIXME: Remove this check when done with per game settings
@ -49,7 +49,7 @@ class LinuxSettings(QWidget, Ui_LinuxSettings):
self.dxvk = DxvkSettings(core, self.name)
else:
self.dxvk = DxvkWidget(core)
self.layout_dxvk.addWidget(self.dxvk)
self.dxvk_layout.addWidget(self.dxvk)
def save_setting(self, widget: PathEdit, setting_name: str):
if self.name not in self.core.lgd.config.sections():

71
rare/components/tabs/settings/linux_ui.py
View file

@ -15,41 +15,38 @@ class Ui_LinuxSettings(object):
def setupUi(self, LinuxSettings):
LinuxSettings.setObjectName("LinuxSettings")
LinuxSettings.resize(569, 454)
self.layout_linux = QtWidgets.QGridLayout(LinuxSettings)
self.layout_linux.setObjectName("layout_linux")
self.layout_dxvk = QtWidgets.QVBoxLayout()
self.layout_dxvk.setObjectName("layout_dxvk")
self.layout_linux.addLayout(self.layout_dxvk, 2, 0, 1, 1)
self.gb_wine = QtWidgets.QGroupBox(LinuxSettings)
self.gb_wine.setObjectName("gb_wine")
self.layout_wine = QtWidgets.QGridLayout(self.gb_wine)
self.layout_wine.setObjectName("layout_wine")
self.lbl_exec = QtWidgets.QLabel(self.gb_wine)
self.lbl_exec.setObjectName("lbl_exec")
self.layout_wine.addWidget(self.lbl_exec, 1, 0, 1, 1, QtCore.Qt.AlignRight)
self.lbl_prefix = QtWidgets.QLabel(self.gb_wine)
self.lbl_prefix.setObjectName("lbl_prefix")
self.layout_wine.addWidget(self.lbl_prefix, 0, 0, 1, 1, QtCore.Qt.AlignRight)
self.frame_prefix = QtWidgets.QFrame(self.gb_wine)
self.frame_prefix.setFrameShape(QtWidgets.QFrame.StyledPanel)
self.frame_prefix.setFrameShadow(QtWidgets.QFrame.Sunken)
self.frame_prefix.setObjectName("frame_prefix")
self.layout_prefix = QtWidgets.QVBoxLayout(self.frame_prefix)
self.layout_prefix.setObjectName("layout_prefix")
self.layout_wine.addWidget(self.frame_prefix, 0, 1, 1, 1)
self.frame_exec = QtWidgets.QFrame(self.gb_wine)
self.frame_exec.setFrameShape(QtWidgets.QFrame.StyledPanel)
self.frame_exec.setFrameShadow(QtWidgets.QFrame.Sunken)
self.frame_exec.setObjectName("frame_exec")
self.layout_exec = QtWidgets.QVBoxLayout(self.frame_exec)
self.layout_exec.setObjectName("layout_exec")
self.layout_wine.addWidget(self.frame_exec, 1, 1, 1, 1)
self.layout_linux.addWidget(self.gb_wine, 0, 0, 1, 1)
self.linux_layout = QtWidgets.QGridLayout(LinuxSettings)
self.linux_layout.setObjectName("linux_layout")
spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
self.layout_linux.addItem(spacerItem, 4, 0, 1, 1)
self.layout_proton = QtWidgets.QVBoxLayout()
self.layout_proton.setObjectName("layout_proton")
self.layout_linux.addLayout(self.layout_proton, 1, 0, 1, 1)
self.linux_layout.addItem(spacerItem, 3, 0, 1, 1)
self.wine_groupbox = QtWidgets.QGroupBox(LinuxSettings)
self.wine_groupbox.setObjectName("wine_groupbox")
self.wine_layout = QtWidgets.QGridLayout(self.wine_groupbox)
self.wine_layout.setObjectName("wine_layout")
self.exec_label = QtWidgets.QLabel(self.wine_groupbox)
self.exec_label.setObjectName("exec_label")
self.wine_layout.addWidget(self.exec_label, 1, 0, 1, 1, QtCore.Qt.AlignRight)
self.prefix_label = QtWidgets.QLabel(self.wine_groupbox)
self.prefix_label.setObjectName("prefix_label")
self.wine_layout.addWidget(self.prefix_label, 0, 0, 1, 1, QtCore.Qt.AlignRight)
self.prefix_frame = QtWidgets.QFrame(self.wine_groupbox)
self.prefix_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
self.prefix_frame.setFrameShadow(QtWidgets.QFrame.Sunken)
self.prefix_frame.setObjectName("prefix_frame")
self.prefix_layout = QtWidgets.QVBoxLayout(self.prefix_frame)
self.prefix_layout.setObjectName("prefix_layout")
self.wine_layout.addWidget(self.prefix_frame, 0, 1, 1, 1)
self.exec_frame = QtWidgets.QFrame(self.wine_groupbox)
self.exec_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
self.exec_frame.setFrameShadow(QtWidgets.QFrame.Sunken)
self.exec_frame.setObjectName("exec_frame")
self.exec_layout = QtWidgets.QVBoxLayout(self.exec_frame)
self.exec_layout.setObjectName("exec_layout")
self.wine_layout.addWidget(self.exec_frame, 1, 1, 1, 1)
self.linux_layout.addWidget(self.wine_groupbox, 0, 0, 1, 1)
self.dxvk_layout = QtWidgets.QVBoxLayout()
self.dxvk_layout.setObjectName("dxvk_layout")
self.linux_layout.addLayout(self.dxvk_layout, 1, 0, 1, 1)
self.retranslateUi(LinuxSettings)
QtCore.QMetaObject.connectSlotsByName(LinuxSettings)
@ -57,9 +54,9 @@ class Ui_LinuxSettings(object):
def retranslateUi(self, LinuxSettings):
_translate = QtCore.QCoreApplication.translate
LinuxSettings.setWindowTitle(_translate("LinuxSettings", "LinuxSettings"))
self.gb_wine.setTitle(_translate("LinuxSettings", "Wine Settings"))
self.lbl_exec.setText(_translate("LinuxSettings", "Wine executable:"))
self.lbl_prefix.setText(_translate("LinuxSettings", "Wine prefix:"))
self.wine_groupbox.setTitle(_translate("LinuxSettings", "Wine Settings"))
self.exec_label.setText(_translate("LinuxSettings", "Wine executable:"))
self.prefix_label.setText(_translate("LinuxSettings", "Wine prefix:"))
if __name__ == "__main__":

101
resources/ui/components/tabs/settings/linux.ui
View file

@ -13,57 +13,9 @@
<property name="windowTitle">
<string>LinuxSettings</string>
</property>
<layout class="QGridLayout" name="layout_linux">
<item row="2" column="0">
<layout class="QVBoxLayout" name="layout_dxvk"/>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="gb_wine">
<property name="title">
<string>Wine Settings</string>
</property>
<layout class="QGridLayout" name="layout_wine">
<item row="1" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="lbl_exec">
<property name="text">
<string>Wine executable:</string>
</property>
</widget>
</item>
<item row="0" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="lbl_prefix">
<property name="text">
<string>Wine prefix:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QFrame" name="frame_prefix">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<layout class="QVBoxLayout" name="layout_prefix"/>
</widget>
</item>
<item row="1" column="1">
<widget class="QFrame" name="frame_exec">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<layout class="QVBoxLayout" name="layout_exec"/>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<spacer name="vs_linux">
<layout class="QGridLayout" name="linux_layout">
<item row="3" column="0">
<spacer name="linux_vspacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
@ -75,8 +27,53 @@
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="wine_groupbox">
<property name="title">
<string>Wine Settings</string>
</property>
<layout class="QGridLayout" name="wine_layout">
<item row="1" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="exec_label">
<property name="text">
<string>Wine executable:</string>
</property>
</widget>
</item>
<item row="0" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="prefix_label">
<property name="text">
<string>Wine prefix:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QFrame" name="prefix_frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<layout class="QVBoxLayout" name="prefix_layout"/>
</widget>
</item>
<item row="1" column="1">
<widget class="QFrame" name="exec_frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<layout class="QVBoxLayout" name="exec_layout"/>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<layout class="QVBoxLayout" name="layout_proton"/>
<layout class="QVBoxLayout" name="dxvk_layout"/>
</item>
</layout>
</widget>