From 6bda3051b4bf8fbb4565d32af57b032294fe0464 Mon Sep 17 00:00:00 2001
From: Daniel Svensson <daniel@nittionio.nu>
Date: Sat, 19 Aug 2006 18:21:04 +0200
Subject: [PATCH] Remember equalizer window position.

---
 Equalizer.cpp  | 26 +++++++++++++++++++++-----
 Equalizer.h    |  6 +++++-
 MainWindow.cpp |  8 +++++++-
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/Equalizer.cpp b/Equalizer.cpp
index e851772..0838edd 100644
--- a/Equalizer.cpp
+++ b/Equalizer.cpp
@@ -31,6 +31,27 @@ EqualizerWindow::setEnabled (void)
 }
 
 
+void
+EqualizerWindow::mousePressEvent (QMouseEvent *event)
+{
+	m_diffx = event->pos().x();
+	m_diffy = event->pos().y();
+}
+
+void
+EqualizerWindow::mouseMoveEvent (QMouseEvent *event)
+{
+	move(event->globalPos().x() - m_diffx,
+		 event->globalPos().y() - m_diffy);
+}
+
+void
+EqualizerWindow::moveEvent (QMoveEvent *event)
+{
+	QSettings s;
+	s.setValue ("equalizer/pos", pos ());
+}
+
 EqualizerWidget::EqualizerWidget (QWidget *parent) : QWidget (parent)
 {
 	Skin *skin = Skin::getInstance ();
@@ -70,11 +91,6 @@ EqualizerWidget::~EqualizerWidget (void)
 {
 }
 
-void
-EqualizerWidget::mouseMoveEvent (QMouseEvent *event)
-{
-}
-
 void
 EqualizerWidget::setPixmaps (Skin *skin)
 {
diff --git a/Equalizer.h b/Equalizer.h
index 1e98090..b2d2ad4 100644
--- a/Equalizer.h
+++ b/Equalizer.h
@@ -24,7 +24,6 @@ class EqualizerWidget : public QWidget
 	public:
 		EqualizerWidget(QWidget *parent);
 		~EqualizerWidget();
-		void mouseMoveEvent(QMouseEvent *);
 		void paintEvent (QPaintEvent *event);
 
 	public slots:
@@ -45,6 +44,9 @@ class EqualizerWindow : public QMainWindow
 	public:
 		EqualizerWindow(QWidget *parent);
 		~EqualizerWindow();
+		void mouseMoveEvent(QMouseEvent *);
+		void mousePressEvent(QMouseEvent *);
+		void moveEvent(QMoveEvent *event);
 
 	public slots:
 		void setEnabled (void);
@@ -52,6 +54,8 @@ class EqualizerWindow : public QMainWindow
 	private:
 		MainWindow *m_mw;
 		EqualizerWidget *m_equalizer;
+		int m_diffx;
+		int m_diffy;
 };
 
 
diff --git a/MainWindow.cpp b/MainWindow.cpp
index d4cd6cf..c7eb697 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -123,6 +123,7 @@ MainWindow::toggleEQ (bool UpdateButton)
 	}
 
 	if (s.value ("equalizer/hidden").toBool ()) {
+		m_equalizer->move (s.value("equalizer/pos").toPoint ());
 		m_equalizer->show (); 
 		s.setValue ("equalizer/hidden", false);
 	} else {
@@ -174,7 +175,6 @@ main (int argc, char **argv)
 		settings.setValue ("playlist/pos", QPoint (mw->pos().x(),
 												   mw->pos().y()+mw->size().height()));
 	playlistwin->move (settings.value("playlist/pos").toPoint ());
-	playlistwin->move (settings.value("playlist/pos").toPoint ());
 
 	if (!settings.contains ("playlist/hidden"))
 		settings.setValue ("playlist/hidden", true);
@@ -184,6 +184,12 @@ main (int argc, char **argv)
 	else
 		playlistwin->show ();
 
+
+	if (!settings.contains ("equalizer/pos"))
+		settings.setValue ("equalizer/pos", QPoint (mw->pos().x(),
+												   mw->pos().y()+mw->size().height()));
+	eqwin->move (settings.value("equalizer/pos").toPoint ());
+
 	if (!settings.contains ("equalizer/hidden"))
 		settings.setValue ("equalizer/hidden", true);