Added the volume slider, and made the Skin loader a bit more robust in the face
of garbage/moved/deleted skins.
This commit is contained in:
Chris Gilbert
Tobias Rundstrom
parent
d7eede1737
commit
73e283cc48
7 changed files with 685 additions and 273 deletions
|
|
@ -48,6 +48,9 @@ MainDisplay::MainDisplay (QWidget *parent) : SkinDisplay(parent)
|
|||
m_playstatus = new PlayStatus (this);
|
||||
m_playstatus->move (24, 28);
|
||||
|
||||
m_vslider = new VolumeSlider(this);
|
||||
m_vslider->move (107, 57);
|
||||
|
||||
connect (xmmsh, SIGNAL(currentSong (const QHash<QString, QString> &)),
|
||||
this, SLOT(setMediainfo (const QHash<QString, QString> &)));
|
||||
connect (xmmsh, SIGNAL(playbackStatusChanged(uint)),
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ class MainDisplay;
|
|||
#include "StereoMono.h"
|
||||
#include "Slider.h"
|
||||
#include "PlayStatus.h"
|
||||
#include "VolumeSlider.h"
|
||||
#include "MainWindow.h"
|
||||
|
||||
class MainDisplay : public SkinDisplay
|
||||
|
|
@ -42,6 +43,7 @@ class MainDisplay : public SkinDisplay
|
|||
|
||||
StereoMono *m_stereo;
|
||||
Slider *m_slider;
|
||||
VolumeSlider *m_vslider;
|
||||
|
||||
PlayStatus *m_playstatus;
|
||||
|
||||
|
|
|
|||
81
Skin.cpp
81
Skin.cpp
|
|
@ -18,6 +18,8 @@ Skin::BuildPlaylist (void)
|
|||
|
||||
QPixmap *img = getPixmap ("pledit");
|
||||
|
||||
if(img)
|
||||
{
|
||||
m_playlist[PLS_CORNER_UL_0] = img->copy(0, 0, 25, 20);
|
||||
m_playlist[PLS_CORNER_UL_1] = img->copy(0, 21, 25, 20);
|
||||
|
||||
|
|
@ -126,6 +128,9 @@ Skin::BuildPlaylist (void)
|
|||
m_playlist[PLS_MSC_BTN_1] = img->copy(77, 168, 22, 18);
|
||||
|
||||
delete img;
|
||||
}
|
||||
else
|
||||
setSkin(":CleanAMP/");
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -203,6 +208,8 @@ Skin::BuildLetterMap (void)
|
|||
{
|
||||
QPixmap *img = getPixmap("text");
|
||||
|
||||
if(img)
|
||||
{
|
||||
QList<QList<QPixmap> >(letters);
|
||||
for (int i = 0; i < 3; i++) {
|
||||
QList<QPixmap>(l);
|
||||
|
|
@ -259,13 +266,17 @@ Skin::BuildLetterMap (void)
|
|||
/* text background */
|
||||
m_items[TEXTBG] = letters[2][6];
|
||||
}
|
||||
else
|
||||
setSkin(":CleanAMP/");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
Skin::BuildButtons (void)
|
||||
{
|
||||
QPixmap *img = getPixmap("cbuttons");
|
||||
|
||||
if(img)
|
||||
{
|
||||
m_items[BTN_PREV_0] = img->copy(0, 0, 23, 18);
|
||||
m_items[BTN_PREV_1] = img->copy(0, 18, 23, 18);
|
||||
|
||||
|
|
@ -286,6 +297,9 @@ Skin::BuildButtons (void)
|
|||
|
||||
delete img;
|
||||
}
|
||||
else
|
||||
setSkin(":CleanAMP/");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
|
|
@ -293,6 +307,8 @@ Skin::BuildToggleButtons (void)
|
|||
{
|
||||
QPixmap *img = getPixmap("shufrep");
|
||||
|
||||
if(img)
|
||||
{
|
||||
m_items[REPEAT_ON_0] = img->copy(0, 30, 28, 15);
|
||||
m_items[REPEAT_ON_1] = img->copy(0, 45, 28, 15);
|
||||
|
||||
|
|
@ -319,6 +335,9 @@ Skin::BuildToggleButtons (void)
|
|||
|
||||
delete img;
|
||||
}
|
||||
else
|
||||
setSkin(":CleanAMP/");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
|
|
@ -326,6 +345,8 @@ Skin::BuildTitleBar (void)
|
|||
{
|
||||
QPixmap *img = getPixmap("titlebar");
|
||||
|
||||
if(img)
|
||||
{
|
||||
m_items[MENUBUTTON_0] = img->copy(0, 0, 9, 9);
|
||||
m_items[MENUBUTTON_1] = img->copy(0, 9, 9, 9);
|
||||
|
||||
|
|
@ -349,6 +370,9 @@ Skin::BuildTitleBar (void)
|
|||
|
||||
delete img;
|
||||
}
|
||||
else
|
||||
setSkin(":CleanAMP/");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
|
|
@ -358,15 +382,20 @@ Skin::BuildOther (void)
|
|||
QPainter(painter);
|
||||
|
||||
img = getPixmap("monoster");
|
||||
if(img)
|
||||
{
|
||||
m_items[MONO_1] = img->copy(29, 0, 27, 12);
|
||||
m_items[MONO_0] = img->copy(29, 12, 27, 12);
|
||||
m_items[STEREO_1] = img->copy(0, 0, 29, 12);
|
||||
m_items[STEREO_0] = img->copy(0, 12, 29, 12);
|
||||
delete img;
|
||||
|
||||
}
|
||||
else
|
||||
setSkin(":CleanAMP/");
|
||||
|
||||
img = getPixmap("playpaus");
|
||||
|
||||
if(img)
|
||||
{
|
||||
part = new QPixmap(11, 9);
|
||||
painter.begin(part);
|
||||
painter.drawPixmap (0, 0, 3, 9, *img, 36, 0, 3, 9);
|
||||
|
|
@ -392,14 +421,21 @@ Skin::BuildOther (void)
|
|||
delete part;
|
||||
|
||||
delete img;
|
||||
|
||||
}
|
||||
else
|
||||
setSkin(":CleanAMP/");
|
||||
|
||||
img = getPixmap ("main");
|
||||
if(img)
|
||||
{
|
||||
m_items[MAIN_WINDOW] = img->copy();
|
||||
m_items[ABOUT_0] = img->copy(247, 83, 20, 25);
|
||||
m_items[ABOUT_1] = img->copy(247, 83, 20, 24);
|
||||
delete img;
|
||||
}
|
||||
else
|
||||
setSkin(":CleanAMP/");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
|
|
@ -408,28 +444,53 @@ Skin::BuildSliders (void)
|
|||
QPixmap *img;
|
||||
|
||||
img = getPixmap("posbar");
|
||||
if(img)
|
||||
{
|
||||
m_items[POSBAR] = img->copy (0, 0, 248, 10);
|
||||
m_items[POSBAR_BTN_0] = img->copy (248, 0, 29, 10);
|
||||
m_items[POSBAR_BTN_1] = img->copy (278, 0, 29, 10);
|
||||
|
||||
delete img;
|
||||
}
|
||||
else
|
||||
setSkin(":CleanAMP/");
|
||||
|
||||
img = getPixmap("volume");
|
||||
for (int i = VOLUMEBAR_POS_MIN; i < VOLUMEBAR_POS_MAX; i++) {
|
||||
if(img)
|
||||
{
|
||||
for (int i = VOLUMEBAR_POS_MIN; i <= VOLUMEBAR_POS_MAX; i++) {
|
||||
m_volume_bar[i] = img->copy(0, i*15, 68, 13);
|
||||
}
|
||||
if(img->height() > 420)
|
||||
{
|
||||
m_items[VOLBAR_BTN_1] = img->copy (0, 422, 14, 11);
|
||||
m_items[VOLBAR_BTN_0] = img->copy (15, 422, 14, 11);
|
||||
m_volbtn = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_volbtn = false;
|
||||
}
|
||||
|
||||
delete img;
|
||||
}
|
||||
else
|
||||
setSkin(":CleanAMP/");
|
||||
|
||||
img = getPixmap("balance");
|
||||
if (!img) {
|
||||
img = getPixmap("volume");
|
||||
}
|
||||
|
||||
for (int i = BALANCE_POS_MIN; i < BALANCE_POS_MAX; i++) {
|
||||
if(img)
|
||||
{
|
||||
for (int i = BALANCE_POS_MIN; i <= BALANCE_POS_MAX; i++) {
|
||||
m_balance[i] = img->copy(9, i*15, 38, 13);
|
||||
}
|
||||
delete img;
|
||||
}
|
||||
else
|
||||
setSkin(":CleanAMP/");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
|
|
@ -443,11 +504,15 @@ Skin::BuildNumbers (void)
|
|||
img = getPixmap ("nums_ex");
|
||||
}
|
||||
|
||||
if(img)
|
||||
{
|
||||
for (uint i = 0; i < num; i++) {
|
||||
m_numbers[i] = img->copy (i*9, 0, 9, 13);
|
||||
}
|
||||
|
||||
delete img;
|
||||
}
|
||||
else
|
||||
setSkin(":CleanAMP/");
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
7
Skin.h
7
Skin.h
|
|
@ -25,6 +25,8 @@ class Skin : public QWidget
|
|||
const QPixmap getLetter (uint c) const { return m_letterMap[c]; }
|
||||
const QPixmap getNumber (uint c) const { return m_numbers[c]; }
|
||||
const QByteArray getPLeditValue (QByteArray c) const { return m_pledit_txt[c]; }
|
||||
const bool getVolBtn(void) const { return m_volbtn; }
|
||||
const bool getBalBtn(void) const { return m_balbtn; }
|
||||
|
||||
enum Volume {
|
||||
VOLUMEBAR_POS_MIN,
|
||||
|
|
@ -148,6 +150,8 @@ class Skin : public QWidget
|
|||
POSBAR,
|
||||
POSBAR_BTN_0,
|
||||
POSBAR_BTN_1,
|
||||
VOLBAR_BTN_0,
|
||||
VOLBAR_BTN_1,
|
||||
};
|
||||
enum PlaylistParts {
|
||||
PLS_CORNER_UL_0,
|
||||
|
|
@ -271,6 +275,9 @@ class Skin : public QWidget
|
|||
QMap<QByteArray, QByteArray> m_pledit_txt;
|
||||
QList<QPixmap *> m_buttons;
|
||||
|
||||
bool m_volbtn;
|
||||
bool m_balbtn;
|
||||
|
||||
signals:
|
||||
void skinChanged (Skin *skin);
|
||||
};
|
||||
|
|
|
|||
267
VolumeSlider.cpp
Normal file
267
VolumeSlider.cpp
Normal file
|
|
@ -0,0 +1,267 @@
|
|||
#include "VolumeSlider.h"
|
||||
#include <QMouseEvent>
|
||||
|
||||
// NOTE!
|
||||
// This file has lots of seemingly strange math.
|
||||
// I will document it as we go, but please keep in mind
|
||||
// that all of the coord-space and normalization is pixel-space dependent.
|
||||
|
||||
VolumeSlider::VolumeSlider (QWidget *parent) : PixWidget (parent)
|
||||
{
|
||||
setMinimumSize (68, 13);
|
||||
setMaximumSize (68, 13);
|
||||
m_volume = 0;
|
||||
m_position = 0;
|
||||
m_hasvolbtn = false;
|
||||
m_volbtn = NULL;
|
||||
|
||||
m_pixmap = QPixmap (68, 13);
|
||||
}
|
||||
|
||||
VolumeSlider::~VolumeSlider ()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void
|
||||
VolumeSlider::setPixmaps (Skin *skin)
|
||||
{
|
||||
m_skin = skin;
|
||||
|
||||
if(m_skin->getVolBtn())
|
||||
{
|
||||
m_hasvolbtn = true;
|
||||
if(m_volbtn)
|
||||
delete m_volbtn;
|
||||
|
||||
m_volbtn = new VolButton (this, Skin::VOLBAR_BTN_0, Skin::VOLBAR_BTN_1);
|
||||
|
||||
// If we are out of scope high or low, we clamp the values.
|
||||
if(m_volume <= 0)
|
||||
m_volbtn->move (0, 1);
|
||||
else if(m_volume >= 27)
|
||||
m_volbtn->move (54, 1);
|
||||
else
|
||||
{
|
||||
// If we are not.. we do two things.
|
||||
|
||||
// First, we normalize the difference between the current position
|
||||
// and the maximum position. This will give us the progress ratio.
|
||||
float temp = ((float)(m_volume) / (float)(27.0f));
|
||||
|
||||
// Now, we multiply that by the number of possible positions in our
|
||||
// space. This gives us our relative position according to the progress
|
||||
// ratio.
|
||||
m_volbtn->move ((int)(49 * temp), 1);
|
||||
}
|
||||
m_volbtn->setPixmaps (m_skin);
|
||||
m_volbtn->show ();
|
||||
}
|
||||
else
|
||||
{
|
||||
m_hasvolbtn = false;
|
||||
if(m_volbtn)
|
||||
{
|
||||
delete m_volbtn;
|
||||
m_volbtn = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
m_volslider = m_skin->getVol (m_volume);
|
||||
|
||||
drawPixmaps ();
|
||||
}
|
||||
|
||||
void
|
||||
VolumeSlider::changePixmap ()
|
||||
{
|
||||
m_volslider = m_skin->getVol (m_volume);
|
||||
drawPixmaps ();
|
||||
}
|
||||
|
||||
void
|
||||
VolumeSlider::drawPixmaps ()
|
||||
{
|
||||
QPainter paint;
|
||||
paint.begin (&m_pixmap);
|
||||
|
||||
paint.drawPixmap (QRect (0, 0, 68, 13),
|
||||
m_volslider,
|
||||
m_pixmap.rect ());
|
||||
paint.end ();
|
||||
|
||||
update ();
|
||||
}
|
||||
|
||||
void
|
||||
VolumeSlider::mousePressEvent (QMouseEvent *event)
|
||||
{
|
||||
updatePos (event);
|
||||
if(m_hasvolbtn)
|
||||
{
|
||||
m_volbtn->mousePressEvent (event);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
VolumeSlider::mouseMoveEvent (QMouseEvent *event)
|
||||
{
|
||||
updatePos (event);
|
||||
if(m_hasvolbtn)
|
||||
{
|
||||
m_volbtn->mouseMoveEvent (event);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
VolumeSlider::mouseReleaseEvent (QMouseEvent *event)
|
||||
{
|
||||
updatePos (event);
|
||||
if(m_hasvolbtn)
|
||||
{
|
||||
m_volbtn->mouseReleaseEvent (event);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
VolumeSlider::updatePos (QMouseEvent *event)
|
||||
{
|
||||
QPoint p (event->pos ());
|
||||
|
||||
int curx = p.x ();
|
||||
|
||||
// Check for scope and clamp.
|
||||
if(curx <= 0)
|
||||
{
|
||||
m_volume = 0;
|
||||
m_volume_base100 = 0;
|
||||
}
|
||||
else if(curx >= 68)
|
||||
{
|
||||
m_volume = 27;
|
||||
m_volume_base100 = 100;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Normalize the same way we do above, except this time
|
||||
// we calculate a base-100 value as well.
|
||||
float temp = ((float)(curx - 5) / (float)(width() - 5));
|
||||
m_volume_base100 = (int)(100 * temp);
|
||||
m_volume = (int)(28 * temp);
|
||||
}
|
||||
|
||||
changePixmap ();
|
||||
}
|
||||
|
||||
void
|
||||
VolumeSlider::setVolume (uint volume_base100)
|
||||
{
|
||||
m_volume_base100 = volume_base100;
|
||||
if(volume_base100 > 100)
|
||||
volume_base100 = 100;
|
||||
|
||||
m_volume = (int)((float)(volume_base100) *.28);
|
||||
if(m_volume > 27)
|
||||
m_volume = 27;
|
||||
|
||||
changePixmap ();
|
||||
}
|
||||
|
||||
VolButton::VolButton (QWidget *parent, uint normal, uint pressed) : PixWidget (parent)
|
||||
{
|
||||
m_volslider = dynamic_cast<VolumeSlider *>(parent);
|
||||
setMinimumSize (14, 11);
|
||||
setMaximumSize (14, 11);
|
||||
|
||||
m_normal = normal;
|
||||
m_pressed = pressed;
|
||||
|
||||
m_pixmap = QPixmap (14, 11);
|
||||
}
|
||||
|
||||
VolButton::~VolButton ()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void
|
||||
VolButton::mousePressEvent (QMouseEvent *event)
|
||||
{
|
||||
QPoint p (event->globalPos ());
|
||||
QPoint np = m_volslider->mapFromGlobal(p);
|
||||
|
||||
move(np.x() - 7, 1);
|
||||
|
||||
changePixmap (true);
|
||||
}
|
||||
|
||||
void
|
||||
VolButton::mouseReleaseEvent (QMouseEvent *event)
|
||||
{
|
||||
changePixmap (false);
|
||||
}
|
||||
|
||||
void
|
||||
VolButton::mouseMoveEvent (QMouseEvent *event)
|
||||
{
|
||||
QPoint p = m_volslider->mapFromGlobal(event->globalPos ());
|
||||
int volume = 0;
|
||||
int curx = p.x ();
|
||||
|
||||
// Same deal, clamp then normalize.
|
||||
if(curx < 7)
|
||||
{
|
||||
volume = 0;
|
||||
m_volslider->setVolume(0);
|
||||
}
|
||||
else if(curx > 61)
|
||||
{
|
||||
volume = 54;
|
||||
m_volslider->setVolume(100);
|
||||
}
|
||||
else
|
||||
{
|
||||
float temp = ((float)(((float)curx) / (float)(68.0f)));
|
||||
float b100temp = ((float)(((float)curx - 12) / (float)(68.0f - 19)));
|
||||
volume = (int)(68 * temp) - 7;
|
||||
// This is to make sure the volume slider itself reflects our changes.
|
||||
m_volslider->setVolume((int)(100 * b100temp));
|
||||
}
|
||||
|
||||
move(volume, 1);
|
||||
}
|
||||
|
||||
void
|
||||
VolButton::setPixmaps (Skin *skin)
|
||||
{
|
||||
m_skin = skin;
|
||||
|
||||
m_volbtn = m_skin->getItem (m_normal);
|
||||
|
||||
drawPixmaps ();
|
||||
}
|
||||
|
||||
void
|
||||
VolButton::changePixmap (bool pressed)
|
||||
{
|
||||
if(pressed)
|
||||
m_volbtn = m_skin->getItem (m_pressed);
|
||||
else
|
||||
m_volbtn = m_skin->getItem (m_normal);
|
||||
|
||||
drawPixmaps ();
|
||||
}
|
||||
|
||||
void
|
||||
VolButton::drawPixmaps ()
|
||||
{
|
||||
QPainter paint;
|
||||
paint.begin (&m_pixmap);
|
||||
|
||||
paint.drawPixmap (QRect (0, 0, 14, 11),
|
||||
m_volbtn,
|
||||
m_pixmap.rect ());
|
||||
paint.end ();
|
||||
|
||||
update ();
|
||||
}
|
||||
66
VolumeSlider.h
Normal file
66
VolumeSlider.h
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
#ifndef __VOLUMESLIDER_H__
|
||||
#define __VOLUMESLIDER_H__
|
||||
|
||||
#include "PixWidget.h"
|
||||
#include "Button.h"
|
||||
|
||||
class VolumeSlider;
|
||||
class MainDisplay;
|
||||
|
||||
class VolButton : public PixWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
VolButton (QWidget *, uint, uint);
|
||||
~VolButton ();
|
||||
|
||||
void mouseMoveEvent (QMouseEvent *);
|
||||
void mousePressEvent (QMouseEvent *);
|
||||
void mouseReleaseEvent (QMouseEvent *);
|
||||
|
||||
public slots:
|
||||
void setPixmaps (Skin *skin);
|
||||
|
||||
private:
|
||||
void changePixmap (bool pressed);
|
||||
void drawPixmaps();
|
||||
|
||||
VolumeSlider *m_volslider;
|
||||
Skin *m_skin;
|
||||
QPixmap m_volbtn;
|
||||
uint m_normal;
|
||||
uint m_pressed;
|
||||
};
|
||||
|
||||
class VolumeSlider : public PixWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
VolumeSlider (QWidget *parent);
|
||||
~VolumeSlider ();
|
||||
void mouseMoveEvent (QMouseEvent *);
|
||||
void mousePressEvent (QMouseEvent *);
|
||||
void mouseReleaseEvent (QMouseEvent *);
|
||||
|
||||
uint getVolume (void) { return m_volume_base100; };
|
||||
void setVolume (uint volume_base100);
|
||||
|
||||
public slots:
|
||||
void setPixmaps (Skin *skin);
|
||||
|
||||
private:
|
||||
void drawPixmaps ();
|
||||
void updatePos (QMouseEvent *event);
|
||||
void changePixmap ();
|
||||
|
||||
QPixmap m_volslider;
|
||||
VolButton *m_volbtn;
|
||||
Skin *m_skin;
|
||||
int m_volume;
|
||||
int m_position;
|
||||
uint m_volume_base100;
|
||||
bool m_hasvolbtn;
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -24,7 +24,8 @@ SOURCES += XmmsQT4.cpp \
|
|||
MediaArtistList.cpp \
|
||||
MediaAlbumList.cpp \
|
||||
MediaSongList.cpp \
|
||||
PlaylistMenu.cpp
|
||||
PlaylistMenu.cpp \
|
||||
VolumeSlider.cpp
|
||||
|
||||
HEADERS += XmmsQT4.h \
|
||||
PixWidget.h \
|
||||
|
|
@ -52,7 +53,8 @@ HEADERS += XmmsQT4.h \
|
|||
MediaArtistList.h \
|
||||
MediaAlbumList.h \
|
||||
MediaSongList.h \
|
||||
PlaylistMenu.h
|
||||
PlaylistMenu.h \
|
||||
VolumeSlider.h
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue