From: <ju...@us...> - 2006-08-02 05:12:20
|
Revision: 737 Author: julienq Date: 2006-08-01 22:12:04 -0700 (Tue, 01 Aug 2006) ViewCVS: http://svn.sourceforge.net/urakawa/?rev=737&view=rev Log Message: ----------- Disabled missing Command (Commands/TOC/IncreaseSectionLevel.cs) Updated Play dialog. Need to remove references to "assets" in the menu (replace with audio blocks) Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/Dialogs/Play.Designer.cs trunk/urakawa/application/Obi/Obi/Dialogs/Play.cs trunk/urakawa/application/Obi/Obi/Obi.csproj trunk/urakawa/application/Obi/Obi/Project.cs trunk/urakawa/application/Obi/Obi/messages.Designer.cs trunk/urakawa/application/Obi/Obi/messages.resx Modified: trunk/urakawa/application/Obi/Obi/Dialogs/Play.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Dialogs/Play.Designer.cs 2006-08-01 21:39:10 UTC (rev 736) +++ trunk/urakawa/application/Obi/Obi/Dialogs/Play.Designer.cs 2006-08-02 05:12:04 UTC (rev 737) @@ -29,65 +29,90 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.txtDisplayAsset = new System.Windows.Forms.TextBox(); - this.txtDisplayTime = new System.Windows.Forms.TextBox(); - this.btnPlay = new System.Windows.Forms.Button(); - this.btnStop = new System.Windows.Forms.Button(); + this.mNameDisplay = new System.Windows.Forms.TextBox(); + this.mTimeDisplay = new System.Windows.Forms.TextBox(); + this.mPlayButton = new System.Windows.Forms.Button(); + this.mStopButton = new System.Windows.Forms.Button(); this.tmUpdateCurrentTime = new System.Windows.Forms.Timer(this.components); + this.label1 = new System.Windows.Forms.Label(); this.SuspendLayout(); // - // txtDisplayAsset + // mNameDisplay // - this.txtDisplayAsset.Location = new System.Drawing.Point(20, 18); - this.txtDisplayAsset.Name = "txtDisplayAsset"; - this.txtDisplayAsset.ReadOnly = true; - this.txtDisplayAsset.Size = new System.Drawing.Size(228, 19); - this.txtDisplayAsset.TabIndex = 0; + this.mNameDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.mNameDisplay.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.mNameDisplay.Location = new System.Drawing.Point(12, 24); + this.mNameDisplay.Name = "mNameDisplay"; + this.mNameDisplay.ReadOnly = true; + this.mNameDisplay.Size = new System.Drawing.Size(268, 19); + this.mNameDisplay.TabIndex = 0; + this.mNameDisplay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // txtDisplayTime + // mTimeDisplay // - this.txtDisplayTime.Location = new System.Drawing.Point(20, 102); - this.txtDisplayTime.Name = "txtDisplayTime"; - this.txtDisplayTime.ReadOnly = true; - this.txtDisplayTime.Size = new System.Drawing.Size(100, 19); - this.txtDisplayTime.TabIndex = 4; + this.mTimeDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.mTimeDisplay.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.mTimeDisplay.Location = new System.Drawing.Point(96, 49); + this.mTimeDisplay.Name = "mTimeDisplay"; + this.mTimeDisplay.ReadOnly = true; + this.mTimeDisplay.Size = new System.Drawing.Size(100, 19); + this.mTimeDisplay.TabIndex = 4; + this.mTimeDisplay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // btnPlay + // mPlayButton // - this.btnPlay.Location = new System.Drawing.Point(20, 46); - this.btnPlay.Name = "btnPlay"; - this.btnPlay.Size = new System.Drawing.Size(75, 21); - this.btnPlay.TabIndex = 2; - this.btnPlay.Text = "&Play"; - this.btnPlay.UseVisualStyleBackColor = true; - this.btnPlay.Click += new System.EventHandler(this.btnPlay_Click); + this.mPlayButton.Anchor = System.Windows.Forms.AnchorStyles.None; + this.mPlayButton.Location = new System.Drawing.Point(68, 101); + this.mPlayButton.Name = "mPlayButton"; + this.mPlayButton.Size = new System.Drawing.Size(75, 21); + this.mPlayButton.TabIndex = 2; + this.mPlayButton.Text = "&Play"; + this.mPlayButton.UseVisualStyleBackColor = true; + this.mPlayButton.Click += new System.EventHandler(this.mPlayButton_Click); // - // btnStop + // mStopButton // - this.btnStop.Location = new System.Drawing.Point(20, 74); - this.btnStop.Name = "btnStop"; - this.btnStop.Size = new System.Drawing.Size(75, 21); - this.btnStop.TabIndex = 3; - this.btnStop.Text = "&Stop"; - this.btnStop.UseVisualStyleBackColor = true; - this.btnStop.Click += new System.EventHandler(this.btnStop_Click); + this.mStopButton.Anchor = System.Windows.Forms.AnchorStyles.None; + this.mStopButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.mStopButton.Location = new System.Drawing.Point(149, 101); + this.mStopButton.Name = "mStopButton"; + this.mStopButton.Size = new System.Drawing.Size(75, 21); + this.mStopButton.TabIndex = 3; + this.mStopButton.Text = "&Stop"; + this.mStopButton.UseVisualStyleBackColor = true; + this.mStopButton.Click += new System.EventHandler(this.mStopButton_Click); // // tmUpdateCurrentTime // this.tmUpdateCurrentTime.Interval = 1000; this.tmUpdateCurrentTime.Tick += new System.EventHandler(this.tmUpdateCurrentTime_Tick); // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(99, 9); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(94, 12); + this.label1.TabIndex = 5; + this.label1.Text = "Currently playing:"; + // // Play // + this.AcceptButton = this.mStopButton; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(292, 246); - this.Controls.Add(this.btnStop); - this.Controls.Add(this.btnPlay); - this.Controls.Add(this.txtDisplayTime); - this.Controls.Add(this.txtDisplayAsset); + this.ClientSize = new System.Drawing.Size(292, 134); + this.Controls.Add(this.label1); + this.Controls.Add(this.mStopButton); + this.Controls.Add(this.mPlayButton); + this.Controls.Add(this.mTimeDisplay); + this.Controls.Add(this.mNameDisplay); this.Name = "Play"; - this.Text = "Play"; + this.Text = "Play audio block"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Play_FormClosing); this.Load += new System.EventHandler(this.Play_Load); this.ResumeLayout(false); @@ -97,10 +122,11 @@ #endregion - private System.Windows.Forms.TextBox txtDisplayAsset; - private System.Windows.Forms.TextBox txtDisplayTime; - private System.Windows.Forms.Button btnPlay; - private System.Windows.Forms.Button btnStop; + private System.Windows.Forms.TextBox mNameDisplay; + private System.Windows.Forms.TextBox mTimeDisplay; + private System.Windows.Forms.Button mPlayButton; + private System.Windows.Forms.Button mStopButton; private System.Windows.Forms.Timer tmUpdateCurrentTime; + private System.Windows.Forms.Label label1; } } \ No newline at end of file Modified: trunk/urakawa/application/Obi/Obi/Dialogs/Play.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Dialogs/Play.cs 2006-08-01 21:39:10 UTC (rev 736) +++ trunk/urakawa/application/Obi/Obi/Dialogs/Play.cs 2006-08-02 05:12:04 UTC (rev 737) @@ -59,31 +59,25 @@ { } - private void btnStop_Click(object sender, EventArgs e) + private void mStopButton_Click(object sender, EventArgs e) { - AudioPlayer.Instance.Stop(); AudioPlayer.Instance.VuMeterObject.CloseVuMeterForm(); this.Close(); } - //ob_play. - //AudioPlayer ob_play = AudioPlayer.Instance; - - private void btnPlay_Click(object sender, EventArgs e) + private void mPlayButton_Click(object sender, EventArgs e) { - - if (AudioPlayer.Instance.State.Equals(AudioPlayerState.Playing)) { AudioPlayer.Instance.Pause(); - btnPlay.Text = "&Play"; + mPlayButton.Text = Localizer.Message("play"); tmUpdateCurrentTime.Enabled = false; } else if (AudioPlayer.Instance.State.Equals(AudioPlayerState.Paused)) { AudioPlayer.Instance.Resume(); - btnPlay.Text = "&Pause"; + mPlayButton.Text = Localizer.Message("pause"); tmUpdateCurrentTime.Enabled = true; } @@ -117,20 +111,14 @@ //string sDisplayTime = Hours.ToString () +":" + Minutes.ToString () + ":" + Seconds.ToString() ; string sDisplayTime = sHours + ":" + sMinutes + ":" + sSeconds; - txtDisplayTime.Text = sDisplayTime; + mTimeDisplay.Text = sDisplayTime; } private void Play_Load(object sender, EventArgs e) { - - txtDisplayAsset.Text = ((TextMedia)Project.GetMediaForChannel(mNode, Project.AnnotationChannel)).getText(); - + mNameDisplay.Text = ((TextMedia)Project.GetMediaForChannel(mNode, Project.AnnotationChannel)).getText(); if (AudioPlayer.Instance.State.Equals(AudioPlayerState.Stopped)) - { - - - VuMeter ob_VuMeter = new VuMeter(); ob_VuMeter.ScaleFactor = 2; ob_VuMeter.LowerThreshold = 70; @@ -138,15 +126,10 @@ ob_VuMeter.SampleTimeLength = 1000; ob_VuMeter.ShowForm(); AudioPlayer.Instance.VuMeterObject = ob_VuMeter; -// AudioPlayer.Instance.GetOutputDevices(); - - - //AudioPlayer.Instance.SetDevice(this, 0); AudioPlayer.Instance.Play(Project.GetAudioMediaAsset(mNode)); - btnPlay.Text = "&Pause"; + mPlayButton.Text = Localizer.Message("pause"); tmUpdateCurrentTime.Enabled = true; } - } private void Play_FormClosing(object sender, FormClosingEventArgs e) Modified: trunk/urakawa/application/Obi/Obi/Obi.csproj =================================================================== --- trunk/urakawa/application/Obi/Obi/Obi.csproj 2006-08-01 21:39:10 UTC (rev 736) +++ trunk/urakawa/application/Obi/Obi/Obi.csproj 2006-08-02 05:12:04 UTC (rev 737) @@ -72,7 +72,6 @@ <Compile Include="Commands\CommandManager.cs" /> <Compile Include="Commands\TOC\AddSection.cs" /> <Compile Include="Commands\TOC\DeleteSection.cs" /> - <Compile Include="Commands\TOC\IncreaseSectionLevel.cs" /> <Compile Include="Commands\TOC\MoveSectionDown.cs" /> <Compile Include="Commands\TOC\MoveSectionUp.cs" /> <Compile Include="Commands\TOC\Rename.cs" /> Modified: trunk/urakawa/application/Obi/Obi/Project.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Project.cs 2006-08-01 21:39:10 UTC (rev 736) +++ trunk/urakawa/application/Obi/Obi/Project.cs 2006-08-02 05:12:04 UTC (rev 737) @@ -694,7 +694,7 @@ public void IncreaseNodeLevel(object origin, CoreNode node) { - Commands.TOC.IncreaseSectionLevel command = null; + //Commands.TOC.IncreaseSectionLevel command = null; // the command file is missing :( JQ if (origin != this) { @@ -702,8 +702,8 @@ NodePositionVisitor visitor = new NodePositionVisitor(node); getPresentation().getRootNode().acceptDepthFirst(visitor); //we need to save the state of the node before it is altered - command = new Commands.TOC.IncreaseSectionLevel - (this, node, parent, parent.indexOf(node), visitor.Position); + //command = new Commands.TOC.IncreaseSectionLevel + // (this, node, parent, parent.indexOf(node), visitor.Position); // Same problem JQ } //a facade API function could do this for us @@ -721,7 +721,7 @@ mUnsaved = true; StateChanged(this, new Events.Project.StateChangedEventArgs(Events.Project.StateChange.Modified)); - if (command != null) CommandCreated(this, new Events.Project.CommandCreatedEventArgs(command)); + // if (command != null) CommandCreated(this, new Events.Project.CommandCreatedEventArgs(command)); // JQ } } Modified: trunk/urakawa/application/Obi/Obi/messages.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2006-08-01 21:39:10 UTC (rev 736) +++ trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2006-08-02 05:12:04 UTC (rev 737) @@ -345,6 +345,24 @@ } /// <summary> + /// Looks up a localized string similar to &Pause. + /// </summary> + internal static string pause { + get { + return ResourceManager.GetString("pause", resourceCulture); + } + } + + /// <summary> + /// Looks up a localized string similar to &Play. + /// </summary> + internal static string play { + get { + return ResourceManager.GetString("play", resourceCulture); + } + } + + /// <summary> /// Looks up a localized string similar to Ready.. /// </summary> internal static string ready { Modified: trunk/urakawa/application/Obi/Obi/messages.resx =================================================================== --- trunk/urakawa/application/Obi/Obi/messages.resx 2006-08-01 21:39:10 UTC (rev 736) +++ trunk/urakawa/application/Obi/Obi/messages.resx 2006-08-02 05:12:04 UTC (rev 737) @@ -258,4 +258,12 @@ <value>Could not find channel named "{0}".</value> <comment>Channel not found exception (JQ)</comment> </data> + <data name="pause" xml:space="preserve"> + <value>&Pause</value> + <comment>Pause button label (JQ)</comment> + </data> + <data name="play" xml:space="preserve"> + <value>&Play</value> + <comment>Play button label (JQ)</comment> + </data> </root> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |