diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-06-15 20:23:58 +0200 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-06-15 20:23:58 +0200 |
| commit | 42be0eb4f1d7a25dca97e8e2eb4ec4d03b7931fb (patch) | |
| tree | fae3347b0c924378c57862feea2708766d159771 /src/findsubtitles | |
| parent | 1a2f0c9c1087899a00298db8fa70518d3c1e69f8 (diff) | |
Imported Upstream version 16.6.0~ds0
Diffstat (limited to 'src/findsubtitles')
| -rw-r--r-- | src/findsubtitles/filedownloader/filedownloader.cpp | 2 | ||||
| -rw-r--r-- | src/findsubtitles/findsubtitleswindow.cpp | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/findsubtitles/filedownloader/filedownloader.cpp b/src/findsubtitles/filedownloader/filedownloader.cpp index 395ca5f..bfbef8b 100644 --- a/src/findsubtitles/filedownloader/filedownloader.cpp +++ b/src/findsubtitles/filedownloader/filedownloader.cpp @@ -28,6 +28,8 @@ FileDownloader::FileDownloader(QWidget *parent) : QProgressDialog(parent) setMinimumDuration(0); setRange(0,0); + + reset(); // Prevent the dialog to be shown on initialization (Qt 5.5) connect(this, SIGNAL(canceled()), this, SLOT(cancelDownload())); /* diff --git a/src/findsubtitles/findsubtitleswindow.cpp b/src/findsubtitles/findsubtitleswindow.cpp index e717331..f129598 100644 --- a/src/findsubtitles/findsubtitleswindow.cpp +++ b/src/findsubtitles/findsubtitleswindow.cpp @@ -50,6 +50,10 @@ #endif +#if QT_VERSION >= 0x050000 +#include "myscroller.h" +#endif + //#define NO_SMPLAYER_SUPPORT #ifndef NO_SMPLAYER_SUPPORT @@ -108,6 +112,10 @@ FindSubtitlesWindow::FindSubtitlesWindow( QWidget * parent, Qt::WindowFlags f ) view->setEditTriggers(QAbstractItemView::NoEditTriggers); view->setContextMenuPolicy( Qt::CustomContextMenu ); +#if QT_VERSION >= 0x050000 + MyScroller::setScroller(view->viewport()); +#endif + connect(view, SIGNAL(activated(const QModelIndex &)), this, SLOT(itemActivated(const QModelIndex &)) ); connect(view->selectionModel(), SIGNAL(currentChanged(const QModelIndex &,const QModelIndex &)), |