From 8e2d54e924ed1e227bdba69ca9524d47d28570ab Mon Sep 17 00:00:00 2001 From: Tim Young Date: Wed, 1 Nov 2017 08:15:07 -0500 Subject: [PATCH] Make more space --- .../TranslationWindow.Designer.cs | 110 +++++++++++------- EduNetworkBuilder/TranslationWindow.cs | 4 +- 2 files changed, 71 insertions(+), 43 deletions(-) diff --git a/EduNetworkBuilder/TranslationWindow.Designer.cs b/EduNetworkBuilder/TranslationWindow.Designer.cs index 854ae3e..aeec7a0 100644 --- a/EduNetworkBuilder/TranslationWindow.Designer.cs +++ b/EduNetworkBuilder/TranslationWindow.Designer.cs @@ -42,7 +42,7 @@ this.tb1URL = new System.Windows.Forms.TextBox(); this.tb2URL = new System.Windows.Forms.TextBox(); this.tpFormStuff = new System.Windows.Forms.TabPage(); - this.cbFormSkipDone = new System.Windows.Forms.CheckBox(); + this.cbFormShowTranslated = new System.Windows.Forms.CheckBox(); this.cbFormHighPriority = new System.Windows.Forms.CheckBox(); this.panelTranslateFormItems = new System.Windows.Forms.Panel(); this.tbFormItem2 = new System.Windows.Forms.TextBox(); @@ -53,10 +53,13 @@ this.cbFormLang1Choice = new System.Windows.Forms.ComboBox(); this.lblFormDir = new System.Windows.Forms.Label(); this.btnChooseDir = new System.Windows.Forms.Button(); + this.cbFormItemTranslated = new System.Windows.Forms.CheckBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); this.tcTabPages.SuspendLayout(); this.tpMessageTitle.SuspendLayout(); this.tpFormStuff.SuspendLayout(); this.panelTranslateFormItems.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // cb1Language @@ -75,7 +78,7 @@ this.tb1Message.Location = new System.Drawing.Point(6, 39); this.tb1Message.Multiline = true; this.tb1Message.Name = "tb1Message"; - this.tb1Message.Size = new System.Drawing.Size(438, 164); + this.tb1Message.Size = new System.Drawing.Size(512, 164); this.tb1Message.TabIndex = 10; this.tb1Message.Leave += new System.EventHandler(this.tb1Message_Leave); // @@ -87,7 +90,7 @@ this.tb2Message.Location = new System.Drawing.Point(6, 266); this.tb2Message.Multiline = true; this.tb2Message.Name = "tb2Message"; - this.tb2Message.Size = new System.Drawing.Size(438, 143); + this.tb2Message.Size = new System.Drawing.Size(512, 144); this.tb2Message.TabIndex = 12; this.tb2Message.Leave += new System.EventHandler(this.tb2Message_Leave); // @@ -103,7 +106,7 @@ // btnClose // this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnClose.Location = new System.Drawing.Point(390, 488); + this.btnClose.Location = new System.Drawing.Point(464, 489); this.btnClose.Name = "btnClose"; this.btnClose.Size = new System.Drawing.Size(75, 23); this.btnClose.TabIndex = 13; @@ -114,7 +117,7 @@ // btnSave // this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnSave.Location = new System.Drawing.Point(12, 488); + this.btnSave.Location = new System.Drawing.Point(12, 489); this.btnSave.Name = "btnSave"; this.btnSave.Size = new System.Drawing.Size(75, 23); this.btnSave.TabIndex = 14; @@ -126,7 +129,7 @@ // this.lblStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lblStatus.AutoSize = true; - this.lblStatus.Location = new System.Drawing.Point(139, 491); + this.lblStatus.Location = new System.Drawing.Point(139, 492); this.lblStatus.Name = "lblStatus"; this.lblStatus.Size = new System.Drawing.Size(48, 17); this.lblStatus.TabIndex = 15; @@ -138,7 +141,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.tb1Title.Location = new System.Drawing.Point(172, 11); this.tb1Title.Name = "tb1Title"; - this.tb1Title.Size = new System.Drawing.Size(272, 22); + this.tb1Title.Size = new System.Drawing.Size(346, 22); this.tb1Title.TabIndex = 16; this.tb1Title.Leave += new System.EventHandler(this.tb1Title_Leave); // @@ -148,7 +151,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.tb2Title.Location = new System.Drawing.Point(172, 236); this.tb2Title.Name = "tb2Title"; - this.tb2Title.Size = new System.Drawing.Size(272, 22); + this.tb2Title.Size = new System.Drawing.Size(346, 22); this.tb2Title.TabIndex = 17; this.tb2Title.Leave += new System.EventHandler(this.tb2Title_Leave); // @@ -162,7 +165,7 @@ this.tcTabPages.Location = new System.Drawing.Point(7, 6); this.tcTabPages.Name = "tcTabPages"; this.tcTabPages.SelectedIndex = 0; - this.tcTabPages.Size = new System.Drawing.Size(458, 467); + this.tcTabPages.Size = new System.Drawing.Size(532, 468); this.tcTabPages.TabIndex = 18; // // tpMessageTitle @@ -178,7 +181,7 @@ this.tpMessageTitle.Location = new System.Drawing.Point(4, 25); this.tpMessageTitle.Name = "tpMessageTitle"; this.tpMessageTitle.Padding = new System.Windows.Forms.Padding(3); - this.tpMessageTitle.Size = new System.Drawing.Size(450, 438); + this.tpMessageTitle.Size = new System.Drawing.Size(524, 439); this.tpMessageTitle.TabIndex = 0; this.tpMessageTitle.Text = "Messages"; this.tpMessageTitle.UseVisualStyleBackColor = true; @@ -201,37 +204,34 @@ // // tpFormStuff // - this.tpFormStuff.Controls.Add(this.cbFormSkipDone); - this.tpFormStuff.Controls.Add(this.cbFormHighPriority); this.tpFormStuff.Controls.Add(this.panelTranslateFormItems); this.tpFormStuff.Controls.Add(this.lblFormDir); this.tpFormStuff.Controls.Add(this.btnChooseDir); + this.tpFormStuff.Controls.Add(this.groupBox1); this.tpFormStuff.Location = new System.Drawing.Point(4, 25); this.tpFormStuff.Name = "tpFormStuff"; this.tpFormStuff.Padding = new System.Windows.Forms.Padding(3); - this.tpFormStuff.Size = new System.Drawing.Size(450, 438); + this.tpFormStuff.Size = new System.Drawing.Size(524, 439); this.tpFormStuff.TabIndex = 1; this.tpFormStuff.Text = "Forms"; this.tpFormStuff.UseVisualStyleBackColor = true; // - // cbFormSkipDone + // cbFormShowTranslated // - this.cbFormSkipDone.AutoSize = true; - this.cbFormSkipDone.Checked = true; - this.cbFormSkipDone.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbFormSkipDone.Location = new System.Drawing.Point(141, 49); - this.cbFormSkipDone.Name = "cbFormSkipDone"; - this.cbFormSkipDone.Size = new System.Drawing.Size(95, 21); - this.cbFormSkipDone.TabIndex = 4; - this.cbFormSkipDone.Text = "Skip Done"; - this.cbFormSkipDone.UseVisualStyleBackColor = true; + this.cbFormShowTranslated.AutoSize = true; + this.cbFormShowTranslated.Location = new System.Drawing.Point(230, 8); + this.cbFormShowTranslated.Name = "cbFormShowTranslated"; + this.cbFormShowTranslated.Size = new System.Drawing.Size(150, 21); + this.cbFormShowTranslated.TabIndex = 4; + this.cbFormShowTranslated.Text = "Already Translated"; + this.cbFormShowTranslated.UseVisualStyleBackColor = true; // // cbFormHighPriority // this.cbFormHighPriority.AutoSize = true; this.cbFormHighPriority.Checked = true; this.cbFormHighPriority.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbFormHighPriority.Location = new System.Drawing.Point(28, 49); + this.cbFormHighPriority.Location = new System.Drawing.Point(100, 7); this.cbFormHighPriority.Name = "cbFormHighPriority"; this.cbFormHighPriority.Size = new System.Drawing.Size(107, 21); this.cbFormHighPriority.TabIndex = 3; @@ -240,43 +240,45 @@ // // panelTranslateFormItems // + this.panelTranslateFormItems.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.panelTranslateFormItems.Controls.Add(this.cbFormItemTranslated); this.panelTranslateFormItems.Controls.Add(this.tbFormItem2); this.panelTranslateFormItems.Controls.Add(this.tbFormItem1); this.panelTranslateFormItems.Controls.Add(this.lblFormItem); this.panelTranslateFormItems.Controls.Add(this.cbFormItemChoice); this.panelTranslateFormItems.Controls.Add(this.cbFormLang2Choice); this.panelTranslateFormItems.Controls.Add(this.cbFormLang1Choice); - this.panelTranslateFormItems.Location = new System.Drawing.Point(6, 88); + this.panelTranslateFormItems.Location = new System.Drawing.Point(6, 117); this.panelTranslateFormItems.Name = "panelTranslateFormItems"; - this.panelTranslateFormItems.Size = new System.Drawing.Size(434, 338); + this.panelTranslateFormItems.Size = new System.Drawing.Size(512, 307); this.panelTranslateFormItems.TabIndex = 2; // // tbFormItem2 // this.tbFormItem2.AcceptsReturn = true; - this.tbFormItem2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tbFormItem2.Location = new System.Drawing.Point(28, 257); + this.tbFormItem2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.tbFormItem2.Location = new System.Drawing.Point(22, 206); this.tbFormItem2.Multiline = true; this.tbFormItem2.Name = "tbFormItem2"; - this.tbFormItem2.Size = new System.Drawing.Size(384, 72); + this.tbFormItem2.Size = new System.Drawing.Size(462, 72); this.tbFormItem2.TabIndex = 6; // // tbFormItem1 // this.tbFormItem1.AcceptsReturn = true; - this.tbFormItem1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tbFormItem1.Location = new System.Drawing.Point(28, 119); + this.tbFormItem1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.tbFormItem1.Location = new System.Drawing.Point(22, 87); this.tbFormItem1.Multiline = true; this.tbFormItem1.Name = "tbFormItem1"; - this.tbFormItem1.Size = new System.Drawing.Size(384, 72); + this.tbFormItem1.Size = new System.Drawing.Size(462, 72); this.tbFormItem1.TabIndex = 5; // // lblFormItem // this.lblFormItem.AutoSize = true; - this.lblFormItem.Location = new System.Drawing.Point(21, 6); + this.lblFormItem.Location = new System.Drawing.Point(21, 17); this.lblFormItem.Name = "lblFormItem"; this.lblFormItem.Size = new System.Drawing.Size(34, 17); this.lblFormItem.TabIndex = 4; @@ -284,17 +286,18 @@ // // cbFormItemChoice // + this.cbFormItemChoice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cbFormItemChoice.FormattingEnabled = true; - this.cbFormItemChoice.Location = new System.Drawing.Point(106, 3); + this.cbFormItemChoice.Location = new System.Drawing.Point(106, 14); this.cbFormItemChoice.Name = "cbFormItemChoice"; - this.cbFormItemChoice.Size = new System.Drawing.Size(306, 24); + this.cbFormItemChoice.Size = new System.Drawing.Size(384, 24); this.cbFormItemChoice.TabIndex = 3; this.cbFormItemChoice.SelectedIndexChanged += new System.EventHandler(this.cbFormItemChoice_SelectedIndexChanged); // // cbFormLang2Choice // this.cbFormLang2Choice.FormattingEnabled = true; - this.cbFormLang2Choice.Location = new System.Drawing.Point(28, 227); + this.cbFormLang2Choice.Location = new System.Drawing.Point(22, 176); this.cbFormLang2Choice.Name = "cbFormLang2Choice"; this.cbFormLang2Choice.Size = new System.Drawing.Size(121, 24); this.cbFormLang2Choice.TabIndex = 1; @@ -302,7 +305,7 @@ // cbFormLang1Choice // this.cbFormLang1Choice.FormattingEnabled = true; - this.cbFormLang1Choice.Location = new System.Drawing.Point(28, 89); + this.cbFormLang1Choice.Location = new System.Drawing.Point(22, 57); this.cbFormLang1Choice.Name = "cbFormLang1Choice"; this.cbFormLang1Choice.Size = new System.Drawing.Size(121, 24); this.cbFormLang1Choice.TabIndex = 0; @@ -326,11 +329,32 @@ this.btnChooseDir.UseVisualStyleBackColor = true; this.btnChooseDir.Click += new System.EventHandler(this.btnChooseDir_Click); // + // cbFormItemTranslated + // + this.cbFormItemTranslated.AutoSize = true; + this.cbFormItemTranslated.Location = new System.Drawing.Point(221, 178); + this.cbFormItemTranslated.Name = "cbFormItemTranslated"; + this.cbFormItemTranslated.Size = new System.Drawing.Size(98, 21); + this.cbFormItemTranslated.TabIndex = 7; + this.cbFormItemTranslated.Text = "Translated"; + this.cbFormItemTranslated.UseVisualStyleBackColor = true; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.cbFormHighPriority); + this.groupBox1.Controls.Add(this.cbFormShowTranslated); + this.groupBox1.Location = new System.Drawing.Point(12, 82); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(505, 28); + this.groupBox1.TabIndex = 6; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Show"; + // // TranslationWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(486, 523); + this.ClientSize = new System.Drawing.Size(560, 524); this.Controls.Add(this.lblStatus); this.Controls.Add(this.btnSave); this.Controls.Add(this.btnClose); @@ -346,6 +370,8 @@ this.tpFormStuff.PerformLayout(); this.panelTranslateFormItems.ResumeLayout(false); this.panelTranslateFormItems.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -376,7 +402,9 @@ private System.Windows.Forms.ComboBox cbFormLang1Choice; private System.Windows.Forms.Label lblFormDir; private System.Windows.Forms.Button btnChooseDir; - private System.Windows.Forms.CheckBox cbFormSkipDone; + private System.Windows.Forms.CheckBox cbFormShowTranslated; private System.Windows.Forms.CheckBox cbFormHighPriority; + private System.Windows.Forms.CheckBox cbFormItemTranslated; + private System.Windows.Forms.GroupBox groupBox1; } } \ No newline at end of file diff --git a/EduNetworkBuilder/TranslationWindow.cs b/EduNetworkBuilder/TranslationWindow.cs index 2ab1f08..558d17c 100644 --- a/EduNetworkBuilder/TranslationWindow.cs +++ b/EduNetworkBuilder/TranslationWindow.cs @@ -46,7 +46,7 @@ namespace EduNetworkBuilder cbFormLang2Choice.Items.Clear(); cbFormHighPriority.CheckedChanged += PopulateFormTranslationItems; - cbFormSkipDone.CheckedChanged += PopulateFormTranslationItems; + cbFormShowTranslated.CheckedChanged += PopulateFormTranslationItems; panelTranslateFormItems.Enabled = false; @@ -329,7 +329,7 @@ namespace EduNetworkBuilder { bool AddTranslated = false; bool AddHigh = false; - if (!TI.translated || !cbFormSkipDone.Checked) + if (!TI.translated || cbFormShowTranslated.Checked) AddTranslated = true; if (cbFormHighPriority.Checked) {