Imported Upstream version 0.7.0

14 files changed, 33 insertions, 18 deletions

diff --git a/src/findsubtitles/filedownloader/filedownloader.cpp b/src/findsubtitles/filedownloader/filedownloader.cpp
index 19f7bd7..88c213e 100644
--- a/src/findsubtitles/filedownloader/filedownloader.cpp
+++ b/src/findsubtitles/filedownloader/filedownloader.cpp
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/filedownloader/filedownloader.h b/src/findsubtitles/filedownloader/filedownloader.h
index 4160ff9..e27961e 100644
--- a/src/findsubtitles/filedownloader/filedownloader.h
+++ b/src/findsubtitles/filedownloader/filedownloader.h
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/findsubtitles.pro b/src/findsubtitles/findsubtitles.pro
index bbfa8a1..ad414ff 100644
--- a/src/findsubtitles/findsubtitles.pro
+++ b/src/findsubtitles/findsubtitles.pro
@@ -10,6 +10,7 @@ DEPENDPATH += ..
 
 HEADERS += simplehttp.h \
            osparser.h \
+           ../lineedit_with_icon.h \
            ../filechooser.h \
            ../languages.h \
            findsubtitlesconfigdialog.h \
@@ -17,13 +18,14 @@ HEADERS += simplehttp.h \
 
 SOURCES += simplehttp.cpp \
            osparser.cpp \
+           ../lineedit_with_icon.cpp \
            ../filechooser.cpp \
            ../languages.cpp \
            findsubtitlesconfigdialog.cpp \
            findsubtitleswindow.cpp \
            main.cpp
 
-FORMS += ../filechooser.ui findsubtitleswindow.ui findsubtitlesconfigdialog.ui
+FORMS += findsubtitleswindow.ui findsubtitlesconfigdialog.ui
 
 DEFINES += NO_SMPLAYER_SUPPORT DOWNLOAD_SUBS
 
diff --git a/src/findsubtitles/findsubtitlesconfigdialog.cpp b/src/findsubtitles/findsubtitlesconfigdialog.cpp
index e4b170a..a06c00b 100644
--- a/src/findsubtitles/findsubtitlesconfigdialog.cpp
+++ b/src/findsubtitles/findsubtitlesconfigdialog.cpp
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/findsubtitlesconfigdialog.h b/src/findsubtitles/findsubtitlesconfigdialog.h
index 1a53018..c496e0e 100644
--- a/src/findsubtitles/findsubtitlesconfigdialog.h
+++ b/src/findsubtitles/findsubtitlesconfigdialog.h
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/findsubtitleswindow.cpp b/src/findsubtitles/findsubtitleswindow.cpp
index f1c51b9..662a746 100644
--- a/src/findsubtitles/findsubtitleswindow.cpp
+++ b/src/findsubtitles/findsubtitleswindow.cpp
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -62,13 +62,13 @@ FindSubtitlesWindow::FindSubtitlesWindow( QWidget * parent, Qt::WindowFlags f )
 
 	set = 0; // settings
 
-	subtitles_for_label->setBuddy(file_chooser->lineEdit());
+	subtitles_for_label->setBuddy(file_chooser);
 
 	progress->hide();
 
 	connect( file_chooser, SIGNAL(fileChanged(QString)),
              this, SLOT(setMovie(QString)) );
-	connect( file_chooser->lineEdit(), SIGNAL(textChanged(const QString &)),
+	connect( file_chooser, SIGNAL(textChanged(const QString &)),
              this, SLOT(updateRefreshButton()) );
 
 	connect( refresh_button, SIGNAL(clicked()),
diff --git a/src/findsubtitles/findsubtitleswindow.h b/src/findsubtitles/findsubtitleswindow.h
index 511f934..1ae2e49 100644
--- a/src/findsubtitles/findsubtitleswindow.h
+++ b/src/findsubtitles/findsubtitleswindow.h
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/main.cpp b/src/findsubtitles/main.cpp
index 9f8902f..4f16d47 100644
--- a/src/findsubtitles/main.cpp
+++ b/src/findsubtitles/main.cpp
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/osparser.cpp b/src/findsubtitles/osparser.cpp
index 2adf9ea..f526007 100644
--- a/src/findsubtitles/osparser.cpp
+++ b/src/findsubtitles/osparser.cpp
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/osparser.h b/src/findsubtitles/osparser.h
index aeca7b3..90edc7f 100644
--- a/src/findsubtitles/osparser.h
+++ b/src/findsubtitles/osparser.h
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/simplehttp.cpp b/src/findsubtitles/simplehttp.cpp
index 8800839..9624519 100644
--- a/src/findsubtitles/simplehttp.cpp
+++ b/src/findsubtitles/simplehttp.cpp
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -34,11 +34,22 @@ SimpleHttp::~SimpleHttp() {
 }
 
 void SimpleHttp::download(const QString & url) {
+	qDebug("SimpleHttp::download: %s", url.toLatin1().constData());
+
 	downloaded_text.clear();
 
 	QUrl u(url);
 	setHost( u.host() );
-	http_get_id = get( u.path() );
+
+	/*
+	qDebug("u.path: %s", u.path().toLatin1().constData());
+	qDebug("u.query: %s", u.encodedQuery().constData());
+	*/
+
+	QString p = u.path();
+	if (!u.encodedQuery().isEmpty()) p += "?" + u.encodedQuery();
+
+	http_get_id = get( p );
 
 	emit connecting(u.host());
 }
@@ -72,7 +83,9 @@ void SimpleHttp::httpRequestFinished(int request_id, bool error) {
 
 	downloaded_text += readAll();
 
-	if (!downloaded_text.isEmpty()) {
+	//qDebug("downloaded_text: '%s'", downloaded_text.constData());
+
+	if ((!error) && (!downloaded_text.isEmpty())) {
 		emit downloadFinished(downloaded_text);
 	}
 }
diff --git a/src/findsubtitles/simplehttp.h b/src/findsubtitles/simplehttp.h
index 94b50f7..9b57526 100644
--- a/src/findsubtitles/simplehttp.h
+++ b/src/findsubtitles/simplehttp.h
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/subchooserdialog.cpp b/src/findsubtitles/subchooserdialog.cpp
index cd64a69..addbc39 100644
--- a/src/findsubtitles/subchooserdialog.cpp
+++ b/src/findsubtitles/subchooserdialog.cpp
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/findsubtitles/subchooserdialog.h b/src/findsubtitles/subchooserdialog.h
index e3c71d2..c2545a4 100644
--- a/src/findsubtitles/subchooserdialog.h
+++ b/src/findsubtitles/subchooserdialog.h
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by