diff --git a/Icon/YoutubeEnchanted-64x64.ico b/Icon/YoutubeEnchanted-64x64.ico new file mode 100644 index 0000000..02324bb Binary files /dev/null and b/Icon/YoutubeEnchanted-64x64.ico differ diff --git a/Icon/YoutubeEnchantedIcon.png b/Icon/YoutubeEnchantedIcon.png new file mode 100644 index 0000000..5ddc26d Binary files /dev/null and b/Icon/YoutubeEnchantedIcon.png differ diff --git a/Icon/YoutubeEnchantedIcon.psd b/Icon/YoutubeEnchantedIcon.psd new file mode 100644 index 0000000..6a60dee Binary files /dev/null and b/Icon/YoutubeEnchantedIcon.psd differ diff --git a/YoutubeEnchanted/Program.cs b/YoutubeEnchanted/Program.cs index 4a171f9..bee3a7d 100644 --- a/YoutubeEnchanted/Program.cs +++ b/YoutubeEnchanted/Program.cs @@ -19,11 +19,11 @@ internal class Program public static BGN_VIDEO Mainwindow; static void Main() { - + System.IO.Directory.CreateDirectory(AppDomain.CurrentDomain.BaseDirectory + "Logs\\"); //APICore.Play(Console.ReadLine()); System.IO.File.WriteAllText(LogPath, "[" + DateTime.Now.ToString() + "] Log Started"); - System.IO.Directory.CreateDirectory(AppDomain.CurrentDomain.BaseDirectory+"Logs\\"); + API.APICore.Log("Youtube Enchanted "+ Application.ProductVersion.Substring(0, 5)); RunWindow(); diff --git a/YoutubeEnchanted/Properties/AssemblyInfo.cs b/YoutubeEnchanted/Properties/AssemblyInfo.cs index 9c31d13..e162d55 100644 --- a/YoutubeEnchanted/Properties/AssemblyInfo.cs +++ b/YoutubeEnchanted/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // 您可以指定所有的值,也可以使用 '*' 將組建和修訂編號 // 設為預設,如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.0.3")] -[assembly: AssemblyFileVersion("0.0.3")] +[assembly: AssemblyVersion("0.0.4")] +[assembly: AssemblyFileVersion("0.0.4")] [assembly: NeutralResourcesLanguage("")] diff --git a/YoutubeEnchanted/Topic.db b/YoutubeEnchanted/Topic.db index 1efe1c8..514ef91 100644 --- a/YoutubeEnchanted/Topic.db +++ b/YoutubeEnchanted/Topic.db @@ -1 +1 @@ -Cyberpunk Workout Music \ No newline at end of file +彌豆子主題曲1hr \ No newline at end of file diff --git a/YoutubeEnchanted/UI/BGN_VIDEO.Designer.cs b/YoutubeEnchanted/UI/BGN_VIDEO.Designer.cs index e05d583..8105364 100644 --- a/YoutubeEnchanted/UI/BGN_VIDEO.Designer.cs +++ b/YoutubeEnchanted/UI/BGN_VIDEO.Designer.cs @@ -28,18 +28,18 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BGN_VIDEO)); this.panel2 = new System.Windows.Forms.Panel(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.panel1 = new System.Windows.Forms.Panel(); - this.pictureBox6 = new System.Windows.Forms.PictureBox(); this.label1 = new System.Windows.Forms.Label(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.pictureBox6 = new System.Windows.Forms.PictureBox(); this.flowLayoutPanel1 = new System.Windows.Forms.Panel(); this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.TextBox(); this.textBox1 = new System.Windows.Forms.TextBox(); this.flowLayoutPanel2 = new System.Windows.Forms.Panel(); this.pictureBox7 = new System.Windows.Forms.PictureBox(); @@ -47,18 +47,21 @@ private void InitializeComponent() this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.pictureBox8 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.colorSlider2 = new ColorSlider.ColorSlider(); this.colorSlider1 = new ColorSlider.ColorSlider(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).BeginInit(); + this.panel4.SuspendLayout(); this.SuspendLayout(); // // panel2 @@ -69,16 +72,16 @@ private void InitializeComponent() this.panel2.BackColor = System.Drawing.Color.White; this.panel2.Controls.Add(this.pictureBox2); this.panel2.Controls.Add(this.panel1); - this.panel2.Location = new System.Drawing.Point(12, 74); + this.panel2.Location = new System.Drawing.Point(3, 82); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(849, 375); + this.panel2.Size = new System.Drawing.Size(891, 373); this.panel2.TabIndex = 5; // // pictureBox2 // this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBox2.Location = new System.Drawing.Point(4, 365); + this.pictureBox2.Location = new System.Drawing.Point(4, 369); this.pictureBox2.Name = "pictureBox2"; this.pictureBox2.Size = new System.Drawing.Size(838, 10); this.pictureBox2.TabIndex = 3; @@ -89,56 +92,56 @@ private void InitializeComponent() // this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.panel1.Controls.Add(this.pictureBox6); this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.pictureBox1); this.panel1.Controls.Add(this.colorSlider2); this.panel1.Controls.Add(this.colorSlider1); - this.panel1.Location = new System.Drawing.Point(4, 288); + this.panel1.Location = new System.Drawing.Point(4, 292); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(837, 79); + this.panel1.Size = new System.Drawing.Size(884, 79); this.panel1.TabIndex = 2; this.panel1.Visible = false; this.panel1.VisibleChanged += new System.EventHandler(this.panel1_VisibleChanged); // - // pictureBox6 - // - this.pictureBox6.BackgroundImage = global::YoutubeEnchanted.Properties.Resources.download_120262; - this.pictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.pictureBox6.Location = new System.Drawing.Point(329, 44); - this.pictureBox6.Name = "pictureBox6"; - this.pictureBox6.Size = new System.Drawing.Size(38, 32); - this.pictureBox6.TabIndex = 5; - this.pictureBox6.TabStop = false; - this.pictureBox6.Click += new System.EventHandler(this.pictureBox6_Click); - // // label1 // this.label1.Font = new System.Drawing.Font("Segoe UI", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(47, 48); + this.label1.Location = new System.Drawing.Point(53, 45); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(130, 20); - this.label1.TabIndex = 4; + this.label1.TabIndex = 6; this.label1.Text = "00:00/00:00"; // // pictureBox1 // + this.pictureBox1.BackgroundImage = global::YoutubeEnchanted.Properties.Resources.PauseIcon; this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.pictureBox1.Location = new System.Drawing.Point(3, 43); + this.pictureBox1.Location = new System.Drawing.Point(9, 40); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(38, 32); - this.pictureBox1.TabIndex = 3; + this.pictureBox1.TabIndex = 5; this.pictureBox1.TabStop = false; this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click_1); // + // pictureBox6 + // + this.pictureBox6.BackgroundImage = global::YoutubeEnchanted.Properties.Resources.download_120262; + this.pictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.pictureBox6.Location = new System.Drawing.Point(329, 44); + this.pictureBox6.Name = "pictureBox6"; + this.pictureBox6.Size = new System.Drawing.Size(38, 32); + this.pictureBox6.TabIndex = 5; + this.pictureBox6.TabStop = false; + this.pictureBox6.Click += new System.EventHandler(this.pictureBox6_Click); + // // flowLayoutPanel1 // this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); this.flowLayoutPanel1.AutoScroll = true; - this.flowLayoutPanel1.Location = new System.Drawing.Point(874, 74); + this.flowLayoutPanel1.Location = new System.Drawing.Point(907, 82); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(380, 592); + this.flowLayoutPanel1.Size = new System.Drawing.Size(380, 607); this.flowLayoutPanel1.TabIndex = 7; this.flowLayoutPanel1.Visible = false; this.flowLayoutPanel1.ControlAdded += new System.Windows.Forms.ControlEventHandler(this.flowLayoutPanel1_ControlAdded); @@ -149,7 +152,7 @@ private void InitializeComponent() // this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label2.Font = new System.Drawing.Font("Segoe UI", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(867, 31); + this.label2.Location = new System.Drawing.Point(900, 39); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(383, 40); this.label2.TabIndex = 8; @@ -161,53 +164,47 @@ private void InitializeComponent() // this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label3.Font = new System.Drawing.Font("Segoe UI", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(12, 452); + this.label3.Location = new System.Drawing.Point(0, 29); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(193, 40); this.label3.TabIndex = 9; - this.label3.Visible = false; // // label4 // - this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label4.BackColor = System.Drawing.Color.White; + this.label4.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.label4.Cursor = System.Windows.Forms.Cursors.Default; this.label4.Font = new System.Drawing.Font("Segoe UI", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(12, 452); + this.label4.Location = new System.Drawing.Point(0, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(823, 40); + this.label4.ReadOnly = true; + this.label4.Size = new System.Drawing.Size(823, 36); this.label4.TabIndex = 10; - this.label4.Visible = false; - // - // label5 - // - this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label5.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(15, 541); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(823, 1011); - this.label5.TabIndex = 11; - this.label5.Visible = false; - this.label5.Click += new System.EventHandler(this.label5_Click); // // label6 // - this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label6.BackColor = System.Drawing.Color.White; + this.label6.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.label6.Cursor = System.Windows.Forms.Cursors.Default; this.label6.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.Location = new System.Drawing.Point(68, 488); + this.label6.Location = new System.Drawing.Point(56, 36); this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(767, 40); + this.label6.ReadOnly = true; + this.label6.Size = new System.Drawing.Size(811, 27); this.label6.TabIndex = 12; - this.label6.Visible = false; // // textBox1 // this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.textBox1.Font = new System.Drawing.Font("Segoe UI", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox1.Location = new System.Drawing.Point(143, 12); + this.textBox1.Location = new System.Drawing.Point(134, 20); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(625, 36); + this.textBox1.Size = new System.Drawing.Size(667, 43); this.textBox1.TabIndex = 15; this.textBox1.WordWrap = false; // @@ -215,7 +212,7 @@ private void InitializeComponent() // this.flowLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.flowLayoutPanel2.BackColor = System.Drawing.SystemColors.ActiveCaptionText; - this.flowLayoutPanel2.Location = new System.Drawing.Point(914, 16); + this.flowLayoutPanel2.Location = new System.Drawing.Point(947, 24); this.flowLayoutPanel2.Name = "flowLayoutPanel2"; this.flowLayoutPanel2.Size = new System.Drawing.Size(340, 152); this.flowLayoutPanel2.TabIndex = 17; @@ -229,7 +226,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.pictureBox7.Location = new System.Drawing.Point(12, 0); this.pictureBox7.Name = "pictureBox7"; - this.pictureBox7.Size = new System.Drawing.Size(1242, 10); + this.pictureBox7.Size = new System.Drawing.Size(1284, 10); this.pictureBox7.TabIndex = 4; this.pictureBox7.TabStop = false; this.pictureBox7.Click += new System.EventHandler(this.pictureBox7_Click); @@ -240,7 +237,7 @@ private void InitializeComponent() this.pictureBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.pictureBox5.BackgroundImage = global::YoutubeEnchanted.Properties.Resources.Search_Icon; this.pictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.pictureBox5.Location = new System.Drawing.Point(774, 16); + this.pictureBox5.Location = new System.Drawing.Point(807, 24); this.pictureBox5.Name = "pictureBox5"; this.pictureBox5.Size = new System.Drawing.Size(46, 32); this.pictureBox5.TabIndex = 16; @@ -249,34 +246,33 @@ private void InitializeComponent() // // pictureBox4 // - this.pictureBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.pictureBox4.Location = new System.Drawing.Point(12, 488); + this.pictureBox4.Location = new System.Drawing.Point(0, 36); this.pictureBox4.Margin = new System.Windows.Forms.Padding(4); this.pictureBox4.Name = "pictureBox4"; this.pictureBox4.Size = new System.Drawing.Size(48, 49); this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox4.TabIndex = 13; this.pictureBox4.TabStop = false; - this.pictureBox4.Visible = false; // // pictureBox3 // this.pictureBox3.BackgroundImage = global::YoutubeEnchanted.Properties.Resources.home; this.pictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.pictureBox3.Location = new System.Drawing.Point(19, -1); + this.pictureBox3.Location = new System.Drawing.Point(10, 7); this.pictureBox3.Margin = new System.Windows.Forms.Padding(2); this.pictureBox3.Name = "pictureBox3"; this.pictureBox3.Size = new System.Drawing.Size(119, 70); this.pictureBox3.TabIndex = 6; this.pictureBox3.TabStop = false; this.pictureBox3.Click += new System.EventHandler(this.pictureBox3_Click); + this.pictureBox3.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox3_Paint); // // pictureBox8 // this.pictureBox8.Anchor = System.Windows.Forms.AnchorStyles.Top; this.pictureBox8.BackgroundImage = global::YoutubeEnchanted.Properties.Resources.Close; this.pictureBox8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.pictureBox8.Location = new System.Drawing.Point(589, 54); + this.pictureBox8.Location = new System.Drawing.Point(602, 62); this.pictureBox8.Name = "pictureBox8"; this.pictureBox8.Size = new System.Drawing.Size(72, 56); this.pictureBox8.TabIndex = 18; @@ -287,6 +283,35 @@ private void InitializeComponent() this.pictureBox8.Click += new System.EventHandler(this.pictureBox8_Click); this.pictureBox8.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox8_Paint); // + // panel4 + // + this.panel4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.panel4.AutoScroll = true; + this.panel4.Controls.Add(this.richTextBox1); + this.panel4.Controls.Add(this.pictureBox4); + this.panel4.Controls.Add(this.label6); + this.panel4.Controls.Add(this.label4); + this.panel4.Controls.Add(this.label3); + this.panel4.Location = new System.Drawing.Point(3, 452); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(891, 242); + this.panel4.TabIndex = 19; + // + // richTextBox1 + // + this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.richTextBox1.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.richTextBox1.ForeColor = System.Drawing.Color.Gray; + this.richTextBox1.Location = new System.Drawing.Point(3, 91); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(879, 150); + this.richTextBox1.TabIndex = 14; + this.richTextBox1.Text = ""; + // // colorSlider2 // this.colorSlider2.BackColor = System.Drawing.Color.Transparent; @@ -303,7 +328,7 @@ private void InitializeComponent() 0, 0, 0}); - this.colorSlider2.Location = new System.Drawing.Point(221, 39); + this.colorSlider2.Location = new System.Drawing.Point(228, 36); this.colorSlider2.Maximum = new decimal(new int[] { 100, 0, @@ -333,7 +358,7 @@ private void InitializeComponent() 0, 0, 0}); - this.colorSlider2.TabIndex = 2; + this.colorSlider2.TabIndex = 4; this.colorSlider2.Text = "colorSlider2"; this.colorSlider2.ThumbInnerColor = System.Drawing.Color.Red; this.colorSlider2.ThumbOuterColor = System.Drawing.Color.IndianRed; @@ -368,7 +393,7 @@ private void InitializeComponent() 0, 0, 0}); - this.colorSlider1.Location = new System.Drawing.Point(3, 9); + this.colorSlider1.Location = new System.Drawing.Point(10, 6); this.colorSlider1.Maximum = new decimal(new int[] { 100, 0, @@ -392,13 +417,13 @@ private void InitializeComponent() 0}); this.colorSlider1.ShowDivisionsText = true; this.colorSlider1.ShowSmallScale = false; - this.colorSlider1.Size = new System.Drawing.Size(831, 36); + this.colorSlider1.Size = new System.Drawing.Size(863, 36); this.colorSlider1.SmallChange = new decimal(new int[] { 1, 0, 0, 0}); - this.colorSlider1.TabIndex = 1; + this.colorSlider1.TabIndex = 3; this.colorSlider1.Text = "colorSlider1"; this.colorSlider1.ThumbInnerColor = System.Drawing.Color.Red; this.colorSlider1.ThumbOuterColor = System.Drawing.Color.IndianRed; @@ -419,25 +444,22 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScroll = true; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(1262, 673); + this.ClientSize = new System.Drawing.Size(1262, 694); + this.Controls.Add(this.panel4); this.Controls.Add(this.pictureBox7); this.Controls.Add(this.flowLayoutPanel2); this.Controls.Add(this.pictureBox5); - this.Controls.Add(this.pictureBox4); - this.Controls.Add(this.label6); - this.Controls.Add(this.label5); - this.Controls.Add(this.label4); - this.Controls.Add(this.label3); this.Controls.Add(this.label2); this.Controls.Add(this.textBox1); this.Controls.Add(this.flowLayoutPanel1); this.Controls.Add(this.pictureBox3); this.Controls.Add(this.pictureBox8); this.Controls.Add(this.panel2); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.Name = "BGN_VIDEO"; - this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "BGN_VIDEO"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; @@ -447,13 +469,15 @@ private void InitializeComponent() this.panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).EndInit(); + this.panel4.ResumeLayout(false); + this.panel4.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -464,18 +488,13 @@ private void InitializeComponent() private System.Windows.Forms.Panel panel2; private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.PictureBox pictureBox1; - private ColorSlider.ColorSlider colorSlider2; - private ColorSlider.ColorSlider colorSlider1; private System.Windows.Forms.PictureBox pictureBox3; private System.Windows.Forms.Panel flowLayoutPanel1; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox label4; private System.Windows.Forms.PictureBox pictureBox4; - private System.Windows.Forms.Label label6; + private System.Windows.Forms.TextBox label6; private System.Windows.Forms.Panel panel3; private System.Windows.Forms.TextBox textBox1; public System.Windows.Forms.PictureBox pictureBox5; @@ -483,5 +502,11 @@ private void InitializeComponent() private System.Windows.Forms.Panel flowLayoutPanel2; private System.Windows.Forms.PictureBox pictureBox8; private System.Windows.Forms.PictureBox pictureBox7; + private System.Windows.Forms.Panel panel4; + private ColorSlider.ColorSlider colorSlider2; + private ColorSlider.ColorSlider colorSlider1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.RichTextBox richTextBox1; } } \ No newline at end of file diff --git a/YoutubeEnchanted/UI/BGN_VIDEO.cs b/YoutubeEnchanted/UI/BGN_VIDEO.cs index 6aae78e..3dc6bce 100644 --- a/YoutubeEnchanted/UI/BGN_VIDEO.cs +++ b/YoutubeEnchanted/UI/BGN_VIDEO.cs @@ -59,7 +59,7 @@ private async void UpdateVideo(string id, string top) private async void Tick() { await Task.Delay(1000); - this.Controls.Add(MainSec = new UI.MainPage() { Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom, Size = this.Size }); + this.Controls.Add(MainSec = new UI.MainPage() { Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom, Size = this.Size,Location=new Point(0,10) }); Message(new UI.Message("You are using YoutubeEnchanted v" + Application.ProductVersion.Substring(0, 5))); do { @@ -67,13 +67,19 @@ private async void Tick() { if (APICore.FullScreen && this.FormBorderStyle == FormBorderStyle.Sizable) - { pictureBox7.Visible = true; this.FormBorderStyle = FormBorderStyle.None; this.TopMost = true; } - else if (APICore.FullScreen == false) { pictureBox7.Visible = false; this.FormBorderStyle = FormBorderStyle.Sizable; this.TopMost = false; } + { Message(new UI.Message("Full Screen is Enabled")); this.WindowState = FormWindowState.Normal; await Task.Delay(100); pictureBox7.Visible = true; this.FormBorderStyle = FormBorderStyle.None;this.WindowState = FormWindowState.Maximized; this.TopMost = true; } + else if (APICore.FullScreen == false&&this.FormBorderStyle==FormBorderStyle.None) { Message(new UI.Message("Full Screen is Disabled")); this.WindowState = FormWindowState.Normal; await Task.Delay(100); pictureBox7.Visible = false; this.FormBorderStyle = FormBorderStyle.Sizable;this.WindowState = FormWindowState.Maximized; this.TopMost = false; } if (APICore.ShowPlayControlMenu) { //APICore.PARSED_URL = false; if (nowurl == APICore._PARSE_URL) { + pictureBox4.Visible = true; + label6.Visible = true; + label4.Visible = true; + + label3.Visible = true; + label2.Visible = true; switch (videoPlayCore.State) { case Vlc.DotNet.Core.Interops.Signatures.MediaStates.NothingSpecial: @@ -109,13 +115,14 @@ private async void Tick() } else { + panel4.Visible = true; pictureBox4.Visible = true; label6.Visible = true; label4.Visible = true; - label5.Visible = true; + label3.Visible = true; label2.Visible = true; - + flowLayoutPanel1.Visible = true; nowurl = APICore._PARSE_URL; panel2.Visible = true; @@ -149,20 +156,21 @@ private async void Tick() videoPlayCore.Play(APICore._PARSE_URL); UpdateVideo(APICore.NOW_URL, APICore.Topic); - label5.Text = APICore.VideoDes; + label4.Text = APICore.Title; - UpdateVideoAuthor(APICore.Topic); + UpdateVideoAuthor(APICore.NOW_URL); API.APICore.Log("Playing " + APICore._PARSE_URL); } } else { + panel4.Visible = false; label6.Visible = false; label4.Visible = false; - label5.Visible = false; + label3.Visible = false; pictureBox4.Visible = false; flowLayoutPanel1.Visible = false; @@ -206,15 +214,17 @@ private async void UpdateVideoAuthor(string vidUrl) try { var vid = await yt.Videos.GetAsync(vidUrl); - + panel4.Visible = true; + richTextBox1.Text=vid.Description; var us = await yt.Channels.GetAsync(vid.Author.ChannelUrl); label6.Text = us.Title; pictureBox4.LoadAsync(us.Thumbnails[0].Url); } - catch + catch(Exception ex) { pictureBox4.Image = null; + Message(new Message("Cannot Load Author Info due to "+ex.Message+"\n"+ex.StackTrace)); } } @@ -234,15 +244,12 @@ private void panel2_Paint(object sender, PaintEventArgs e) private void colorSlider1_Scroll(object sender, ScrollEventArgs e) { if (videoPlayCore.State == Vlc.DotNet.Core.Interops.Signatures.MediaStates.Ended) - { - videoPlayCore.Play(_PARSE_URL); - } + { videoPlayCore.Play(_PARSE_URL); } else { videoPlayCore.Time = long.Parse(colorSlider1.Value.ToString()) * 1000; } - } private async void panel1_VisibleChanged(object sender, EventArgs e) { - await Task.Delay(5000); + await Task.Delay(10000); panel1.Visible = false; } @@ -259,6 +266,10 @@ private void colorSlider2_Scroll(object sender, ScrollEventArgs e) private void pictureBox1_Click_1(object sender, EventArgs e) { videoPlayCore.Pause(); + if (videoPlayCore.State == Vlc.DotNet.Core.Interops.Signatures.MediaStates.Ended) + { + videoPlayCore.Play(_PARSE_URL); + } } private void BGN_VIDEO_Load(object sender, EventArgs e) { @@ -310,8 +321,15 @@ private void BGN_VIDEO_KeyUp(object sender, KeyEventArgs e) { case Keys.Enter: - MainSec.StartSerch(textBox1.Text); - textBox1.Text = ""; + if (textBox1.Text == "") + { } + else + { + APICore.ShowPlayControlMenu = false; + + MainSec.StartSerch(textBox1.Text); + textBox1.Text = ""; + } break; case Keys.Space: try { videoPlayCore.Pause(); } catch (Exception ex) { APICore.Log("User Press Space but " + ex.Message); APICore.Log(ex.StackTrace); } @@ -325,6 +343,9 @@ private void BGN_VIDEO_KeyUp(object sender, KeyEventArgs e) case Keys.F11: APICore.FullScreen = APICore.ToggleBool(APICore.FullScreen); break; + case Keys.BrowserHome: + APICore.ShowPlayControlMenu = false; + break; } @@ -332,9 +353,15 @@ private void BGN_VIDEO_KeyUp(object sender, KeyEventArgs e) private void pictureBox5_Click(object sender, EventArgs e) { - MainSec.StartSerch(textBox1.Text); - APICore.ShowPlayControlMenu = false; - textBox1.Text = ""; + if (textBox1.Text == "") + { } + else { + APICore.ShowPlayControlMenu = false; + + MainSec.StartSerch(textBox1.Text); + textBox1.Text = ""; + } + } int createsize = 10; private void flowLayoutPanel1_ControlAdded(object sender, ControlEventArgs e) @@ -426,7 +453,8 @@ private async void flowLayoutPanel2_ControlAdded(object sender, ControlEventArgs private void pictureBox7_MouseEnter(object sender, EventArgs e) { - pictureBox8.Visible = true; + if (APICore.FullScreen) { pictureBox8.Visible = true; } + //panel4.Visible = true; } @@ -570,5 +598,10 @@ private async void panel4_VisibleChanged(object sender, EventArgs e) await Task.Delay(5000); //panel4.Visible = false; } + + private void pictureBox3_Paint(object sender, PaintEventArgs e) + { + pictureBox3.Region = System.Drawing.Region.FromHrgn(CreateRoundRectRgn(0, 0, flowLayoutPanel2.Width, flowLayoutPanel2.Height, 20, 20)); + } } } diff --git a/YoutubeEnchanted/UI/BGN_VIDEO.resx b/YoutubeEnchanted/UI/BGN_VIDEO.resx index 1af7de1..df0956e 100644 --- a/YoutubeEnchanted/UI/BGN_VIDEO.resx +++ b/YoutubeEnchanted/UI/BGN_VIDEO.resx @@ -117,4 +117,292 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + 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 + SRNxJkgTdCtLEoNEXAiYzaAAflRhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAIdZbADo//gAgEJdRHApSZ1vIUeibyFJo3w2ZcqBQ3f7gEJ4/4JGd/+keLD/RTjx/wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8SC/b/bTPc/7gx0/+7Jdv/uyXd/7sl5P++JvH/vSX2/70n8f+nKrj/iCtv/4QwYv+BMGL+gDNk2H43 + Zad8NWOifjVion8qV6J6IEyieiFMo34mT52NQGBGr9KyAY1YbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAE8AJABRDisAUAkpAFMRLACGWGsAwNfIAYA/WmxwJ0f0bSFG/WsgR/x0M2D+fEV6/3tG + e/98Sn3/X0jK/woJ//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//xsJ+v+rJt7/wyHg/8Ef4f/DIev/yij6/8so///KKvv/sS7A/5Ew + df+NNGj/izVp/4c1aP6CNmb8gDdm/II3ZfyDK1n8fiFN/H4hTf2CJlD1jz5gbarMqwGPV2sAojBvAJEn + ZwDFSoMAfxpeAAAAAAAAAAAAAAAAAAAAAABOAiUAUxAsAFELKQBUEi0AYihBAP///wB4PVZtaiZE92Yh + Q/9kIEb/bTJd/3VFdf92Rnb/XTmU/xUO6/8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8ZB/r/rCXh/8ci4v/GIeL/ySLr/9Eo + /P/TKf7/0yr7/7svw/+dM3j/mTds/5g3bP+UN2z/jThq/4k5af+KOWf/iixc/4YiUf+HIVD/iSdS95Q+ + Ym2l//0AnzxvAKMxbwCUKWgAvkV+AIUfYQAAAAAAAAAAAAAAAAAAAAAATwAjAE4NKQBOBycCURAqBk8O + KgZ6R14JeENed2YoSfhiIkb/YSJJ/2w3Yf94TXn/b0iD/ykaz/8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//GQf6/6wl + 5P/HIeb/xyHk/8wk6v/WKvn/1yv7/9ct9//CMsT/pjyB/6VBd/+lQHj/oDxz/5o5b/+YOW7/mDht/5Ut + Yv+RI1j/kyJX/5QqWfiiR293tF+SCZ8rawafL24GkCdnA81SiACDHmAAAAAAAAAAAAAAAAAAAAAAAEwK + JwBbFjEAVREtH1oWMmhaFzZ0Xh09eHE3XLtsN2H8ajVg/2k2X/+PZIv/u5i6/29Zzv8IBfn/AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//xkI/P+wKe7/zSXx/88k8v/UJ/D/3DHw/9007//bNez/1lPV/9SAvv/Whrn/14W5/79j + mf+kO3T/pDhy/6Q4cv+iMm3/oS1p/6MtZ/+jMmn8rEF4uqo4d3ipNHR0qTRxaaIwbCSuOHMAmCpnAAAA + AAAAAAAAbV1vAHVfdwBREC0AYBk2AFoWMkFeGDfYXxk68V0aOvFoLVX4dEV0/3NGdf9ySHT/sY+x/9m/ + 9f87NP3/AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8aCf3/tS33/9Mr+//WKf3/2iz2/9846f/hOuf/3jzl/+pw + 6P/9u/P//sLy///A8v/Vg7j/pzx4/6k5dv+qOXb/rDd3/7A3d/+0OHj/szl3/7M5ePiyOHjxsTd38bI3 + ddiuNHFCsTh0AKovbQC/THwAt1R7AG5dcAB2X3gAb1JvAGEfOwBcFzNFXxk35mAbOv9gGzr/ZixT/29G + c/9uR3f/bkl2/66Nsv+Kefn/Bwb//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//GQn9/7It9//TKf3/0yn+/9Yu + 9v/cOej/4Dzk/94+4v/UZun/8bb2///I9P//xfT/1oW6/6g8eP+sOHf/rjh4/7E3ev+1OHz/ujl9/7w5 + fP+7Onz/uzt9/706e/++OXnmuzZ1Rb07eQC6RnkAw0t+ALtTfAD///8A+f/JAMj/sgA1AA8AXB04SF0Z + OOZgGjr/YBo8/2MsVP9sRnP/bEd2/29Kdv+Lb7X/Lij8/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//xkJ + /f+tLvb/ySv7/8wr/P/QMPP/1zvk/9s94v/cQeD/ijnp/29W+v/lsfT//8fz/9aGuf+oPHj/rDl3/7A4 + d/+zOHn/tzl7/7o6fP+9On3/wTt+/8Q8f//GO3//yDp+5sY8fkjeAFwAAP9xAAD/pAAA//8AbVhxCXNV + dzdyU3lIc1h9R3BDZIRgKUvvYCVK/2EkTf9yQmr/kG2T/5JwmP+TcZj/VUPQ/wMD//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8XC/z/nkny/7ZP+f+4Tvv/vVHz/8JZ6v/GWer/yl7m/3Y97P8DAv//Tjz7/8+b + 8P/fk8P/vWKY/8Fgl//EYJf/xluV/8lXlP/NWJX/0FiX/8xIif/JPYH/yz2D/9A9hO/XSYaD20aBR9o/ + gEjdQIE3zEd9CWJLZxxmR2yqZUVt3mVFbdxqR23qakJr/Wc/bP9oP23/mHWb/9/B3f/oyeT/vqTm/yMe + +P8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8WFv//ICD//wAA//8AAP//FBH8/46B9v+imf7/pJf//6eW/v+qlfv/rJT8/7SX + +f9xWff/AAD//wAA//8yI/n/rn3n/++w4f/zs+L/9bHi//Sl2f/yms//9ZrR//aW0f/cY6T/zj6D/9I9 + hv/VPYf91jh66dkzctzbMXTe2jF0qsY3bxxdQmEgYD5mxl8+Z/9hP2X/Y0Jp/2hHcv9mRnb/Z0Z2/6OC + qP/21/H/+tv2/3pr+/8BAf//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8DA///dXX//46O//8FBf//AAD//xMT+/+Fk/X/l6///5iu + //+arP//nqX+/6Ck/v+nqfz/a2H4/wAA//8AAP//AAD//x0W/f+Zd/n/+MH3///H9v/8uOr/+6vf//6s + 4P/7qOD/3mqr/88/hP/XPYX/2TyI/9kwd//bKWz/3ipu/9wqbsbIMGkgX0FhIGI+Z8VhPmf/YT9k/2NB + aP9mRnH/ZUVz/2ZFdP+jgqb/+djw/9e79/8qJf7/AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//MDD//9nZ///h4f//LCz//wAA + //8TE/v/hZTz/5ew/v+Xrv//mav//52k/v+fpP7/pKj8/2lg+P8AAP//AAD//wAA//8AAP//Dwz+/4Jl + +v/zvPb//bnq//ur3//9q+D/+6ff/99qqv/OPoL/1j2F/9k7h//ZL3f/2yls/9wpbf/ZKW3GxTBoIGA+ + XyBiPGTFYjtl/2A8Yv9lRGr/cVJ7/3BRff9yUnz/qYmp//fW7f+PfPn/BQT//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//CQn//5KS + /////////////3p7//8AAP//EhL8/4aS9f+Xr/3/l6z//5mp//+dpP//nqP//6Sm/P9pYPj/AAD//wAA + //8AAP//AAD//wAA//8JB///dFn6/+qr6//9ruD//qzh//yp4P/ecK3/zkiJ/9dIjP/bRY/+2DV89tkt + bvHbLG/z2SxvusQzah5bM1MgXjBYxV4vWf9cL1f/fFd6/7udv//BpMb/wqTE/9u0zv/juOP/PTL5/wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//0lJ///o6P//+vP7/9ec6f+vZOz/Zxvs/2Yx7v+SlPn/lav+/5ap/v+Yp/7/nKT+/52k + /v+ipvv/ZFv0/wAA//8AAP//AAD//wAA//8AAP//AAD//wUE//9kSff/5qru//+/7//+uu//8ZrT/+uC + vv/wgsD/9H7B8+hdoJ/dN3ds4Dd4bd03eVTKO3UNWCxMIF0pUcVeKFH/XCdP/49khv/x0u3/+dz4//rc + 9v/+0+j/u4/j/xMO/P8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//xYW//+0tP////////Tm+v+6Rur/tyP2/7wo9f+wSPL/nZf9/5Wq + /v+Wqf7/mKf//5yl/v+dpP7/oqb6/2JZ8f8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AgL//19K + /P/sufn//8j6//227f/9quP//arj//+p4+f9pd1NrAAxAtNKfgTOSH8Dv0V/AFsrTCBhKFHFYihS/18n + T/+TZIb/9dPv//ze+f/83vf//tLp/4Zn6/8BAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//9mZv//9fX////////15vr/vEfw/7ok + /v+8Jf3/r0X5/52V/v+Vqf//l6j+/5mn//+cpf//nqT//6Wm+/9kWfL/AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8DAv//dVz9//jC+v/9uOz//qzj//2s4//+rOPl/q7mRfeb0wDcRYAA1z98AMZA + egBdK0wgYyhSxWQoU/9gJ0//lGSG//fT7v/+3fn//t73//rQ6v9tVe//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8nKP//zc7///// + ////////9uj7/71I7v+7Jvz/vCf7/7BF+P+hk///m6f//5ym//+fpf//oqX7/6Wm+/+up/j/aVrw/wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//xIP//+6kfr//7ns//2s4//8reP//azk5f6t + 5EX9q+MA/7btALE6aACYLl4AXS5PIGQrVMVlK1X/YCpS/5Nihv/1yuX//tPv//7T7f/ou9b/XEff/wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8HCP//c2ft/8+p2v/Wqt3/16re/9Ob4P++QOX/vi3u/74u7v+1Qe7/q3H7/6p8/f+rfvz/h2z4/1lT + 9/9bVPX/YFX0/zku8/8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//aEjw//Op + 4v/+tev//LXs//216+X9t+tF/bTpAP687QAAAAAAAAAAAFwyUiBkLlfFZi5Y/2IvV/+UYIb/8rnV//7C + 3P/7wdz/x5W0/040tP8BAP3/AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//QkT//7ia2f+oRbr/sz3I/7U8yf+4PM7/vTnY/7843P/AON3/vTfj/7c2 + 9f+4NPr/uTb3/2ci8v8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//zMY5v/ckNL//8X6///G+///xvrl/8j5Rf/F+AD/zfsAAAAAAAAAAABZM1MgYS9YxWMv + WP9gL1f/lWCF//W41P//wNr//L7a/8OOsf9jP5L/Dgju/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//EBD//6ip///Xttv/rkHC/7w51f+9OdX/vjrW/8A7 + 1//AO9f/wDzX/8E24f+/Kff/viX9/8Qo/P9wG/T/AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8uE+X/2ovQ///I/f//yf7//sv95f3N/UX6yPkA3XuvALo9 + cgCqSHEAVjJSIF0vVsVeL1b/XC5U/5Jfgv/zuNP//7/b//2+3P/Bj7P/dEt9/zkju/8CAfz/AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//1xd///z9f//2bjc/61B + wv+7Odb/uznV/7061v+/O9j/wDvY/8A71//ANuD/vyr3/78m/v/GKfr/cxv0/wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//ORbf/96Mz///yPz//8n+//zM + /OX9z/1F6J3QAMBEfAC8QngArEdyAFQwUSBZLlTFWi1T/1gtUv+IW33/3qvJ/+my0f/osdP/tIet/3ZN + e/9rRIP/LR3M/wEA/v8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AQD+/w4I + +v9eV/r/n5n7/6V83P+uPcf/ujbV/7o21v+8N9f/vzrX/8E71//BO9f/vzjc/7sy5v++Men/xTTl/3Eh + 6f8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//10j + yP/hhcD/+bXs//e27f/2tejq6JfKZ708cyLDQXkjvkN4G61JcwRRLU4gVitRxVcrUf9WKlH/a0Rr/5Fx + l/+WdZ3/lXWf/4Vkk/9zUIL/dlCB/2tIkf8tH9L/AgH9/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//w8H9/9wKc3/hijQ/4Uo0f+VLM3/sC3S/7Uq1/+1Ktf/ty3X/8A31v/DO9f/wzvX/7I6 + 0/9sJd//YyPi/2cl4f87Fuv/AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//w0G+f+QPLj/zGCd/8tmov/LZqP/yGSd+rxKg9O3OHC6tThxu7I5cJClP2sXTyxNIFQp + UMVWKk//VCpO/1w4YP9nUH3/aVOC/2lThf9tU4f/c1SG/3ZTh/93VIj/bk2T/zQkzf8EA/v/AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8UCPb/kyzK/7En1P+yJdf/siXW/7Ij2v+zI9r/syLa/7Um + 2f/BNtf/xTvX/8Y71v+mOdH/FQn3/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//84Guf/ulOt/79Ijf+2Onv/tzp7/7M5eP+wM3D/sDBr/6wx + a/+pMWrFnDVkIE8sTSBVKlDFVypP/1YqTP9cOF//ZVCA/2dShv9pUof/bVKI/3JTh/90U4j/dVSJ/3hV + if90UZH/QCzD/wgG+P8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//FAf2/5Mqzf+0Jdj/tiPb/7Uk + 2/+1I9v/tCPb/7Qi3P+3Jtv/xDbZ/8g72v/JPNn/qjnV/xcJ9/8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8FAv3/dDfL/8Zbpv+9Ro3/tTh6/7Y4 + ev+0N3n/rzFw/6svaP+oL2f/pjBnxZg0YyBQLE4gVylRxVkqUP9ZKk3/Xzhg/2lQgP9pUob/a1GG/29S + h/9yUoj/dVOI/3dUif94VYr/elaK/3hTjv9KM7v/DAj0/wAA//8AAP//AQD//wQC/P8FAvz/BAL9/xgJ + 9P+UKND/tCTZ/7Yk2/+2I9z/tiPe/7gj3v+4I9//uyjd/8k62P/OQNf/0EHX/7E80/8YCff/AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//KxXr/61T + sf/FW6X/ukaN/7E5ev+yOHn/sTh3/6w0b/2mMWr8pDJp/aIzaMuUN2MpUixNIFopUcVdKlH/WylP/2E0 + Xv9pSXf/akp8/2tKff9uToH/dFOG/3ZUiP94VIn/eVWK/3lViv98Vov/fFWO/1k6sv8WDu3/AAD//w0H + 9/9gK8//dizW/3Ur2P98LNj/pCnW/7Ej2v+zI9v/tCPd/7kk5/+9Jer/vyTr/7Yp5P+HK97/gC/b/4Iv + 3P9wKtz/Dwb5/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//BgP8/3U3yf/CXab/wlqk/7ZGjP+uOXn/rjh4/6w6dfiuQXbBqT90nKk/c52lPnCBlUBqHlYs + TSBeKVHFYCpR/18oUf9iL1v/Zj5s/2Y/b/9mP2//a0d5/3VTh/93VIn/eVWK/3lViv97Vov/fVeM/4BX + jf+DV47/Z0Oo/yEV4/8TCfX/jzLT/7Mv6f+0Le7/sizs/60l3/+vI9r/sSPa/7Ei3v+7Ju//wSf5/8Mn + +f+pKO//GQj6/wEB/v8CAf7/AgH+/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//zIX5/+wU67/wl2l/79apP+zRov/qzl4/6o5eP+nOXbpq0N5W7hb + hBKzU3wTrU57EJxKdAReLU4gZCpTxWUqU/9mKVP/aC9c/2s9bP9rPm7/aj5t/3BHeP96U4n/elOM/3xU + jf99VI3/flWM/4BWjf+DV47/hFeO/4ZXj/91SqD/RifO/5Qw2v+1KPn/tCX9/7Il+f+sI+T/rCTZ/64j + 2P+xIt3/uSby/78m/v/CJ/z/qCnv/xcH+v8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wkD+f94NcP/xFym/8Bcpv+9WaP/s0eK/6k7 + dv+nOnX/pDh05Z4zb0WnPHYAsU18AKxLegCbSHMAZC5QIGwqVcVtKlb/bCtV/28xX/9xPm7/cj9x/3E/ + cP94SHr/gVOL/39Tjv+AU4//gVSP/4FVjv+CVo//g1aP/4RWj/+FVpD/h1eQ/4dNnP+gN9H/syf7/7Ml + /v+zJfn/rSLl/6sj2v+sJNj/sCPc/7km8v++Jv7/wyf9/6go7/8XB/r/AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//84FNz/sUqk/8Zb + p//CWqj/vVil/7NIiv+qPHX/pztz/6U3c+WgMm5FozZ0AJwuZgCiS28Ak0RqAGgtUBhyKFWYcyhVx3Ep + VcV0MF/FdTxtxXY8csV3PnLHgEt85IVRhv6EUYn/hVGJ/4RQiP+EUIb/hFCG/4VQh/+JUpL/jVOd/45T + nv+TTaX/pTnO/7Ir8f+zKfX/tijz/7Aj4f+sI9n/qyPY/6wk2f+uK+X/si7r/7Yv6/+dLOL/Fgf5/wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8PBvf/hDOz/8FPlv/DVp//wFaf/7tUm/6zSorkqjt2x6c4csakNXGwny9sNaE0cgCcKGMAAAAAAAAA + AABkKUoGcSZQJXEmUTFvJ1Ewci5bMHM5aDBxN2swekJzNI5UgpOERXj6g0F1/4RBdf+APG7/fjZo/382 + Z/9/Nmz/lUWa/6dPwv+oT8T/q03G/7M/0/+5Nd7/ujTg/7kx4P+yJ9v/riPZ/68j2f+cItn/QhPt/zMR + 8f81EvH/LhDw/wYC/P8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//SiHd/71SpP+/SY7/tTx//7M7ff+vPn36s02Hk6Y/eTSgMm4wnDJrK5gu + Zw2YMWsAmidgAAAAAAAAAAAAcClUAH8jWQCAI1kAfyRZAIErZACBOHQAgz97AP///wCVVX9uiEBx94c7 + bv+HPG3/gjNj/4EqWv+CKln/gilf/549n/+1Ttb/tU3Y/7hL2f+7Qdj/vzvV/8E61f+/N9b/tSnY/7Ai + 2v+0I9r/mSLZ/xMF+f8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//HQ3z/5xIu//JXKX/u0WI/68wbv+vMGv/rTRv97RK + f27E//8AuDp9ALYweQCvKnIAsi96AKwiZgAAAAAAAAAAAFgqQQBjKkgAYypKAGArSwBkMlIAZjxdAJZn + hADL48IBmVaAbo9Cc/iPPHD/jz1v/4o0Zv+IKlz/iSpb/4opYv+mPaT/vE7b/7xN3f++Stz/wUHb/8Q6 + 1//FOtf/wzfX/7gq2P+zI9r/tyTa/50j2f8WBvj/AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//BgP8/2syz//CW6n/xFum/7dF + h/+sMG3/rTBq/600b/i1Sn5uqt63AahcgACDNV8AgDNcAIA0XgB/L1gAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAIhyhQCea4cAvM63AZxVgGKUQXPclTxx45Y9ceOQNGnjkCtg45ErX+OSKmblrz6r9MNN + 3//DTOH/xUri/8hB4P/KO93/yjvc/8Y52v+6Ldj/tibY/7km2P+fJdj/Fgb4/wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//zka + 4/+sUaz/vlqj/71Yov+zRYX3qDBr5qovaeOqM23cskd7YZ3fsgGoXX8A//H/AAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlWB/AJqekgCbU38jk0B0T5U6cVGXO3NRkjRqUZMs + YFGTLF5RmS1uWb08yLPKPuv8zD3u/8487v/OOe3/zznr/8466v/KOuT/uDvM/7I8wf+0PMH/qj29/1Im + 1v8KBfn/AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//xQK9f+DObH/sUeI/69GiP+vR4f7sEmDtKg3cFymLmhRqDNqT69GdSJ3/7IAold4AAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wD///8A/8F7AO5I + KQDaXzsA6mlSANBEcgCnAHsAyjrOALxQwAbLMe6Dzy35+tIs+//RLPr/0jH7/9I1+//RNfr/zjnv/7lJ + v/+xVKj/slSo/7FVpP+rVaX/cTnE/x8P8P8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wQC/f9fLtD/q0eM/6Mzbf+jMWr/ozJr8aY8cWP85O0B912cAPku + /ADsUv8AzKSoAMqGtwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AACHT3MAZWZaAJdQgACQQHYAkzlzAJQ6dACPM2oAki5fALE5vQCwSsoEziz4gNMo/vrVKP7/1Cn8/9Uv + /f/VM/7/1TP+/9I58f++Tb3/tlik/7dao/+4W6P/uVqm/7tap/+bSbj/Qx/i/wYD/P8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//82GuX/qlKr/7FIiP+lMGr/pS5n/6Uu + Z++hLmVUqDJqAJ4sZAClM2UArEVuAAD//wCaTmsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL9hpQC9Pt0AsUrJBM4t + 94DSKf371Cj+/9Up/f/XL/7/1zP//9cz/v/VOvD/w0+//7tap/+9W6b/v12m/8FdqP/GXKn/y12q/75W + sf94NdD/Hw7z/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8bDfL/jkW7/7xb + of+vR4j/oy9r/6MtaP+jLWjvoi1mVKQuaQCgLWMAvm2TAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAwEHaALRNxQPRMfVj1S39wdQs/MXULfrF2DL9xdo1/sXZNv3F1z/rysNNs+y7U5v/vlOZ/8RU + nv/HVqP/zFal/89Wpv/UWKj/1lyt/6xKv/9KIOT/CAT8/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8OBff/czG//7hRmv+5Upf+s0iI6KY0bsmjMWnGozBpuKQxaECjMmoApTFmAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAL5E1ACvS70B0DbwF9Y1+izVNfct0zX0LdY49y3bPPst2T/5LNJI + 1jm0Ooaxsjd5/rc3ef+8N37/wkCJ/8dFj//KRJH/0EiX/9tbq//gYbH/0Fq4/4Y50v8mEPL/AgH+/wAA + //8AAP//AAD//wAA//8TCff/byq//685gf+yOHr/rzl3/LFDfKCvRXg1ojZqLaI1aSqjNGkOozdpAKMw + aAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADcRfgA0ljlAPEs/wDwI/8A8CP/APAm + /wD0Kf8A7yT/ANIr1AChL2UIsS1tl7Uubv66Lm//vS91/8Q7gv/IQIj/y0CI/9FFj//eW6v/4mG0/+Ri + tf/kYLX/vlDA/3Ex2P8sE/D/FAn4/xcK9v89G+j/jD3J/8JKl/+5M3T/tjBx/7AxbfqrNWyAk1NxBLY5 + dgC3L3EAvTZ2AKwhZADNSYcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAmEGmAIE8 + iACsPcAAtUPNALRDygCxQccAtETKAMRU2gCjNWwAmTRhCLQua5e8Lm7+wC1w/8Iwdf/JPIP/zECI/88/ + iP/WRZH/4Vuu/+Vit//lYrX/5mG0/+Rhsv/eX7P/xFS7/61Lwv+vTMD/yFi2/9Zdrv/MTJf/vDN3/7ox + dP+1MnH7sTNwgJA8YwSbOWcAiDpeAH0vVACYTG8ASAAiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/hfcAoTRlAJk1Yge2L2uGvy5v4cQs + cuLGMHbizD2D4s9BieLRQIni10aU7OJarv3lX7X/5V+0/+Nfsv/hXa//4F2u/+Fdrv/gXq3/3V6t/9le + rf/XXa3/zk6a+b40eea9MXPjuzFy3rYycXGPO2QEnzhqAP/y/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKMy + ZQCbM2MDuC1sMsEscFTGLHNUxzB2VM48g1TRP4tV0UCLVtpYoIbeVKPw3E6g/9xPn//dTZz/2EaU/9ZF + kv/VRZL/1EeU/9BKlv/OTJb/zU2X/85UmtLEQ4Rnvi9xU70wclK2L28phjJbAZwxZAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAACVGE0AihVFALEYXwHBH2sBxydtAcgnbwHUNn8B3jqOAv///wDhc6s92k+X5dZB + j//WQY3/2D2J/9Ayff/NMHr/zTB6/8s0ff/KPIT/xz+E/8NBhP/GVZOy2n2xFBwAAADCK28Bsh5hAf// + /wBQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnildAJQpWAC1JmcAwChuAMYqcQDHLXQA0DqCANU6 + igDhZ6IA4nOoOd1OleTZQI//2ECM/9g9hv/RMnn/zTB2/8ovdf/JM3n/yjyB/8g9gv/DPoP/xFOQr9J8 + rhHNZp4Avi5xALUrbABlFjsAkSNXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJ4pXQCUKVgAtSZnAMAo + bgDGKnEAxy10ANA6ggDoibkA426pAOV3rjjcUJbk2kCP/9dBjf/XPYb/0TJ5/80xdv/IMHX/xzR6/8o9 + gv/GPoL/wz+C/8hUkq7bf7IQ2HWrAM1unwC1K2wAZhY7AJIkVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA7JTBAON2rwDlf7Ql216erdhWl9LWVpjR1lSS0dJK + htHOSILRykiB0ctLhtHLUozRx1SN0cVVjc/IYJl94Ii5Cdt+sQDTd6AAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPap0gDpjLwA7JLAB+SG + tjHkkLtK5ZPASuOOuUrhh69K4YuwSt+Kr0rch65K242zStyTuUrZjbZG04KwHueeywHglcAAyYagAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAA///AAD///////8AAP//////8AAAAP/////wAAAA//////AAAAD/////8AAAAP////8AAAAAA + P///wAAAAAA////AAAAAAD///8AAAAAAP///wAAAAAA///wAAAAAAAA//AAAAAAAAD/8AAAAAAAAP/wA + AAAAAAA/wAAAAAAAAAPAAAAAAAAAA8AAAAAAAAADwAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAAD+AAAAAAAAB/8AAAAAAAAP/wAAAAAAAA//AAAAAAA + AD//+AAAAAAB///8AAAAAAP///wAAAAAA////AAAAAAD///8AAAAAAP////4AAAAH/////wAAAA///// + /AAAAD/////8AAAAP/////wAAAA///////gAAf//////+AAB//8= + + \ No newline at end of file diff --git a/YoutubeEnchanted/UI/BetterTextbox.cs b/YoutubeEnchanted/UI/BetterTextbox.cs new file mode 100644 index 0000000..2d2d417 --- /dev/null +++ b/YoutubeEnchanted/UI/BetterTextbox.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace YoutubeEnchanted.UI +{ + internal class BetterTextbox:TextBox + { + public BetterTextbox() { BorderStyle = BorderStyle.None;ReadOnly = true;BackColor = System.Drawing.Color.White; } + } +} diff --git a/YoutubeEnchanted/UI/MainPage.Designer.cs b/YoutubeEnchanted/UI/MainPage.Designer.cs index 143c87b..3f2662d 100644 --- a/YoutubeEnchanted/UI/MainPage.Designer.cs +++ b/YoutubeEnchanted/UI/MainPage.Designer.cs @@ -49,6 +49,7 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.White; this.Controls.Add(this.TopicShower); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "MainPage"; diff --git a/YoutubeEnchanted/UI/TopicVideoSelecter.Designer.cs b/YoutubeEnchanted/UI/TopicVideoSelecter.Designer.cs index 3d86f14..0db7e00 100644 --- a/YoutubeEnchanted/UI/TopicVideoSelecter.Designer.cs +++ b/YoutubeEnchanted/UI/TopicVideoSelecter.Designer.cs @@ -38,7 +38,7 @@ private void InitializeComponent() this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.flowLayoutPanel1.AutoScroll = true; - this.flowLayoutPanel1.BackColor = System.Drawing.SystemColors.Control; + this.flowLayoutPanel1.BackColor = System.Drawing.Color.White; this.flowLayoutPanel1.Location = new System.Drawing.Point(4, 56); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(4); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; @@ -69,7 +69,7 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.Color.White; this.Controls.Add(this.label1); this.Controls.Add(this.flowLayoutPanel1); this.Margin = new System.Windows.Forms.Padding(4); diff --git a/YoutubeEnchanted/UI/VideoControl.Designer.cs b/YoutubeEnchanted/UI/VideoControl.Designer.cs index cc7464d..4cd7b15 100644 --- a/YoutubeEnchanted/UI/VideoControl.Designer.cs +++ b/YoutubeEnchanted/UI/VideoControl.Designer.cs @@ -28,10 +28,10 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); + this.label1 = new UI.BetterTextbox(); + this.label2 = new UI.BetterTextbox(); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); - this.label3 = new System.Windows.Forms.Label(); + this.label3 = new UI.BetterTextbox(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); @@ -43,11 +43,12 @@ private void InitializeComponent() this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.label1.BackColor = System.Drawing.Color.White; + this.label1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.label1.Font = new System.Drawing.Font("Segoe UI", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label1.Location = new System.Drawing.Point(4, 188); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(256, 41); + this.label1.Size = new System.Drawing.Size(256, 35); this.label1.TabIndex = 1; this.label1.Click += new System.EventHandler(this.pictureBox2_Click); this.label1.MouseEnter += new System.EventHandler(this.pictureBox1_MouseEnter); @@ -58,11 +59,12 @@ private void InitializeComponent() this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.label2.BackColor = System.Drawing.Color.White; + this.label2.BorderStyle = System.Windows.Forms.BorderStyle.None; this.label2.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label2.Location = new System.Drawing.Point(64, 229); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(199, 40); + this.label2.Size = new System.Drawing.Size(199, 27); this.label2.TabIndex = 2; this.label2.Click += new System.EventHandler(this.pictureBox2_Click); this.label2.MouseEnter += new System.EventHandler(this.pictureBox1_MouseEnter); @@ -75,18 +77,17 @@ private void InitializeComponent() // label3 // this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label3.BorderStyle = System.Windows.Forms.BorderStyle.None; this.label3.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.Location = new System.Drawing.Point(164, 154); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(99, 30); + this.label3.Size = new System.Drawing.Size(99, 27); this.label3.TabIndex = 3; this.label3.Click += new System.EventHandler(this.pictureBox2_Click); // // pictureBox2 // - this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.pictureBox2.BackColor = System.Drawing.Color.White; this.pictureBox2.ErrorImage = global::YoutubeEnchanted.Properties.Resources.error; this.pictureBox2.Location = new System.Drawing.Point(8, 229); @@ -138,16 +139,17 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); + this.PerformLayout(); } #endregion private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox label1; + private System.Windows.Forms.TextBox label2; private System.ComponentModel.BackgroundWorker backgroundWorker1; - private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox label3; private System.Windows.Forms.PictureBox pictureBox2; } } diff --git a/YoutubeEnchanted/YoutubeEnchanted-64x64.ico b/YoutubeEnchanted/YoutubeEnchanted-64x64.ico new file mode 100644 index 0000000..02324bb Binary files /dev/null and b/YoutubeEnchanted/YoutubeEnchanted-64x64.ico differ diff --git a/YoutubeEnchanted/YoutubeEnchanted.csproj b/YoutubeEnchanted/YoutubeEnchanted.csproj index 0dfea80..6006769 100644 --- a/YoutubeEnchanted/YoutubeEnchanted.csproj +++ b/YoutubeEnchanted/YoutubeEnchanted.csproj @@ -38,6 +38,9 @@ prompt true + + YoutubeEnchanted-64x64.ico + ..\packages\AngleSharp.0.17.1\lib\net472\AngleSharp.dll @@ -140,6 +143,9 @@ + + Component + Form @@ -276,6 +282,9 @@ + + +