Changeset 171323

Timestamp:

11/08/2009 06:58:09 AM (16 years ago)

Author:

ruslany

Message:

Enabled PopupPlayer. Also adding the belorussian translation by M.Comfi <zhr@…>.

Location:

wp-media-player/trunk

Files:

• languages/wp-media-player-be_BY.mo (added)
• languages/wp-media-player-be_BY.po (added)
• mediaplayer/BasePlayer/BasePlayer.cs (modified) (3 diffs)
• mediaplayer/PopupPlayer/PopupPlayer.xaml.cs (modified) (4 diffs)

wp-media-player/trunk/mediaplayer/BasePlayer/BasePlayer.cs

@@ -10 +10 @@
 using System.Windows.Threading;
 using System.Windows.Shapes;
+using System.Diagnostics;
 
 namespace MediaPlayer
@@ -41 +42 @@
         protected Canvas BaseMainClip = null;
         protected FrameworkElement BaseDownloadProgressSlider = null;
-        protected Path BaseTimeSlider_Highlight = null;
-        protected Canvas BaseTimeThumb = null;
+        protected FrameworkElement BaseTimeSlider_Highlight = null;
+        protected FrameworkElement BaseTimeThumb = null;
         protected Storyboard BaseBufferingArea_Buffering = null;
         protected Storyboard BasePlayPauseButton_MouseEnter = null;
@@ -94 +95 @@
 
             #region Hook up the event handlers for the buttons
-            BasePlayPauseButton.MouseEnter += new MouseEventHandler(PlayPauseButton_OnMouseEnter);
-            BasePlayPauseButton.MouseLeave += new MouseEventHandler(PlayPauseButton_OnMouseLeave);
-            BasePlayPauseButton.MouseLeftButtonDown += new MouseButtonEventHandler(PlayPauseButton_OnMouseLeftButtonDown);
-            BasePlayPauseButton.MouseLeftButtonUp += new MouseButtonEventHandler(PlayPauseButton_MouseLeftButtonUp);
-            BaseStopButton.MouseEnter += new MouseEventHandler(StopButton_OnMouseEnter);
-            BaseStopButton.MouseLeave += new MouseEventHandler(StopButton_OnMouseLeave);
-            BaseStopButton.MouseLeftButtonDown += new MouseButtonEventHandler(StopButton_OnMouseLeftButtonDown);
-            BaseStopButton.MouseLeftButtonUp += new MouseButtonEventHandler(StopButton_OnMouseLeftButtonUp);
-            BaseNextButton.MouseEnter += new MouseEventHandler(NextButton_OnMouseEnter);
-            BaseNextButton.MouseLeave += new MouseEventHandler(NextButton_OnMouseLeave);
-            BaseNextButton.MouseLeftButtonDown += new MouseButtonEventHandler(NextButton_OnMouseLeftButtonDown);
-            BaseNextButton.MouseLeftButtonUp += new MouseButtonEventHandler(NextButton_OnMouseLeftButtonUp);
-            BasePreviousButton.MouseEnter += new MouseEventHandler(PreviousButton_OnMouseEnter);
-            BasePreviousButton.MouseLeave += new MouseEventHandler(PreviousButton_OnMouseLeave);
-            BasePreviousButton.MouseLeftButtonDown += new MouseButtonEventHandler(PreviousButton_OnMouseLeftButtonDown);
-            BasePreviousButton.MouseLeftButtonUp += new MouseButtonEventHandler(PreviousButton_OnMouseLeftButtonUp);
-            BaseMuteButton.MouseLeftButtonUp += new MouseButtonEventHandler(MuteButton_OnMouseLeftButtonUp);
+            if (BasePlayPauseButton != null)
+            {
+                BasePlayPauseButton.MouseEnter += new MouseEventHandler(PlayPauseButton_OnMouseEnter);
+                BasePlayPauseButton.MouseLeave += new MouseEventHandler(PlayPauseButton_OnMouseLeave);
+                BasePlayPauseButton.MouseLeftButtonDown += new MouseButtonEventHandler(PlayPauseButton_OnMouseLeftButtonDown);
+                BasePlayPauseButton.MouseLeftButtonUp += new MouseButtonEventHandler(PlayPauseButton_MouseLeftButtonUp);
+            }
+            if (BaseStopButton != null)
+            {
+                BaseStopButton.MouseEnter += new MouseEventHandler(StopButton_OnMouseEnter);
+                BaseStopButton.MouseLeave += new MouseEventHandler(StopButton_OnMouseLeave);
+                BaseStopButton.MouseLeftButtonDown += new MouseButtonEventHandler(StopButton_OnMouseLeftButtonDown);
+                BaseStopButton.MouseLeftButtonUp += new MouseButtonEventHandler(StopButton_OnMouseLeftButtonUp);
+            }
+            if (BaseNextButton != null)
+            {
+                BaseNextButton.MouseEnter += new MouseEventHandler(NextButton_OnMouseEnter);
+                BaseNextButton.MouseLeave += new MouseEventHandler(NextButton_OnMouseLeave);
+                BaseNextButton.MouseLeftButtonDown += new MouseButtonEventHandler(NextButton_OnMouseLeftButtonDown);
+                BaseNextButton.MouseLeftButtonUp += new MouseButtonEventHandler(NextButton_OnMouseLeftButtonUp);
+            }
+            if (BasePreviousButton != null)
+            {
+                BasePreviousButton.MouseEnter += new MouseEventHandler(PreviousButton_OnMouseEnter);
+                BasePreviousButton.MouseLeave += new MouseEventHandler(PreviousButton_OnMouseLeave);
+                BasePreviousButton.MouseLeftButtonDown += new MouseButtonEventHandler(PreviousButton_OnMouseLeftButtonDown);
+                BasePreviousButton.MouseLeftButtonUp += new MouseButtonEventHandler(PreviousButton_OnMouseLeftButtonUp);
+            }
+            if (BaseMuteButton != null)
+            {
+                BaseMuteButton.MouseLeftButtonUp += new MouseButtonEventHandler(MuteButton_OnMouseLeftButtonUp);
+            }
             BaseVideoWindow.MouseLeftButtonDown += new MouseButtonEventHandler(VideoWindow_MouseLeftButtonDown);
             BaseFullScreenArea.MouseLeftButtonDown += new MouseButtonEventHandler(FullScreenArea_MouseLeftButtonDown);

