Skip to content
This repository was archived by the owner on May 24, 2025. It is now read-only.

Commit 852ed18

Browse files
shuuryoushuuryou
committed
Test pattern fixes and Mono compatibility
Moved the test pattern context menu from GeometryPage to AppletForm and added a menu to allow direct selection of the test pattern.
1 parent 27e7833 commit 852ed18

17 files changed

+906
-547
lines changed

‎crtcpl.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Global
3636
{864D91B2-45C1-4684-A4A0-A9F17BD72949}.Release|Any CPU.Build.0 = Release|Any CPU
3737
{3EA43C76-9821-43BA-BA3C-4E3C13C7C0F7}.Debug|Any CPU.ActiveCfg = Debug|Win32
3838
{3EA43C76-9821-43BA-BA3C-4E3C13C7C0F7}.Debug|Any CPU.Build.0 = Debug|Win32
39-
{3EA43C76-9821-43BA-BA3C-4E3C13C7C0F7}.Mono|Any CPU.ActiveCfg = Release|Win32
39+
{3EA43C76-9821-43BA-BA3C-4E3C13C7C0F7}.Mono|Any CPU.ActiveCfg = Release|x64
4040
{3EA43C76-9821-43BA-BA3C-4E3C13C7C0F7}.Release|Any CPU.ActiveCfg = Release|Win32
4141
{3EA43C76-9821-43BA-BA3C-4E3C13C7C0F7}.Release|Any CPU.Build.0 = Release|Win32
4242
EndGlobalSection

‎crtcpl/AppletForm.Designer.cs

Lines changed: 143 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crtcpl/AppletForm.cs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ namespace crtcpl
77
{
88
public partial class AppletForm : Form
99
{
10+
private readonly TestPatternForm m_TestPatternForm = new TestPatternForm();
11+
1012
public AppletForm()
1113
{
1214
InitializeComponent();
@@ -55,6 +57,7 @@ protected override void Dispose(bool disposing)
5557
this.components.Dispose();
5658
UCCom.ConnectionClosed -= UCCom_ConnectionClosed;
5759
UCCom.ConnectionOpened -= UCCom_ConnectionOpened;
60+
m_TestPatternForm.Dispose();
5861
}
5962
base.Dispose(disposing);
6063
}
@@ -341,5 +344,31 @@ private void SCREEN_BrightnessChanged(object sender, ScreenPageEventArgs e)
341344

342345
this.applyButton.Enabled = true;
343346
}
347+
348+
private void showTestPatternToolStripMenuItem_Click(object sender, EventArgs e)
349+
{
350+
if (showTestPatternToolStripMenuItem.Checked)
351+
{
352+
m_TestPatternForm.Show();
353+
this.TopMost = true;
354+
}
355+
else
356+
{
357+
m_TestPatternForm.Hide();
358+
this.TopMost = false;
359+
}
360+
}
361+
362+
private void testPatternSelectionToolStripMenuItem_Click(object sender, EventArgs e)
363+
{
364+
int tag = int.Parse(((ToolStripMenuItem)sender).Tag.ToString(), NumberStyles.None);
365+
TestPatternForm.TestPatternMode mode = (TestPatternForm.TestPatternMode)tag;
366+
367+
foreach (ToolStripMenuItem item in testPatternSelectionToolStripMenuItem.DropDownItems)
368+
if (item != sender)
369+
item.Checked = false;
370+
371+
m_TestPatternForm.SetTestPattern(mode);
372+
}
344373
}
345374
}

‎crtcpl/AppletForm.de.resx

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,4 +681,43 @@
681681
<data name="$this.Text" xml:space="preserve">
682682
<value>Bildschirmeinstellungen</value>
683683
</data>
684+
<data name="okButton.Text" xml:space="preserve">
685+
<value>OK</value>
686+
</data>
687+
<data name="showTestPatternToolStripMenuItem.Text" xml:space="preserve">
688+
<value>Te&amp;stbild einblenden</value>
689+
</data>
690+
<data name="screenAdjustToolStripMenuItem.Text" xml:space="preserve">
691+
<value>Stan&amp;dard</value>
692+
</data>
693+
<data name="sMPTEColorBarToolStripMenuItem.Text" xml:space="preserve">
694+
<value>&amp;SMPTE-Testbild</value>
695+
</data>
696+
<data name="fuBKTestCardToolStripMenuItem.Text" xml:space="preserve">
697+
<value>&amp;FuBK-Testbild</value>
698+
</data>
699+
<data name="bWverticalToolStripMenuItem.Text" xml:space="preserve">
700+
<value>S/W (&amp;vertikal)</value>
701+
</data>
702+
<data name="bWhorizontalToolStripMenuItem.Text" xml:space="preserve">
703+
<value>S/W (&amp;horizontal)</value>
704+
</data>
705+
<data name="rGBverticalToolStripMenuItem.Text" xml:space="preserve">
706+
<value>&amp;RGB (vertikal)</value>
707+
</data>
708+
<data name="rGBhorizontalToolStripMenuItem.Text" xml:space="preserve">
709+
<value>R&amp;GB (horizontal)</value>
710+
</data>
711+
<data name="redScreenToolStripMenuItem.Text" xml:space="preserve">
712+
<value>Rot&amp;er Bildschirm</value>
713+
</data>
714+
<data name="greenScreenToolStripMenuItem.Text" xml:space="preserve">
715+
<value>Grün&amp;er Bildschirm</value>
716+
</data>
717+
<data name="blueScreenToolStripMenuItem.Text" xml:space="preserve">
718+
<value>B&amp;lauer Bildschirm</value>
719+
</data>
720+
<data name="testPatternSelectionToolStripMenuItem.Text" xml:space="preserve">
721+
<value>&amp;Testbild-Auswahl</value>
722+
</data>
684723
</root>

