Improve the "Open" dialog:

 - the "OK" button will be disabled until a file has been selected (this avoids an error when clicking on "OK" while no file was selected).
 - when the selected file cannot be dubbed (for example when opening an rtsp stream), the wrong label was grayed out.

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4297 10f7b99b-c216-0410-bff0-8a66a9350fd8

26 files changed, 16 insertions, 3 deletions

diff --git a/docs/Changelog.txt b/docs/Changelog.txt
index b081395d8..a1afda82a 100644
--- a/docs/Changelog.txt
+++ b/docs/Changelog.txt
@@ -27,6 +27,11 @@ Legend:
   intergrated Intel adapter

 ! The settings location is now changed only when applying the changes in the

   options dialog instead of immediately after changing the state of the checkbox

+! Improve the "Open" dialog:

+   - the "OK" button will be disabled until a file has been selected (this avoids

+     an error when clicking on "OK" while no file was selected)

+   - when the selected file cannot be dubbed (for example when opening an rtsp

+     stream), the wrong label was grayed out

 ! Ticket #1182, Unable to playback MPEG2 in AVI

 ! Ticket #1589, Crash with "Null (uncompressed)"

 ! Ticket #1946, Skipping bug with EVR custom output and .webm with vsync on

diff --git a/src/apps/mplayerc/OpenDlg.cpp b/src/apps/mplayerc/OpenDlg.cpp
index 2f585c77c..619641369 100644
--- a/src/apps/mplayerc/OpenDlg.cpp
+++ b/src/apps/mplayerc/OpenDlg.cpp
@@ -2,7 +2,7 @@
  * $Id$

  *

  * (C) 2003-2006 Gabest

- * (C) 2006-2011 see AUTHORS

+ * (C) 2006-2012 see AUTHORS

  *

  * This file is part of mplayerc.

  *

@@ -63,6 +63,7 @@ BEGIN_MESSAGE_MAP(COpenDlg, CResizableDialog)
 	ON_UPDATE_COMMAND_UI(IDC_STATIC1, OnUpdateDub)

 	ON_UPDATE_COMMAND_UI(IDC_COMBO2, OnUpdateDub)

 	ON_UPDATE_COMMAND_UI(IDC_BUTTON2, OnUpdateDub)

+	ON_UPDATE_COMMAND_UI(IDOK, OnUpdateOk)

 END_MESSAGE_MAP()

 

 

@@ -214,6 +215,12 @@ void COpenDlg::OnBnClickedOk()
 

 void COpenDlg::OnUpdateDub(CCmdUI* pCmdUI)

 {

-	m_mrucombo.GetWindowText(m_path);

+	UpdateData();

 	pCmdUI->Enable(AfxGetAppSettings().m_Formats.GetEngine(m_path) == DirectShow);

 }

+

+void COpenDlg::OnUpdateOk(CCmdUI* pCmdUI)

+{

+	UpdateData();

+	pCmdUI->Enable(!m_path.IsEmpty() || !m_path2.IsEmpty());

+}

diff --git a/src/apps/mplayerc/OpenDlg.h b/src/apps/mplayerc/OpenDlg.h
index b303cc655..25d4bba72 100644
--- a/src/apps/mplayerc/OpenDlg.h
+++ b/src/apps/mplayerc/OpenDlg.h
@@ -2,7 +2,7 @@
  * $Id$

  *

  * (C) 2003-2006 Gabest

- * (C) 2006-2010 see AUTHORS

+ * (C) 2006-2012 see AUTHORS

  *

  * This file is part of mplayerc.

  *

@@ -60,4 +60,5 @@ public:
 	afx_msg void OnBnClickedBrowsebutton2();

 	afx_msg void OnBnClickedOk();

 	afx_msg void OnUpdateDub(CCmdUI* pCmdUI);

+	afx_msg void OnUpdateOk(CCmdUI* pCmdUI);

 };