wp-media-player/trunk/mediaplayer/PopupPlayer/PopupPlayer.xaml.cs

@@ -18 +18 @@
         {
             InitializeComponent();
-            
+
             #region Assign XAML Elements
             BasePlayPauseButton = PlayPauseButton;
@@ -30 +30 @@
             BaseMainClip = MainClip;
             BaseDownloadProgressSlider = DownloadProgressSlider;
-            BaseTimeSlider_Highlight = TimeSlider_Highlight;
+            BaseTimeSlider_Highlight = TimeSlider;
             BaseTimeThumb = TimeThumb;
 
@@ -52 +52 @@
             BasePlaceholderImage_Show = PlaceholderImage_Show;
             BasePlaceholderImage_Hide = PlaceholderImage_Hide;
-            BasePlayPauseButton_Disable = PlayPauseButton_Disable;
-            BaseBasePlayPauseButton_Enable = PlayPauseButton_Enable;
-            BaseStopButton_Disable = StopButton_Disable;
-            BaseStopButton_Enable = StopButton_Enable;
-            BaseNextButton_Disable = NextButton_Disable;
-            BaseNextButton_Enable = NextButton_Enable;
-            BasePreviousButton_Disable = PreviousButton_Disable;
-            BasePreviousButton_Enable = PreviousButton_Enable;
             BasePlaySymbol_Show = PlaySymbol_Show;
             BasePlaySymbol_Hide = PlaySymbol_Hide;
@@ -69 +61 @@
             BaseMuteOnSymbol_Hide = MuteOnSymbol_Hide;
             #endregion
+
+            ControlsHotspot.MouseEnter += new MouseEventHandler(ControlsHotspot_OnMouseEnter);
+            ControlsHotspot.MouseLeave += new MouseEventHandler(ControlsHotspot_OnMouseLeave);
+        }
+
+        void ControlsHotspot_OnMouseEnter(object sender, MouseEventArgs e)
+        {
+            ControlsHotspot_MouseEnter.Begin();
+        }
+        void ControlsHotspot_OnMouseLeave(object sender, MouseEventArgs e)
+        {
+            ControlsHotspot_MouseLeave.Begin();
         }
     }