Skip to content

Fix linked music and sound volume sliders #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nschimme wants to merge 3 commits into
base: preferences-fix
Choose a base branch
from
Open

Fix linked music and sound volume sliders #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
959a1f1
add searchable preferences
nschimme Apr 14, 2026
db4186c
Fix ConfigDialog search focus and add empty state message (#201)
nschimme Apr 15, 2026
0419e86
fix: ensure music and sound sliders operate independently
nschimme Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/preferences/AdvancedGraphics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,18 @@ AdvancedGraphicsGroupBox::AdvancedGraphicsGroupBox(QGroupBox &groupBox)
};

auto *const checkboxDiag = new QCheckBox("Show Performance Stats");
checkboxDiag->setObjectName("checkboxDiag");
checkboxDiag->setChecked(MapCanvasConfig::getShowPerfStats());
vertical->addWidget(checkboxDiag);

auto *const checkbox3d = new QCheckBox("3d Mode");
checkbox3d->setObjectName("checkbox3d");
const bool is3dAtInit = MapCanvasConfig::isIn3dMode();
checkbox3d->setChecked(is3dAtInit);
vertical->addWidget(checkbox3d);

auto *const autoTilt = new QCheckBox("Auto tilt with zoom");
autoTilt->setObjectName("autoTilt");
autoTilt->setChecked(MapCanvasConfig::isAutoTilt());
vertical->addWidget(autoTilt);

