#309

git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32730

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 52e5b900b9607556da1ae42a8bcb85a40afd8692..b17625f4a3cadaf8e0cf912feaec07aa4280d3b3 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -24,6 +24,8 @@ namespace DxPlay {
         private OpenFileDialog openFileDialog = new OpenFileDialog();\r
         private ToolTip tooltips;\r
 \r
+        private bool isPauseButtonClicked = false;\r
+\r
         private DxPlaySettings settings;\r
         public DxPlaySettings Settings {\r
             get {\r
@@ -104,6 +106,7 @@ namespace DxPlay {
         public PlayerForm() {\r
             InitializeComponent();\r
 \r
+            playerControls.Pause.Click += Pause_Click;\r
             playerControls.Play.Click += OnPlayClick;\r
             playerControls.Stop.Click += OnStopClick;\r
             playerControls.Rewind.MouseDown += OnRewindMouseDown;\r
@@ -120,6 +123,15 @@ namespace DxPlay {
             playerControls.TrackBar.Scroll += OnTrackBarScroll;\r
         }\r
 \r
+        private void Pause_Click(object sender, EventArgs e)\r
+        {\r
+            if (!isPauseButtonClicked)\r
+            {\r
+                isPauseButtonClicked = true;\r
+                PlayOrPause();\r
+            }\r
+        }\r
+\r
         private void InitializeTexts() {\r
             tpMetadata.Text = Settings.Resource("METADATA", Resources.METADATA);\r
             tpSegments.Text = Settings.Resource("SEGMENTS", Resources.SEGMENTS);\r
@@ -138,6 +150,7 @@ namespace DxPlay {
             tooltips.SetToolTip(playerControls.StepBack, Settings.Resource("STEPBACK", Resources.STEPBACK));\r
             tooltips.SetToolTip(playerControls.StepForward, Settings.Resource("STEPFORWARD", Resources.STEPFORWARD));\r
             tooltips.SetToolTip(playerControls.Play, Settings.Resource("PLAY", Resources.PLAY));\r
+            tooltips.SetToolTip(playerControls.Pause, Settings.Resource("PAUSE", Resources.PLAY));\r
             tooltips.SetToolTip(playerControls.Stop, Settings.Resource("STOP", Resources.STOP));\r
             playerControls.Status.Text = Settings.Resource("NOINPUT", Resources.NOINPUT);\r
             playerControls.Start.Text = Settings.Resource("START", Resources.START);\r
@@ -263,10 +276,24 @@ namespace DxPlay {
                 m_play.Stop();\r
             }\r
             m_play.Play();\r
-            UpdatePlayPauseButton();\r
+            UpdatePlayButton();\r
+        }\r
+\r
+        private void UpdatePauseButton()\r
+        {\r
+            if (m_play.State == GraphState.Playing)\r
+            { //PAUSE\r
+                playerControls.Pause.Image = Resources.ic_pause_black_24dp_2x;\r
+                tooltips.SetToolTip(playerControls.Pause, Settings.Resource("PAUSE", Resources.PAUSE));\r
+            }\r
+            else\r
+            {\r
+                playerControls.Pause.Image = Resources.ic_play_arrow_black_24dp_2x;\r
+                tooltips.SetToolTip(playerControls.Pause, Settings.Resource("PLAY", Resources.PLAY));\r
+            }\r
         }\r
 \r
-        private void UpdatePlayPauseButton() {\r
+        private void UpdatePlayButton() {\r
             if (m_play.State == GraphState.Playing) {\r
                 playerControls.Play.Image = Resources.ic_pause_black_24dp_2x;\r
                 tooltips.SetToolTip(playerControls.Play, Settings.Resource("PAUSE", Resources.PAUSE));\r
@@ -278,7 +305,7 @@ namespace DxPlay {
 \r
         private void Pause() {\r
             m_play.Pause();\r
-            UpdatePlayPauseButton();\r
+            UpdatePlayButton();\r
         }\r
 \r
         private void OnPlayClick(object sender, EventArgs e) {\r
@@ -302,7 +329,7 @@ namespace DxPlay {
             buttonDown = true;\r
             do {\r
                 m_play.Rewind(10);\r
-                Application.DoEvents();\r
+                Application.DoEvents();             \r
             } while (buttonDown);\r
         }\r
 \r
@@ -314,7 +341,7 @@ namespace DxPlay {
             buttonDown = true;\r
             do {\r
                 m_play.Forward(10);\r
-                Application.DoEvents();\r
+                Application.DoEvents();                \r
             } while (buttonDown);\r
         }\r
 \r
@@ -476,7 +503,7 @@ namespace DxPlay {
                 if (Disposing || IsDisposed || m_play == null)\r
                     return;\r
                 if (m_play.State == GraphState.Completed || m_play.State == GraphState.Paused)\r
-                    UpdatePlayPauseButton();\r
+                    UpdatePlayButton();\r
                 if (!trackBarAtUser)\r
                     playerControls.TrackBar.Value = m_play.CurrentTC.ZeroBasedFrames;\r
                 playerControls.CurrentTC.Text = m_play.CurrentTC.ToString();\r