brian/promoe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OTHER: more skin cleanups

Browse source
This commit is contained in:
Thomas Frauendorfer 2010-03-19 23:05:51 +01:00
parent e99f0e4325
commit ae6dd70b2a
6 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/equalizer/equalizerwidget.cpp
View file

@ -146,7 +146,7 @@ EqualizerWidget::setPixmaps (Skin *skin)
/* Update Sliders */ /* Update Sliders */
QPixmap normal = skin->getItem (Skin::EQ_WIN_BAR_BTN_0); QPixmap normal = skin->getItem (Skin::EQ_WIN_BAR_BTN_0);
QPixmap pressed = skin->getItem (Skin::EQ_WIN_BAR_BTN_1); QPixmap pressed = skin->getItem (Skin::EQ_WIN_BAR_BTN_1);
QPixmapList bgslist = skin->getBackgrounds (Skin::SLIDER_EQUALIZER_BGS); QPixmapList bgslist = skin->getPixmapList (Skin::SLIDER_EQUALIZER_BGS);
m_preamp->setSliders (normal, pressed); m_preamp->setSliders (normal, pressed);
m_preamp->setBackground (bgslist); m_preamp->setBackground (bgslist);

4
src/mainwindow/maindisplay.cpp
View file

@ -161,10 +161,10 @@ MainDisplay::setPixmaps (Skin *skin)
m_repeat->setPixmaps (skin->getButton (Skin::BUTTON_MW_REPEAT)); m_repeat->setPixmaps (skin->getButton (Skin::BUTTON_MW_REPEAT));
/* update Sliders */ /* update Sliders */
m_vslider->setBackground (skin->getBackgrounds (Skin::SLIDER_VOLUMEBAR_BGS)); m_vslider->setBackground (skin->getPixmapList (Skin::SLIDER_VOLUMEBAR_BGS));
m_vslider->setButton (skin->getButton (Skin::SLIDER_VOLUMEBAR_BUTTON)); m_vslider->setButton (skin->getButton (Skin::SLIDER_VOLUMEBAR_BUTTON));
m_bslider->setBackground (skin->getBackgrounds (Skin::SLIDER_BALANCEBAR_BGS)); m_bslider->setBackground (skin->getPixmapList (Skin::SLIDER_BALANCEBAR_BGS));
m_bslider->setButton (skin->getButton (Skin::SLIDER_BALANCEBAR_BUTTON)); m_bslider->setButton (skin->getButton (Skin::SLIDER_BALANCEBAR_BUTTON));
/* update some other widgets */ /* update some other widgets */

7
src/mainwindow/mainwindow.cpp
View file

@ -143,13 +143,6 @@ MainWindow::activeWindowOutEvent (QEvent *event)
BaseWindow::activeWindowOutEvent (event); BaseWindow::activeWindowOutEvent (event);
} }
void
MainWindow::raisePL (void)
{
m_playlistwin->raise ();
}
void void
MainWindow::mouseMoveEvent (QMouseEvent *event) MainWindow::mouseMoveEvent (QMouseEvent *event)
{ {

2
src/mainwindow/mainwindow.h
View file

@ -39,8 +39,6 @@ class MainWindow : public BaseWindow
PlaylistWindow *getPL () { return m_playlistwin; } PlaylistWindow *getPL () { return m_playlistwin; }
EqualizerWindow *getEQ () { return m_equalizer; } EqualizerWindow *getEQ () { return m_equalizer; }
void raisePL (void);
void moveEvent (QMoveEvent *event); void moveEvent (QMoveEvent *event);
void attachWidgets (); void attachWidgets ();

6
src/skin/skin.cpp
View file

@ -165,7 +165,7 @@ Skin::handle_volume (const QPixmap &img)
for (int i = 0; i <= 27; i++) { for (int i = 0; i <= 27; i++) {
list << img.copy(0, i*15, qMin (68, img.width()), 13); list << img.copy(0, i*15, qMin (68, img.width()), 13);
} }
m_backgrounds[SLIDER_VOLUMEBAR_BGS] = list; m_pixmaplists[SLIDER_VOLUMEBAR_BGS] = list;
if (img.height() > 421) { if (img.height() > 421) {
const int h = qMin (11, img.height () - 422); const int h = qMin (11, img.height () - 422);
@ -195,7 +195,7 @@ Skin::handle_balance (const QPixmap &img)
list.append (p); list.append (p);
list.prepend (p); list.prepend (p);
} }
m_backgrounds[SLIDER_BALANCEBAR_BGS] = list; m_pixmaplists[SLIDER_BALANCEBAR_BGS] = list;
if (img.height() > 421) { if (img.height() > 421) {
const int h = qMin (11, img.height () - 422); const int h = qMin (11, img.height () - 422);
@ -499,7 +499,7 @@ Skin::handle_eqmain (const QPixmap &img)
for (int i = 0; i < 14; i++) { for (int i = 0; i < 14; i++) {
list << img.copy (13+15*i, 229, 14, 63); list << img.copy (13+15*i, 229, 14, 63);
} }
m_backgrounds[SLIDER_EQUALIZER_BGS] = list; m_pixmaplists[SLIDER_EQUALIZER_BGS] = list;
m_items[EQ_WIN_BAR_BTN_0] = img.copy (0, 164, 11, 11); m_items[EQ_WIN_BAR_BTN_0] = img.copy (0, 164, 11, 11);
m_items[EQ_WIN_BAR_BTN_1] = img.copy (0, 176, 11, 11); m_items[EQ_WIN_BAR_BTN_1] = img.copy (0, 176, 11, 11);

6
src/skin/skin.h
View file

@ -57,8 +57,8 @@ class Skin : public QObject
const ButtonPixmaps getButton (int button) const const ButtonPixmaps getButton (int button) const
{ return m_buttons.value (button); } { return m_buttons.value (button); }
const QPixmapList getBackgrounds (uint item) const const QPixmapList getPixmapList (uint item) const
{ return m_backgrounds.value(item); }; { return m_pixmaplists.value(item); };
const PixmapMap getPixmapFont () const const PixmapMap getPixmapFont () const
{ return m_letterMap; } { return m_letterMap; }
@ -99,7 +99,7 @@ class Skin : public QObject
QString m_path; QString m_path;
QMap<int, ButtonPixmaps> m_buttons; QMap<int, ButtonPixmaps> m_buttons;
QMap<uint, QPixmapList> m_backgrounds; QMap<uint, QPixmapList> m_pixmaplists;
QMap<int, QPixmap> m_numbers; QMap<int, QPixmap> m_numbers;
QMap<int, QPixmap> m_smallNumbers; QMap<int, QPixmap> m_smallNumbers;