Merge branch 'master' of git.manuel.mausz.at:/foop

Conflicts:
	pacman-c++/sceneholder.cpp
	pacman-c++/util.h

12 files changed, 117 insertions, 7 deletions

diff --git a/pacman-c++/actor.cpp b/pacman-c++/actor.cpp
index 445d63d..011fbeb 100644
--- a/pacman-c++/actor.cpp
+++ b/pacman-c++/actor.cpp
@@ -81,7 +81,7 @@ QSequentialAnimationGroup *Actor::setupEatingAnimation(Actor::Movement direction
     fadeout->setEndValue(false);
 
     QPropertyAnimation *move = new QPropertyAnimation(img, "pos", m_moving);
-    move->setDuration(Constants::tick);
+    move->setDuration(Constants::tick - 50);
     move->setEndValue(QPoint(0, 0));
   }
 
@@ -106,8 +106,8 @@ bool Actor::isLocal()
 void Actor::move(Actor::Movement direction)
 {
   //TODO: remove?
-  if (isMoving())
-    return;
+  //if (isMoving())
+  //  return;
 
   /* stop current animation */
   if (direction != m_direction)
diff --git a/pacman-c++/audioplayer.cpp b/pacman-c++/audioplayer.cpp
index 424d3cf..5507bb3 100644
--- a/pacman-c++/audioplayer.cpp
+++ b/pacman-c++/audioplayer.cpp
@@ -52,6 +52,11 @@ AudioPlayer *AudioPlayer::self()
   return m_instance;
 }
 
+bool AudioPlayer::isWorking() const
+{
+  return m_working;
+}
+
 void AudioPlayer::stop()
 {
   m_player->stop();
@@ -62,6 +67,11 @@ void AudioPlayer::setMuted(bool mute)
   m_output->setMuted(mute);
 }
 
+bool AudioPlayer::isMuted() const
+{
+  return m_output->isMuted();
+}
+
 void AudioPlayer::play(AudioPlayer::Sound sound)
 {
   if (!m_working)
@@ -86,7 +96,7 @@ void AudioPlayer::enqueue(AudioPlayer::Sound sound)
   m_player->enqueue(Phonon::MediaSource(m_sounds[sound]));
 }
 
