[vlc-devel] commit: Esc key in the FileDialog should close it. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Aug 24 11:44:55 2008 -0700| [a04632a1b4dd89ce22712500459371acb51356fd] | committer: Jean-Baptiste Kempf 

Esc key in the FileDialog should close it.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a04632a1b4dd89ce22712500459371acb51356fd
---

 modules/gui/qt4/components/open_panels.cpp |    6 ++++--
 modules/gui/qt4/dialogs/open.hpp           |    2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 8c3cd21..21e18a4 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -191,11 +191,13 @@ void FileOpenPanel::accept()
 
 void FileOpenBox::accept()
 {
-    OpenDialog::getInstance( NULL, NULL, true )->selectSlots();
+    OpenDialog::getInstance( NULL, NULL, true )->cancel();
 }
 
 void FileOpenBox::reject()
-{}
+{
+    OpenDialog::getInstance( NULL, NULL, true )->selectSlots();
+}
 
 /* Function called by Open Dialog when clicked on cancel */
 void FileOpenPanel::clear()
diff --git a/modules/gui/qt4/dialogs/open.hpp b/modules/gui/qt4/dialogs/open.hpp
index ea287b8..92a546d 100644
--- a/modules/gui/qt4/dialogs/open.hpp
+++ b/modules/gui/qt4/dialogs/open.hpp
@@ -57,6 +57,8 @@ class QTabWidget;
 
 class OpenDialog : public QVLCDialog
 {
+    friend class FileOpenBox;
+
     Q_OBJECT;
 public:
     static OpenDialog * getInstance( QWidget *parent, intf_thread_t *p_intf,