From 8c3af01e08b21dd172abc56cbc91814a62089721 Mon Sep 17 00:00:00 2001 From: Martin Piatka Date: Fri, 20 Sep 2024 15:32:18 +0200 Subject: [PATCH] GUI: Show placeholder text for video & audio bitrate --- gui/QT/option/available_settings.cpp | 1 + gui/QT/option/available_settings.hpp | 1 + gui/QT/option/lineedit_ui.cpp | 4 ++++ gui/QT/option/lineedit_ui.hpp | 1 + gui/QT/option/video_opts.cpp | 3 +++ gui/QT/ui/ultragrid_window.ui | 3 +++ 6 files changed, 13 insertions(+) diff --git a/gui/QT/option/available_settings.cpp b/gui/QT/option/available_settings.cpp index b0836ba476..91bcfd7ab6 100644 --- a/gui/QT/option/available_settings.cpp +++ b/gui/QT/option/available_settings.cpp @@ -149,6 +149,7 @@ std::vector parseCapabOpts(const QJsonObject& obj){ CapabOpt capabOpt; maybeWriteString(optJson, "display_name", capabOpt.displayName); maybeWriteString(optJson, "display_desc", capabOpt.displayDesc); + maybeWriteString(optJson, "placeholder_text", capabOpt.placeholder); maybeWriteString(optJson, "key", capabOpt.key); maybeWriteString(optJson, "opt_str", capabOpt.optStr); if(optJson.contains("is_boolean") && optJson["is_boolean"].isString()){ diff --git a/gui/QT/option/available_settings.hpp b/gui/QT/option/available_settings.hpp index c92f7dd4a5..a4bdb67531 100644 --- a/gui/QT/option/available_settings.hpp +++ b/gui/QT/option/available_settings.hpp @@ -41,6 +41,7 @@ struct DeviceMode{ struct CapabOpt{ std::string displayName; //Name displayed to user std::string displayDesc; //Description displayed to user + std::string placeholder; //Displayed placeholder if opt is a line edit /* internal name of option, options that are used in the same way should * have the same key (e.g. both bitrate for libavcodec and quality for jpeg diff --git a/gui/QT/option/lineedit_ui.cpp b/gui/QT/option/lineedit_ui.cpp index 54688997b6..a6f478b9fd 100644 --- a/gui/QT/option/lineedit_ui.cpp +++ b/gui/QT/option/lineedit_ui.cpp @@ -29,4 +29,8 @@ void LineEditUi::setToolTip(const QString& toolTip){ line->setToolTip(toolTip); } +void LineEditUi::setPlaceholder(const QString& placeholder){ + line->setPlaceholderText(placeholder); +} + diff --git a/gui/QT/option/lineedit_ui.hpp b/gui/QT/option/lineedit_ui.hpp index e3b55143a5..7a86075cd3 100644 --- a/gui/QT/option/lineedit_ui.hpp +++ b/gui/QT/option/lineedit_ui.hpp @@ -12,6 +12,7 @@ Q_OBJECT void setEnabled(bool enabled); void setToolTip(const QString& toolTip); + void setPlaceholder(const QString& placeholder); private: QLineEdit *line; diff --git a/gui/QT/option/video_opts.cpp b/gui/QT/option/video_opts.cpp index d6c8b48f35..ca2177c327 100644 --- a/gui/QT/option/video_opts.cpp +++ b/gui/QT/option/video_opts.cpp @@ -163,6 +163,7 @@ void videoCompressBitrateCallback(Option &opt, bool suboption, void *opaque){ bool enableEdit = false; QString toolTip; QString qualityLabel; + QString placeholder; for(const auto& compMod : data->availSettings->getVideoCompressModules()){ if(compMod.name == mod){ @@ -171,6 +172,7 @@ void videoCompressBitrateCallback(Option &opt, bool suboption, void *opaque){ enableEdit = true; toolTip = QString::fromStdString(modOpt.displayDesc); qualityLabel = QString::fromStdString(modOpt.displayName); + placeholder = QString::fromStdString(modOpt.placeholder); break; } } @@ -180,6 +182,7 @@ void videoCompressBitrateCallback(Option &opt, bool suboption, void *opaque){ data->lineEditUi->setOpt("video.compress." + mod + ".quality"); data->lineEditUi->setEnabled(enableEdit); data->lineEditUi->setToolTip(toolTip); + data->lineEditUi->setPlaceholder(placeholder); if(data->label){ data->label->setEnabled(enableEdit); data->label->setToolTip(toolTip); diff --git a/gui/QT/ui/ultragrid_window.ui b/gui/QT/ui/ultragrid_window.ui index bfc6f887dc..8fec2dac48 100644 --- a/gui/QT/ui/ultragrid_window.ui +++ b/gui/QT/ui/ultragrid_window.ui @@ -458,6 +458,9 @@ 0 + + 160k +