From e2225dbc1cc75d32a94d336e6b42075cf8af1e11 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 15 Nov 2009 09:36:28 +0000 Subject: added playlist selector git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1372 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/playlistmanager.cpp | 3 + src/qmmpui/playlistmodel.cpp | 6 +- src/qmmpui/playlistmodel.h | 5 ++ src/qmmpui/translations/libqmmpui_cs.ts | 2 +- src/qmmpui/translations/libqmmpui_de.ts | 2 +- src/qmmpui/translations/libqmmpui_it.ts | 2 +- src/qmmpui/translations/libqmmpui_lt.ts | 2 +- src/qmmpui/translations/libqmmpui_pl.ts | 2 +- src/qmmpui/translations/libqmmpui_pt_BR.ts | 2 +- src/qmmpui/translations/libqmmpui_ru.ts | 2 +- src/qmmpui/translations/libqmmpui_tr.ts | 2 +- src/qmmpui/translations/libqmmpui_uk_UA.ts | 2 +- src/qmmpui/translations/libqmmpui_zh_CN.ts | 2 +- src/qmmpui/translations/libqmmpui_zh_TW.ts | 2 +- src/ui/CMakeLists.txt | 2 + src/ui/listwidget.h | 9 +- src/ui/playlist.cpp | 10 ++- src/ui/playlist.h | 2 + src/ui/playlistselector.cpp | 135 +++++++++++++++++++++++++++++ src/ui/playlistselector.h | 62 +++++++++++++ src/ui/translations/qmmp_cs.ts | 106 +++++++++++----------- src/ui/translations/qmmp_de.ts | 106 +++++++++++----------- src/ui/translations/qmmp_it.ts | 106 +++++++++++----------- src/ui/translations/qmmp_lt.ts | 106 +++++++++++----------- src/ui/translations/qmmp_pl_PL.ts | 106 +++++++++++----------- src/ui/translations/qmmp_pt_BR.ts | 106 +++++++++++----------- src/ui/translations/qmmp_ru.ts | 106 +++++++++++----------- src/ui/translations/qmmp_tr.ts | 106 +++++++++++----------- src/ui/translations/qmmp_uk_UA.ts | 106 +++++++++++----------- src/ui/translations/qmmp_zh_CN.ts | 106 +++++++++++----------- src/ui/translations/qmmp_zh_TW.ts | 106 +++++++++++----------- src/ui/ui.pro | 6 +- 32 files changed, 824 insertions(+), 604 deletions(-) create mode 100644 src/ui/playlistselector.cpp create mode 100644 src/ui/playlistselector.h (limited to 'src') diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp index 280de012c..4af84d1b4 100644 --- a/src/qmmpui/playlistmanager.cpp +++ b/src/qmmpui/playlistmanager.cpp @@ -117,6 +117,7 @@ PlayListModel *PlayListManager::createPlayList(const QString &name) m_models.insert(i, model); model->prepareForRepeatablePlaying(m_repeatable); model->prepareForShufflePlaying(m_shuffle); + connect(model, SIGNAL(nameChanged(QString)), SIGNAL(playListsChanged())); emit playListAdded(i); emit playListsChanged(); return model; @@ -324,6 +325,8 @@ void PlayListManager::readPlayLists() pl = 0; m_selected = m_models.at(pl); m_current = m_models.at(pl); + foreach(PlayListModel *model, m_models) + connect(model, SIGNAL(nameChanged(QString)), SIGNAL(playListsChanged())); } void PlayListManager::writePlayLists() diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp index c87ad7409..7d0d339b0 100644 --- a/src/qmmpui/playlistmodel.cpp +++ b/src/qmmpui/playlistmodel.cpp @@ -97,7 +97,11 @@ QString PlayListModel::name() const void PlayListModel::setName(const QString &name) { - m_name = name; + if(m_name != name) + { + m_name = name; + emit nameChanged(name); + } } void PlayListModel::add(PlayListItem *item) diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h index 834d38f1f..c26572fe4 100644 --- a/src/qmmpui/playlistmodel.h +++ b/src/qmmpui/playlistmodel.h @@ -275,6 +275,11 @@ signals: * Emitted when first item has added. */ void firstAdded(); + /*! + * Emitted when playlist name has chanded. + * @param name New playlist name. + */ + void nameChanged(const QString& name); public slots: /*! diff --git a/src/qmmpui/translations/libqmmpui_cs.ts b/src/qmmpui/translations/libqmmpui_cs.ts index 482642afd..02a26096b 100644 --- a/src/qmmpui/translations/libqmmpui_cs.ts +++ b/src/qmmpui/translations/libqmmpui_cs.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist diff --git a/src/qmmpui/translations/libqmmpui_de.ts b/src/qmmpui/translations/libqmmpui_de.ts index 61660fe08..5d3e51a66 100644 --- a/src/qmmpui/translations/libqmmpui_de.ts +++ b/src/qmmpui/translations/libqmmpui_de.ts @@ -76,7 +76,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist diff --git a/src/qmmpui/translations/libqmmpui_it.ts b/src/qmmpui/translations/libqmmpui_it.ts index 816edc01c..b87aac97e 100644 --- a/src/qmmpui/translations/libqmmpui_it.ts +++ b/src/qmmpui/translations/libqmmpui_it.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist diff --git a/src/qmmpui/translations/libqmmpui_lt.ts b/src/qmmpui/translations/libqmmpui_lt.ts index 96ead23aa..92586da36 100644 --- a/src/qmmpui/translations/libqmmpui_lt.ts +++ b/src/qmmpui/translations/libqmmpui_lt.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist diff --git a/src/qmmpui/translations/libqmmpui_pl.ts b/src/qmmpui/translations/libqmmpui_pl.ts index e5a652ff4..5555007bc 100644 --- a/src/qmmpui/translations/libqmmpui_pl.ts +++ b/src/qmmpui/translations/libqmmpui_pl.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist diff --git a/src/qmmpui/translations/libqmmpui_pt_BR.ts b/src/qmmpui/translations/libqmmpui_pt_BR.ts index caea9ec7b..066279f71 100644 --- a/src/qmmpui/translations/libqmmpui_pt_BR.ts +++ b/src/qmmpui/translations/libqmmpui_pt_BR.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist diff --git a/src/qmmpui/translations/libqmmpui_ru.ts b/src/qmmpui/translations/libqmmpui_ru.ts index 04a0f26a1..909a476f9 100644 --- a/src/qmmpui/translations/libqmmpui_ru.ts +++ b/src/qmmpui/translations/libqmmpui_ru.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist Список воспроизведения diff --git a/src/qmmpui/translations/libqmmpui_tr.ts b/src/qmmpui/translations/libqmmpui_tr.ts index 3e052b264..f9da4fc12 100644 --- a/src/qmmpui/translations/libqmmpui_tr.ts +++ b/src/qmmpui/translations/libqmmpui_tr.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist diff --git a/src/qmmpui/translations/libqmmpui_uk_UA.ts b/src/qmmpui/translations/libqmmpui_uk_UA.ts index 2ed659790..a7344acc8 100644 --- a/src/qmmpui/translations/libqmmpui_uk_UA.ts +++ b/src/qmmpui/translations/libqmmpui_uk_UA.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist Список diff --git a/src/qmmpui/translations/libqmmpui_zh_CN.ts b/src/qmmpui/translations/libqmmpui_zh_CN.ts index c8c8a381c..dbf912245 100644 --- a/src/qmmpui/translations/libqmmpui_zh_CN.ts +++ b/src/qmmpui/translations/libqmmpui_zh_CN.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist diff --git a/src/qmmpui/translations/libqmmpui_zh_TW.ts b/src/qmmpui/translations/libqmmpui_zh_TW.ts index 52e190865..c6165a84b 100644 --- a/src/qmmpui/translations/libqmmpui_zh_TW.ts +++ b/src/qmmpui/translations/libqmmpui_zh_TW.ts @@ -72,7 +72,7 @@ p, li { white-space: pre-wrap; } PlayListManager - + Playlist diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index dacab3fcc..172b2a3ab 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -77,6 +77,7 @@ SET(ui_SRCS volumebar.cpp cursorimage.cpp playlistbrowser.cpp + playlistselector.cpp ) SET(ui_MOC_HDRS @@ -128,6 +129,7 @@ SET(ui_MOC_HDRS volumebar.h cursorimage.h playlistbrowser.h + playlistselector.h ) SET(ui_RCCS images/images.qrc stuff.qrc translations/qmmp_locales.qrc) diff --git a/src/ui/listwidget.h b/src/ui/listwidget.h index 15e657c62..7c581f4ce 100644 --- a/src/ui/listwidget.h +++ b/src/ui/listwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Ilya Kotov * + * Copyright (C) 2006-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -24,20 +24,19 @@ #include #include -/** - @author Ilya Kotov -*/ class QFont; class QFontMetrics; class QMenu; class QAction; - class PlayList; class PlayListModel; class Skin; class PlayListItem; class MediaPlayer; +/** + @author Ilya Kotov +*/ class ListWidget : public QWidget { Q_OBJECT diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp index 7aab2fa66..c4f704043 100644 --- a/src/ui/playlist.cpp +++ b/src/ui/playlist.cpp @@ -39,7 +39,7 @@ #include "playlistcontrol.h" #include "keyboardmanager.h" #include "playlistbrowser.h" - +#include "playlistselector.h" #include #include #include @@ -73,6 +73,7 @@ PlayList::PlayList (PlayListManager *manager, QWidget *parent) m_resizeWidget->resize(25,25); m_resizeWidget->setCursor(m_skin->getCursor (Skin::CUR_PSIZE)); m_pl_control = new PlaylistControl (this); + m_pl_selector = new PlayListSelector(m_pl_manager, this); m_length_totalLength = new SymbolDisplay (this,14); m_length_totalLength->setAlignment (Qt::AlignLeft); @@ -132,7 +133,11 @@ void PlayList::updatePositions() m_titleBar->resize (275*m_ratio+25*sx, 20*m_ratio); m_plslider->resize (20*m_ratio, 58*m_ratio+sy*29); - m_listWidget->resize (243*m_ratio+25*sx, 58*m_ratio+29*sy); + + m_pl_selector->resize(243*m_ratio+25*sx, m_pl_selector->height()); + m_pl_selector->move(12*m_ratio, 20*m_ratio + 58*m_ratio+29*sy - m_pl_selector->height()); + + m_listWidget->resize (243*m_ratio+25*sx, 58*m_ratio+29*sy - m_pl_selector->height()); m_listWidget->move (12*m_ratio,20*m_ratio); m_buttonAdd->move (11*m_ratio, 86*m_ratio+29*sy); @@ -452,6 +457,7 @@ void PlayList::readSettings() { m_listWidget->readSettings(); m_titleBar->readSettings(); + m_pl_selector->readSettings(); } else { diff --git a/src/ui/playlist.h b/src/ui/playlist.h index d74971c53..990af25ca 100644 --- a/src/ui/playlist.h +++ b/src/ui/playlist.h @@ -39,6 +39,7 @@ class PlaylistControl; class KeyboardManager; class PlayListManager; class PlayListBrowser; +class PlayListSelector; /** @author Ilya Kotov @@ -121,6 +122,7 @@ class PlayList : public QWidget PlayListManager *m_pl_manager; KeyboardManager* m_keyboardManager; QPointer m_pl_browser; + PlayListSelector *m_pl_selector; protected: virtual void paintEvent (QPaintEvent *); diff --git a/src/ui/playlistselector.cpp b/src/ui/playlistselector.cpp new file mode 100644 index 000000000..534aa6bf0 --- /dev/null +++ b/src/ui/playlistselector.cpp @@ -0,0 +1,135 @@ +/*************************************************************************** + * Copyright (C) 2009 by Ilya Kotov * + * forkotov02@hotmail.ru * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "skin.h" +#include "playlistselector.h" + +PlayListSelector::PlayListSelector(PlayListManager *manager, QWidget *parent) : QWidget(parent) +{ + m_update = FALSE; + m_skin = Skin::instance(); + m_pl_manager = manager; + connect(m_pl_manager, SIGNAL(playListsChanged()), SLOT(updateTabs())); + connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin())); + readSettings(); + loadColors(); + updateTabs(); +} + +PlayListSelector::~PlayListSelector() +{} + +void PlayListSelector::readSettings() +{ + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); + m_font.fromString(settings.value("PlayList/Font", QApplication::font().toString()).toString()); + if (m_update) + { + delete m_metrics; + m_metrics = new QFontMetrics(m_font); + } + else + { + m_update = TRUE; + } + m_metrics = new QFontMetrics(m_font); + + resize(width(), m_metrics->height () +1); +} + +void PlayListSelector::updateTabs() +{ + m_rects.clear(); + QRect rect; + foreach(QString text, m_pl_manager->playListNames()) + { + if(m_rects.isEmpty()) + rect.setX(9); + else + rect.setX(m_rects.last().x() + m_rects.last().width() + m_metrics->width(" | ")); + rect.setY(0); + rect.setWidth(m_metrics->width(text)); + rect.setHeight(m_metrics->ascent ()); + m_rects.append(rect); + } + update(); +} + +void PlayListSelector::updateSkin() +{ + loadColors(); + updateTabs(); +} + +void PlayListSelector::paintEvent(QPaintEvent *) +{ + QPainter m_painter(this); + m_painter.setFont(m_font); + m_painter.setBrush(QBrush(m_normal_bg)); + m_painter.drawRect(-1,-1,width()+1,height()+1); + QStringList names = m_pl_manager->playListNames(); + int current = m_pl_manager->indexOf(m_pl_manager->currentPlayList()); + int selected = m_pl_manager->indexOf(m_pl_manager->selectedPlayList()); + m_painter.setBrush(QBrush(m_selected_bg)); + m_painter.setPen(m_selected_bg); + m_painter.drawRect(m_rects.at(selected).x()-3, 0, m_rects.at(selected).width()+4, height()-1); + + for (int i = 0; i < m_rects.size(); ++i) + { + if(i == current) + m_painter.setPen(m_current); + else + m_painter.setPen(m_normal); + m_painter.drawText(m_rects[i].x(), m_metrics->ascent(), names.at(i)); + if(i < m_rects.size() - 1) + { + m_painter.setPen(m_normal); + m_painter.drawText(m_rects[i].x() + m_rects[i].width(), m_metrics->ascent(), " | "); + } + } +} + +void PlayListSelector::mousePressEvent (QMouseEvent *e) +{ + for(int i = 0; i < m_rects.count(); ++i) + { + if(m_rects.at(i).contains(e->pos())) + { + m_pl_manager->selectPlayList(i); + break; + } + } +} + +void PlayListSelector::loadColors() +{ + m_normal.setNamedColor(m_skin->getPLValue("normal")); + m_current.setNamedColor(m_skin->getPLValue("current")); + m_normal_bg.setNamedColor(m_skin->getPLValue("normalbg")); + m_selected_bg.setNamedColor(m_skin->getPLValue("selectedbg")); +} diff --git a/src/ui/playlistselector.h b/src/ui/playlistselector.h new file mode 100644 index 000000000..159a09996 --- /dev/null +++ b/src/ui/playlistselector.h @@ -0,0 +1,62 @@ +/*************************************************************************** + * Copyright (C) 2009 by Ilya Kotov * + * forkotov02@hotmail.ru * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#ifndef PLAYLISTSELECTOR_H +#define PLAYLISTSELECTOR_H + +#include +#include + +class QFontMetrics; +class QFont; +class QMouseEvent; +class PlayListManager; +class Skin; + +/** + @author Ilya Kotov +*/ +class PlayListSelector : public QWidget +{ +Q_OBJECT +public: + PlayListSelector(PlayListManager *manager, QWidget *parent = 0); + ~PlayListSelector(); + void readSettings(); + +private slots: + void updateTabs(); + void updateSkin(); + +private: + void paintEvent(QPaintEvent *); + void mousePressEvent ( QMouseEvent *e); + void updateOffsets(); + void loadColors(); + PlayListManager *m_pl_manager; + QFontMetrics *m_metrics; + QFont m_font; + bool m_update; + QList m_rects; + Skin *m_skin; + QColor m_normal, m_current, m_normal_bg, m_selected_bg; +}; + +#endif // PLAYLISTSELECTOR_H diff --git a/src/ui/translations/qmmp_cs.ts b/src/ui/translations/qmmp_cs.ts index 46be78fd6..30d7022a1 100644 --- a/src/ui/translations/qmmp_cs.ts +++ b/src/ui/translations/qmmp_cs.ts @@ -1020,239 +1020,239 @@ PlayList - + &Add File Přidat &soubor - + F F - + &Add Directory Přidat &adresář - + D D - + &Remove Selected &Odstranit vybrané - + Del Del - + &Remove All Odstranit &vše - + &Remove Unselected Odstranit &nevybrané - + Remove unavailable files Odstranit nedostupné soubory - + &View Track Details Zobrazit &informace o skladbě - + Alt+I Alt+I - + Sort List Seřadit seznam - - + + By Title Podle názvu skladby - - + + By Album - - + + By Artist - - + + By Filename Podle názvu souboru - - + + By Path + Filename Podle cesty a názvu souboru - - + + By Date Podle data - + Sort Selection Seřadit výběr - + Randomize List Zamíchat seznam - + Reverse List Obrátit pořadí seznamu - + Invert Selection Invertovat výběr - + &Select None &Zrušit výběr - + Shift+A - + &Select All &Vybrat vše - + Ctrl+A Ctrl+A - + &New List &Nový seznam - + Ctrl+T - + Ctrl+W - + &Select Next Playlist - + Ctrl+PgDown - + &Select Previous Playlist - + Ctrl+PgUp - + &Show Playlists - + P - + &Delete List - + &Load List Načíst &seznam - + O O - + &Save List &Uložit seznam - + Shift+S Shift+S - + &Add Url Přidat &URL - + U U - - + + By Track Number Podle čísla skladby - + &Queue &Fronta - + Q Q - + Actions Činnosti diff --git a/src/ui/translations/qmmp_de.ts b/src/ui/translations/qmmp_de.ts index 9da4d0a2f..d25efe14e 100644 --- a/src/ui/translations/qmmp_de.ts +++ b/src/ui/translations/qmmp_de.ts @@ -1020,239 +1020,239 @@ PlayList - + &Add File &Datei hinzufügen - + F F - + &Add Directory &Verzeichnis hinzufügen - + D D - + &Remove Selected &Ausgewählte entfernen - + Del Entf - + &Remove All Alle &entfernen - + &Remove Unselected &Nicht ausgewählte entfernen - + Remove unavailable files Nichtverfügbare Dateien entfernen - + &View Track Details &Titeldetails anzeigen - + Alt+I Alt+I - + Sort List Wiedergabeliste sortieren - - + + By Title Nach Titel - - + + By Album - - + + By Artist - - + + By Filename Nach Dateinamen - - + + By Path + Filename Nach Pfad + Dateinamen - - + + By Date Nach Datum - + Sort Selection Auswahl sortieren - + Randomize List Wiedergabeliste mischen - + Reverse List Wiedergabeliste umkehren - + Invert Selection Auswahl umkehren - + &Select None &Auswahl aufheben - + Shift+A - + &Select All Alle aus&wählen - + Ctrl+A Strg+A - + &New List &Neue Wiedergabeliste - + Ctrl+T - + Ctrl+W - + &Select Next Playlist - + Ctrl+PgDown - + &Select Previous Playlist - + Ctrl+PgUp - + &Show Playlists - + P - + &Delete List - + &Load List Wiedergabeliste &laden - + O O - + &Save List Wiedergabeliste &speichern - + Shift+S Umschalt+S - + &Add Url &URL hinzufügen - + U U - - + + By Track Number Nach Titelnummer - + &Queue &Warteschlange - + Q Q - + Actions Aktionen diff --git a/src/ui/translations/qmmp_it.ts b/src/ui/translations/qmmp_it.ts index f79360629..fa0fcda1f 100644 --- a/src/ui/translations/qmmp_it.ts +++ b/src/ui/translations/qmmp_it.ts @@ -1020,239 +1020,239 @@ PlayList - + F F - + D D - + Alt+I Alt+I - + Ctrl+A Ctrl+A - + Ctrl+T - + Ctrl+W - + O O - + &Add File &Aggiungi brani - + &Add Directory &Aggiungi cartelle - + &Remove Selected &Elimina la selezione - + &Remove All &Elimina tutto - + &Remove Unselected &Elimina i non selezionati - + Remove unavailable files Rimuovi files non disponibili - + &View Track Details &Dettagli della traccia - + Sort List Riordina la lista - - + + By Title Per titolo - - + + By Album - - + + By Artist - - + + By Filename Per titolo del brano - - + + By Path + Filename per percorso più titolo del brano - - + + By Date Per data - + Sort Selection Riordina la selezione - + Randomize List Mescola i brnai della lista - + Reverse List Inverti la lista - + Invert Selection Inverti la selezione - + &Select None &Non scegliere alcun brano - + Shift+A - + &Select All &Seleziona tutto - + &New List &Nuova lista - + &Select Next Playlist - + Ctrl+PgDown - + &Select Previous Playlist - + Ctrl+PgUp - + &Show Playlists - + P - + &Delete List - + &Load List &Carica lista - + &Save List &Salva lista - + Shift+S Shift+S - + Del Canc - + &Add Url &Aggiungi URL - + U U - - + + By Track Number Per numero di traccia - + &Queue &Metti in coda - + Q Q - + Actions Azioni diff --git a/src/ui/translations/qmmp_lt.ts b/src/ui/translations/qmmp_lt.ts index 324c1f656..69d04991f 100644 --- a/src/ui/translations/qmmp_lt.ts +++ b/src/ui/translations/qmmp_lt.ts @@ -1020,239 +1020,239 @@ PlayList - + F - + D - + Alt+I - + Ctrl+A - + Ctrl+T - + Ctrl+W - + O - + &Add File &Pridėti bylą - + &Add Directory &Pridėti aplanką - + &Remove Selected &Pašalinti pasirinktus - + &Remove All &Pašalinti visus - + &Remove Unselected &Pašalinti NEpasirinktus - + Remove unavailable files - + &View Track Details &Takelio informacija - + Sort List Rūšiuoti - - + + By Title Pagal dainos pavadinimą - - + + By Album - - + + By Artist - - + + By Filename Pagal bylos pavadinimą - - + + By Path + Filename Pagal kelią iki bylos - - + + By Date Pagal datą - + Sort Selection Rūšiuoti pasirinktus - + Randomize List Sumaišyti sąrašą - + Reverse List Apversti - + Invert Selection Atšaukti pasirinkimą - + &Select None &Nepasirinkti nei vieno - + Shift+A - + &Select All &Pasirinkti visus - + &New List &Naujas sąrašas - + &Select Next Playlist - + Ctrl+PgDown - + &Select Previous Playlist - + Ctrl+PgUp - + &Show Playlists - + P - + &Delete List - + &Load List &Įkelti sąrašą - + &Save List &Išsaugoti sąrašą - + Shift+S - + Del - + &Add Url &Pridėti interneto adresą - + U - - + + By Track Number Pagal takelio numerį - + &Queue &Į eilę - + Q - + Actions Veiksmai diff --git a/src/ui/translations/qmmp_pl_PL.ts b/src/ui/translations/qmmp_pl_PL.ts index f2b45c237..4d4454227 100644 --- a/src/ui/translations/qmmp_pl_PL.ts +++ b/src/ui/translations/qmmp_pl_PL.ts @@ -1020,239 +1020,239 @@ PlayList - + F F - + D D - + Alt+I Alt+I - + Ctrl+A Ctrl+A - + Ctrl+T - + Ctrl+W - + O O - + &Add File &Dodaj plik - + &Add Directory Dodaj &katalog - + &Remove Selected &Usuń zaznaczone - + &Remove All Usuń &wszystkie - + &Remove Unselected Usuń &niezaznaczone - + Remove unavailable files Usuń niedostępne pliki - + &View Track Details &Pokaż informacje o pliku - + Sort List Sortuj listę - - + + By Title Według nazwy - - + + By Album - - + + By Artist - - + + By Filename Według nazwy pliku - - + + By Path + Filename Według Ścieżki + Nazwy pliku - - + + By Date Wg Daty - + Sort Selection Sortuj zaznaczone - + Randomize List Tasuj listę - + Reverse List Odwróć listę - + Invert Selection Odwróć zaznaczenie - + &Select None &Odznacz wszystkie - + Shift+A - + &Select All &Zaznacz wszystkie - + &New List &Nowa lista - + &Select Next Playlist - + Ctrl+PgDown - + &Select Previous Playlist - + Ctrl+PgUp - + &Show Playlists - + P - + &Delete List - + &Load List &Ładuj listę - + &Save List &Zapisz listę - + Shift+S Shift+S - + Del Del - + &Add Url Dod&aj Url - + U U - - + + By Track Number Wg numeru utworu - + &Queue &Kolejkuj - + Q Q - + Actions Akcje diff --git a/src/ui/translations/qmmp_pt_BR.ts b/src/ui/translations/qmmp_pt_BR.ts index abf862f4f..93d1158fd 100644 --- a/src/ui/translations/qmmp_pt_BR.ts +++ b/src/ui/translations/qmmp_pt_BR.ts @@ -1020,239 +1020,239 @@ PlayList - + F - + D - + Alt+I - + Ctrl+A - + Ctrl+T - + Ctrl+W - + O - + &Add File &Adicionar arquivo - + &Add Directory &Adicionar Diretorio - + &Remove Selected &Remover selecionadas - + &Remove All &Remover tudo - + &Remove Unselected &Remover não selecionadas - + Remove unavailable files - + &View Track Details &Ver detalhes da Faixa - + Sort List Classificar lista - - + + By Title Por Título - - + + By Album - - + + By Artist - - + + By Filename Por Nome - - + + By Path + Filename Por Dirertório + Nome - - + + By Date Por Data - + Sort Selection Classificar por Seleção - + Randomize List Lista Eleatória - + Reverse List Lista Revertida - + Invert Selection Inverter Seleção - + &Select None &Nenhum selecionado - + Shift+A - + &Select All &Selecionar tudo - + &New List &Nova lista - + &Select Next Playlist - + Ctrl+PgDown - + &Select Previous Playlist - + Ctrl+PgUp - + &Show Playlists - + P - + &Delete List - + &Load List &Carregar lista - + &Save List &Salvar lista - + Shift+S - + Del - + &Add Url - + U - - + + By Track Number - + &Queue Na fila - + Q - + Actions diff --git a/src/ui/translations/qmmp_ru.ts b/src/ui/translations/qmmp_ru.ts index 3582b6d5d..bae62ec9a 100644 --- a/src/ui/translations/qmmp_ru.ts +++ b/src/ui/translations/qmmp_ru.ts @@ -1020,239 +1020,239 @@ PlayList - + F - + D - + Alt+I - + Ctrl+A - + Ctrl+T - + Ctrl+W - + O - + &Add File &Добавить файл - + &Add Directory &Добавить директорию - + &Remove Selected &Удалить выделенное - + &Remove All &Удалить всё - + &Remove Unselected &Удалить невыделенное - + Remove unavailable files Удалить недоступные файлы - + &View Track Details &Информация - + Sort List Сортировать - - + + By Title По названию - - + + By Album По альбому - - + + By Artist По исполнителю - - + + By Filename По имени файла - - + + By Path + Filename По пути и файлу - - + + By Date По дате - + Sort Selection Сортировать выделенное - + Randomize List Перемешать - + Reverse List Перевернуть - + Invert Selection Инвертировать выделение - + &Select None &Снять выделение - + Shift+A - + &Select All &Выделить всё - + &New List &Новый список - + &Select Next Playlist &Выбрать следующий список - + Ctrl+PgDown - + &Select Previous Playlist &Выбрать предыдущий список - + Ctrl+PgUp - + &Show Playlists &Показать списки - + P - + &Delete List &Удалить список - + &Load List &Загрузить лист - + &Save List &Сохранить лист - + Shift+S - + Del - + &Add Url &Добавить URL - + U - - + + By Track Number По номеру трека - + &Queue &В очередь - + Q - + Actions Действия diff --git a/src/ui/translations/qmmp_tr.ts b/src/ui/translations/qmmp_tr.ts index 774e63ab3..df89b50e9 100644 --- a/src/ui/translations/qmmp_tr.ts +++ b/src/ui/translations/qmmp_tr.ts @@ -1020,239 +1020,239 @@ PlayList - + F F - + D D - + Alt+I Alt+I - + Ctrl+A Ctrl+A - + Ctrl+T - + Ctrl+W - + O O - + &Add File &Dosya Ekle - + &Add Directory &Dizin Ekle - + &Remove Selected &Seçileni Kaldır - + &Remove All &Hepsini Kaldır - + &Remove Unselected &Seçilmemişleri Kaldır - + Remove unavailable files - + &View Track Details &Parça Detaylarını Göster - + Sort List Listeyi Sınıflandır - - + + By Title Başlığa Göre - - + + By Album - - + + By Artist - - + + By Filename Dosya Adına Göre - - + + By Path + Filename Dosya Yolu + Dosya Adına Göre - - + + By Date Tarihe Göre - + Sort Selection Seçilenleri Sınıflandır - + Randomize List Rastgele Listele - + Reverse List Listeyi Ters Çevir - + Invert Selection Seçimi Tersine Çevir - + &Select None &Hiçbirini Seçme - + Shift+A - + &Select All &Tümünü Seç - + &New List &Yeni Liste - + &Select Next Playlist - + Ctrl+PgDown - + &Select Previous Playlist - + Ctrl+PgUp - + &Show Playlists - + P - + &Delete List - + &Load List &Liste Yükle - + &Save List &Listeyi Kaydet - + Shift+S Shift+S - + Del Del - + &Add Url &Url Ekle - + U U - - + + By Track Number Parça Numarasına Göre - + &Queue &Kuyruğa ekle - + Q Q - + Actions Eylemler diff --git a/src/ui/translations/qmmp_uk_UA.ts b/src/ui/translations/qmmp_uk_UA.ts index e777c89df..e7d92f2de 100644 --- a/src/ui/translations/qmmp_uk_UA.ts +++ b/src/ui/translations/qmmp_uk_UA.ts @@ -1020,239 +1020,239 @@ PlayList - + F - + D - + Alt+I - + Ctrl+A - + Ctrl+T - + Ctrl+W - + O - + &Add File &Додати файл - + &Add Directory &Додати теку - + &Remove Selected &Видалити вибране - + &Remove All &Видалити все - + &Remove Unselected &Видалити не вибране - + Remove unavailable files Видалити недоступні файли - + &View Track Details &Інформація - + Sort List Сортувати - - + + By Title За назвою - - + + By Album За альбомом - - + + By Artist За артистом - - + + By Filename За ім'ям файлу - - + + By Path + Filename За шляхом та файлом - - + + By Date За датою - + Sort Selection Сортувати вибране - + Randomize List Перемішати - + Reverse List Перевернути - + Invert Selection Інвертувати вибране - + &Select None &Зняти виділення - + Shift+A - + &Select All &Вибрати все - + &New List &Новий список - + &Select Next Playlist Вибрати &наступний список - + Ctrl+PgDown - + &Select Previous Playlist Вибрати &попередній список - + Ctrl+PgUp - + &Show Playlists Показати &всі списки - + P - + &Delete List - + &Load List &Завантажити список - + &Save List &Зберегти список - + Shift+S - + Del - + &Add Url &Додати адресу - + U - - + + By Track Number - + &Queue &В чергу - + Q - + Actions Дії diff --git a/src/ui/translations/qmmp_zh_CN.ts b/src/ui/translations/qmmp_zh_CN.ts index 3b2b3a3e8..963be8c38 100644 --- a/src/ui/translations/qmmp_zh_CN.ts +++ b/src/ui/translations/qmmp_zh_CN.ts @@ -1020,239 +1020,239 @@ PlayList - + F F - + D D - + Alt+I Alt+I - + Ctrl+A Ctrl+A - + Ctrl+T - + Ctrl+W - + O O - + &Add File 添加文件(&A) - + &Add Directory 添加文件夹(&A) - + &Remove Selected 删除所选(&R) - + &Remove All 删除全部(&R) - + &Remove Unselected 删除未选(&R) - + Remove unavailable files - + &View Track Details 查看音轨详细信息(&V) - + Sort List 列表排序 - - + + By Title 按标题 - - + + By Album - - + + By Artist - - + + By Filename 按文件名 - - + + By Path + Filename 按路径+文件名 - - + + By Date 按日期 - + Sort Selection 选择排序 - + Randomize List 随机产生列表 - + Reverse List 逆序列表 - + Invert Selection 反选 - + &Select None 无选择(&S) - + Shift+A - + &Select All 选择全部(&S) - + &New List 新建列表(&N) - + &Select Next Playlist - + Ctrl+PgDown - + &Select Previous Playlist - + Ctrl+PgUp - + &Show Playlists - + P - + &Delete List - + &Load List 载入列表(&L) - + &Save List 保存列表(&S) - + Shift+S Shift+S - + Del Del - + &Add Url 添加 URL (&A) - + U U - - + + By Track Number 按音轨 - + &Queue 队列(&Q) - + Q Q - + Actions 动作 diff --git a/src/ui/translations/qmmp_zh_TW.ts b/src/ui/translations/qmmp_zh_TW.ts index 97fe6fbf2..b635382df 100644 --- a/src/ui/translations/qmmp_zh_TW.ts +++ b/src/ui/translations/qmmp_zh_TW.ts @@ -1020,239 +1020,239 @@ PlayList - + F F - + D D - + Alt+I Alt+I - + Ctrl+A Ctrl+A - + Ctrl+T - + Ctrl+W - + O O - + &Add File 添加檔案(&A) - + &Add Directory 添加檔案夾(&A) - + &Remove Selected 移除所選(&R) - + &Remove All 移除全部(&R) - + &Remove Unselected 移除未選(&R) - + Remove unavailable files - + &View Track Details 檢視音軌詳細資訊(&V) - + Sort List 清單排序 - - + + By Title 按標題 - - + + By Album - - + + By Artist - - + + By Filename 按檔名 - - + + By Path + Filename 按路徑+檔名 - - + + By Date 按日期 - + Sort Selection 選取排序 - + Randomize List 隨機產生清單 - + Reverse List 逆串列表 - + Invert Selection 反選 - + &Select None 無選取(&S) - + Shift+A - + &Select All 選取全部(&S) - + &New List 新建清單(&N) - + &Select Next Playlist - + Ctrl+PgDown - + &Select Previous Playlist - + Ctrl+PgUp - + &Show Playlists - + P - + &Delete List - + &Load List 載入清單(&L) - + &Save List 儲存清單(&S) - + Shift+S Shift+S - + Del Del - + &Add Url 添加 URL (&A) - + U U - - + + By Track Number 按音軌 - + &Queue 佇列(&Q) - + Q Q - + Actions 動作 diff --git a/src/ui/ui.pro b/src/ui/ui.pro index 68644a7db..d4ab1eb7b 100644 --- a/src/ui/ui.pro +++ b/src/ui/ui.pro @@ -55,7 +55,8 @@ HEADERS += mainwindow.h \ shadedbar.h \ builtincommandlineoption.h \ cursorimage.h \ - playlistbrowser.h + playlistbrowser.h \ + playlistselector.h SOURCES += mainwindow.cpp \ mp3player.cpp \ button.cpp \ @@ -102,7 +103,8 @@ SOURCES += mainwindow.cpp \ shadedbar.cpp \ builtincommandlineoption.cpp \ cursorimage.cpp \ - playlistbrowser.cpp + playlistbrowser.cpp \ + playlistselector.cpp win32:HEADERS += ../qmmp/visual.h unix { HEADERS += unixdomainsocket.h -- cgit v1.2.3-13-gbd6f