aiden
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Qt: Move screenshot/capture directories to Capture Settings

Browse Source
pull/3715/head
Stenzek 5 months ago
parent e3423e1a57
commit d140fbf8b2
No known key found for this signature in database
4 changed files with 183 additions and 182 deletions
Show Stats Download Patch File Download Diff File

12
src/duckstation-qt/capturesettingswidget.cpp
Unescape Escape View File

@ -29,11 +29,19 @@ CaptureSettingsWidget::CaptureSettingsWidget(SettingsWindow* dialog, QWidget* pa
Settings::DEFAULT_DISPLAY_SCREENSHOT_FORMAT, DisplayScreenshotFormat::Count); Settings::DEFAULT_DISPLAY_SCREENSHOT_FORMAT, DisplayScreenshotFormat::Count);
SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.screenshotQuality, "Display", "ScreenshotQuality", SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.screenshotQuality, "Display", "ScreenshotQuality",
Settings::DEFAULT_DISPLAY_SCREENSHOT_QUALITY); Settings::DEFAULT_DISPLAY_SCREENSHOT_QUALITY);
SettingWidgetBinder::BindWidgetToFolderSetting(sif, m_ui.screenshotsDirectory, m_ui.screenshotsDirectoryBrowse,
tr("Select Screenshots Directory"), m_ui.screenshotsDirectoryOpen,
m_ui.screenshotsDirectoryReset, "Folders", "Screenshots",
Path::Combine(EmuFolders::DataRoot, "screenshots"));
SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.mediaCaptureBackend, "MediaCapture", "Backend", SettingWidgetBinder::BindWidgetToEnumSetting(sif, m_ui.mediaCaptureBackend, "MediaCapture", "Backend",
&MediaCapture::ParseBackendName, &MediaCapture::GetBackendName, &MediaCapture::ParseBackendName, &MediaCapture::GetBackendName,
&MediaCapture::GetBackendDisplayName, &MediaCapture::GetBackendDisplayName,
Settings::DEFAULT_MEDIA_CAPTURE_BACKEND, MediaCaptureBackend::MaxCount); Settings::DEFAULT_MEDIA_CAPTURE_BACKEND, MediaCaptureBackend::MaxCount);
SettingWidgetBinder::BindWidgetToFolderSetting(sif, m_ui.videosDirectory, m_ui.videosDirectoryBrowse,
tr("Select Media Capture Directory"), m_ui.videosDirectoryOpen,
m_ui.videosDirectoryReset, "Folders", "Videos",
Path::Combine(EmuFolders::DataRoot, "videos"));
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.enableVideoCapture, "MediaCapture", "VideoCapture", true); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.enableVideoCapture, "MediaCapture", "VideoCapture", true);
SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.videoCaptureWidth, "MediaCapture", "VideoWidth", SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.videoCaptureWidth, "MediaCapture", "VideoWidth",
Settings::DEFAULT_MEDIA_CAPTURE_VIDEO_WIDTH); Settings::DEFAULT_MEDIA_CAPTURE_VIDEO_WIDTH);
@ -70,6 +78,8 @@ CaptureSettingsWidget::CaptureSettingsWidget(SettingsWindow* dialog, QWidget* pa
dialog->registerWidgetHelp(m_ui.screenshotSize, tr("Screenshot Size"), tr("Screen Resolution"), dialog->registerWidgetHelp(m_ui.screenshotSize, tr("Screenshot Size"), tr("Screen Resolution"),
tr("Determines the resolution at which screenshots will be saved. Internal resolutions " tr("Determines the resolution at which screenshots will be saved. Internal resolutions "
"preserve more detail at the cost of file size.")); "preserve more detail at the cost of file size."));
dialog->registerWidgetHelp(m_ui.screenshotsDirectory, tr("Save Location"), tr("Default"),
tr("Specifies the directory where screenshots will be saved."));
dialog->registerWidgetHelp( dialog->registerWidgetHelp(
m_ui.screenshotFormat, tr("Screenshot Format"), tr("PNG"), m_ui.screenshotFormat, tr("Screenshot Format"), tr("PNG"),
tr("Selects the format which will be used to save screenshots. JPEG produces smaller files, but loses detail.")); tr("Selects the format which will be used to save screenshots. JPEG produces smaller files, but loses detail."));
@ -83,6 +93,8 @@ CaptureSettingsWidget::CaptureSettingsWidget(SettingsWindow* dialog, QWidget* pa
tr("Selects the framework that is used to encode video/audio.")); tr("Selects the framework that is used to encode video/audio."));
dialog->registerWidgetHelp(m_ui.captureContainer, tr("Container"), tr("MP4"), dialog->registerWidgetHelp(m_ui.captureContainer, tr("Container"), tr("MP4"),
tr("Determines the file format used to contain the captured audio/video.")); tr("Determines the file format used to contain the captured audio/video."));
dialog->registerWidgetHelp(m_ui.videosDirectory, tr("Save Location"), tr("Default"),
tr("Specifies the directory where media capture (video/audio) will be saved."));
dialog->registerWidgetHelp(m_ui.enableVideoCapture, tr("Capture Video"), tr("Checked"), dialog->registerWidgetHelp(m_ui.enableVideoCapture, tr("Capture Video"), tr("Checked"),
tr("Captures video to the chosen file when media capture is started. If unchecked, the " tr("Captures video to the chosen file when media capture is started. If unchecked, the "
"file will only contain audio.")); "file will only contain audio."));

