Browse Source

- 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
adaptive-webui-19844
Christophe Dumez 15 years ago
parent
commit
aa8f7552a2
  1. 9
      src/feeddownloader.h
  2. BIN
      src/lang/qbittorrent_sv.qm
  3. 36
      src/lang/qbittorrent_sv.ts

9
src/feeddownloader.h

@ -261,6 +261,7 @@ public: @@ -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: @@ -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: @@ -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: @@ -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

BIN
src/lang/qbittorrent_sv.qm

Binary file not shown.

36
src/lang/qbittorrent_sv.ts

@ -1655,29 +1655,31 @@ Are you sure you want to quit qBittorrent?</source> @@ -1655,29 +1655,31 @@ Are you sure you want to quit qBittorrent?</source>
<name>LegalNotice</name>
<message>
<source>Legal Notice</source>
<translation type="unfinished"></translation>
<translation>Juridisk information</translation>
</message>
<message>
<source>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&apos;t tell you again.</source>
<translation type="unfinished"></translation>
<translation>qBittorrent är ett fildelarprogram. När du kör en torrent kommer dess data att göras tillgängligt för andra. Och klart, allt innehåll som du delar ut är fullständigt ditt ansvar.
Du visste antagligen redan detta vi kommer inte att berätta det igen.</translation>
</message>
<message>
<source>Press any key to accept and continue...</source>
<translation type="unfinished"></translation>
<translation>Tryck en tangent för att acceptera och fortsätta...</translation>
</message>
<message>
<source>Legal notice</source>
<translation type="unfinished"></translation>
<translation>Juridisk information</translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
<translation>Avbryt</translation>
</message>
<message>
<source>I Agree</source>
<translation type="unfinished"></translation>
<translation>Jag godkänner</translation>
</message>
</context>
<context>
@ -2672,19 +2674,19 @@ QGroupBox { @@ -2672,19 +2674,19 @@ QGroupBox {
</message>
<message>
<source>I/O Error</source>
<translation type="unfinished"></translation>
<translation>In/Ut-fel</translation>
</message>
<message>
<source>This file does not exist yet.</source>
<translation type="unfinished"></translation>
<translation>Denna fil finns ännu inte.</translation>
</message>
<message>
<source>This folder does not exist yet.</source>
<translation type="unfinished"></translation>
<translation>Denna mapp finns inte ännu.</translation>
</message>
<message>
<source>This file name contains forbidden characters, please choose a different one.</source>
<translation type="unfinished"></translation>
<translation>Detta filnamn innehåller förbjudna tecken. Välj ett annat filnamn.</translation>
</message>
</context>
<context>
@ -3350,11 +3352,11 @@ p, li { white-space: pre-wrap; } @@ -3350,11 +3352,11 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<source>Invalid label name</source>
<translation type="unfinished"></translation>
<translation>Ogiltigt etikettnamn</translation>
</message>
<message>
<source>Please don&apos;t use any special characters in the label name.</source>
<translation type="unfinished"></translation>
<translation>Använd inte några specialtecken i etikettnamnet.</translation>
</message>
</context>
<context>
@ -3571,11 +3573,11 @@ p, li { white-space: pre-wrap; } @@ -3571,11 +3573,11 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<source>Invalid label name</source>
<translation type="unfinished"></translation>
<translation>Ogiltigt etikettnamn</translation>
</message>
<message>
<source>Please don&apos;t use any special characters in the label name.</source>
<translation type="unfinished"></translation>
<translation>Använd inte några specialtecken i etikettnamnet.</translation>
</message>
</context>
<context>
@ -5123,15 +5125,15 @@ Dock har dessa insticksmoduler blivit inaktiverade.</translation> @@ -5123,15 +5125,15 @@ Dock har dessa insticksmoduler blivit inaktiverade.</translation>
</message>
<message>
<source>This file name contains forbidden characters, please choose a different one.</source>
<translation type="unfinished"></translation>
<translation>Detta filnamn innehåller förbjudna tecken. Välj ett annat filnamn.</translation>
</message>
<message>
<source>Invalid label name</source>
<translation type="unfinished"></translation>
<translation>Ogiltigt etikettnamn</translation>
</message>
<message>
<source>Please don&apos;t use any special characters in the label name.</source>
<translation type="unfinished"></translation>
<translation>Använd inte några specialtecken i etikettnamnet.</translation>
</message>
</context>
</TS>

Loading…
Cancel
Save