Adjust to include the open log dir button in rare settings
This commit is contained in:
Stelios Tsampas
parent
127728d329
commit
7662f52ba8
|
|
@ -39,6 +39,7 @@ class RareSettings(QWidget, Ui_RareSettings):
|
|||
self.settings = QSettings()
|
||||
self.img_dir_path = self.settings.value("img_dir", os.path.expanduser("~/.cache/rare/images/"), type=str)
|
||||
language = self.settings.value("language", get_lang(), type=str)
|
||||
self.logdir = os.path.expanduser("~/.cache/rare/logs")
|
||||
|
||||
# Select Image directory
|
||||
self.img_dir = PathEdit(self.img_dir_path, file_type=QFileDialog.DirectoryOnly)
|
||||
|
|
@ -80,17 +81,17 @@ class RareSettings(QWidget, Ui_RareSettings):
|
|||
lambda: self.settings.setValue("save_size", self.save_size.isChecked())
|
||||
)
|
||||
|
||||
self.open_log_dir = QPushButton(self.tr("Open Log directory"))
|
||||
self.open_log_dir.clicked.connect(self.open_dir)
|
||||
self.layout().addWidget(self.open_log_dir)
|
||||
self.log_dir_open_button.clicked.connect(self.open_dir)
|
||||
# TODO: Implement
|
||||
self.log_dir_clean_button.setVisible(False)
|
||||
self.log_dir_size_label.setVisible(False)
|
||||
|
||||
def open_dir(self):
|
||||
logdir = os.path.expanduser("~/.cache/rare/logs")
|
||||
if os.name == "nt":
|
||||
os.startfile(logdir)
|
||||
os.startfile(self.logdir)
|
||||
else:
|
||||
opener = "open" if sys.platform == "darwin" else "xdg-open"
|
||||
subprocess.Popen([opener, logdir])
|
||||
subprocess.Popen([opener, self.logdir])
|
||||
|
||||
def save_window_size(self):
|
||||
self.settings.setValue("save_size", self.save_size.isChecked())
|
||||
|
|
|
|||
|
|
@ -16,9 +16,11 @@ class Ui_RareSettings(object):
|
|||
RareSettings.setObjectName("RareSettings")
|
||||
self.layout_rare = QtWidgets.QGridLayout(RareSettings)
|
||||
self.layout_rare.setObjectName("layout_rare")
|
||||
self.layout_rpc = QtWidgets.QVBoxLayout()
|
||||
self.layout_rpc.setObjectName("layout_rpc")
|
||||
self.layout_rare.addLayout(self.layout_rpc, 1, 1, 1, 1)
|
||||
self.gb_img_dir = QtWidgets.QGroupBox(RareSettings)
|
||||
self.gb_img_dir.setObjectName("gb_img_dir")
|
||||
self.layout_img_dir = QtWidgets.QVBoxLayout(self.gb_img_dir)
|
||||
self.layout_img_dir.setObjectName("layout_img_dir")
|
||||
self.layout_rare.addWidget(self.gb_img_dir, 0, 0, 1, 1)
|
||||
self.gb_lang = QtWidgets.QGroupBox(RareSettings)
|
||||
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
|
||||
sizePolicy.setHorizontalStretch(0)
|
||||
|
|
@ -39,13 +41,6 @@ class Ui_RareSettings(object):
|
|||
self.info_lang.setObjectName("info_lang")
|
||||
self.layout_lang.addWidget(self.info_lang, 0, QtCore.Qt.AlignTop)
|
||||
self.layout_rare.addWidget(self.gb_lang, 0, 1, 1, 1)
|
||||
spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
|
||||
self.layout_rare.addItem(spacerItem, 2, 0, 1, 2)
|
||||
self.gb_img_dir = QtWidgets.QGroupBox(RareSettings)
|
||||
self.gb_img_dir.setObjectName("gb_img_dir")
|
||||
self.layout_img_dir = QtWidgets.QVBoxLayout(self.gb_img_dir)
|
||||
self.layout_img_dir.setObjectName("layout_img_dir")
|
||||
self.layout_rare.addWidget(self.gb_img_dir, 0, 0, 1, 1)
|
||||
self.gb_settings = QtWidgets.QGroupBox(RareSettings)
|
||||
self.gb_settings.setObjectName("gb_settings")
|
||||
self.gridLayout = QtWidgets.QGridLayout(self.gb_settings)
|
||||
|
|
@ -98,9 +93,30 @@ class Ui_RareSettings(object):
|
|||
self.save_size.setSizePolicy(sizePolicy)
|
||||
self.save_size.setObjectName("save_size")
|
||||
self.gridLayout.addWidget(self.save_size, 1, 1, 1, 1)
|
||||
spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
|
||||
self.gridLayout.addItem(spacerItem1, 0, 2, 4, 1)
|
||||
spacerItem = QtWidgets.QSpacerItem(0, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
|
||||
self.gridLayout.addItem(spacerItem, 0, 2, 4, 1)
|
||||
self.layout_rare.addWidget(self.gb_settings, 1, 0, 1, 1)
|
||||
spacerItem1 = QtWidgets.QSpacerItem(20, 0, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
|
||||
self.layout_rare.addItem(spacerItem1, 3, 0, 1, 2)
|
||||
self.layout_rpc = QtWidgets.QVBoxLayout()
|
||||
self.layout_rpc.setObjectName("layout_rpc")
|
||||
self.layout_rare.addLayout(self.layout_rpc, 1, 1, 1, 1)
|
||||
self.log_dir_group = QtWidgets.QGroupBox(RareSettings)
|
||||
self.log_dir_group.setObjectName("log_dir_group")
|
||||
self.log_dir_layout = QtWidgets.QVBoxLayout(self.log_dir_group)
|
||||
self.log_dir_layout.setObjectName("log_dir_layout")
|
||||
self.log_dir_open_button = QtWidgets.QPushButton(self.log_dir_group)
|
||||
self.log_dir_open_button.setObjectName("log_dir_open_button")
|
||||
self.log_dir_layout.addWidget(self.log_dir_open_button)
|
||||
self.log_dir_clean_button = QtWidgets.QPushButton(self.log_dir_group)
|
||||
self.log_dir_clean_button.setObjectName("log_dir_clean_button")
|
||||
self.log_dir_layout.addWidget(self.log_dir_clean_button)
|
||||
self.log_dir_size_label = QtWidgets.QLabel(self.log_dir_group)
|
||||
self.log_dir_size_label.setText("")
|
||||
self.log_dir_size_label.setWordWrap(True)
|
||||
self.log_dir_size_label.setObjectName("log_dir_size_label")
|
||||
self.log_dir_layout.addWidget(self.log_dir_size_label)
|
||||
self.layout_rare.addWidget(self.log_dir_group, 2, 1, 1, 1)
|
||||
|
||||
self.retranslateUi(RareSettings)
|
||||
QtCore.QMetaObject.connectSlotsByName(RareSettings)
|
||||
|
|
@ -108,9 +124,9 @@ class Ui_RareSettings(object):
|
|||
def retranslateUi(self, RareSettings):
|
||||
_translate = QtCore.QCoreApplication.translate
|
||||
RareSettings.setWindowTitle(_translate("RareSettings", "RareSettings"))
|
||||
self.gb_img_dir.setTitle(_translate("RareSettings", "Image Cache Directory"))
|
||||
self.gb_lang.setTitle(_translate("RareSettings", "Language"))
|
||||
self.info_lang.setText(_translate("RareSettings", "Restart Rare to apply the new settings."))
|
||||
self.gb_img_dir.setTitle(_translate("RareSettings", "Image Cache DIrectory"))
|
||||
self.gb_settings.setTitle(_translate("RareSettings", "Behaviour"))
|
||||
self.auto_update.setText(_translate("RareSettings", "Update games on application startup"))
|
||||
self.confirm_start.setText(_translate("RareSettings", "Confirm game launch"))
|
||||
|
|
@ -118,6 +134,9 @@ class Ui_RareSettings(object):
|
|||
self.notification.setText(_translate("RareSettings", "Show notification on download completion"))
|
||||
self.auto_sync_cloud.setText(_translate("RareSettings", "Automatically sync with cloud"))
|
||||
self.save_size.setText(_translate("RareSettings", "Restore window size on application startup"))
|
||||
self.log_dir_group.setTitle(_translate("RareSettings", "Logs"))
|
||||
self.log_dir_open_button.setText(_translate("RareSettings", "Open Log directory"))
|
||||
self.log_dir_clean_button.setText(_translate("RareSettings", "Clean Log directory"))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
|
|||
|
|
@ -6,8 +6,13 @@
|
|||
<string>RareSettings</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="layout_rare">
|
||||
<item row="1" column="1">
|
||||
<layout class="QVBoxLayout" name="layout_rpc"/>
|
||||
<item row="0" column="0">
|
||||
<widget class="QGroupBox" name="gb_img_dir">
|
||||
<property name="title">
|
||||
<string>Image Cache Directory</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="layout_img_dir"/>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QGroupBox" name="gb_lang">
|
||||
|
|
@ -42,27 +47,6 @@
|
|||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0" colspan="2">
|
||||
<spacer name="vs_rare">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QGroupBox" name="gb_img_dir">
|
||||
<property name="title">
|
||||
<string>Image Cache DIrectory</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="layout_img_dir"/>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QGroupBox" name="gb_settings">
|
||||
<property name="title">
|
||||
|
|
@ -148,13 +132,13 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2" rowspan="4">
|
||||
<spacer name="horizontalSpacer">
|
||||
<spacer name="settings_hspacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
|
|
@ -163,6 +147,55 @@
|
|||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="2">
|
||||
<spacer name="rare_vspacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<layout class="QVBoxLayout" name="layout_rpc"/>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QGroupBox" name="log_dir_group">
|
||||
<property name="title">
|
||||
<string>Logs</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="log_dir_layout">
|
||||
<item>
|
||||
<widget class="QPushButton" name="log_dir_open_button">
|
||||
<property name="text">
|
||||
<string>Open Log directory</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="log_dir_clean_button">
|
||||
<property name="text">
|
||||
<string>Clean Log directory</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="log_dir_size_label">
|
||||
<property name="text">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
|
|
|
|||
Loading…
Reference in a new issue