From 4d0682a5169effd35e352411170cb937ca1c35cf Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 28 Dec 2009 18:22:36 +0900 Subject: [PATCH] fix: cannot preview with QT --- win/C#/Properties/Settings.Designer.cs | 2 +- win/C#/Properties/Settings.settings | 2 +- win/C#/app.config | 2 +- win/C#/frmMain.cs | 32 ++++++++++++++++---------------- win/C#/frmPreview.cs | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs index 91cc4fc..ed62d51 100644 --- a/win/C#/Properties/Settings.Designer.cs +++ b/win/C#/Properties/Settings.Designer.cs @@ -157,7 +157,7 @@ namespace Handbrake.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("http://sourceforge.jp/projects/handbrake-jp/docs/appcast.xml")] + [global::System.Configuration.DefaultSettingValueAttribute("http://sourceforge.jp/projects/handbrake-jp/docs/appcast094.xml")] public string appcast { get { return ((string)(this["appcast"])); diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings index 9d91131..49a3a22 100644 --- a/win/C#/Properties/Settings.settings +++ b/win/C#/Properties/Settings.settings @@ -36,7 +36,7 @@ - http://sourceforge.jp/projects/handbrake-jp/docs/appcast.xml + http://sourceforge.jp/projects/handbrake-jp/docs/appcast094.xml http://sourceforge.jp/projects/handbrake-jp/docs/appcast_unstable.xml diff --git a/win/C#/app.config b/win/C#/app.config index 1009a8d..1c7ea6a 100644 --- a/win/C#/app.config +++ b/win/C#/app.config @@ -41,7 +41,7 @@ - http://sourceforge.jp/projects/handbrake-jp/docs/appcast.xml + http://sourceforge.jp/projects/handbrake-jp/docs/appcast094.xml http://sourceforge.jp/projects/handbrake-jp/docs/appcast_unstable.xml diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index bfcb8dd..bed660b 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -459,7 +459,7 @@ namespace Handbrake updateWindow.ShowDialog(); } else - MessageBox.Show("Œ»Ý—˜—p‰Â”\‚ȃAƒbƒvƒf[ƒg‚Í‚ ‚è‚Ü‚¹‚ñ", "Update Check", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("Œ»Ý—˜—p‰Â”\‚ȃAƒbƒvƒf[ƒg‚Í‚ ‚è‚Ü‚¹‚ñB", "Update Check", MessageBoxButtons.OK, MessageBoxIcon.Information); lbl_updateCheck.Visible = false; return; } @@ -582,11 +582,11 @@ namespace Handbrake { Properties.Settings.Default.defaultPreset = treeView_presets.SelectedNode.Text; Properties.Settings.Default.Save(); - MessageBox.Show("ƒfƒtƒHƒ‹ƒgƒvƒŠƒZƒbƒg‚ð•ÏX‚µ‚Ü‚µ‚½", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("ƒfƒtƒHƒ‹ƒgƒvƒŠƒZƒbƒg‚ð•ÏX‚µ‚Ü‚µ‚½B", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Information); } } else - MessageBox.Show("ƒvƒŠƒZƒbƒg‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + MessageBox.Show("ƒvƒŠƒZƒbƒg‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); } private void treeview_presets_mouseUp(object sender, MouseEventArgs e) { @@ -834,13 +834,13 @@ namespace Handbrake this.Focus(); } else if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text)) - MessageBox.Show("‘I‘ð‚³‚ê‚½•ÏŠ·Œ³/•Û‘¶æ‚Í‘¶Ý‚µ‚Ü‚¹‚ñ", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + MessageBox.Show("‘I‘ð‚³‚ê‚½•ÏŠ·Œ³/•Û‘¶æ‚Í‘¶Ý‚µ‚Ü‚¹‚ñB", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); } } private void btn_add2Queue_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text)) - MessageBox.Show("•ÏŠ·Œ³/•Û‘¶æ‚ª‘I‘ð‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + MessageBox.Show("•ÏŠ·Œ³/•Û‘¶æ‚ª‘I‘ð‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); else { String query = queryGen.GenerateCLIQuery(this, 0, null); @@ -871,7 +871,7 @@ namespace Handbrake private void tb_preview_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(text_destination.Text)) - MessageBox.Show("•ÏŠ·Œ³/•Û‘¶æ‚ª‘I‘ð‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + MessageBox.Show("•ÏŠ·Œ³/•Û‘¶æ‚ª‘I‘ð‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); else { if (qtpreview == null) @@ -885,7 +885,7 @@ namespace Handbrake qtpreview.Show(); } else - MessageBox.Show(qtpreview, "ƒvƒŒƒrƒ…[ƒEƒBƒ“ƒhƒE‚ð‚·‚Å‚ÉŠJ‚¢‚Ä‚¢‚Ü‚·", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + MessageBox.Show(qtpreview, "ƒvƒŒƒrƒ…[ƒEƒBƒ“ƒhƒE‚ð‚·‚Å‚ÉŠJ‚¢‚Ä‚¢‚Ü‚·B", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); } } private void btn_ActivityWindow_Click(object sender, EventArgs e) @@ -996,13 +996,13 @@ namespace Handbrake private void drp_dvdtitle_Click(object sender, EventArgs e) { if ((drp_dvdtitle.Items.Count == 1) && (drp_dvdtitle.Items[0].ToString() == "Ž©“®")) - MessageBox.Show("ƒ^ƒCƒgƒ‹‚ª‘I‘ð‚³‚ê‚Ä‚¢‚Ü‚¹‚ñBu•ÏŠ·Œ³v‚ðƒNƒŠƒbƒN‚µ‚Ä•ÏŠ·Œ³‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk); + MessageBox.Show("ƒ^ƒCƒgƒ‹‚ª‘I‘ð‚³‚ê‚Ä‚¢‚Ü‚¹‚ñBu•ÏŠ·Œ³v‚ðƒNƒŠƒbƒN‚µ‚Ä•ÏŠ·Œ³‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk); } private void drp_dvdtitle_SelectedIndexChanged(object sender, EventArgs e) { UnRegisterPresetEventHandler(); - PictureSettings.lbl_Aspect.Text = "ƒ^ƒCƒgƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢"; // Reset some values on the form + PictureSettings.lbl_Aspect.Text = "ƒ^ƒCƒgƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B"; // Reset some values on the form drop_chapterStart.Items.Clear(); drop_chapterFinish.Items.Clear(); @@ -1061,7 +1061,7 @@ namespace Handbrake if (autoPath != null) text_destination.Text = autoPath; else - MessageBox.Show("Ý’è‚Łuo—̓tƒ@ƒCƒ‹–¼‚ðŽ©“®“I‚ɐݒ肷‚év‚ª—LŒø‚É‚È‚Á‚Ä‚¢‚Ü‚·‚ªA•Û‘¶æƒtƒHƒ‹ƒ_‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚¹‚ñBuƒc[ƒ‹vƒƒjƒ…[‚́uƒIƒvƒVƒ‡ƒ“Ý’èv‚Őݒ肵‚Ä‚­‚¾‚³‚¢", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + MessageBox.Show("Ý’è‚Łuo—̓tƒ@ƒCƒ‹–¼‚ðŽ©“®“I‚ɐݒ肷‚év‚ª—LŒø‚É‚È‚Á‚Ä‚¢‚Ü‚·‚ªA•Û‘¶æƒtƒHƒ‹ƒ_‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚¹‚ñBuƒc[ƒ‹vƒƒjƒ…[‚́uƒIƒvƒVƒ‡ƒ“Ý’èv‚Őݒ肵‚Ä‚­‚¾‚³‚¢B", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); } data_chpt.Rows.Clear(); @@ -1171,7 +1171,7 @@ namespace Handbrake if (DVD_Save.ShowDialog() == DialogResult.OK) { if (DVD_Save.FileName.StartsWith("\\")) - MessageBox.Show("HandBrake‚ÍUNCƒpƒX‚ɑΉž‚µ‚Ä‚¢‚Ü‚¹‚ñB\n‹¤—LƒtƒHƒ‹ƒ_‚ðƒ}ƒEƒ“ƒg‚µ‚Ä‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢","Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + MessageBox.Show("HandBrake‚ÍUNCƒpƒX‚ɑΉž‚µ‚Ä‚¢‚Ü‚¹‚ñB\n‹¤—LƒtƒHƒ‹ƒ_‚ðƒ}ƒEƒ“ƒg‚µ‚Ä‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B","Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); else { // Add a file extension manually, as FileDialog.AddExtension has issues with dots in filenames @@ -1747,7 +1747,7 @@ namespace Handbrake } private void UpdateSourceLabel() { - labelSource.Text = string.IsNullOrEmpty(sourcePath) ? "u•ÏŠ·Œ³v‚ðƒNƒŠƒbƒN‚µ‚Ä‚­‚¾‚³‚¢" : this.SourceName; + labelSource.Text = string.IsNullOrEmpty(sourcePath) ? "u•ÏŠ·Œ³v‚ðƒNƒŠƒbƒN‚µ‚Ä‚­‚¾‚³‚¢B" : this.SourceName; } #endregion @@ -1771,7 +1771,7 @@ namespace Handbrake lbl_encode.Text = "•ÏŠ·Š®—¹"; btn_start.Text = "•ÏŠ·ŠJŽn"; - btn_start.ToolTipText = "•ÏŠ·ì‹Æ‚ðŠJŽn‚µ‚Ü‚·"; + btn_start.ToolTipText = "•ÏŠ·ì‹Æ‚ðŠJŽn‚µ‚Ü‚·B"; btn_start.Image = Properties.Resources.Play; // If the window is minimized, display the notification in a popup. @@ -1804,7 +1804,7 @@ namespace Handbrake lbl_encode.Visible = true; lbl_encode.Text = "•ÏŠ·’†i" + encodeQueue.Count + "ŒÂ‚̃AƒCƒeƒ€‚ª‘Ò‹@’†j"; btn_start.Text = "’†Ž~"; - btn_start.ToolTipText = "•ÏŠ·ì‹Æ‚𒆎~‚µ‚Ü‚·"; + btn_start.ToolTipText = "•ÏŠ·ì‹Æ‚𒆎~‚µ‚Ü‚·B"; btn_start.Image = Properties.Resources.stop; } catch (Exception exc) @@ -2171,7 +2171,7 @@ namespace Handbrake if (presetHandler.CheckIfPresetsAreOutOfDate()) if (!Properties.Settings.Default.presetNotification) MessageBox.Show(splash, - "V‚µ‚¢•W€ƒvƒŠƒZƒbƒg‚ª—˜—p‚Å‚«‚Ü‚·", + "V‚µ‚¢•W€ƒvƒŠƒZƒbƒg‚ðƒ[ƒh‚µ‚Ü‚·B", "Preset Update", MessageBoxButtons.OK, MessageBoxIcon.Information); presetHandler.GetPresetPanel(ref treeView_presets); @@ -2189,7 +2189,7 @@ namespace Handbrake // If currently encoding, the queue isn't paused, and there are queue items to process, prompt to confirm close. if ((encodeQueue.isEncoding) && (!encodeQueue.PauseRequested) && (encodeQueue.Count > 0)) { - DialogResult result = MessageBox.Show("Œ»Ý•ÏŠ·ì‹Æ‚ðŽÀs’†‚Å‚·BHandBrake‚ðI—¹‚µ‚Ä‚àAŽÀs’†‚̍ì‹Æ‚Í’†Ž~‚³‚ê‚Ü‚¹‚ñB‚½‚¾‚µAƒLƒ…[‚É‚ ‚éƒAƒCƒeƒ€‚ɂ‚¢‚Ä‚Í•ÏŠ·ì‹Æ‚ª’†Ž~‚³‚ê‚Ü‚·B\n\nHandBrake‚ðI—¹‚µ‚Ü‚·‚©H", + DialogResult result = MessageBox.Show("Œ»Ý•ÏŠ·ì‹Æ‚ðŽÀs’†‚Å‚·BHandBrake‚ðI—¹‚µ‚Ä‚àAŽÀs’†‚Ì•ÏŠ·ˆ—‚Í’†Ž~‚³‚ê‚Ü‚¹‚ñB‚½‚¾‚µAƒLƒ…[‚É‚ ‚éƒAƒCƒeƒ€‚ɂ‚¢‚Ä‚Í•ÏŠ·ˆ—‚ª’†Ž~‚³‚ê‚Ü‚·B\n\nHandBrake‚ðI—¹‚µ‚Ü‚·‚©H", "Close HandBrake?", MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (result == DialogResult.No) e.Cancel = true; diff --git a/win/C#/frmPreview.cs b/win/C#/frmPreview.cs index a4cf59c..b9a9f31 100644 --- a/win/C#/frmPreview.cs +++ b/win/C#/frmPreview.cs @@ -124,7 +124,7 @@ namespace Handbrake btn_playVLC.Enabled = true; // Decide which player to use. - String playerSelection = lbl_status.Text.Contains("QT") ? "QT" : "VLC"; + String playerSelection = lbl_status.Text.Contains("QuickTime") ? "QT" : "VLC"; lbl_status.Text = "ロード中..."; -- 2.11.0