From 9fcfb5f537ffdf9a6af59a3cd753935761b74bcd Mon Sep 17 00:00:00 2001 From: Jeff Date: Tue, 11 Jun 2013 09:39:07 +0200 Subject: [PATCH 1/2] Prevent shutdown from the console --- src/CasparCGFrontend/MainForm.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CasparCGFrontend/MainForm.cs b/src/CasparCGFrontend/MainForm.cs index 2f3300e..2aed7ca 100755 --- a/src/CasparCGFrontend/MainForm.cs +++ b/src/CasparCGFrontend/MainForm.cs @@ -566,7 +566,8 @@ private void textBoxCommand_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Return) { - ExecuteCommand(); + if (!this.textBoxCommand.Text.Equals("exit") && !this.textBoxCommand.Text.Equals("q") && !this.textBoxCommand.Text.Equals("quit") && !this.textBoxCommand.Text.Equals("bye")) + ExecuteCommand(); this.textBoxCommand.Clear(); } From b305ae125998bd3fa501f9ed6c58c5af5966cddd Mon Sep 17 00:00:00 2001 From: Jeff Date: Tue, 11 Jun 2013 10:06:28 +0200 Subject: [PATCH 2/2] Add Macro Tabpage with 5 custom macros with shortcut --- src/CasparCGFrontend/App.config | 22 + src/CasparCGFrontend/CasparCGFrontend.csproj | 1 + src/CasparCGFrontend/MainForm.Designer.cs | 415 ++++++++++++++++-- src/CasparCGFrontend/MainForm.cs | 109 +++++ src/CasparCGFrontend/MainForm.resx | 17 +- .../Properties/Resources.Designer.cs | 45 +- .../Properties/Resources.resx | 3 + .../Properties/Settings.Designer.cs | 62 ++- .../Properties/Settings.settings | 15 + src/CasparCGFrontend/Resources/Macro.png | Bin 0 -> 407 bytes 10 files changed, 618 insertions(+), 71 deletions(-) create mode 100644 src/CasparCGFrontend/Resources/Macro.png diff --git a/src/CasparCGFrontend/App.config b/src/CasparCGFrontend/App.config index 83f4cf6..f51308e 100755 --- a/src/CasparCGFrontend/App.config +++ b/src/CasparCGFrontend/App.config @@ -4,6 +4,9 @@
+ +
+ @@ -15,4 +18,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/CasparCGFrontend/CasparCGFrontend.csproj b/src/CasparCGFrontend/CasparCGFrontend.csproj index adab0d3..4995d88 100755 --- a/src/CasparCGFrontend/CasparCGFrontend.csproj +++ b/src/CasparCGFrontend/CasparCGFrontend.csproj @@ -201,6 +201,7 @@ + diff --git a/src/CasparCGFrontend/MainForm.Designer.cs b/src/CasparCGFrontend/MainForm.Designer.cs index a889757..1f45d98 100755 --- a/src/CasparCGFrontend/MainForm.Designer.cs +++ b/src/CasparCGFrontend/MainForm.Designer.cs @@ -62,6 +62,11 @@ private void InitializeComponent() System.Windows.Forms.Label label42; System.Windows.Forms.Label label43; System.Windows.Forms.Label thumbnailspathLabel; + System.Windows.Forms.Label label48; + System.Windows.Forms.Label label47; + System.Windows.Forms.Label label46; + System.Windows.Forms.Label label31; + System.Windows.Forms.Label label45; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -73,7 +78,6 @@ private void InitializeComponent() this.button9 = new System.Windows.Forms.Button(); this.button8 = new System.Windows.Forms.Button(); this.datapathTextBox = new System.Windows.Forms.TextBox(); - this.pathsBindingSource = new System.Windows.Forms.BindingSource(this.components); this.logpathTextBox = new System.Windows.Forms.TextBox(); this.mediapathTextBox = new System.Windows.Forms.TextBox(); this.templatepathTextBox = new System.Windows.Forms.TextBox(); @@ -84,6 +88,7 @@ private void InitializeComponent() this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.buttonMacro = new System.Windows.Forms.Button(); this.buttonConsole = new System.Windows.Forms.Button(); this.labelSeparatorRight = new System.Windows.Forms.Label(); this.buttonStatus = new System.Windows.Forms.Button(); @@ -106,7 +111,6 @@ private void InitializeComponent() this.tabPageChannels = new System.Windows.Forms.TabPage(); this.panelChannels = new System.Windows.Forms.Panel(); this.comboBox5 = new System.Windows.Forms.ComboBox(); - this.channelBindingSource = new System.Windows.Forms.BindingSource(this.components); this.label1 = new System.Windows.Forms.Label(); this.button2 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); @@ -131,7 +135,6 @@ private void InitializeComponent() this.panelAdvanced = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel(); this.comboBox9 = new System.Windows.Forms.ComboBox(); - this.thumbnailBindingSource = new System.Windows.Forms.BindingSource(this.components); this.label44 = new System.Windows.Forms.Label(); this.numericUpDown5 = new System.Windows.Forms.NumericUpDown(); this.numericUpDown4 = new System.Windows.Forms.NumericUpDown(); @@ -144,13 +147,10 @@ private void InitializeComponent() this.label26 = new System.Windows.Forms.Label(); this.button12 = new System.Windows.Forms.Button(); this.comboBox6 = new System.Windows.Forms.ComboBox(); - this.configurationBindingSource = new System.Windows.Forms.BindingSource(this.components); this.button13 = new System.Windows.Forms.Button(); this.listBox4 = new System.Windows.Forms.ListBox(); this.comboBox7 = new System.Windows.Forms.ComboBox(); - this.flashBindingSource = new System.Windows.Forms.BindingSource(this.components); this.textBox2 = new System.Windows.Forms.TextBox(); - this.oscBindingSource = new System.Windows.Forms.BindingSource(this.components); this.comboBox8 = new System.Windows.Forms.ComboBox(); this.checkBox2 = new System.Windows.Forms.CheckBox(); this.checkBox3 = new System.Windows.Forms.CheckBox(); @@ -173,12 +173,33 @@ private void InitializeComponent() this.textBoxCommand = new System.Windows.Forms.TextBox(); this.textBoxLog = new System.Windows.Forms.TextBox(); this.labelSpacerBottom = new System.Windows.Forms.Label(); + this.tabPageMacro = new System.Windows.Forms.TabPage(); + this.panelMacro = new System.Windows.Forms.Panel(); + this.buttonMacro5 = new System.Windows.Forms.Button(); + this.textBoxMacro5 = new System.Windows.Forms.TextBox(); + this.buttonMacro4 = new System.Windows.Forms.Button(); + this.textBoxMacro4 = new System.Windows.Forms.TextBox(); + this.buttonMacro3 = new System.Windows.Forms.Button(); + this.textBoxMacro3 = new System.Windows.Forms.TextBox(); + this.buttonMacro2 = new System.Windows.Forms.Button(); + this.textBoxMacro2 = new System.Windows.Forms.TextBox(); + this.buttonMacro1 = new System.Windows.Forms.Button(); + this.textBoxMacro1 = new System.Windows.Forms.TextBox(); this.labelSeparatorTop = new System.Windows.Forms.Label(); this.labelSeparatorBottom = new System.Windows.Forms.Label(); this.fileToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.quitToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.buttonMacroRestore = new System.Windows.Forms.Button(); + this.buttonMacroReset = new System.Windows.Forms.Button(); + this.buttonMacroSave = new System.Windows.Forms.Button(); + this.pathsBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.channelBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.thumbnailBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.configurationBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.flashBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.oscBindingSource = new System.Windows.Forms.BindingSource(this.components); datapathLabel = new System.Windows.Forms.Label(); logpathLabel = new System.Windows.Forms.Label(); mediapathLabel = new System.Windows.Forms.Label(); @@ -212,8 +233,12 @@ private void InitializeComponent() label42 = new System.Windows.Forms.Label(); label43 = new System.Windows.Forms.Label(); thumbnailspathLabel = new System.Windows.Forms.Label(); + label48 = new System.Windows.Forms.Label(); + label47 = new System.Windows.Forms.Label(); + label46 = new System.Windows.Forms.Label(); + label31 = new System.Windows.Forms.Label(); + label45 = new System.Windows.Forms.Label(); this.menuStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pathsBindingSource)).BeginInit(); this.statusStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); @@ -226,21 +251,24 @@ private void InitializeComponent() this.panelPaths.SuspendLayout(); this.tabPageChannels.SuspendLayout(); this.panelChannels.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.channelBindingSource)).BeginInit(); this.tabPageAdvanced.SuspendLayout(); this.panelAdvanced.SuspendLayout(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.thumbnailBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); + this.tabPageConsole.SuspendLayout(); + this.panelConsole.SuspendLayout(); + this.tabPageMacro.SuspendLayout(); + this.panelMacro.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pathsBindingSource)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.channelBindingSource)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.thumbnailBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.configurationBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.flashBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.oscBindingSource)).BeginInit(); - this.tabPageConsole.SuspendLayout(); - this.panelConsole.SuspendLayout(); this.SuspendLayout(); // // datapathLabel @@ -574,6 +602,56 @@ private void InitializeComponent() thumbnailspathLabel.TabIndex = 12; thumbnailspathLabel.Text = "Thumbnails Path"; // + // label48 + // + label48.AutoSize = true; + label48.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190))))); + label48.Location = new System.Drawing.Point(39, 441); + label48.Name = "label48"; + label48.Size = new System.Drawing.Size(45, 13); + label48.TabIndex = 18; + label48.Text = "Macro5"; + // + // label47 + // + label47.AutoSize = true; + label47.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190))))); + label47.Location = new System.Drawing.Point(39, 338); + label47.Name = "label47"; + label47.Size = new System.Drawing.Size(45, 13); + label47.TabIndex = 15; + label47.Text = "Macro4"; + // + // label46 + // + label46.AutoSize = true; + label46.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190))))); + label46.Location = new System.Drawing.Point(39, 232); + label46.Name = "label46"; + label46.Size = new System.Drawing.Size(45, 13); + label46.TabIndex = 12; + label46.Text = "Macro3"; + // + // label31 + // + label31.AutoSize = true; + label31.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190))))); + label31.Location = new System.Drawing.Point(39, 129); + label31.Name = "label31"; + label31.Size = new System.Drawing.Size(45, 13); + label31.TabIndex = 9; + label31.Text = "Macro2"; + // + // label45 + // + label45.AutoSize = true; + label45.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190))))); + label45.Location = new System.Drawing.Point(39, 26); + label45.Name = "label45"; + label45.Size = new System.Drawing.Size(45, 13); + label45.TabIndex = 0; + label45.Text = "Macro1"; + // // menuStrip1 // this.menuStrip1.BackColor = System.Drawing.Color.Transparent; @@ -680,10 +758,6 @@ private void InitializeComponent() this.datapathTextBox.Size = new System.Drawing.Size(565, 22); this.datapathTextBox.TabIndex = 1; // - // pathsBindingSource - // - this.pathsBindingSource.DataSource = typeof(CasparCGFrontend.Paths); - // // logpathTextBox // this.logpathTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -804,6 +878,7 @@ private void InitializeComponent() // splitContainer1.Panel1 // this.splitContainer1.Panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.splitContainer1.Panel1.Controls.Add(this.buttonMacro); this.splitContainer1.Panel1.Controls.Add(this.buttonConsole); this.splitContainer1.Panel1.Controls.Add(this.labelSeparatorRight); this.splitContainer1.Panel1.Controls.Add(this.buttonStatus); @@ -820,13 +895,28 @@ private void InitializeComponent() this.splitContainer1.SplitterDistance = 177; this.splitContainer1.TabIndex = 7; // + // buttonMacro + // + this.buttonMacro.FlatAppearance.BorderSize = 0; + this.buttonMacro.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonMacro.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190))))); + this.buttonMacro.Image = global::CasparCGFrontend.Properties.Resources.Macro; + this.buttonMacro.Location = new System.Drawing.Point(51, 284); + this.buttonMacro.Name = "buttonMacro"; + this.buttonMacro.Size = new System.Drawing.Size(75, 57); + this.buttonMacro.TabIndex = 10; + this.buttonMacro.Text = "Macro"; + this.buttonMacro.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.buttonMacro.UseVisualStyleBackColor = true; + this.buttonMacro.Click += new System.EventHandler(this.buttonMacro_Click); + // // buttonConsole // this.buttonConsole.FlatAppearance.BorderSize = 0; this.buttonConsole.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonConsole.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190))))); this.buttonConsole.Image = global::CasparCGFrontend.Properties.Resources.Log; - this.buttonConsole.Location = new System.Drawing.Point(50, 292); + this.buttonConsole.Location = new System.Drawing.Point(50, 346); this.buttonConsole.Name = "buttonConsole"; this.buttonConsole.Size = new System.Drawing.Size(75, 57); this.buttonConsole.TabIndex = 8; @@ -877,6 +967,7 @@ private void InitializeComponent() this.tabControl.Controls.Add(this.tabPageChannels); this.tabControl.Controls.Add(this.tabPageAdvanced); this.tabControl.Controls.Add(this.tabPageConsole); + this.tabControl.Controls.Add(this.tabPageMacro); this.tabControl.Location = new System.Drawing.Point(-3, -24); this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 0; @@ -1127,10 +1218,6 @@ private void InitializeComponent() this.comboBox5.TabIndex = 40; this.comboBox5.SelectedIndexChanged += new System.EventHandler(this.comboBox5_SelectedIndexChanged); // - // channelBindingSource - // - this.channelBindingSource.DataSource = typeof(CasparCGFrontend.Channel); - // // label1 // this.label1.AutoSize = true; @@ -1498,10 +1585,6 @@ private void InitializeComponent() this.comboBox9.Size = new System.Drawing.Size(121, 21); this.comboBox9.TabIndex = 50; // - // thumbnailBindingSource - // - this.thumbnailBindingSource.DataSource = typeof(CasparCGFrontend.Thumbnails); - // // label44 // this.label44.AutoSize = true; @@ -1687,10 +1770,6 @@ private void InitializeComponent() this.comboBox6.TabIndex = 30; this.comboBox6.Visible = false; // - // configurationBindingSource - // - this.configurationBindingSource.DataSource = typeof(CasparCGFrontend.configuration); - // // button13 // this.button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat; @@ -1738,10 +1817,6 @@ private void InitializeComponent() this.comboBox7.Size = new System.Drawing.Size(121, 21); this.comboBox7.TabIndex = 28; // - // flashBindingSource - // - this.flashBindingSource.DataSource = typeof(CasparCGFrontend.Flash); - // // textBox2 // this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -1755,10 +1830,6 @@ private void InitializeComponent() this.textBox2.Size = new System.Drawing.Size(132, 22); this.textBox2.TabIndex = 3; // - // oscBindingSource - // - this.oscBindingSource.DataSource = typeof(CasparCGFrontend.Osc); - // // comboBox8 // this.comboBox8.DataBindings.Add(new System.Windows.Forms.Binding("SelectedItem", this.configurationBindingSource, "loglevel", true)); @@ -2015,6 +2086,182 @@ private void InitializeComponent() this.labelSpacerBottom.Size = new System.Drawing.Size(742, 3); this.labelSpacerBottom.TabIndex = 2; // + // tabPageMacro + // + this.tabPageMacro.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.tabPageMacro.Controls.Add(this.panelMacro); + this.tabPageMacro.Location = new System.Drawing.Point(4, 22); + this.tabPageMacro.Name = "tabPageMacro"; + this.tabPageMacro.Size = new System.Drawing.Size(742, 579); + this.tabPageMacro.TabIndex = 5; + this.tabPageMacro.Text = "Macro"; + // + // panelMacro + // + this.panelMacro.Controls.Add(this.buttonMacroRestore); + this.panelMacro.Controls.Add(this.buttonMacroReset); + this.panelMacro.Controls.Add(this.buttonMacroSave); + this.panelMacro.Controls.Add(label48); + this.panelMacro.Controls.Add(this.buttonMacro5); + this.panelMacro.Controls.Add(this.textBoxMacro5); + this.panelMacro.Controls.Add(label47); + this.panelMacro.Controls.Add(this.buttonMacro4); + this.panelMacro.Controls.Add(this.textBoxMacro4); + this.panelMacro.Controls.Add(label46); + this.panelMacro.Controls.Add(this.buttonMacro3); + this.panelMacro.Controls.Add(this.textBoxMacro3); + this.panelMacro.Controls.Add(label31); + this.panelMacro.Controls.Add(this.buttonMacro2); + this.panelMacro.Controls.Add(this.textBoxMacro2); + this.panelMacro.Controls.Add(label45); + this.panelMacro.Controls.Add(this.buttonMacro1); + this.panelMacro.Controls.Add(this.textBoxMacro1); + this.panelMacro.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelMacro.Location = new System.Drawing.Point(0, 0); + this.panelMacro.Name = "panelMacro"; + this.panelMacro.Size = new System.Drawing.Size(742, 579); + this.panelMacro.TabIndex = 2; + // + // buttonMacro5 + // + this.buttonMacro5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonMacro5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonMacro5.ForeColor = System.Drawing.Color.DarkGray; + this.buttonMacro5.Location = new System.Drawing.Point(685, 440); + this.buttonMacro5.Name = "buttonMacro5"; + this.buttonMacro5.Size = new System.Drawing.Size(29, 20); + this.buttonMacro5.TabIndex = 20; + this.buttonMacro5.Text = "F5"; + this.buttonMacro5.UseVisualStyleBackColor = true; + this.buttonMacro5.Click += new System.EventHandler(this.buttonMacro5_Click); + // + // textBoxMacro5 + // + this.textBoxMacro5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxMacro5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.textBoxMacro5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.textBoxMacro5.ForeColor = System.Drawing.SystemColors.Window; + this.textBoxMacro5.Location = new System.Drawing.Point(103, 439); + this.textBoxMacro5.Multiline = true; + this.textBoxMacro5.Name = "textBoxMacro5"; + this.textBoxMacro5.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.textBoxMacro5.Size = new System.Drawing.Size(571, 87); + this.textBoxMacro5.TabIndex = 19; + this.textBoxMacro5.Text = "call 1-1 audio 1"; + // + // buttonMacro4 + // + this.buttonMacro4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonMacro4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonMacro4.ForeColor = System.Drawing.Color.DarkGray; + this.buttonMacro4.Location = new System.Drawing.Point(685, 337); + this.buttonMacro4.Name = "buttonMacro4"; + this.buttonMacro4.Size = new System.Drawing.Size(29, 20); + this.buttonMacro4.TabIndex = 17; + this.buttonMacro4.Text = "F4"; + this.buttonMacro4.UseVisualStyleBackColor = true; + this.buttonMacro4.Click += new System.EventHandler(this.buttonMacro4_Click); + // + // textBoxMacro4 + // + this.textBoxMacro4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxMacro4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.textBoxMacro4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.textBoxMacro4.ForeColor = System.Drawing.SystemColors.Window; + this.textBoxMacro4.Location = new System.Drawing.Point(103, 336); + this.textBoxMacro4.Multiline = true; + this.textBoxMacro4.Name = "textBoxMacro4"; + this.textBoxMacro4.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.textBoxMacro4.Size = new System.Drawing.Size(571, 87); + this.textBoxMacro4.TabIndex = 16; + this.textBoxMacro4.Text = "call 1-1 audio 2"; + // + // buttonMacro3 + // + this.buttonMacro3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonMacro3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonMacro3.ForeColor = System.Drawing.Color.DarkGray; + this.buttonMacro3.Location = new System.Drawing.Point(685, 231); + this.buttonMacro3.Name = "buttonMacro3"; + this.buttonMacro3.Size = new System.Drawing.Size(29, 20); + this.buttonMacro3.TabIndex = 14; + this.buttonMacro3.Text = "F3"; + this.buttonMacro3.UseVisualStyleBackColor = true; + this.buttonMacro3.Click += new System.EventHandler(this.buttonMacro3_Click); + // + // textBoxMacro3 + // + this.textBoxMacro3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxMacro3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.textBoxMacro3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.textBoxMacro3.ForeColor = System.Drawing.SystemColors.Window; + this.textBoxMacro3.Location = new System.Drawing.Point(103, 230); + this.textBoxMacro3.Multiline = true; + this.textBoxMacro3.Name = "textBoxMacro3"; + this.textBoxMacro3.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.textBoxMacro3.Size = new System.Drawing.Size(571, 87); + this.textBoxMacro3.TabIndex = 13; + this.textBoxMacro3.Text = "play 3-1 bones"; + // + // buttonMacro2 + // + this.buttonMacro2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonMacro2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonMacro2.ForeColor = System.Drawing.Color.DarkGray; + this.buttonMacro2.Location = new System.Drawing.Point(685, 128); + this.buttonMacro2.Name = "buttonMacro2"; + this.buttonMacro2.Size = new System.Drawing.Size(29, 20); + this.buttonMacro2.TabIndex = 11; + this.buttonMacro2.Text = "F2"; + this.buttonMacro2.UseVisualStyleBackColor = true; + this.buttonMacro2.Click += new System.EventHandler(this.buttonMacro2_Click); + // + // textBoxMacro2 + // + this.textBoxMacro2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxMacro2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.textBoxMacro2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.textBoxMacro2.ForeColor = System.Drawing.SystemColors.Window; + this.textBoxMacro2.Location = new System.Drawing.Point(103, 127); + this.textBoxMacro2.Multiline = true; + this.textBoxMacro2.Name = "textBoxMacro2"; + this.textBoxMacro2.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.textBoxMacro2.Size = new System.Drawing.Size(571, 87); + this.textBoxMacro2.TabIndex = 10; + this.textBoxMacro2.Text = "play 2-1 cartier"; + // + // buttonMacro1 + // + this.buttonMacro1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonMacro1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonMacro1.ForeColor = System.Drawing.Color.DarkGray; + this.buttonMacro1.Location = new System.Drawing.Point(685, 25); + this.buttonMacro1.Name = "buttonMacro1"; + this.buttonMacro1.Size = new System.Drawing.Size(29, 20); + this.buttonMacro1.TabIndex = 8; + this.buttonMacro1.Text = "F1"; + this.buttonMacro1.UseVisualStyleBackColor = true; + this.buttonMacro1.Click += new System.EventHandler(this.buttonMacro1_Click); + // + // textBoxMacro1 + // + this.textBoxMacro1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxMacro1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55))))); + this.textBoxMacro1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.textBoxMacro1.ForeColor = System.Drawing.SystemColors.Window; + this.textBoxMacro1.Location = new System.Drawing.Point(103, 24); + this.textBoxMacro1.Multiline = true; + this.textBoxMacro1.Name = "textBoxMacro1"; + this.textBoxMacro1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.textBoxMacro1.Size = new System.Drawing.Size(571, 87); + this.textBoxMacro1.TabIndex = 1; + this.textBoxMacro1.Text = "play 1-1 EARL"; + // // labelSeparatorTop // this.labelSeparatorTop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); @@ -2057,6 +2304,69 @@ private void InitializeComponent() this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6); // + // buttonMacroRestore + // + this.buttonMacroRestore.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.buttonMacroRestore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonMacroRestore.ForeColor = System.Drawing.Color.White; + this.buttonMacroRestore.Location = new System.Drawing.Point(465, 541); + this.buttonMacroRestore.Name = "buttonMacroRestore"; + this.buttonMacroRestore.Size = new System.Drawing.Size(146, 23); + this.buttonMacroRestore.TabIndex = 43; + this.buttonMacroRestore.Text = "Restore Macros"; + this.buttonMacroRestore.UseVisualStyleBackColor = true; + this.buttonMacroRestore.Click += new System.EventHandler(this.buttonMacroRestore_Click); + // + // buttonMacroReset + // + this.buttonMacroReset.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.buttonMacroReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonMacroReset.ForeColor = System.Drawing.Color.White; + this.buttonMacroReset.Location = new System.Drawing.Point(298, 541); + this.buttonMacroReset.Name = "buttonMacroReset"; + this.buttonMacroReset.Size = new System.Drawing.Size(146, 23); + this.buttonMacroReset.TabIndex = 42; + this.buttonMacroReset.Text = "Reset Macros"; + this.buttonMacroReset.UseVisualStyleBackColor = true; + this.buttonMacroReset.Click += new System.EventHandler(this.buttonMacroReset_Click); + // + // buttonMacroSave + // + this.buttonMacroSave.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.buttonMacroSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonMacroSave.ForeColor = System.Drawing.Color.White; + this.buttonMacroSave.Location = new System.Drawing.Point(131, 541); + this.buttonMacroSave.Name = "buttonMacroSave"; + this.buttonMacroSave.Size = new System.Drawing.Size(146, 23); + this.buttonMacroSave.TabIndex = 41; + this.buttonMacroSave.Text = "Save Macros"; + this.buttonMacroSave.UseVisualStyleBackColor = true; + this.buttonMacroSave.Click += new System.EventHandler(this.buttonMacroSave_Click); + // + // pathsBindingSource + // + this.pathsBindingSource.DataSource = typeof(CasparCGFrontend.Paths); + // + // channelBindingSource + // + this.channelBindingSource.DataSource = typeof(CasparCGFrontend.Channel); + // + // thumbnailBindingSource + // + this.thumbnailBindingSource.DataSource = typeof(CasparCGFrontend.Thumbnails); + // + // configurationBindingSource + // + this.configurationBindingSource.DataSource = typeof(CasparCGFrontend.configuration); + // + // flashBindingSource + // + this.flashBindingSource.DataSource = typeof(CasparCGFrontend.Flash); + // + // oscBindingSource + // + this.oscBindingSource.DataSource = typeof(CasparCGFrontend.Osc); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -2071,6 +2381,7 @@ private void InitializeComponent() this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ForeColor = System.Drawing.Color.White; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.KeyPreview = true; this.MainMenuStrip = this.menuStrip1; this.MaximizeBox = false; this.MaximumSize = new System.Drawing.Size(940, 662); @@ -2080,9 +2391,9 @@ private void InitializeComponent() this.Text = "CasparCG Frontend"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); this.Load += new System.EventHandler(this.MainForm_Load); + this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyDown); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pathsBindingSource)).EndInit(); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); this.splitContainer1.Panel1.ResumeLayout(false); @@ -2098,24 +2409,28 @@ private void InitializeComponent() this.tabPageChannels.ResumeLayout(false); this.panelChannels.ResumeLayout(false); this.panelChannels.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.channelBindingSource)).EndInit(); this.tabPageAdvanced.ResumeLayout(false); this.panelAdvanced.ResumeLayout(false); this.panelAdvanced.PerformLayout(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.thumbnailBindingSource)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.configurationBindingSource)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.flashBindingSource)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.oscBindingSource)).EndInit(); this.tabPageConsole.ResumeLayout(false); this.panelConsole.ResumeLayout(false); this.panelConsole.PerformLayout(); + this.tabPageMacro.ResumeLayout(false); + this.panelMacro.ResumeLayout(false); + this.panelMacro.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pathsBindingSource)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.channelBindingSource)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.thumbnailBindingSource)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.configurationBindingSource)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.flashBindingSource)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.oscBindingSource)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -2239,6 +2554,22 @@ private void InitializeComponent() public System.Windows.Forms.CheckBox checkBox4; public System.Windows.Forms.TextBox thumbnailspathTextBox; public System.Windows.Forms.Button button14; + private System.Windows.Forms.TabPage tabPageMacro; + private System.Windows.Forms.Button buttonMacro; + private System.Windows.Forms.Panel panelMacro; + public System.Windows.Forms.Button buttonMacro5; + public System.Windows.Forms.TextBox textBoxMacro5; + public System.Windows.Forms.Button buttonMacro4; + public System.Windows.Forms.TextBox textBoxMacro4; + public System.Windows.Forms.Button buttonMacro3; + public System.Windows.Forms.TextBox textBoxMacro3; + public System.Windows.Forms.Button buttonMacro2; + public System.Windows.Forms.TextBox textBoxMacro2; + public System.Windows.Forms.Button buttonMacro1; + public System.Windows.Forms.TextBox textBoxMacro1; + private System.Windows.Forms.Button buttonMacroRestore; + private System.Windows.Forms.Button buttonMacroReset; + private System.Windows.Forms.Button buttonMacroSave; } } diff --git a/src/CasparCGFrontend/MainForm.cs b/src/CasparCGFrontend/MainForm.cs index 2aed7ca..0c2d98e 100755 --- a/src/CasparCGFrontend/MainForm.cs +++ b/src/CasparCGFrontend/MainForm.cs @@ -52,6 +52,17 @@ public MainForm() this.Text += " " + Settings.Default.Version; this.tabControl.SelectedTab = this.tabPageStatus; + + this.InitializeMacros(); + } + + private void InitializeMacros() + { + textBoxMacro1.Text = Settings.Default.Macro1; + textBoxMacro2.Text = Settings.Default.Macro2; + textBoxMacro3.Text = Settings.Default.Macro3; + textBoxMacro4.Text = Settings.Default.Macro4; + textBoxMacro5.Text = Settings.Default.Macro5; } private void MainForm_Load(object sender, EventArgs e) @@ -78,6 +89,7 @@ private void DockControls() this.panelChannels.Dock = DockStyle.Fill; this.panelAdvanced.Dock = DockStyle.Fill; this.panelConsole.Dock = DockStyle.Fill; + this.panelMacro.Dock = DockStyle.Fill; } private bool ProcessExists(string name) @@ -521,6 +533,11 @@ private void buttonConsole_Click(object sender, EventArgs e) this.textBoxCommand.Focus(); } + private void buttonMacro_Click(object sender, EventArgs e) + { + this.tabControl.SelectedTab = this.tabPageMacro; + } + private void quitToolStripMenuItem_Click(object sender, EventArgs e) { Application.Exit(); @@ -617,5 +634,97 @@ private void listBox4_Click(object sender, EventArgs e) } } + private void ExecuteCommand(string sMultilineText) + { + string[] allLines = sMultilineText.Replace("\r", "").Split('\n'); + foreach (string text in allLines) + { + try + { + if (string.IsNullOrEmpty(text)) + System.Threading.Thread.Sleep(40); + else + this.process.StandardInput.Write(string.Format("{0}\r\n", text)); + } + catch (Exception ex) { } + } + } + + private void buttonMacro1_Click(object sender, EventArgs e) + { + ExecuteCommand(textBoxMacro1.Text); + } + + private void buttonMacro2_Click(object sender, EventArgs e) + { + ExecuteCommand(textBoxMacro2.Text); + } + + private void buttonMacro3_Click(object sender, EventArgs e) + { + ExecuteCommand(textBoxMacro3.Text); + } + + private void buttonMacro4_Click(object sender, EventArgs e) + { + ExecuteCommand(textBoxMacro4.Text); + } + + private void buttonMacro5_Click(object sender, EventArgs e) + { + ExecuteCommand(textBoxMacro5.Text); + } + + private void buttonMacroSave_Click(object sender, EventArgs e) + { + Settings.Default.Macro1 = textBoxMacro1.Text; + Settings.Default.Macro2 = textBoxMacro2.Text; + Settings.Default.Macro3 = textBoxMacro3.Text; + Settings.Default.Macro4 = textBoxMacro4.Text; + Settings.Default.Macro5 = textBoxMacro5.Text; + Settings.Default.Save(); + } + + private void buttonMacroRestore_Click(object sender, EventArgs e) + { + this.InitializeMacros(); + } + + private void buttonMacroReset_Click(object sender, EventArgs e) + { + textBoxMacro1.Text = ""; + textBoxMacro2.Text = ""; + textBoxMacro3.Text = ""; + textBoxMacro4.Text = ""; + textBoxMacro5.Text = ""; + } + + private void MainForm_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.F1) + { + ExecuteCommand(textBoxMacro1.Text); + } + else + if (e.KeyCode == Keys.F2) + { + ExecuteCommand(textBoxMacro2.Text); + } + else + if (e.KeyCode == Keys.F3) + { + ExecuteCommand(textBoxMacro3.Text); + } + else + if (e.KeyCode == Keys.F4) + { + ExecuteCommand(textBoxMacro4.Text); + } + else + if (e.KeyCode == Keys.F5) + { + ExecuteCommand(textBoxMacro5.Text); + } + } } } diff --git a/src/CasparCGFrontend/MainForm.resx b/src/CasparCGFrontend/MainForm.resx index b28ace2..219c0b0 100755 --- a/src/CasparCGFrontend/MainForm.resx +++ b/src/CasparCGFrontend/MainForm.resx @@ -216,6 +216,21 @@ False + + False + + + False + + + False + + + False + + + False + 17, 17 @@ -230,7 +245,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - CQAAAk1TRnQBSQFMAwEBAAHYAQoB2AEKASABAAEgAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA + CQAAAk1TRnQBSQFMAwEBAAEIAQsBCAELASABAAEgAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA AYADAAEgAwABAQEAAQgGAAEQGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm diff --git a/src/CasparCGFrontend/Properties/Resources.Designer.cs b/src/CasparCGFrontend/Properties/Resources.Designer.cs index 58f79eb..4774f35 100755 --- a/src/CasparCGFrontend/Properties/Resources.Designer.cs +++ b/src/CasparCGFrontend/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18034 +// Runtime Version:4.0.30319.296 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -60,9 +60,6 @@ internal Resources() { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// public static System.Drawing.Bitmap Advanced { get { object obj = ResourceManager.GetObject("Advanced", resourceCulture); @@ -70,9 +67,6 @@ public static System.Drawing.Bitmap Advanced { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// public static System.Drawing.Bitmap CasparCG_10_128x128x32 { get { object obj = ResourceManager.GetObject("CasparCG_10_128x128x32", resourceCulture); @@ -80,9 +74,6 @@ public static System.Drawing.Bitmap CasparCG_10_128x128x32 { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// public static System.Drawing.Bitmap Channels { get { object obj = ResourceManager.GetObject("Channels", resourceCulture); @@ -91,18 +82,23 @@ public static System.Drawing.Bitmap Channels { } /// - /// Looks up a localized string similar to This file was created with CasparCG Configurator 2.1 and is meant to be used with CasparCG Server 2.1. - /// - ///!!!DOCUMENTATION!!! + /// Looks up a localized string similar to !!!DOCUMENTATION!!! /// ///<log-level> trace [trace|debug|info|warning|error]</log-level> ///<force-deinterlacing> true [true|false]</force-deinterlacing> ///<channel-grid> false [true|false]</channel-grid> ///<blend-modes> true [true|false]</blend-modes> ///<auto-deinterlace> true [true|false]</auto-deinterlace> - ///<accelerator>auto [cpu|gpu|auto]</accelerator> ///<template-hosts> - /// < [rest of string was truncated]";. + /// <template-host> + /// <video-mode/> + /// <filename/> + /// <width/> + /// <height/> + /// </template-host> + ///</template-hosts> + ///<flash> + /// <bu [rest of string was truncated]";. /// public static string configdoc { get { @@ -110,9 +106,6 @@ public static string configdoc { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// public static System.Drawing.Bitmap Disconnection { get { object obj = ResourceManager.GetObject("Disconnection", resourceCulture); @@ -120,9 +113,6 @@ public static System.Drawing.Bitmap Disconnection { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// public static System.Drawing.Bitmap Log { get { object obj = ResourceManager.GetObject("Log", resourceCulture); @@ -130,9 +120,13 @@ public static System.Drawing.Bitmap Log { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// + public static System.Drawing.Bitmap Macro { + get { + object obj = ResourceManager.GetObject("Macro", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + public static System.Drawing.Bitmap Paths { get { object obj = ResourceManager.GetObject("Paths", resourceCulture); @@ -140,9 +134,6 @@ public static System.Drawing.Bitmap Paths { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// public static System.Drawing.Bitmap Status { get { object obj = ResourceManager.GetObject("Status", resourceCulture); diff --git a/src/CasparCGFrontend/Properties/Resources.resx b/src/CasparCGFrontend/Properties/Resources.resx index 8c97f28..d9cffaa 100755 --- a/src/CasparCGFrontend/Properties/Resources.resx +++ b/src/CasparCGFrontend/Properties/Resources.resx @@ -142,4 +142,7 @@ ..\Resources\Log.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Macro.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/src/CasparCGFrontend/Properties/Settings.Designer.cs b/src/CasparCGFrontend/Properties/Settings.Designer.cs index b67fa6a..7bb91c6 100755 --- a/src/CasparCGFrontend/Properties/Settings.Designer.cs +++ b/src/CasparCGFrontend/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18034 +// Runtime Version:4.0.30319.296 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -40,5 +40,65 @@ public string Version { return ((string)(this["Version"])); } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string Macro1 { + get { + return ((string)(this["Macro1"])); + } + set { + this["Macro1"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string Macro2 { + get { + return ((string)(this["Macro2"])); + } + set { + this["Macro2"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string Macro3 { + get { + return ((string)(this["Macro3"])); + } + set { + this["Macro3"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string Macro4 { + get { + return ((string)(this["Macro4"])); + } + set { + this["Macro4"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string Macro5 { + get { + return ((string)(this["Macro5"])); + } + set { + this["Macro5"] = value; + } + } } } diff --git a/src/CasparCGFrontend/Properties/Settings.settings b/src/CasparCGFrontend/Properties/Settings.settings index df12eb4..8007f28 100755 --- a/src/CasparCGFrontend/Properties/Settings.settings +++ b/src/CasparCGFrontend/Properties/Settings.settings @@ -8,5 +8,20 @@ 1.0.0 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/CasparCGFrontend/Resources/Macro.png b/src/CasparCGFrontend/Resources/Macro.png new file mode 100644 index 0000000000000000000000000000000000000000..347a247e7df9f7c002f7aa1478a32fced2392568 GIT binary patch literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pnQpIM2T~LL1j^9dPWIDkbk73Pe`PKTac@( zf{&-Ot6#9I!o8c_nLwpdAf>_iX(i=}MX3w{iJ5sNdVa1U3T4K6rh0}3249L60#)7i zba4!caDO|^o3BBE$7Sz-!JRy9telFu&qWQ7wX|{v7_WD>kJ)3v4drG9({~^?Bx=Z42u!#3w-}eeNb5{y&7hPQ?KU+96