Changeset View
Changeset View
Standalone View
Standalone View
gui/kmixprefdlg.cpp
Show All 18 Lines | |||||
19 | * License along with this program; if not, write to the Free | 19 | * License along with this program; if not, write to the Free | ||
20 | * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | 20 | * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
21 | */ | 21 | */ | ||
22 | 22 | | |||
23 | #include "gui/kmixprefdlg.h" | 23 | #include "gui/kmixprefdlg.h" | ||
24 | 24 | | |||
25 | #include <qbuttongroup.h> | 25 | #include <qbuttongroup.h> | ||
26 | #include <qcheckbox.h> | 26 | #include <qcheckbox.h> | ||
27 | #include <qspinbox.h> | ||||
27 | #include <qlabel.h> | 28 | #include <qlabel.h> | ||
28 | #include <qradiobutton.h> | 29 | #include <qradiobutton.h> | ||
29 | #include <qgroupbox.h> | 30 | #include <qgroupbox.h> | ||
30 | 31 | | |||
31 | #include <kconfig.h> | 32 | #include <kconfig.h> | ||
32 | #include <klocalizedstring.h> | 33 | #include <klocalizedstring.h> | ||
33 | #include <kmessagewidget.h> | 34 | #include <kmessagewidget.h> | ||
34 | 35 | | |||
▲ Show 20 Lines • Show All 168 Lines • ▼ Show 20 Line(s) | 192 | { | |||
203 | grp->setLayout(behaviorLayout); | 204 | grp->setLayout(behaviorLayout); | ||
204 | 205 | | |||
205 | // [CONFIG] | 206 | // [CONFIG] | ||
206 | m_beepOnVolumeChange = new QCheckBox(i18n("Volume feedback"), grp); | 207 | m_beepOnVolumeChange = new QCheckBox(i18n("Volume feedback"), grp); | ||
207 | addWidgetToLayout(m_beepOnVolumeChange, behaviorLayout, 10, "", "VolumeFeedback"); | 208 | addWidgetToLayout(m_beepOnVolumeChange, behaviorLayout, 10, "", "VolumeFeedback"); | ||
208 | 209 | | |||
209 | m_volumeOverdrive = new QCheckBox(i18n("Volume overdrive"), grp); | 210 | m_volumeOverdrive = new QCheckBox(i18n("Volume overdrive"), grp); | ||
210 | addWidgetToLayout(m_volumeOverdrive, behaviorLayout, 10, i18nc("@info:tooltip", "Raise the maximum volume to 150%"), "VolumeOverdrive"); | 211 | addWidgetToLayout(m_volumeOverdrive, behaviorLayout, 10, i18nc("@info:tooltip", "Raise the maximum volume to 150%"), "VolumeOverdrive"); | ||
211 | 212 | | |||
marten: Could the volume step widget be moved to below the volumeFeedbackWarning message, so that if… | |||||
213 | // Volume Feedback Warning | ||||
212 | volumeFeedbackWarning = new KMessageWidget( | 214 | volumeFeedbackWarning = new KMessageWidget( | ||
213 | i18n("Volume feedback and volume overdrive are only available for PulseAudio."), grp); | 215 | i18n("Volume feedback and volume overdrive are only available for PulseAudio."), grp); | ||
214 | volumeFeedbackWarning->setIcon(QIcon::fromTheme("dialog-warning")); | 216 | volumeFeedbackWarning->setIcon(QIcon::fromTheme("dialog-warning")); | ||
215 | volumeFeedbackWarning->setMessageType(KMessageWidget::Warning); | 217 | volumeFeedbackWarning->setMessageType(KMessageWidget::Warning); | ||
216 | volumeFeedbackWarning->setCloseButtonVisible(false); | 218 | volumeFeedbackWarning->setCloseButtonVisible(false); | ||
217 | volumeFeedbackWarning->setWordWrap(true); | 219 | volumeFeedbackWarning->setWordWrap(true); | ||
218 | volumeFeedbackWarning->setVisible(false); | 220 | volumeFeedbackWarning->setVisible(false); | ||
219 | addWidgetToLayout(volumeFeedbackWarning, behaviorLayout, 2, "", ""); | 221 | addWidgetToLayout(volumeFeedbackWarning, behaviorLayout, 2, "", ""); | ||
220 | 222 | | |||
223 | // Volume Step Grid | ||||
224 | QGridLayout* horizontalGrid = new QGridLayout(); | ||||
225 | horizontalGrid->setHorizontalSpacing(DialogBase::horizontalSpacing()); | ||||
226 | | ||||
227 | // Volume Step SpinBox | ||||
228 | m_volumeStep = new QSpinBox(grp); | ||||
229 | m_volumeStep->setSuffix(" %"); | ||||
230 | m_volumeStep->setRange(1, 50); | ||||
231 | // Register SpinBox for KConfig | ||||
232 | m_volumeStep->setObjectName("kcfg_VolumePercentageStep"); | ||||
233 | | ||||
234 | horizontalGrid->addWidget(new QLabel(i18n("Volume step:"), m_generalTab), 0, 0, Qt::AlignLeft); | ||||
235 | horizontalGrid->addWidget(m_volumeStep, 0, 1, Qt::AlignLeft); | ||||
236 | horizontalGrid->addItem(new QSpacerItem(1 ,1 , QSizePolicy::Expanding), 0, 2); | ||||
237 | | ||||
238 | // Add grid to behavior layout | ||||
239 | behaviorLayout->addLayout(horizontalGrid); | ||||
240 | | ||||
241 | // Volume Step and Overdrive Warning | ||||
221 | volumeOverdriveWarning = new KMessageWidget( | 242 | volumeOverdriveWarning = new KMessageWidget( | ||
marten: "... for the Volume Step and..."
| |||||
222 | i18n("KMix must be restarted for the Volume Overdrive setting to take effect."), grp); | 243 | i18n("KMix must be restarted for the Volume Step and Overdrive settings to take effect."), grp); | ||
223 | volumeOverdriveWarning->setIcon(QIcon::fromTheme("dialog-information")); | 244 | volumeOverdriveWarning->setIcon(QIcon::fromTheme("dialog-information")); | ||
224 | volumeOverdriveWarning->setMessageType(KMessageWidget::Information); | 245 | volumeOverdriveWarning->setMessageType(KMessageWidget::Information); | ||
225 | volumeOverdriveWarning->setCloseButtonVisible(false); | 246 | volumeOverdriveWarning->setCloseButtonVisible(false); | ||
226 | volumeOverdriveWarning->setWordWrap(true); | 247 | volumeOverdriveWarning->setWordWrap(true); | ||
227 | volumeOverdriveWarning->setVisible(false); | 248 | volumeOverdriveWarning->setVisible(false); | ||
228 | addWidgetToLayout(volumeOverdriveWarning, behaviorLayout, 2, "", ""); | 249 | addWidgetToLayout(volumeOverdriveWarning, behaviorLayout, 2, "", ""); | ||
229 | 250 | | |||
230 | // --- Visual --------------------------------------------------------- | 251 | // --- Visual --------------------------------------------------------- | ||
▲ Show 20 Lines • Show All 229 Lines • ▼ Show 20 Line(s) | 467 | { | |||
460 | dvc->show(); | 481 | dvc->show(); | ||
461 | 482 | | |||
462 | // Push everything above to the top | 483 | // Push everything above to the top | ||
463 | // layoutControlsTab->addStretch(); | 484 | // layoutControlsTab->addStretch(); | ||
464 | 485 | | |||
465 | dvcSpacerBelow = new QSpacerItem(1,1); | 486 | dvcSpacerBelow = new QSpacerItem(1,1); | ||
466 | layoutControlsTab->addItem(dvcSpacerBelow); | 487 | layoutControlsTab->addItem(dvcSpacerBelow); | ||
467 | } | 488 | } | ||
468 | | ||||
469 | | ||||
470 | | ||||
471 | |
Could the volume step widget be moved to below the volumeFeedbackWarning message, so that if the message is shown it does not give the impression that the volume step only applies to PulseAudio.