Changeset 124 for smplayer/trunk/src/findsubtitles/findsubtitleswindow.cpp

Timestamp:

Mar 16, 2012, 4:02:47 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: 0.7.1 trunk update

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/findsubtitles/findsubtitleswindow.cpp (modified) (9 diffs)

smplayer/trunk/src/findsubtitles/findsubtitleswindow.cpp

@@ -1 +1 @@
 /*  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
@@ -63 +63 @@
         set = 0; // settings
 
-        subtitles_for_label->setBuddy(file_chooser->lineEdit());
+        subtitles_for_label->setBuddy(file_chooser);
 
         progress->hide();
@@ -69 +69 @@
         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()) );
 
@@ -153 +153 @@
         language_filter->setCurrentIndex(0);
 
+        // Opensubtitles server
+        os_server = "http://www.opensubtitles.org";
+
         // Proxy
         use_proxy = false;
@@ -245 +248 @@
                 qWarning("FindSubtitlesWindow::setMovie: hash invalid. Doing nothing.");
         } else {
-                QString link = "http://www.opensubtitles.org/search/sublanguageid-all/moviehash-" + hash + "/simplexml";
+                QString link = os_server + "/search/sublanguageid-all/moviehash-" + hash + "/simplexml";
                 qDebug("FindSubtitlesWindow::setMovie: link: '%s'", link.toLatin1().constData());
                 downloader->download(link);
@@ -601 +604 @@
         FindSubtitlesConfigDialog d(this);
 
+        d.setServer( os_server );
         d.setUseProxy( use_proxy );
         d.setProxyHostname( proxy_host );
@@ -609 +613 @@
 
         if (d.exec() == QDialog::Accepted) {
+                os_server = d.server();
                 use_proxy = d.useProxy();
                 proxy_host = d.proxyHostname();
@@ -647 +652 @@
         set->beginGroup("findsubtitles");
 
+        set->setValue("server", os_server);
         set->setValue("language", language());
 #ifdef DOWNLOAD_SUBS
@@ -666 +672 @@
         set->beginGroup("findsubtitles");
 
+        os_server = set->value("server", os_server).toString();
         setLanguage( set->value("language", language()).toString() );
 #ifdef DOWNLOAD_SUBS