Copyright file added.
[jspeed] / src / speedalarmsettings.cpp
index 64e84c2..8baf6ab 100644 (file)
@@ -33,7 +33,6 @@
 #include "settings.h"
 #include "fileselector.h"
 #include "poialerts.h"
-#include "mediaplayer.h"
 #include "soundselector.h"
 #include "buttonbox.h"
 
@@ -60,13 +59,13 @@ SpeedAlarmSettings::SpeedAlarmSettings(QWidget* parent): QDialog(parent)
     enabled_->setChecked(Settings::instance().value("alarm_enabled", false).toBool());
 
     ButtonBox* buttons = new ButtonBox;
-    buttons->addButton(tr("Save"), this, SLOT(saveSettings()), QDialogButtonBox::AcceptRole);
+    connect(buttons->addButton(tr("Save"), QDialogButtonBox::AcceptRole), SIGNAL(clicked(bool)), this, SLOT(saveSettings()));
 
     QHBoxLayout* layout = new QHBoxLayout;
     QVBoxLayout* left = new QVBoxLayout;
 
     left->addLayout(speedLayout);
-    left->addWidget(soundSelector_);
+    left->addLayout(soundSelector_);
     left->addWidget(enabled_);
     layout->addLayout(left, Qt::AlignLeft);
     layout->addWidget(buttons);
@@ -82,6 +81,7 @@ void SpeedAlarmSettings::loadData()
     speed_->setText(QString::number(static_cast<int>(speedValue)));
 
     QString selected = Settings::instance().value("alarm_sound", "").toString();
+    soundSelector_->load();
     soundSelector_->setValue(selected);
 }