267
src/duckstation-qt/capturesettingswidget.ui
Unescape Escape View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>710</width> <width>633</width>
<height>364</height> <height>500</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -27,13 +27,13 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="groupBox_10"> <widget class="QGroupBox" name="screenshotsGroup">
<property name="title"> <property name="title">
<string>Screenshots</string> <string>Screenshots</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_15" columnstretch="0,1"> <layout class="QGridLayout" name="screenshotsLayout" columnstretch="0,1">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_21"> <widget class="QLabel" name="screenshotSizeLabel">
<property name="text"> <property name="text">
<string>Screenshot Size:</string> <string>Screenshot Size:</string>
</property> </property>
@ -69,17 +69,61 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="screenshotsDirectoryLabel">
<property name="text">
<string>Save Location:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="screenshotsDirectoryLayout">
<item>
<widget class="QLineEdit" name="screenshotsDirectory"/>
</item>
<item>
<widget class="QPushButton" name="screenshotsDirectoryBrowse">
<property name="toolTip">
<string>Browse...</string>
</property>
<property name="icon">
<iconset theme="folder-open-line"/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="screenshotsDirectoryOpen">
<property name="toolTip">
<string>Open...</string>
</property>
<property name="icon">
<iconset theme="open-folder-line"/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="screenshotsDirectoryReset">
<property name="toolTip">
<string>Reset</string>
</property>
<property name="icon">
<iconset theme="delete-back-2-line"/>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="captureTabGroupBox"> <widget class="QGroupBox" name="captureGroup">
<property name="title"> <property name="title">
<string>Media Capture</string> <string>Media Capture</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_16" columnstretch="0,1"> <layout class="QGridLayout" name="captureLayout" columnstretch="0,1">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="mediaCaptureBackendLabel">
<property name="text"> <property name="text">
<string>Backend:</string> <string>Backend:</string>
</property> </property>
@ -98,7 +142,51 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="captureContainer"/> <widget class="QComboBox" name="captureContainer"/>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0">
<widget class="QLabel" name="videosDirectoryLabel">
<property name="text">
<string>Save Location:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="videosDirectoryLayout">
<item>
<widget class="QLineEdit" name="videosDirectory"/>
</item>
<item>
<widget class="QPushButton" name="videosDirectoryBrowse">
<property name="toolTip">
<string>Browse...</string>
</property>
<property name="icon">
<iconset theme="folder-open-line"/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="videosDirectoryOpen">
<property name="toolTip">
<string>Open...</string>
</property>
<property name="icon">
<iconset theme="open-folder-line"/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="videosDirectoryReset">
<property name="toolTip">
<string>Reset</string>
</property>
<property name="icon">
<iconset theme="delete-back-2-line"/>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0" colspan="2">
<layout class="QGridLayout" name="captureOptionLayout"> <layout class="QGridLayout" name="captureOptionLayout">
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>20</number> <number>20</number>
@ -106,81 +194,11 @@
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>10</number> <number>10</number>
</property> </property>
<item row="1" column="1"> <item row="0" column="0">
<widget class="QWidget" name="audioCaptureOptions" native="true"> <widget class="QCheckBox" name="enableVideoCapture">
<layout class="QGridLayout" name="gridLayout_20" columnstretch="0,1"> <property name="text">
<property name="leftMargin"> <string>Capture Video</string>
<number>0</number> </property>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="1">
<widget class="QComboBox" name="audioCaptureCodec"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="audioCaptureBitrateLabel">
<property name="text">
<string>Bitrate:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="audioCaptureBitrate">
<property name="suffix">
<string> kbps</string>
</property>
<property name="minimum">
<number>16</number>
</property>
<property name="maximum">
<number>2048</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>128</number>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="enableAudioCaptureArguments">
<property name="text">
<string>Extra Arguments</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QLineEdit" name="audioCaptureArguments"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="audioCaptureCodecLabel">
<property name="text">
<string>Codec:</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<spacer name="verticalSpacer_8">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
@ -192,7 +210,7 @@
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QWidget" name="videoCaptureOptions" native="true"> <widget class="QWidget" name="videoCaptureOptions" native="true">
<layout class="QGridLayout" name="gridLayout_19" columnstretch="0,1"> <layout class="QFormLayout" name="videoCaptureOptionsLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -298,6 +316,9 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="4" column="0" colspan="2">
<widget class="QLineEdit" name="videoCaptureArguments"/>
</item>
<item row="3" column="0" colspan="2"> <item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="enableVideoCaptureArguments"> <widget class="QCheckBox" name="enableVideoCaptureArguments">
<property name="text"> <property name="text">
@ -305,17 +326,71 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2">
<widget class="QLineEdit" name="videoCaptureArguments"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="1" column="1">
<widget class="QCheckBox" name="enableVideoCapture"> <widget class="QWidget" name="audioCaptureOptions" native="true">
<property name="text"> <layout class="QFormLayout" name="audioCaptureOptionsLayout">
<string>Capture Video</string> <property name="leftMargin">
</property> <number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="audioCaptureCodecLabel">
<property name="text">
<string>Codec:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="audioCaptureCodec"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="audioCaptureBitrateLabel">
<property name="text">
<string>Bitrate:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="audioCaptureBitrate">
<property name="suffix">
<string> kbps</string>
</property>
<property name="minimum">
<number>16</number>
</property>
<property name="maximum">
<number>2048</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>128</number>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="enableAudioCaptureArguments">
<property name="text">
<string>Extra Arguments</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QLineEdit" name="audioCaptureArguments"/>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -324,14 +399,14 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer_7"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Orientation::Vertical</enum> <enum>Qt::Orientation::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>0</width>
<height>1</height> <height>0</height>
</size> </size>
</property> </property>
</spacer> </spacer>