‎crtcpl/AppletForm.fr.resx

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,4 +663,40 @@
663663
<data name="okButton.Text" xml:space="preserve">
664664
<value>OK</value>
665665
</data>
666+
<data name="showTestPatternToolStripMenuItem.Text" xml:space="preserve">
667+
<value>Afficher un motif de te&amp;st</value>
668+
</data>
669+
<data name="screenAdjustToolStripMenuItem.Text" xml:space="preserve">
670+
<value>&amp;Défaut</value>
671+
</data>
672+
<data name="sMPTEColorBarToolStripMenuItem.Text" xml:space="preserve">
673+
<value>Mire &amp;SMPTE</value>
674+
</data>
675+
<data name="fuBKTestCardToolStripMenuItem.Text" xml:space="preserve">
676+
<value>Mire &amp;FuBK</value>
677+
</data>
678+
<data name="bWverticalToolStripMenuItem.Text" xml:space="preserve">
679+
<value>N/&amp;B (verticale)</value>
680+
</data>
681+
<data name="bWhorizontalToolStripMenuItem.Text" xml:space="preserve">
682+
<value>N/B (&amp;horizontale)</value>
683+
</data>
684+
<data name="rGBverticalToolStripMenuItem.Text" xml:space="preserve">
685+
<value>&amp;RGB (verticale)</value>
686+
</data>
687+
<data name="rGBhorizontalToolStripMenuItem.Text" xml:space="preserve">
688+
<value>R&amp;GB (horizontale)</value>
689+
</data>
690+
<data name="redScreenToolStripMenuItem.Text" xml:space="preserve">
691+
<value>Écran roug&amp;e</value>
692+
</data>
693+
<data name="greenScreenToolStripMenuItem.Text" xml:space="preserve">
694+
<value>Écra&amp;n vert</value>
695+
</data>
696+
<data name="blueScreenToolStripMenuItem.Text" xml:space="preserve">
697+
<value>&amp;Écran bleu</value>
698+
</data>
699+
<data name="testPatternSelectionToolStripMenuItem.Text" xml:space="preserve">
700+
<value>Sélec&amp;tion de la mire</value>
701+
</data>
666702
</root>

‎crtcpl/AppletForm.ja.resx

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,40 @@
144144
<data name="$this.Text" xml:space="preserve">
145145
<value>画面設定</value>
146146
</data>
147+
<data name="showTestPatternToolStripMenuItem.Text" xml:space="preserve">
148+
<value>テストパターンを表示(&amp;S)</value>
149+
</data>
150+
<data name="screenAdjustToolStripMenuItem.Text" xml:space="preserve">
151+
<value>既定のパターン(&amp;D)</value>
152+
</data>
153+
<data name="sMPTEColorBarToolStripMenuItem.Text" xml:space="preserve">
154+
<value>SMPTEのカラーバー(&amp;S)</value>
155+
</data>
156+
<data name="fuBKTestCardToolStripMenuItem.Text" xml:space="preserve">
157+
<value>FuBKのテストパターン(&amp;F)</value>
158+
</data>
159+
<data name="bWverticalToolStripMenuItem.Text" xml:space="preserve">
160+
<value>水平の白黒バー(&amp;B)</value>
161+
</data>
162+
<data name="bWhorizontalToolStripMenuItem.Text" xml:space="preserve">
163+
<value>垂直の白黒バー(&amp;B)</value>
164+
</data>
165+
<data name="rGBverticalToolStripMenuItem.Text" xml:space="preserve">
166+
<value>水平のRGBバー(&amp;R)</value>
167+
</data>
168+
<data name="rGBhorizontalToolStripMenuItem.Text" xml:space="preserve">
169+
<value>垂直のRGBバー(&amp;G)</value>
170+
</data>
171+
<data name="redScreenToolStripMenuItem.Text" xml:space="preserve">
172+
<value>赤(&amp;E)</value>
173+
</data>
174+
<data name="greenScreenToolStripMenuItem.Text" xml:space="preserve">
175+
<value>緑(&amp;N)</value>
176+
</data>
177+
<data name="blueScreenToolStripMenuItem.Text" xml:space="preserve">
178+
<value>青(&amp;L)</value>
179+
</data>
180+
<data name="testPatternSelectionToolStripMenuItem.Text" xml:space="preserve">
181+
<value>テストパターンの選択(&amp;T)</value>
182+
</data>
147183
</root>

0 commit comments

Comments
 (0)