Expand Down
3 changes: 3 additions & 0 deletions src/preferences/audiopage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ AudioPage::AudioPage(QWidget *const parent)
{
ui->setupUi(this);

ui->musicVolumeSlider->setAudioType(AudioVolumeSlider::AudioType::Music);
ui->soundsVolumeSlider->setAudioType(AudioVolumeSlider::AudioType::Sound);

slot_updateDevices();
slot_loadConfig();

Expand Down
81 changes: 67 additions & 14 deletions src/preferences/audiopage.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
<ui version="4.0">
<class>AudioPage</class>
<widget class="QWidget" name="AudioPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="outputGroupBox">
Expand All @@ -19,13 +11,26 @@
<layout class="QGridLayout" name="gridLayoutOutput">
<item row="0" column="0">
<widget class="QLabel" name="outputDeviceLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Device:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="outputDeviceComboBox"/>
<widget class="QComboBox" name="outputDeviceComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
Expand All @@ -38,15 +43,39 @@
<layout class="QGridLayout" name="gridLayoutMusic">
<item row="1" column="0">
<widget class="QLabel" name="musicVolumeLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Volume:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="AudioVolumeSlider" name="musicVolumeSlider">
<property name="audioType">
<enum>AudioVolumeSlider::AudioType::Music</enum>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="mouseTracking">
<bool>true</bool>
</property>
<property name="tracking">
<bool>false</bool>
</property>
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TickPosition::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>10</number>
</property>
</widget>
</item>
Expand All @@ -61,15 +90,39 @@
<layout class="QGridLayout" name="gridLayoutSounds">
<item row="1" column="0">
<widget class="QLabel" name="soundsVolumeLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Volume:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="AudioVolumeSlider" name="soundsVolumeSlider">
<property name="audioType">
<enum>AudioVolumeSlider::AudioType::Sound</enum>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="mouseTracking">
<bool>true</bool>
</property>
<property name="tracking">
<bool>false</bool>
</property>
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TickPosition::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>10</number>
</property>
</widget>
</item>
Expand All @@ -79,7 +132,7 @@
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand Down
27 changes: 18 additions & 9 deletions src/preferences/autologpage.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>326</width>
<height>384</height>
<width>345</width>
<height>404</height>
</rect>
</property>
<layout class="QVBoxLayout">
Expand Down Expand Up @@ -36,10 +36,10 @@
<item row="6" column="0" colspan="6">
<widget class="QFrame" name="autoLogFrame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
<enum>QFrame::Shadow::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
Expand Down Expand Up @@ -129,6 +129,9 @@
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="spinBoxDays">
<property name="focusPolicy">
<enum>Qt::FocusPolicy::StrongFocus</enum>
</property>
<property name="maximum">
<number>9999999</number>
</property>
Expand All @@ -151,6 +154,9 @@
<height>0</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::FocusPolicy::StrongFocus</enum>
</property>
<property name="minimum">
<number>1</number>
</property>
Expand Down Expand Up @@ -192,11 +198,11 @@
<item row="3" column="3">
<spacer name="advancedSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<width>10</width>
<height>20</height>
</size>
</property>
Expand Down Expand Up @@ -268,6 +274,9 @@
<height>0</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::FocusPolicy::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Rotate logs to keep files small for editors</string>
</property>
Expand All @@ -288,11 +297,11 @@
<item row="0" column="3">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<width>10</width>
<height>20</height>
</size>
</property>
Expand All @@ -304,7 +313,7 @@
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand Down
43 changes: 27 additions & 16 deletions src/preferences/clientpage.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
<ui version="4.0">
<class>ClientPage</class>
<widget class="QWidget" name="ClientPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>331</width>
<height>687</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
Expand Down Expand Up @@ -77,11 +69,11 @@
<item row="2" column="3">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<width>10</width>
<height>20</height>
</size>
</property>
Expand All @@ -90,10 +82,10 @@
<item row="0" column="0" colspan="4">
<widget class="QLabel" name="exampleLabel">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::Shape::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<enum>QFrame::Shadow::Raised</enum>
</property>
<property name="text">
<string>Arglebargle, glop-glyf!?!</string>
Expand All @@ -117,6 +109,9 @@
<layout class="QGridLayout" name="gridLayout_3">
<item row="4" column="1">
<widget class="QSpinBox" name="scrollbackSpinBox">
<property name="focusPolicy">
<enum>Qt::FocusPolicy::StrongFocus</enum>
</property>
<property name="showGroupSeparator" stdset="0">
<bool>true</bool>
</property>
Expand All @@ -130,6 +125,9 @@
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="columnsSpinBox">
<property name="focusPolicy">
<enum>Qt::FocusPolicy::StrongFocus</enum>
</property>
<property name="showGroupSeparator" stdset="0">
<bool>true</bool>
</property>
Expand Down Expand Up @@ -170,6 +168,9 @@
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="rowsSpinBox">
<property name="focusPolicy">
<enum>Qt::FocusPolicy::StrongFocus</enum>
</property>
<property name="showGroupSeparator" stdset="0">
<bool>true</bool>
</property>
Expand Down Expand Up @@ -205,7 +206,11 @@
</widget>
</item>
<item row="5" column="1">
<widget class="QSpinBox" name="previewSpinBox"/>
<widget class="QSpinBox" name="previewSpinBox">
<property name="focusPolicy">
<enum>Qt::FocusPolicy::StrongFocus</enum>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<widget class="QCheckBox" name="audibleBellCheckBox">
Expand Down Expand Up @@ -238,6 +243,9 @@
<layout class="QGridLayout" name="gridLayout_2">
<item row="2" column="1">
<widget class="QSpinBox" name="tabDictionarySpinBox">
<property name="focusPolicy">
<enum>Qt::FocusPolicy::StrongFocus</enum>
</property>
<property name="showGroupSeparator" stdset="0">
<bool>true</bool>
</property>
Expand All @@ -254,6 +262,9 @@
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="inputHistorySpinBox">
<property name="focusPolicy">
<enum>Qt::FocusPolicy::StrongFocus</enum>
</property>
<property name="showGroupSeparator" stdset="0">
<bool>true</bool>
</property>
Expand Down Expand Up @@ -291,11 +302,11 @@
<item row="4" column="1">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<width>10</width>
<height>20</height>
</size>
</property>
Expand Down Expand Up @@ -344,7 +355,7 @@
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand Down
Loading
Loading