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

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

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

smplayer/trunk/src/findsubtitles/findsubtitleswindow.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -147 +147 @@
         file_downloader = new FileDownloader(this);
         file_downloader->setModal(false);
+        file_downloader->hide();
+
         connect( file_downloader, SIGNAL(downloadFailed(QString)),
              this, SLOT(showError(QString)), Qt::QueuedConnection );
@@ -177 +179 @@
         osclient->setServer(os_server);
 
+#ifdef FS_USE_PROXY
         // Proxy
         use_proxy = false;
@@ -186 +189 @@
 
         setupProxy();
+#endif
 }
 
@@ -195 +199 @@
         set = settings;
         loadSettings();
+#ifdef FS_USE_PROXY
         setupProxy();
-}
-
+#endif
+}
+
+#ifdef FS_USE_PROXY
 void FindSubtitlesWindow::setProxy(QNetworkProxy proxy) {
         /*
@@ -212 +219 @@
            proxy.hostName().toUtf8().constData(), proxy.port(), proxy.type());
 }
+#endif
 
 void FindSubtitlesWindow::retranslateStrings() {
@@ -761 +769 @@
 
         d.setServer( os_server );
+        #ifdef OS_SEARCH_WORKAROUND
+        d.setRetries(osclient->retries());
+        #endif
+        #ifdef FS_USE_PROXY
         d.setUseProxy( use_proxy );
         d.setProxyHostname( proxy_host );
@@ -767 +779 @@
         d.setProxyPassword( proxy_password );
         d.setProxyType( proxy_type );
+        #endif
+
+        #ifdef DOWNLOAD_SUBS
+        d.setAppendLang(include_lang_on_filename);
+        #endif
 
         if (d.exec() == QDialog::Accepted) {
                 os_server = d.server();
+                #ifdef OS_SEARCH_WORKAROUND
+                osclient->setRetries( d.retries() );
+                #endif
+                #ifdef FS_USE_PROXY
                 use_proxy = d.useProxy();
                 proxy_host = d.proxyHostname();
@@ -776 +797 @@
                 proxy_password = d.proxyPassword();
                 proxy_type = d.proxyType();
+                #endif
 
                 osclient->setServer(os_server);
+                #ifdef FS_USE_PROXY
                 setupProxy();
-        }
-}
-
+                #endif
+
+                #ifdef DOWNLOAD_SUBS
+                include_lang_on_filename = d.appendLang();
+                #endif
+        }
+}
+
+#ifdef FS_USE_PROXY
 void FindSubtitlesWindow::setupProxy() {
         QNetworkProxy proxy;
@@ -803 +832 @@
         setProxy(proxy);
 }
+#endif
 
 void FindSubtitlesWindow::saveSettings() {
@@ -810 +840 @@
 
         set->setValue("xmlrpc_server", os_server);
+#ifdef OS_SEARCH_WORKAROUND
+        set->setValue("retries", osclient->retries());
+#endif
+
         set->setValue("language", language());
 #ifdef DOWNLOAD_SUBS
         set->setValue("include_lang_on_filename", includeLangOnFilename());
 #endif
+
+#ifdef FS_USE_PROXY
         set->setValue("proxy/use_proxy", use_proxy);
         set->setValue("proxy/type", proxy_type);
@@ -820 +856 @@
         set->setValue("proxy/username", proxy_username);
         set->setValue("proxy/password", proxy_password);
+#endif
 
         set->endGroup();
@@ -830 +867 @@
 
         os_server = set->value("xmlrpc_server", os_server).toString();
+#ifdef OS_SEARCH_WORKAROUND
+        osclient->setRetries( set->value("retries", osclient->retries()).toInt() );
+#endif
+
         setLanguage( set->value("language", language()).toString() );
 #ifdef DOWNLOAD_SUBS
         setIncludeLangOnFilename( set->value("include_lang_on_filename", includeLangOnFilename()).toBool() );
 #endif
+
+#ifdef FS_USE_PROXY
         use_proxy = set->value("proxy/use_proxy", use_proxy).toBool();
         proxy_type = set->value("proxy/type", proxy_type).toInt();
@@ -840 +883 @@
         proxy_username = set->value("proxy/username", proxy_username).toString();
         proxy_password = set->value("proxy/password", proxy_password).toString();
+#endif
 
         set->endGroup();