[Roam-commit] SF.net SVN: roam: [101] Trunk/Source/Roam
Status: Alpha
Brought to you by:
jonfroehlich
|
From: <jon...@us...> - 2007-10-23 05:46:06
|
Revision: 101
http://roam.svn.sourceforge.net/roam/?rev=101&view=rev
Author: jonfroehlich
Date: 2007-10-22 22:45:56 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
1. updated SoundLoopPlayer to expose Volume
2. fixed NotificationForm bug when ReminderCount starts at 0, the Snooze menu item is now disabled
Modified Paths:
--------------
Trunk/Source/Roam/Media/SoundLoopPlayer.cs
Trunk/Source/Roam.Test/Roam.Test.csproj
Trunk/Source/Roam.UI/Forms/NotificationForm.cs
Modified: Trunk/Source/Roam/Media/SoundLoopPlayer.cs
===================================================================
--- Trunk/Source/Roam/Media/SoundLoopPlayer.cs 2007-10-22 18:16:32 UTC (rev 100)
+++ Trunk/Source/Roam/Media/SoundLoopPlayer.cs 2007-10-23 05:45:56 UTC (rev 101)
@@ -71,25 +71,31 @@
private InvokeDelegate _invokeDelegate;
#endregion Private Fields
+ #region Constructors
public SoundLoopPlayer(InvokeDelegate invokeDelegate, string soundFile)
: base(new TimeSpan(0, 30, 0), new TimeSpan(0,0,2), 2)
{
_soundFile = soundFile;
}
- //public SoundLoopPlayer(string soundFile, TimeSpan pauseDuration, int repeatCount)
- // : base(new TimeSpan(0, 30, 0), pauseDuration, repeatCount)
- //{
- // _soundFile = soundFile;
- //}
-
public SoundLoopPlayer(InvokeDelegate invokeDelegate, string soundFile, TimeSpan pauseDuration, int repeatCount)
: base(new TimeSpan(0, 30, 0), pauseDuration, repeatCount)
{
_soundFile = soundFile;
_invokeDelegate = invokeDelegate;
}
+ #endregion Constructors
+
+ #region Properties
+ public int Volume
+ {
+ get { return _soundPlayer.Volume; }
+ set { _soundPlayer.Volume = value; }
+ }
+ #endregion Properties
+
+ #region Methods
protected virtual void StartInternalDelegate(object state)
{
_soundPlayer.DonePlaying += new WaveDoneHandler(OnSoundPlayerDonePlaying);
@@ -122,5 +128,6 @@
{
OnTimer(null);
}
+ #endregion Methods
}
}
Modified: Trunk/Source/Roam.Test/Roam.Test.csproj
===================================================================
--- Trunk/Source/Roam.Test/Roam.Test.csproj 2007-10-22 18:16:32 UTC (rev 100)
+++ Trunk/Source/Roam.Test/Roam.Test.csproj 2007-10-23 05:45:56 UTC (rev 101)
@@ -560,7 +560,7 @@
<DependentUpon>TextBoxFilteredListTest.cs</DependentUpon>
</Compile>
<Compile Include="UI\Controls\FontTest.cs">
- <SubType>Component</SubType>
+ <SubType>Form</SubType>
</Compile>
<Compile Include="UI\Controls\FontTest.Designer.cs">
<DependentUpon>FontTest.cs</DependentUpon>
Modified: Trunk/Source/Roam.UI/Forms/NotificationForm.cs
===================================================================
--- Trunk/Source/Roam.UI/Forms/NotificationForm.cs 2007-10-22 18:16:32 UTC (rev 100)
+++ Trunk/Source/Roam.UI/Forms/NotificationForm.cs 2007-10-23 05:45:56 UTC (rev 101)
@@ -158,6 +158,12 @@
if (_maximumReminders != value)
{
_maximumReminders = value;
+
+ if (_reminderCount >= _maximumReminders)
+ {
+ _menuItemSnooze.Enabled = false;
+ }
+
this.Invalidate();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|