d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

- Fix for media file preview

adaptive-webui-19844
Christophe Dumez 15 years ago
parent
d22d6468c7
commit
90207020f2
6 changed files with 82 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/GUI.cpp
  2. 1
      src/GUI.h
  3. 2
      src/filterparserthread.h
  4. 150
      src/previewselect.h
  5. 4
      src/transferlistwidget.cpp
  6. 1
      src/transferlistwidget.h

4
src/GUI.cpp
Unescape View File

@ -424,10 +424,6 @@ void GUI::on_actionExit_triggered() { @@ -424,10 +424,6 @@ void GUI::on_actionExit_triggered() {
close();
}
void GUI::previewFile(QString filePath) {
QDesktopServices::openUrl(QString("file://")+filePath);
}
int GUI::getCurrentTabIndex() const {
if(isMinimized() || !isVisible())
return -1;

1
src/GUI.h
Unescape View File

@ -105,7 +105,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{ @@ -105,7 +105,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{
void on_actionShow_console_triggered();
void readParamsOnSocket();
void acceptConnection();
void previewFile(QString filePath);
void balloonClicked();
void writeSettings();
void readSettings();

2
src/filterparserthread.h
Unescape View File

@ -72,7 +72,7 @@ class FilterParserThread : public QThread { @@ -72,7 +72,7 @@ class FilterParserThread : public QThread {
parseP2PFilterFile(filePath);
} else {
if(filePath.endsWith(".p2p", Qt::CaseInsensitive)) {
// PeerGuardian p2p file
// PeerGuardian p2b file
parseP2BFilterFile(filePath);
} else {
// Default: eMule DAT format

150
src/previewselect.h
Unescape View File

@ -50,90 +50,92 @@ using namespace libtorrent; @@ -50,90 +50,92 @@ using namespace libtorrent;
class previewSelect: public QDialog, private Ui::preview {
Q_OBJECT
private:
QStandardItemModel *previewListModel;
PreviewListDelegate *listDelegate;
QTorrentHandle h;
QList<int> indexes;
private:
QStandardItemModel *previewListModel;
PreviewListDelegate *listDelegate;
QTorrentHandle h;
QList<int> indexes;
signals:
void readyToPreviewFile(QString) const;
signals:
void readyToPreviewFile(QString) const;
protected slots:
void on_previewButton_clicked(){
QModelIndex index;
QModelIndexList selectedIndexes = previewList->selectionModel()->selectedIndexes();
if(selectedIndexes.size() == 0) return;
QString path;
foreach(index, selectedIndexes){
if(index.column() == NAME){
path = h.files_path().at(indexes.at(index.row()));
// File
if(QFile::exists(path)){
emit readyToPreviewFile(path);
}
close();
return;
}
protected slots:
void on_previewButton_clicked(){
QModelIndex index;
QModelIndexList selectedIndexes = previewList->selectionModel()->selectedRows(NAME);
if(selectedIndexes.size() == 0) return;
QString path;
foreach(index, selectedIndexes){
path = h.files_path().at(indexes.at(index.row()));
// File
if(QFile::exists(path)){
emit readyToPreviewFile(path);
} else {
QMessageBox::critical(0, tr("Preview impossible"), tr("Sorry, we can't preview this file"));
}
qDebug("Cannot find file: %s", path.toLocal8Bit().data());
QMessageBox::critical(0, tr("Preview impossible"), tr("Sorry, we can't preview this file"));
close();
return;
}
qDebug("Cannot find file: %s", path.toLocal8Bit().data());
QMessageBox::critical(0, tr("Preview impossible"), tr("Sorry, we can't preview this file"));
close();
}
void on_cancelButton_clicked(){
close();
}
void on_cancelButton_clicked(){
close();
}
public:
previewSelect(QWidget* parent, QTorrentHandle h): QDialog(parent), h(h){
setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
// Preview list
previewListModel = new QStandardItemModel(0, 3);
previewListModel->setHeaderData(NAME, Qt::Horizontal, tr("Name"));
previewListModel->setHeaderData(SIZE, Qt::Horizontal, tr("Size"));
previewListModel->setHeaderData(PROGRESS, Qt::Horizontal, tr("Progress"));
previewList->setModel(previewListModel);
listDelegate = new PreviewListDelegate(this);
previewList->setItemDelegate(listDelegate);
previewList->header()->resizeSection(0, 200);
// Fill list in
std::vector<size_type> fp;
h.file_progress(fp);
unsigned int nbFiles = h.num_files();
for(unsigned int i=0; i<nbFiles; ++i){
QString fileName = h.file_at(i);
QString extension = fileName.split(QString::fromUtf8(".")).last().toUpper();
if(misc::isPreviewable(extension)) {
int row = previewListModel->rowCount();
previewListModel->insertRow(row);
previewListModel->setData(previewListModel->index(row, NAME), QVariant(fileName));
previewListModel->setData(previewListModel->index(row, SIZE), QVariant((qlonglong)h.filesize_at(i)));
previewListModel->setData(previewListModel->index(row, PROGRESS), QVariant((double)fp[i]/h.filesize_at(i)));
indexes << i;
}
}
previewList->selectionModel()->select(previewListModel->index(0, NAME), QItemSelectionModel::Select);
previewList->selectionModel()->select(previewListModel->index(0, SIZE), QItemSelectionModel::Select);
previewList->selectionModel()->select(previewListModel->index(0, PROGRESS), QItemSelectionModel::Select);
if(!previewListModel->rowCount()){
QMessageBox::critical(0, tr("Preview impossible"), tr("Sorry, we can't preview this file"));
close();
}
connect(this, SIGNAL(readyToPreviewFile(QString)), parent, SLOT(previewFile(QString)));
if(previewListModel->rowCount() == 1){
// Only one file : no choice
on_previewButton_clicked();
}else{
show();
public:
previewSelect(QWidget* parent, QTorrentHandle h): QDialog(parent), h(h){
setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
// Preview list
previewListModel = new QStandardItemModel(0, 3);
previewListModel->setHeaderData(NAME, Qt::Horizontal, tr("Name"));
previewListModel->setHeaderData(SIZE, Qt::Horizontal, tr("Size"));
previewListModel->setHeaderData(PROGRESS, Qt::Horizontal, tr("Progress"));
previewList->setModel(previewListModel);
listDelegate = new PreviewListDelegate(this);
previewList->setItemDelegate(listDelegate);
previewList->header()->resizeSection(0, 200);
// Fill list in
std::vector<size_type> fp;
h.file_progress(fp);
unsigned int nbFiles = h.num_files();
for(unsigned int i=0; i<nbFiles; ++i){
QString fileName = h.file_at(i);
QString extension = fileName.split(QString::fromUtf8(".")).last().toUpper();
if(misc::isPreviewable(extension)) {
int row = previewListModel->rowCount();
previewListModel->insertRow(row);
previewListModel->setData(previewListModel->index(row, NAME), QVariant(fileName));
previewListModel->setData(previewListModel->index(row, SIZE), QVariant((qlonglong)h.filesize_at(i)));
previewListModel->setData(previewListModel->index(row, PROGRESS), QVariant((double)fp[i]/h.filesize_at(i)));
indexes << i;
}
}
~previewSelect(){
delete previewListModel;
delete listDelegate;
previewList->selectionModel()->select(previewListModel->index(0, NAME), QItemSelectionModel::Select);
previewList->selectionModel()->select(previewListModel->index(0, SIZE), QItemSelectionModel::Select);
previewList->selectionModel()->select(previewListModel->index(0, PROGRESS), QItemSelectionModel::Select);
if(!previewListModel->rowCount()){
QMessageBox::critical(0, tr("Preview impossible"), tr("Sorry, we can't preview this file"));
close();
}
connect(this, SIGNAL(readyToPreviewFile(QString)), parent, SLOT(previewFile(QString)));
if(previewListModel->rowCount() == 1){
qDebug("Torrent file only contains one file, no need to display selection dialog before preview");
// Only one file : no choice
on_previewButton_clicked();
}else{
qDebug("Displaying media file selection dialog for preview");
show();
}
}
~previewSelect(){
delete previewListModel;
delete listDelegate;
}
};
#endif

4
src/transferlistwidget.cpp
Unescape View File

@ -251,6 +251,10 @@ void TransferListWidget::updateMetadata(QTorrentHandle &h) { @@ -251,6 +251,10 @@ void TransferListWidget::updateMetadata(QTorrentHandle &h) {
}
}
void TransferListWidget::previewFile(QString filePath) {
QDesktopServices::openUrl(QString("file://")+filePath);
}
int TransferListWidget::updateTorrent(int row) {
TorrentState s = STATE_INVALID;
QString hash = getHashFromRow(row);

1
src/transferlistwidget.h
Unescape View File

@ -108,6 +108,7 @@ public slots: @@ -108,6 +108,7 @@ public slots:
void hidePriorityColumn(bool hide);
void displayDLHoSMenu(const QPoint&);
void applyFilter(int f);
void previewFile(QString filePath);
signals:
void currentTorrentChanged(QTorrentHandle &h);

Write Preview
Loading…
Cancel
Save