diff options
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/playlistselector.cpp | 32 | ||||
| -rw-r--r-- | src/ui/playlistselector.h | 2 | ||||
| -rw-r--r-- | src/ui/translations/qmmp_cs.ts | 12 | ||||
| -rw-r--r-- | src/ui/translations/qmmp_de.ts | 12 | ||||
| -rw-r--r-- | src/ui/translations/qmmp_hu.ts | 12 | ||||
| -rw-r--r-- | src/ui/translations/qmmp_it.ts | 12 | ||||
| -rw-r--r-- | src/ui/translations/qmmp_lt.ts | 12 | ||||
| -rw-r--r-- | src/ui/translations/qmmp_pl_PL.ts | 12 | ||||
| -rw-r--r-- | src/ui/translations/qmmp_pt_BR.ts | 12 | ||||
| -rw-r--r-- | src/ui/translations/qmmp_ru.ts | 12 | ||||
| -rw-r--r-- | src/ui/translations/qmmp_tr.ts | 12 | ||||
| -rw-r--r-- | src/ui/translations/qmmp_uk_UA.ts | 12 | ||||
| -rw-r--r-- | src/ui/translations/qmmp_zh_CN.ts | 12 | ||||
| -rw-r--r-- | src/ui/translations/qmmp_zh_TW.ts | 12 |
14 files changed, 98 insertions, 80 deletions
diff --git a/src/ui/playlistselector.cpp b/src/ui/playlistselector.cpp index e63056c89..8d84750a4 100644 --- a/src/ui/playlistselector.cpp +++ b/src/ui/playlistselector.cpp @@ -36,6 +36,8 @@ PlayListSelector::PlayListSelector(PlayListManager *manager, QWidget *parent) : { m_update = FALSE; m_scrollable = FALSE; + m_left_pressed = FALSE; + m_right_pressed = FALSE; m_offset = 0; m_offset_max = 0; m_skin = Skin::instance(); @@ -155,6 +157,8 @@ void PlayListSelector::mousePressEvent (QMouseEvent *e) { m_offset += m_rects.at(lastVisible()).right() - m_offset - width() + 42; m_offset = qMin(m_offset, m_offset_max); + m_right_pressed = TRUE; + drawButtons(); update(); return; } @@ -162,6 +166,8 @@ void PlayListSelector::mousePressEvent (QMouseEvent *e) { m_offset -= 11 - m_rects.at(firstVisible()).x() + m_offset; m_offset = qMax(0, m_offset); + m_left_pressed = TRUE; + drawButtons(); update(); return; } @@ -181,9 +187,18 @@ void PlayListSelector::mousePressEvent (QMouseEvent *e) m_menu->exec(e->globalPos()); } +void PlayListSelector::mouseReleaseEvent (QMouseEvent *e) +{ + m_left_pressed = FALSE; + m_right_pressed = FALSE; + drawButtons(); + update(); + QWidget::mouseReleaseEvent(e); +} + void PlayListSelector::mouseDoubleClickEvent (QMouseEvent *e) { - if(e->button() == Qt::LeftButton) + if(e->button() == Qt::LeftButton && !(m_scrollable && (e->x() > width() - 40))) renamePlaylist(); else QWidget::mouseDoubleClickEvent(e); @@ -207,19 +222,20 @@ void PlayListSelector::drawButtons() m_pixmap = QPixmap(40, height()); m_pixmap.fill(m_normal_bg); QPainter painter(&m_pixmap); - painter.setPen(m_normal); - painter.setBrush(QBrush(m_normal)); + painter.setPen(m_left_pressed ? m_current : m_normal); + painter.setBrush(QBrush(m_left_pressed ? m_current : m_normal)); QPoint points[3] = { - QPoint(m_pixmap.width() - 25, height()/2 - 6), + QPoint(m_pixmap.width() - 25, height()/2 - 5), QPoint(m_pixmap.width() - 35, height()/2-1), - QPoint(m_pixmap.width() - 25, height()/2 + 4), + QPoint(m_pixmap.width() - 25, height()/2 + 3), }; painter.drawPolygon(points, 3); - + painter.setPen(m_right_pressed ? m_current : m_normal); + painter.setBrush(QBrush(m_right_pressed ? m_current : m_normal)); QPoint points2[3] = { - QPoint(m_pixmap.width() - 20, height()/2 - 6), + QPoint(m_pixmap.width() - 20, height()/2 - 5), QPoint(m_pixmap.width() - 10, height()/2-1), - QPoint(m_pixmap.width() - 20, height()/2 + 4), + QPoint(m_pixmap.width() - 20, height()/2 + 3), }; painter.drawPolygon(points2, 3); } diff --git a/src/ui/playlistselector.h b/src/ui/playlistselector.h index 4f54abd9d..538c156e1 100644 --- a/src/ui/playlistselector.h +++ b/src/ui/playlistselector.h @@ -51,6 +51,7 @@ private slots: private: void paintEvent(QPaintEvent *); void mousePressEvent (QMouseEvent *e); + void mouseReleaseEvent (QMouseEvent *e); void mouseDoubleClickEvent (QMouseEvent *e); void resizeEvent (QResizeEvent *); void updateOffsets(); @@ -71,6 +72,7 @@ private: QPixmap m_pixmap; bool m_showButtons; int m_offset, m_offset_max; + bool m_left_pressed, m_right_pressed; }; #endif // PLAYLISTSELECTOR_H diff --git a/src/ui/translations/qmmp_cs.ts b/src/ui/translations/qmmp_cs.ts index 59b018fd0..da042b4e5 100644 --- a/src/ui/translations/qmmp_cs.ts +++ b/src/ui/translations/qmmp_cs.ts @@ -1403,32 +1403,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="49"/> + <location filename="../playlistselector.cpp" line="51"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="50"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="54"/> <source>Rename</source> <translation type="unfinished">Přejmenovat</translation> </message> <message> - <location filename="../playlistselector.cpp" line="53"/> + <location filename="../playlistselector.cpp" line="55"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Rename Playlist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Playlist name:</source> <translation type="unfinished"></translation> </message> diff --git a/src/ui/translations/qmmp_de.ts b/src/ui/translations/qmmp_de.ts index bf0ef122b..bde2ce5fe 100644 --- a/src/ui/translations/qmmp_de.ts +++ b/src/ui/translations/qmmp_de.ts @@ -1403,32 +1403,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="49"/> + <location filename="../playlistselector.cpp" line="51"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="50"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="54"/> <source>Rename</source> <translation type="unfinished">Umbenennen</translation> </message> <message> - <location filename="../playlistselector.cpp" line="53"/> + <location filename="../playlistselector.cpp" line="55"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Rename Playlist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Playlist name:</source> <translation type="unfinished"></translation> </message> diff --git a/src/ui/translations/qmmp_hu.ts b/src/ui/translations/qmmp_hu.ts index 836df2e75..5a50807e9 100644 --- a/src/ui/translations/qmmp_hu.ts +++ b/src/ui/translations/qmmp_hu.ts @@ -1403,32 +1403,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="49"/> + <location filename="../playlistselector.cpp" line="51"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="50"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="54"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="53"/> + <location filename="../playlistselector.cpp" line="55"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Rename Playlist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Playlist name:</source> <translation type="unfinished"></translation> </message> diff --git a/src/ui/translations/qmmp_it.ts b/src/ui/translations/qmmp_it.ts index 3cbfa7a52..e91e22d94 100644 --- a/src/ui/translations/qmmp_it.ts +++ b/src/ui/translations/qmmp_it.ts @@ -1403,32 +1403,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="49"/> + <location filename="../playlistselector.cpp" line="51"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="50"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="54"/> <source>Rename</source> <translation type="unfinished">Rinomina</translation> </message> <message> - <location filename="../playlistselector.cpp" line="53"/> + <location filename="../playlistselector.cpp" line="55"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Rename Playlist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Playlist name:</source> <translation type="unfinished"></translation> </message> diff --git a/src/ui/translations/qmmp_lt.ts b/src/ui/translations/qmmp_lt.ts index d16b3a2d6..c37fa9279 100644 --- a/src/ui/translations/qmmp_lt.ts +++ b/src/ui/translations/qmmp_lt.ts @@ -1404,32 +1404,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="49"/> + <location filename="../playlistselector.cpp" line="51"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="50"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="54"/> <source>Rename</source> <translation type="unfinished">Pervadinti</translation> </message> <message> - <location filename="../playlistselector.cpp" line="53"/> + <location filename="../playlistselector.cpp" line="55"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Rename Playlist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Playlist name:</source> <translation type="unfinished"></translation> </message> diff --git a/src/ui/translations/qmmp_pl_PL.ts b/src/ui/translations/qmmp_pl_PL.ts index 954c484af..05e148026 100644 --- a/src/ui/translations/qmmp_pl_PL.ts +++ b/src/ui/translations/qmmp_pl_PL.ts @@ -1403,32 +1403,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="49"/> + <location filename="../playlistselector.cpp" line="51"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="50"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="54"/> <source>Rename</source> <translation type="unfinished">Zmień nazwę</translation> </message> <message> - <location filename="../playlistselector.cpp" line="53"/> + <location filename="../playlistselector.cpp" line="55"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Rename Playlist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Playlist name:</source> <translation type="unfinished"></translation> </message> diff --git a/src/ui/translations/qmmp_pt_BR.ts b/src/ui/translations/qmmp_pt_BR.ts index 7c51382f3..49b86e80c 100644 --- a/src/ui/translations/qmmp_pt_BR.ts +++ b/src/ui/translations/qmmp_pt_BR.ts @@ -1403,32 +1403,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="49"/> + <location filename="../playlistselector.cpp" line="51"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="50"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="54"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="53"/> + <location filename="../playlistselector.cpp" line="55"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Rename Playlist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Playlist name:</source> <translation type="unfinished"></translation> </message> diff --git a/src/ui/translations/qmmp_ru.ts b/src/ui/translations/qmmp_ru.ts index 8ccd96a0f..ca949d2fb 100644 --- a/src/ui/translations/qmmp_ru.ts +++ b/src/ui/translations/qmmp_ru.ts @@ -1403,32 +1403,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="49"/> + <location filename="../playlistselector.cpp" line="51"/> <source>&Load</source> <translation>&Загрузить</translation> </message> <message> - <location filename="../playlistselector.cpp" line="50"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Save As...</source> <translation>&Сохранить как...</translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="54"/> <source>Rename</source> <translation>Переименовать</translation> </message> <message> - <location filename="../playlistselector.cpp" line="53"/> + <location filename="../playlistselector.cpp" line="55"/> <source>&Delete</source> <translation>&Удалить</translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Rename Playlist</source> <translation>Переименовать список</translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Playlist name:</source> <translation>Имя списка:</translation> </message> diff --git a/src/ui/translations/qmmp_tr.ts b/src/ui/translations/qmmp_tr.ts index 99efcb75e..a4210d7ac 100644 --- a/src/ui/translations/qmmp_tr.ts +++ b/src/ui/translations/qmmp_tr.ts @@ -1403,32 +1403,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="49"/> + <location filename="../playlistselector.cpp" line="51"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="50"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="54"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="53"/> + <location filename="../playlistselector.cpp" line="55"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Rename Playlist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Playlist name:</source> <translation type="unfinished"></translation> </message> diff --git a/src/ui/translations/qmmp_uk_UA.ts b/src/ui/translations/qmmp_uk_UA.ts index bed82b021..5821b8269 100644 --- a/src/ui/translations/qmmp_uk_UA.ts +++ b/src/ui/translations/qmmp_uk_UA.ts @@ -1403,32 +1403,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="49"/> + <location filename="../playlistselector.cpp" line="51"/> <source>&Load</source> <translation>&Завантажити</translation> </message> <message> - <location filename="../playlistselector.cpp" line="50"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Save As...</source> <translation>&Зберегти як...</translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="54"/> <source>Rename</source> <translation>Переіменувати</translation> </message> <message> - <location filename="../playlistselector.cpp" line="53"/> + <location filename="../playlistselector.cpp" line="55"/> <source>&Delete</source> <translation>&Видалити</translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Rename Playlist</source> <translation>Переіменувати список</translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Playlist name:</source> <translation>Ім'я списка:</translation> </message> diff --git a/src/ui/translations/qmmp_zh_CN.ts b/src/ui/translations/qmmp_zh_CN.ts index ad220b688..f0bcdc2bb 100644 --- a/src/ui/translations/qmmp_zh_CN.ts +++ b/src/ui/translations/qmmp_zh_CN.ts @@ -1403,32 +1403,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="49"/> + <location filename="../playlistselector.cpp" line="51"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="50"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="54"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="53"/> + <location filename="../playlistselector.cpp" line="55"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Rename Playlist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Playlist name:</source> <translation type="unfinished"></translation> </message> diff --git a/src/ui/translations/qmmp_zh_TW.ts b/src/ui/translations/qmmp_zh_TW.ts index b6e8588af..2e87c7f63 100644 --- a/src/ui/translations/qmmp_zh_TW.ts +++ b/src/ui/translations/qmmp_zh_TW.ts @@ -1403,32 +1403,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="49"/> + <location filename="../playlistselector.cpp" line="51"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="50"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="54"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="53"/> + <location filename="../playlistselector.cpp" line="55"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Rename Playlist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="109"/> + <location filename="../playlistselector.cpp" line="111"/> <source>Playlist name:</source> <translation type="unfinished"></translation> </message> |
