diff --git a/PlaylistShade.h b/PlaylistShade.h index 9b5e52e..66e0e63 100644 --- a/PlaylistShade.h +++ b/PlaylistShade.h @@ -4,6 +4,7 @@ #include "Skin.h" #include +#include class PlaylistShade : public QWidget { Q_OBJECT diff --git a/Skin.cpp b/Skin.cpp index 8218908..1b5b88e 100644 --- a/Skin.cpp +++ b/Skin.cpp @@ -13,13 +13,6 @@ Skin *Skin::getInstance (void) Skin::Skin (void) { - m_items = new QHash; - m_volume_bar = new QHash; - m_balance = new QHash; - m_pledit_txt = new QHash; - m_numbers = new QHash; - m_letterMap = new QHash; - m_playlist = new QHash; } @@ -34,48 +27,48 @@ Skin::BuildPlaylist (void) QPixmap *img = getPixmap ("pledit"); - m_playlist->insert (PLS_CORNER_UL_0, img->copy(0, 0, 25, 20)); - m_playlist->insert (PLS_CORNER_UL_1, img->copy(0, 21, 25, 20)); + m_playlist[PLS_CORNER_UL_0] = img->copy(0, 0, 25, 20); + m_playlist[PLS_CORNER_UL_1] = img->copy(0, 21, 25, 20); - m_playlist->insert (PLS_TBAR_0, img->copy (26, 0, 100, 20)); - m_playlist->insert (PLS_TBAR_1, img->copy (26, 21, 100, 20)); + m_playlist[PLS_TBAR_0] = img->copy (26, 0, 100, 20); + m_playlist[PLS_TBAR_1] = img->copy (26, 21, 100, 20); - m_playlist->insert (PLS_CORNER_UR_0, img->copy(153, 0, 25, 20)); - m_playlist->insert (PLS_CORNER_UR_1, img->copy(153, 21, 25, 20)); + m_playlist[PLS_CORNER_UR_0] = img->copy(153, 0, 25, 20); + m_playlist[PLS_CORNER_UR_1] = img->copy(153, 21, 25, 20); - m_playlist->insert (PLS_TFILL_0, img->copy(127, 0, 25, 20)); - m_playlist->insert (PLS_TFILL_1, img->copy(127, 21, 25, 20)); + m_playlist[PLS_TFILL_0] = img->copy(127, 0, 25, 20); + m_playlist[PLS_TFILL_1] = img->copy(127, 21, 25, 20); - m_playlist->insert (PLS_BFILL_0, img->copy(179, 0, 25, 38)); + m_playlist[PLS_BFILL_0] = img->copy(179, 0, 25, 38); - m_playlist->insert (PLS_VISMINI_0, img->copy(205, 0, 75, 38)); + m_playlist[PLS_VISMINI_0] = img->copy(205, 0, 75, 38); - m_playlist->insert (PLS_LFILL_0, img->copy(0, 42, 12, 29)); + m_playlist[PLS_LFILL_0] = img->copy(0, 42, 12, 29); - m_playlist->insert (PLS_RFILL_0, img->copy(31, 42, 5, 29)); - m_playlist->insert (PLS_RFILL2_0, img->copy(36, 42, 8, 29)); - m_playlist->insert (PLS_RFILL3_0, img->copy(44, 42, 7, 29)); + m_playlist[PLS_RFILL_0] = img->copy(31, 42, 5, 29); + m_playlist[PLS_RFILL2_0] = img->copy(36, 42, 8, 29); + m_playlist[PLS_RFILL3_0] = img->copy(44, 42, 7, 29); - tmp = m_playlist->value (PLS_CORNER_UR_0); + tmp = m_playlist[PLS_CORNER_UR_0]; - m_playlist->insert (PLS_CLOSE_BTN_0, tmp.copy(14, 3, 9, 9)); - m_playlist->insert (PLS_CLOSE_BTN_1, img->copy(52, 42, 9, 9)); + m_playlist[PLS_CLOSE_BTN_0] = tmp.copy(14, 3, 9, 9); + m_playlist[PLS_CLOSE_BTN_1] = img->copy(52, 42, 9, 9); - m_playlist->insert (PLS_SHADE_BTN_0, tmp.copy(14, 3, 9, 9)); - m_playlist->insert (PLS_SHADE_BTN_1, img->copy(52, 42, 9, 9)); + m_playlist[PLS_SHADE_BTN_0] = tmp.copy(14, 3, 9, 9); + m_playlist[PLS_SHADE_BTN_1] = img->copy(52, 42, 9, 9); - m_playlist->insert (PLS_MAX_BTN_0, img->copy(150, 42, 9, 9)); + m_playlist[PLS_MAX_BTN_0] = img->copy(150, 42, 9, 9); - m_playlist->insert (PLS_SCROLL_0, img->copy(52, 53, 8, 18)); - m_playlist->insert (PLS_SCROLL_1, img->copy(61, 53, 8, 18)); + m_playlist[PLS_SCROLL_0] = img->copy(52, 53, 8, 18); + m_playlist[PLS_SCROLL_1] = img->copy(61, 53, 8, 18); - m_playlist->insert (PLS_WS_LE_0, img->copy(72, 42, 25, 14)); - m_playlist->insert (PLS_WS_RE_0, img->copy(99, 42, 50, 14)); - m_playlist->insert (PLS_WS_RE_1, img->copy(99, 57, 50, 14)); - m_playlist->insert (PLS_WS_MID_0, img->copy(72, 57, 25, 14)); + m_playlist[PLS_WS_LE_0] = img->copy(72, 42, 25, 14); + m_playlist[PLS_WS_RE_0] = img->copy(99, 42, 50, 14); + m_playlist[PLS_WS_RE_1] = img->copy(99, 57, 50, 14); + m_playlist[PLS_WS_MID_0] = img->copy(72, 57, 25, 14); - m_playlist->insert (PLS_LCBAR, img->copy(0, 72, 125, 38)); - m_playlist->insert (PLS_RCBAR, img->copy(126, 72, 150, 38)); + m_playlist[PLS_LCBAR] = img->copy(0, 72, 125, 38); + m_playlist[PLS_RCBAR] = img->copy(126, 72, 150, 38); delete img; @@ -86,24 +79,24 @@ Skin::setSkin (const QString& name) { m_path = name; - m_items->clear(); + m_items.clear(); BuildButtons(); BuildToggleButtons(); BuildTitleBar(); BuildOther(); - m_letterMap->clear(); + m_letterMap.clear(); BuildLetterMap(); BuildSliders(); - m_pledit_txt->clear(); + m_pledit_txt.clear(); ParsePLEdit(); - m_numbers->clear(); + m_numbers.clear(); BuildNumbers(); - m_playlist->clear (); + m_playlist.clear (); BuildPlaylist (); emit skinChanged(this); @@ -169,47 +162,47 @@ Skin::BuildLetterMap (void) /* alphabet */ for (uint i = 97; i < 123; i++) { - m_letterMap->insert(i, letters[0][i-97]); + m_letterMap[i] = letters[0][i-97]; } /* digits */ for (uint i = 0; i <= 9; i++) { - m_letterMap->insert(i+48, letters[1][i]); + m_letterMap[i+48] = letters[1][i]; } /* special characters */ - m_letterMap->insert('"', letters[0][27]); - m_letterMap->insert('@', letters[0][28]); - m_letterMap->insert('(', letters[1][13]); - m_letterMap->insert(')', letters[1][14]); - m_letterMap->insert('-', letters[1][15]); - m_letterMap->insert('\'', letters[1][16]); - m_letterMap->insert('`', letters[1][16]); - m_letterMap->insert('!', letters[1][17]); - m_letterMap->insert('_', letters[1][18]); - m_letterMap->insert('+', letters[1][19]); - m_letterMap->insert('\\', letters[1][20]); - m_letterMap->insert('/', letters[1][21]); - m_letterMap->insert('[', letters[1][22]); - m_letterMap->insert(']', letters[1][23]); - m_letterMap->insert('^', letters[1][24]); - m_letterMap->insert('&', letters[1][25]); - m_letterMap->insert('%', letters[1][26]); - m_letterMap->insert('.', letters[1][27]); - m_letterMap->insert(',', letters[1][27]); - m_letterMap->insert('=', letters[1][28]); - m_letterMap->insert('$', letters[1][29]); - m_letterMap->insert('#', letters[1][30]); + m_letterMap['"'] = letters[0][27]; + m_letterMap['@'] = letters[0][28]; + m_letterMap['('] = letters[1][13]; + m_letterMap[')'] = letters[1][14]; + m_letterMap['-'] = letters[1][15]; + m_letterMap['\''] = letters[1][16]; + m_letterMap['`'] = letters[1][16]; + m_letterMap['!'] = letters[1][17]; + m_letterMap['_'] = letters[1][18]; + m_letterMap['+'] = letters[1][19]; + m_letterMap['\\'] = letters[1][20]; + m_letterMap['/'] = letters[1][21]; + m_letterMap['['] = letters[1][22]; + m_letterMap[']'] = letters[1][23]; + m_letterMap['^'] = letters[1][24]; + m_letterMap['&'] = letters[1][25]; + m_letterMap['%'] = letters[1][26]; + m_letterMap['.'] = letters[1][27]; + m_letterMap[','] = letters[1][27]; + m_letterMap['='] = letters[1][28]; + m_letterMap['$'] = letters[1][29]; + m_letterMap['#'] = letters[1][30]; - m_letterMap->insert(229, letters[2][0]); - m_letterMap->insert(246, letters[2][1]); - m_letterMap->insert(228, letters[2][2]); - m_letterMap->insert('?', letters[2][3]); - m_letterMap->insert('*', letters[2][4]); - m_letterMap->insert(' ', letters[2][5]); + m_letterMap[229] = letters[2][0]; + m_letterMap[246] = letters[2][1]; + m_letterMap[228] = letters[2][2]; + m_letterMap['?'] = letters[2][3]; + m_letterMap['*'] = letters[2][4]; + m_letterMap[' '] = letters[2][5]; /* text background */ - m_items->insert (TEXTBG, letters[2][6]); + m_items[TEXTBG] = letters[2][6]; } @@ -218,23 +211,23 @@ Skin::BuildButtons (void) { QPixmap *img = getPixmap("cbuttons"); - m_items->insert (BTN_PREV_0, img->copy(0, 0, 23, 18)); - m_items->insert (BTN_PREV_1, img->copy(0, 18, 23, 18)); + m_items[BTN_PREV_0] = img->copy(0, 0, 23, 18); + m_items[BTN_PREV_1] = img->copy(0, 18, 23, 18); - m_items->insert (BTN_PLAY_0, img->copy(23, 0, 23, 18)); - m_items->insert (BTN_PLAY_1, img->copy(23, 18, 23, 18)); + m_items[BTN_PLAY_0] = img->copy(23, 0, 23, 18); + m_items[BTN_PLAY_1] = img->copy(23, 18, 23, 18); - m_items->insert (BTN_PAUSE_0, img->copy(46, 0, 23, 18)); - m_items->insert (BTN_PAUSE_1, img->copy(46, 18, 23, 18)); + m_items[BTN_PAUSE_0] = img->copy(46, 0, 23, 18); + m_items[BTN_PAUSE_1] = img->copy(46, 18, 23, 18); - m_items->insert (BTN_STOP_0, img->copy(69, 0, 23, 18)); - m_items->insert (BTN_STOP_1, img->copy(69, 18, 23, 18)); + m_items[BTN_STOP_0] = img->copy(69, 0, 23, 18); + m_items[BTN_STOP_1] = img->copy(69, 18, 23, 18); - m_items->insert (BTN_NEXT_0, img->copy(92, 0, 22, 18)); - m_items->insert (BTN_NEXT_1, img->copy(92, 18, 22, 18)); + m_items[BTN_NEXT_0] = img->copy(92, 0, 22, 18); + m_items[BTN_NEXT_1] = img->copy(92, 18, 22, 18); - m_items->insert (BTN_EJECT_0, img->copy(114, 0, 22, 16)); - m_items->insert (BTN_EJECT_1, img->copy(114, 16, 22, 16)); + m_items[BTN_EJECT_0] = img->copy(114, 0, 22, 16); + m_items[BTN_EJECT_1] = img->copy(114, 16, 22, 16); delete img; } @@ -245,29 +238,29 @@ Skin::BuildToggleButtons (void) { QPixmap *img = getPixmap("shufrep"); - m_items->insert(REPEAT_ON_0, img->copy(0, 30, 28, 15)); - m_items->insert(REPEAT_ON_1, img->copy(0, 45, 28, 15)); + m_items[REPEAT_ON_0] = img->copy(0, 30, 28, 15); + m_items[REPEAT_ON_1] = img->copy(0, 45, 28, 15); - m_items->insert(REPEAT_OFF_0, img->copy(0, 0, 28, 15)); - m_items->insert(REPEAT_OFF_1, img->copy(0, 15, 28, 15)); + m_items[REPEAT_OFF_0] = img->copy(0, 0, 28, 15); + m_items[REPEAT_OFF_1] = img->copy(0, 15, 28, 15); - m_items->insert(SHUFFLE_ON_0, img->copy(28, 30, 46, 15)); - m_items->insert(SHUFFLE_ON_1, img->copy(28, 45, 46, 15)); + m_items[SHUFFLE_ON_0] = img->copy(28, 30, 46, 15); + m_items[SHUFFLE_ON_1] = img->copy(28, 45, 46, 15); - m_items->insert(SHUFFLE_OFF_0, img->copy(28, 0, 46, 15)); - m_items->insert(SHUFFLE_OFF_1, img->copy(28, 15, 46, 15)); + m_items[SHUFFLE_OFF_0] = img->copy(28, 0, 46, 15); + m_items[SHUFFLE_OFF_1] = img->copy(28, 15, 46, 15); - m_items->insert(EQ_ON_0, img->copy( 0, 73, 23, 12)); - m_items->insert(EQ_ON_1, img->copy(46, 73, 23, 12)); + m_items[EQ_ON_0] = img->copy( 0, 73, 23, 12); + m_items[EQ_ON_1] = img->copy(46, 73, 23, 12); - m_items->insert(EQ_OFF_0, img->copy( 0, 61, 23, 12)); - m_items->insert(EQ_OFF_1, img->copy(46, 61, 23, 12)); + m_items[EQ_OFF_0] = img->copy( 0, 61, 23, 12); + m_items[EQ_OFF_1] = img->copy(46, 61, 23, 12); - m_items->insert(PLS_ON_0, img->copy(23, 73, 23, 12)); - m_items->insert(PLS_ON_1, img->copy(69, 73, 23, 12)); + m_items[PLS_ON_0] = img->copy(23, 73, 23, 12); + m_items[PLS_ON_1] = img->copy(69, 73, 23, 12); - m_items->insert(PLS_OFF_0, img->copy(23, 61, 23, 12)); - m_items->insert(PLS_OFF_1, img->copy(69, 61, 23, 12)); + m_items[PLS_OFF_0] = img->copy(23, 61, 23, 12); + m_items[PLS_OFF_1] = img->copy(69, 61, 23, 12); delete img; } @@ -278,26 +271,26 @@ Skin::BuildTitleBar (void) { QPixmap *img = getPixmap("titlebar"); - m_items->insert(MENUBUTTON_0, img->copy(0, 0, 9, 9)); - m_items->insert(MENUBUTTON_1, img->copy(0, 9, 9, 9)); + m_items[MENUBUTTON_0] = img->copy(0, 0, 9, 9); + m_items[MENUBUTTON_1] = img->copy(0, 9, 9, 9); - m_items->insert(MINIMIZE_0, img->copy(9, 0, 9, 9)); - m_items->insert(MINIMIZE_1, img->copy(9, 9, 9, 9)); + m_items[MINIMIZE_0] = img->copy(9, 0, 9, 9); + m_items[MINIMIZE_1] = img->copy(9, 9, 9, 9); - m_items->insert(CLOSE_0, img->copy(18, 0, 9, 9)); - m_items->insert(CLOSE_1, img->copy(18, 9, 9 ,9)); + m_items[CLOSE_0] = img->copy(18, 0, 9, 9); + m_items[CLOSE_1] = img->copy(18, 9, 9 ,9); - m_items->insert(SHADE_1_0, img->copy(0, 18, 9, 9)); - m_items->insert(SHADE_1_1, img->copy(9, 18, 9, 9)); + m_items[SHADE_1_0] = img->copy(0, 18, 9, 9); + m_items[SHADE_1_1] = img->copy(9, 18, 9, 9); - m_items->insert(SHADE_2_0, img->copy(0, 27, 9, 9)); - m_items->insert(SHADE_2_1, img->copy(9, 27, 9, 9)); + m_items[SHADE_2_0] = img->copy(0, 27, 9, 9); + m_items[SHADE_2_1] = img->copy(9, 27, 9, 9); - m_items->insert(TITLEBAR_0, img->copy(27, 0, 275, 14)); - m_items->insert(TITLEBAR_1, img->copy(27, 15, 275, 14)); + m_items[TITLEBAR_0] = img->copy(27, 0, 275, 14); + m_items[TITLEBAR_1] = img->copy(27, 15, 275, 14); - m_items->insert(STATUSBAR_0, img->copy(27, 29, 275, 14)); - m_items->insert(STATUSBAR_1, img->copy(27, 29+13, 275, 14)); + m_items[STATUSBAR_0] = img->copy(27, 29, 275, 14); + m_items[STATUSBAR_1] = img->copy(27, 29+13, 275, 14); delete img; } @@ -310,10 +303,10 @@ Skin::BuildOther (void) QPainter(painter); img = getPixmap("monoster"); - m_items->insert (MONO_1, img->copy(29, 0, 27, 12)); - m_items->insert (MONO_0, img->copy(29, 12, 27, 12)); - m_items->insert (STEREO_1, img->copy(0, 0, 29, 12)); - m_items->insert (STEREO_0, img->copy(0, 12, 29, 12)); + 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; @@ -324,7 +317,7 @@ Skin::BuildOther (void) painter.drawPixmap (0, 0, 3, 9, *img, 36, 0, 3, 9); painter.drawPixmap (3, 0, 8, 9, *img, 1, 0, 8, 9); painter.end(); - m_items->insert (PIC_PLAY, part->copy()); + m_items[PIC_PLAY] = part->copy(); delete part; part = new QPixmap(11, 9); @@ -332,7 +325,7 @@ Skin::BuildOther (void) painter.drawPixmap (0, 0, 2, 9, *img, 27, 0, 2, 9); painter.drawPixmap (2, 0, 9, 9, *img, 9, 0, 9, 9); painter.end(); - m_items->insert (PIC_PAUSE, part->copy()); + m_items[PIC_PAUSE] = part->copy(); delete part; part = new QPixmap(11, 9); @@ -340,16 +333,16 @@ Skin::BuildOther (void) painter.drawPixmap (0, 0, 2, 9, *img, 27, 0, 2, 9); painter.drawPixmap (2, 0, 9, 9, *img, 18, 0, 9, 9); painter.end(); - m_items->insert (PIC_STOP, part->copy()); + m_items[PIC_STOP] = part->copy(); delete part; delete img; img = getPixmap ("main"); - m_items->insert (MAIN_WINDOW, img->copy()); - m_items->insert (ABOUT_0, img->copy(247, 83, 20, 25)); - m_items->insert (ABOUT_1, img->copy(247, 83, 20, 24)); + 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; } @@ -360,15 +353,15 @@ Skin::BuildSliders (void) QPixmap *img; img = getPixmap("posbar"); - m_items->insert (POSBAR, img->copy (0, 0, 248, 10)); - m_items->insert (POSBAR_BTN_0, img->copy (248, 0, 29, 10)); - m_items->insert (POSBAR_BTN_1, img->copy (278, 0, 29, 10)); + 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; img = getPixmap("volume"); for (int i = VOLUMEBAR_POS_MIN; i < VOLUMEBAR_POS_MAX; i++) { - m_volume_bar->insert(i, img->copy(0, i*15, 68, 13)); + m_volume_bar[i] = img->copy(0, i*15, 68, 13); } delete img; @@ -378,7 +371,7 @@ Skin::BuildSliders (void) } for (int i = BALANCE_POS_MIN; i < BALANCE_POS_MAX; i++) { - m_balance->insert(i, img->copy(9, i*15, 38, 13)); + m_balance[i] = img->copy(9, i*15, 38, 13); } delete img; } @@ -396,7 +389,7 @@ Skin::BuildNumbers (void) } for (uint i = 0; i < num; i++) { - m_numbers->insert (i, img->copy (i*9, 0, 9, 13)); + m_numbers[i] = img->copy (i*9, 0, 9, 13); } delete img; @@ -436,7 +429,7 @@ Skin::ParsePLEdit (void) QByteArray line = file.readLine (); QList l = line.split ('='); if (l.count () == 2) { - m_pledit_txt->insert (l[0].toLower (), l[1].trimmed()); + m_pledit_txt[l[0].toLower ()] = l[1].trimmed(); } else if (line.length() == 0) { break; } diff --git a/Skin.h b/Skin.h index 0414031..bf6401d 100644 --- a/Skin.h +++ b/Skin.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include class Skin : public QWidget @@ -20,13 +20,13 @@ class Skin : public QWidget void setSkin (const QString& name); static QPixmap getPixmap (const QString&, QDir); - const QPixmap getItem (uint part) const { return m_items->value(part); } - const QPixmap getPls (uint part) const { return m_playlist->value(part); } - const QPixmap getVol (uint p) const { return m_volume_bar->value(p); } - const QPixmap getBal (uint p) const { return m_balance->value(p); } - const QPixmap getLetter (uint c) const { return m_letterMap->value(c); } - const QPixmap getNumber (uint c) const { return m_numbers->value(c); } - const QByteArray getPLeditValue (QByteArray c) const { return m_pledit_txt->value(c); } + const QPixmap getItem (uint part) const { return m_items[part]; } + const QPixmap getPls (uint part) const { return m_playlist[part]; } + const QPixmap getVol (uint p) const { return m_volume_bar[p]; } + const QPixmap getBal (uint p) const { return m_balance[p]; } + 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]; } enum Volume { VOLUMEBAR_POS_MIN, @@ -207,14 +207,14 @@ class Skin : public QWidget QString m_skinname; QString m_path; - QHash *m_items; - QHash *m_letterMap; - QHash *m_volume_bar; - QHash *m_balance; - QHash *m_numbers; - QHash *m_playlist; + QMap m_items; + QMap m_letterMap; + QMap m_volume_bar; + QMap m_balance; + QMap m_numbers; + QMap m_playlist; - QHash *m_pledit_txt; + QMap m_pledit_txt; QList m_buttons; signals: