From ee60d54489d7638d5e44ad0db8a034f64d35d3e6 Mon Sep 17 00:00:00 2001
From: legatvs <legatvs@gmail.com>
Date: Sun, 14 Jun 2009 13:51:01 +0300
Subject: [PATCH] Start work on merging clivefeed and clivescan into abby.

---
 src/mainwnd.cpp | 30 ++++--------------------------
 src/mainwnd.h   |  2 --
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/src/mainwnd.cpp b/src/mainwnd.cpp
index 6758688..f17fa01 100644
--- a/src/mainwnd.cpp
+++ b/src/mainwnd.cpp
@@ -26,7 +26,6 @@
 
 #include "mainwnd.h"
 #include "prefsdlg.h"
-#include "passdlg.h"
 #include "aboutdlg.h"
 
 MainWindow::MainWindow():
@@ -154,7 +153,8 @@ MainWindow::updateFormats() {
 
     // Alter widgets dynamically based on the video URL.
 
-    QString url = urlEdit->text();
+    QString url = urlEdit->toPlainText();
+
     if (url.isEmpty())
         return;
 
@@ -201,33 +201,15 @@ MainWindow::onPreferences() {
 }
 
 void
-MainWindow::onSaveasStateChanged(int state) {
-    saveasEdit  ->setEnabled(state != 0);
-    saveasButton->setEnabled(state != 0);
-
-    if (state != 0 && titleBox->isChecked())
-        titleBox->setCheckState(Qt::Unchecked);
-
-    titleBox->setEnabled(state == 0);
-}
-
-void
 MainWindow::onStreamStateChanged(int state) {
     streamSpin->setEnabled(state != 0);
 }
 
 void
-MainWindow::onSaveasBrowse() {
-    QString fname = QFileDialog::getSaveFileName(this,tr("Save as")); 
-    if (!fname.isEmpty())
-        saveasEdit->setText(fname);
-}
-
-void
 MainWindow::onStart() {
     // Check video URL
 
-    QString url = urlEdit->text();
+    QString url = urlEdit->toPlainText();
 
     if (url.isEmpty()) {
         statusBar()->showMessage(tr("Enter a video link."));
@@ -322,10 +304,6 @@ MainWindow::onStart() {
             args << QString("--connect-timeout-socks=%1").arg(n);
     }
 
-    s = saveasEdit->text();
-    if (!s.isEmpty() && saveasBox->isChecked())
-        args << QString("--output-video=%1").arg(s);
-
 #ifdef MAKE_CONTINUE_CONDITIONAL
     if (continueBox->isChecked())
         args << "--continue";
@@ -390,7 +368,7 @@ MainWindow::onURLReturnPressed() {
 
 void
 MainWindow::onFormatStateChanged(int) {
-    QString url = urlEdit->text();
+    QString url = urlEdit->toPlainText();
 
     if (url.isEmpty())
         return;
diff --git a/src/mainwnd.h b/src/mainwnd.h
index 7f2f7ae..e2cf2a2 100644
--- a/src/mainwnd.h
+++ b/src/mainwnd.h
@@ -34,8 +34,6 @@ private slots:
     void onStart();
     void onCancel();
     void onAbout();
-    void onSaveasStateChanged(int state);
-    void onSaveasBrowse();
     void onStreamStateChanged(int state);
     void onURLEditingFinished();
     void onURLReturnPressed();
-- 
2.11.4.GIT