Esc key in the FileDialog should close it.

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 8c3cd215e7026b8dee6695d02f0a70a4361530c0..21e18a454c40082fa20c37314b6d83e460f56bc3 100644 (file)
--- 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 ea287b8b34e4c312973b182fb5856ee6a3353843..92a546dd6a65dda91239a6c8111d28b5c95a3e80 100644 (file)
--- 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,