X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=browsemainwindow.cpp;h=c561533a3c9582cec6780dffbae015b5ca988a17;hb=c4948f90b97e27212b97e2451164db5ad0129f7c;hp=4ddf99e06a6d710b117af80273078f5a6cb8daf1;hpb=70c4d9da8ad3b6603de225743bff9ce8b7d65839;p=vlc-remote

diff --git a/browsemainwindow.cpp b/browsemainwindow.cpp
index 4ddf99e..c561533 100644
--- a/browsemainwindow.cpp
+++ b/browsemainwindow.cpp
@@ -38,6 +38,7 @@ BrowseMainWindow::BrowseMainWindow(QWidget *parent) :
     QString currentKey = settings.value("config/currentKey").toString();
     mIp = settings.value("account/"+currentKey).toString();
 
+
     mNetManager = new QNetworkAccessManager(this);
 
     ui->playButton->setIcon(QIcon::fromTheme("camera_playback"));
@@ -46,8 +47,6 @@ BrowseMainWindow::BrowseMainWindow(QWidget *parent) :
     ui->browseButton->setDisabled(true);
     ui->playButton->setDisabled(true);
     ui->addButton->setDisabled(true);
-    //ui->listWidget->setHorizontalScrollMode(QListWidget::ScrollMode::ScrollPerItem);
-    //ui->listWidget->setHorizontalScrollHint(QListWidget::ScrollHint::PositionAtTop);
 
     connect(ui->browseButton,SIGNAL(clicked()),this,SLOT(onBrowse()));
     connect(ui->addButton,SIGNAL(clicked()),this,SLOT(onAddToPlaylist()));
@@ -161,20 +160,37 @@ void BrowseMainWindow::parseXmlDirectory() {
     this->updateList();
 }
 
+void BrowseMainWindow::writeFile(QString path, QByteArray text) {
+    QFile file(path);
+         if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
+             return;
+
+         QTextStream out(&file);
+         out << text;
+}
+
 void BrowseMainWindow::updateList() {
     int ct = this->mContents->count();
     if (0 < ct) {
+        QIcon icon_up     = QIcon::fromTheme("filemanager_folder_up");
+        QIcon icon_folder = QIcon::fromTheme("general_folder");
+        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");
         for (int idx = 0; idx < ct; ++idx) {
             VlcBrowseElement dir = mContents->at(idx);
             QListWidgetItem* item;
+            bool item_good = false;
             if (0 == QString::compare("directory", dir.type)) {
                 if (0 == QString::compare("..", dir.name)) {
-                    item = new QListWidgetItem(QIcon::fromTheme("filemanager_folder_up"), dir.name, ui->listWidget, 0);
+                    item = new QListWidgetItem(icon_up, dir.name, ui->listWidget, 0);
+                    item_good = true;
                 }
                 else {
-                    item = new QListWidgetItem(QIcon::fromTheme("general_folder"), dir.name, ui->listWidget, 0);
+                    item = new QListWidgetItem(icon_folder, dir.name, ui->listWidget, 0);
+                    item_good = true;
                 }
-                ui->listWidget->addItem(item);
             }
             else if (0 == QString::compare("file", dir.type)) {
                 if ( 0 == QString::compare(dir.extension, "jpg")  ||
@@ -182,34 +198,44 @@ void BrowseMainWindow::updateList() {
                      0 == QString::compare(dir.extension, "gif")  ||
                      0 == QString::compare(dir.extension, "png")  ||
                      0 == QString::compare(dir.extension, "bmp")  ) {
-                    item = new QListWidgetItem(QIcon::fromTheme("general_image"), dir.name, ui->listWidget, 0); // .jpg, .jpeg, .gif, .png, .bmp
+                    item_good = true;
+                    item = new QListWidgetItem(icon_image, dir.name, ui->listWidget, 0); // .jpg, .jpeg, .gif, .png, .bmp
                 }
                 else if ( 0 == QString::compare(dir.extension, "mp3")  ||
-                          0 == QString::compare(dir.extension, "m4a") ||
+                          0 == QString::compare(dir.extension, "m4a")  ||
                           0 == QString::compare(dir.extension, "ogg")  ||
                           0 == QString::compare(dir.extension, "oga")  ||
                           0 == QString::compare(dir.extension, "wav")  ||
                           0 == QString::compare(dir.extension, "flac")  ) {
-                    item = new QListWidgetItem(QIcon::fromTheme("general_audio_file"), dir.name, ui->listWidget, 0); // .mp3, .m4a, .ogg, .oga, .wav, .flac
+                    item_good = true;
+                    item = new QListWidgetItem(icon_audio, dir.name, ui->listWidget, 0); // .mp3, .m4a, .ogg, .oga, .wav, .flac
                 }
-                else if ( 0 == QString::compare(dir.extension, "flv")   ||
-                          0 == QString::compare(dir.extension, "avi")  ||
+                else if ( 0 == QString::compare(dir.extension, "avi")  ||
                           0 == QString::compare(dir.extension, "mpeg") ||
+                          0 == QString::compare(dir.extension, "mpg")  ||
                           0 == QString::compare(dir.extension, "mov")  ||
                           0 == QString::compare(dir.extension, "mp4")  ||
                           0 == QString::compare(dir.extension, "wmv")  ||
                           0 == QString::compare(dir.extension, "mkv")  ||
                           0 == QString::compare(dir.extension, "ogv")  ) {
-                    item = new QListWidgetItem(QIcon::fromTheme("general_video_file"), dir.name, ui->listWidget, 0); // .flv, .avi, .mpeg, .mov, .mp4, .wmv, .mkv, .ogv
+                    item_good = true;
+                    item = new QListWidgetItem(icon_video, dir.name, ui->listWidget, 0); // .avi, .mpg, .mpeg, .mov, .mp4, .wmv, .mkv, .ogv
+                }
+                else if ( 0 == QString::compare(dir.extension, "flv")  ) {
+                    item_good = true;
+                    item = new QListWidgetItem(icon_flash, dir.name, ui->listWidget, 0); // .flv
                 }
                 else {
                     if (dir.name.startsWith("Flash")) {
-                        item = new QListWidgetItem(QIcon::fromTheme("general_video_file"), dir.name, ui->listWidget, 0);
+                        item_good = true;
+                        item = new QListWidgetItem(icon_flash, dir.name, ui->listWidget, 0);
                     }
                     else {
-                        item = new QListWidgetItem(QIcon::fromTheme("filemanager_unknown_file"), dir.name, ui->listWidget, 0);
+                        item_good = false;
                     }
                 }
+            }
+            if (item_good) {
                 ui->listWidget->addItem(item);
             }
             // other types ignored