Changeset 124 for smplayer/trunk/src/filechooser.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/filechooser.cpp (modified) (9 diffs)

smplayer/trunk/src/filechooser.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
@@ -18 +18 @@
 
 #include "filechooser.h"
+#include <QToolButton>
+#include <QStyle>
 
 //#define NO_SMPLAYER_SUPPORT
@@ -28 +30 @@
 #endif
 
-FileChooser::FileChooser(QWidget * parent) : QWidget(parent) 
+QString FileChooser::last_dir;
+
+FileChooser::FileChooser(QWidget * parent) : LineEditWithIcon(parent) 
 {
-        setupUi(this);
-
-#ifndef NO_SMPLAYER_SUPPORT
-        button->setIcon(Images::icon("find"));
-#else
-        button->setIcon(QIcon(":/find"));
-#endif
-
         setDialogType(GetFileName);
         setOptions(0);
+
+        setupButton();
+        button->setCursor( Qt::PointingHandCursor );
+
+        connect(button, SIGNAL(clicked()), this, SLOT(openFileDialog()));
 }
 
@@ -45 +46 @@
 }
 
-QLineEdit * FileChooser::lineEdit() {
-        return line_edit;
+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") );
 }
 
-QToolButton * FileChooser::toolButton() {
-        return button;
-}
+void FileChooser::openFileDialog() {
+        qDebug("FileChooser::openFileDialog");
 
-QString FileChooser::text() const {
-        return line_edit->text();
-}
-
-void FileChooser::setText(const QString & text) {
-        line_edit->setText(text);
-}
-
-void FileChooser::on_button_clicked() {
         QString result;
         QString f;
@@ -69 +65 @@
                 if (opts == 0) opts = QFileDialog::DontResolveSymlinks;
 
+                QString dir = QFileInfo(text()).absolutePath();
+                if (dir.isEmpty()) dir = last_dir;
+                if (dir.isEmpty()) dir = QDir::homePath();
+
 #ifndef NO_SMPLAYER_SUPPORT
                 result = MyFileDialog::getOpenFileName( 
@@ -75 +75 @@
 #endif
                         this, caption(),
-                        line_edit->text(),
+                        dir,
                         filter(), &f, opts );
+                if (!result.isEmpty()) last_dir = QFileInfo(result).absolutePath();
         }
         else
@@ -82 +83 @@
                 QFileDialog::Options opts = options();
                 if (opts == 0) opts = QFileDialog::ShowDirsOnly;
+
+                QString dir = text();
+                if (dir.isEmpty()) dir = last_dir;
+                if (dir.isEmpty()) dir = QDir::homePath();
 
 #ifndef NO_SMPLAYER_SUPPORT
@@ -89 +94 @@
 #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);
         }
@@ -100 +106 @@
 
 #include "moc_filechooser.cpp"
-