Skip to content

V
vlc
Commit a04632a1 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Esc key in the FileDialog should close it.

parent 2ee008ab
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
modules/gui/qt4/components/open_panels.cpp
View file @ a04632a1
...@@ -191,11 +191,13 @@ void FileOpenPanel::accept() ...@@ -191,11 +191,13 @@ void FileOpenPanel::accept()
void FileOpenBox::accept() void FileOpenBox::accept()
{ {
OpenDialog::getInstance( NULL, NULL, true )->selectSlots(); OpenDialog::getInstance( NULL, NULL, true )->cancel();
} }
void FileOpenBox::reject() void FileOpenBox::reject()
{} {
OpenDialog::getInstance( NULL, NULL, true )->selectSlots();
}
/* Function called by Open Dialog when clicked on cancel */ /* Function called by Open Dialog when clicked on cancel */
void FileOpenPanel::clear() void FileOpenPanel::clear()
......
modules/gui/qt4/dialogs/open.hpp
View file @ a04632a1
...@@ -57,6 +57,8 @@ class QTabWidget; ...@@ -57,6 +57,8 @@ class QTabWidget;
class OpenDialog : public QVLCDialog class OpenDialog : public QVLCDialog
{ {
friend class FileOpenBox;
Q_OBJECT; Q_OBJECT;
public: public:
static OpenDialog * getInstance( QWidget *parent, intf_thread_t *p_intf, static OpenDialog * getInstance( QWidget *parent, intf_thread_t *p_intf,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment