From: druid23 Date: Tue, 17 Aug 2010 23:48:55 +0000 (+0100) Subject: Improved file extension handling for icons and minor cosmetic fixes. X-Git-Tag: v0.5~39 X-Git-Url: https://vcs.maemo.org/git/?p=vlc-remote;a=commitdiff_plain;h=59bdf67e10f004194b07dd0e5703ad0c4caf9ff5 Improved file extension handling for icons and minor cosmetic fixes. modified: browsemainwindow.cpp modified: browsemainwindow.h modified: playlistmainwindow.cpp modified: playlistmainwindow.h modified: vlcplaylistelementsimple.h --- diff --git a/browsemainwindow.cpp b/browsemainwindow.cpp index 15fcefd..62bfda9 100644 --- a/browsemainwindow.cpp +++ b/browsemainwindow.cpp @@ -174,7 +174,7 @@ void BrowseMainWindow::parseXmlDirectory() { dir->date = QDate::fromString(node.attributes().namedItem("date").nodeValue()); dir->path = node.attributes().namedItem("path").nodeValue(); dir->name = node.attributes().namedItem("name").nodeValue(); - dir->extension = node.attributes().namedItem("extension").nodeValue(); + dir->extension = getExtension(dir->path, node.attributes().namedItem("extension").nodeValue()); ++idx; if (0 != QString::compare("directory", dir->type)) { files->append(*dir); @@ -198,6 +198,21 @@ void BrowseMainWindow::parseXmlDirectory() { this->updateList(); } +QString BrowseMainWindow::getExtension(QString path, QString extension) { + // return extension if exists + if (!extension.isNull() && !extension.isEmpty()) return extension; + // return blank if no path + if (path.isNull() || path.isEmpty()) return ""; + // otherwise extract the extension + int dot_pos = path.lastIndexOf('.'); + if (0 < dot_pos) { + return path.right(path.length() - (dot_pos + 1)); + } + else { // no dot + return ""; + } +} + void BrowseMainWindow::writeFile(QString path, QByteArray text) { QFile file(path); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) diff --git a/browsemainwindow.h b/browsemainwindow.h index bc83ad8..f0365a6 100644 --- a/browsemainwindow.h +++ b/browsemainwindow.h @@ -53,6 +53,7 @@ protected: void changeEvent(QEvent *e); VlcBrowseElement getElementFromText(QString text); void writeFile(QString path, QByteArray text); + QString getExtension(QString path, QString extension); private: Ui::BrowseMainWindow *ui; diff --git a/playlistmainwindow.cpp b/playlistmainwindow.cpp index b9a1886..fc43b99 100644 --- a/playlistmainwindow.cpp +++ b/playlistmainwindow.cpp @@ -161,15 +161,15 @@ void PlayListMainWindow::parseXmlPlayList() { doc.setContent(this->mResponse); QDomElement docElem = doc.documentElement(); QDomNodeList nodes = docElem.elementsByTagName("node"); - int depth = 0; int ct = nodes.count(); for (int idx = 0; idx < ct; ++idx) { QDomNode node = nodes.at(idx); + QString current = ""; QString name = node.attributes().namedItem("name").nodeValue(); int id = node.attributes().namedItem("id").nodeValue().toInt(); - if (3 == id) { + if (4 > id && 0 == QString::compare(node.attributes().namedItem("ro").nodeValue(), "ro")) { // got the main playlist, let's build it up if (node.hasChildNodes()) { QDomNodeList leafs = node.childNodes(); @@ -179,11 +179,14 @@ void PlayListMainWindow::parseXmlPlayList() { QDomNode leaf = leafs.at(jdx); VlcPlayListElementSimple* el = new VlcPlayListElementSimple(); el->id = leaf.attributes().namedItem("id").nodeValue().toInt(); - //el->path = leaf.attributes().namedItem("uri").nodeValue(); + el->path = leaf.attributes().namedItem("uri").nodeValue(); el->name = leaf.attributes().namedItem("name").nodeValue(); + current = leaf.attributes().namedItem("current").nodeValue(); + el->playing = (0 < current.length()); + el->depth = 1; if (0 == QString::compare(leaf.nodeName(), "node")) { - el->depth = 1; el->type = "node"; + el->extension = getExtension(el->path, NULL); this->mContents->append(*el); // now parse the child nodes as leafs. if (leaf.hasChildNodes()) { @@ -194,10 +197,13 @@ void PlayListMainWindow::parseXmlPlayList() { QDomNode item = items.at(kdx); VlcPlayListElementSimple* it = new VlcPlayListElementSimple(); it->id = item.attributes().namedItem("id").nodeValue().toInt(); - //it->path = item.attributes().namedItem("uri").nodeValue(); + it->path = item.attributes().namedItem("uri").nodeValue(); it->name = item.attributes().namedItem("name").nodeValue(); + it->extension = getExtension(it->path, NULL); it->depth = 2; it->type = "leaf"; + current = item.attributes().namedItem("current").nodeValue(); + it->playing = (0 < current.length()); this->mContents->append(*it); delete it; } @@ -205,8 +211,8 @@ void PlayListMainWindow::parseXmlPlayList() { } } else { - el->depth = 1; el->type = "leaf"; + el->extension = getExtension(el->path, NULL); this->mContents->append(*el); } delete el; @@ -223,6 +229,21 @@ void PlayListMainWindow::parseXmlPlayList() { } +QString PlayListMainWindow::getExtension(QString path, QString extension) { + // return extension if exists + if (!extension.isNull() && !extension.isEmpty()) return extension; + // return blank if no path + if (path.isNull() || path.isEmpty()) return ""; + // otherwise extract the extension + int dot_pos = path.lastIndexOf('.'); + if (0 < dot_pos) { + return path.right(path.length() - (dot_pos + 1)); + } + else { // no dot + return ""; + } +} + VlcPlayListElementSimple PlayListMainWindow::getElementFromText(QString text) { //if (0 != QString::compare("", text)) { for (int idx = 0; idx < mContents->count(); ++idx) { @@ -237,17 +258,60 @@ VlcPlayListElementSimple PlayListMainWindow::getElementFromText(QString text) { void PlayListMainWindow::updateList() { int ct = this->mContents->count(); if (0 < ct) { + QIcon icon_audio = QIcon::fromTheme("general_audio_file"); + QIcon icon_video = QIcon::fromTheme("general_video_file"); + QIcon icon_image = QIcon::fromTheme("general_image"); + QIcon icon_flash = QIcon::fromTheme("filemanager_flash_file"); + QIcon icon_media = QIcon::fromTheme("filemanager_media_folder"); for (int idx = 0; idx < ct; ++idx) { VlcPlayListElementSimple el = mContents->at(idx); - QListWidgetItem* item;// + QListWidgetItem* item; if (0 == QString::compare("node", el.type)) { - item = new QListWidgetItem(QIcon::fromTheme("filemanager_media_folder"), el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); + item = new QListWidgetItem(icon_media, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); } else { - item = new QListWidgetItem(QIcon::fromTheme("general_video_file"), el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); + if ( 0 == QString::compare(el.extension, "jpg") || + 0 == QString::compare(el.extension, "jpeg") || + 0 == QString::compare(el.extension, "gif") || + 0 == QString::compare(el.extension, "png") || + 0 == QString::compare(el.extension, "bmp") ) { + item = new QListWidgetItem(icon_image, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); // .jpg, .jpeg, .gif, .png, .bmp + } + else if ( 0 == QString::compare(el.extension, "mp3") || + 0 == QString::compare(el.extension, "m4a") || + 0 == QString::compare(el.extension, "ogg") || + 0 == QString::compare(el.extension, "oga") || + 0 == QString::compare(el.extension, "wav") || + 0 == QString::compare(el.extension, "flac") ) { + item = new QListWidgetItem(icon_audio, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); // .mp3, .m4a, .ogg, .oga, .wav, .flac + } + else if ( 0 == QString::compare(el.extension, "avi") || + 0 == QString::compare(el.extension, "mpeg") || + 0 == QString::compare(el.extension, "mpg") || + 0 == QString::compare(el.extension, "mov") || + 0 == QString::compare(el.extension, "mp4") || + 0 == QString::compare(el.extension, "wmv") || + 0 == QString::compare(el.extension, "mkv") || + 0 == QString::compare(el.extension, "ogv") ) { + item = new QListWidgetItem(icon_video, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); // .avi, .mpg, .mpeg, .mov, .mp4, .wmv, .mkv, .ogv + } + else if ( 0 == QString::compare(el.extension, "flv") ) { + item = new QListWidgetItem(icon_flash, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); // .flv + } + else { + if (el.name.contains("Flash")) { + item = new QListWidgetItem(icon_flash, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); + } + else { + item = new QListWidgetItem(icon_media, el.name, ui->listWidget, LIST_ITEM_TYPE_OFFSET + el.id); + } + } } + item->setSelected(el.playing); ui->listWidget->addItem(item); - /// TODO - Work out the file / media type and use an appropriate icon instead of the default. + if (el.playing) { + ui->listWidget->scrollToItem(item, QAbstractItemView::PositionAtCenter); + } } } } diff --git a/playlistmainwindow.h b/playlistmainwindow.h index 6e87837..9fc36bf 100644 --- a/playlistmainwindow.h +++ b/playlistmainwindow.h @@ -58,6 +58,7 @@ protected slots: protected: void changeEvent(QEvent *e); VlcPlayListElementSimple getElementFromText(QString text); + QString getExtension(QString path, QString extension); private: Ui::PlayListMainWindow *ui; diff --git a/vlcplaylistelementsimple.h b/vlcplaylistelementsimple.h index b3369b6..fc9d1bd 100644 --- a/vlcplaylistelementsimple.h +++ b/vlcplaylistelementsimple.h @@ -22,9 +22,11 @@ struct VlcPlayListElementSimple { int id; // vlc playlist item id - int depth; // + int depth; // how deep in the tree + bool playing; // currently playing item QString type; // node or leaf - //QString path; // Only used for leaf - repeat name otherwise + QString extension; // file extension + QString path; // Only used for leaf - repeat name otherwise QString name; // name or metadata title if available } ;