From bab7ebaa5b167f94ae6b51e179a705cbba58b528 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Fri, 25 Nov 2011 23:46:41 +0000 Subject: [PATCH] Added new button "Open Collection" in TransfersDialog. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4691 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/MainWindow.cpp | 1 + retroshare-gui/src/gui/RemoteDirModel.cpp | 11 +- retroshare-gui/src/gui/TransfersDialog.cpp | 12 +- retroshare-gui/src/gui/TransfersDialog.h | 2 + retroshare-gui/src/gui/TransfersDialog.ui | 1683 +++++++++-------- .../src/gui/common/RsCollectionFile.cpp | 81 +- .../src/gui/common/RsCollectionFile.h | 10 +- .../src/gui/common/RsUrlHandler.cpp | 12 +- retroshare-gui/src/lang/retroshare_de.qm | Bin 330124 -> 330546 bytes retroshare-gui/src/lang/retroshare_de.ts | 86 +- 10 files changed, 993 insertions(+), 905 deletions(-) diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 9935e9aee..7e1cb1482 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -335,6 +335,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) /** StatusBar section ********/ /* initialize combobox in status bar */ statusComboBox = new QComboBox(statusBar()); + statusComboBox->setFocusPolicy(Qt::ClickFocus); initializeStatusObject(statusComboBox, true); QWidget *widget = new QWidget(); diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp index 439fdc1b9..4bfbc3a9f 100644 --- a/retroshare-gui/src/gui/RemoteDirModel.cpp +++ b/retroshare-gui/src/gui/RemoteDirModel.cpp @@ -916,19 +916,10 @@ void RetroshareDirModel::createCollectionFile(const QModelIndexList &list) return ; } - QString filename ; - - if(!misc::getSaveFileName(NULL,RshareSettings::LASTDIR_EXTRAFILE,tr("Create selection file"),tr("Collection files")+" (*."+RsCollectionFile::ExtensionString+")",filename)) - return ; - - if(!filename.endsWith("."+RsCollectionFile::ExtensionString)) - filename += "."+RsCollectionFile::ExtensionString ; - - std::cerr << "Got file name: "<< filename.toStdString() << std::endl; std::vector dirVec; getDirDetailsFromSelect(list, dirVec); - RsCollectionFile(dirVec).save(filename) ; + RsCollectionFile(dirVec).save(); } void RetroshareDirModel::downloadSelected(const QModelIndexList &list) diff --git a/retroshare-gui/src/gui/TransfersDialog.cpp b/retroshare-gui/src/gui/TransfersDialog.cpp index b6aaacdb1..1479a679a 100644 --- a/retroshare-gui/src/gui/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/TransfersDialog.cpp @@ -44,11 +44,12 @@ #include "TurtleRouterStatistics.h" #include "xprogressbar.h" #include "settings/rsharesettings.h" +#include "util/misc.h" +#include "common/RsCollectionFile.h" #include #include #include -#include "util/misc.h" /**** * #define SHOW_RTT_STATISTICS 1 @@ -322,6 +323,7 @@ TransfersDialog::TransfersDialog(QWidget *parent) #endif QObject::connect(ui._showCacheTransfers_CB,SIGNAL(toggled(bool)),this,SLOT(insertTransfers())) ; + QObject::connect(ui.openCollection, SIGNAL(clicked()), this, SLOT(openCollection())); // Actions. Only need to be defined once. pauseAct = new QAction(QIcon(IMAGE_PAUSE), tr("Pause"), this); @@ -1690,3 +1692,11 @@ QString TransfersDialog::getSources(int row, QStandardItemModel *model) { return model->data(model->index(row, SOURCES), Qt::DisplayRole).toString(); } + +void TransfersDialog::openCollection() +{ + RsCollectionFile Collection; + if (Collection.load()) { + Collection.downloadFiles(); + } +} diff --git a/retroshare-gui/src/gui/TransfersDialog.h b/retroshare-gui/src/gui/TransfersDialog.h index b42611234..91cffce8d 100644 --- a/retroshare-gui/src/gui/TransfersDialog.h +++ b/retroshare-gui/src/gui/TransfersDialog.h @@ -101,6 +101,8 @@ private slots: void showDetailsDialog(); void updateDetailsDialog(); + void openCollection(); + signals: void playFiles(QStringList files); diff --git a/retroshare-gui/src/gui/TransfersDialog.ui b/retroshare-gui/src/gui/TransfersDialog.ui index 7fc5884cd..275ecf37e 100644 --- a/retroshare-gui/src/gui/TransfersDialog.ui +++ b/retroshare-gui/src/gui/TransfersDialog.ui @@ -1,835 +1,848 @@ - - - TransfersDialog - - - - 0 - 0 - 620 - 353 - - - - - 0 - 0 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 192 - 192 - 192 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 104 - 104 - 104 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 104 - 104 - 104 - - - - - - - 255 - 255 - 255 - - - - - - - 104 - 104 - 104 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - Arial - 8 - 50 - false - false - false - false - - - - true - - - Qt::PreventContextMenu - - - - - - Qt::Vertical - - - - - 0 - - - - - - 0 - 32 - - - - - 16777215 - 32 - - - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - - - 0 - - - 6 - - - - - - - - :/images/down.png - - - - - - - - 10 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Downloads:</span></p></body></html> - - - - - - - - - Qt::Horizontal - - - - 483 - 20 - - - - - - - - Show cache transfers - - - - - - - - - - - Arial - 9 - - - - true - - - Qt::CustomContextMenu - - - false - - - 0 - - - QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked - - - false - - - false - - - false - - - QAbstractItemView::NoDragDrop - - - false - - - true - - - true - - - false - - - true - - - false - - - - - - - - - 75 - true - - - - 1 - - - - - :/images/up.png:/images/up.png - - - Uploads - - - - 0 - - - 0 - - - - - - Arial - 9 - - - - true - - - - - - - - - :/images/blockdevice.png:/images/blockdevice.png - - - Selected transfer - - - - 0 - - - 6 - - - - - QFrame::NoFrame - - - Qt::ScrollBarAlwaysOff - - - true - - - - - 0 - 0 - 598 - 99 - - - - - - - - - 6 - - - - - - - - - - :/images/graph-downloaded.png - - - - - - - Done - - - - - - - - - - - - - - :/images/graph-downloading.png - - - - - - - Active - - - - - - - - - - - - - - :/images/graph-notdownload.png - - - - - - - Outstanding - - - - - - - - - Qt::Horizontal - - - - 368 - 13 - - - - - - - - - - - - - - - - - - + + + TransfersDialog + + + + 0 + 0 + 620 + 353 + + + + + 0 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 208 + 208 + 208 + + + + + + + 255 + 255 + 255 + + + + + + + 247 + 247 + 247 + + + + + + + 104 + 104 + 104 + + + + + + + 139 + 139 + 139 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 240 + 240 + 240 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 128 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 231 + 231 + 231 + + + + + + + + + 0 + 0 + 0 + + + + + + + 208 + 208 + 208 + + + + + + + 255 + 255 + 255 + + + + + + + 247 + 247 + 247 + + + + + + + 104 + 104 + 104 + + + + + + + 139 + 139 + 139 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 240 + 240 + 240 + + + + + + + 0 + 0 + 0 + + + + + + + 192 + 192 + 192 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 231 + 231 + 231 + + + + + + + + + 104 + 104 + 104 + + + + + + + 208 + 208 + 208 + + + + + + + 255 + 255 + 255 + + + + + + + 247 + 247 + 247 + + + + + + + 104 + 104 + 104 + + + + + + + 139 + 139 + 139 + + + + + + + 104 + 104 + 104 + + + + + + + 255 + 255 + 255 + + + + + + + 104 + 104 + 104 + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 128 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 231 + 231 + 231 + + + + + + + + + Arial + 8 + 50 + false + false + false + false + + + + true + + + Qt::PreventContextMenu + + + + + + Qt::Vertical + + + + + 0 + + + + + + 0 + 32 + + + + + 16777215 + 32 + + + + QFrame#frame{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, +stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + + + 0 + + + 6 + + + + + + + + :/images/down.png + + + + + + + + 10 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Arial'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Downloads:</span></p></body></html> + + + + + + + + + Qt::Horizontal + + + + 483 + 20 + + + + + + + + Qt::NoFocus + + + Open Collection + + + + + + + Qt::ClickFocus + + + Show cache transfers + + + + + + + + + + + Arial + 9 + + + + true + + + Qt::CustomContextMenu + + + false + + + 0 + + + QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked + + + false + + + false + + + false + + + QAbstractItemView::NoDragDrop + + + false + + + true + + + true + + + false + + + true + + + false + + + + + + + + + 75 + true + + + + 1 + + + + + :/images/up.png:/images/up.png + + + Uploads + + + + 0 + + + 0 + + + + + + Arial + 9 + + + + true + + + + + + + + + :/images/blockdevice.png:/images/blockdevice.png + + + Selected transfer + + + + 0 + + + 6 + + + + + QFrame::NoFrame + + + Qt::ScrollBarAlwaysOff + + + true + + + + + 0 + 0 + 596 + 101 + + + + + + + + + 6 + + + + + + + + + + :/images/graph-downloaded.png + + + + + + + Done + + + + + + + + + + + + + + :/images/graph-downloading.png + + + + + + + Active + + + + + + + + + + + + + + :/images/graph-notdownload.png + + + + + + + Outstanding + + + + + + + + + Qt::Horizontal + + + + 368 + 13 + + + + + + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/common/RsCollectionFile.cpp b/retroshare-gui/src/gui/common/RsCollectionFile.cpp index b2b95c730..1a2e1b42e 100644 --- a/retroshare-gui/src/gui/common/RsCollectionFile.cpp +++ b/retroshare-gui/src/gui/common/RsCollectionFile.cpp @@ -26,33 +26,22 @@ #include "RsCollectionFile.h" #include "RsCollectionDialog.h" +#include "util/misc.h" #include #include #include -#include #include #include #include +#include +#include const QString RsCollectionFile::ExtensionString = QString("rscollection") ; -RsCollectionFile::RsCollectionFile(const QString& filename) - : _xml_doc("RsCollection"),_filename(filename) +RsCollectionFile::RsCollectionFile() + : _xml_doc("RsCollection") { - QFile file(filename); - - if (!file.open(QIODevice::ReadOnly)) - { - std::cerr << "Cannot open file " << filename.toStdString() << " !!" << std::endl; - return; - } - - bool ok = _xml_doc.setContent(&file) ; - file.close(); - - if(!ok) - throw std::runtime_error("Error parsing xml file") ; } void RsCollectionFile::downloadFiles() const @@ -143,14 +132,55 @@ RsCollectionFile::RsCollectionFile(const std::vector& file_infos) recursAddElements(_xml_doc,file_infos[i],root) ; } -void RsCollectionFile::save(const QString& filename) const +static void showError(const QString& filename, const QString& error) +{ + QMessageBox mb(QMessageBox::Warning, QObject::tr("Treatment of collection file has failed"), QObject::tr("The collection file %1 could not be openned.\nReported error is: %2").arg(filename).arg(error), QMessageBox::Ok); + mb.setWindowIcon(QIcon(":/images/rstray3.png")); + mb.exec(); +} + +bool RsCollectionFile::load(const QString& filename) +{ + QFile file(filename); + + if (!file.open(QIODevice::ReadOnly)) + { + std::cerr << "Cannot open file " << filename.toStdString() << " !!" << std::endl; + showError(filename, QApplication::translate("RsCollectionFile", "Cannot open file %1").arg(filename)); + return false; + } + + bool ok = _xml_doc.setContent(&file) ; + file.close(); + + if (ok) { + _filename = filename; + } else { + showError(filename, QApplication::translate("RsCollectionFile", "Error parsing xml file")); + } + + return ok; +} + +bool RsCollectionFile::load() +{ + QString filename; + if (!misc::getOpenFileName(NULL, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Open collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollectionFile::ExtensionString + ")", filename)) + return false; + + std::cerr << "Got file name: " << filename.toStdString() << std::endl; + + return load(filename); +} + +bool RsCollectionFile::save(const QString& filename) const { QFile file(filename); if (!file.open(QIODevice::WriteOnly)) { std::cerr << "Cannot write to file " << filename.toStdString() << " !!" << std::endl; - return; + return false; } QTextStream stream(&file) ; @@ -158,5 +188,20 @@ void RsCollectionFile::save(const QString& filename) const stream << _xml_doc.toString() ; file.close(); + + return true; } +bool RsCollectionFile::save() const +{ + QString filename; + if(!misc::getSaveFileName(NULL, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Create collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollectionFile::ExtensionString + ")", filename)) + return false; + + if (!filename.endsWith("." + RsCollectionFile::ExtensionString)) + filename += "." + RsCollectionFile::ExtensionString ; + + std::cerr << "Got file name: " << filename.toStdString() << std::endl; + + return save(filename); +} diff --git a/retroshare-gui/src/gui/common/RsCollectionFile.h b/retroshare-gui/src/gui/common/RsCollectionFile.h index 2923ef6f6..70f0ada69 100644 --- a/retroshare-gui/src/gui/common/RsCollectionFile.h +++ b/retroshare-gui/src/gui/common/RsCollectionFile.h @@ -40,14 +40,18 @@ class RsCollectionFile public: static const QString ExtensionString ; - // Loads file from disk. - RsCollectionFile(const QString& filename) ; + RsCollectionFile() ; // create from list of files and directories RsCollectionFile(const std::vector& file_entries) ; + // Loads file from disk. + bool load(); + bool load(const QString& filename); + // Save to disk - void save(const QString& filename) const ; + bool save() const ; + bool save(const QString& filename) const ; // Download the content. void downloadFiles() const ; diff --git a/retroshare-gui/src/gui/common/RsUrlHandler.cpp b/retroshare-gui/src/gui/common/RsUrlHandler.cpp index c397982a9..5b200b859 100644 --- a/retroshare-gui/src/gui/common/RsUrlHandler.cpp +++ b/retroshare-gui/src/gui/common/RsUrlHandler.cpp @@ -21,7 +21,6 @@ #include #include -#include #include #include "RsCollectionFile.h" #include "RsUrlHandler.h" @@ -30,14 +29,9 @@ bool RsUrlHandler::openUrl(const QUrl& url) { if(url.scheme() == QString("file") && url.toLocalFile().endsWith("."+RsCollectionFile::ExtensionString)) { - try - { - RsCollectionFile(url.toLocalFile().toUtf8().constData()).downloadFiles() ; - } - catch(std::runtime_error& e) - { - QMessageBox::warning(NULL,QObject::tr("Treatment of collection file has failed."),QObject::tr("The collection file ") + url.toLocalFile() + QObject::tr(" could not be openned. Reported error is: ") + QString::fromStdString(e.what())) ; - return false ; + RsCollectionFile Collection; + if (Collection.load(url.toLocalFile().toUtf8().constData())) { + Collection.downloadFiles() ; } return true; } diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index 3bb4ef005ad475edce3a57a508b5be0ed90c8faf..f28436e781f39d3dc17b31d1957d91fe090db1bb 100644 GIT binary patch delta 6359 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 delta 6213 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 X$CAp={93-mgV5^6k`eFd%l7{VY)#@2 diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index 5919c76aa..b31a317e2 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -6135,7 +6135,7 @@ Die folgenden Wege sind möglich: - + Notify Meldungen @@ -6265,7 +6265,7 @@ Die folgenden Wege sind möglich: Schnellstart Assistent - + Search Suchen @@ -6280,7 +6280,7 @@ Die folgenden Wege sind möglich: Messenger - + Show/Hide Anzeigen/Verbergen @@ -6331,7 +6331,7 @@ Die folgenden Wege sind möglich: Maximieren - + Unfinished unfertig @@ -6341,7 +6341,7 @@ Die folgenden Wege sind möglich: - + Help Hilfe @@ -6351,7 +6351,7 @@ Die folgenden Wege sind möglich: Über - + Forums Foren @@ -6361,7 +6361,7 @@ Die folgenden Wege sind möglich: RetroShare %1 eine sichere und dezentralisierte Kommunikationsplattform - + Open Messages Öffne Nachrichten @@ -6371,12 +6371,12 @@ Die folgenden Wege sind möglich: Anwendungen - + Plugins - + Do you really want to exit RetroShare ? Möchtest du RetroShare wirklich beenden? @@ -10052,18 +10052,14 @@ Lockdatei: - - Treatment of collection file has failed. + + Treatment of collection file has failed - The collection file - - - - - could not be openned. Reported error is: + The collection file %1 could not be openned. +Reported error is: %2 @@ -10463,14 +10459,12 @@ p, li { white-space: pre-wrap; } NEU - Create selection file - Erstelle Kollektion + Erstelle Kollektion - Collection files - Kollektion + Kollektion @@ -10531,6 +10525,35 @@ p, li { white-space: pre-wrap; } Herunterladen + + RsCollectionFile + + + Cannot open file %1 + Kann Datei %1 nicht öffnen + + + + Error parsing xml file + Fehler beim Parsen des XML + + + + Open collection file + Öffne Kollektion + + + + + Collection files + Kollektion + + + + Create collection file + Kollektion erstellen + + Rshare @@ -11833,7 +11856,7 @@ p, li { white-space: pre-wrap; } Lade Konfiguration - + Create interface Erstelle Oberfläche @@ -12720,7 +12743,7 @@ p, li { white-space: pre-wrap; } TransfersDialog - + Cancel Abbrechen @@ -12730,7 +12753,7 @@ p, li { white-space: pre-wrap; } Fertige ausblenden - + Status Status @@ -12754,7 +12777,12 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Downloads:</span></p></body></html> - + + Open Collection + Öffne Kollektion + + + Show cache transfers Zeige Cache Übertragungen @@ -12838,7 +12866,7 @@ p, li { white-space: pre-wrap; } Übertragen - + Play Abspielen @@ -12963,7 +12991,7 @@ p, li { white-space: pre-wrap; } Soll dieser Download wirklich abgebrochen und gelöscht werden? - + Speed / Queue position Geschwindigkeits- / Warteschlangenposition @@ -13005,7 +13033,7 @@ p, li { white-space: pre-wrap; } - + Copy RetroShare Link Kopiere RetroShare Link @@ -13100,7 +13128,7 @@ p, li { white-space: pre-wrap; } TreeStyle_RDM - + My files Meine Dateien