diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-09-16 12:45:41 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-09-16 12:45:41 +0000 |
| commit | 935e31e01dcd5d680d6dda4b3fd9136649436f39 (patch) | |
| tree | 72770616f1a8eac62f10604621a79ae6522411f8 | |
| parent | 1a24a61265d498ab3948c79c99efdc53f576dc61 (diff) | |
| download | qmmp-935e31e01dcd5d680d6dda4b3fd9136649436f39.tar.gz qmmp-935e31e01dcd5d680d6dda4b3fd9136649436f39.tar.bz2 qmmp-935e31e01dcd5d680d6dda4b3fd9136649436f39.zip | |
enabled support for streams
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1226 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/qmmp/downloader.cpp | 2 | ||||
| -rw-r--r-- | src/qmmp/soundcore.cpp | 19 | ||||
| -rw-r--r-- | src/qmmp/soundcore.h | 3 | ||||
| -rw-r--r-- | src/qmmpui/abstractplaylistitem.cpp | 5 | ||||
| -rw-r--r-- | src/qmmpui/abstractplaylistitem.h | 4 | ||||
| -rw-r--r-- | src/qmmpui/detailsdialog.cpp | 29 | ||||
| -rw-r--r-- | src/qmmpui/detailsdialog.h | 1 | ||||
| -rw-r--r-- | src/qmmpui/playlistmodel.cpp | 23 | ||||
| -rw-r--r-- | src/qmmpui/translations/libqmmpui_cs.ts | 61 | ||||
| -rw-r--r-- | src/qmmpui/translations/libqmmpui_de.ts | 61 | ||||
| -rw-r--r-- | src/qmmpui/translations/libqmmpui_it.ts | 61 | ||||
| -rw-r--r-- | src/qmmpui/translations/libqmmpui_lt.ts | 61 | ||||
| -rw-r--r-- | src/qmmpui/translations/libqmmpui_pl.ts | 61 | ||||
| -rw-r--r-- | src/qmmpui/translations/libqmmpui_pt_BR.ts | 61 | ||||
| -rw-r--r-- | src/qmmpui/translations/libqmmpui_ru.ts | 61 | ||||
| -rw-r--r-- | src/qmmpui/translations/libqmmpui_tr.ts | 61 | ||||
| -rw-r--r-- | src/qmmpui/translations/libqmmpui_uk_UA.ts | 67 | ||||
| -rw-r--r-- | src/qmmpui/translations/libqmmpui_zh_CN.ts | 61 | ||||
| -rw-r--r-- | src/qmmpui/translations/libqmmpui_zh_TW.ts | 61 |
19 files changed, 140 insertions, 623 deletions
diff --git a/src/qmmp/downloader.cpp b/src/qmmp/downloader.cpp index b9170972c..183a7fd8d 100644 --- a/src/qmmp/downloader.cpp +++ b/src/qmmp/downloader.cpp @@ -339,7 +339,7 @@ void Downloader::readICYMetaData() } void Downloader::parseICYMetaData(char *data) -{ +{ QString str(data); QStringList list(str.split(";", QString::SkipEmptyParts)); foreach(QString line, list) diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp index aba3a4c2c..0b51adb15 100644 --- a/src/qmmp/soundcore.cpp +++ b/src/qmmp/soundcore.cpp @@ -42,8 +42,6 @@ SoundCore::SoundCore(QObject *parent) { m_instance = this; m_decoder = 0; - m_output = 0; - m_input = 0; m_paused = FALSE; m_useEQ = FALSE; m_update = FALSE; @@ -51,7 +49,6 @@ SoundCore::SoundCore(QObject *parent) m_preamp = 0; m_vis = 0; m_parentWidget = 0; - m_factory = 0; m_engine = 0; for (int i = 1; i < 10; ++i) m_bands[i] = 0; @@ -88,21 +85,24 @@ bool SoundCore::play(const QString &source, bool queue) else return decode(); - if(qobject_cast<StreamReader *>(m_inputSource->ioDevice())) - qobject_cast<StreamReader *>(m_inputSource->ioDevice())->downloadFile(); + StreamReader *reader = qobject_cast<StreamReader *>(m_inputSource->ioDevice()); + if(reader) + { + connect(reader, SIGNAL(bufferingProgress(int)), SIGNAL(bufferingProgress(int))); + reader->downloadFile(); + m_handler->dispatch(Qmmp::Buffering); + return TRUE; + } else m_inputSource->ioDevice()->open(QIODevice::ReadOnly); return decode(); - //return TRUE; } void SoundCore::stop() { - m_factory = 0; m_source.clear(); if(m_engine) m_engine->stop(); - m_input = 0; //update VolumeControl delete m_volumeControl; m_volumeControl = VolumeControl::create(this); @@ -228,6 +228,8 @@ QString SoundCore::metaData(Qmmp::MetaData key) bool SoundCore::decode() { qDebug("ready"); + if(!m_inputSource->ioDevice()->isOpen()) + m_inputSource->ioDevice()->open(QIODevice::ReadOnly); disconnect(m_inputSource->ioDevice(), SIGNAL(readyRead()), this, SLOT(decode())); if(!m_engine) @@ -250,7 +252,6 @@ bool SoundCore::decode() return FALSE; } - qDebug ("ok"); return TRUE; diff --git a/src/qmmp/soundcore.h b/src/qmmp/soundcore.h index f35d96656..aec2ad947 100644 --- a/src/qmmp/soundcore.h +++ b/src/qmmp/soundcore.h @@ -208,10 +208,7 @@ private slots: private: Decoder* m_decoder; - DecoderFactory* m_factory; QString m_source; - Output* m_output; - QIODevice* m_input; uint m_error; bool m_paused; bool m_useEQ; diff --git a/src/qmmpui/abstractplaylistitem.cpp b/src/qmmpui/abstractplaylistitem.cpp index 4c8a0f561..bbae56bd3 100644 --- a/src/qmmpui/abstractplaylistitem.cpp +++ b/src/qmmpui/abstractplaylistitem.cpp @@ -109,3 +109,8 @@ void AbstractPlaylistItem::setLength(qint64 length) { m_length = length; } + +const QMap <Qmmp::MetaData, QString> AbstractPlaylistItem::metaData() +{ + return m_metaData; +} diff --git a/src/qmmpui/abstractplaylistitem.h b/src/qmmpui/abstractplaylistitem.h index 149291ace..ce4decd35 100644 --- a/src/qmmpui/abstractplaylistitem.h +++ b/src/qmmpui/abstractplaylistitem.h @@ -105,6 +105,10 @@ public: * Sets length in seconds. */ virtual void setLength(qint64 length); + /*! + * + */ + const QMap <Qmmp::MetaData, QString> metaData(); private: QMap <Qmmp::MetaData, QString> m_metaData; diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp index 11d4a49a6..e8f8d8d90 100644 --- a/src/qmmpui/detailsdialog.cpp +++ b/src/qmmpui/detailsdialog.cpp @@ -37,24 +37,27 @@ DetailsDialog::DetailsDialog(AbstractPlaylistItem *item, QWidget *parent) setAttribute(Qt::WA_QuitOnClose, FALSE); setAttribute(Qt::WA_DeleteOnClose, FALSE); m_metaDataModel = 0; + m_item = item; ui.setupUi(this); setAttribute(Qt::WA_DeleteOnClose); m_path = item->url(); setWindowTitle (m_path.section('/',-1)); ui.pathEdit->setText(m_path); - DecoderFactory *fact = Decoder::findByPath(item->url()); - if(fact) - m_metaDataModel = fact->createMetaDataModel(item->url(), this); - else - return; - - printInfo(); - - foreach(TagModel *tagModel, m_metaDataModel->tags()) + if(QFile::exists(item->url())) { - ui.tabWidget->addTab(new TagEditor(tagModel, this), tagModel->name()); + DecoderFactory *fact = Decoder::findByPath(item->url()); + if(fact) + m_metaDataModel = fact->createMetaDataModel(item->url(), this); + else + return; + + foreach(TagModel *tagModel, m_metaDataModel->tags()) + { + ui.tabWidget->addTab(new TagEditor(tagModel, this), tagModel->name()); + } } + printInfo(); } DetailsDialog::~DetailsDialog() @@ -64,10 +67,10 @@ void DetailsDialog::printInfo() { QList <FileInfo *> flist = Decoder::createPlayList(m_path, TRUE); QMap <Qmmp::MetaData, QString> metaData; - if(!flist.isEmpty()) + if(!flist.isEmpty() && QFile::exists(m_item->url())) metaData = flist.at(0)->metaData(); - /*else - TODO use metadata from playlist item*/ + else + metaData = m_item->metaData(); QString formattedText; formattedText.append("<TABLE>"); //tags diff --git a/src/qmmpui/detailsdialog.h b/src/qmmpui/detailsdialog.h index ce3dd7bff..26f70533f 100644 --- a/src/qmmpui/detailsdialog.h +++ b/src/qmmpui/detailsdialog.h @@ -52,6 +52,7 @@ private: QString m_path; QString formatRow(const QString key, const QString value); MetaDataModel *m_metaDataModel; + AbstractPlaylistItem *m_item; }; diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp index 893850e51..3428c0390 100644 --- a/src/qmmpui/playlistmodel.cpp +++ b/src/qmmpui/playlistmodel.cpp @@ -358,29 +358,6 @@ void PlayListModel::showDetails() { if (m_items.at(i)->isSelected()) { - if (!QFile::exists(m_items.at(i)->url())) - { - PlayListItem *item = m_items.at(i); - QString str; - str.append(tr("URL:") + " %1\n"); - str.append(tr("Title:") + " %2\n"); - str.append(tr("Artist:") + " %3\n"); - str.append(tr("Album:") + " %4\n"); - str.append(tr("Genre:") + " %5\n"); - str.append(tr("Comment:") + " %6\n"); - str.append(tr("Composer:") + " %7\n"); - str.append(tr("Disc number:") + " %8"); - str = str.arg(item->url()) - .arg(item->title().isEmpty() ? item->text() : item->title()) - .arg(item->artist()) - .arg(item->album()) - .arg(item->genre()) - .arg(item->comment()) - .arg(item->composer()) - .arg(item->discNumber()); - QMessageBox::information(0, m_items.at(i)->url(), str); - return; - } QDialog *d = new DetailsDialog(m_items.at(i)); //TODO set parent widget TagUpdater *updater = new TagUpdater(d, m_items.at(i)); m_editing_items.append(m_items.at(i)); diff --git a/src/qmmpui/translations/libqmmpui_cs.ts b/src/qmmpui/translations/libqmmpui_cs.ts index aa5ceb7b2..359b63e9c 100644 --- a/src/qmmpui/translations/libqmmpui_cs.ts +++ b/src/qmmpui/translations/libqmmpui_cs.ts @@ -4,47 +4,47 @@ <context> <name>DetailsDialog</name> <message> - <location filename="../detailsdialog.cpp" line="74"/> + <location filename="../detailsdialog.cpp" line="77"/> <source>Title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="75"/> + <location filename="../detailsdialog.cpp" line="78"/> <source>Artist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="76"/> + <location filename="../detailsdialog.cpp" line="79"/> <source>Album</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="77"/> + <location filename="../detailsdialog.cpp" line="80"/> <source>Comment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="78"/> + <location filename="../detailsdialog.cpp" line="81"/> <source>Genre</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="79"/> + <location filename="../detailsdialog.cpp" line="82"/> <source>Composer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="81"/> + <location filename="../detailsdialog.cpp" line="84"/> <source>Year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="83"/> + <location filename="../detailsdialog.cpp" line="86"/> <source>Track</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="85"/> + <location filename="../detailsdialog.cpp" line="88"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> @@ -69,49 +69,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>PlayListModel</name> - <message> - <location filename="../playlistmodel.cpp" line="366"/> - <source>Title:</source> - <translation>Název:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="367"/> - <source>Artist:</source> - <translation>Umělec:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="368"/> - <source>Album:</source> - <translation></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="369"/> - <source>Genre:</source> - <translation>Žánr:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="370"/> - <source>Comment:</source> - <translation>Poznámka:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="371"/> - <source>Composer:</source> - <translation>Skladatel:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="372"/> - <source>Disc number:</source> - <translation>Číslo disku:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="365"/> - <source>URL:</source> - <translation>URL:</translation> - </message> -</context> -<context> <name>QtFileDialogFactory</name> <message> <location filename="../qtfiledialog.cpp" line="33"/> diff --git a/src/qmmpui/translations/libqmmpui_de.ts b/src/qmmpui/translations/libqmmpui_de.ts index 15a7df4e7..4cf2dd8bb 100644 --- a/src/qmmpui/translations/libqmmpui_de.ts +++ b/src/qmmpui/translations/libqmmpui_de.ts @@ -4,47 +4,47 @@ <context> <name>DetailsDialog</name> <message> - <location filename="../detailsdialog.cpp" line="74"/> + <location filename="../detailsdialog.cpp" line="77"/> <source>Title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="75"/> + <location filename="../detailsdialog.cpp" line="78"/> <source>Artist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="76"/> + <location filename="../detailsdialog.cpp" line="79"/> <source>Album</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="77"/> + <location filename="../detailsdialog.cpp" line="80"/> <source>Comment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="78"/> + <location filename="../detailsdialog.cpp" line="81"/> <source>Genre</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="79"/> + <location filename="../detailsdialog.cpp" line="82"/> <source>Composer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="81"/> + <location filename="../detailsdialog.cpp" line="84"/> <source>Year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="83"/> + <location filename="../detailsdialog.cpp" line="86"/> <source>Track</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="85"/> + <location filename="../detailsdialog.cpp" line="88"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> @@ -69,49 +69,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>PlayListModel</name> - <message> - <location filename="../playlistmodel.cpp" line="366"/> - <source>Title:</source> - <translation>Titel:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="367"/> - <source>Artist:</source> - <translation>Interpret:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="368"/> - <source>Album:</source> - <translation>Album:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="369"/> - <source>Genre:</source> - <translation>Genre:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="370"/> - <source>Comment:</source> - <translation>Kommentar:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="371"/> - <source>Composer:</source> - <translation>Komponist:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="372"/> - <source>Disc number:</source> - <translation>CD-Nummer:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="365"/> - <source>URL:</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>QtFileDialogFactory</name> <message> <location filename="../qtfiledialog.cpp" line="33"/> diff --git a/src/qmmpui/translations/libqmmpui_it.ts b/src/qmmpui/translations/libqmmpui_it.ts index 9064555cd..a3a0c7a25 100644 --- a/src/qmmpui/translations/libqmmpui_it.ts +++ b/src/qmmpui/translations/libqmmpui_it.ts @@ -4,47 +4,47 @@ <context> <name>DetailsDialog</name> <message> - <location filename="../detailsdialog.cpp" line="74"/> + <location filename="../detailsdialog.cpp" line="77"/> <source>Title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="75"/> + <location filename="../detailsdialog.cpp" line="78"/> <source>Artist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="76"/> + <location filename="../detailsdialog.cpp" line="79"/> <source>Album</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="77"/> + <location filename="../detailsdialog.cpp" line="80"/> <source>Comment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="78"/> + <location filename="../detailsdialog.cpp" line="81"/> <source>Genre</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="79"/> + <location filename="../detailsdialog.cpp" line="82"/> <source>Composer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="81"/> + <location filename="../detailsdialog.cpp" line="84"/> <source>Year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="83"/> + <location filename="../detailsdialog.cpp" line="86"/> <source>Track</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="85"/> + <location filename="../detailsdialog.cpp" line="88"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> @@ -69,49 +69,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>PlayListModel</name> - <message> - <location filename="../playlistmodel.cpp" line="366"/> - <source>Title:</source> - <translation>Titolo:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="367"/> - <source>Artist:</source> - <translation>Interprete:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="368"/> - <source>Album:</source> - <translation>Album:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="369"/> - <source>Genre:</source> - <translation>Genere:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="370"/> - <source>Comment:</source> - <translation>Commento:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="371"/> - <source>Composer:</source> - <translation>Compositore</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="372"/> - <source>Disc number:</source> - <translation>Disco numero: </translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="365"/> - <source>URL:</source> - <translation>URL:</translation> - </message> -</context> -<context> <name>QtFileDialogFactory</name> <message> <location filename="../qtfiledialog.cpp" line="33"/> diff --git a/src/qmmpui/translations/libqmmpui_lt.ts b/src/qmmpui/translations/libqmmpui_lt.ts index 6ae2eadfb..756c3176d 100644 --- a/src/qmmpui/translations/libqmmpui_lt.ts +++ b/src/qmmpui/translations/libqmmpui_lt.ts @@ -4,47 +4,47 @@ <context> <name>DetailsDialog</name> <message> - <location filename="../detailsdialog.cpp" line="74"/> + <location filename="../detailsdialog.cpp" line="77"/> <source>Title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="75"/> + <location filename="../detailsdialog.cpp" line="78"/> <source>Artist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="76"/> + <location filename="../detailsdialog.cpp" line="79"/> <source>Album</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="77"/> + <location filename="../detailsdialog.cpp" line="80"/> <source>Comment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="78"/> + <location filename="../detailsdialog.cpp" line="81"/> <source>Genre</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="79"/> + <location filename="../detailsdialog.cpp" line="82"/> <source>Composer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="81"/> + <location filename="../detailsdialog.cpp" line="84"/> <source>Year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="83"/> + <location filename="../detailsdialog.cpp" line="86"/> <source>Track</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="85"/> + <location filename="../detailsdialog.cpp" line="88"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> @@ -69,49 +69,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>PlayListModel</name> - <message> - <location filename="../playlistmodel.cpp" line="366"/> - <source>Title:</source> - <translation>Pavadinimas:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="367"/> - <source>Artist:</source> - <translation>Atlikėjas:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="368"/> - <source>Album:</source> - <translation>Albumas:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="369"/> - <source>Genre:</source> - <translation>Žanras:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="370"/> - <source>Comment:</source> - <translation>Komantaras:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="371"/> - <source>Composer:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="372"/> - <source>Disc number:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="365"/> - <source>URL:</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>QtFileDialogFactory</name> <message> <location filename="../qtfiledialog.cpp" line="33"/> diff --git a/src/qmmpui/translations/libqmmpui_pl.ts b/src/qmmpui/translations/libqmmpui_pl.ts index 8c9336d8e..dc599ebab 100644 --- a/src/qmmpui/translations/libqmmpui_pl.ts +++ b/src/qmmpui/translations/libqmmpui_pl.ts @@ -4,47 +4,47 @@ <context> <name>DetailsDialog</name> <message> - <location filename="../detailsdialog.cpp" line="74"/> + <location filename="../detailsdialog.cpp" line="77"/> <source>Title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="75"/> + <location filename="../detailsdialog.cpp" line="78"/> <source>Artist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="76"/> + <location filename="../detailsdialog.cpp" line="79"/> <source>Album</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="77"/> + <location filename="../detailsdialog.cpp" line="80"/> <source>Comment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="78"/> + <location filename="../detailsdialog.cpp" line="81"/> <source>Genre</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="79"/> + <location filename="../detailsdialog.cpp" line="82"/> <source>Composer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="81"/> + <location filename="../detailsdialog.cpp" line="84"/> <source>Year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="83"/> + <location filename="../detailsdialog.cpp" line="86"/> <source>Track</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="85"/> + <location filename="../detailsdialog.cpp" line="88"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> @@ -69,49 +69,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>PlayListModel</name> - <message> - <location filename="../playlistmodel.cpp" line="366"/> - <source>Title:</source> - <translation>Tytuł:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="367"/> - <source>Artist:</source> - <translation>Artysta:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="368"/> - <source>Album:</source> - <translation>Album:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="369"/> - <source>Genre:</source> - <translation>Gatunek:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="370"/> - <source>Comment:</source> - <translation>Komentarz:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="371"/> - <source>Composer:</source> - <translation>Kompozytor:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="372"/> - <source>Disc number:</source> - <translation>Numer albumu:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="365"/> - <source>URL:</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>QtFileDialogFactory</name> <message> <location filename="../qtfiledialog.cpp" line="33"/> diff --git a/src/qmmpui/translations/libqmmpui_pt_BR.ts b/src/qmmpui/translations/libqmmpui_pt_BR.ts index e366d82c0..c450d8c08 100644 --- a/src/qmmpui/translations/libqmmpui_pt_BR.ts +++ b/src/qmmpui/translations/libqmmpui_pt_BR.ts @@ -4,47 +4,47 @@ <context> <name>DetailsDialog</name> <message> - <location filename="../detailsdialog.cpp" line="74"/> + <location filename="../detailsdialog.cpp" line="77"/> <source>Title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="75"/> + <location filename="../detailsdialog.cpp" line="78"/> <source>Artist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="76"/> + <location filename="../detailsdialog.cpp" line="79"/> <source>Album</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="77"/> + <location filename="../detailsdialog.cpp" line="80"/> <source>Comment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="78"/> + <location filename="../detailsdialog.cpp" line="81"/> <source>Genre</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="79"/> + <location filename="../detailsdialog.cpp" line="82"/> <source>Composer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="81"/> + <location filename="../detailsdialog.cpp" line="84"/> <source>Year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="83"/> + <location filename="../detailsdialog.cpp" line="86"/> <source>Track</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="85"/> + <location filename="../detailsdialog.cpp" line="88"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> @@ -69,49 +69,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>PlayListModel</name> - <message> - <location filename="../playlistmodel.cpp" line="366"/> - <source>Title:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="367"/> - <source>Artist:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="368"/> - <source>Album:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="369"/> - <source>Genre:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="370"/> - <source>Comment:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="371"/> - <source>Composer:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="372"/> - <source>Disc number:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="365"/> - <source>URL:</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>QtFileDialogFactory</name> <message> <location filename="../qtfiledialog.cpp" line="33"/> diff --git a/src/qmmpui/translations/libqmmpui_ru.ts b/src/qmmpui/translations/libqmmpui_ru.ts index c3040c409..9044feb48 100644 --- a/src/qmmpui/translations/libqmmpui_ru.ts +++ b/src/qmmpui/translations/libqmmpui_ru.ts @@ -4,47 +4,47 @@ <context> <name>DetailsDialog</name> <message> - <location filename="../detailsdialog.cpp" line="74"/> + <location filename="../detailsdialog.cpp" line="77"/> <source>Title</source> <translation>Название</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="75"/> + <location filename="../detailsdialog.cpp" line="78"/> <source>Artist</source> <translation>Исполнитель</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="76"/> + <location filename="../detailsdialog.cpp" line="79"/> <source>Album</source> <translation>Альбом</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="77"/> + <location filename="../detailsdialog.cpp" line="80"/> <source>Comment</source> <translation>Комментарий</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="78"/> + <location filename="../detailsdialog.cpp" line="81"/> <source>Genre</source> <translation>Жанр</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="79"/> + <location filename="../detailsdialog.cpp" line="82"/> <source>Composer</source> <translation>Композитр</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="81"/> + <location filename="../detailsdialog.cpp" line="84"/> <source>Year</source> <translation>Год</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="83"/> + <location filename="../detailsdialog.cpp" line="86"/> <source>Track</source> <translation>Дорожка</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="85"/> + <location filename="../detailsdialog.cpp" line="88"/> <source>Disc number</source> <translation>Номер диска</translation> </message> @@ -69,49 +69,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>PlayListModel</name> - <message> - <location filename="../playlistmodel.cpp" line="366"/> - <source>Title:</source> - <translation>Название:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="367"/> - <source>Artist:</source> - <translation>Исполнитель:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="368"/> - <source>Album:</source> - <translation>Альбом:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="369"/> - <source>Genre:</source> - <translation>Жанр:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="370"/> - <source>Comment:</source> - <translation>Комментарий:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="371"/> - <source>Composer:</source> - <translation>Композитор:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="372"/> - <source>Disc number:</source> - <translation>Номер диска:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="365"/> - <source>URL:</source> - <translation>URL:</translation> - </message> -</context> -<context> <name>QtFileDialogFactory</name> <message> <location filename="../qtfiledialog.cpp" line="33"/> diff --git a/src/qmmpui/translations/libqmmpui_tr.ts b/src/qmmpui/translations/libqmmpui_tr.ts index 0ed86a295..926df3b0e 100644 --- a/src/qmmpui/translations/libqmmpui_tr.ts +++ b/src/qmmpui/translations/libqmmpui_tr.ts @@ -4,47 +4,47 @@ <context> <name>DetailsDialog</name> <message> - <location filename="../detailsdialog.cpp" line="74"/> + <location filename="../detailsdialog.cpp" line="77"/> <source>Title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="75"/> + <location filename="../detailsdialog.cpp" line="78"/> <source>Artist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="76"/> + <location filename="../detailsdialog.cpp" line="79"/> <source>Album</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="77"/> + <location filename="../detailsdialog.cpp" line="80"/> <source>Comment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="78"/> + <location filename="../detailsdialog.cpp" line="81"/> <source>Genre</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="79"/> + <location filename="../detailsdialog.cpp" line="82"/> <source>Composer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="81"/> + <location filename="../detailsdialog.cpp" line="84"/> <source>Year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="83"/> + <location filename="../detailsdialog.cpp" line="86"/> <source>Track</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="85"/> + <location filename="../detailsdialog.cpp" line="88"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> @@ -69,49 +69,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>PlayListModel</name> - <message> - <location filename="../playlistmodel.cpp" line="366"/> - <source>Title:</source> - <translation>Başlık:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="367"/> - <source>Artist:</source> - <translation>Artist:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="368"/> - <source>Album:</source> - <translation>Albüm:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="369"/> - <source>Genre:</source> - <translation>Tür:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="370"/> - <source>Comment:</source> - <translation>Yorum:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="371"/> - <source>Composer:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="372"/> - <source>Disc number:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="365"/> - <source>URL:</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>QtFileDialogFactory</name> <message> <location filename="../qtfiledialog.cpp" line="33"/> diff --git a/src/qmmpui/translations/libqmmpui_uk_UA.ts b/src/qmmpui/translations/libqmmpui_uk_UA.ts index 7e075b76b..37f4ea704 100644 --- a/src/qmmpui/translations/libqmmpui_uk_UA.ts +++ b/src/qmmpui/translations/libqmmpui_uk_UA.ts @@ -1,50 +1,50 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="1.1" language="uk"> -<defaultcodec></defaultcodec> +<!DOCTYPE TS> +<TS version="2.0" language="uk"> <context> <name>DetailsDialog</name> <message> - <location filename="../detailsdialog.cpp" line="74"/> + <location filename="../detailsdialog.cpp" line="77"/> <source>Title</source> <translation>Заголовок</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="75"/> + <location filename="../detailsdialog.cpp" line="78"/> <source>Artist</source> <translation>Виконавець</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="76"/> + <location filename="../detailsdialog.cpp" line="79"/> <source>Album</source> <translation>Альбом</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="77"/> + <location filename="../detailsdialog.cpp" line="80"/> <source>Comment</source> <translation>Коментар</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="78"/> + <location filename="../detailsdialog.cpp" line="81"/> <source>Genre</source> <translation>Жанр</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="79"/> + <location filename="../detailsdialog.cpp" line="82"/> <source>Composer</source> <translation>Композитор</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="81"/> + <location filename="../detailsdialog.cpp" line="84"/> <source>Year</source> <translation>Рік</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="83"/> + <location filename="../detailsdialog.cpp" line="86"/> <source>Track</source> <translation>Доріжка</translation> </message> <message> - <location filename="../detailsdialog.cpp" line="85"/> + <location filename="../detailsdialog.cpp" line="88"/> <source>Disc number</source> <translation>Номер диску</translation> </message> @@ -69,49 +69,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>PlayListModel</name> - <message> - <location filename="../playlistmodel.cpp" line="366"/> - <source>Title:</source> - <translation>Заголовок:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="367"/> - <source>Artist:</source> - <translation>Виконавець:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="368"/> - <source>Album:</source> - <translation>Альбом:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="369"/> - <source>Genre:</source> - <translation>Жанр:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="370"/> - <source>Comment:</source> - <translation>Коментар:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="371"/> - <source>Composer:</source> - <translation>Композитор:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="372"/> - <source>Disc number:</source> - <translation>Номер диску:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="365"/> - <source>URL:</source> - <translation>URL:</translation> - </message> -</context> -<context> <name>QtFileDialogFactory</name> <message> <location filename="../qtfiledialog.cpp" line="33"/> @@ -157,6 +114,8 @@ p, li { white-space: pre-wrap; } <translation>Номер диску:</translation> </message> <message> + <location filename="../tageditor.ui" line="169"/> + <location filename="../tageditor.ui" line="201"/> <location filename="../tageditor.ui" line="239"/> <source>?</source> <translation></translation> diff --git a/src/qmmpui/translations/libqmmpui_zh_CN.ts b/src/qmmpui/translations/libqmmpui_zh_CN.ts index c0a68feaf..513442d49 100644 --- a/src/qmmpui/translations/libqmmpui_zh_CN.ts +++ b/src/qmmpui/translations/libqmmpui_zh_CN.ts @@ -4,47 +4,47 @@ <context> <name>DetailsDialog</name> <message> - <location filename="../detailsdialog.cpp" line="74"/> + <location filename="../detailsdialog.cpp" line="77"/> <source>Title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="75"/> + <location filename="../detailsdialog.cpp" line="78"/> <source>Artist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="76"/> + <location filename="../detailsdialog.cpp" line="79"/> <source>Album</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="77"/> + <location filename="../detailsdialog.cpp" line="80"/> <source>Comment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="78"/> + <location filename="../detailsdialog.cpp" line="81"/> <source>Genre</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="79"/> + <location filename="../detailsdialog.cpp" line="82"/> <source>Composer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="81"/> + <location filename="../detailsdialog.cpp" line="84"/> <source>Year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="83"/> + <location filename="../detailsdialog.cpp" line="86"/> <source>Track</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="85"/> + <location filename="../detailsdialog.cpp" line="88"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> @@ -69,49 +69,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>PlayListModel</name> - <message> - <location filename="../playlistmodel.cpp" line="366"/> - <source>Title:</source> - <translation>标题:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="367"/> - <source>Artist:</source> - <translation>艺术家:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="368"/> - <source>Album:</source> - <translation>专辑:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="369"/> - <source>Genre:</source> - <translation>流派:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="370"/> - <source>Comment:</source> - <translation>备注:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="371"/> - <source>Composer:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="372"/> - <source>Disc number:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="365"/> - <source>URL:</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>QtFileDialogFactory</name> <message> <location filename="../qtfiledialog.cpp" line="33"/> diff --git a/src/qmmpui/translations/libqmmpui_zh_TW.ts b/src/qmmpui/translations/libqmmpui_zh_TW.ts index 5e573313f..5cee8eeec 100644 --- a/src/qmmpui/translations/libqmmpui_zh_TW.ts +++ b/src/qmmpui/translations/libqmmpui_zh_TW.ts @@ -4,47 +4,47 @@ <context> <name>DetailsDialog</name> <message> - <location filename="../detailsdialog.cpp" line="74"/> + <location filename="../detailsdialog.cpp" line="77"/> <source>Title</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="75"/> + <location filename="../detailsdialog.cpp" line="78"/> <source>Artist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="76"/> + <location filename="../detailsdialog.cpp" line="79"/> <source>Album</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="77"/> + <location filename="../detailsdialog.cpp" line="80"/> <source>Comment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="78"/> + <location filename="../detailsdialog.cpp" line="81"/> <source>Genre</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="79"/> + <location filename="../detailsdialog.cpp" line="82"/> <source>Composer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="81"/> + <location filename="../detailsdialog.cpp" line="84"/> <source>Year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="83"/> + <location filename="../detailsdialog.cpp" line="86"/> <source>Track</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../detailsdialog.cpp" line="85"/> + <location filename="../detailsdialog.cpp" line="88"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> @@ -69,49 +69,6 @@ p, li { white-space: pre-wrap; } </message> </context> <context> - <name>PlayListModel</name> - <message> - <location filename="../playlistmodel.cpp" line="366"/> - <source>Title:</source> - <translation>標題:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="367"/> - <source>Artist:</source> - <translation>藝術家:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="368"/> - <source>Album:</source> - <translation>專輯:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="369"/> - <source>Genre:</source> - <translation>流派:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="370"/> - <source>Comment:</source> - <translation>備註:</translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="371"/> - <source>Composer:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="372"/> - <source>Disc number:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../playlistmodel.cpp" line="365"/> - <source>URL:</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>QtFileDialogFactory</name> <message> <location filename="../qtfiledialog.cpp" line="33"/> |
