Improve UI

Author: floppyhammer

assets/translations.csv

@@ -1,9 +1,9 @@
 tag,en,zh,ru,ja
 lang,Language,语言,Язык,言語
 fullscreen,Fullscreen,全屏,Полноэкранный,全画面
-bit rate,Bit rate,码率,Битрейт,ビットレート
+bitrate,Bitrate,码率,Битрейт,ビットレート
 render fps,Render FPS,渲染帧率,FPS рендера,レンダリングFPS
-hw decoder,Hardware decoder,硬件解码器,Аппаратный декодер,ハードウェアデコーダー
+decoder,Decoder,解码器,Декодер,デコーダ
 capture frame,Capture frame,截图,кадр захвата,フレームキャプチャ
 player control,Player control,播放控制,контроль игрока,プレイヤーコントロール
 record mp4,Record MP4,录制 MP4,Запись MP4,MP4録画

src/gui/player_rect.cpp

@@ -6,6 +6,8 @@
     #include "src/player/gst/video_player.h"
 #endif
 
+constexpr uint32_t HUD_LABEL_FONT_SIZE = 20;
+
 class SignalBar : public revector::ProgressBar {
     void custom_ready() override {
         theme_fg = {};
@@ -89,11 +91,12 @@ void PlayerRect::custom_ready() {
     tip_label_->set_anchor_flag(revector::AnchorFlag::VCenterWide);
     tip_label_->set_visibility(false);
     tip_label_->set_word_wrap(true);
+    tip_label_->set_font_size(HUD_LABEL_FONT_SIZE);
     add_child(tip_label_);
 
     hud_container_ = std::make_shared<revector::HBoxContainer>();
     add_child(hud_container_);
-    hud_container_->set_size({0, 48});
+    hud_container_->set_size({0, 32});
     revector::StyleBox box;
     box.bg_color =
         GuiInterface::Instance().dark_mode_ ? revector::ColorU(27, 27, 27, 100) : revector::ColorU(228, 228, 228, 100);
@@ -127,6 +130,7 @@ void PlayerRect::custom_ready() {
         video_info_label_ = std::make_shared<revector::Label>();
         hud_container_->add_child(video_info_label_);
         video_info_label_->set_text("");
+        video_info_label_->set_font_size(HUD_LABEL_FONT_SIZE);
         video_info_label_->set_visibility(false);
 
         auto on_decoder_ready = [this](uint32_t width, uint32_t height, float fps, std::string decoder_name) {
@@ -135,28 +139,34 @@ void PlayerRect::custom_ready() {
             video_info_label_->set_text(ss.str());
             video_info_label_->set_visibility(true);
 
-            hw_status_label_->set_text(FTR("hw decoder") + ": " + decoder_name);
-            hw_status_label_->set_visibility(true);
+            decoder_label_->set_text(FTR("decoder") + ": " + decoder_name);
+            decoder_label_->set_font_size(HUD_LABEL_FONT_SIZE);
+            decoder_label_->set_visibility(true);
         };
         GuiInterface::Instance().decoderReadyCallbacks.emplace_back(on_decoder_ready);
     }
 
     bitrate_label_ = std::make_shared<revector::Label>();
     hud_container_->add_child(bitrate_label_);
-    bitrate_label_->set_text(FTR("bit rate") + ": 0 bps");
+    bitrate_label_->set_font_size(HUD_LABEL_FONT_SIZE);
+    bitrate_label_->set_visibility(false);
 
     render_fps_label_ = std::make_shared<revector::Label>();
     hud_container_->add_child(render_fps_label_);
+    render_fps_label_->set_font_size(HUD_LABEL_FONT_SIZE);
 
-    hw_status_label_ = std::make_shared<revector::Label>();
-    hud_container_->add_child(hw_status_label_);
-    hw_status_label_->set_visibility(false);
+    decoder_label_ = std::make_shared<revector::Label>();
+    hud_container_->add_child(decoder_label_);
+    decoder_label_->set_font_size(HUD_LABEL_FONT_SIZE);
+    decoder_label_->set_visibility(false);
 
 #ifndef _WIN32
     pl_label_ = std::make_shared<revector::Label>();
     hud_container_->add_child(pl_label_);
+    pl_label_->set_font_size(HUD_LABEL_FONT_SIZE);
     fec_label_ = std::make_shared<revector::Label>();
     hud_container_->add_child(fec_label_);
+    fec_label_->set_font_size(HUD_LABEL_FONT_SIZE);
 #endif
 
     rx_status_update_timer = std::make_shared<revector::Timer>();
@@ -199,6 +209,7 @@ void PlayerRect::custom_ready() {
     hud_container_->add_child(record_status_label_);
     record_status_label_->container_sizing.flag_h = revector::ContainerSizingFlag::ShrinkEnd;
     record_status_label_->set_text("");
+    record_status_label_->set_font_size(HUD_LABEL_FONT_SIZE);
 
     auto capture_button = std::make_shared<revector::Button>();
     vbox->add_child(capture_button);
@@ -292,7 +303,7 @@ void PlayerRect::custom_ready() {
     // }
 
     auto onBitrateUpdate = [this](uint64_t bitrate) {
-        std::string text = FTR("bit rate") + ": ";
+        std::string text = FTR("bitrate") + ": ";
         if (bitrate > 1024 * 1024) {
             text += std::format("{:.1f}", bitrate / 1024.0 / 1024.0) + " Mbps";
         } else if (bitrate > 1024) {
@@ -301,6 +312,7 @@ void PlayerRect::custom_ready() {
             text += std::format("{:d}", bitrate) + " bps";
         }
         bitrate_label_->set_text(text);
+        bitrate_label_->show();
     };
     GuiInterface::Instance().bitrateUpdateCallbacks.emplace_back(onBitrateUpdate);
 

src/gui/player_rect.h

@@ -38,7 +38,7 @@ class PlayerRect final : public revector::TextureRect {
 
     std::shared_ptr<revector::Label> bitrate_label_;
 
-    std::shared_ptr<revector::Label> hw_status_label_;
+    std::shared_ptr<revector::Label> decoder_label_;
 
     std::shared_ptr<revector::Label> pl_label_;
 

src/main.cpp

@@ -13,7 +13,7 @@ int main() {
     GuiInterface::Instance().PutLog(LogLevel::Info, "App started");
 
     auto app =
-        new revector::App({1280, 720}, GuiInterface::Instance().dark_mode_, GuiInterface::Instance().use_vulkan_);
+        new revector::App({1080, 480}, GuiInterface::Instance().dark_mode_, GuiInterface::Instance().use_vulkan_);
     app->set_window_title("Aviateur - OpenIPC FPV Ground Station");
 
     GuiInterface::Instance().PutLog(LogLevel::Info, "revector app created");
@@ -24,19 +24,19 @@ int main() {
     int rc = libusb_init(nullptr);
 
     {
-        auto split_container = std::make_shared<revector::SplitContainer>();
-        split_container->set_split_ratio(1.0f);
-        split_container->set_anchor_flag(revector::AnchorFlag::FullRect);
-        app->get_tree_root()->add_child(split_container);
+        auto hbox_container = std::make_shared<revector::HBoxContainer>();
+        hbox_container->set_anchor_flag(revector::AnchorFlag::FullRect);
+        hbox_container->set_separation(0);
+        app->get_tree_root()->add_child(hbox_container);
 
         auto player_rect = std::make_shared<PlayerRect>();
         player_rect->container_sizing.flag_h = revector::ContainerSizingFlag::Fill;
         player_rect->container_sizing.flag_v = revector::ContainerSizingFlag::Fill;
-        split_container->add_child(player_rect);
+        hbox_container->add_child(player_rect);
 
         auto control_panel = std::make_shared<ControlPanel>();
         control_panel->container_sizing.flag_v = revector::ContainerSizingFlag::Fill;
-        split_container->add_child(control_panel);
+        hbox_container->add_child(control_panel);
 
         std::weak_ptr control_panel_weak = control_panel;
         std::weak_ptr player_rect_weak = player_rect;

src/player/ffmpeg/video_player.cpp

@@ -80,7 +80,7 @@ void VideoPlayerFfmpeg::play(const std::string &playUrl, bool forceSoftwareDecod
             return;
         }
 
-        std::string decoder_name = decoder->hwDecoderName.has_value() ? decoder->hwDecoderName.value() : "N/A";
+        std::string decoder_name = decoder->hwDecoderName.has_value() ? decoder->hwDecoderName.value() : "Software";
 
         GuiInterface::Instance().EmitDecoderReady(decoder->GetWidth(),
                                                   decoder->GetHeight(),