From aa8f7552a2a5b3a1f1791aec3b20bbd70cc40180 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Mon, 11 Jan 2010 14:39:58 +0000 Subject: [PATCH] - RSS filters are now alphabetically sorted - Fix crash when renaming currently displayed RSS filter - Remove overwriting confirmation when exporting RSS filters since Qt takes care of it --- src/feeddownloader.h | 9 +++++++-- src/lang/qbittorrent_sv.qm | Bin 83845 -> 86930 bytes src/lang/qbittorrent_sv.ts | 36 +++++++++++++++++++----------------- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/feeddownloader.h b/src/feeddownloader.h index ca573f9e1..22b7a085d 100644 --- a/src/feeddownloader.h +++ b/src/feeddownloader.h @@ -261,6 +261,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)); @@ -380,11 +381,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); } } @@ -438,6 +442,7 @@ protected slots: } }while(!validated); QListWidgetItem *it = new QListWidgetItem(filter_name, filtersList); + filtersList->sortItems(Qt::AscendingOrder); filtersList->setCurrentItem(it); //showFilterSettings(it); } @@ -493,10 +498,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 diff --git a/src/lang/qbittorrent_sv.qm b/src/lang/qbittorrent_sv.qm index 060576037d3027969b233e9eb4a9830266d39ee5..95cfe38c096a2e8f8d35d4fdee7ded0798efc6e6 100644 GIT binary patch delta 8323 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 ftJa3i{tr>wCGd_lZJ4M0KQB# delta 5883 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 diff --git a/src/lang/qbittorrent_sv.ts b/src/lang/qbittorrent_sv.ts index 4b35faf67..652a8f6de 100644 --- a/src/lang/qbittorrent_sv.ts +++ b/src/lang/qbittorrent_sv.ts @@ -1655,29 +1655,31 @@ Are you sure you want to quit qBittorrent? LegalNotice Legal Notice - + Juridisk information qBittorrent is a file sharing program. When you run a torrent, its data will be made available to others by mean of upload. And of course, any content you share if your sole responsatibility. You probably knew this, so we won't tell you again. - + qBittorrent är ett fildelarprogram. När du kör en torrent så kommer dess data att göras tillgängligt för andra. Och så klart, allt innehåll som du delar ut är fullständigt på ditt ansvar. + +Du visste antagligen redan detta så vi kommer inte att berätta det igen. Press any key to accept and continue... - + Tryck på en tangent för att acceptera och fortsätta... Legal notice - + Juridisk information Cancel - + Avbryt I Agree - + Jag godkänner @@ -2672,19 +2674,19 @@ QGroupBox { I/O Error - + In/Ut-fel This file does not exist yet. - + Denna fil finns ännu inte. This folder does not exist yet. - + Denna mapp finns inte ännu. This file name contains forbidden characters, please choose a different one. - + Detta filnamn innehåller förbjudna tecken. Välj ett annat filnamn. @@ -3350,11 +3352,11 @@ p, li { white-space: pre-wrap; } Invalid label name - + Ogiltigt etikettnamn Please don't use any special characters in the label name. - + Använd inte några specialtecken i etikettnamnet. @@ -3571,11 +3573,11 @@ p, li { white-space: pre-wrap; } Invalid label name - + Ogiltigt etikettnamn Please don't use any special characters in the label name. - + Använd inte några specialtecken i etikettnamnet. @@ -5123,15 +5125,15 @@ Dock har dessa insticksmoduler blivit inaktiverade. This file name contains forbidden characters, please choose a different one. - + Detta filnamn innehåller förbjudna tecken. Välj ett annat filnamn. Invalid label name - + Ogiltigt etikettnamn Please don't use any special characters in the label name. - + Använd inte några specialtecken i etikettnamnet.