diff --git a/src/equalizer/equalizerwidget.cpp b/src/equalizer/equalizerwidget.cpp index 6460525..6202af8 100644 --- a/src/equalizer/equalizerwidget.cpp +++ b/src/equalizer/equalizerwidget.cpp @@ -146,7 +146,7 @@ EqualizerWidget::setPixmaps (Skin *skin) /* Update Sliders */ QPixmap normal = skin->getItem (Skin::EQ_WIN_BAR_BTN_0); 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->setBackground (bgslist); diff --git a/src/mainwindow/maindisplay.cpp b/src/mainwindow/maindisplay.cpp index 746310f..6140b4f 100644 --- a/src/mainwindow/maindisplay.cpp +++ b/src/mainwindow/maindisplay.cpp @@ -161,10 +161,10 @@ MainDisplay::setPixmaps (Skin *skin) m_repeat->setPixmaps (skin->getButton (Skin::BUTTON_MW_REPEAT)); /* 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_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)); /* update some other widgets */ diff --git a/src/mainwindow/mainwindow.cpp b/src/mainwindow/mainwindow.cpp index dcb541b..3bab3ea 100644 --- a/src/mainwindow/mainwindow.cpp +++ b/src/mainwindow/mainwindow.cpp @@ -143,13 +143,6 @@ MainWindow::activeWindowOutEvent (QEvent *event) BaseWindow::activeWindowOutEvent (event); } - -void -MainWindow::raisePL (void) -{ - m_playlistwin->raise (); -} - void MainWindow::mouseMoveEvent (QMouseEvent *event) { diff --git a/src/mainwindow/mainwindow.h b/src/mainwindow/mainwindow.h index d4d1dad..6f26cfb 100644 --- a/src/mainwindow/mainwindow.h +++ b/src/mainwindow/mainwindow.h @@ -39,8 +39,6 @@ class MainWindow : public BaseWindow PlaylistWindow *getPL () { return m_playlistwin; } EqualizerWindow *getEQ () { return m_equalizer; } - - void raisePL (void); void moveEvent (QMoveEvent *event); void attachWidgets (); diff --git a/src/skin/skin.cpp b/src/skin/skin.cpp index a1b9d62..22453ec 100644 --- a/src/skin/skin.cpp +++ b/src/skin/skin.cpp @@ -165,7 +165,7 @@ Skin::handle_volume (const QPixmap &img) for (int i = 0; i <= 27; i++) { 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) { const int h = qMin (11, img.height () - 422); @@ -195,7 +195,7 @@ Skin::handle_balance (const QPixmap &img) list.append (p); list.prepend (p); } - m_backgrounds[SLIDER_BALANCEBAR_BGS] = list; + m_pixmaplists[SLIDER_BALANCEBAR_BGS] = list; if (img.height() > 421) { 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++) { 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_1] = img.copy (0, 176, 11, 11); diff --git a/src/skin/skin.h b/src/skin/skin.h index ff0c7c8..9063b37 100644 --- a/src/skin/skin.h +++ b/src/skin/skin.h @@ -57,8 +57,8 @@ class Skin : public QObject const ButtonPixmaps getButton (int button) const { return m_buttons.value (button); } - const QPixmapList getBackgrounds (uint item) const - { return m_backgrounds.value(item); }; + const QPixmapList getPixmapList (uint item) const + { return m_pixmaplists.value(item); }; const PixmapMap getPixmapFont () const { return m_letterMap; } @@ -99,7 +99,7 @@ class Skin : public QObject QString m_path; QMap m_buttons; - QMap m_backgrounds; + QMap m_pixmaplists; QMap m_numbers; QMap m_smallNumbers;