-void AudioPlayer::clearQueue()
+void AudioPlayer::clearQueue() const
 {
   if (!m_working)
     return;
diff --git a/pacman-c++/audioplayer.h b/pacman-c++/audioplayer.h
index dd0c25a..567ccb1 100644
--- a/pacman-c++/audioplayer.h
+++ b/pacman-c++/audioplayer.h
@@ -28,13 +28,14 @@ public:
 public:
   AudioPlayer();
   static AudioPlayer *self();
-  bool isWorking();
+  bool isWorking() const;
   void stop();
   void setMuted(bool mute = true);
+  bool isMuted() const;
   void play(Sound sound);
   void clear();
   void enqueue(Sound sound);
-  void clearQueue();
+  void clearQueue() const;
   Phonon::State state();
 
 signals:
diff --git a/pacman-c++/clicklabel.cpp b/pacman-c++/clicklabel.cpp
new file mode 100644
index 0000000..87b06b8
--- /dev/null
+++ b/pacman-c++/clicklabel.cpp
@@ -0,0 +1,12 @@
+#include "clicklabel.h"
+
+ClickLabel::ClickLabel(const QString &text, QWidget *parent, Qt::WindowFlags f)
+  : QLabel(text, parent, f)
+{
+}
+
+void ClickLabel::mouseReleaseEvent(QMouseEvent * /* event */)
+{
+  emit clicked();
+}
+
diff --git a/pacman-c++/clicklabel.h b/pacman-c++/clicklabel.h
new file mode 100644
index 0000000..494b1ee
--- /dev/null
+++ b/pacman-c++/clicklabel.h
@@ -0,0 +1,21 @@
+#ifndef CLICKLABEL_H
+#define CLICKLABEL_H
+
+#include <QLabel>
+
+class ClickLabel
+  : public QLabel
+{
+    Q_OBJECT
+
+public:
+    ClickLabel(const QString &text, QWidget *parent = 0, Qt::WindowFlags f = 0);
+
+signals:
+    void clicked();
+
+protected:
+  void mouseReleaseEvent(QMouseEvent *event);
+};
+
+#endif // CLICKLABEL_H
diff --git a/pacman-c++/client.cpp b/pacman-c++/client.cpp
index e4978f7..7827591 100644
--- a/pacman-c++/client.cpp
+++ b/pacman-c++/client.cpp
@@ -1,5 +1,6 @@
 #include "client.h"
 #include "audioplayer.h"
+#include "clicklabel.h"
 
 Client::Client()
 {
@@ -9,10 +10,38 @@ Client::Client()
   QMenu *fileMenu = menuBar()->addMenu("File");
   fileMenu->addAction(quitAction);
 
+  ClickLabel *toggleSound = new ClickLabel("Toggle Sound", this);
+  toggleSound->setFixedWidth(20);
+  toggleSound->setFixedHeight(16);
+  toggleSound->setAlignment(Qt::AlignBottom);
+  bool sound = AudioPlayer::self()->isWorking();
+  QImage img(sound ? ":/soundon" : ":/soundoff");
+  img.setColor(1, menuBar()->palette().color(sound ? QPalette::Active : QPalette::Disabled,
+                                             QPalette::ButtonText).rgba());
+  toggleSound->setPixmap(QPixmap::fromImage(img));
+  if (sound)
+    connect(toggleSound, SIGNAL(clicked()), this, SLOT(toggleSound()));
+
+  menuBar()->setCornerWidget(toggleSound);
+
   m_mainWidget = new MainWidget();
   setCentralWidget(m_mainWidget);
 }
 
+void Client::toggleSound() const
+{
+  if (!AudioPlayer::self()->isWorking())
+    return;
+
+  bool muted = AudioPlayer::self()->isMuted();
+  QImage img(muted ? ":/soundon" : ":/soundoff");
+  img.setColor(1, menuBar()->palette().color(muted ? QPalette::Active : QPalette::Disabled,
+                                             QPalette::ButtonText).rgba());
+  ClickLabel *tmp = qobject_cast<ClickLabel *>(menuBar()->cornerWidget());
+  tmp->setPixmap(QPixmap::fromImage(img));
+  AudioPlayer::self()->setMuted(!muted);
+}
+
 int main(int argc, char ** argv)
 {
   QApplication app(argc, argv);
diff --git a/pacman-c++/client.h b/pacman-c++/client.h
index 476b972..56f3602 100644
--- a/pacman-c++/client.h
+++ b/pacman-c++/client.h
@@ -11,6 +11,9 @@ class Client
 public:
   Client();
 
+public slots:
+  void toggleSound() const;
+
 private:
   MainWidget *m_mainWidget;
 };
diff --git a/pacman-c++/pacman.pro b/pacman-c++/pacman.pro
index a1dddf6..dd08568 100644
--- a/pacman-c++/pacman.pro
+++ b/pacman-c++/pacman.pro
@@ -8,6 +8,7 @@ SOURCES += pixmapitem.cpp \
     mainwidget.cpp \
     point.cpp \
     audioplayer.cpp \
+    clicklabel.cpp \
                 sceneholder.cpp \
                 util.cpp
 HEADERS += pixmapitem.h \
@@ -20,6 +21,7 @@ HEADERS += pixmapitem.h \
     constants.h \
     point.h \
     audioplayer.h \
+    clicklabel.h \
                 sceneholder.h \
                 util.h
 RESOURCES += pacman.qrc
diff --git a/pacman-c++/pacman.qrc b/pacman-c++/pacman.qrc
index b116a30..4fb542e 100644
--- a/pacman-c++/pacman.qrc
+++ b/pacman-c++/pacman.qrc
@@ -17,6 +17,8 @@
         <file alias="actor2icon">pics/actor2icon.png</file>
         <file alias="actor3icon">pics/actor3icon.png</file>
         <file alias="actor4icon">pics/actor4icon.png</file>
+        <file alias="soundon">pics/soundon.xpm</file>
+        <file alias="soundoff">pics/soundoff.xpm</file>
     </qresource>
     <qresource prefix="/sound">
         <file alias="sound1">sound/intro.ogg</file>
diff --git a/pacman-c++/pics/soundoff.xpm b/pacman-c++/pics/soundoff.xpm
new file mode 100644
index 0000000..ba33f5f
--- /dev/null
+++ b/pacman-c++/pics/soundoff.xpm
@@ -0,0 +1,15 @@
+/* XPM */
+static char * soundoff_xpm[] = {
+"12 10 2 1",
+"       c None",
+".      c #000000",
+"            ",
+"   .        ",
+"  ..  .    .",
+"....   .  . ",
+"....    ..  ",
+"....    ..  ",
+"....   .  . ",
+"  ..  .    .",
+"   .        ",
+"            "};
diff --git a/pacman-c++/pics/soundon.xpm b/pacman-c++/pics/soundon.xpm
new file mode 100644
index 0000000..e6ca41e
--- /dev/null
+++ b/pacman-c++/pics/soundon.xpm
@@ -0,0 +1,15 @@
+/* XPM */
+static char * soundoff_xpm[] = {
+"12 10 2 1",
+"       c None",
+".      c #000000",
+"       .    ",
+"   .    .   ",
+"  ..  .  .  ",
+"....   . .  ",
+"....   . .  ",
+"....   . .  ",
+"....   . .  ",
+"  ..  .  .  ",
+"   .    .   ",
+"       .    "};
diff --git a/pacman-c++/sceneholder.h b/pacman-c++/sceneholder.h
index cf6941a..f188956 100644
--- a/pacman-c++/sceneholder.h
+++ b/pacman-c++/sceneholder.h
@@ -35,4 +35,4 @@ protected:
 
 };
 
-#endif // SCENEHOLDER_H
\ No newline at end of file
+#endif // SCENEHOLDER_H