Changeset 119 for smplayer/trunk/src/findsubtitles
- Timestamp:
- Dec 27, 2011, 5:44:12 PM (14 years ago)
- Location:
- smplayer/trunk
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
smplayer/trunk
-
Property svn:mergeinfo
set to
/smplayer/vendor/current merged eligible
-
Property svn:mergeinfo
set to
-
smplayer/trunk/src/findsubtitles/filedownloader/filedownloader.cpp
r114 r119 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 0Ricardo Villalba <rvm@escomposlinux.org>2 Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> 3 3 4 4 This program is free software; you can redistribute it and/or modify … … 62 62 63 63 http_request_aborted = false; 64 http_get_id = http->get(url.path(), &buffer);64 http_get_id = http->get(url.path()); 65 65 66 66 setLabelText(tr("Downloading %1").arg(url.toString())); … … 87 87 emit downloadFailed(http->errorString()); 88 88 } else { 89 emit downloadFinished(buffer.data());89 emit downloadFinished(http->readAll()); 90 90 } 91 91 } -
smplayer/trunk/src/findsubtitles/filedownloader/filedownloader.h
r114 r119 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 0Ricardo Villalba <rvm@escomposlinux.org>2 Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> 3 3 4 4 This program is free software; you can redistribute it and/or modify … … 24 24 #include <QProgressDialog> 25 25 #include <QUrl> 26 #include <QBuffer>27 26 #include <QNetworkProxy> 28 27 … … 57 56 int http_get_id; 58 57 bool http_request_aborted; 59 QBuffer buffer; 58 60 59 }; 61 60 -
smplayer/trunk/src/findsubtitles/findsubtitlesconfigdialog.cpp
r114 r119 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 0Ricardo Villalba <rvm@escomposlinux.org>2 Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> 3 3 4 4 This program is free software; you can redistribute it and/or modify -
smplayer/trunk/src/findsubtitles/findsubtitlesconfigdialog.h
r114 r119 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 0Ricardo Villalba <rvm@escomposlinux.org>2 Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> 3 3 4 4 This program is free software; you can redistribute it and/or modify -
smplayer/trunk/src/findsubtitles/findsubtitleswindow.cpp
r114 r119 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 0Ricardo Villalba <rvm@escomposlinux.org>2 Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> 3 3 4 4 This program is free software; you can redistribute it and/or modify … … 129 129 130 130 file_downloader = new FileDownloader(this); 131 file_downloader->setModal(true);131 file_downloader->setModal(false); 132 132 connect( file_downloader, SIGNAL(downloadFailed(QString)), 133 133 this, SLOT(showError(QString)), Qt::QueuedConnection ); -
smplayer/trunk/src/findsubtitles/findsubtitleswindow.h
r114 r119 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 0Ricardo Villalba <rvm@escomposlinux.org>2 Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> 3 3 4 4 This program is free software; you can redistribute it and/or modify -
smplayer/trunk/src/findsubtitles/main.cpp
r114 r119 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 0Ricardo Villalba <rvm@escomposlinux.org>2 Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> 3 3 4 4 This program is free software; you can redistribute it and/or modify -
smplayer/trunk/src/findsubtitles/osparser.cpp
r114 r119 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 0Ricardo Villalba <rvm@escomposlinux.org>2 Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> 3 3 4 4 This program is free software; you can redistribute it and/or modify -
smplayer/trunk/src/findsubtitles/osparser.h
r114 r119 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 0Ricardo Villalba <rvm@escomposlinux.org>2 Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> 3 3 4 4 This program is free software; you can redistribute it and/or modify -
smplayer/trunk/src/findsubtitles/simplehttp.cpp
r114 r119 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 0Ricardo Villalba <rvm@escomposlinux.org>2 Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> 3 3 4 4 This program is free software; you can redistribute it and/or modify -
smplayer/trunk/src/findsubtitles/simplehttp.h
r114 r119 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 0Ricardo Villalba <rvm@escomposlinux.org>2 Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> 3 3 4 4 This program is free software; you can redistribute it and/or modify -
smplayer/trunk/src/findsubtitles/subchooserdialog.cpp
r114 r119 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 0Ricardo Villalba <rvm@escomposlinux.org>2 Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> 3 3 4 4 This program is free software; you can redistribute it and/or modify -
smplayer/trunk/src/findsubtitles/subchooserdialog.h
r114 r119 1 1 /* smplayer, GUI front-end for mplayer. 2 Copyright (C) 2006-201 0Ricardo Villalba <rvm@escomposlinux.org>2 Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> 3 3 4 4 This program is free software; you can redistribute it and/or modify
Note:
See TracChangeset
for help on using the changeset viewer.