6
src/duckstation-qt/foldersettingswidget.cpp
Unescape Escape View File

@ -21,12 +21,6 @@ FolderSettingsWidget::FolderSettingsWidget(SettingsWindow* dialog, QWidget* pare
SettingWidgetBinder::BindWidgetToFolderSetting(sif, m_ui.covers, m_ui.coversBrowse, tr("Select Covers Directory"), SettingWidgetBinder::BindWidgetToFolderSetting(sif, m_ui.covers, m_ui.coversBrowse, tr("Select Covers Directory"),
m_ui.coversOpen, m_ui.coversReset, "Folders", "Covers", m_ui.coversOpen, m_ui.coversReset, "Folders", "Covers",
Path::Combine(EmuFolders::DataRoot, "covers")); Path::Combine(EmuFolders::DataRoot, "covers"));
SettingWidgetBinder::BindWidgetToFolderSetting(
sif, m_ui.screenshots, m_ui.screenshotsBrowse, tr("Select Screenshots Directory"), m_ui.screenshotsOpen,
m_ui.screenshotsReset, "Folders", "Screenshots", Path::Combine(EmuFolders::DataRoot, "screenshots"));
SettingWidgetBinder::BindWidgetToFolderSetting(sif, m_ui.videos, m_ui.videosBrowse, tr("Select Videos Directory"),
m_ui.videosOpen, m_ui.videosReset, "Folders", "Videos",
Path::Combine(EmuFolders::DataRoot, "videos"));
} }
FolderSettingsWidget::~FolderSettingsWidget() = default; FolderSettingsWidget::~FolderSettingsWidget() = default;

80
src/duckstation-qt/foldersettingswidget.ui
Unescape Escape View File

@ -103,86 +103,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Screenshots Directory</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="4">
<widget class="QLabel" name="label">
<property name="text">
<string>Used for screenshots.</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLineEdit" name="screenshots"/>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="screenshotsBrowse">
<property name="text">
<string>Browse...</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="screenshotsOpen">
<property name="text">
<string>Open...</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="screenshotsReset">
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
<string>Videos Directory</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0" colspan="4">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Used for media capture, regardless of whether audio and/or video is enabled.</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLineEdit" name="videos"/>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="videosBrowse">
<property name="text">
<string>Browse...</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="videosOpen">
<property name="text">
<string>Open...</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="videosReset">
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">

Write Preview
Loading…
Cancel
Save