From 0ed683e1e26d13233c189a6d4cb5d7e5e41a93a8 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Wed, 22 Nov 2023 02:37:00 -0500 Subject: add labels to settings in voice window --- src/windows/voicewindow.cpp | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'src/windows') diff --git a/src/windows/voicewindow.cpp b/src/windows/voicewindow.cpp index 16a9fed..74ce8f5 100644 --- a/src/windows/voicewindow.cpp +++ b/src/windows/voicewindow.cpp @@ -181,7 +181,7 @@ VoiceWindow::VoiceWindow(Snowflake channel_id) m_mix_mono.set_active(audio.GetMixMono()); m_mix_mono.signal_toggled().connect([this]() { - Abaddon::Get().GetAudio().SetMixMono(m_mix_mono.get_active()); + Abaddon::Get().GetAudio().SetMixMono(m_mix_mono.get_active()); }); auto *playback_renderer = Gtk::make_managed(); @@ -225,6 +225,28 @@ VoiceWindow::VoiceWindow(Snowflake channel_id) window->show(); }); + auto *sliders_container = Gtk::make_managed(); + auto *sliders_labels = Gtk::make_managed(); + auto *sliders_sliders = Gtk::make_managed(); + sliders_container->pack_start(*sliders_labels, false, true, 2); + sliders_container->pack_start(*sliders_sliders); + sliders_labels->pack_start(*Gtk::make_managed("Threshold", Gtk::ALIGN_END)); + sliders_labels->pack_start(*Gtk::make_managed("Gain", Gtk::ALIGN_END)); + sliders_sliders->pack_start(m_vad_param); + sliders_sliders->pack_start(m_capture_gain); + + auto *combos_container = Gtk::make_managed(); + auto *combos_labels = Gtk::make_managed(); + auto *combos_combos = Gtk::make_managed(); + combos_container->pack_start(*combos_labels, false, true, 2); + combos_container->pack_start(*combos_combos); + combos_labels->pack_start(*Gtk::make_managed("VAD Method", Gtk::ALIGN_END)); + combos_labels->pack_start(*Gtk::make_managed("Output Device", Gtk::ALIGN_END)); + combos_labels->pack_start(*Gtk::make_managed("Input Device", Gtk::ALIGN_END)); + combos_combos->pack_start(m_vad_combo); + combos_combos->pack_start(m_playback_combo); + combos_combos->pack_start(m_capture_combo); + m_scroll.add(m_user_list); m_controls.add(m_mute); m_controls.add(m_deafen); @@ -233,12 +255,9 @@ VoiceWindow::VoiceWindow(Snowflake channel_id) m_main.add(m_menu_bar); m_main.add(m_controls); m_main.add(m_vad_value); - m_main.add(m_vad_param); - m_main.add(m_capture_gain); + m_main.add(*sliders_container); m_main.add(m_scroll); - m_main.add(m_vad_combo); - m_main.add(m_playback_combo); - m_main.add(m_capture_combo); + m_main.add(*combos_container); add(m_main); show_all_children(); -- cgit v1.2.3 From f7f1788df9f8db0810f615b41f653110935fa5c2 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sun, 26 Nov 2023 17:51:41 -0500 Subject: add input settings label, tweak padding --- src/windows/voicewindow.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/windows') diff --git a/src/windows/voicewindow.cpp b/src/windows/voicewindow.cpp index 74ce8f5..825681c 100644 --- a/src/windows/voicewindow.cpp +++ b/src/windows/voicewindow.cpp @@ -238,8 +238,8 @@ VoiceWindow::VoiceWindow(Snowflake channel_id) auto *combos_container = Gtk::make_managed(); auto *combos_labels = Gtk::make_managed(); auto *combos_combos = Gtk::make_managed(); - combos_container->pack_start(*combos_labels, false, true, 2); - combos_container->pack_start(*combos_combos); + combos_container->pack_start(*combos_labels, false, true, 6); + combos_container->pack_start(*combos_combos, Gtk::PACK_EXPAND_WIDGET, 6); combos_labels->pack_start(*Gtk::make_managed("VAD Method", Gtk::ALIGN_END)); combos_labels->pack_start(*Gtk::make_managed("Output Device", Gtk::ALIGN_END)); combos_labels->pack_start(*Gtk::make_managed("Input Device", Gtk::ALIGN_END)); @@ -252,12 +252,13 @@ VoiceWindow::VoiceWindow(Snowflake channel_id) m_controls.add(m_deafen); m_controls.add(m_noise_suppression); m_controls.add(m_mix_mono); - m_main.add(m_menu_bar); - m_main.add(m_controls); - m_main.add(m_vad_value); - m_main.add(*sliders_container); - m_main.add(m_scroll); - m_main.add(*combos_container); + m_main.pack_start(m_menu_bar); + m_main.pack_start(m_controls); + m_main.pack_start(m_vad_value); + m_main.pack_start(*Gtk::make_managed("Input Settings")); + m_main.pack_start(*sliders_container); + m_main.pack_start(m_scroll); + m_main.pack_start(*combos_container, Gtk::PACK_EXPAND_WIDGET, 2); add(m_main); show_all_children(); -- cgit v1.2.3 From 14317bb513846a57034ecd21187a81fd2e861e85 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Fri, 1 Dec 2023 02:00:08 -0500 Subject: tweak voice settings window ui --- res/css/main.css | 8 ++++++++ src/windows/voicesettingswindow.cpp | 20 ++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) (limited to 'src/windows') diff --git a/res/css/main.css b/res/css/main.css index 19c65f0..95cab3e 100644 --- a/res/css/main.css +++ b/res/css/main.css @@ -125,3 +125,11 @@ .set-status-dialog .dialog-action-area { margin: 10px 5px 5px 5px; } + +.voice-settings-window > box { + padding: 5px; +} + +.voice-settings-window scale { + margin-right: 8px; +} diff --git a/src/windows/voicesettingswindow.cpp b/src/windows/voicesettingswindow.cpp index 97f77b5..1a112f5 100644 --- a/src/windows/voicesettingswindow.cpp +++ b/src/windows/voicesettingswindow.cpp @@ -12,6 +12,7 @@ VoiceSettingsWindow::VoiceSettingsWindow() : m_main(Gtk::ORIENTATION_VERTICAL) { get_style_context()->add_class("app-window"); + get_style_context()->add_class("voice-settings-window"); set_default_size(300, 300); m_encoding_mode.append("Voice"); @@ -115,10 +116,21 @@ VoiceSettingsWindow::VoiceSettingsWindow() m_signal_gain.emit(m_gain.get_value() / 100.0); }); - m_main.add(m_encoding_mode); - m_main.add(m_signal); - m_main.add(m_bitrate); - m_main.add(m_gain); + auto *layout = Gtk::make_managed(); + auto *labels = Gtk::make_managed(); + auto *widgets = Gtk::make_managed(); + layout->pack_start(*labels, false, true, 5); + layout->pack_start(*widgets); + labels->pack_start(*Gtk::make_managed("Coding Mode", Gtk::ALIGN_END)); + labels->pack_start(*Gtk::make_managed("Signal Hint", Gtk::ALIGN_END)); + labels->pack_start(*Gtk::make_managed("Bitrate", Gtk::ALIGN_END)); + labels->pack_start(*Gtk::make_managed("Gain", Gtk::ALIGN_END)); + widgets->pack_start(m_encoding_mode); + widgets->pack_start(m_signal); + widgets->pack_start(m_bitrate); + widgets->pack_start(m_gain); + + m_main.add(*layout); add(m_main); show_all_children(); -- cgit v1.2.3