From 304c20d3d8da0fe7fee5059fea727c028592dd85 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Mon, 11 Jan 2010 14:47:01 +0000
Subject: [PATCH]     - BUGFIX: RSS filters are now alphabetically sorted     -
 BUGFIX: Fix crash when renaming currently displayed RSS filter     - BUGFIX:
 Remove overwriting confirmation when exporting RSS filters since Qt takes
 care of it

---
 Changelog            | 3 +++
 src/feeddownloader.h | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 9688dc4fb..5f772ac63 100644
--- a/Changelog
+++ b/Changelog
@@ -4,6 +4,9 @@
     - BUGFIX: RSS Feed downloader ignores articles above maximum number of articles
     - BUGFIX: Fix possible bug when deleting a RSS folder
     - BUGFIX: Remove persistant data when a RSS feed is deleted
+    - BUGFIX: RSS filters are now alphabetically sorted
+    - BUGFIX: Fix crash when renaming currently displayed RSS filter
+    - BUGFIX: Remove overwriting confirmation when exporting RSS filters since Qt takes care of it
 
 * Tue Jan 5 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.6
     - BUGFIX: Fix detection of invalid torrent files
diff --git a/src/feeddownloader.h b/src/feeddownloader.h
index df6a4e4f2..3c89d06e0 100644
--- a/src/feeddownloader.h
+++ b/src/feeddownloader.h
@@ -257,6 +257,7 @@ public:
     // Restore saved info
     enableDl_cb->setChecked(filters.isDownloadingEnabled());
     fillFiltersList();
+    filtersList->sortItems(Qt::AscendingOrder);
     if(filters.size() > 0) {
       // Select first filter
       filtersList->setCurrentItem(filtersList->item(0));
@@ -376,11 +377,14 @@ protected slots:
           QMessageBox::warning(0, tr("Invalid filter name"), tr("This filter name is already in use."));
         }
       }while(!validated);
+      // Save the current filter
+      saveCurrentFilterSettings();
       // Rename the filter
       filters.rename(current_name, new_name);
       if(selected_filter == current_name)
         selected_filter = new_name;
       item->setText(new_name);
+      filtersList->sortItems(Qt::AscendingOrder);
     }
   }
 
@@ -434,6 +438,7 @@ protected slots:
       }
     }while(!validated);
     QListWidgetItem *it = new QListWidgetItem(filter_name, filtersList);
+    filtersList->sortItems(Qt::AscendingOrder);
     filtersList->setCurrentItem(it);
     //showFilterSettings(it);
   }
@@ -489,10 +494,10 @@ protected slots:
     // Append file extension
     if(!destination.endsWith(".filters"))
       destination += ".filters";
-    if(QFile::exists(destination)) {
+    /*if(QFile::exists(destination)) {
       int ret = QMessageBox::question(0, tr("Overwriting confirmation"), tr("Are you sure you want to overwrite existing file?"), QMessageBox::Yes|QMessageBox::No);
       if(ret != QMessageBox::Yes) return;
-    }
+    }*/
     if(filters.serialize(destination))
       QMessageBox::information(0, tr("Export successful"), tr("Filters export was successful."));
     else