diff --git a/src/apps/mplayerc/mpcresources/mplayerc.br.rc b/src/apps/mplayerc/mpcresources/mplayerc.br.rc
index 0b2287466..962d5862f 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.br.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.br.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.by.rc b/src/apps/mplayerc/mpcresources/mplayerc.by.rc
index abc087448..836a4f9aa 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.by.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.by.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.ca.rc b/src/apps/mplayerc/mpcresources/mplayerc.ca.rc
index b34bcd674..8bf7e66e1 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.ca.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.ca.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.cz.rc b/src/apps/mplayerc/mpcresources/mplayerc.cz.rc
index 060daaa9d..d1514e665 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.cz.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.cz.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.de.rc b/src/apps/mplayerc/mpcresources/mplayerc.de.rc
index af109403e..ad0f2f689 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.de.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.de.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.es.rc b/src/apps/mplayerc/mpcresources/mplayerc.es.rc
index 20568a5d7..b34f0ca14 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.es.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.es.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.fr.rc b/src/apps/mplayerc/mpcresources/mplayerc.fr.rc
index 0787b71cf..e81d2c754 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.fr.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.fr.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.he.rc b/src/apps/mplayerc/mpcresources/mplayerc.he.rc
index 18841b0f2..36001dbc3 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.he.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.he.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.hu.rc b/src/apps/mplayerc/mpcresources/mplayerc.hu.rc
index ad1a34f80..ae45f18da 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.hu.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.hu.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.hy.rc b/src/apps/mplayerc/mpcresources/mplayerc.hy.rc
index 19152ee08..cb485104f 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.hy.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.hy.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.it.rc b/src/apps/mplayerc/mpcresources/mplayerc.it.rc
index 26241552a..92ccd1438 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.it.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.it.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.ja.rc b/src/apps/mplayerc/mpcresources/mplayerc.ja.rc
index 1ecf3664a..e60cfeee3 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.ja.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.ja.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.kr.rc b/src/apps/mplayerc/mpcresources/mplayerc.kr.rc
index 3aaeb190a..2230327f2 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.kr.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.kr.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.nl.rc b/src/apps/mplayerc/mpcresources/mplayerc.nl.rc
index b547f36c7..5f3b058e1 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.nl.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.nl.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.pl.rc b/src/apps/mplayerc/mpcresources/mplayerc.pl.rc
index d94206000..47afbddf8 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.pl.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.pl.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.ru.rc b/src/apps/mplayerc/mpcresources/mplayerc.ru.rc
index 4b1adf4fd..e611af3a7 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.ru.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.ru.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.sc.rc b/src/apps/mplayerc/mpcresources/mplayerc.sc.rc
index 94b213753..7a21b3331 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.sc.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.sc.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.sk.rc b/src/apps/mplayerc/mpcresources/mplayerc.sk.rc
index 9067282c1..e2719ff5e 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.sk.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.sk.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.sv.rc b/src/apps/mplayerc/mpcresources/mplayerc.sv.rc
index e0855eeec..f107dd9bf 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.sv.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.sv.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.tc.rc b/src/apps/mplayerc/mpcresources/mplayerc.tc.rc
index 498bb1a6f..8258c7733 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.tc.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.tc.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.tr.rc b/src/apps/mplayerc/mpcresources/mplayerc.tr.rc
index 44f0b6c33..cd6d30f0e 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.tr.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.tr.rc
diff --git a/src/apps/mplayerc/mpcresources/mplayerc.ua.rc b/src/apps/mplayerc/mpcresources/mplayerc.ua.rc
index a1cc2509c..58b9e89cc 100644
--- a/src/apps/mplayerc/mpcresources/mplayerc.ua.rc
+++ b/src/apps/mplayerc/mpcresources/mplayerc.ua.rc
diff --git a/src/apps/mplayerc/mplayerc.rc b/src/apps/mplayerc/mplayerc.rc
index 2ba258699..4535fb0a2 100644
--- a/src/apps/mplayerc/mplayerc.rc
+++ b/src/apps/mplayerc/mplayerc.rc