diff --git a/src/Display.cpp b/src/Display.cpp index 74f6ac9..dc52a8f 100644 --- a/src/Display.cpp +++ b/src/Display.cpp @@ -13,6 +13,8 @@ * GNU General Public License for more details. */ +#include "XMMSHandler.h" + #include "mainwindow.h" #include "Display.h" diff --git a/src/PosBar.cpp b/src/PosBar.cpp index 36fb9f1..1fad511 100644 --- a/src/PosBar.cpp +++ b/src/PosBar.cpp @@ -13,6 +13,8 @@ * GNU General Public License for more details. */ +#include "XMMSHandler.h" + #include "mainwindow.h" #include "PosBar.h" diff --git a/src/TimeDisplay.cpp b/src/TimeDisplay.cpp index 191fff7..b678cde 100644 --- a/src/TimeDisplay.cpp +++ b/src/TimeDisplay.cpp @@ -13,6 +13,8 @@ * GNU General Public License for more details. */ +#include "XMMSHandler.h" + #include "mainwindow.h" #include "maindisplay.h" #include "TimeDisplay.h" diff --git a/src/TitleBar.cpp b/src/TitleBar.cpp index 1790989..1d1499a 100644 --- a/src/TitleBar.cpp +++ b/src/TitleBar.cpp @@ -13,6 +13,8 @@ * GNU General Public License for more details. */ +#include "XMMSHandler.h" + #include "mainwindow.h" #include "TitleBar.h" #include "Display.h" diff --git a/src/equalizer/equalizer.pri b/src/equalizer/equalizer.pri index 57f96a0..c69e850 100644 --- a/src/equalizer/equalizer.pri +++ b/src/equalizer/equalizer.pri @@ -1,6 +1,8 @@ -HEADERS += equalizer.h +HEADERS += equalizerwindow.h \ + equalizerwidget.h -SOURCES += equalizer.cpp +SOURCES += equalizerwindow.cpp \ + equalizerwidget.cpp INCLUDEPATH += $$PWD DEPENDPATH += $$PWD diff --git a/src/equalizer/equalizer.cpp b/src/equalizer/equalizerwidget.cpp similarity index 74% rename from src/equalizer/equalizer.cpp rename to src/equalizer/equalizerwidget.cpp index d461f1a..aa0235f 100644 --- a/src/equalizer/equalizer.cpp +++ b/src/equalizer/equalizerwidget.cpp @@ -13,64 +13,14 @@ * GNU General Public License for more details. */ +#include "XMMSHandler.h" + +#include "equalizerwidget.h" + #include "mainwindow.h" -#include "TitleBar.h" -#include "equalizer.h" #include "Button.h" #include "VolumeSlider.h" -EqualizerWindow::EqualizerWindow (QWidget *parent) : QMainWindow (parent) -{ - m_mw = dynamic_cast(parent); - - setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint); - setAttribute (Qt::WA_DeleteOnClose); - - m_equalizer = new EqualizerWidget (this); - m_equalizer->show(); - - setCentralWidget (m_equalizer); - - setFixedSize (275, 116); -} - -EqualizerWindow::~EqualizerWindow (void) -{ -} - -void -EqualizerWindow::setEnabled (void) -{ - qDebug ("test"); -} - - -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::EqualizerWidget (QWidget *parent) : QWidget (parent) { Skin *skin = Skin::getInstance (); diff --git a/src/equalizer/equalizer.h b/src/equalizer/equalizerwidget.h similarity index 63% rename from src/equalizer/equalizer.h rename to src/equalizer/equalizerwidget.h index 2bbb578..32b7f9b 100644 --- a/src/equalizer/equalizer.h +++ b/src/equalizer/equalizerwidget.h @@ -13,25 +13,19 @@ * GNU General Public License for more details. */ -#ifndef __EQUALIZER_H__ -#define __EQUALIZER_H__ +#ifndef __EQUALIZERWIDGET_H__ +#define __EQUALIZERWIDGET_H__ + +#include +class QPixmap; +class QPaintEvent; class Skin; class Button; -class MainWindow; -class TitleBar; class ToggleButton; class Slider; -#include - -#include -#include -#include -#include -#include - -#include "Display.h" +//#include class EqualizerWidget : public QWidget { @@ -43,6 +37,7 @@ class EqualizerWidget : public QWidget public slots: void setPixmaps(Skin *skin); + private: QPixmap m_pixmap; QPixmap m_graph; @@ -53,25 +48,5 @@ class EqualizerWidget : public QWidget Slider *m_bands[10]; }; -class EqualizerWindow : public QMainWindow -{ - Q_OBJECT - public: - EqualizerWindow(QWidget *parent); - ~EqualizerWindow(); - void mouseMoveEvent(QMouseEvent *); - void mousePressEvent(QMouseEvent *); - void moveEvent(QMoveEvent *event); - - public slots: - void setEnabled (void); - - private: - MainWindow *m_mw; - EqualizerWidget *m_equalizer; - int m_diffx; - int m_diffy; -}; - #endif diff --git a/src/equalizer/equalizerwindow.cpp b/src/equalizer/equalizerwindow.cpp new file mode 100644 index 0000000..e9aed81 --- /dev/null +++ b/src/equalizer/equalizerwindow.cpp @@ -0,0 +1,73 @@ +/** + * This file is a part of Prome, an XMMS2 Client. + * + * Copyright (C) 2005-2007 XMMS2 Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include "XMMSHandler.h" + +#include "equalizerwindow.h" + +#include "QWidget" +#include +#include +#include + +#include "mainwindow.h" +#include "equalizerwidget.h" + +EqualizerWindow::EqualizerWindow (QWidget *parent) : QMainWindow (parent) +{ + m_mw = dynamic_cast(parent); + + setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint); + setAttribute (Qt::WA_DeleteOnClose); + + m_equalizer = new EqualizerWidget (this); + m_equalizer->show(); + + setCentralWidget (m_equalizer); + + setFixedSize (275, 116); +} + +EqualizerWindow::~EqualizerWindow (void) +{ +} + +void +EqualizerWindow::setEnabled (void) +{ + qDebug ("test"); +} + + +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 ()); +} diff --git a/src/equalizer/equalizerwindow.h b/src/equalizer/equalizerwindow.h new file mode 100644 index 0000000..3d11196 --- /dev/null +++ b/src/equalizer/equalizerwindow.h @@ -0,0 +1,48 @@ +/** + * This file is a part of Prome, an XMMS2 Client. + * + * Copyright (C) 2005-2007 XMMS2 Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __EQUALIZERWINDOW_H__ +#define __EQUALIZERWINDOW_H__ + +#include + +class QWidget; +class QMouseEvent; +class QMoveEvent; + +class MainWindow; +class EqualizerWidget; + +class EqualizerWindow : public QMainWindow +{ + Q_OBJECT + public: + EqualizerWindow(QWidget *parent); + ~EqualizerWindow(); + void mouseMoveEvent(QMouseEvent *); + void mousePressEvent(QMouseEvent *); + void moveEvent(QMoveEvent *event); + + public slots: + void setEnabled (void); + + private: + MainWindow *m_mw; + EqualizerWidget *m_equalizer; + int m_diffx; + int m_diffy; +}; + +#endif // __EQUALIZERWINDOW_H__ diff --git a/src/main.cpp b/src/main.cpp index 33e41dc..a0854af 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -13,12 +13,13 @@ * GNU General Public License for more details. */ +#include "XMMSHandler.h" + #include "mainwindow.h" -#include "playlistwindow.h" -#include "equalizer.h" +// #include "playlistwindow.h" +#include "equalizerwindow.h" #include "Skin.h" //TODO: change to xclient.h sometime later -#include "XMMSHandler.h" #ifdef HAVE_SERVERBROWSER #include "Serverbrowser.h" diff --git a/src/mainwindow/maindisplay.cpp b/src/mainwindow/maindisplay.cpp index aab36de..4f2f9c6 100644 --- a/src/mainwindow/maindisplay.cpp +++ b/src/mainwindow/maindisplay.cpp @@ -230,8 +230,8 @@ MainDisplay::SetupToggleButtons (void) Skin::EQ_OFF_0, Skin::EQ_OFF_1); m_eq->move(219, 58); if (!s.value ("equalizer/hidden").toBool ()) - m_pls->toggle (); - m_eq->setEnabled(false); // FIXME: Disabled for now, equalizer doesn't work yet + m_eq->toggle (); + m_eq->setEnabled(false); // FIXME: Disabled for now, equalizer doesn't work yet connect (m_eq, SIGNAL(clicked()), this, SLOT(toggleEQ())); diff --git a/src/mainwindow/mainwindow.cpp b/src/mainwindow/mainwindow.cpp index 1c0df79..ebb66d6 100644 --- a/src/mainwindow/mainwindow.cpp +++ b/src/mainwindow/mainwindow.cpp @@ -13,6 +13,8 @@ * GNU General Public License for more details. */ +#include "XMMSHandler.h" + #include "mainwindow.h" #ifdef HAVE_SERVERBROWSER @@ -22,7 +24,7 @@ #include "playlistwindow.h" #include "maindisplay.h" #include "shadeddisplay.h" -#include "equalizer.h" +#include "equalizerwindow.h" #include "Button.h" #include diff --git a/src/mainwindow/mainwindow.h b/src/mainwindow/mainwindow.h index 2f78579..bb13043 100644 --- a/src/mainwindow/mainwindow.h +++ b/src/mainwindow/mainwindow.h @@ -16,8 +16,6 @@ #ifndef __MAINWINDOW_H__ #define __MAINWINDOW_H__ -#include "XMMSHandler.h" - #include #include diff --git a/src/playlist/playlistwidget.cpp b/src/playlist/playlistwidget.cpp index 2d9b59d..25316ca 100644 --- a/src/playlist/playlistwidget.cpp +++ b/src/playlist/playlistwidget.cpp @@ -14,6 +14,8 @@ * GNU General Public License for more details. */ +#include "XMMSHandler.h" + #include "mainwindow.h" #include "BrowseDialog.h" #include "playlistwindow.h" diff --git a/src/playlist/playlistwindow.h b/src/playlist/playlistwindow.h index d8f277a..8ac2e8d 100644 --- a/src/playlist/playlistwindow.h +++ b/src/playlist/playlistwindow.h @@ -14,8 +14,8 @@ * GNU General Public License for more details. */ -#ifndef _PLAYLISTWINDOW_ -#define _PLAYLISTWINDOW_ +#ifndef __PLAYLISTWINDOW_H__ +#define __PLAYLISTWINDOW_H__ // Qt classes #include @@ -72,4 +72,4 @@ class PlaylistWindow : public QMainWindow { }; -#endif // _PLAYLISTWINDOW_ +#endif // __PLAYLISTWINDOW_H__