Imported Upstream version 0.7.0

1 files changed, 31 insertions, 28 deletions

diff --git a/src/filechooser.cpp b/src/filechooser.cpp
index 8de459d..85d4954 100644
--- a/src/filechooser.cpp
+++ b/src/filechooser.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
@@ -17,6 +17,8 @@
 */
 
 #include "filechooser.h"
+#include <QToolButton>
+#include <QStyle>
 
 //#define NO_SMPLAYER_SUPPORT
 
@@ -27,40 +29,34 @@
 #include <QFileDialog>
 #endif
 
-FileChooser::FileChooser(QWidget * parent) : QWidget(parent) 
-{
-	setupUi(this);
-
-#ifndef NO_SMPLAYER_SUPPORT
-	button->setIcon(Images::icon("find"));
-#else
-	button->setIcon(QIcon(":/find"));
-#endif
+QString FileChooser::last_dir;
 
+FileChooser::FileChooser(QWidget * parent) : LineEditWithIcon(parent) 
+{
 	setDialogType(GetFileName);
 	setOptions(0);
-}
 
-FileChooser::~FileChooser() {
-}
+	setupButton();
+	button->setCursor( Qt::PointingHandCursor );
 
-QLineEdit * FileChooser::lineEdit() {
-	return line_edit;
+	connect(button, SIGNAL(clicked()), this, SLOT(openFileDialog()));
 }
 
-QToolButton * FileChooser::toolButton() {
-	return button;
+FileChooser::~FileChooser() {
 }
 
-QString FileChooser::text() const {
-	return line_edit->text();
+void FileChooser::setupButton() {
+#ifdef NO_SMPLAYER_SUPPORT
+	setIcon( QPixmap(":/folder_open") );
+#else
+	setIcon( Images::icon("folder_open") );
+#endif
+	button->setToolTip( tr("Click to select a file or folder") );
 }
 
-void FileChooser::setText(const QString & text) {
-	line_edit->setText(text);
-}
+void FileChooser::openFileDialog() {
+	qDebug("FileChooser::openFileDialog");
 
-void FileChooser::on_button_clicked() {
 	QString result;
 	QString f;
 
@@ -68,35 +64,42 @@ void FileChooser::on_button_clicked() {
 		QFileDialog::Options opts = options();
 		if (opts == 0) opts = QFileDialog::DontResolveSymlinks;
 
+		QString dir = QFileInfo(text()).absolutePath();
+		if (dir.isEmpty()) dir = last_dir;
+
 #ifndef NO_SMPLAYER_SUPPORT
 		result = MyFileDialog::getOpenFileName( 
 #else
 		result = QFileDialog::getOpenFileName( 
 #endif
                         this, caption(),
-                        line_edit->text(),
+                        dir,
                         filter(), &f, opts );
+		if (!result.isEmpty()) last_dir = QFileInfo(result).absolutePath();
 	}
 	else
 	if (dialogType() == GetDirectory) {
 		QFileDialog::Options opts = options();
 		if (opts == 0) opts = QFileDialog::ShowDirsOnly;
 
+		QString dir = text();
+		if (dir.isEmpty()) dir = last_dir;
+
 #ifndef NO_SMPLAYER_SUPPORT
 		result = MyFileDialog::getExistingDirectory(
 #else
 		result = QFileDialog::getExistingDirectory(
 #endif
                     this, caption(),
-                    line_edit->text(), opts );
+                    dir, opts );
+		if (!result.isEmpty()) last_dir = result;
 	}
 
 	if (!result.isEmpty()) {
-		QString old_file = line_edit->text();
-		line_edit->setText(result);
+		QString old_file = text();
+		setText(result);
 		if (old_file != result) emit fileChanged(result);
 	}
 }
 
 #include "moc_filechooser.cpp"
-