Merge branch 'master' into QJson_Experiments

[buliscores] / src / src / mainwidget.cpp

diff --git a/src/src/mainwidget.cpp b/src/src/mainwidget.cpp
index 6016a34..35f8af9 100644 (file)
--- a/src/src/mainwidget.cpp
+++ b/src/src/mainwidget.cpp
@@ -46,7 +46,10 @@ MainWidget::MainWidget(QWidget *parent) :
     // table
     m_layout.addWidget(&m_statuslbl);
     m_layout.addWidget(m_scoretbl);
+    m_layout.setSizeConstraint(QLayout::SetFixedSize);
     this->setLayout(&m_layout);
+    this->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
     m_statuslbl.show();
 
     connect(m_settingsdlg, SIGNAL(accepted()),
@@ -61,8 +64,8 @@ MainWidget::MainWidget(QWidget *parent) :
     connect(m_backend, SIGNAL(matchAdded(Match*)),
            this, SLOT(onMatchAdded(Match*)));
 
-    m_mediaObject_tor->setCurrentSource(Phonon::MediaSource("/usr/share/buliscores/tor.wav"));
-    m_mediaObject_pfeife->setCurrentSource(Phonon::MediaSource("/usr/share/buliscores/trillerpfeife.wav"));
+    m_mediaObject_tor->setCurrentSource(Phonon::MediaSource("/usr/share/buliscores/tor.mp3"));
+    m_mediaObject_pfeife->setCurrentSource(Phonon::MediaSource("/usr/share/buliscores/trillerpfeife.mp3"));
 
     Phonon::createPath(m_mediaObject_tor,     m_audioOutput_tor);
     Phonon::createPath(m_mediaObject_pfeife,  m_audioOutput_pfeife);
@@ -82,14 +85,16 @@ void MainWidget::mousePressEvent(QMouseEvent* event)
         data.insert("BackendData", m_backend->serializableData());
         qWarning() << serializer.serialize(m_backend->serializableData());
 
-
-//        qDebug() << "current volume: " << m_audioOutput_pfeife->volume();
-//        qDebug() << "MO state: " << m_mediaObject_pfeife->state();
 //        m_mediaObject_pfeife->seek(0);
 //        if (m_settings.value("Sounds", false).toBool()) {
 //            m_mediaObject_pfeife->play();
 //        }
-//        qDebug() << "MO state 2: " << m_mediaObject_pfeife->state();
+//        m_mediaObject_tor->seek(0);
+//        if (m_settings.value("Sounds", false).toBool()) {
+//            m_mediaObject_tor->play();
+//        }
+//        qDebug() << "pfeife state 2: " << m_mediaObject_pfeife->state();
+//        qDebug() << "tor state 2: " << m_mediaObject_pfeife->state();
     }
 }
 
@@ -119,6 +124,7 @@ void MainWidget::onMatchAdded(Match* match) {
 
     connect(match, SIGNAL(stateChanged(Match::MatchState)),
             this, SLOT(onMatchStateChanged(Match::MatchState)));
+
     qDebug() << "Match (" << match->homeTeam() << " vs "
              << match->awayTeam() << ") : registering signals";
 }