From b900a5687051f1991c392ffac79ff522f214e6e1 Mon Sep 17 00:00:00 2001 From: Steven Cohn Date: Fri, 9 Feb 2024 10:15:05 -0500 Subject: [PATCH 1/9] Adjust color tones #1285 --- .../Commands/Clean/BreakingDialog.Designer.cs | 10 +- .../Clean/RemoveDuplicatesDialog.Designer.cs | 61 ++++++---- .../Clean/RemoveSpacingDialog.Designer.cs | 24 ++-- .../Clean/ToggleDttmDialog.Designer.cs | 27 +++-- .../Commands/Edit/ColorizeDialog.Designer.cs | 14 ++- .../Edit/PronunciateDialog.Designer.cs | 13 +- .../Commands/Edit/SortListDialog.Designer.cs | 41 ++++--- .../Commands/Extras/SortDialog.Designer.cs | 14 +-- .../Favorites/FavoritesDialog.Designer.cs | 17 ++- .../Commands/File/AnalyzeDialog.Designer.cs | 15 ++- .../File/CrawlWebPageDialog.Designer.cs | 4 +- .../Commands/File/ExportDialog.Designer.cs | 4 +- OneMore/Commands/File/ExportDialog.cs | 15 +++ OneMore/Commands/File/ExportDialog.resx | 11 -- .../Commands/File/ImportDialog.Designer.cs | 56 +++++---- OneMore/Commands/File/ImportDialog.cs | 15 +++ OneMore/Commands/File/ImportDialog.resx | 11 -- .../Commands/File/ImportWebDialog.Designer.cs | 33 ++--- .../Commands/File/PluginDialog.Designer.cs | 37 +++--- .../Images/AdjustImagesDialog.Designer.cs | 4 +- .../Images/CropImageDialog.Designer.cs | 21 ++-- .../Images/StylizeImagesDialog.Designer.cs | 12 +- .../Numbering/NumberPagesDialog.Designer.cs | 37 +++--- .../Numbering/OutlineDialog.Designer.cs | 58 ++++++--- .../Page/ArrangeContainersDialog.Designer.cs | 36 +++--- .../Page/FitGridToTextDialog.Designer.cs | 27 +++-- OneMore/Commands/Page/SplitDialog.Designer.cs | 33 +++-- .../References/LinkDialog.Designer.cs | 57 ++++++--- .../Commands/References/MapDialog.Designer.cs | 48 +++++--- .../RefreshPageLinksDialog.Designer.cs | 40 +++++-- .../ImportOutlookTasksDialog.Designer.cs | 29 +++-- .../Reminders/ImportOutlookTasksDialog.resx | 113 +++++++++--------- .../Reminders/RemindDialog.Designer.cs | 62 +++++----- .../ReportRemindersDialog.Designer.cs | 23 ++-- .../ReportRemindersReuseDialog.Designer.cs | 20 ++-- .../Search/SearchAndReplaceDialog.Designer.cs | 19 ++- .../Commands/Search/SearchDialog.Designer.cs | 24 ++-- OneMore/Commands/Search/SearchDialog.cs | 27 ++++- OneMore/Commands/Search/SearchDialog.resx | 14 --- .../Snippets/SaveSnippetDialog.Designer.cs | 18 +-- .../Styles/PageColorDialog.Designer.cs | 18 +-- .../Commands/Styles/ReorderDialog.Designer.cs | 12 +- .../Tables/EditTableThemesDialog.Designer.cs | 36 +++--- .../Commands/Tables/FormulaDialog.Designer.cs | 3 +- .../Tables/InsertCellsDialog.Designer.cs | 16 +-- .../Tables/SplitTableDialog.Designer.cs | 26 ++-- .../Tables/TextToTableDialog.Designer.cs | 60 +++++----- .../Commands/Tagging/HashtagErrorControl.cs | 20 ++++ .../Tools/DiagnosticsDialog.Designer.cs | 9 +- OneMore/UI/DarkTheme.json | 6 +- OneMore/UI/LightTheme.json | 6 +- OneMore/UI/MoreDataGridView.cs | 2 +- 52 files changed, 795 insertions(+), 563 deletions(-) diff --git a/OneMore/Commands/Clean/BreakingDialog.Designer.cs b/OneMore/Commands/Clean/BreakingDialog.Designer.cs index 31d26e7da7..aed7b19db6 100644 --- a/OneMore/Commands/Clean/BreakingDialog.Designer.cs +++ b/OneMore/Commands/Clean/BreakingDialog.Designer.cs @@ -68,12 +68,12 @@ private void InitializeComponent() this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(246, 142); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 38); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = false; // // cancelButton @@ -85,12 +85,12 @@ private void InitializeComponent() this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(352, 142); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 38); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = false; // // BreakingDialog @@ -98,7 +98,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(465, 193); this.Controls.Add(this.oneButton); diff --git a/OneMore/Commands/Clean/RemoveDuplicatesDialog.Designer.cs b/OneMore/Commands/Clean/RemoveDuplicatesDialog.Designer.cs index 567abc63b2..27d55750fe 100644 --- a/OneMore/Commands/Clean/RemoveDuplicatesDialog.Designer.cs +++ b/OneMore/Commands/Clean/RemoveDuplicatesDialog.Designer.cs @@ -34,7 +34,7 @@ private void InitializeComponent() this.okButton = new River.OneMoreAddIn.UI.MoreButton(); this.cancelButton = new River.OneMoreAddIn.UI.MoreButton(); this.depthBox = new River.OneMoreAddIn.UI.MoreGroupBox(); - this.includeTitlesBox = new System.Windows.Forms.CheckBox(); + this.includeTitlesBox = new River.OneMoreAddIn.UI.MoreCheckBox(); this.deepRadio = new River.OneMoreAddIn.UI.MoreRadioButton(); this.basicRadio = new River.OneMoreAddIn.UI.MoreRadioButton(); this.simpleRadio = new River.OneMoreAddIn.UI.MoreRadioButton(); @@ -48,11 +48,11 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.scopeGroupBox.Controls.Add(this.scopeSelector); - this.scopeGroupBox.Location = new System.Drawing.Point(18, 204); + this.scopeGroupBox.Location = new System.Drawing.Point(18, 219); this.scopeGroupBox.Margin = new System.Windows.Forms.Padding(3, 12, 3, 3); this.scopeGroupBox.Name = "scopeGroupBox"; - this.scopeGroupBox.Padding = new System.Windows.Forms.Padding(20, 3, 3, 3); - this.scopeGroupBox.Size = new System.Drawing.Size(567, 313); + this.scopeGroupBox.Padding = new System.Windows.Forms.Padding(20, 15, 3, 3); + this.scopeGroupBox.Size = new System.Drawing.Size(567, 341); this.scopeGroupBox.TabIndex = 0; this.scopeGroupBox.TabStop = false; this.scopeGroupBox.Text = "Scope"; @@ -60,42 +60,46 @@ private void InitializeComponent() // scopeSelector // this.scopeSelector.Dock = System.Windows.Forms.DockStyle.Fill; - this.scopeSelector.Location = new System.Drawing.Point(20, 22); + this.scopeSelector.Location = new System.Drawing.Point(20, 34); this.scopeSelector.Name = "scopeSelector"; this.scopeSelector.Scopes = ((River.OneMoreAddIn.UI.SelectorScope)((((River.OneMoreAddIn.UI.SelectorScope.Section | River.OneMoreAddIn.UI.SelectorScope.Notebook) | River.OneMoreAddIn.UI.SelectorScope.Notebooks) | River.OneMoreAddIn.UI.SelectorScope.SelectedNotebooks))); - this.scopeSelector.Size = new System.Drawing.Size(544, 288); + this.scopeSelector.Size = new System.Drawing.Size(544, 304); this.scopeSelector.TabIndex = 0; // // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; - this.okButton.Location = new System.Drawing.Point(379, 534); + this.okButton.Location = new System.Drawing.Point(379, 577); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 38); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; - this.cancelButton.Location = new System.Drawing.Point(485, 534); + this.cancelButton.Location = new System.Drawing.Point(485, 577); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 38); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // depthBox @@ -106,7 +110,8 @@ private void InitializeComponent() this.depthBox.Controls.Add(this.simpleRadio); this.depthBox.Location = new System.Drawing.Point(18, 13); this.depthBox.Name = "depthBox"; - this.depthBox.Size = new System.Drawing.Size(567, 166); + this.depthBox.Padding = new System.Windows.Forms.Padding(3, 15, 3, 3); + this.depthBox.Size = new System.Drawing.Size(567, 191); this.depthBox.TabIndex = 8; this.depthBox.TabStop = false; this.depthBox.Text = "Scanning Depth"; @@ -114,28 +119,32 @@ private void InitializeComponent() // includeTitlesBox // this.includeTitlesBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.includeTitlesBox.AutoSize = true; - this.includeTitlesBox.Location = new System.Drawing.Point(20, 130); + this.includeTitlesBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.includeTitlesBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.includeTitlesBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.includeTitlesBox.Location = new System.Drawing.Point(20, 148); this.includeTitlesBox.Name = "includeTitlesBox"; - this.includeTitlesBox.Size = new System.Drawing.Size(284, 24); + this.includeTitlesBox.Size = new System.Drawing.Size(293, 25); this.includeTitlesBox.TabIndex = 3; this.includeTitlesBox.Text = "Include page titles when comparing"; this.includeTitlesBox.UseVisualStyleBackColor = true; // // deepRadio // - this.deepRadio.Location = new System.Drawing.Point(20, 85); + this.deepRadio.Cursor = System.Windows.Forms.Cursors.Hand; + this.deepRadio.Location = new System.Drawing.Point(20, 97); this.deepRadio.Name = "deepRadio"; - this.deepRadio.Size = new System.Drawing.Size(330, 24); + this.deepRadio.Size = new System.Drawing.Size(334, 25); this.deepRadio.TabIndex = 2; this.deepRadio.Text = "Deep XML with binary comparison (slow)"; this.deepRadio.UseVisualStyleBackColor = true; // // basicRadio // - this.basicRadio.Location = new System.Drawing.Point(20, 55); + this.basicRadio.Cursor = System.Windows.Forms.Cursors.Hand; + this.basicRadio.Location = new System.Drawing.Point(20, 67); this.basicRadio.Name = "basicRadio"; - this.basicRadio.Size = new System.Drawing.Size(178, 24); + this.basicRadio.Size = new System.Drawing.Size(183, 25); this.basicRadio.TabIndex = 1; this.basicRadio.Text = "Basic XML structure"; this.basicRadio.UseVisualStyleBackColor = true; @@ -143,9 +152,10 @@ private void InitializeComponent() // simpleRadio // this.simpleRadio.Checked = true; - this.simpleRadio.Location = new System.Drawing.Point(20, 25); + this.simpleRadio.Cursor = System.Windows.Forms.Cursors.Hand; + this.simpleRadio.Location = new System.Drawing.Point(20, 37); this.simpleRadio.Name = "simpleRadio"; - this.simpleRadio.Size = new System.Drawing.Size(166, 24); + this.simpleRadio.Size = new System.Drawing.Size(171, 25); this.simpleRadio.TabIndex = 0; this.simpleRadio.TabStop = true; this.simpleRadio.Text = "Simple text (quick)"; @@ -156,9 +166,9 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(598, 584); + this.ClientSize = new System.Drawing.Size(598, 627); this.Controls.Add(this.depthBox); this.Controls.Add(this.okButton); this.Controls.Add(this.cancelButton); @@ -174,7 +184,6 @@ private void InitializeComponent() this.Text = "Remove Duplicate Pages"; this.scopeGroupBox.ResumeLayout(false); this.depthBox.ResumeLayout(false); - this.depthBox.PerformLayout(); this.ResumeLayout(false); } @@ -189,6 +198,6 @@ private void InitializeComponent() private UI.MoreRadioButton deepRadio; private UI.MoreRadioButton basicRadio; private UI.MoreRadioButton simpleRadio; - private System.Windows.Forms.CheckBox includeTitlesBox; + private UI.MoreCheckBox includeTitlesBox; } } \ No newline at end of file diff --git a/OneMore/Commands/Clean/RemoveSpacingDialog.Designer.cs b/OneMore/Commands/Clean/RemoveSpacingDialog.Designer.cs index daea5af957..ec5b85f1fe 100644 --- a/OneMore/Commands/Clean/RemoveSpacingDialog.Designer.cs +++ b/OneMore/Commands/Clean/RemoveSpacingDialog.Designer.cs @@ -39,7 +39,7 @@ private void InitializeComponent() // // beforeBox // - this.beforeBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); + this.beforeBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.beforeBox.Checked = true; this.beforeBox.CheckState = System.Windows.Forms.CheckState.Checked; this.beforeBox.Cursor = System.Windows.Forms.Cursors.Hand; @@ -54,7 +54,7 @@ private void InitializeComponent() // // afterBox // - this.afterBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); + this.afterBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.afterBox.Checked = true; this.afterBox.CheckState = System.Windows.Forms.CheckState.Checked; this.afterBox.Cursor = System.Windows.Forms.Cursors.Hand; @@ -69,7 +69,7 @@ private void InitializeComponent() // // betweenBox // - this.betweenBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); + this.betweenBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.betweenBox.Checked = true; this.betweenBox.CheckState = System.Windows.Forms.CheckState.Checked; this.betweenBox.Cursor = System.Windows.Forms.Cursors.Hand; @@ -84,7 +84,7 @@ private void InitializeComponent() // // headingsBox // - this.headingsBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); + this.headingsBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.headingsBox.Checked = true; this.headingsBox.CheckState = System.Windows.Forms.CheckState.Checked; this.headingsBox.Cursor = System.Windows.Forms.Cursors.Hand; @@ -104,15 +104,15 @@ private void InitializeComponent() this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; - this.cancelButton.Location = new System.Drawing.Point(325, 230); + this.cancelButton.Location = new System.Drawing.Point(342, 230); this.cancelButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(112, 35); this.cancelButton.TabIndex = 5; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // okButton @@ -122,15 +122,15 @@ private void InitializeComponent() this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; - this.okButton.Location = new System.Drawing.Point(205, 230); + this.okButton.Location = new System.Drawing.Point(222, 230); this.okButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(112, 35); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // RemoveSpacingDialog @@ -138,9 +138,9 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(451, 280); + this.ClientSize = new System.Drawing.Size(468, 280); this.Controls.Add(this.okButton); this.Controls.Add(this.cancelButton); this.Controls.Add(this.headingsBox); diff --git a/OneMore/Commands/Clean/ToggleDttmDialog.Designer.cs b/OneMore/Commands/Clean/ToggleDttmDialog.Designer.cs index efb65770a1..1d332c552f 100644 --- a/OneMore/Commands/Clean/ToggleDttmDialog.Designer.cs +++ b/OneMore/Commands/Clean/ToggleDttmDialog.Designer.cs @@ -29,8 +29,8 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ToggleDttmDialog)); - this.hideRadio = new UI.MoreRadioButton(); - this.showRadio = new UI.MoreRadioButton(); + this.hideRadio = new River.OneMoreAddIn.UI.MoreRadioButton(); + this.showRadio = new River.OneMoreAddIn.UI.MoreRadioButton(); this.toggleGroup = new River.OneMoreAddIn.UI.MoreGroupBox(); this.scopeGroup = new River.OneMoreAddIn.UI.MoreGroupBox(); this.scopeSelector = new River.OneMoreAddIn.UI.ScopeSelector(); @@ -42,11 +42,11 @@ private void InitializeComponent() // // hideRadio // - this.hideRadio.AutoSize = true; this.hideRadio.Checked = true; + this.hideRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.hideRadio.Location = new System.Drawing.Point(18, 37); this.hideRadio.Name = "hideRadio"; - this.hideRadio.Size = new System.Drawing.Size(168, 24); + this.hideRadio.Size = new System.Drawing.Size(173, 25); this.hideRadio.TabIndex = 0; this.hideRadio.TabStop = true; this.hideRadio.Text = "Hide date and time"; @@ -54,10 +54,10 @@ private void InitializeComponent() // // showRadio // - this.showRadio.AutoSize = true; + this.showRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.showRadio.Location = new System.Drawing.Point(18, 67); this.showRadio.Name = "showRadio"; - this.showRadio.Size = new System.Drawing.Size(175, 24); + this.showRadio.Size = new System.Drawing.Size(181, 25); this.showRadio.TabIndex = 1; this.showRadio.Text = "Show date and time"; this.showRadio.UseVisualStyleBackColor = true; @@ -66,7 +66,6 @@ private void InitializeComponent() // this.toggleGroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.toggleGroup.BackColor = System.Drawing.SystemColors.Control; this.toggleGroup.Controls.Add(this.hideRadio); this.toggleGroup.Controls.Add(this.showRadio); this.toggleGroup.ForeColor = System.Drawing.SystemColors.ControlText; @@ -82,7 +81,6 @@ private void InitializeComponent() // this.scopeGroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.scopeGroup.BackColor = System.Drawing.SystemColors.Control; this.scopeGroup.Controls.Add(this.scopeSelector); this.scopeGroup.ForeColor = System.Drawing.SystemColors.ControlText; this.scopeGroup.Location = new System.Drawing.Point(18, 159); @@ -95,7 +93,7 @@ private void InitializeComponent() // // scopeSelector // - this.scopeSelector.Location = new System.Drawing.Point(31, 34); + this.scopeSelector.Location = new System.Drawing.Point(18, 34); this.scopeSelector.Margin = new System.Windows.Forms.Padding(0); this.scopeSelector.Name = "scopeSelector"; this.scopeSelector.Scopes = ((River.OneMoreAddIn.UI.SelectorScope)((River.OneMoreAddIn.UI.SelectorScope.Page | River.OneMoreAddIn.UI.SelectorScope.Section))); @@ -105,7 +103,9 @@ private void InitializeComponent() // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(342, 305); this.cancelButton.Name = "cancelButton"; @@ -113,12 +113,16 @@ private void InitializeComponent() this.cancelButton.Size = new System.Drawing.Size(100, 38); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(236, 305); this.okButton.Name = "okButton"; @@ -126,6 +130,8 @@ private void InitializeComponent() this.okButton.Size = new System.Drawing.Size(100, 38); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // ToggleDttmDialog @@ -133,7 +139,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(460, 361); this.Controls.Add(this.okButton); @@ -151,7 +157,6 @@ private void InitializeComponent() this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.Text = "Show/Hide Date and Time"; this.toggleGroup.ResumeLayout(false); - this.toggleGroup.PerformLayout(); this.scopeGroup.ResumeLayout(false); this.ResumeLayout(false); diff --git a/OneMore/Commands/Edit/ColorizeDialog.Designer.cs b/OneMore/Commands/Edit/ColorizeDialog.Designer.cs index e42a7c1f55..498c41da97 100644 --- a/OneMore/Commands/Edit/ColorizeDialog.Designer.cs +++ b/OneMore/Commands/Edit/ColorizeDialog.Designer.cs @@ -40,9 +40,10 @@ private void InitializeComponent() // // controlPanel // + this.controlPanel.BackColor = System.Drawing.SystemColors.ControlLight; this.controlPanel.Controls.Add(this.okButton); this.controlPanel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.controlPanel.Location = new System.Drawing.Point(0, 478); + this.controlPanel.Location = new System.Drawing.Point(0, 516); this.controlPanel.Name = "controlPanel"; this.controlPanel.Size = new System.Drawing.Size(373, 62); this.controlPanel.TabIndex = 0; @@ -56,23 +57,24 @@ private void InitializeComponent() this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(253, 13); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(108, 38); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; this.okButton.KeyUp += new System.Windows.Forms.KeyEventHandler(this.CancelOnKeyUp); // // mainPanel // + this.mainPanel.BackColor = System.Drawing.SystemColors.ControlLight; this.mainPanel.Controls.Add(this.view); this.mainPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.mainPanel.Location = new System.Drawing.Point(0, 0); this.mainPanel.Name = "mainPanel"; this.mainPanel.Padding = new System.Windows.Forms.Padding(10); - this.mainPanel.Size = new System.Drawing.Size(373, 478); + this.mainPanel.Size = new System.Drawing.Size(373, 516); this.mainPanel.TabIndex = 1; // // view @@ -87,7 +89,7 @@ private void InitializeComponent() this.view.HideSelection = false; this.view.Location = new System.Drawing.Point(10, 10); this.view.Name = "view"; - this.view.Size = new System.Drawing.Size(353, 458); + this.view.Size = new System.Drawing.Size(353, 496); this.view.TabIndex = 0; this.view.UseCompatibleStateImageBehavior = false; this.view.View = System.Windows.Forms.View.Details; @@ -103,7 +105,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(373, 540); + this.ClientSize = new System.Drawing.Size(373, 578); this.Controls.Add(this.mainPanel); this.Controls.Add(this.controlPanel); this.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); diff --git a/OneMore/Commands/Edit/PronunciateDialog.Designer.cs b/OneMore/Commands/Edit/PronunciateDialog.Designer.cs index 0c5ab29d82..2b6ae3b374 100644 --- a/OneMore/Commands/Edit/PronunciateDialog.Designer.cs +++ b/OneMore/Commands/Edit/PronunciateDialog.Designer.cs @@ -54,10 +54,10 @@ private void InitializeComponent() this.wordBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.wordBox.Location = new System.Drawing.Point(110, 32); this.wordBox.Name = "wordBox"; - this.wordBox.ThemedBack = null; - this.wordBox.ThemedFore = null; this.wordBox.Size = new System.Drawing.Size(379, 26); this.wordBox.TabIndex = 2; + this.wordBox.ThemedBack = null; + this.wordBox.ThemedFore = null; // // languageLabel // @@ -104,12 +104,12 @@ private void InitializeComponent() this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(389, 141); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 38); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // okButton @@ -121,12 +121,12 @@ private void InitializeComponent() this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(283, 141); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 38); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // PronunciateDialog @@ -134,6 +134,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(513, 202); this.Controls.Add(this.okButton); diff --git a/OneMore/Commands/Edit/SortListDialog.Designer.cs b/OneMore/Commands/Edit/SortListDialog.Designer.cs index ddf73a1cb6..864bd705d4 100644 --- a/OneMore/Commands/Edit/SortListDialog.Designer.cs +++ b/OneMore/Commands/Edit/SortListDialog.Designer.cs @@ -44,11 +44,11 @@ private void InitializeComponent() // // thisListButton // - this.thisListButton.AutoSize = true; this.thisListButton.Checked = true; + this.thisListButton.Cursor = System.Windows.Forms.Cursors.Hand; this.thisListButton.Location = new System.Drawing.Point(23, 42); this.thisListButton.Name = "thisListButton"; - this.thisListButton.Size = new System.Drawing.Size(200, 24); + this.thisListButton.Size = new System.Drawing.Size(208, 25); this.thisListButton.TabIndex = 0; this.thisListButton.TabStop = true; this.thisListButton.Text = "Sort only the current list"; @@ -56,30 +56,34 @@ private void InitializeComponent() // // allListsButton // - this.allListsButton.AutoSize = true; + this.allListsButton.Cursor = System.Windows.Forms.Cursors.Hand; this.allListsButton.Location = new System.Drawing.Point(23, 72); this.allListsButton.Name = "allListsButton"; - this.allListsButton.Size = new System.Drawing.Size(266, 24); + this.allListsButton.Size = new System.Drawing.Size(278, 25); this.allListsButton.TabIndex = 1; this.allListsButton.Text = "Sort all top-level lists on the page"; this.allListsButton.UseVisualStyleBackColor = true; // // typeBox // - this.typeBox.AutoSize = true; + this.typeBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.typeBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.typeBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.typeBox.Location = new System.Drawing.Point(23, 148); this.typeBox.Name = "typeBox"; - this.typeBox.Size = new System.Drawing.Size(280, 24); + this.typeBox.Size = new System.Drawing.Size(290, 25); this.typeBox.TabIndex = 3; this.typeBox.Text = "Both bullet lists and numbered lists"; this.typeBox.UseVisualStyleBackColor = true; // // deepBox // - this.deepBox.AutoSize = true; + this.deepBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.deepBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.deepBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.deepBox.Location = new System.Drawing.Point(23, 118); this.deepBox.Name = "deepBox"; - this.deepBox.Size = new System.Drawing.Size(149, 24); + this.deepBox.Size = new System.Drawing.Size(154, 25); this.deepBox.TabIndex = 2; this.deepBox.Text = "Include sub-lists"; this.deepBox.UseVisualStyleBackColor = true; @@ -87,31 +91,35 @@ private void InitializeComponent() // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(391, 312); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 38); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(497, 312); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 38); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // optionsBox @@ -133,10 +141,12 @@ private void InitializeComponent() // // duplicatesBox // - this.duplicatesBox.AutoSize = true; + this.duplicatesBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.duplicatesBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.duplicatesBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.duplicatesBox.Location = new System.Drawing.Point(23, 178); this.duplicatesBox.Name = "duplicatesBox"; - this.duplicatesBox.Size = new System.Drawing.Size(170, 24); + this.duplicatesBox.Size = new System.Drawing.Size(176, 25); this.duplicatesBox.TabIndex = 4; this.duplicatesBox.Text = "Remove duplicates"; this.duplicatesBox.UseVisualStyleBackColor = true; @@ -155,7 +165,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(620, 373); this.Controls.Add(this.introLabel); @@ -174,7 +184,6 @@ private void InitializeComponent() this.Text = "Sort Lists"; this.Load += new System.EventHandler(this.LoadForm); this.optionsBox.ResumeLayout(false); - this.optionsBox.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/OneMore/Commands/Extras/SortDialog.Designer.cs b/OneMore/Commands/Extras/SortDialog.Designer.cs index 70c0e64157..c1e9a7816e 100644 --- a/OneMore/Commands/Extras/SortDialog.Designer.cs +++ b/OneMore/Commands/Extras/SortDialog.Designer.cs @@ -56,12 +56,12 @@ private void InitializeComponent() this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(376, 402); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(120, 38); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.Cancel); // @@ -74,12 +74,12 @@ private void InitializeComponent() this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(245, 402); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(120, 38); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.OK); // @@ -125,7 +125,6 @@ private void InitializeComponent() // scopeLabel // this.scopeLabel.AutoSize = true; - this.scopeLabel.BackColor = System.Drawing.SystemColors.Control; this.scopeLabel.ForeColor = System.Drawing.SystemColors.ControlText; this.scopeLabel.Location = new System.Drawing.Point(18, 43); this.scopeLabel.Name = "scopeLabel"; @@ -157,7 +156,6 @@ private void InitializeComponent() // sortLabel // this.sortLabel.AutoSize = true; - this.sortLabel.BackColor = System.Drawing.SystemColors.Control; this.sortLabel.ForeColor = System.Drawing.SystemColors.ControlText; this.sortLabel.Location = new System.Drawing.Point(18, 96); this.sortLabel.Name = "sortLabel"; @@ -168,7 +166,6 @@ private void InitializeComponent() // directionLabel // this.directionLabel.AutoSize = true; - this.directionLabel.BackColor = System.Drawing.SystemColors.Control; this.directionLabel.ForeColor = System.Drawing.SystemColors.ControlText; this.directionLabel.Location = new System.Drawing.Point(22, 212); this.directionLabel.Name = "directionLabel"; @@ -210,7 +207,6 @@ private void InitializeComponent() // // pinNotesBox // - this.pinNotesBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.pinNotesBox.Checked = true; this.pinNotesBox.CheckState = System.Windows.Forms.CheckState.Checked; this.pinNotesBox.Cursor = System.Windows.Forms.Cursors.Hand; @@ -227,7 +223,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(508, 452); this.Controls.Add(this.pinNotesBox); diff --git a/OneMore/Commands/Favorites/FavoritesDialog.Designer.cs b/OneMore/Commands/Favorites/FavoritesDialog.Designer.cs index dca0b01333..bdc4d6632e 100644 --- a/OneMore/Commands/Favorites/FavoritesDialog.Designer.cs +++ b/OneMore/Commands/Favorites/FavoritesDialog.Designer.cs @@ -95,7 +95,7 @@ private void InitializeComponent() // // buttonPanel // - this.buttonPanel.BackColor = System.Drawing.SystemColors.Control; + this.buttonPanel.BackColor = System.Drawing.SystemColors.ControlLight; this.buttonPanel.Controls.Add(this.goButton); this.buttonPanel.Controls.Add(this.cancelButton); this.buttonPanel.Dock = System.Windows.Forms.DockStyle.Bottom; @@ -109,7 +109,9 @@ private void InitializeComponent() // goButton // this.goButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.goButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.goButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.goButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.goButton.ImageOver = null; this.goButton.Location = new System.Drawing.Point(518, 11); this.goButton.Name = "goButton"; @@ -117,13 +119,17 @@ private void InitializeComponent() this.goButton.Size = new System.Drawing.Size(120, 38); this.goButton.TabIndex = 0; this.goButton.Text = "Go"; + this.goButton.ThemedBack = null; + this.goButton.ThemedFore = null; this.goButton.UseVisualStyleBackColor = true; this.goButton.Click += new System.EventHandler(this.ChooseByClick); // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(644, 11); this.cancelButton.Name = "cancelButton"; @@ -131,11 +137,13 @@ private void InitializeComponent() this.cancelButton.Size = new System.Drawing.Size(120, 38); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // searchPanel // - this.searchPanel.BackColor = System.Drawing.SystemColors.Control; + this.searchPanel.BackColor = System.Drawing.SystemColors.ControlLight; this.searchPanel.Controls.Add(this.menuButton); this.searchPanel.Controls.Add(this.searchBox); this.searchPanel.Controls.Add(this.searchLabel); @@ -150,6 +158,7 @@ private void InitializeComponent() // menuButton // this.menuButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.menuButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.menuButton.FlatAppearance.BorderSize = 0; this.menuButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.menuButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -161,6 +170,8 @@ private void InitializeComponent() this.menuButton.Size = new System.Drawing.Size(50, 38); this.menuButton.TabIndex = 1; this.menuButton.Text = "•••"; + this.menuButton.ThemedBack = null; + this.menuButton.ThemedFore = null; this.menuButton.UseVisualStyleBackColor = true; this.menuButton.Click += new System.EventHandler(this.ShowMenu); // @@ -174,6 +185,8 @@ private void InitializeComponent() this.searchBox.Name = "searchBox"; this.searchBox.Size = new System.Drawing.Size(566, 28); this.searchBox.TabIndex = 0; + this.searchBox.ThemedBack = null; + this.searchBox.ThemedFore = null; this.searchBox.KeyUp += new System.Windows.Forms.KeyEventHandler(this.FilterRowOnKeyUp); // // searchLabel diff --git a/OneMore/Commands/File/AnalyzeDialog.Designer.cs b/OneMore/Commands/File/AnalyzeDialog.Designer.cs index e1d83d2e8c..8690023fbf 100644 --- a/OneMore/Commands/File/AnalyzeDialog.Designer.cs +++ b/OneMore/Commands/File/AnalyzeDialog.Designer.cs @@ -52,12 +52,12 @@ private void InitializeComponent() this.okButton.Location = new System.Drawing.Point(270, 307); this.okButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(112, 35); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // cancelButton @@ -70,17 +70,16 @@ private void InitializeComponent() this.cancelButton.Location = new System.Drawing.Point(390, 307); this.cancelButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(112, 35); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // notebookBox // - this.notebookBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.notebookBox.Checked = true; this.notebookBox.CheckState = System.Windows.Forms.CheckState.Checked; this.notebookBox.Cursor = System.Windows.Forms.Cursors.Hand; @@ -95,7 +94,6 @@ private void InitializeComponent() // // sectionBox // - this.sectionBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.sectionBox.Checked = true; this.sectionBox.CheckState = System.Windows.Forms.CheckState.Checked; this.sectionBox.Cursor = System.Windows.Forms.Cursors.Hand; @@ -174,11 +172,11 @@ private void InitializeComponent() this.warningLabel.ForeColor = System.Drawing.Color.Maroon; this.warningLabel.Location = new System.Drawing.Point(152, 259); this.warningLabel.Name = "warningLabel"; - this.warningLabel.ThemedBack = null; - this.warningLabel.ThemedFore = "ErrorText"; this.warningLabel.Size = new System.Drawing.Size(186, 20); this.warningLabel.TabIndex = 14; this.warningLabel.Text = "Report may take minutes"; + this.warningLabel.ThemedBack = null; + this.warningLabel.ThemedFore = "ErrorText"; this.warningLabel.Visible = false; // // AnalyzeDialog @@ -186,6 +184,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(521, 362); this.Controls.Add(this.warningLabel); diff --git a/OneMore/Commands/File/CrawlWebPageDialog.Designer.cs b/OneMore/Commands/File/CrawlWebPageDialog.Designer.cs index adf8a250bc..9930de3efa 100644 --- a/OneMore/Commands/File/CrawlWebPageDialog.Designer.cs +++ b/OneMore/Commands/File/CrawlWebPageDialog.Designer.cs @@ -163,6 +163,7 @@ private void InitializeComponent() // // introBox // + this.introBox.BackColor = System.Drawing.SystemColors.ControlLight; this.introBox.BorderStyle = System.Windows.Forms.BorderStyle.None; this.introBox.Dock = System.Windows.Forms.DockStyle.Top; this.introBox.Location = new System.Drawing.Point(20, 20); @@ -172,7 +173,7 @@ private void InitializeComponent() this.introBox.Size = new System.Drawing.Size(1153, 62); this.introBox.TabIndex = 15; this.introBox.Text = "Select links to import as sub-pages. These will be relinked to from this page."; - this.introBox.ThemedBack = null; + this.introBox.ThemedBack = "ControlLight"; this.introBox.ThemedFore = null; // // gridView @@ -250,6 +251,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(1188, 544); this.Controls.Add(this.gridView); diff --git a/OneMore/Commands/File/ExportDialog.Designer.cs b/OneMore/Commands/File/ExportDialog.Designer.cs index 11d8b1eba9..c645add1da 100644 --- a/OneMore/Commands/File/ExportDialog.Designer.cs +++ b/OneMore/Commands/File/ExportDialog.Designer.cs @@ -160,7 +160,7 @@ private void InitializeComponent() // this.browseButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.browseButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.browseButton.Image = ((System.Drawing.Image)(resources.GetObject("browseButton.Image"))); + this.browseButton.Image = global::River.OneMoreAddIn.Properties.Resources.m_FileOpen; this.browseButton.ImageOver = null; this.browseButton.Location = new System.Drawing.Point(512, 40); this.browseButton.Name = "browseButton"; @@ -212,7 +212,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(715, 327); this.Controls.Add(this.okButton); diff --git a/OneMore/Commands/File/ExportDialog.cs b/OneMore/Commands/File/ExportDialog.cs index 9bc214dd22..aa0658f090 100644 --- a/OneMore/Commands/File/ExportDialog.cs +++ b/OneMore/Commands/File/ExportDialog.cs @@ -79,6 +79,21 @@ public OneNote.ExportFormat Format } + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + + var editor = new ImageEditor { Size = new System.Drawing.Size(16, 16) }; + if (manager.DarkMode) + { + editor.Style = ImageEditor.Stylization.Invert; + } + + using var img = browseButton.Image; + browseButton.Image = editor.Apply(img); + } + + private string LoadDefaultPath() { var provider = new SettingsProvider(); diff --git a/OneMore/Commands/File/ExportDialog.resx b/OneMore/Commands/File/ExportDialog.resx index 363b1b02a0..cf28135ec8 100644 --- a/OneMore/Commands/File/ExportDialog.resx +++ b/OneMore/Commands/File/ExportDialog.resx @@ -118,17 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAAAd0SU1FB9ULGg0YMGpJmnAAAAAZdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAu - MjHxIGmVAAABBElEQVQ4T6WRsRGDMAxFPQU7ULtiCNbwCmxAnYo7j5AiDRMwgHsq5qBU9KUYGzDkcine - nbH9voRsiOgviptHlmWhYRgE7wNN00TrugpF4YhznkIIvNRvBM3zTNiX9NfzcSIXjuAMsgToZc/7EADW - /jYkyluASkkWgtt1lGbg+DyFZQG5rAElvgbgd0BePSd20ve9hGmAzCCJ2sEV2klgGUEpgMFaBpq1fMby - VcsDtPKU8qaQ99XLYsSzHGexBdxX/8hcOXhDzmp1CcAwrqvnosqo7hyfxVdAK1odgzGXSNuQufo4jvsA - 0HUdX3CSjgG1bUtN05Bloa5rEaqq2sTI7uN3yLwBpM724PGQQrAAAAAASUVORK5CYII= - - AAABABIAICAAAAEACACoCAAAJgEAABAQAAABAAgAaAUAAM4JAABAQAAAAQAIACgWAAA2DwAAMDAAAAEA diff --git a/OneMore/Commands/File/ImportDialog.Designer.cs b/OneMore/Commands/File/ImportDialog.Designer.cs index 7aaeb9d336..e62ed9f397 100644 --- a/OneMore/Commands/File/ImportDialog.Designer.cs +++ b/OneMore/Commands/File/ImportDialog.Designer.cs @@ -68,55 +68,61 @@ private void InitializeComponent() this.pathBox.Location = new System.Drawing.Point(62, 54); this.pathBox.Margin = new System.Windows.Forms.Padding(3, 3, 3, 15); this.pathBox.Name = "pathBox"; - this.pathBox.ThemedBack = null; - this.pathBox.ThemedFore = null; this.pathBox.Size = new System.Drawing.Size(449, 26); this.pathBox.TabIndex = 1; + this.pathBox.ThemedBack = null; + this.pathBox.ThemedFore = null; this.pathBox.TextChanged += new System.EventHandler(this.ChangePath); // // browseButton // - this.browseButton.Image = ((System.Drawing.Image)(resources.GetObject("browseButton.Image"))); + this.browseButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.browseButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.browseButton.Image = global::River.OneMoreAddIn.Properties.Resources.m_FileOpen; this.browseButton.ImageOver = null; this.browseButton.Location = new System.Drawing.Point(517, 54); this.browseButton.Name = "browseButton"; - this.browseButton.ThemedBack = null; - this.browseButton.ThemedFore = null; this.browseButton.ShowBorder = false; this.browseButton.Size = new System.Drawing.Size(44, 26); this.browseButton.TabIndex = 4; + this.browseButton.ThemedBack = null; + this.browseButton.ThemedFore = null; this.browseButton.UseVisualStyleBackColor = true; this.browseButton.Click += new System.EventHandler(this.BrowseFile); // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(462, 261); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 38); this.cancelButton.TabIndex = 6; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.okButton.Enabled = false; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(356, 261); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 38); this.okButton.TabIndex = 7; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // wordGroup @@ -134,10 +140,11 @@ private void InitializeComponent() // // wordCreateButton // + this.wordCreateButton.Cursor = System.Windows.Forms.Cursors.Hand; this.wordCreateButton.ForeColor = System.Drawing.SystemColors.ControlText; this.wordCreateButton.Location = new System.Drawing.Point(40, 67); this.wordCreateButton.Name = "wordCreateButton"; - this.wordCreateButton.Size = new System.Drawing.Size(156, 24); + this.wordCreateButton.Size = new System.Drawing.Size(160, 25); this.wordCreateButton.TabIndex = 10; this.wordCreateButton.TabStop = true; this.wordCreateButton.Text = "Create new page"; @@ -145,13 +152,13 @@ private void InitializeComponent() // // wordAppendButton // - this.wordAppendButton.AutoSize = true; this.wordAppendButton.Checked = true; + this.wordAppendButton.Cursor = System.Windows.Forms.Cursors.Hand; this.wordAppendButton.ForeColor = System.Drawing.SystemColors.ControlText; this.wordAppendButton.Location = new System.Drawing.Point(40, 32); this.wordAppendButton.Margin = new System.Windows.Forms.Padding(3, 3, 3, 8); this.wordAppendButton.Name = "wordAppendButton"; - this.wordAppendButton.Size = new System.Drawing.Size(177, 24); + this.wordAppendButton.Size = new System.Drawing.Size(181, 25); this.wordAppendButton.TabIndex = 9; this.wordAppendButton.TabStop = true; this.wordAppendButton.Text = "Append to this page"; @@ -173,10 +180,11 @@ private void InitializeComponent() // // powerCreateButton // + this.powerCreateButton.Cursor = System.Windows.Forms.Cursors.Hand; this.powerCreateButton.Location = new System.Drawing.Point(40, 67); this.powerCreateButton.Margin = new System.Windows.Forms.Padding(3, 3, 3, 8); this.powerCreateButton.Name = "powerCreateButton"; - this.powerCreateButton.Size = new System.Drawing.Size(156, 24); + this.powerCreateButton.Size = new System.Drawing.Size(160, 25); this.powerCreateButton.TabIndex = 1; this.powerCreateButton.TabStop = true; this.powerCreateButton.Text = "Create new page"; @@ -185,10 +193,11 @@ private void InitializeComponent() // powerAppendButton // this.powerAppendButton.Checked = true; + this.powerAppendButton.Cursor = System.Windows.Forms.Cursors.Hand; this.powerAppendButton.Location = new System.Drawing.Point(40, 32); this.powerAppendButton.Margin = new System.Windows.Forms.Padding(3, 3, 3, 8); this.powerAppendButton.Name = "powerAppendButton"; - this.powerAppendButton.Size = new System.Drawing.Size(177, 24); + this.powerAppendButton.Size = new System.Drawing.Size(181, 25); this.powerAppendButton.TabIndex = 0; this.powerAppendButton.TabStop = true; this.powerAppendButton.Text = "Append to this page"; @@ -196,9 +205,10 @@ private void InitializeComponent() // // powerSectionButton // + this.powerSectionButton.Cursor = System.Windows.Forms.Cursors.Hand; this.powerSectionButton.Location = new System.Drawing.Point(40, 101); this.powerSectionButton.Name = "powerSectionButton"; - this.powerSectionButton.Size = new System.Drawing.Size(353, 24); + this.powerSectionButton.Size = new System.Drawing.Size(357, 25); this.powerSectionButton.TabIndex = 2; this.powerSectionButton.TabStop = true; this.powerSectionButton.Text = "Create a new section with a page each slide"; @@ -219,9 +229,10 @@ private void InitializeComponent() // pdfCreateButton // this.pdfCreateButton.Checked = true; + this.pdfCreateButton.Cursor = System.Windows.Forms.Cursors.Hand; this.pdfCreateButton.Location = new System.Drawing.Point(40, 67); this.pdfCreateButton.Name = "pdfCreateButton"; - this.pdfCreateButton.Size = new System.Drawing.Size(156, 24); + this.pdfCreateButton.Size = new System.Drawing.Size(160, 25); this.pdfCreateButton.TabIndex = 10; this.pdfCreateButton.TabStop = true; this.pdfCreateButton.Text = "Create new page"; @@ -229,10 +240,11 @@ private void InitializeComponent() // // pdfAppendButton // + this.pdfAppendButton.Cursor = System.Windows.Forms.Cursors.Hand; this.pdfAppendButton.Location = new System.Drawing.Point(40, 32); this.pdfAppendButton.Margin = new System.Windows.Forms.Padding(3, 3, 3, 8); this.pdfAppendButton.Name = "pdfAppendButton"; - this.pdfAppendButton.Size = new System.Drawing.Size(177, 24); + this.pdfAppendButton.Size = new System.Drawing.Size(181, 25); this.pdfAppendButton.TabIndex = 9; this.pdfAppendButton.TabStop = true; this.pdfAppendButton.Text = "Append to this page"; @@ -254,11 +266,11 @@ private void InitializeComponent() this.notInstalledLabel.ForeColor = System.Drawing.Color.Maroon; this.notInstalledLabel.Location = new System.Drawing.Point(27, 113); this.notInstalledLabel.Name = "notInstalledLabel"; - this.notInstalledLabel.ThemedBack = null; - this.notInstalledLabel.ThemedFore = "ErrorText"; this.notInstalledLabel.Size = new System.Drawing.Size(306, 20); this.notInstalledLabel.TabIndex = 10; this.notInstalledLabel.Text = "The required Office product is not installed"; + this.notInstalledLabel.ThemedBack = null; + this.notInstalledLabel.ThemedFore = "ErrorText"; this.notInstalledLabel.Visible = false; // // errorLabel @@ -267,11 +279,11 @@ private void InitializeComponent() this.errorLabel.ForeColor = System.Drawing.Color.Maroon; this.errorLabel.Location = new System.Drawing.Point(27, 270); this.errorLabel.Name = "errorLabel"; - this.errorLabel.ThemedBack = null; - this.errorLabel.ThemedFore = "ErrorText"; this.errorLabel.Size = new System.Drawing.Size(114, 20); this.errorLabel.TabIndex = 11; this.errorLabel.Text = "Path not found"; + this.errorLabel.ThemedBack = null; + this.errorLabel.ThemedFore = "ErrorText"; this.errorLabel.Visible = false; // // ImportDialog @@ -279,6 +291,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(579, 317); this.Controls.Add(this.errorLabel); @@ -303,7 +316,6 @@ private void InitializeComponent() this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.Text = "Import"; this.wordGroup.ResumeLayout(false); - this.wordGroup.PerformLayout(); this.powerGroup.ResumeLayout(false); this.pdfGroup.ResumeLayout(false); this.ResumeLayout(false); diff --git a/OneMore/Commands/File/ImportDialog.cs b/OneMore/Commands/File/ImportDialog.cs index ae6170bbf8..2923d0836c 100644 --- a/OneMore/Commands/File/ImportDialog.cs +++ b/OneMore/Commands/File/ImportDialog.cs @@ -110,6 +110,21 @@ public bool AppendToPage public bool CreateSection => powerSectionButton.Checked; + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + + var editor = new ImageEditor { Size = new System.Drawing.Size(16, 16) }; + if (manager.DarkMode) + { + editor.Style = ImageEditor.Stylization.Invert; + } + + using var img = browseButton.Image; + browseButton.Image = editor.Apply(img); + } + + private void ChangePath(object sender, EventArgs e) { try diff --git a/OneMore/Commands/File/ImportDialog.resx b/OneMore/Commands/File/ImportDialog.resx index baa380fc7a..cf28135ec8 100644 --- a/OneMore/Commands/File/ImportDialog.resx +++ b/OneMore/Commands/File/ImportDialog.resx @@ -118,17 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAAd0SU1FB9ULGg0YMGpJmnAAAAAZdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAu - MjHxIGmVAAABBElEQVQ4T6WRsRGDMAxFPQU7ULtiCNbwCmxAnYo7j5AiDRMwgHsq5qBU9KUYGzDkcine - nbH9voRsiOgviptHlmWhYRgE7wNN00TrugpF4YhznkIIvNRvBM3zTNiX9NfzcSIXjuAMsgToZc/7EADW - /jYkyluASkkWgtt1lGbg+DyFZQG5rAElvgbgd0BePSd20ve9hGmAzCCJ2sEV2klgGUEpgMFaBpq1fMby - VcsDtPKU8qaQ99XLYsSzHGexBdxX/8hcOXhDzmp1CcAwrqvnosqo7hyfxVdAK1odgzGXSNuQufo4jvsA - 0HUdX3CSjgG1bUtN05Bloa5rEaqq2sTI7uN3yLwBpM724PGQQrAAAAAASUVORK5CYII= - - AAABABIAICAAAAEACACoCAAAJgEAABAQAAABAAgAaAUAAM4JAABAQAAAAQAIACgWAAA2DwAAMDAAAAEA diff --git a/OneMore/Commands/File/ImportWebDialog.Designer.cs b/OneMore/Commands/File/ImportWebDialog.Designer.cs index 3137721a97..3b371ebf76 100644 --- a/OneMore/Commands/File/ImportWebDialog.Designer.cs +++ b/OneMore/Commands/File/ImportWebDialog.Designer.cs @@ -56,62 +56,66 @@ private void InitializeComponent() this.addressBox.Location = new System.Drawing.Point(92, 27); this.addressBox.Margin = new System.Windows.Forms.Padding(3, 3, 3, 15); this.addressBox.Name = "addressBox"; - this.addressBox.ThemedBack = null; - this.addressBox.ThemedFore = null; this.addressBox.Size = new System.Drawing.Size(691, 26); this.addressBox.TabIndex = 1; + this.addressBox.ThemedBack = null; + this.addressBox.ThemedFore = null; this.addressBox.TextChanged += new System.EventHandler(this.ConfirmAddress); // // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.okButton.Enabled = false; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(577, 210); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 38); this.okButton.TabIndex = 9; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(683, 210); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 38); this.cancelButton.TabIndex = 8; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // appendButton // - this.appendButton.AutoSize = true; + this.appendButton.Cursor = System.Windows.Forms.Cursors.Hand; this.appendButton.ForeColor = System.Drawing.SystemColors.ControlText; this.appendButton.Location = new System.Drawing.Point(92, 171); this.appendButton.Name = "appendButton"; - this.appendButton.Size = new System.Drawing.Size(202, 24); + this.appendButton.Size = new System.Drawing.Size(207, 25); this.appendButton.TabIndex = 10; this.appendButton.Text = "Append to current page"; this.appendButton.UseVisualStyleBackColor = true; // // newPageButton // - this.newPageButton.AutoSize = true; this.newPageButton.Checked = true; + this.newPageButton.Cursor = System.Windows.Forms.Cursors.Hand; this.newPageButton.ForeColor = System.Drawing.SystemColors.ControlText; this.newPageButton.Location = new System.Drawing.Point(92, 111); this.newPageButton.Name = "newPageButton"; - this.newPageButton.Size = new System.Drawing.Size(176, 24); + this.newPageButton.Size = new System.Drawing.Size(182, 25); this.newPageButton.TabIndex = 11; this.newPageButton.TabStop = true; this.newPageButton.Text = "Create as new page"; @@ -119,22 +123,22 @@ private void InitializeComponent() // // newChildButton // - this.newChildButton.AutoSize = true; + this.newChildButton.Cursor = System.Windows.Forms.Cursors.Hand; this.newChildButton.ForeColor = System.Drawing.SystemColors.ControlText; this.newChildButton.Location = new System.Drawing.Point(92, 141); this.newChildButton.Name = "newChildButton"; - this.newChildButton.Size = new System.Drawing.Size(284, 24); + this.newChildButton.Size = new System.Drawing.Size(295, 25); this.newChildButton.TabIndex = 12; this.newChildButton.Text = "Create as new child of current page"; this.newChildButton.UseVisualStyleBackColor = true; // // imagesBox // - this.imagesBox.AutoSize = true; + this.imagesBox.Cursor = System.Windows.Forms.Cursors.Hand; this.imagesBox.ForeColor = System.Drawing.SystemColors.ControlText; this.imagesBox.Location = new System.Drawing.Point(92, 71); this.imagesBox.Name = "imagesBox"; - this.imagesBox.Size = new System.Drawing.Size(199, 24); + this.imagesBox.Size = new System.Drawing.Size(204, 25); this.imagesBox.TabIndex = 13; this.imagesBox.Text = "Import as static images"; this.imagesBox.UseVisualStyleBackColor = true; @@ -144,6 +148,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(801, 266); this.Controls.Add(this.imagesBox); diff --git a/OneMore/Commands/File/PluginDialog.Designer.cs b/OneMore/Commands/File/PluginDialog.Designer.cs index f3321d88c9..8becf9b712 100644 --- a/OneMore/Commands/File/PluginDialog.Designer.cs +++ b/OneMore/Commands/File/PluginDialog.Designer.cs @@ -72,12 +72,12 @@ private void InitializeComponent() this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(640, 503); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(120, 35); this.cancelButton.TabIndex = 12; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // okButton @@ -90,12 +90,12 @@ private void InitializeComponent() this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(514, 503); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(120, 35); this.okButton.TabIndex = 11; this.okButton.Text = "Run"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.OK); // @@ -114,10 +114,10 @@ private void InitializeComponent() this.cmdBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.cmdBox.Location = new System.Drawing.Point(140, 123); this.cmdBox.Name = "cmdBox"; - this.cmdBox.ThemedBack = null; - this.cmdBox.ThemedFore = null; this.cmdBox.Size = new System.Drawing.Size(578, 26); this.cmdBox.TabIndex = 2; + this.cmdBox.ThemedBack = null; + this.cmdBox.ThemedFore = null; this.cmdBox.TextChanged += new System.EventHandler(this.ChangeText); // // browseButton @@ -127,12 +127,12 @@ private void InitializeComponent() this.browseButton.ImageOver = null; this.browseButton.Location = new System.Drawing.Point(724, 122); this.browseButton.Name = "browseButton"; - this.browseButton.ThemedBack = null; - this.browseButton.ThemedFore = null; this.browseButton.ShowBorder = true; this.browseButton.Size = new System.Drawing.Size(36, 31); this.browseButton.TabIndex = 3; this.browseButton.Text = "..."; + this.browseButton.ThemedBack = null; + this.browseButton.ThemedFore = null; this.browseButton.UseVisualStyleBackColor = true; this.browseButton.Click += new System.EventHandler(this.BrowsePath); // @@ -165,10 +165,10 @@ private void InitializeComponent() this.pageNameBox.Enabled = false; this.pageNameBox.Location = new System.Drawing.Point(31, 85); this.pageNameBox.Name = "pageNameBox"; - this.pageNameBox.ThemedBack = null; - this.pageNameBox.ThemedFore = null; this.pageNameBox.Size = new System.Drawing.Size(469, 26); this.pageNameBox.TabIndex = 8; + this.pageNameBox.ThemedBack = null; + this.pageNameBox.ThemedFore = null; this.pageNameBox.TextChanged += new System.EventHandler(this.ChangeText); // // childBox @@ -190,10 +190,10 @@ private void InitializeComponent() this.argsBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.argsBox.Location = new System.Drawing.Point(140, 169); this.argsBox.Name = "argsBox"; - this.argsBox.ThemedBack = null; - this.argsBox.ThemedFore = null; this.argsBox.Size = new System.Drawing.Size(578, 26); this.argsBox.TabIndex = 4; + this.argsBox.ThemedBack = null; + this.argsBox.ThemedFore = null; this.argsBox.TextChanged += new System.EventHandler(this.ChangeText); // // argsLabel @@ -213,12 +213,12 @@ private void InitializeComponent() this.browseArgsButton.ImageOver = null; this.browseArgsButton.Location = new System.Drawing.Point(724, 168); this.browseArgsButton.Name = "browseArgsButton"; - this.browseArgsButton.ThemedBack = null; - this.browseArgsButton.ThemedFore = null; this.browseArgsButton.ShowBorder = true; this.browseArgsButton.Size = new System.Drawing.Size(36, 31); this.browseArgsButton.TabIndex = 5; this.browseArgsButton.Text = "..."; + this.browseArgsButton.ThemedBack = null; + this.browseArgsButton.ThemedFore = null; this.browseArgsButton.UseVisualStyleBackColor = true; this.browseArgsButton.Click += new System.EventHandler(this.BrowsePath); // @@ -231,12 +231,12 @@ private void InitializeComponent() this.saveButton.ImageOver = null; this.saveButton.Location = new System.Drawing.Point(388, 503); this.saveButton.Name = "saveButton"; - this.saveButton.ThemedBack = null; - this.saveButton.ThemedFore = null; this.saveButton.ShowBorder = true; this.saveButton.Size = new System.Drawing.Size(120, 35); this.saveButton.TabIndex = 10; this.saveButton.Text = "Save"; + this.saveButton.ThemedBack = null; + this.saveButton.ThemedFore = null; this.saveButton.UseVisualStyleBackColor = true; this.saveButton.Click += new System.EventHandler(this.SavePlugin); // @@ -277,10 +277,10 @@ private void InitializeComponent() this.nameBox.Location = new System.Drawing.Point(140, 78); this.nameBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.nameBox.Name = "nameBox"; - this.nameBox.ThemedBack = null; - this.nameBox.ThemedFore = null; this.nameBox.Size = new System.Drawing.Size(578, 26); this.nameBox.TabIndex = 1; + this.nameBox.ThemedBack = null; + this.nameBox.ThemedFore = null; this.nameBox.TextChanged += new System.EventHandler(this.ChangeText); // // errorBox @@ -397,6 +397,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(778, 559); this.Controls.Add(this.sectionGroup); diff --git a/OneMore/Commands/Images/AdjustImagesDialog.Designer.cs b/OneMore/Commands/Images/AdjustImagesDialog.Designer.cs index 72d3ee1374..269a02d549 100644 --- a/OneMore/Commands/Images/AdjustImagesDialog.Designer.cs +++ b/OneMore/Commands/Images/AdjustImagesDialog.Designer.cs @@ -361,7 +361,6 @@ private void InitializeComponent() // // preserveBox // - this.preserveBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); this.preserveBox.Checked = true; this.preserveBox.CheckState = System.Windows.Forms.CheckState.Checked; this.preserveBox.Cursor = System.Windows.Forms.Cursors.Hand; @@ -694,7 +693,6 @@ private void InitializeComponent() // // repositionBox // - this.repositionBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); this.repositionBox.Checked = true; this.repositionBox.CheckState = System.Windows.Forms.CheckState.Checked; this.repositionBox.Cursor = System.Windows.Forms.Cursors.Hand; @@ -744,7 +742,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Window; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(1122, 728); this.Controls.Add(this.autoSizeRadio); diff --git a/OneMore/Commands/Images/CropImageDialog.Designer.cs b/OneMore/Commands/Images/CropImageDialog.Designer.cs index 37e8fb134d..e5562b48ac 100644 --- a/OneMore/Commands/Images/CropImageDialog.Designer.cs +++ b/OneMore/Commands/Images/CropImageDialog.Designer.cs @@ -92,6 +92,7 @@ private void InitializeComponent() // // introPanel // + this.introPanel.BackColor = System.Drawing.SystemColors.ControlLight; this.introPanel.Controls.Add(this.introText); this.introPanel.Dock = System.Windows.Forms.DockStyle.Top; this.introPanel.Location = new System.Drawing.Point(0, 0); @@ -104,7 +105,6 @@ private void InitializeComponent() // this.introText.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.introText.BackColor = System.Drawing.SystemColors.Control; this.introText.ForeColor = System.Drawing.SystemColors.ControlText; this.introText.Location = new System.Drawing.Point(13, 12); this.introText.Name = "introText"; @@ -115,6 +115,7 @@ private void InitializeComponent() // // buttonPanel // + this.buttonPanel.BackColor = System.Drawing.SystemColors.ControlLight; this.buttonPanel.Controls.Add(this.rotationBox); this.buttonPanel.Controls.Add(this.rotationBar); this.buttonPanel.Controls.Add(this.selectButton); @@ -155,47 +156,53 @@ private void InitializeComponent() // // selectButton // + this.selectButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.selectButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.selectButton.ImageOver = null; this.selectButton.Location = new System.Drawing.Point(12, 9); this.selectButton.Name = "selectButton"; - this.selectButton.ThemedBack = null; - this.selectButton.ThemedFore = null; this.selectButton.ShowBorder = true; this.selectButton.Size = new System.Drawing.Size(120, 40); this.selectButton.TabIndex = 4; this.selectButton.Text = "Select All"; + this.selectButton.ThemedBack = null; + this.selectButton.ThemedFore = null; this.selectButton.UseVisualStyleBackColor = true; this.selectButton.Click += new System.EventHandler(this.SelectButton_Click); // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(1373, 9); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(103, 40); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // cropButton // this.cropButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.cropButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cropButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.cropButton.Enabled = false; + this.cropButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cropButton.ImageOver = null; this.cropButton.Location = new System.Drawing.Point(1265, 9); this.cropButton.Name = "cropButton"; - this.cropButton.ThemedBack = null; - this.cropButton.ThemedFore = null; this.cropButton.ShowBorder = true; this.cropButton.Size = new System.Drawing.Size(102, 40); this.cropButton.TabIndex = 0; this.cropButton.Text = "OK"; + this.cropButton.ThemedBack = null; + this.cropButton.ThemedFore = null; this.cropButton.UseVisualStyleBackColor = true; this.cropButton.Click += new System.EventHandler(this.CropButton_Click); // diff --git a/OneMore/Commands/Images/StylizeImagesDialog.Designer.cs b/OneMore/Commands/Images/StylizeImagesDialog.Designer.cs index 66e017c866..01735ba658 100644 --- a/OneMore/Commands/Images/StylizeImagesDialog.Designer.cs +++ b/OneMore/Commands/Images/StylizeImagesDialog.Designer.cs @@ -46,12 +46,12 @@ private void InitializeComponent() this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(261, 270); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 38); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.OK); // @@ -64,12 +64,12 @@ private void InitializeComponent() this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(367, 270); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 38); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // styleLabel @@ -99,7 +99,6 @@ private void InitializeComponent() // // foreBox // - this.foreBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.foreBox.Cursor = System.Windows.Forms.Cursors.Hand; this.foreBox.ForeColor = System.Drawing.SystemColors.ControlText; this.foreBox.Location = new System.Drawing.Point(44, 24); @@ -113,7 +112,6 @@ private void InitializeComponent() // // backBox // - this.backBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.backBox.Cursor = System.Windows.Forms.Cursors.Hand; this.backBox.ForeColor = System.Drawing.SystemColors.ControlText; this.backBox.Location = new System.Drawing.Point(44, 103); @@ -130,7 +128,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(479, 320); this.Controls.Add(this.backBox); diff --git a/OneMore/Commands/Numbering/NumberPagesDialog.Designer.cs b/OneMore/Commands/Numbering/NumberPagesDialog.Designer.cs index 78a6d63493..e99bf57c99 100644 --- a/OneMore/Commands/Numbering/NumberPagesDialog.Designer.cs +++ b/OneMore/Commands/Numbering/NumberPagesDialog.Designer.cs @@ -43,32 +43,36 @@ private void InitializeComponent() // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(264, 269); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 38); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(370, 269); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 38); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); // @@ -102,33 +106,37 @@ private void InitializeComponent() // // cleanBox // + this.cleanBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.cleanBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.cleanBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cleanBox.Location = new System.Drawing.Point(25, 180); this.cleanBox.Name = "cleanBox"; this.cleanBox.Padding = new System.Windows.Forms.Padding(0, 9, 0, 0); - this.cleanBox.Size = new System.Drawing.Size(301, 24); + this.cleanBox.Size = new System.Drawing.Size(302, 25); this.cleanBox.TabIndex = 3; this.cleanBox.Text = "Remove/cleanup existing numbering"; this.cleanBox.UseVisualStyleBackColor = true; // // alphaDemoBox // - this.alphaDemoBox.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.alphaDemoBox.BackColor = System.Drawing.SystemColors.Window; this.alphaDemoBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.alphaDemoBox.ForeColor = System.Drawing.SystemColors.ControlText; this.alphaDemoBox.Location = new System.Drawing.Point(82, 98); this.alphaDemoBox.Name = "alphaDemoBox"; - this.alphaDemoBox.ThemedBack = "ControlLightLight"; - this.alphaDemoBox.ThemedFore = "ControlText"; this.alphaDemoBox.Size = new System.Drawing.Size(128, 67); this.alphaDemoBox.TabIndex = 15; this.alphaDemoBox.Text = "1.\r\n a.\r\n i."; + this.alphaDemoBox.ThemedBack = "ControlLightLight"; + this.alphaDemoBox.ThemedFore = "ControlText"; // // alphaRadio // this.alphaRadio.Checked = true; + this.alphaRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.alphaRadio.Location = new System.Drawing.Point(56, 69); this.alphaRadio.Name = "alphaRadio"; - this.alphaRadio.Size = new System.Drawing.Size(141, 24); + this.alphaRadio.Size = new System.Drawing.Size(142, 25); this.alphaRadio.TabIndex = 1; this.alphaRadio.TabStop = true; this.alphaRadio.Text = "Alpha-numeric"; @@ -136,22 +144,23 @@ private void InitializeComponent() // // numDemoBox // - this.numDemoBox.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.numDemoBox.BackColor = System.Drawing.SystemColors.Window; this.numDemoBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.numDemoBox.ForeColor = System.Drawing.SystemColors.ControlText; this.numDemoBox.Location = new System.Drawing.Point(290, 98); this.numDemoBox.Name = "numDemoBox"; - this.numDemoBox.ThemedBack = "ControlLightLight"; - this.numDemoBox.ThemedFore = "ControlText"; this.numDemoBox.Size = new System.Drawing.Size(128, 67); this.numDemoBox.TabIndex = 16; this.numDemoBox.Text = "1.\r\n 1.1.\r\n 1.1.1."; + this.numDemoBox.ThemedBack = "ControlLightLight"; + this.numDemoBox.ThemedFore = "ControlText"; // // numRadio // + this.numRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.numRadio.Location = new System.Drawing.Point(261, 69); this.numRadio.Name = "numRadio"; - this.numRadio.Size = new System.Drawing.Size(96, 24); + this.numRadio.Size = new System.Drawing.Size(97, 25); this.numRadio.TabIndex = 2; this.numRadio.Text = "Numeric"; this.numRadio.UseVisualStyleBackColor = true; @@ -161,7 +170,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(488, 325); this.Controls.Add(this.numberingGroup); diff --git a/OneMore/Commands/Numbering/OutlineDialog.Designer.cs b/OneMore/Commands/Numbering/OutlineDialog.Designer.cs index ee8e69c6dd..5fab310332 100644 --- a/OneMore/Commands/Numbering/OutlineDialog.Designer.cs +++ b/OneMore/Commands/Numbering/OutlineDialog.Designer.cs @@ -53,33 +53,37 @@ private void InitializeComponent() // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.okButton.Enabled = false; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(262, 432); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 38); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(368, 432); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 38); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // numberingGroup @@ -102,10 +106,13 @@ private void InitializeComponent() // // cleanBox // + this.cleanBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.cleanBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.cleanBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cleanBox.Location = new System.Drawing.Point(26, 178); this.cleanBox.Name = "cleanBox"; this.cleanBox.Padding = new System.Windows.Forms.Padding(0, 9, 0, 0); - this.cleanBox.Size = new System.Drawing.Size(301, 24); + this.cleanBox.Size = new System.Drawing.Size(302, 25); this.cleanBox.TabIndex = 3; this.cleanBox.Text = "Remove/cleanup existing numbering"; this.cleanBox.UseVisualStyleBackColor = true; @@ -118,19 +125,20 @@ private void InitializeComponent() this.alphaDemoBox.ForeColor = System.Drawing.SystemColors.ControlText; this.alphaDemoBox.Location = new System.Drawing.Point(82, 98); this.alphaDemoBox.Name = "alphaDemoBox"; - this.alphaDemoBox.ThemedBack = "ControlLightLight"; - this.alphaDemoBox.ThemedFore = "ControlText"; this.alphaDemoBox.Size = new System.Drawing.Size(128, 67); this.alphaDemoBox.TabIndex = 15; this.alphaDemoBox.Text = "1.\r\n a.\r\n i."; + this.alphaDemoBox.ThemedBack = "ControlLightLight"; + this.alphaDemoBox.ThemedFore = "ControlText"; // // alphaRadio // this.alphaRadio.Checked = true; + this.alphaRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.alphaRadio.Enabled = false; this.alphaRadio.Location = new System.Drawing.Point(56, 69); this.alphaRadio.Name = "alphaRadio"; - this.alphaRadio.Size = new System.Drawing.Size(141, 24); + this.alphaRadio.Size = new System.Drawing.Size(142, 25); this.alphaRadio.TabIndex = 1; this.alphaRadio.TabStop = true; this.alphaRadio.Text = "Alpha-numeric"; @@ -143,28 +151,32 @@ private void InitializeComponent() this.numDemoBox.ForeColor = System.Drawing.SystemColors.ControlText; this.numDemoBox.Location = new System.Drawing.Point(290, 98); this.numDemoBox.Name = "numDemoBox"; - this.numDemoBox.ThemedBack = "ControlLightLight"; - this.numDemoBox.ThemedFore = "ControlText"; this.numDemoBox.Size = new System.Drawing.Size(128, 67); this.numDemoBox.TabIndex = 13; this.numDemoBox.Text = "1.\r\n 1.1.\r\n 1.1.1."; + this.numDemoBox.ThemedBack = "ControlLightLight"; + this.numDemoBox.ThemedFore = "ControlText"; // // numRadio // + this.numRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.numRadio.Enabled = false; this.numRadio.Location = new System.Drawing.Point(261, 69); this.numRadio.Name = "numRadio"; - this.numRadio.Size = new System.Drawing.Size(96, 24); + this.numRadio.Size = new System.Drawing.Size(97, 25); this.numRadio.TabIndex = 2; this.numRadio.Text = "Numeric"; this.numRadio.UseVisualStyleBackColor = true; // // numberingBox // + this.numberingBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.numberingBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.numberingBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.numberingBox.Location = new System.Drawing.Point(26, 34); this.numberingBox.Name = "numberingBox"; this.numberingBox.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0); - this.numberingBox.Size = new System.Drawing.Size(149, 24); + this.numberingBox.Size = new System.Drawing.Size(150, 25); this.numberingBox.TabIndex = 0; this.numberingBox.Text = "Add Numbering"; this.tooltip.SetToolTip(this.numberingBox, "Applies to both standard and custom Headings"); @@ -189,10 +201,13 @@ private void InitializeComponent() // // removeTagsBox // + this.removeTagsBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.removeTagsBox.Cursor = System.Windows.Forms.Cursors.Hand; this.removeTagsBox.Enabled = false; + this.removeTagsBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.removeTagsBox.Location = new System.Drawing.Point(190, 114); this.removeTagsBox.Name = "removeTagsBox"; - this.removeTagsBox.Size = new System.Drawing.Size(131, 24); + this.removeTagsBox.Size = new System.Drawing.Size(132, 25); this.removeTagsBox.TabIndex = 3; this.removeTagsBox.Text = "Remove tags"; this.removeTagsBox.UseVisualStyleBackColor = true; @@ -211,25 +226,29 @@ private void InitializeComponent() // this.tagButton.BackColor = System.Drawing.SystemColors.Window; this.tagButton.Enabled = false; + this.tagButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.tagButton.ImageOver = null; this.tagButton.Location = new System.Drawing.Point(104, 108); this.tagButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tagButton.Name = "tagButton"; - this.tagButton.ThemedBack = null; - this.tagButton.ThemedFore = null; this.tagButton.ShowBorder = true; this.tagButton.Size = new System.Drawing.Size(60, 38); this.tagButton.TabIndex = 2; this.tagButton.Text = "?"; this.tagButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.tagButton.ThemedBack = null; + this.tagButton.ThemedFore = null; this.tagButton.UseVisualStyleBackColor = false; this.tagButton.Click += new System.EventHandler(this.tagButton_Click); // // indentTagBox // + this.indentTagBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.indentTagBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.indentTagBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.indentTagBox.Location = new System.Drawing.Point(26, 74); this.indentTagBox.Name = "indentTagBox"; - this.indentTagBox.Size = new System.Drawing.Size(377, 24); + this.indentTagBox.Size = new System.Drawing.Size(378, 25); this.indentTagBox.TabIndex = 1; this.indentTagBox.Text = "Indent only below tagged headings/paragraphs"; this.tooltip.SetToolTip(this.indentTagBox, "Indents content below only tagged headings or non-heading paragraphs"); @@ -238,10 +257,13 @@ private void InitializeComponent() // // indentBox // + this.indentBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.indentBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.indentBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.indentBox.Location = new System.Drawing.Point(26, 33); this.indentBox.Name = "indentBox"; this.indentBox.Padding = new System.Windows.Forms.Padding(0, 9, 0, 0); - this.indentBox.Size = new System.Drawing.Size(258, 24); + this.indentBox.Size = new System.Drawing.Size(259, 25); this.indentBox.TabIndex = 0; this.indentBox.Text = "Indent content below headings"; this.indentBox.UseVisualStyleBackColor = true; @@ -252,7 +274,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(482, 483); this.Controls.Add(this.indentationsGroup); diff --git a/OneMore/Commands/Page/ArrangeContainersDialog.Designer.cs b/OneMore/Commands/Page/ArrangeContainersDialog.Designer.cs index 76abe1315b..df0412e52e 100644 --- a/OneMore/Commands/Page/ArrangeContainersDialog.Designer.cs +++ b/OneMore/Commands/Page/ArrangeContainersDialog.Designer.cs @@ -53,44 +53,48 @@ private void InitializeComponent() // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(285, 317); this.okButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(112, 35); this.okButton.TabIndex = 6; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.SaveSettingsOnClick); // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(406, 317); this.cancelButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(112, 35); this.cancelButton.TabIndex = 7; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // verticalButton // - this.verticalButton.AutoSize = true; this.verticalButton.Checked = true; - this.verticalButton.Location = new System.Drawing.Point(23, 23); + this.verticalButton.Cursor = System.Windows.Forms.Cursors.Hand; + this.verticalButton.Location = new System.Drawing.Point(33, 23); this.verticalButton.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.verticalButton.Name = "verticalButton"; - this.verticalButton.Size = new System.Drawing.Size(354, 24); + this.verticalButton.Size = new System.Drawing.Size(369, 25); this.verticalButton.TabIndex = 0; this.verticalButton.TabStop = true; this.verticalButton.Text = "Arrange all containers vertically, top to bottom"; @@ -99,11 +103,11 @@ private void InitializeComponent() // // flowButton // - this.flowButton.AutoSize = true; - this.flowButton.Location = new System.Drawing.Point(23, 115); + this.flowButton.Cursor = System.Windows.Forms.Cursors.Hand; + this.flowButton.Location = new System.Drawing.Point(33, 115); this.flowButton.Margin = new System.Windows.Forms.Padding(3, 3, 3, 8); this.flowButton.Name = "flowButton"; - this.flowButton.Size = new System.Drawing.Size(394, 24); + this.flowButton.Size = new System.Drawing.Size(409, 25); this.flowButton.TabIndex = 3; this.flowButton.Text = "Arrange in columns and then rows, fit to page width"; this.flowButton.UseVisualStyleBackColor = true; @@ -175,10 +179,12 @@ private void InitializeComponent() // // setWidthCheckBox // - this.setWidthCheckBox.AutoSize = true; + this.setWidthCheckBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.setWidthCheckBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.setWidthCheckBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.setWidthCheckBox.Location = new System.Drawing.Point(72, 60); this.setWidthCheckBox.Name = "setWidthCheckBox"; - this.setWidthCheckBox.Size = new System.Drawing.Size(76, 24); + this.setWidthCheckBox.Size = new System.Drawing.Size(78, 25); this.setWidthCheckBox.TabIndex = 1; this.setWidthCheckBox.Text = "Width"; this.setWidthCheckBox.UseVisualStyleBackColor = true; @@ -220,7 +226,7 @@ private void InitializeComponent() // indentLabel // this.indentLabel.AutoSize = true; - this.indentLabel.Location = new System.Drawing.Point(3, 22); + this.indentLabel.Location = new System.Drawing.Point(6, 22); this.indentLabel.Name = "indentLabel"; this.indentLabel.Size = new System.Drawing.Size(55, 20); this.indentLabel.TabIndex = 12; @@ -236,6 +242,8 @@ private void InitializeComponent() this.optionsPanel.Name = "optionsPanel"; this.optionsPanel.Size = new System.Drawing.Size(485, 66); this.optionsPanel.TabIndex = 13; + this.optionsPanel.ThemedBack = "ControlLight"; + this.optionsPanel.ThemedFore = null; this.optionsPanel.TopBorderColor = System.Drawing.SystemColors.ActiveBorder; this.optionsPanel.TopBorderSize = 1; // @@ -244,7 +252,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(537, 372); this.Controls.Add(this.optionsPanel); diff --git a/OneMore/Commands/Page/FitGridToTextDialog.Designer.cs b/OneMore/Commands/Page/FitGridToTextDialog.Designer.cs index 5bebaad61c..ab1cd254b3 100644 --- a/OneMore/Commands/Page/FitGridToTextDialog.Designer.cs +++ b/OneMore/Commands/Page/FitGridToTextDialog.Designer.cs @@ -42,43 +42,47 @@ private void InitializeComponent() // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(264, 204); this.okButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(112, 35); this.okButton.TabIndex = 4; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(385, 204); this.cancelButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(112, 35); this.cancelButton.TabIndex = 3; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // autoButton // - this.autoButton.AutoSize = true; this.autoButton.Checked = true; + this.autoButton.Cursor = System.Windows.Forms.Cursors.Hand; this.autoButton.Location = new System.Drawing.Point(23, 23); this.autoButton.Margin = new System.Windows.Forms.Padding(3, 3, 3, 15); this.autoButton.Name = "autoButton"; - this.autoButton.Size = new System.Drawing.Size(391, 24); + this.autoButton.Size = new System.Drawing.Size(405, 25); this.autoButton.TabIndex = 5; this.autoButton.TabStop = true; this.autoButton.Text = "Automatically adjust grid to most common font size"; @@ -87,11 +91,11 @@ private void InitializeComponent() // // customButton // - this.customButton.AutoSize = true; + this.customButton.Cursor = System.Windows.Forms.Cursors.Hand; this.customButton.Location = new System.Drawing.Point(23, 65); this.customButton.Margin = new System.Windows.Forms.Padding(3, 3, 3, 8); this.customButton.Name = "customButton"; - this.customButton.Size = new System.Drawing.Size(171, 24); + this.customButton.Size = new System.Drawing.Size(179, 25); this.customButton.TabIndex = 6; this.customButton.Text = "Customize grid size"; this.customButton.UseVisualStyleBackColor = true; @@ -127,24 +131,25 @@ private void InitializeComponent() // // recommendBox // + this.recommendBox.BackColor = System.Drawing.SystemColors.ControlLight; this.recommendBox.BorderStyle = System.Windows.Forms.BorderStyle.None; this.recommendBox.ForeColor = System.Drawing.SystemColors.ControlText; this.recommendBox.Location = new System.Drawing.Point(62, 138); this.recommendBox.Multiline = true; this.recommendBox.Name = "recommendBox"; - this.recommendBox.ThemedBack = null; - this.recommendBox.ThemedFore = null; this.recommendBox.ReadOnly = true; this.recommendBox.Size = new System.Drawing.Size(432, 52); this.recommendBox.TabIndex = 10; this.recommendBox.Text = "Recommended size for 11pt font is 13.12345"; + this.recommendBox.ThemedBack = "ControlLight"; + this.recommendBox.ThemedFore = null; // // FitGridToTextDialog // this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(509, 252); this.Controls.Add(this.recommendBox); diff --git a/OneMore/Commands/Page/SplitDialog.Designer.cs b/OneMore/Commands/Page/SplitDialog.Designer.cs index 454f696529..efda45477e 100644 --- a/OneMore/Commands/Page/SplitDialog.Designer.cs +++ b/OneMore/Commands/Page/SplitDialog.Designer.cs @@ -84,23 +84,23 @@ private void InitializeComponent() // // byLinksBox // - this.byLinksBox.AutoSize = true; + this.byLinksBox.Cursor = System.Windows.Forms.Cursors.Hand; this.byLinksBox.Location = new System.Drawing.Point(20, 111); this.byLinksBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.byLinksBox.Name = "byLinksBox"; - this.byLinksBox.Size = new System.Drawing.Size(145, 24); + this.byLinksBox.Size = new System.Drawing.Size(154, 25); this.byLinksBox.TabIndex = 1; this.byLinksBox.Text = "Page (wiki) links"; this.byLinksBox.UseVisualStyleBackColor = true; // // byHeading1Box // - this.byHeading1Box.AutoSize = true; this.byHeading1Box.Checked = true; + this.byHeading1Box.Cursor = System.Windows.Forms.Cursors.Hand; this.byHeading1Box.Location = new System.Drawing.Point(20, 40); this.byHeading1Box.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.byHeading1Box.Name = "byHeading1Box"; - this.byHeading1Box.Size = new System.Drawing.Size(107, 24); + this.byHeading1Box.Size = new System.Drawing.Size(110, 25); this.byHeading1Box.TabIndex = 0; this.byHeading1Box.TabStop = true; this.byHeading1Box.Text = "Heading 1"; @@ -109,42 +109,48 @@ private void InitializeComponent() // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(429, 372); this.cancelButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(112, 35); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(308, 372); this.okButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(112, 35); this.okButton.TabIndex = 2; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // taggedBox // - this.taggedBox.AutoSize = true; + this.taggedBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.taggedBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.taggedBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.taggedBox.Location = new System.Drawing.Point(20, 40); this.taggedBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.taggedBox.Name = "taggedBox"; - this.taggedBox.Size = new System.Drawing.Size(310, 24); + this.taggedBox.Size = new System.Drawing.Size(321, 25); this.taggedBox.TabIndex = 4; this.taggedBox.Text = "Apply only to tagged headings and lnks"; this.taggedBox.UseVisualStyleBackColor = true; @@ -180,17 +186,18 @@ private void InitializeComponent() // this.tagButton.BackColor = System.Drawing.SystemColors.Window; this.tagButton.Enabled = false; + this.tagButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.tagButton.ImageOver = null; this.tagButton.Location = new System.Drawing.Point(100, 75); this.tagButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tagButton.Name = "tagButton"; - this.tagButton.ThemedBack = null; - this.tagButton.ThemedFore = null; this.tagButton.ShowBorder = true; this.tagButton.Size = new System.Drawing.Size(60, 38); this.tagButton.TabIndex = 19; this.tagButton.Text = "?"; this.tagButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.tagButton.ThemedBack = null; + this.tagButton.ThemedFore = null; this.tagButton.UseVisualStyleBackColor = false; this.tagButton.Click += new System.EventHandler(this.SetTag); // @@ -199,7 +206,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(561, 428); this.Controls.Add(this.filterGroup); diff --git a/OneMore/Commands/References/LinkDialog.Designer.cs b/OneMore/Commands/References/LinkDialog.Designer.cs index f4953f4d67..759045738a 100644 --- a/OneMore/Commands/References/LinkDialog.Designer.cs +++ b/OneMore/Commands/References/LinkDialog.Designer.cs @@ -31,15 +31,15 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LinkDialog)); - this.okButton = new UI.MoreButton(); - this.cancelButton = new UI.MoreButton(); - this.notebooksRadio = new UI.MoreRadioButton(); - this.notebookRadio = new UI.MoreRadioButton(); - this.sectionRadio = new UI.MoreRadioButton(); - this.groupBox = new UI.MoreGroupBox(); + this.okButton = new River.OneMoreAddIn.UI.MoreButton(); + this.cancelButton = new River.OneMoreAddIn.UI.MoreButton(); + this.notebooksRadio = new River.OneMoreAddIn.UI.MoreRadioButton(); + this.notebookRadio = new River.OneMoreAddIn.UI.MoreRadioButton(); + this.sectionRadio = new River.OneMoreAddIn.UI.MoreRadioButton(); + this.groupBox = new River.OneMoreAddIn.UI.MoreGroupBox(); this.introLabel = new System.Windows.Forms.Label(); - this.synopsisBox = new UI.MoreCheckBox(); - this.unindexedBox = new UI.MoreCheckBox(); + this.synopsisBox = new River.OneMoreAddIn.UI.MoreCheckBox(); + this.unindexedBox = new River.OneMoreAddIn.UI.MoreCheckBox(); this.tooltip = new System.Windows.Forms.ToolTip(this.components); this.groupBox.SuspendLayout(); this.SuspendLayout(); @@ -47,55 +47,67 @@ private void InitializeComponent() // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(311, 335); this.okButton.Name = "okButton"; + this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(120, 38); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(437, 335); this.cancelButton.Name = "cancelButton"; + this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(120, 38); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // notebooksRadio // - this.notebooksRadio.AutoSize = true; + this.notebooksRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.notebooksRadio.Location = new System.Drawing.Point(23, 42); this.notebooksRadio.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.notebooksRadio.Name = "notebooksRadio"; - this.notebooksRadio.Size = new System.Drawing.Size(130, 24); + this.notebooksRadio.Size = new System.Drawing.Size(134, 25); this.notebooksRadio.TabIndex = 2; this.notebooksRadio.Text = "All notebooks"; this.notebooksRadio.UseVisualStyleBackColor = true; // // notebookRadio // - this.notebookRadio.AutoSize = true; + this.notebookRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.notebookRadio.Location = new System.Drawing.Point(23, 79); this.notebookRadio.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.notebookRadio.Name = "notebookRadio"; - this.notebookRadio.Size = new System.Drawing.Size(282, 24); + this.notebookRadio.Size = new System.Drawing.Size(291, 25); this.notebookRadio.TabIndex = 3; this.notebookRadio.Text = "All sections in the current notebook"; this.notebookRadio.UseVisualStyleBackColor = true; // // sectionRadio // - this.sectionRadio.AutoSize = true; this.sectionRadio.Checked = true; + this.sectionRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.sectionRadio.Location = new System.Drawing.Point(23, 116); this.sectionRadio.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.sectionRadio.Name = "sectionRadio"; - this.sectionRadio.Size = new System.Drawing.Size(170, 24); + this.sectionRadio.Size = new System.Drawing.Size(176, 25); this.sectionRadio.TabIndex = 4; this.sectionRadio.TabStop = true; this.sectionRadio.Text = "The current section"; @@ -108,6 +120,7 @@ private void InitializeComponent() this.groupBox.Controls.Add(this.notebookRadio); this.groupBox.Controls.Add(this.sectionRadio); this.groupBox.Controls.Add(this.notebooksRadio); + this.groupBox.ForeColor = System.Drawing.SystemColors.ControlText; this.groupBox.Location = new System.Drawing.Point(23, 70); this.groupBox.Name = "groupBox"; this.groupBox.Padding = new System.Windows.Forms.Padding(20); @@ -119,6 +132,7 @@ private void InitializeComponent() // introLabel // this.introLabel.AutoSize = true; + this.introLabel.ForeColor = System.Drawing.SystemColors.ControlText; this.introLabel.Location = new System.Drawing.Point(23, 20); this.introLabel.Name = "introLabel"; this.introLabel.Size = new System.Drawing.Size(343, 20); @@ -127,20 +141,24 @@ private void InitializeComponent() // // synopsisBox // - this.synopsisBox.AutoSize = true; + this.synopsisBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.synopsisBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.synopsisBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.synopsisBox.Location = new System.Drawing.Point(46, 256); this.synopsisBox.Name = "synopsisBox"; - this.synopsisBox.Size = new System.Drawing.Size(262, 24); + this.synopsisBox.Size = new System.Drawing.Size(270, 25); this.synopsisBox.TabIndex = 7; this.synopsisBox.Text = "Include a synopsis of each page"; this.synopsisBox.UseVisualStyleBackColor = true; // // unindexedBox // - this.unindexedBox.AutoSize = true; + this.unindexedBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.unindexedBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.unindexedBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.unindexedBox.Location = new System.Drawing.Point(46, 286); this.unindexedBox.Name = "unindexedBox"; - this.unindexedBox.Size = new System.Drawing.Size(271, 24); + this.unindexedBox.Size = new System.Drawing.Size(281, 25); this.unindexedBox.TabIndex = 8; this.unindexedBox.Text = "Include unindexed pages in query"; this.tooltip.SetToolTip(this.unindexedBox, "Enable to search newer text that has not yet been indexed by OneNote. This may be" + @@ -152,6 +170,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(580, 386); this.Controls.Add(this.unindexedBox); @@ -160,6 +179,7 @@ private void InitializeComponent() this.Controls.Add(this.groupBox); this.Controls.Add(this.cancelButton); this.Controls.Add(this.okButton); + this.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; @@ -169,7 +189,6 @@ private void InitializeComponent() this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.Text = "Link References"; this.groupBox.ResumeLayout(false); - this.groupBox.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/OneMore/Commands/References/MapDialog.Designer.cs b/OneMore/Commands/References/MapDialog.Designer.cs index 1161d8bdfe..10902f0035 100644 --- a/OneMore/Commands/References/MapDialog.Designer.cs +++ b/OneMore/Commands/References/MapDialog.Designer.cs @@ -30,45 +30,57 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapDialog)); - this.okButton = new UI.MoreButton(); - this.cancelButton = new UI.MoreButton(); - this.notebooksRadio = new UI.MoreRadioButton(); - this.notebookRadio = new UI.MoreRadioButton(); - this.sectionRadio = new UI.MoreRadioButton(); - this.groupBox = new UI.MoreGroupBox(); - this.catalogBox = new UI.MoreCheckBox(); + this.okButton = new River.OneMoreAddIn.UI.MoreButton(); + this.cancelButton = new River.OneMoreAddIn.UI.MoreButton(); + this.notebooksRadio = new River.OneMoreAddIn.UI.MoreRadioButton(); + this.notebookRadio = new River.OneMoreAddIn.UI.MoreRadioButton(); + this.sectionRadio = new River.OneMoreAddIn.UI.MoreRadioButton(); + this.groupBox = new River.OneMoreAddIn.UI.MoreGroupBox(); + this.catalogBox = new River.OneMoreAddIn.UI.MoreCheckBox(); this.groupBox.SuspendLayout(); this.SuspendLayout(); // // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(311, 267); this.okButton.Name = "okButton"; + this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(120, 38); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(437, 267); this.cancelButton.Name = "cancelButton"; + this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(120, 38); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // notebooksRadio // - this.notebooksRadio.AutoSize = true; + this.notebooksRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.notebooksRadio.Location = new System.Drawing.Point(23, 42); this.notebooksRadio.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.notebooksRadio.Name = "notebooksRadio"; - this.notebooksRadio.Size = new System.Drawing.Size(130, 24); + this.notebooksRadio.Size = new System.Drawing.Size(134, 25); this.notebooksRadio.TabIndex = 2; this.notebooksRadio.Text = "All notebooks"; this.notebooksRadio.UseVisualStyleBackColor = true; @@ -76,11 +88,11 @@ private void InitializeComponent() // // notebookRadio // - this.notebookRadio.AutoSize = true; + this.notebookRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.notebookRadio.Location = new System.Drawing.Point(23, 79); this.notebookRadio.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.notebookRadio.Name = "notebookRadio"; - this.notebookRadio.Size = new System.Drawing.Size(282, 24); + this.notebookRadio.Size = new System.Drawing.Size(291, 25); this.notebookRadio.TabIndex = 3; this.notebookRadio.Text = "All sections in the current notebook"; this.notebookRadio.UseVisualStyleBackColor = true; @@ -88,12 +100,12 @@ private void InitializeComponent() // // sectionRadio // - this.sectionRadio.AutoSize = true; this.sectionRadio.Checked = true; + this.sectionRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.sectionRadio.Location = new System.Drawing.Point(23, 116); this.sectionRadio.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.sectionRadio.Name = "sectionRadio"; - this.sectionRadio.Size = new System.Drawing.Size(170, 24); + this.sectionRadio.Size = new System.Drawing.Size(176, 25); this.sectionRadio.TabIndex = 4; this.sectionRadio.TabStop = true; this.sectionRadio.Text = "The current section"; @@ -108,6 +120,7 @@ private void InitializeComponent() this.groupBox.Controls.Add(this.notebookRadio); this.groupBox.Controls.Add(this.sectionRadio); this.groupBox.Controls.Add(this.notebooksRadio); + this.groupBox.ForeColor = System.Drawing.SystemColors.ControlText; this.groupBox.Location = new System.Drawing.Point(23, 23); this.groupBox.Name = "groupBox"; this.groupBox.Padding = new System.Windows.Forms.Padding(20); @@ -118,10 +131,12 @@ private void InitializeComponent() // // catalogBox // - this.catalogBox.AutoSize = true; + this.catalogBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.catalogBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.catalogBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.catalogBox.Location = new System.Drawing.Point(23, 176); this.catalogBox.Name = "catalogBox"; - this.catalogBox.Size = new System.Drawing.Size(281, 24); + this.catalogBox.Size = new System.Drawing.Size(288, 25); this.catalogBox.TabIndex = 5; this.catalogBox.Text = "Include cross-notebook references"; this.catalogBox.UseVisualStyleBackColor = true; @@ -131,11 +146,13 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(580, 318); this.Controls.Add(this.groupBox); this.Controls.Add(this.cancelButton); this.Controls.Add(this.okButton); + this.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; @@ -145,7 +162,6 @@ private void InitializeComponent() this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.Text = "Create Page Map"; this.groupBox.ResumeLayout(false); - this.groupBox.PerformLayout(); this.ResumeLayout(false); } diff --git a/OneMore/Commands/References/RefreshPageLinksDialog.Designer.cs b/OneMore/Commands/References/RefreshPageLinksDialog.Designer.cs index 1a49f8adc2..08834aaf44 100644 --- a/OneMore/Commands/References/RefreshPageLinksDialog.Designer.cs +++ b/OneMore/Commands/References/RefreshPageLinksDialog.Designer.cs @@ -30,67 +30,79 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RefreshPageLinksDialog)); - this.okButton = new UI.MoreButton(); - this.cancelButton = new UI.MoreButton(); - this.notebooksRadio = new UI.MoreRadioButton(); - this.notebookRadio = new UI.MoreRadioButton(); - this.sectionRadio = new UI.MoreRadioButton(); - this.groupBox = new UI.MoreGroupBox(); + this.okButton = new River.OneMoreAddIn.UI.MoreButton(); + this.cancelButton = new River.OneMoreAddIn.UI.MoreButton(); + this.notebooksRadio = new River.OneMoreAddIn.UI.MoreRadioButton(); + this.notebookRadio = new River.OneMoreAddIn.UI.MoreRadioButton(); + this.sectionRadio = new River.OneMoreAddIn.UI.MoreRadioButton(); + this.groupBox = new River.OneMoreAddIn.UI.MoreGroupBox(); this.groupBox.SuspendLayout(); this.SuspendLayout(); // // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(311, 207); this.okButton.Name = "okButton"; + this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(120, 38); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(437, 207); this.cancelButton.Name = "cancelButton"; + this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(120, 38); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // notebooksRadio // - this.notebooksRadio.AutoSize = true; + this.notebooksRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.notebooksRadio.Location = new System.Drawing.Point(23, 42); this.notebooksRadio.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.notebooksRadio.Name = "notebooksRadio"; - this.notebooksRadio.Size = new System.Drawing.Size(130, 24); + this.notebooksRadio.Size = new System.Drawing.Size(134, 25); this.notebooksRadio.TabIndex = 2; this.notebooksRadio.Text = "All notebooks"; this.notebooksRadio.UseVisualStyleBackColor = true; // // notebookRadio // - this.notebookRadio.AutoSize = true; + this.notebookRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.notebookRadio.Location = new System.Drawing.Point(23, 79); this.notebookRadio.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.notebookRadio.Name = "notebookRadio"; - this.notebookRadio.Size = new System.Drawing.Size(282, 24); + this.notebookRadio.Size = new System.Drawing.Size(291, 25); this.notebookRadio.TabIndex = 3; this.notebookRadio.Text = "All sections in the current notebook"; this.notebookRadio.UseVisualStyleBackColor = true; // // sectionRadio // - this.sectionRadio.AutoSize = true; this.sectionRadio.Checked = true; + this.sectionRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.sectionRadio.Location = new System.Drawing.Point(23, 116); this.sectionRadio.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.sectionRadio.Name = "sectionRadio"; - this.sectionRadio.Size = new System.Drawing.Size(170, 24); + this.sectionRadio.Size = new System.Drawing.Size(176, 25); this.sectionRadio.TabIndex = 4; this.sectionRadio.TabStop = true; this.sectionRadio.Text = "The current section"; @@ -103,6 +115,7 @@ private void InitializeComponent() this.groupBox.Controls.Add(this.notebookRadio); this.groupBox.Controls.Add(this.sectionRadio); this.groupBox.Controls.Add(this.notebooksRadio); + this.groupBox.ForeColor = System.Drawing.SystemColors.ControlText; this.groupBox.Location = new System.Drawing.Point(23, 23); this.groupBox.Name = "groupBox"; this.groupBox.Padding = new System.Windows.Forms.Padding(20); @@ -116,11 +129,13 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(580, 258); this.Controls.Add(this.groupBox); this.Controls.Add(this.cancelButton); this.Controls.Add(this.okButton); + this.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; @@ -130,7 +145,6 @@ private void InitializeComponent() this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; this.Text = "Refresh Page References"; this.groupBox.ResumeLayout(false); - this.groupBox.PerformLayout(); this.ResumeLayout(false); } diff --git a/OneMore/Commands/Reminders/ImportOutlookTasksDialog.Designer.cs b/OneMore/Commands/Reminders/ImportOutlookTasksDialog.Designer.cs index 14f1d9419c..089d623268 100644 --- a/OneMore/Commands/Reminders/ImportOutlookTasksDialog.Designer.cs +++ b/OneMore/Commands/Reminders/ImportOutlookTasksDialog.Designer.cs @@ -32,7 +32,7 @@ private void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ImportOutlookTasksDialog)); this.okButton = new River.OneMoreAddIn.UI.MoreButton(); this.cancelButton = new River.OneMoreAddIn.UI.MoreButton(); - this.introBox = new UI.MoreMultilineLabel(); + this.introBox = new River.OneMoreAddIn.UI.MoreMultilineLabel(); this.warningBox = new River.OneMoreAddIn.UI.MoreRichLabel(); this.resetLabel = new River.OneMoreAddIn.UI.MoreLinkLabel(); this.imageList = new System.Windows.Forms.ImageList(this.components); @@ -50,31 +50,35 @@ private void InitializeComponent() // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(563, 10); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 38); this.okButton.TabIndex = 1; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(669, 10); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 38); this.cancelButton.TabIndex = 2; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // introBox @@ -83,12 +87,12 @@ private void InitializeComponent() this.introBox.Location = new System.Drawing.Point(20, 20); this.introBox.Name = "introBox"; this.introBox.Padding = new System.Windows.Forms.Padding(0, 0, 0, 12); - this.introBox.ThemedBack = "Control"; - this.introBox.ThemedFore = "ControlText"; this.introBox.Size = new System.Drawing.Size(772, 61); this.introBox.TabIndex = 0; this.introBox.Text = "Choose an entire folder or individual tasks to import from Outlook into OneNote. " + "Disabled items indicate tasks already linked to OneNote"; + this.introBox.ThemedBack = "ControlLight"; + this.introBox.ThemedFore = "ControlText"; // // warningBox // @@ -114,9 +118,12 @@ private void InitializeComponent() this.resetLabel.Location = new System.Drawing.Point(30, 15); this.resetLabel.Name = "resetLabel"; this.resetLabel.Size = new System.Drawing.Size(166, 20); + this.resetLabel.StrictColors = false; this.resetLabel.TabIndex = 0; this.resetLabel.TabStop = true; this.resetLabel.Text = "Reset orphaned tasks"; + this.resetLabel.ThemedBack = null; + this.resetLabel.ThemedFore = null; this.toolTip.SetToolTip(this.resetLabel, "An orphaned task is one that was imported but its linked paragraph was deleted. T" + "his will reset orphaned tasks so they can be imported again."); this.resetLabel.VisitedLinkColor = System.Drawing.Color.MediumOrchid; @@ -169,9 +176,10 @@ private void InitializeComponent() // tableButton // this.tableButton.Checked = true; + this.tableButton.Cursor = System.Windows.Forms.Cursors.Hand; this.tableButton.Location = new System.Drawing.Point(3, 12); this.tableButton.Name = "tableButton"; - this.tableButton.Size = new System.Drawing.Size(222, 24); + this.tableButton.Size = new System.Drawing.Size(223, 25); this.tableButton.TabIndex = 0; this.tableButton.TabStop = true; this.tableButton.Text = "Generate task detail table"; @@ -179,9 +187,10 @@ private void InitializeComponent() // // listButton // + this.listButton.Cursor = System.Windows.Forms.Cursors.Hand; this.listButton.Location = new System.Drawing.Point(3, 42); this.listButton.Name = "listButton"; - this.listButton.Size = new System.Drawing.Size(162, 24); + this.listButton.Size = new System.Drawing.Size(163, 25); this.listButton.TabIndex = 1; this.listButton.Text = "Generate task list"; this.listButton.UseVisualStyleBackColor = true; @@ -212,7 +221,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(812, 603); this.Controls.Add(this.tree); diff --git a/OneMore/Commands/Reminders/ImportOutlookTasksDialog.resx b/OneMore/Commands/Reminders/ImportOutlookTasksDialog.resx index 402efc3774..c959bd263c 100644 --- a/OneMore/Commands/Reminders/ImportOutlookTasksDialog.resx +++ b/OneMore/Commands/Reminders/ImportOutlookTasksDialog.resx @@ -130,66 +130,69 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM - DQAAAk1TRnQBSQFMAgEBAwEAAfgBAAH4AQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA - AwABEAMAAQEBAAEYBgABDHgAAT0CPwFRAlMBVgJXAVYCVwFWAlcBVgJXAVYCVwFWAlcBVgJXAVYCVwFR - AlMBPQI/NgAB9gL3AewB8AHzAewB8AHzAewB8AHzAewB8AHzAewB8AHzAewB8AHzAewB8AHzAewB8AHz - AewB8AHzAewB8AHzAewB8AHzAewB8AHzAewB8AHzAewB8AHzAe8B8gH0AewB8AHzAewB8AHzAewB8AHz - AewB8AHzAewB8AHzAewB8AHzAewB8AHzAewB8AHzAewB8AHzAewB8AHzAewB8AHzAewB8AHzAewB8AHz - AesB8AHzAe0B8QH0A/cGAAFRAlMDuxjXA7sBUQJTNgAB6QHvAfMBjwHJAewBjwHJAewBjwHJAewBjwHJ - AewBjwHJAewBjwHJAewBjwHJAewBjwHJAewBjwHJAewBjwHJAewBjwHJAewBjwHJAewBjwHJAewBjwHJ - AewBtAHaAfIBjwHJAewBjwHJAewBjwHJAewBjwHJAewBjwHJAewBjwHJAewBjwHJAewBjwHJAewBjwHJ - AewBjwHJAewBjwHJAewBjwHJAewBjwHJAewBjwHIAewBoAHRAe4B7wHyAfQGAAFWAlcD1wb6AuQB+QL3 - DfoD1wFWAlc2AAHnAe8B8wGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGC - AcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGrAdYB8QGCAcIB6gGEAcMB6gGC - AcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGC - AcIB6gGBAcEB6QGWAcsB7QHuAfIB9AYAAVYCVwPXA/oC0AH3AWsBbAHwAccByAH3DPoD1wFWAlc2AAHn - Ae8B8wGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGC - AcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGrAdYB8QGHAcUB6wGaAc0B7gGFAcMB6gGCAcIB6gGC - AcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGBAcEB6QGS - AckB7AHfAekB8QYAAVYCVwPXAasBrAH1AVYBWAHvAYsBjAHyAVoBWwHvAccByAP3B/oD1wFWAlc2AAHn - Ae8B8wGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGC - AcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGrAdYB8QGPAcgB7AG5AdwB8wGLAcYB6wGCAcIB6gGC - AcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGF - AcMB6gGRAcYB6gYAAVYCVwPXAX8BgQHyAakBqgH1AvMB+gGwAbEB9QFdAV8B8AHHAcgB9wb6A9cBVgJX - NgAB5wHvAfMBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHC - AeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBqwHWAfEBlQHMAe0B2QHsAfgBnAHPAe4BhQHD + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABK + DQAAAk1TRnQBSQFMAgEBAwIAAQEBAAEBARABAAEQAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA + ARADAAEBAQABGAYAAQx4AAE9Aj8BUQJTAVYCVwFWAlcBVgJXAVYCVwFWAlcBVgJXAVYCVwFWAlcBUQJT + AT0CPzYAAfYC9wHsAfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHs + AfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHvAfIB9AHsAfAB8wHsAfAB8wHsAfAB8wHs + AfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHsAfAB8wHr + AfAB8wHtAfEB9AP3BgABUQJTA7sY1wO7AVECUzYAAekB7wHzAY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHs + AY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHs + AbQB2gHyAY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHs + AY8ByQHsAY8ByQHsAY8ByQHsAY8ByQHsAY8ByAHsAaAB0QHuAe8B8gH0BgABVgJXA9cG+gLkAfkC9w36 + A9cBVgJXNgAB5wHvAfMBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHC + AeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBqwHWAfEBggHCAeoBhAHDAeoBggHC AeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHC - AeoBgQHBAeoBgAG/AekGAAFWAlcD1wz6AbABsQH1AVYBWAHvAbABsQH1AvMB+gPXAVYCVzYAAecB7wHz - AYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHq - AYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAasB1gHxAZcBzAHtAeIB8QH6AbsB3gHzAYwBxwHsAYIBwgHq + AeoBgQHBAekBlgHLAe0B7gHyAfQGAAFWAlcD1wP6AtAB9wFrAWwB8AHHAcgB9wz6A9cBVgJXNgAB5wHv + AfMBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHC + AeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBqwHWAfEBhwHFAesBmgHNAe4BhQHDAeoBggHCAeoBggHC + AeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBgQHBAekBkgHJ + AewB3wHpAfEGAAFWAlcD1wGrAawB9QFWAVgB7wGLAYwB8gFaAVsB7wHHAcgD9wf6A9cBVgJXNgAB5wHv + AfMBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHC + AeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBqwHWAfEBjwHIAewBuQHcAfMBiwHGAesBggHCAeoBggHC + AeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBhQHD + AeoBkQHGAeoGAAFWAlcD1wF/AYEB8gGpAaoB9QLzAfoBsAGxAfUBXQFfAfABxwHIAfcG+gPXAVYCVzYA + AecB7wHzAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHq + AYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAasB1gHxAZUBzAHtAdkB7AH4AZwBzwHuAYUBwwHq AYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHq - AYABwQHpBgABVgJXA9cM+gLzAfoBsAGxAfUBUgFTAe8BsAGxAfUD1wFWAlc2AAHnAe8B8wGCAcIB6gGC + AYEBwQHqAYABvwHpBgABVgJXA9cM+gGwAbEB9QFWAVgB7wGwAbEB9QLzAfoD1wFWAlc2AAHnAe8B8wGC AcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGC - AcIB6gGCAcIB6gGCAcIB6gGrAdYB8QGXAcwB7QHoAfQB+wHhAfAB+gGeAc8B7gGEAcMB6gGCAcIB6gGC - AcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGAAcEB6QYA - AVYCVwPXEvoBsAGxAfUBgQGCAfID1wFWAlc2AAHnAe8B8wGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGC - AcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGr - AdYB8QGXAcwB7QHqAfQB+wH0AfoB/QHJAeQB9gGXAcwB7QGQAckB7AGPAckB7AGPAckB7AGPAckB7AGP - AckB7AGPAckB7AGPAckB7AGNAcgB7AGGAcQB6gGOAccB6wGOAccB6wYAAVYCVwPXEvoC8wH6Au4B+QPX - AVYCVzYAAecB7wHzAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHq - AYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAasB1gHxAZYBywHtAeUB8gH6Af0B/gH/ - AfkB/AH+AfIB+AH8AfEB+AH8AfEB+AH8AfEB+AH8AfEB+AH8AfEB+AH8AfEB+AH8AfEB+AH8Ad4B7wH5 - AaAB0QHuAewB8AHzCQABVgJXA9cBPQI/AVECUwFWAlcBVgJXAVYCVwFWAlcBUQJTAT0CPwPXAVYCVzYA - AecB7gHzAYEBwQHpAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHq - AYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAYIBwgHqAasB1gHxAY8ByAHsAcgB5AH1Ae0B9gH8AfEB+AH8 - AfEB+AH8AfEB+AH8AfEB+AH8AfEB+AH8AfYB+wL9Af4H/wHqAfUB+wGkAdMB7wwAAVYCVwPXAVECUwO7 - DNcDuwFRAlMD1wFWAlc2AAHqAfAB8wGWAcsB7QGXAcwB7QGXAcwB7QGXAcwB7QGXAcwB7QGXAcwB7QGP - AcgB7AGBAcEB6QGFAcMB6gGRAckB7AGWAcwB7QGXAcwB7QGXAcwB7QGPAcgB7AGsAdcB8QGXAcwB6wGf - Ac8B7QGkAdIB7wGkAdMB7wGkAdMB7wGkAdMB7wGgAdAB7wGUAckB7AGzAdkB8QHnAfMB+wH9Af4E/wHq - AfUB+wGkAdMB7wwAAVECUwO7AVECUwO7A9wG8wPcA7sBUQJTA7sBUQJTNgAC+gH7Ae4B8gH0Ae4B8gH0 - Ae4B8gH0Ae4B8gH0Ae4B8gH0Ae4B8gH0Ac4B4wHvAYcBwwHoAZEByQHrAcEB4QH0AdkB7AH4AdwB7QH5 - AdwB7QH5AbkB3QHzAbAB2AHxAe4B8gH0Ae4B8gH0Ae4B8gH0Ae4B8gH0Ae4B8gH0Ae4B8gH0Ad8B6QHx - AZUBwwHqAZMByAHrAbgB3AHyAesB9QH7AfEB+AH8Ad8B7wH5AaMB0gHvDAABPQI/AVECUwE9Aj8BUQJT - AW4CcAbcAW4CcAFRAlMBPQI/AVECUwE9Aj9LAAHyAvMBywHlAfQBmwHNAesBoAHQAe4BpAHSAe8BpAHT - Ae8BpAHTAe8BnwHQAe4BugHdAfMVAAHsAe8B8gGcAc0B6AGcAc4B7AGkAdIB7wGkAdMB7wGjAdIB7wGr - AdYB8BgAAV4CYAGsAq0BrAKtAV4CYFoAAfIB9AH1Ae4B8gH0Ae4B8gH0Ae4B8gH0Ae4B8gH0Ae4B8gH0 - Ae4B8gH0AfEB8wH0GAAB7wHyAfQB7gHyAfQB7gHyAfQB7gHyAfQB7gHyAfQB8AHzAfQYAAPLAV4CYAFe - AmADq0IAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAT/AcABAwYAAcABAwYA - AcABAwYAAcABAwYAAcABAwYAAcABAwYAAcABAwYAAcABAwYAAcABAwYAAcABAwUAAQEBwAEDBQABAwHA - AQMFAAEDAcABAwUAAQMBwAEDAgAB/gEAAf4BAwH8AT8CAAH/AQAB/wEDAfwBPwIACw== + AcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGrAdYB8QGXAcwB7QHiAfEB+gG7Ad4B8wGMAccB7AGCAcIB6gGC + AcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGA + AcEB6QYAAVYCVwPXDPoC8wH6AbABsQH1AVIBUwHvAbABsQH1A9cBVgJXNgAB5wHvAfMBggHCAeoBggHC + AeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHC + AeoBggHCAeoBggHCAeoBqwHWAfEBlwHMAe0B6AH0AfsB4QHwAfoBngHPAe4BhAHDAeoBggHCAeoBggHC + AeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBgAHBAekGAAFW + AlcD1xL6AbABsQH1AYEBggHyA9cBVgJXNgAB5wHvAfMBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHC + AeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBggHCAeoBqwHW + AfEBlwHMAe0B6gH0AfsB9AH6Af0ByQHkAfYBlwHMAe0BkAHJAewBjwHJAewBjwHJAewBjwHJAewBjwHJ + AewBjwHJAewBjwHJAewBjQHIAewBhgHEAeoBjgHHAesBjgHHAesGAAFWAlcD1xL6AvMB+gLuAfkD1wFW + Alc2AAHnAe8B8wGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGC + AcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGrAdYB8QGWAcsB7QHlAfIB+gH9Af4B/wH5 + AfwB/gHyAfgB/AHxAfgB/AHxAfgB/AHxAfgB/AHxAfgB/AHxAfgB/AHxAfgB/AHxAfgB/AHeAe8B+QGg + AdEB7gHsAfAB8wkAAVYCVwPXAT0CPwFRAlMBVgJXAVYCVwFWAlcBVgJXAVECUwE9Aj8D1wFWAlc2AAHn + Ae4B8wGBAcEB6QGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGC + AcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGCAcIB6gGrAdYB8QGPAcgB7AHIAeQB9QHtAfYB/AHxAfgB/AHx + AfgB/AHxAfgB/AHxAfgB/AHxAfgB/AH2AfsC/QH+B/8B6gH1AfsBpAHTAe8MAAFWAlcD1wFRAlMDuwzX + A7sBUQJTA9cBVgJXNgAB6gHwAfMBlgHLAe0BlwHMAe0BlwHMAe0BlwHMAe0BlwHMAe0BlwHMAe0BjwHI + AewBgQHBAekBhQHDAeoBkQHJAewBlgHMAe0BlwHMAe0BlwHMAe0BjwHIAewBrAHXAfEBlwHMAesBnwHP + Ae0BpAHSAe8BpAHTAe8BpAHTAe8BpAHTAe8BoAHQAe8BlAHJAewBswHZAfEB5wHzAfsB/QH+BP8B6gH1 + AfsBpAHTAe8MAAFRAlMDuwFRAlMDuwPcBvMD3AO7AVECUwO7AVECUzYAAvoB+wHuAfIB9AHuAfIB9AHu + AfIB9AHuAfIB9AHuAfIB9AHuAfIB9AHOAeMB7wGHAcMB6AGRAckB6wHBAeEB9AHZAewB+AHcAe0B+QHc + Ae0B+QG5Ad0B8wGwAdgB8QHuAfIB9AHuAfIB9AHuAfIB9AHuAfIB9AHuAfIB9AHuAfIB9AHfAekB8QGV + AcMB6gGTAcgB6wG4AdwB8gHrAfUB+wHxAfgB/AHfAe8B+QGjAdIB7wwAAT0CPwFRAlMBPQI/AVECUwFu + AnAG3AFuAnABUQJTAT0CPwFRAlMBPQI/SwAB8gLzAcsB5QH0AZsBzQHrAaAB0AHuAaQB0gHvAaQB0wHv + AaQB0wHvAZ8B0AHuAboB3QHzFQAB7AHvAfIBnAHNAegBnAHOAewBpAHSAe8BpAHTAe8BowHSAe8BqwHW + AfAYAAFeAmABrAKtAawCrQFeAmBaAAHyAfQB9QHuAfIB9AHuAfIB9AHuAfIB9AHuAfIB9AHuAfIB9AHu + AfIB9AHxAfMB9BgAAe8B8gH0Ae4B8gH0Ae4B8gH0Ae4B8gH0Ae4B8gH0AfAB8wH0GAADywFeAmABXgJg + A6tCAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAE/wHAAQMGAAHAAQMGAAHA + AQMGAAHAAQMGAAHAAQMGAAHAAQMGAAHAAQMGAAHAAQMGAAHAAQMGAAHAAQMFAAEBAcABAwUAAQMBwAED + BQABAwHAAQMFAAEDAcABAwIAAf4BAAH+AQMB/AE/AgAB/wEAAf8BAwH8AT8CAAs= + + 156, 17 + diff --git a/OneMore/Commands/Reminders/RemindDialog.Designer.cs b/OneMore/Commands/Reminders/RemindDialog.Designer.cs index 7825c558ed..290371ed00 100644 --- a/OneMore/Commands/Reminders/RemindDialog.Designer.cs +++ b/OneMore/Commands/Reminders/RemindDialog.Designer.cs @@ -68,14 +68,14 @@ private void InitializeComponent() this.okButton.Enabled = false; this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; - this.okButton.Location = new System.Drawing.Point(624, 563); + this.okButton.Location = new System.Drawing.Point(624, 575); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 38); this.okButton.TabIndex = 7; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.OK); // @@ -86,14 +86,14 @@ private void InitializeComponent() this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; - this.cancelButton.Location = new System.Drawing.Point(730, 563); + this.cancelButton.Location = new System.Drawing.Point(730, 575); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 38); this.cancelButton.TabIndex = 8; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // startDateBox @@ -154,10 +154,10 @@ private void InitializeComponent() this.subjectBox.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.subjectBox.MaxLength = 200; this.subjectBox.Name = "subjectBox"; - this.subjectBox.ThemedBack = null; - this.subjectBox.ThemedFore = null; this.subjectBox.Size = new System.Drawing.Size(649, 26); this.subjectBox.TabIndex = 1; + this.subjectBox.ThemedBack = null; + this.subjectBox.ThemedFore = null; this.subjectBox.TextChanged += new System.EventHandler(this.ChangeSubject); // // statusLabel @@ -228,25 +228,25 @@ private void InitializeComponent() 0}); this.percentBox.Location = new System.Drawing.Point(181, 358); this.percentBox.Name = "percentBox"; - this.percentBox.ThemedBack = null; - this.percentBox.ThemedFore = "ControlText"; this.percentBox.Size = new System.Drawing.Size(92, 26); this.percentBox.TabIndex = 6; + this.percentBox.ThemedBack = null; + this.percentBox.ThemedFore = "ControlText"; this.percentBox.ValueChanged += new System.EventHandler(this.ChangePercent); // // startedBox // - this.startedBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.startedBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.startedBox.Location = new System.Drawing.Point(181, 159); this.startedBox.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.startedBox.MaxLength = 200; this.startedBox.Name = "startedBox"; - this.startedBox.ThemedBack = null; - this.startedBox.ThemedFore = null; this.startedBox.ReadOnly = true; - this.startedBox.Size = new System.Drawing.Size(434, 19); + this.startedBox.Size = new System.Drawing.Size(434, 26); this.startedBox.TabIndex = 22; this.startedBox.TabStop = false; + this.startedBox.ThemedBack = null; + this.startedBox.ThemedFore = null; // // startedLabel // @@ -268,17 +268,17 @@ private void InitializeComponent() // // completedBox // - this.completedBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.completedBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.completedBox.Location = new System.Drawing.Point(181, 237); this.completedBox.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.completedBox.MaxLength = 200; this.completedBox.Name = "completedBox"; - this.completedBox.ThemedBack = null; - this.completedBox.ThemedFore = null; this.completedBox.ReadOnly = true; - this.completedBox.Size = new System.Drawing.Size(434, 19); + this.completedBox.Size = new System.Drawing.Size(434, 26); this.completedBox.TabIndex = 24; this.completedBox.TabStop = false; + this.completedBox.ThemedBack = null; + this.completedBox.ThemedFore = null; // // tagButton // @@ -288,13 +288,13 @@ private void InitializeComponent() this.tagButton.Location = new System.Drawing.Point(181, 30); this.tagButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 10); this.tagButton.Name = "tagButton"; - this.tagButton.ThemedBack = null; - this.tagButton.ThemedFore = null; this.tagButton.ShowBorder = true; this.tagButton.Size = new System.Drawing.Size(60, 38); this.tagButton.TabIndex = 0; this.tagButton.Text = "?"; this.tagButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.tagButton.ThemedBack = null; + this.tagButton.ThemedFore = null; this.tagButton.UseVisualStyleBackColor = false; this.tagButton.Click += new System.EventHandler(this.SelectTag); // @@ -312,7 +312,7 @@ private void InitializeComponent() this.silentBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.silentBox.Cursor = System.Windows.Forms.Cursors.Hand; this.silentBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.silentBox.Location = new System.Drawing.Point(19, 28); + this.silentBox.Location = new System.Drawing.Point(23, 37); this.silentBox.Name = "silentBox"; this.silentBox.Size = new System.Drawing.Size(189, 25); this.silentBox.TabIndex = 0; @@ -328,8 +328,8 @@ private void InitializeComponent() this.optionsBox.Controls.Add(this.silentBox); this.optionsBox.Location = new System.Drawing.Point(27, 402); this.optionsBox.Name = "optionsBox"; - this.optionsBox.Padding = new System.Windows.Forms.Padding(12, 6, 3, 3); - this.optionsBox.Size = new System.Drawing.Size(803, 137); + this.optionsBox.Padding = new System.Windows.Forms.Padding(20, 15, 3, 3); + this.optionsBox.Size = new System.Drawing.Size(803, 157); this.optionsBox.TabIndex = 29; this.optionsBox.TabStop = false; this.optionsBox.Text = "Options"; @@ -337,7 +337,7 @@ private void InitializeComponent() // snoozeTimeLabel // this.snoozeTimeLabel.AutoSize = true; - this.snoozeTimeLabel.Location = new System.Drawing.Point(420, 91); + this.snoozeTimeLabel.Location = new System.Drawing.Point(436, 103); this.snoozeTimeLabel.Name = "snoozeTimeLabel"; this.snoozeTimeLabel.Size = new System.Drawing.Size(19, 20); this.snoozeTimeLabel.TabIndex = 32; @@ -349,14 +349,14 @@ private void InitializeComponent() this.snoozeButton.Enabled = false; this.snoozeButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.snoozeButton.ImageOver = null; - this.snoozeButton.Location = new System.Drawing.Point(275, 84); + this.snoozeButton.Location = new System.Drawing.Point(283, 96); this.snoozeButton.Name = "snoozeButton"; - this.snoozeButton.ThemedBack = null; - this.snoozeButton.ThemedFore = null; this.snoozeButton.ShowBorder = true; this.snoozeButton.Size = new System.Drawing.Size(121, 34); this.snoozeButton.TabIndex = 1; this.snoozeButton.Text = "Snooze"; + this.snoozeButton.ThemedBack = null; + this.snoozeButton.ThemedFore = null; this.snoozeButton.UseVisualStyleBackColor = true; this.snoozeButton.Click += new System.EventHandler(this.OK); // @@ -379,7 +379,7 @@ private void InitializeComponent() "3 days", "1 week", "2 weeks"}); - this.snoozeBox.Location = new System.Drawing.Point(19, 88); + this.snoozeBox.Location = new System.Drawing.Point(27, 100); this.snoozeBox.Name = "snoozeBox"; this.snoozeBox.Size = new System.Drawing.Size(250, 28); this.snoozeBox.TabIndex = 0; @@ -389,7 +389,7 @@ private void InitializeComponent() // this.snoozeLabel.AutoSize = true; this.snoozeLabel.ForeColor = System.Drawing.SystemColors.GrayText; - this.snoozeLabel.Location = new System.Drawing.Point(15, 65); + this.snoozeLabel.Location = new System.Drawing.Point(23, 74); this.snoozeLabel.Name = "snoozeLabel"; this.snoozeLabel.Size = new System.Drawing.Size(224, 20); this.snoozeLabel.TabIndex = 29; @@ -400,9 +400,9 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(853, 624); + this.ClientSize = new System.Drawing.Size(853, 636); this.Controls.Add(this.optionsBox); this.Controls.Add(this.tagLabel); this.Controls.Add(this.tagButton); diff --git a/OneMore/Commands/Reminders/ReportRemindersDialog.Designer.cs b/OneMore/Commands/Reminders/ReportRemindersDialog.Designer.cs index 8816c4efca..6aa661e66f 100644 --- a/OneMore/Commands/Reminders/ReportRemindersDialog.Designer.cs +++ b/OneMore/Commands/Reminders/ReportRemindersDialog.Designer.cs @@ -63,20 +63,22 @@ private void InitializeComponent() // // notebookRadio // + this.notebookRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.notebookRadio.Location = new System.Drawing.Point(23, 79); this.notebookRadio.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.notebookRadio.Name = "notebookRadio"; - this.notebookRadio.Size = new System.Drawing.Size(290, 24); + this.notebookRadio.Size = new System.Drawing.Size(291, 25); this.notebookRadio.TabIndex = 1; this.notebookRadio.Text = "All sections in the current notebook"; this.notebookRadio.UseVisualStyleBackColor = true; // // sectionRadio // + this.sectionRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.sectionRadio.Location = new System.Drawing.Point(23, 116); this.sectionRadio.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.sectionRadio.Name = "sectionRadio"; - this.sectionRadio.Size = new System.Drawing.Size(175, 24); + this.sectionRadio.Size = new System.Drawing.Size(176, 25); this.sectionRadio.TabIndex = 2; this.sectionRadio.Text = "The current section"; this.sectionRadio.UseVisualStyleBackColor = true; @@ -84,10 +86,11 @@ private void InitializeComponent() // notebooksRadio // this.notebooksRadio.Checked = true; + this.notebooksRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.notebooksRadio.Location = new System.Drawing.Point(23, 42); this.notebooksRadio.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.notebooksRadio.Name = "notebooksRadio"; - this.notebooksRadio.Size = new System.Drawing.Size(133, 24); + this.notebooksRadio.Size = new System.Drawing.Size(134, 25); this.notebooksRadio.TabIndex = 0; this.notebooksRadio.TabStop = true; this.notebooksRadio.Text = "All notebooks"; @@ -96,31 +99,35 @@ private void InitializeComponent() // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(441, 241); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(120, 38); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(315, 241); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(120, 38); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // ReportRemindersDialog @@ -128,7 +135,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(574, 292); this.Controls.Add(this.okButton); diff --git a/OneMore/Commands/Reminders/ReportRemindersReuseDialog.Designer.cs b/OneMore/Commands/Reminders/ReportRemindersReuseDialog.Designer.cs index b99921796d..68d0cefb66 100644 --- a/OneMore/Commands/Reminders/ReportRemindersReuseDialog.Designer.cs +++ b/OneMore/Commands/Reminders/ReportRemindersReuseDialog.Designer.cs @@ -38,39 +38,44 @@ private void InitializeComponent() // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(184, 111); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(120, 38); this.okButton.TabIndex = 2; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(310, 111); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(120, 38); this.cancelButton.TabIndex = 3; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // oldRadio // this.oldRadio.Checked = true; + this.oldRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.oldRadio.Location = new System.Drawing.Point(23, 29); this.oldRadio.Name = "oldRadio"; - this.oldRadio.Size = new System.Drawing.Size(226, 24); + this.oldRadio.Size = new System.Drawing.Size(227, 25); this.oldRadio.TabIndex = 0; this.oldRadio.TabStop = true; this.oldRadio.Text = "Update this existing report"; @@ -78,9 +83,10 @@ private void InitializeComponent() // // newRadio // + this.newRadio.Cursor = System.Windows.Forms.Cursors.Hand; this.newRadio.Location = new System.Drawing.Point(23, 63); this.newRadio.Name = "newRadio"; - this.newRadio.Size = new System.Drawing.Size(220, 24); + this.newRadio.Size = new System.Drawing.Size(221, 25); this.newRadio.TabIndex = 1; this.newRadio.Text = "Create a new report page"; this.newRadio.UseVisualStyleBackColor = true; @@ -90,7 +96,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(443, 162); this.Controls.Add(this.newRadio); diff --git a/OneMore/Commands/Search/SearchAndReplaceDialog.Designer.cs b/OneMore/Commands/Search/SearchAndReplaceDialog.Designer.cs index 00e492af09..0b3e364fbf 100644 --- a/OneMore/Commands/Search/SearchAndReplaceDialog.Designer.cs +++ b/OneMore/Commands/Search/SearchAndReplaceDialog.Designer.cs @@ -51,12 +51,12 @@ private void InitializeComponent () this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(513, 262); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 38); this.cancelButton.TabIndex = 5; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // okButton @@ -69,12 +69,12 @@ private void InitializeComponent () this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(406, 262); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 38); this.okButton.TabIndex = 4; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // whatLabel @@ -154,11 +154,11 @@ private void InitializeComponent () this.whatStatusLabel.ForeColor = System.Drawing.Color.Brown; this.whatStatusLabel.Location = new System.Drawing.Point(156, 54); this.whatStatusLabel.Name = "whatStatusLabel"; - this.whatStatusLabel.ThemedBack = null; - this.whatStatusLabel.ThemedFore = "ErrorText"; this.whatStatusLabel.Size = new System.Drawing.Size(453, 20); this.whatStatusLabel.TabIndex = 9; this.whatStatusLabel.Text = "Invalid regular expression"; + this.whatStatusLabel.ThemedBack = null; + this.whatStatusLabel.ThemedFore = "ErrorText"; // // withStatusLabel // @@ -167,15 +167,14 @@ private void InitializeComponent () this.withStatusLabel.ForeColor = System.Drawing.SystemColors.MenuHighlight; this.withStatusLabel.Location = new System.Drawing.Point(156, 190); this.withStatusLabel.Name = "withStatusLabel"; - this.withStatusLabel.ThemedBack = null; - this.withStatusLabel.ThemedFore = "HintText"; this.withStatusLabel.Size = new System.Drawing.Size(453, 20); this.withStatusLabel.TabIndex = 10; this.withStatusLabel.Text = "Valid substitution parameters: $1"; + this.withStatusLabel.ThemedBack = null; + this.withStatusLabel.ThemedFore = "HintText"; // // rawBox // - this.rawBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.rawBox.Cursor = System.Windows.Forms.Cursors.Hand; this.rawBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.rawBox.Location = new System.Drawing.Point(160, 215); @@ -192,7 +191,7 @@ private void InitializeComponent () this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(629, 318); this.Controls.Add(this.rawBox); diff --git a/OneMore/Commands/Search/SearchDialog.Designer.cs b/OneMore/Commands/Search/SearchDialog.Designer.cs index 9a832a3d64..d27043103d 100644 --- a/OneMore/Commands/Search/SearchDialog.Designer.cs +++ b/OneMore/Commands/Search/SearchDialog.Designer.cs @@ -68,10 +68,10 @@ private void InitializeComponent() this.findBox.Location = new System.Drawing.Point(81, 63); this.findBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.findBox.Name = "findBox"; - this.findBox.ThemedBack = null; - this.findBox.ThemedFore = null; this.findBox.Size = new System.Drawing.Size(406, 26); this.findBox.TabIndex = 0; + this.findBox.ThemedBack = null; + this.findBox.ThemedFore = null; this.findBox.TextChanged += new System.EventHandler(this.ChangeQuery); this.findBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SearchOnKeydown); // @@ -85,12 +85,12 @@ private void InitializeComponent() this.cancelButton.Location = new System.Drawing.Point(641, 538); this.cancelButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 15); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(112, 35); this.cancelButton.TabIndex = 6; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.Nevermind); // @@ -100,16 +100,16 @@ private void InitializeComponent() this.searchButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.searchButton.Enabled = false; this.searchButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.searchButton.Image = ((System.Drawing.Image)(resources.GetObject("searchButton.Image"))); + this.searchButton.Image = global::River.OneMoreAddIn.Properties.Resources.m_Search; this.searchButton.ImageOver = null; this.searchButton.Location = new System.Drawing.Point(495, 62); this.searchButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 15); this.searchButton.Name = "searchButton"; - this.searchButton.ThemedBack = null; - this.searchButton.ThemedFore = null; this.searchButton.ShowBorder = true; this.searchButton.Size = new System.Drawing.Size(68, 32); this.searchButton.TabIndex = 1; + this.searchButton.ThemedBack = null; + this.searchButton.ThemedFore = null; this.searchButton.UseVisualStyleBackColor = true; this.searchButton.Click += new System.EventHandler(this.Search); // @@ -124,12 +124,12 @@ private void InitializeComponent() this.copyButton.Location = new System.Drawing.Point(401, 538); this.copyButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.copyButton.Name = "copyButton"; - this.copyButton.ThemedBack = null; - this.copyButton.ThemedFore = null; this.copyButton.ShowBorder = true; this.copyButton.Size = new System.Drawing.Size(112, 35); this.copyButton.TabIndex = 4; this.copyButton.Text = "Copy"; + this.copyButton.ThemedBack = null; + this.copyButton.ThemedFore = null; this.copyButton.UseVisualStyleBackColor = true; this.copyButton.Click += new System.EventHandler(this.CopyPressed); // @@ -144,12 +144,12 @@ private void InitializeComponent() this.moveButton.Location = new System.Drawing.Point(521, 538); this.moveButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.moveButton.Name = "moveButton"; - this.moveButton.ThemedBack = null; - this.moveButton.ThemedFore = null; this.moveButton.ShowBorder = true; this.moveButton.Size = new System.Drawing.Size(112, 35); this.moveButton.TabIndex = 5; this.moveButton.Text = "Move"; + this.moveButton.ThemedBack = null; + this.moveButton.ThemedFore = null; this.moveButton.UseVisualStyleBackColor = true; this.moveButton.Click += new System.EventHandler(this.MovePressed); // @@ -190,7 +190,7 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(778, 594); this.Controls.Add(this.scopeBox); diff --git a/OneMore/Commands/Search/SearchDialog.cs b/OneMore/Commands/Search/SearchDialog.cs index a74f925548..933fc39fd1 100644 --- a/OneMore/Commands/Search/SearchDialog.cs +++ b/OneMore/Commands/Search/SearchDialog.cs @@ -1,5 +1,5 @@ //************************************************************************************************ -// Copyright © 2020 Steven M Cohn. All rights reserved. +// Copyright © 2020 Steven M Cohn. All rights reserved. //************************************************************************************************ namespace River.OneMoreAddIn.Commands.Search @@ -7,10 +7,9 @@ namespace River.OneMoreAddIn.Commands.Search using River.OneMoreAddIn.UI; using System; using System.Collections.Generic; - using System.Linq; + using System.Drawing; using System.Windows.Forms; - using System.Xml.Linq; - using Resx = River.OneMoreAddIn.Properties.Resources; + using Resx = Properties.Resources; internal partial class SearchDialog : MoreForm @@ -52,6 +51,26 @@ public SearchDialog() public List SelectedPages { get; private set; } + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + + var editor = new ImageEditor + { + // shrink from 24x24 to 16x16 + Size = new Size(16, 16) + }; + + if (manager.DarkMode) + { + editor.Style = ImageEditor.Stylization.Invert; + } + + using var img = searchButton.Image; + searchButton.Image = editor.Apply(img); + } + + private void ChangeQuery(object sender, EventArgs e) { searchButton.Enabled = findBox.Text.Trim().Length > 0; diff --git a/OneMore/Commands/Search/SearchDialog.resx b/OneMore/Commands/Search/SearchDialog.resx index 915be79d1e..cf28135ec8 100644 --- a/OneMore/Commands/Search/SearchDialog.resx +++ b/OneMore/Commands/Search/SearchDialog.resx @@ -118,20 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAAcFJREFUOE+Nks9KAlEYxdU3KCqobRTYJFJB6B01cGas0NI7ChaR0DaDFpWuWliL - Fi1at2hrm1btIkgloxbhot7ASZ8hGrW+b5yrVx2hgcOdy5zzO/fP2OCxgxzmyGTMvQqdIAq9IIr6SmT6 - ZkhSL4m8OcV5e0NMnmBsmcjqO0ASzWZTA1VxJFIsCqB3Eoz6TW83BDIgPt/aOIZ1Xa+1Wq0qE0Jw1PVG - DSH+VToJ/sHli0o8B81bfIiHODPFdRLajsPWLsHfbWYCehmXy4d4iPPkSXIdP+JW3sDfbWbv+MGqmb3r - jWZtLltK9wM6EDj5Z1zBMMh8pqgIRw8bVgADIir01Curu3yIg2hCtnRNQskkkegF+AcA9sXU+TQcUAVu - oY6hH71RRwknhYiQKVwvpK4C0I5XPAH+disLe0KhUXc6f+ZO31YQgisRDu7EuUxhz3V4D6ef2MEw/idm - ptPs8EmxWVFWNfgHvl37+RyuBLcDgTLuV5TpC17x0kpkjGVAbYARVuiXqKi/ANB84fAIZ2IlVnOz2QyD - tICszvSZhkN6wtgM8x5DV9YQCH22m+lXX/P/IHDSNwD4MMNWoX5xHpv9D+otOGg/JSn9AAAAAElFTkSu - QmCC - - AAABABIAICAAAAEACACoCAAAJgEAABAQAAABAAgAaAUAAM4JAABAQAAAAQAIACgWAAA2DwAAMDAAAAEA diff --git a/OneMore/Commands/Snippets/SaveSnippetDialog.Designer.cs b/OneMore/Commands/Snippets/SaveSnippetDialog.Designer.cs index 1d2ffa2251..e3fe49ea06 100644 --- a/OneMore/Commands/Snippets/SaveSnippetDialog.Designer.cs +++ b/OneMore/Commands/Snippets/SaveSnippetDialog.Designer.cs @@ -47,12 +47,12 @@ private void InitializeComponent() this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(388, 94); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(112, 35); this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.OK); // @@ -65,12 +65,12 @@ private void InitializeComponent() this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(506, 94); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(112, 35); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // nameLabel @@ -89,10 +89,10 @@ private void InitializeComponent() this.nameBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.nameBox.Location = new System.Drawing.Point(141, 28); this.nameBox.Name = "nameBox"; - this.nameBox.ThemedBack = null; - this.nameBox.ThemedFore = null; this.nameBox.Size = new System.Drawing.Size(477, 26); this.nameBox.TabIndex = 2; + this.nameBox.ThemedBack = null; + this.nameBox.ThemedFore = null; this.nameBox.TextChanged += new System.EventHandler(this.ValidateName); // // errorLabel @@ -101,18 +101,18 @@ private void InitializeComponent() this.errorLabel.ForeColor = System.Drawing.Color.Maroon; this.errorLabel.Location = new System.Drawing.Point(137, 57); this.errorLabel.Name = "errorLabel"; - this.errorLabel.ThemedBack = null; - this.errorLabel.ThemedFore = "ErrorText"; this.errorLabel.Size = new System.Drawing.Size(167, 20); this.errorLabel.TabIndex = 13; this.errorLabel.Text = "Name is already in use"; + this.errorLabel.ThemedBack = null; + this.errorLabel.ThemedFore = "ErrorText"; // // SaveSnippetDialog // this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(641, 152); this.Controls.Add(this.errorLabel); diff --git a/OneMore/Commands/Styles/PageColorDialog.Designer.cs b/OneMore/Commands/Styles/PageColorDialog.Designer.cs index af55a73b7d..69e87dfc27 100644 --- a/OneMore/Commands/Styles/PageColorDialog.Designer.cs +++ b/OneMore/Commands/Styles/PageColorDialog.Designer.cs @@ -105,12 +105,12 @@ private void InitializeComponent() this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(497, 545); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(130, 40); this.cancelButton.TabIndex = 9; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // expander @@ -151,9 +151,12 @@ private void InitializeComponent() this.loadThemeLink.Location = new System.Drawing.Point(50, 37); this.loadThemeLink.Name = "loadThemeLink"; this.loadThemeLink.Size = new System.Drawing.Size(152, 20); + this.loadThemeLink.StrictColors = false; this.loadThemeLink.TabIndex = 2; this.loadThemeLink.TabStop = true; this.loadThemeLink.Text = "Load different styles"; + this.loadThemeLink.ThemedBack = null; + this.loadThemeLink.ThemedFore = null; this.loadThemeLink.VisitedLinkColor = System.Drawing.Color.MediumOrchid; this.loadThemeLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LoadTheme); // @@ -168,7 +171,6 @@ private void InitializeComponent() // // applyThemeBox // - this.applyThemeBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.applyThemeBox.Cursor = System.Windows.Forms.Cursors.Hand; this.applyThemeBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.applyThemeBox.Location = new System.Drawing.Point(51, 82); @@ -187,12 +189,12 @@ private void InitializeComponent() this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(361, 545); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(130, 40); this.okButton.TabIndex = 12; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.Apply); // @@ -233,11 +235,11 @@ private void InitializeComponent() this.statusLabel.ForeColor = System.Drawing.Color.Brown; this.statusLabel.Location = new System.Drawing.Point(83, 262); this.statusLabel.Name = "statusLabel"; - this.statusLabel.ThemedBack = null; - this.statusLabel.ThemedFore = "ErrorText"; this.statusLabel.Size = new System.Drawing.Size(31, 20); this.statusLabel.TabIndex = 16; this.statusLabel.Text = "OK"; + this.statusLabel.ThemedBack = null; + this.statusLabel.ThemedFore = "ErrorText"; // // scopeBox // @@ -268,7 +270,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(640, 598); this.Controls.Add(this.detailPanel); diff --git a/OneMore/Commands/Styles/ReorderDialog.Designer.cs b/OneMore/Commands/Styles/ReorderDialog.Designer.cs index a661b1a58b..0c0e5584b5 100644 --- a/OneMore/Commands/Styles/ReorderDialog.Designer.cs +++ b/OneMore/Commands/Styles/ReorderDialog.Designer.cs @@ -43,7 +43,7 @@ private void InitializeComponent() this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; - this.okButton.Location = new System.Drawing.Point(120, 486); + this.okButton.Location = new System.Drawing.Point(120, 538); this.okButton.Name = "okButton"; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(116, 38); @@ -60,7 +60,7 @@ private void InitializeComponent() this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; - this.cancelButton.Location = new System.Drawing.Point(242, 486); + this.cancelButton.Location = new System.Drawing.Point(242, 538); this.cancelButton.Name = "cancelButton"; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(116, 38); @@ -72,6 +72,8 @@ private void InitializeComponent() // // listBox // + this.listBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); this.listBox.BackColor = System.Drawing.SystemColors.ControlLightLight; this.listBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.listBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -81,7 +83,7 @@ private void InitializeComponent() this.listBox.Location = new System.Drawing.Point(30, 88); this.listBox.Margin = new System.Windows.Forms.Padding(3, 3, 3, 12); this.listBox.Name = "listBox"; - this.listBox.Size = new System.Drawing.Size(325, 378); + this.listBox.Size = new System.Drawing.Size(325, 422); this.listBox.TabIndex = 2; this.listBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.DrawItem); this.listBox.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.MeasureItem); @@ -140,9 +142,9 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(417, 546); + this.ClientSize = new System.Drawing.Size(417, 598); this.Controls.Add(this.label); this.Controls.Add(this.downButton); this.Controls.Add(this.upButton); diff --git a/OneMore/Commands/Tables/EditTableThemesDialog.Designer.cs b/OneMore/Commands/Tables/EditTableThemesDialog.Designer.cs index 79fd0d0814..a423504f79 100644 --- a/OneMore/Commands/Tables/EditTableThemesDialog.Designer.cs +++ b/OneMore/Commands/Tables/EditTableThemesDialog.Designer.cs @@ -125,10 +125,10 @@ private void InitializeComponent() this.elementsGroup.Controls.Add(this.elementsBox); this.elementsGroup.Controls.Add(this.resetButtonPanel); this.elementsGroup.Dock = System.Windows.Forms.DockStyle.Fill; - this.elementsGroup.Location = new System.Drawing.Point(3, 6); + this.elementsGroup.Location = new System.Drawing.Point(5, 10); this.elementsGroup.Name = "elementsGroup"; this.elementsGroup.Padding = new System.Windows.Forms.Padding(10, 7, 7, 7); - this.elementsGroup.Size = new System.Drawing.Size(507, 510); + this.elementsGroup.Size = new System.Drawing.Size(503, 504); this.elementsGroup.TabIndex = 8; this.elementsGroup.TabStop = false; this.elementsGroup.Text = "Table Elements"; @@ -145,7 +145,7 @@ private void InitializeComponent() this.elementsBox.Location = new System.Drawing.Point(10, 26); this.elementsBox.Name = "elementsBox"; this.elementsBox.RowHeight = 28; - this.elementsBox.Size = new System.Drawing.Size(490, 428); + this.elementsBox.Size = new System.Drawing.Size(486, 422); this.elementsBox.SortedBackground = System.Drawing.SystemColors.Window; this.elementsBox.TabIndex = 0; this.elementsBox.UseCompatibleStateImageBehavior = false; @@ -155,9 +155,9 @@ private void InitializeComponent() // this.resetButtonPanel.Controls.Add(this.resetButton); this.resetButtonPanel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.resetButtonPanel.Location = new System.Drawing.Point(10, 454); + this.resetButtonPanel.Location = new System.Drawing.Point(10, 448); this.resetButtonPanel.Name = "resetButtonPanel"; - this.resetButtonPanel.Size = new System.Drawing.Size(490, 49); + this.resetButtonPanel.Size = new System.Drawing.Size(486, 49); this.resetButtonPanel.TabIndex = 2; // // resetButton @@ -212,7 +212,7 @@ private void InitializeComponent() this.deleteButton}); this.toolstrip.Location = new System.Drawing.Point(505, 5); this.toolstrip.Name = "toolstrip"; - this.toolstrip.Size = new System.Drawing.Size(192, 38); + this.toolstrip.Size = new System.Drawing.Size(170, 38); this.toolstrip.TabIndex = 10; this.toolstrip.Text = "toolstrip"; // @@ -297,7 +297,7 @@ private void InitializeComponent() this.colorsTab.ForeColor = System.Drawing.SystemColors.WindowText; this.colorsTab.Location = new System.Drawing.Point(4, 29); this.colorsTab.Name = "colorsTab"; - this.colorsTab.Padding = new System.Windows.Forms.Padding(3, 6, 3, 3); + this.colorsTab.Padding = new System.Windows.Forms.Padding(5, 10, 5, 5); this.colorsTab.Size = new System.Drawing.Size(821, 519); this.colorsTab.TabIndex = 0; this.colorsTab.Text = "Colors"; @@ -306,9 +306,9 @@ private void InitializeComponent() // this.previewDockPanel.Controls.Add(this.previewGroup); this.previewDockPanel.Dock = System.Windows.Forms.DockStyle.Right; - this.previewDockPanel.Location = new System.Drawing.Point(510, 6); + this.previewDockPanel.Location = new System.Drawing.Point(508, 10); this.previewDockPanel.Name = "previewDockPanel"; - this.previewDockPanel.Size = new System.Drawing.Size(308, 510); + this.previewDockPanel.Size = new System.Drawing.Size(308, 504); this.previewDockPanel.TabIndex = 10; // // fontsTab @@ -320,7 +320,7 @@ private void InitializeComponent() this.fontsTab.ForeColor = System.Drawing.SystemColors.WindowText; this.fontsTab.Location = new System.Drawing.Point(4, 29); this.fontsTab.Name = "fontsTab"; - this.fontsTab.Padding = new System.Windows.Forms.Padding(3, 6, 3, 3); + this.fontsTab.Padding = new System.Windows.Forms.Padding(5, 10, 5, 5); this.fontsTab.Size = new System.Drawing.Size(821, 519); this.fontsTab.TabIndex = 1; this.fontsTab.Text = "Fonts"; @@ -333,7 +333,7 @@ private void InitializeComponent() this.fontsGroup.Controls.Add(this.sizeBox); this.fontsGroup.Controls.Add(this.fontToolstrip); this.fontsGroup.Enabled = false; - this.fontsGroup.Location = new System.Drawing.Point(6, 268); + this.fontsGroup.Location = new System.Drawing.Point(8, 266); this.fontsGroup.Name = "fontsGroup"; this.fontsGroup.Padding = new System.Windows.Forms.Padding(10, 3, 10, 3); this.fontsGroup.Size = new System.Drawing.Size(640, 115); @@ -466,7 +466,7 @@ private void InitializeComponent() // this.defaultBlackToolStripMenuItem.Image = null; this.defaultBlackToolStripMenuItem.Name = "defaultBlackToolStripMenuItem"; - this.defaultBlackToolStripMenuItem.Size = new System.Drawing.Size(270, 34); + this.defaultBlackToolStripMenuItem.Size = new System.Drawing.Size(226, 34); this.defaultBlackToolStripMenuItem.Text = "Default (Black)"; this.defaultBlackToolStripMenuItem.Click += new System.EventHandler(this.SetFontColorDefault); // @@ -479,11 +479,11 @@ private void InitializeComponent() this.fontElementsGroup.Controls.Add(this.selectedFontLabel); this.fontElementsGroup.Controls.Add(this.resetFontButton); this.fontElementsGroup.Controls.Add(this.colorFontsBox); - this.fontElementsGroup.Location = new System.Drawing.Point(6, 9); + this.fontElementsGroup.Location = new System.Drawing.Point(5, 10); this.fontElementsGroup.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.fontElementsGroup.Name = "fontElementsGroup"; this.fontElementsGroup.Padding = new System.Windows.Forms.Padding(10, 3, 10, 3); - this.fontElementsGroup.Size = new System.Drawing.Size(718, 246); + this.fontElementsGroup.Size = new System.Drawing.Size(714, 240); this.fontElementsGroup.TabIndex = 15; this.fontElementsGroup.TabStop = false; this.fontElementsGroup.Text = "Table Elements"; @@ -494,7 +494,7 @@ private void InitializeComponent() this.defaultFontButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); this.defaultFontButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.defaultFontButton.ImageOver = null; - this.defaultFontButton.Location = new System.Drawing.Point(231, 206); + this.defaultFontButton.Location = new System.Drawing.Point(231, 200); this.defaultFontButton.Name = "defaultFontButton"; this.defaultFontButton.ShowBorder = true; this.defaultFontButton.Size = new System.Drawing.Size(110, 34); @@ -509,7 +509,7 @@ private void InitializeComponent() // this.selectedFontLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.selectedFontLabel.AutoSize = true; - this.selectedFontLabel.Location = new System.Drawing.Point(13, 212); + this.selectedFontLabel.Location = new System.Drawing.Point(13, 206); this.selectedFontLabel.Name = "selectedFontLabel"; this.selectedFontLabel.Size = new System.Drawing.Size(76, 20); this.selectedFontLabel.TabIndex = 2; @@ -521,7 +521,7 @@ private void InitializeComponent() this.resetFontButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); this.resetFontButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.resetFontButton.ImageOver = null; - this.resetFontButton.Location = new System.Drawing.Point(115, 205); + this.resetFontButton.Location = new System.Drawing.Point(115, 199); this.resetFontButton.Name = "resetFontButton"; this.resetFontButton.ShowBorder = true; this.resetFontButton.Size = new System.Drawing.Size(110, 34); @@ -546,7 +546,7 @@ private void InitializeComponent() this.colorFontsBox.Location = new System.Drawing.Point(13, 25); this.colorFontsBox.Name = "colorFontsBox"; this.colorFontsBox.RowHeight = 28; - this.colorFontsBox.Size = new System.Drawing.Size(692, 174); + this.colorFontsBox.Size = new System.Drawing.Size(688, 168); this.colorFontsBox.SortedBackground = System.Drawing.Color.Transparent; this.colorFontsBox.TabIndex = 0; this.colorFontsBox.UseCompatibleStateImageBehavior = false; diff --git a/OneMore/Commands/Tables/FormulaDialog.Designer.cs b/OneMore/Commands/Tables/FormulaDialog.Designer.cs index 22bf30f579..d0d34810aa 100644 --- a/OneMore/Commands/Tables/FormulaDialog.Designer.cs +++ b/OneMore/Commands/Tables/FormulaDialog.Designer.cs @@ -211,7 +211,6 @@ private void InitializeComponent() // // tagBox // - this.tagBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); this.tagBox.Cursor = System.Windows.Forms.Cursors.Hand; this.tagBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.tagBox.Location = new System.Drawing.Point(166, 180); @@ -249,7 +248,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(651, 570); this.Controls.Add(this.decimalBox); diff --git a/OneMore/Commands/Tables/InsertCellsDialog.Designer.cs b/OneMore/Commands/Tables/InsertCellsDialog.Designer.cs index 3b1181011d..823a37da72 100644 --- a/OneMore/Commands/Tables/InsertCellsDialog.Designer.cs +++ b/OneMore/Commands/Tables/InsertCellsDialog.Designer.cs @@ -69,14 +69,14 @@ private void InitializeComponent() this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; - this.cancelButton.Location = new System.Drawing.Point(258, 167); + this.cancelButton.Location = new System.Drawing.Point(296, 167); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(110, 34); this.cancelButton.TabIndex = 2; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // okButton @@ -86,14 +86,14 @@ private void InitializeComponent() this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; - this.okButton.Location = new System.Drawing.Point(132, 167); + this.okButton.Location = new System.Drawing.Point(170, 167); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(110, 34); this.okButton.TabIndex = 3; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // numLabel @@ -128,9 +128,9 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(386, 219); + this.ClientSize = new System.Drawing.Size(424, 219); this.Controls.Add(this.numCellsBox); this.Controls.Add(this.numLabel); this.Controls.Add(this.okButton); diff --git a/OneMore/Commands/Tables/SplitTableDialog.Designer.cs b/OneMore/Commands/Tables/SplitTableDialog.Designer.cs index 2567b2822b..6fa064f04b 100644 --- a/OneMore/Commands/Tables/SplitTableDialog.Designer.cs +++ b/OneMore/Commands/Tables/SplitTableDialog.Designer.cs @@ -39,51 +39,59 @@ private void InitializeComponent() // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(186, 152); this.okButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(112, 35); this.okButton.TabIndex = 4; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(308, 152); this.cancelButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(112, 35); this.cancelButton.TabIndex = 3; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // copyHeaderBox // - this.copyHeaderBox.Location = new System.Drawing.Point(20, 37); + this.copyHeaderBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.copyHeaderBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.copyHeaderBox.Location = new System.Drawing.Point(27, 37); this.copyHeaderBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.copyHeaderBox.Name = "copyHeaderBox"; - this.copyHeaderBox.Size = new System.Drawing.Size(229, 24); + this.copyHeaderBox.Size = new System.Drawing.Size(231, 25); this.copyHeaderBox.TabIndex = 5; this.copyHeaderBox.Text = "Duplicate table header row"; this.copyHeaderBox.UseVisualStyleBackColor = true; // // fixedColsBox // - this.fixedColsBox.Location = new System.Drawing.Point(20, 72); + this.fixedColsBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.fixedColsBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.fixedColsBox.Location = new System.Drawing.Point(27, 72); this.fixedColsBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.fixedColsBox.Name = "fixedColsBox"; - this.fixedColsBox.Size = new System.Drawing.Size(250, 24); + this.fixedColsBox.Size = new System.Drawing.Size(252, 25); this.fixedColsBox.TabIndex = 6; this.fixedColsBox.Text = "Set all columns as fixed-width"; this.fixedColsBox.UseVisualStyleBackColor = true; @@ -93,7 +101,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(440, 208); this.Controls.Add(this.fixedColsBox); diff --git a/OneMore/Commands/Tables/TextToTableDialog.Designer.cs b/OneMore/Commands/Tables/TextToTableDialog.Designer.cs index 6b58187cea..15aec4f9cc 100644 --- a/OneMore/Commands/Tables/TextToTableDialog.Designer.cs +++ b/OneMore/Commands/Tables/TextToTableDialog.Designer.cs @@ -62,8 +62,8 @@ private void InitializeComponent() this.group1.Location = new System.Drawing.Point(18, 18); this.group1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.group1.Name = "group1"; - this.group1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.group1.Size = new System.Drawing.Size(464, 121); + this.group1.Padding = new System.Windows.Forms.Padding(4, 15, 4, 5); + this.group1.Size = new System.Drawing.Size(506, 129); this.group1.TabIndex = 0; this.group1.TabStop = false; this.group1.Text = "Separate text at"; @@ -72,21 +72,21 @@ private void InitializeComponent() // this.otherBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.otherBox.Enabled = false; - this.otherBox.Location = new System.Drawing.Point(303, 63); + this.otherBox.Location = new System.Drawing.Point(303, 73); this.otherBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.otherBox.MaxLength = 10; this.otherBox.Name = "otherBox"; - this.otherBox.ThemedBack = "Window"; - this.otherBox.ThemedFore = null; this.otherBox.Size = new System.Drawing.Size(139, 26); this.otherBox.TabIndex = 4; this.otherBox.Text = "~"; + this.otherBox.ThemedBack = "Window"; + this.otherBox.ThemedFore = null; this.otherBox.TextChanged += new System.EventHandler(this.ChangeCustomDelimeter); // // otherRadio // this.otherRadio.Cursor = System.Windows.Forms.Cursors.Hand; - this.otherRadio.Location = new System.Drawing.Point(218, 65); + this.otherRadio.Location = new System.Drawing.Point(218, 75); this.otherRadio.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.otherRadio.Name = "otherRadio"; this.otherRadio.Size = new System.Drawing.Size(77, 25); @@ -99,7 +99,7 @@ private void InitializeComponent() // this.commasRadio.Checked = true; this.commasRadio.Cursor = System.Windows.Forms.Cursors.Hand; - this.commasRadio.Location = new System.Drawing.Point(218, 29); + this.commasRadio.Location = new System.Drawing.Point(218, 39); this.commasRadio.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.commasRadio.Name = "commasRadio"; this.commasRadio.Size = new System.Drawing.Size(101, 25); @@ -112,7 +112,7 @@ private void InitializeComponent() // tabsRadio // this.tabsRadio.Cursor = System.Windows.Forms.Cursors.Hand; - this.tabsRadio.Location = new System.Drawing.Point(24, 65); + this.tabsRadio.Location = new System.Drawing.Point(24, 75); this.tabsRadio.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabsRadio.Name = "tabsRadio"; this.tabsRadio.Size = new System.Drawing.Size(72, 25); @@ -124,7 +124,7 @@ private void InitializeComponent() // paragraphsRadio // this.paragraphsRadio.Cursor = System.Windows.Forms.Cursors.Hand; - this.paragraphsRadio.Location = new System.Drawing.Point(24, 29); + this.paragraphsRadio.Location = new System.Drawing.Point(24, 39); this.paragraphsRadio.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.paragraphsRadio.Name = "paragraphsRadio"; this.paragraphsRadio.Size = new System.Drawing.Size(121, 25); @@ -140,15 +140,15 @@ private void InitializeComponent() this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; - this.cancelButton.Location = new System.Drawing.Point(369, 359); + this.cancelButton.Location = new System.Drawing.Point(411, 392); this.cancelButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(112, 35); this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // okButton @@ -158,15 +158,15 @@ private void InitializeComponent() this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; - this.okButton.Location = new System.Drawing.Point(248, 359); + this.okButton.Location = new System.Drawing.Point(290, 392); this.okButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(112, 35); this.okButton.TabIndex = 2; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // group2 @@ -177,18 +177,18 @@ private void InitializeComponent() this.group2.Controls.Add(this.columnsBox); this.group2.Controls.Add(this.rowsLabel); this.group2.Controls.Add(this.columnsLabel); - this.group2.Location = new System.Drawing.Point(18, 149); + this.group2.Location = new System.Drawing.Point(18, 157); this.group2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.group2.Name = "group2"; - this.group2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.group2.Size = new System.Drawing.Size(464, 129); + this.group2.Padding = new System.Windows.Forms.Padding(4, 15, 4, 5); + this.group2.Size = new System.Drawing.Size(506, 136); this.group2.TabIndex = 3; this.group2.TabStop = false; this.group2.Text = "Table size"; // // rowsBox // - this.rowsBox.Location = new System.Drawing.Point(180, 69); + this.rowsBox.Location = new System.Drawing.Point(194, 80); this.rowsBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.rowsBox.Maximum = new decimal(new int[] { 10000, @@ -211,7 +211,7 @@ private void InitializeComponent() // // columnsBox // - this.columnsBox.Location = new System.Drawing.Point(180, 29); + this.columnsBox.Location = new System.Drawing.Point(194, 40); this.columnsBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.columnsBox.Maximum = new decimal(new int[] { 10000, @@ -235,29 +235,29 @@ private void InitializeComponent() // rowsLabel // this.rowsLabel.AutoSize = true; - this.rowsLabel.Location = new System.Drawing.Point(20, 72); + this.rowsLabel.Location = new System.Drawing.Point(20, 82); this.rowsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.rowsLabel.Name = "rowsLabel"; - this.rowsLabel.Size = new System.Drawing.Size(124, 20); + this.rowsLabel.Size = new System.Drawing.Size(120, 20); this.rowsLabel.TabIndex = 1; - this.rowsLabel.Text = "Number of rows:"; + this.rowsLabel.Text = "Number of rows"; // // columnsLabel // this.columnsLabel.AutoSize = true; - this.columnsLabel.Location = new System.Drawing.Point(20, 32); + this.columnsLabel.Location = new System.Drawing.Point(20, 42); this.columnsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.columnsLabel.Name = "columnsLabel"; - this.columnsLabel.Size = new System.Drawing.Size(150, 20); + this.columnsLabel.Size = new System.Drawing.Size(146, 20); this.columnsLabel.TabIndex = 0; - this.columnsLabel.Text = "Number of columns:"; + this.columnsLabel.Text = "Number of columns"; // // headerBox // this.headerBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.headerBox.Cursor = System.Windows.Forms.Cursors.Hand; this.headerBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.headerBox.Location = new System.Drawing.Point(18, 286); + this.headerBox.Location = new System.Drawing.Point(42, 311); this.headerBox.Name = "headerBox"; this.headerBox.Size = new System.Drawing.Size(184, 25); this.headerBox.TabIndex = 5; @@ -269,7 +269,7 @@ private void InitializeComponent() this.unquoteBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.unquoteBox.Cursor = System.Windows.Forms.Cursors.Hand; this.unquoteBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.unquoteBox.Location = new System.Drawing.Point(18, 316); + this.unquoteBox.Location = new System.Drawing.Point(42, 341); this.unquoteBox.Name = "unquoteBox"; this.unquoteBox.Size = new System.Drawing.Size(312, 25); this.unquoteBox.TabIndex = 6; @@ -281,9 +281,9 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(500, 413); + this.ClientSize = new System.Drawing.Size(542, 446); this.Controls.Add(this.unquoteBox); this.Controls.Add(this.headerBox); this.Controls.Add(this.group2); diff --git a/OneMore/Commands/Tagging/HashtagErrorControl.cs b/OneMore/Commands/Tagging/HashtagErrorControl.cs index bb5d7cf0fd..d4ce76c70e 100644 --- a/OneMore/Commands/Tagging/HashtagErrorControl.cs +++ b/OneMore/Commands/Tagging/HashtagErrorControl.cs @@ -8,6 +8,7 @@ namespace River.OneMoreAddIn.Commands using System; using System.ComponentModel; using System.Drawing; + using System.Windows.Forms; internal partial class HashtagErrorControl : MoreUserControl @@ -35,6 +36,8 @@ public HashtagErrorControl(string message, string notes) { notesBox.Text = notes; } + + LoadControls(Controls); } @@ -50,6 +53,23 @@ public int Radius } + private void LoadControls(Control.ControlCollection controls) + { + foreach (Control child in controls) + { + if (child is ILoadControl loader) + { + loader.OnLoad(); + } + + if (child.Controls.Count > 0) + { + LoadControls(child.Controls); + } + } + } + + private void RecreateRegion() { Region = Region.FromHrgn(Native.CreateRoundRectRgn( diff --git a/OneMore/Commands/Tools/DiagnosticsDialog.Designer.cs b/OneMore/Commands/Tools/DiagnosticsDialog.Designer.cs index f66f012af4..a098fcdc66 100644 --- a/OneMore/Commands/Tools/DiagnosticsDialog.Designer.cs +++ b/OneMore/Commands/Tools/DiagnosticsDialog.Designer.cs @@ -39,6 +39,7 @@ private void InitializeComponent() // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.okButton.ForeColor = System.Drawing.SystemColors.ControlText; this.okButton.ImageOver = null; @@ -48,6 +49,8 @@ private void InitializeComponent() this.okButton.Size = new System.Drawing.Size(140, 42); this.okButton.TabIndex = 5; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.CloseWindow); // @@ -71,9 +74,13 @@ private void InitializeComponent() this.linkLabel.Location = new System.Drawing.Point(28, 57); this.linkLabel.Name = "linkLabel"; this.linkLabel.Size = new System.Drawing.Size(80, 20); + this.linkLabel.StrictColors = false; this.linkLabel.TabIndex = 7; this.linkLabel.TabStop = true; this.linkLabel.Text = "linkLabel1"; + this.linkLabel.ThemedBack = null; + this.linkLabel.ThemedFore = null; + this.linkLabel.VisitedLinkColor = System.Drawing.Color.MediumOrchid; this.linkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.ShowLogOnLinkClicked); // // timer @@ -86,7 +93,7 @@ private void InitializeComponent() this.AcceptButton = this.okButton; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.okButton; this.ClientSize = new System.Drawing.Size(728, 154); this.Controls.Add(this.linkLabel); diff --git a/OneMore/UI/DarkTheme.json b/OneMore/UI/DarkTheme.json index f59c4ab1f5..022e22986f 100644 --- a/OneMore/UI/DarkTheme.json +++ b/OneMore/UI/DarkTheme.json @@ -17,13 +17,13 @@ "ActiveCaption": "#C980EE", "ActiveCaptionText": "#000000", "AppWorkspace": "#1F1F1F", - "ButtonFace": "#323232", + "ButtonFace": "#2F2F2F", "ButtonHighlight": "#3D2F45", - "ButtonShadow": "#A0A0A0", + "ButtonShadow": "#A4A4A4", "Control": "#2B2B2B", "ControlDark": "#2A2A2A", "ControlDarkDark": "#000000", - "ControlLight": "#393939", + "ControlLight": "#353535", "ControlLightLight": "#404040", "ControlText": "#E6E6E6", "Desktop": "#000000", diff --git a/OneMore/UI/LightTheme.json b/OneMore/UI/LightTheme.json index 84293feb99..1e88e115a1 100644 --- a/OneMore/UI/LightTheme.json +++ b/OneMore/UI/LightTheme.json @@ -21,9 +21,9 @@ "ButtonHighlight": "#FFFFFF", "ButtonShadow": "#A0A0A0", "Control": "#F0F0F0", - "ControlDark": "#A0A0A0", - "ControlDarkDark": "#696969", - "ControlLight": "#E3E3E3", + "ControlDark": "#B0B0B0", + "ControlDarkDark": "#7B7B7B", + "ControlLight": "#F8F8F8", "ControlLightLight": "#FFFFFF", "ControlText": "#000000", "Desktop": "#000000", diff --git a/OneMore/UI/MoreDataGridView.cs b/OneMore/UI/MoreDataGridView.cs index 05e33a4d5c..60033b5387 100644 --- a/OneMore/UI/MoreDataGridView.cs +++ b/OneMore/UI/MoreDataGridView.cs @@ -46,7 +46,7 @@ void ILoadControl.OnLoad() EnableHeadersVisualStyles = false; ColumnHeadersDefaultCellStyle.BackColor = manager.GetColor("ControlDarkDark"); - ColumnHeadersDefaultCellStyle.ForeColor = fore; + ColumnHeadersDefaultCellStyle.ForeColor = manager.GetColor("DarkText"); RowsDefaultCellStyle.BackColor = back; RowsDefaultCellStyle.ForeColor = fore; From 8776ae83078a5b2de8e49f1ec976baa9460225e3 Mon Sep 17 00:00:00 2001 From: Steven Cohn Date: Fri, 9 Feb 2024 11:40:34 -0500 Subject: [PATCH 2/9] fav grid --- OneMore/Commands/Favorites/FavoritesDialog.Designer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OneMore/Commands/Favorites/FavoritesDialog.Designer.cs b/OneMore/Commands/Favorites/FavoritesDialog.Designer.cs index bdc4d6632e..67bdaa8e74 100644 --- a/OneMore/Commands/Favorites/FavoritesDialog.Designer.cs +++ b/OneMore/Commands/Favorites/FavoritesDialog.Designer.cs @@ -30,7 +30,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FavoritesDialog)); - this.gridView = new System.Windows.Forms.DataGridView(); + this.gridView = new UI.MoreDataGridView(); this.nameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.locationColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.buttonPanel = new System.Windows.Forms.Panel(); @@ -272,7 +272,7 @@ private void InitializeComponent() } #endregion - private System.Windows.Forms.DataGridView gridView; + private UI.MoreDataGridView gridView; private System.Windows.Forms.DataGridViewTextBoxColumn nameColumn; private System.Windows.Forms.DataGridViewTextBoxColumn locationColumn; private System.Windows.Forms.Panel buttonPanel; From 22813cd07a9a561776a0c23cdd4b45798cfe8fd9 Mon Sep 17 00:00:00 2001 From: Steven Cohn Date: Fri, 9 Feb 2024 12:37:08 -0500 Subject: [PATCH 3/9] resize reorder --- OneMore/Commands/Styles/ReorderDialog.Designer.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OneMore/Commands/Styles/ReorderDialog.Designer.cs b/OneMore/Commands/Styles/ReorderDialog.Designer.cs index 0c0e5584b5..8b6d23ceee 100644 --- a/OneMore/Commands/Styles/ReorderDialog.Designer.cs +++ b/OneMore/Commands/Styles/ReorderDialog.Designer.cs @@ -43,7 +43,7 @@ private void InitializeComponent() this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; - this.okButton.Location = new System.Drawing.Point(120, 538); + this.okButton.Location = new System.Drawing.Point(120, 526); this.okButton.Name = "okButton"; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(116, 38); @@ -60,7 +60,7 @@ private void InitializeComponent() this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; - this.cancelButton.Location = new System.Drawing.Point(242, 538); + this.cancelButton.Location = new System.Drawing.Point(242, 526); this.cancelButton.Name = "cancelButton"; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(116, 38); @@ -83,7 +83,7 @@ private void InitializeComponent() this.listBox.Location = new System.Drawing.Point(30, 88); this.listBox.Margin = new System.Windows.Forms.Padding(3, 3, 3, 12); this.listBox.Name = "listBox"; - this.listBox.Size = new System.Drawing.Size(325, 422); + this.listBox.Size = new System.Drawing.Size(325, 400); this.listBox.TabIndex = 2; this.listBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.DrawItem); this.listBox.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.MeasureItem); @@ -144,7 +144,7 @@ private void InitializeComponent() this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(417, 598); + this.ClientSize = new System.Drawing.Size(417, 586); this.Controls.Add(this.label); this.Controls.Add(this.downButton); this.Controls.Add(this.upButton); From c05cd424e6a449603cac302c0d0bc51aed5136f9 Mon Sep 17 00:00:00 2001 From: Steven Cohn Date: Fri, 9 Feb 2024 13:01:42 -0500 Subject: [PATCH 4/9] button resize image --- .../Commands/File/ExportDialog.Designer.cs | 3 +++ OneMore/Commands/File/ExportDialog.cs | 15 ----------- .../Commands/File/ImportDialog.Designer.cs | 3 +++ OneMore/Commands/File/ImportDialog.cs | 15 ----------- .../Commands/Search/SearchDialog.Designer.cs | 4 +++ OneMore/Commands/Search/SearchDialog.cs | 20 --------------- .../Tagging/HashtagDialog.Designer.cs | 6 +++++ OneMore/Commands/Tagging/HashtagDialog.cs | 20 --------------- .../Commands/Tools/ShowXmlDialog.Designer.cs | 5 ++++ OneMore/Commands/Tools/ShowXmlDialog.cs | 8 ------ OneMore/Commands/Tools/ShowXmlDialog.resx | 2 +- OneMore/UI/MoreButton.cs | 25 ++++++++++++++++++- 12 files changed, 46 insertions(+), 80 deletions(-) diff --git a/OneMore/Commands/File/ExportDialog.Designer.cs b/OneMore/Commands/File/ExportDialog.Designer.cs index c645add1da..5b2544bd8d 100644 --- a/OneMore/Commands/File/ExportDialog.Designer.cs +++ b/OneMore/Commands/File/ExportDialog.Designer.cs @@ -166,6 +166,7 @@ private void InitializeComponent() this.browseButton.Name = "browseButton"; this.browseButton.ShowBorder = false; this.browseButton.Size = new System.Drawing.Size(44, 34); + this.browseButton.StylizeImage = true; this.browseButton.TabIndex = 4; this.browseButton.ThemedBack = null; this.browseButton.ThemedFore = null; @@ -183,6 +184,7 @@ private void InitializeComponent() this.cancelButton.Name = "cancelButton"; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 38); + this.cancelButton.StylizeImage = false; this.cancelButton.TabIndex = 6; this.cancelButton.Text = "Cancel"; this.cancelButton.ThemedBack = null; @@ -201,6 +203,7 @@ private void InitializeComponent() this.okButton.Name = "okButton"; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 38); + this.okButton.StylizeImage = false; this.okButton.TabIndex = 7; this.okButton.Text = "OK"; this.okButton.ThemedBack = null; diff --git a/OneMore/Commands/File/ExportDialog.cs b/OneMore/Commands/File/ExportDialog.cs index aa0658f090..9bc214dd22 100644 --- a/OneMore/Commands/File/ExportDialog.cs +++ b/OneMore/Commands/File/ExportDialog.cs @@ -79,21 +79,6 @@ public OneNote.ExportFormat Format } - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - - var editor = new ImageEditor { Size = new System.Drawing.Size(16, 16) }; - if (manager.DarkMode) - { - editor.Style = ImageEditor.Stylization.Invert; - } - - using var img = browseButton.Image; - browseButton.Image = editor.Apply(img); - } - - private string LoadDefaultPath() { var provider = new SettingsProvider(); diff --git a/OneMore/Commands/File/ImportDialog.Designer.cs b/OneMore/Commands/File/ImportDialog.Designer.cs index e62ed9f397..d5f4a04497 100644 --- a/OneMore/Commands/File/ImportDialog.Designer.cs +++ b/OneMore/Commands/File/ImportDialog.Designer.cs @@ -84,6 +84,7 @@ private void InitializeComponent() this.browseButton.Name = "browseButton"; this.browseButton.ShowBorder = false; this.browseButton.Size = new System.Drawing.Size(44, 26); + this.browseButton.StylizeImage = true; this.browseButton.TabIndex = 4; this.browseButton.ThemedBack = null; this.browseButton.ThemedFore = null; @@ -101,6 +102,7 @@ private void InitializeComponent() this.cancelButton.Name = "cancelButton"; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 38); + this.cancelButton.StylizeImage = false; this.cancelButton.TabIndex = 6; this.cancelButton.Text = "Cancel"; this.cancelButton.ThemedBack = null; @@ -119,6 +121,7 @@ private void InitializeComponent() this.okButton.Name = "okButton"; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 38); + this.okButton.StylizeImage = false; this.okButton.TabIndex = 7; this.okButton.Text = "OK"; this.okButton.ThemedBack = null; diff --git a/OneMore/Commands/File/ImportDialog.cs b/OneMore/Commands/File/ImportDialog.cs index 2923d0836c..ae6170bbf8 100644 --- a/OneMore/Commands/File/ImportDialog.cs +++ b/OneMore/Commands/File/ImportDialog.cs @@ -110,21 +110,6 @@ public bool AppendToPage public bool CreateSection => powerSectionButton.Checked; - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - - var editor = new ImageEditor { Size = new System.Drawing.Size(16, 16) }; - if (manager.DarkMode) - { - editor.Style = ImageEditor.Stylization.Invert; - } - - using var img = browseButton.Image; - browseButton.Image = editor.Apply(img); - } - - private void ChangePath(object sender, EventArgs e) { try diff --git a/OneMore/Commands/Search/SearchDialog.Designer.cs b/OneMore/Commands/Search/SearchDialog.Designer.cs index d27043103d..5cc8dbf2d2 100644 --- a/OneMore/Commands/Search/SearchDialog.Designer.cs +++ b/OneMore/Commands/Search/SearchDialog.Designer.cs @@ -87,6 +87,7 @@ private void InitializeComponent() this.cancelButton.Name = "cancelButton"; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(112, 35); + this.cancelButton.StylizeImage = false; this.cancelButton.TabIndex = 6; this.cancelButton.Text = "Cancel"; this.cancelButton.ThemedBack = null; @@ -107,6 +108,7 @@ private void InitializeComponent() this.searchButton.Name = "searchButton"; this.searchButton.ShowBorder = true; this.searchButton.Size = new System.Drawing.Size(68, 32); + this.searchButton.StylizeImage = true; this.searchButton.TabIndex = 1; this.searchButton.ThemedBack = null; this.searchButton.ThemedFore = null; @@ -126,6 +128,7 @@ private void InitializeComponent() this.copyButton.Name = "copyButton"; this.copyButton.ShowBorder = true; this.copyButton.Size = new System.Drawing.Size(112, 35); + this.copyButton.StylizeImage = false; this.copyButton.TabIndex = 4; this.copyButton.Text = "Copy"; this.copyButton.ThemedBack = null; @@ -146,6 +149,7 @@ private void InitializeComponent() this.moveButton.Name = "moveButton"; this.moveButton.ShowBorder = true; this.moveButton.Size = new System.Drawing.Size(112, 35); + this.moveButton.StylizeImage = false; this.moveButton.TabIndex = 5; this.moveButton.Text = "Move"; this.moveButton.ThemedBack = null; diff --git a/OneMore/Commands/Search/SearchDialog.cs b/OneMore/Commands/Search/SearchDialog.cs index 933fc39fd1..1a2e820b4a 100644 --- a/OneMore/Commands/Search/SearchDialog.cs +++ b/OneMore/Commands/Search/SearchDialog.cs @@ -51,26 +51,6 @@ public SearchDialog() public List SelectedPages { get; private set; } - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - - var editor = new ImageEditor - { - // shrink from 24x24 to 16x16 - Size = new Size(16, 16) - }; - - if (manager.DarkMode) - { - editor.Style = ImageEditor.Stylization.Invert; - } - - using var img = searchButton.Image; - searchButton.Image = editor.Apply(img); - } - - private void ChangeQuery(object sender, EventArgs e) { searchButton.Enabled = findBox.Text.Trim().Length > 0; diff --git a/OneMore/Commands/Tagging/HashtagDialog.Designer.cs b/OneMore/Commands/Tagging/HashtagDialog.Designer.cs index 0c2cec5d3d..4ca64735b9 100644 --- a/OneMore/Commands/Tagging/HashtagDialog.Designer.cs +++ b/OneMore/Commands/Tagging/HashtagDialog.Designer.cs @@ -64,6 +64,7 @@ private void InitializeComponent() this.cancelButton.Name = "cancelButton"; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(112, 35); + this.cancelButton.StylizeImage = false; this.cancelButton.TabIndex = 0; this.cancelButton.Text = "Cancel"; this.cancelButton.ThemedBack = null; @@ -119,6 +120,7 @@ private void InitializeComponent() this.menuButton.Name = "menuButton"; this.menuButton.ShowBorder = true; this.menuButton.Size = new System.Drawing.Size(50, 31); + this.menuButton.StylizeImage = false; this.menuButton.TabIndex = 4; this.menuButton.Text = "•••"; this.menuButton.ThemedBack = null; @@ -203,6 +205,7 @@ private void InitializeComponent() this.searchButton.Name = "searchButton"; this.searchButton.ShowBorder = true; this.searchButton.Size = new System.Drawing.Size(60, 31); + this.searchButton.StylizeImage = true; this.searchButton.TabIndex = 1; this.searchButton.ThemedBack = null; this.searchButton.ThemedFore = null; @@ -272,6 +275,7 @@ private void InitializeComponent() this.indexButton.Name = "indexButton"; this.indexButton.ShowBorder = true; this.indexButton.Size = new System.Drawing.Size(112, 35); + this.indexButton.StylizeImage = false; this.indexButton.TabIndex = 1; this.indexButton.Text = "Index"; this.indexButton.ThemedBack = null; @@ -292,6 +296,7 @@ private void InitializeComponent() this.copyButton.Name = "copyButton"; this.copyButton.ShowBorder = true; this.copyButton.Size = new System.Drawing.Size(112, 35); + this.copyButton.StylizeImage = false; this.copyButton.TabIndex = 2; this.copyButton.Text = "Copy"; this.copyButton.ThemedBack = null; @@ -312,6 +317,7 @@ private void InitializeComponent() this.moveButton.Name = "moveButton"; this.moveButton.ShowBorder = true; this.moveButton.Size = new System.Drawing.Size(112, 35); + this.moveButton.StylizeImage = false; this.moveButton.TabIndex = 3; this.moveButton.Text = "Move"; this.moveButton.ThemedBack = null; diff --git a/OneMore/Commands/Tagging/HashtagDialog.cs b/OneMore/Commands/Tagging/HashtagDialog.cs index 59703db1da..54f7134f36 100644 --- a/OneMore/Commands/Tagging/HashtagDialog.cs +++ b/OneMore/Commands/Tagging/HashtagDialog.cs @@ -93,26 +93,6 @@ public IEnumerable SelectedPages } - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - - var editor = new ImageEditor - { - // shrink from 24x24 to 16x16 - Size = new Size(16, 16) - }; - - if (manager.DarkMode) - { - editor.Style = ImageEditor.Stylization.Invert; - } - - using var img = searchButton.Image; - searchButton.Image = editor.Apply(img); - } - - private void ShowScanTimes() { var scan = new HashtagProvider().ReadScanTime(); diff --git a/OneMore/Commands/Tools/ShowXmlDialog.Designer.cs b/OneMore/Commands/Tools/ShowXmlDialog.Designer.cs index ef332b7e9d..9cd4c3bfb5 100644 --- a/OneMore/Commands/Tools/ShowXmlDialog.Designer.cs +++ b/OneMore/Commands/Tools/ShowXmlDialog.Designer.cs @@ -381,6 +381,7 @@ private void InitializeComponent () this.queryButton.Name = "queryButton"; this.queryButton.ShowBorder = true; this.queryButton.Size = new System.Drawing.Size(47, 32); + this.queryButton.StylizeImage = false; this.queryButton.TabIndex = 9; this.queryButton.Text = "▶"; this.queryButton.ThemedBack = null; @@ -440,6 +441,7 @@ private void InitializeComponent () this.cancelButton.Name = "cancelButton"; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(124, 35); + this.cancelButton.StylizeImage = false; this.cancelButton.TabIndex = 9; this.cancelButton.Text = "Close"; this.cancelButton.ThemedBack = null; @@ -477,6 +479,7 @@ private void InitializeComponent () this.okButton.Name = "okButton"; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(124, 35); + this.okButton.StylizeImage = false; this.okButton.TabIndex = 8; this.okButton.Text = "Update Page"; this.okButton.ThemedBack = null; @@ -685,6 +688,7 @@ private void InitializeComponent () this.selectButton.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); this.selectButton.ShowBorder = true; this.selectButton.Size = new System.Drawing.Size(140, 35); + this.selectButton.StylizeImage = true; this.selectButton.TabIndex = 3; this.selectButton.Text = "Select All"; this.selectButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -749,6 +753,7 @@ private void InitializeComponent () this.findButton.Name = "findButton"; this.findButton.ShowBorder = true; this.findButton.Size = new System.Drawing.Size(66, 35); + this.findButton.StylizeImage = false; this.findButton.TabIndex = 1; this.findButton.Text = "🔎"; this.findButton.ThemedBack = null; diff --git a/OneMore/Commands/Tools/ShowXmlDialog.cs b/OneMore/Commands/Tools/ShowXmlDialog.cs index 66cadec1dc..e2995b9bf9 100644 --- a/OneMore/Commands/Tools/ShowXmlDialog.cs +++ b/OneMore/Commands/Tools/ShowXmlDialog.cs @@ -86,14 +86,6 @@ protected override async void OnLoad(EventArgs e) { base.OnLoad(e); - var editor = new ImageEditor { Size = new Size(16, 16) }; - if (manager.DarkMode) - { - editor.Style = ImageEditor.Stylization.Invert; - } - using var img = selectButton.Image; - selectButton.Image = editor.Apply(img); - // build scopeBox with custom order var type = typeof(OneNote.PageDetail); var names = new List diff --git a/OneMore/Commands/Tools/ShowXmlDialog.resx b/OneMore/Commands/Tools/ShowXmlDialog.resx index 38b6eb6883..6df54db3c5 100644 --- a/OneMore/Commands/Tools/ShowXmlDialog.resx +++ b/OneMore/Commands/Tools/ShowXmlDialog.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABy - CwAAAk1TRnQBSQFMAgEBBgEAAXABAgFwAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBgEAAXgBAgF4AQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/OneMore/UI/MoreButton.cs b/OneMore/UI/MoreButton.cs index f6ee035a6e..e312c562e6 100644 --- a/OneMore/UI/MoreButton.cs +++ b/OneMore/UI/MoreButton.cs @@ -74,7 +74,8 @@ protected override void Dispose(bool disposing) public string ThemedFore { get; set; } - [Description("Specifies the image to show when the mouse is over the button")] + [Category("OneMore"), + Description("Specifies the image to show when the mouse is over the button")] public Image ImageOver { get; @@ -82,6 +83,11 @@ public Image ImageOver } + [Category("OneMore"), + Description("Indicate that the Image should be set for dark mode and resized")] + public bool StylizeImage { get; set; } + + /// /// Gets or sets a value indicating whether or not to draw the button border even /// when in normal state @@ -95,6 +101,23 @@ void ILoadControl.OnLoad() ForeColor = Enabled ? manager.GetColor("ControlText", ThemedFore) : manager.GetColor("GrayText"); + + if (StylizeImage) + { + var editor = new ImageEditor(); + if (manager.DarkMode) + { + editor.Style = ImageEditor.Stylization.Invert; + } + + if (Image.Height > 16) + { + editor.Size = new Size(16, 16); + } + + using var img = Image; + Image = editor.Apply(img); + } } From 10614a0b983fcd45b379d15fc03e119133fedb9a Mon Sep 17 00:00:00 2001 From: Steven Cohn Date: Fri, 9 Feb 2024 15:01:19 -0500 Subject: [PATCH 5/9] table --- .../Tables/EditTableThemesDialog.Designer.cs | 69 +++++++++++-------- OneMore/UI/MoreTabControl.cs | 2 +- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/OneMore/Commands/Tables/EditTableThemesDialog.Designer.cs b/OneMore/Commands/Tables/EditTableThemesDialog.Designer.cs index a423504f79..6831ae6e6d 100644 --- a/OneMore/Commands/Tables/EditTableThemesDialog.Designer.cs +++ b/OneMore/Commands/Tables/EditTableThemesDialog.Designer.cs @@ -95,6 +95,7 @@ private void InitializeComponent() this.cancelButton.Name = "cancelButton"; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(110, 34); + this.cancelButton.StylizeImage = false; this.cancelButton.TabIndex = 2; this.cancelButton.Text = "Close"; this.cancelButton.ThemedBack = null; @@ -122,13 +123,15 @@ private void InitializeComponent() // // elementsGroup // + this.elementsGroup.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.elementsGroup.Controls.Add(this.elementsBox); this.elementsGroup.Controls.Add(this.resetButtonPanel); - this.elementsGroup.Dock = System.Windows.Forms.DockStyle.Fill; - this.elementsGroup.Location = new System.Drawing.Point(5, 10); + this.elementsGroup.Location = new System.Drawing.Point(5, 18); this.elementsGroup.Name = "elementsGroup"; this.elementsGroup.Padding = new System.Windows.Forms.Padding(10, 7, 7, 7); - this.elementsGroup.Size = new System.Drawing.Size(503, 504); + this.elementsGroup.Size = new System.Drawing.Size(503, 496); this.elementsGroup.TabIndex = 8; this.elementsGroup.TabStop = false; this.elementsGroup.Text = "Table Elements"; @@ -145,7 +148,7 @@ private void InitializeComponent() this.elementsBox.Location = new System.Drawing.Point(10, 26); this.elementsBox.Name = "elementsBox"; this.elementsBox.RowHeight = 28; - this.elementsBox.Size = new System.Drawing.Size(486, 422); + this.elementsBox.Size = new System.Drawing.Size(486, 414); this.elementsBox.SortedBackground = System.Drawing.SystemColors.Window; this.elementsBox.TabIndex = 0; this.elementsBox.UseCompatibleStateImageBehavior = false; @@ -155,7 +158,7 @@ private void InitializeComponent() // this.resetButtonPanel.Controls.Add(this.resetButton); this.resetButtonPanel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.resetButtonPanel.Location = new System.Drawing.Point(10, 448); + this.resetButtonPanel.Location = new System.Drawing.Point(10, 440); this.resetButtonPanel.Name = "resetButtonPanel"; this.resetButtonPanel.Size = new System.Drawing.Size(486, 49); this.resetButtonPanel.TabIndex = 2; @@ -171,6 +174,7 @@ private void InitializeComponent() this.resetButton.Name = "resetButton"; this.resetButton.ShowBorder = true; this.resetButton.Size = new System.Drawing.Size(110, 34); + this.resetButton.StylizeImage = false; this.resetButton.TabIndex = 1; this.resetButton.Text = "Reset all"; this.resetButton.ThemedBack = null; @@ -212,7 +216,7 @@ private void InitializeComponent() this.deleteButton}); this.toolstrip.Location = new System.Drawing.Point(505, 5); this.toolstrip.Name = "toolstrip"; - this.toolstrip.Size = new System.Drawing.Size(170, 38); + this.toolstrip.Size = new System.Drawing.Size(170, 28); this.toolstrip.TabIndex = 10; this.toolstrip.Text = "toolstrip"; // @@ -222,7 +226,7 @@ private void InitializeComponent() this.newButton.Image = global::River.OneMoreAddIn.Properties.Resources.m_NewStyle; this.newButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.newButton.Name = "newButton"; - this.newButton.Size = new System.Drawing.Size(40, 38); + this.newButton.Size = new System.Drawing.Size(40, 28); this.newButton.Text = "New Style"; this.newButton.Click += new System.EventHandler(this.CreateNewTheme); // @@ -232,7 +236,7 @@ private void InitializeComponent() this.renameButton.Image = global::River.OneMoreAddIn.Properties.Resources.m_Rename; this.renameButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.renameButton.Name = "renameButton"; - this.renameButton.Size = new System.Drawing.Size(40, 38); + this.renameButton.Size = new System.Drawing.Size(40, 28); this.renameButton.Text = "Rename"; this.renameButton.Click += new System.EventHandler(this.RenameTheme); // @@ -243,14 +247,14 @@ private void InitializeComponent() this.saveButton.Image = global::River.OneMoreAddIn.Properties.Resources.m_SaveAs; this.saveButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.saveButton.Name = "saveButton"; - this.saveButton.Size = new System.Drawing.Size(40, 38); + this.saveButton.Size = new System.Drawing.Size(40, 28); this.saveButton.Text = "Save"; this.saveButton.Click += new System.EventHandler(this.SaveTheme); // // toolsep1 // this.toolsep1.Name = "toolsep1"; - this.toolsep1.Size = new System.Drawing.Size(6, 38); + this.toolsep1.Size = new System.Drawing.Size(6, 28); // // deleteButton // @@ -258,7 +262,7 @@ private void InitializeComponent() this.deleteButton.Image = global::River.OneMoreAddIn.Properties.Resources.m_Delete; this.deleteButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.deleteButton.Name = "deleteButton"; - this.deleteButton.Size = new System.Drawing.Size(40, 38); + this.deleteButton.Size = new System.Drawing.Size(40, 28); this.deleteButton.Text = "Delete"; this.deleteButton.Click += new System.EventHandler(this.DeleteTheme); // @@ -297,18 +301,19 @@ private void InitializeComponent() this.colorsTab.ForeColor = System.Drawing.SystemColors.WindowText; this.colorsTab.Location = new System.Drawing.Point(4, 29); this.colorsTab.Name = "colorsTab"; - this.colorsTab.Padding = new System.Windows.Forms.Padding(5, 10, 5, 5); + this.colorsTab.Padding = new System.Windows.Forms.Padding(5, 15, 5, 5); this.colorsTab.Size = new System.Drawing.Size(821, 519); this.colorsTab.TabIndex = 0; this.colorsTab.Text = "Colors"; // // previewDockPanel // + this.previewDockPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); this.previewDockPanel.Controls.Add(this.previewGroup); - this.previewDockPanel.Dock = System.Windows.Forms.DockStyle.Right; - this.previewDockPanel.Location = new System.Drawing.Point(508, 10); + this.previewDockPanel.Location = new System.Drawing.Point(508, 18); this.previewDockPanel.Name = "previewDockPanel"; - this.previewDockPanel.Size = new System.Drawing.Size(308, 504); + this.previewDockPanel.Size = new System.Drawing.Size(308, 496); this.previewDockPanel.TabIndex = 10; // // fontsTab @@ -320,7 +325,7 @@ private void InitializeComponent() this.fontsTab.ForeColor = System.Drawing.SystemColors.WindowText; this.fontsTab.Location = new System.Drawing.Point(4, 29); this.fontsTab.Name = "fontsTab"; - this.fontsTab.Padding = new System.Windows.Forms.Padding(5, 10, 5, 5); + this.fontsTab.Padding = new System.Windows.Forms.Padding(5, 15, 5, 5); this.fontsTab.Size = new System.Drawing.Size(821, 519); this.fontsTab.TabIndex = 1; this.fontsTab.Text = "Fonts"; @@ -333,10 +338,10 @@ private void InitializeComponent() this.fontsGroup.Controls.Add(this.sizeBox); this.fontsGroup.Controls.Add(this.fontToolstrip); this.fontsGroup.Enabled = false; - this.fontsGroup.Location = new System.Drawing.Point(8, 266); + this.fontsGroup.Location = new System.Drawing.Point(8, 279); this.fontsGroup.Name = "fontsGroup"; this.fontsGroup.Padding = new System.Windows.Forms.Padding(10, 3, 10, 3); - this.fontsGroup.Size = new System.Drawing.Size(640, 115); + this.fontsGroup.Size = new System.Drawing.Size(711, 127); this.fontsGroup.TabIndex = 16; this.fontsGroup.TabStop = false; this.fontsGroup.Text = "Font"; @@ -346,10 +351,11 @@ private void InitializeComponent() this.applyFontButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); this.applyFontButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.applyFontButton.ImageOver = null; - this.applyFontButton.Location = new System.Drawing.Point(512, 25); + this.applyFontButton.Location = new System.Drawing.Point(519, 38); this.applyFontButton.Name = "applyFontButton"; this.applyFontButton.ShowBorder = true; this.applyFontButton.Size = new System.Drawing.Size(110, 34); + this.applyFontButton.StylizeImage = false; this.applyFontButton.TabIndex = 15; this.applyFontButton.Text = "Apply"; this.applyFontButton.ThemedBack = null; @@ -364,7 +370,7 @@ private void InitializeComponent() this.familyBox.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.familyBox.FormattingEnabled = true; this.familyBox.IntegralHeight = false; - this.familyBox.Location = new System.Drawing.Point(13, 25); + this.familyBox.Location = new System.Drawing.Point(20, 38); this.familyBox.Name = "familyBox"; this.familyBox.Size = new System.Drawing.Size(377, 32); this.familyBox.TabIndex = 11; @@ -390,7 +396,7 @@ private void InitializeComponent() "22", "24", "26"}); - this.sizeBox.Location = new System.Drawing.Point(396, 24); + this.sizeBox.Location = new System.Drawing.Point(403, 37); this.sizeBox.Name = "sizeBox"; this.sizeBox.Size = new System.Drawing.Size(110, 33); this.sizeBox.TabIndex = 12; @@ -407,7 +413,7 @@ private void InitializeComponent() this.italicButton, this.underlineButton, this.colorButton}); - this.fontToolstrip.Location = new System.Drawing.Point(13, 60); + this.fontToolstrip.Location = new System.Drawing.Point(20, 73); this.fontToolstrip.Name = "fontToolstrip"; this.fontToolstrip.Padding = new System.Windows.Forms.Padding(0); this.fontToolstrip.Size = new System.Drawing.Size(147, 27); @@ -479,11 +485,11 @@ private void InitializeComponent() this.fontElementsGroup.Controls.Add(this.selectedFontLabel); this.fontElementsGroup.Controls.Add(this.resetFontButton); this.fontElementsGroup.Controls.Add(this.colorFontsBox); - this.fontElementsGroup.Location = new System.Drawing.Point(5, 10); + this.fontElementsGroup.Location = new System.Drawing.Point(5, 18); this.fontElementsGroup.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10); this.fontElementsGroup.Name = "fontElementsGroup"; this.fontElementsGroup.Padding = new System.Windows.Forms.Padding(10, 3, 10, 3); - this.fontElementsGroup.Size = new System.Drawing.Size(714, 240); + this.fontElementsGroup.Size = new System.Drawing.Size(714, 248); this.fontElementsGroup.TabIndex = 15; this.fontElementsGroup.TabStop = false; this.fontElementsGroup.Text = "Table Elements"; @@ -494,10 +500,11 @@ private void InitializeComponent() this.defaultFontButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); this.defaultFontButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.defaultFontButton.ImageOver = null; - this.defaultFontButton.Location = new System.Drawing.Point(231, 200); + this.defaultFontButton.Location = new System.Drawing.Point(231, 208); this.defaultFontButton.Name = "defaultFontButton"; this.defaultFontButton.ShowBorder = true; this.defaultFontButton.Size = new System.Drawing.Size(110, 34); + this.defaultFontButton.StylizeImage = false; this.defaultFontButton.TabIndex = 3; this.defaultFontButton.Text = "Default"; this.defaultFontButton.ThemedBack = null; @@ -509,7 +516,7 @@ private void InitializeComponent() // this.selectedFontLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.selectedFontLabel.AutoSize = true; - this.selectedFontLabel.Location = new System.Drawing.Point(13, 206); + this.selectedFontLabel.Location = new System.Drawing.Point(13, 214); this.selectedFontLabel.Name = "selectedFontLabel"; this.selectedFontLabel.Size = new System.Drawing.Size(76, 20); this.selectedFontLabel.TabIndex = 2; @@ -521,10 +528,11 @@ private void InitializeComponent() this.resetFontButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); this.resetFontButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.resetFontButton.ImageOver = null; - this.resetFontButton.Location = new System.Drawing.Point(115, 199); + this.resetFontButton.Location = new System.Drawing.Point(115, 207); this.resetFontButton.Name = "resetFontButton"; this.resetFontButton.ShowBorder = true; this.resetFontButton.Size = new System.Drawing.Size(110, 34); + this.resetFontButton.StylizeImage = false; this.resetFontButton.TabIndex = 1; this.resetFontButton.Text = "Reset"; this.resetFontButton.ThemedBack = null; @@ -546,7 +554,7 @@ private void InitializeComponent() this.colorFontsBox.Location = new System.Drawing.Point(13, 25); this.colorFontsBox.Name = "colorFontsBox"; this.colorFontsBox.RowHeight = 28; - this.colorFontsBox.Size = new System.Drawing.Size(688, 168); + this.colorFontsBox.Size = new System.Drawing.Size(688, 176); this.colorFontsBox.SortedBackground = System.Drawing.Color.Transparent; this.colorFontsBox.TabIndex = 0; this.colorFontsBox.UseCompatibleStateImageBehavior = false; @@ -574,6 +582,7 @@ private void InitializeComponent() this.button1.Name = "button1"; this.button1.ShowBorder = true; this.button1.Size = new System.Drawing.Size(110, 34); + this.button1.StylizeImage = false; this.button1.TabIndex = 1; this.button1.Text = "Reset"; this.button1.ThemedBack = null; @@ -584,7 +593,7 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.Control; + this.BackColor = System.Drawing.SystemColors.ControlLight; this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(859, 701); this.Controls.Add(this.tabs); @@ -593,7 +602,7 @@ private void InitializeComponent() this.ForeColor = System.Drawing.SystemColors.ControlText; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MinimizeBox = false; - this.MinimumSize = new System.Drawing.Size(859, 643); + this.MinimumSize = new System.Drawing.Size(880, 750); this.Name = "EditTableThemesDialog"; this.Padding = new System.Windows.Forms.Padding(20, 20, 10, 10); this.StartPosition = System.Windows.Forms.FormStartPosition.Manual; diff --git a/OneMore/UI/MoreTabControl.cs b/OneMore/UI/MoreTabControl.cs index c94431e11b..09519a722f 100644 --- a/OneMore/UI/MoreTabControl.cs +++ b/OneMore/UI/MoreTabControl.cs @@ -156,7 +156,7 @@ protected override void OnPaint(PaintEventArgs e) { e.Graphics.DrawString(page.Text, Font, fore, bounds.X + 2 + (bounds.Width - size.Width) / 2f, - (bounds.Height - size.Height), + (bounds.Height - size.Height) - 2, format); } } From 7c8691f21dea4fb156422468adfa300e0fc447f1 Mon Sep 17 00:00:00 2001 From: Steven Cohn Date: Fri, 9 Feb 2024 17:37:33 -0500 Subject: [PATCH 6/9] colorizer --- OneMore/Commands/Edit/ColorizeDialog.Designer.cs | 1 + OneMore/Commands/Edit/ColorizeDialog.cs | 7 +++++++ .../Commands/Tables/EditTableThemesDialog.Designer.cs | 2 +- OneMore/UI/ThemeManager.cs | 11 +++++++++-- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/OneMore/Commands/Edit/ColorizeDialog.Designer.cs b/OneMore/Commands/Edit/ColorizeDialog.Designer.cs index 498c41da97..3ad1a25fc7 100644 --- a/OneMore/Commands/Edit/ColorizeDialog.Designer.cs +++ b/OneMore/Commands/Edit/ColorizeDialog.Designer.cs @@ -59,6 +59,7 @@ private void InitializeComponent() this.okButton.Name = "okButton"; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(108, 38); + this.okButton.StylizeImage = false; this.okButton.TabIndex = 0; this.okButton.Text = "OK"; this.okButton.ThemedBack = null; diff --git a/OneMore/Commands/Edit/ColorizeDialog.cs b/OneMore/Commands/Edit/ColorizeDialog.cs index bad1900e0b..c12b964ef8 100644 --- a/OneMore/Commands/Edit/ColorizeDialog.cs +++ b/OneMore/Commands/Edit/ColorizeDialog.cs @@ -81,6 +81,13 @@ private ImageList MakeImageList(IDictionary languages) } + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + nameColumn.Width = view.ClientSize.Width; + } + + private void FocusOnActivated(object sender, EventArgs e) { view.Focus(); diff --git a/OneMore/Commands/Tables/EditTableThemesDialog.Designer.cs b/OneMore/Commands/Tables/EditTableThemesDialog.Designer.cs index 6831ae6e6d..0b4d75ce9c 100644 --- a/OneMore/Commands/Tables/EditTableThemesDialog.Designer.cs +++ b/OneMore/Commands/Tables/EditTableThemesDialog.Designer.cs @@ -185,7 +185,7 @@ private void InitializeComponent() // previewGroup // this.previewGroup.Controls.Add(this.previewBox); - this.previewGroup.Location = new System.Drawing.Point(6, 3); + this.previewGroup.Location = new System.Drawing.Point(17, 3); this.previewGroup.Name = "previewGroup"; this.previewGroup.Padding = new System.Windows.Forms.Padding(10); this.previewGroup.Size = new System.Drawing.Size(217, 199); diff --git a/OneMore/UI/ThemeManager.cs b/OneMore/UI/ThemeManager.cs index 0bf5895fc3..4c60057bbc 100644 --- a/OneMore/UI/ThemeManager.cs +++ b/OneMore/UI/ThemeManager.cs @@ -117,10 +117,17 @@ public void InitializeTheme(ContainerControl container) // apply colors... - if (DarkMode && container is MoreForm form) + if (DarkMode && (container is MoreForm || container is MoreUserControl)) { SetWindowTheme(container); - form.OnThemeChange(); + if (container is MoreForm form) + { + form.OnThemeChange(); + } + else + { + ((MoreUserControl)container).OnThemeChange(); + } } Colorize(container); From fdf387279f56dafff777ee667a229fdc80e474aa Mon Sep 17 00:00:00 2001 From: Steven Cohn Date: Fri, 9 Feb 2024 18:56:58 -0500 Subject: [PATCH 7/9] tagged --- OneMore/Commands/Tagging/TagCheckBox.cs | 2 +- .../Commands/Tagging/TagControl.Designer.cs | 29 +++-- OneMore/Commands/Tagging/TagControl.cs | 2 +- OneMore/Commands/Tagging/TagControl.resx | 2 +- .../Commands/Tagging/TaggedDialog.Designer.cs | 107 ++++++++++++--- OneMore/Commands/Tagging/TaggedDialog.resx | 21 +-- .../Tagging/TaggingDialog.Designer.cs | 122 ++++++++++++------ OneMore/Commands/Tagging/TaggingDialog.cs | 21 ++- OneMore/OneMore.csproj | 1 + OneMore/UI/HierarchyView.cs | 69 +++++++--- OneMore/UI/MoreButton.cs | 7 +- OneMore/UI/MoreTextBox.cs | 37 +++++- 12 files changed, 294 insertions(+), 126 deletions(-) diff --git a/OneMore/Commands/Tagging/TagCheckBox.cs b/OneMore/Commands/Tagging/TagCheckBox.cs index 54310ef285..651eeced8b 100644 --- a/OneMore/Commands/Tagging/TagCheckBox.cs +++ b/OneMore/Commands/Tagging/TagCheckBox.cs @@ -8,7 +8,7 @@ namespace River.OneMoreAddIn.Commands using System.Windows.Forms; - internal class TagCheckBox : CheckBox + internal class TagCheckBox : UI.MoreCheckBox { private readonly IntPtr hcursor; diff --git a/OneMore/Commands/Tagging/TagControl.Designer.cs b/OneMore/Commands/Tagging/TagControl.Designer.cs index abfe9413d8..473650eb2c 100644 --- a/OneMore/Commands/Tagging/TagControl.Designer.cs +++ b/OneMore/Commands/Tagging/TagControl.Designer.cs @@ -30,8 +30,8 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TagControl)); - this.label = new System.Windows.Forms.Label(); - this.xButton = new System.Windows.Forms.Button(); + this.label = new River.OneMoreAddIn.UI.MoreLabel(); + this.xButton = new River.OneMoreAddIn.UI.MoreButton(); this.SuspendLayout(); // // label @@ -43,29 +43,40 @@ private void InitializeComponent() this.label.Size = new System.Drawing.Size(133, 20); this.label.TabIndex = 0; this.label.Text = "I\'m a tag, dummy!"; + this.label.ThemedBack = null; + this.label.ThemedFore = null; // // xButton // this.xButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.xButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.xButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.xButton.Image = ((System.Drawing.Image)(resources.GetObject("xButton.Image"))); - this.xButton.Location = new System.Drawing.Point(162, -1); + this.xButton.ImageOver = null; + this.xButton.Location = new System.Drawing.Point(160, -1); this.xButton.Margin = new System.Windows.Forms.Padding(0); this.xButton.Name = "xButton"; + this.xButton.ShowBorder = true; this.xButton.Size = new System.Drawing.Size(31, 30); + this.xButton.StylizeImage = false; this.xButton.TabIndex = 1; + this.xButton.ThemedBack = null; + this.xButton.ThemedFore = null; this.xButton.UseVisualStyleBackColor = true; this.xButton.Click += new System.EventHandler(this.DeleteTag); // - // TagLabel + // TagControl // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.ControlLight; + this.BackColor = System.Drawing.SystemColors.Control; + this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.Controls.Add(this.xButton); this.Controls.Add(this.label); + this.ForeColor = System.Drawing.SystemColors.ControlText; this.Margin = new System.Windows.Forms.Padding(4); - this.Name = "TagLabel"; - this.Size = new System.Drawing.Size(193, 29); + this.Name = "TagControl"; + this.Size = new System.Drawing.Size(191, 27); this.ResumeLayout(false); this.PerformLayout(); @@ -73,7 +84,7 @@ private void InitializeComponent() #endregion - private System.Windows.Forms.Label label; - private System.Windows.Forms.Button xButton; + private UI.MoreLabel label; + private UI.MoreButton xButton; } } diff --git a/OneMore/Commands/Tagging/TagControl.cs b/OneMore/Commands/Tagging/TagControl.cs index 92bbc5b81c..22ae6709f2 100644 --- a/OneMore/Commands/Tagging/TagControl.cs +++ b/OneMore/Commands/Tagging/TagControl.cs @@ -12,7 +12,7 @@ namespace River.OneMoreAddIn.Commands /// Displays a tag label with its own Delete button. Used in the TaggingDialog for adding /// and removing tags to a page. /// - internal partial class TagControl : UserControl + internal partial class TagControl : UI.MoreUserControl { public TagControl() diff --git a/OneMore/Commands/Tagging/TagControl.resx b/OneMore/Commands/Tagging/TagControl.resx index 27771e2649..4b4a385183 100644 --- a/OneMore/Commands/Tagging/TagControl.resx +++ b/OneMore/Commands/Tagging/TagControl.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAOxJREFUKFNjgIFbHrnsj+0TC4D47BOHxJ+PHRJ+PXZIPP/EPqHkkUUIJ1QZBDy0 + wQAADsEBuJFr7QAAAOxJREFUKFNjgIFbHrnsj+0TC4D47BOHxJ+PHRJ+PXZIPP/EPqHkkUUIJ1QZBDy0 SpICSlwAKvyPFdsnXnlqHSsHVvzfOI0VZOqrws5/3w6d+f/ULQ2u8KlL6v+v+07+f13W9++JQ8Ll+/bx HAxAq9NBkl+2H/4PAt9PXAJreuqS8v/b4bNgMZAmkBqQkxmAjINgE52BCvafAiv4fuLi/2+HIIq/Hz3/ /6lrKszWUwxAXW+gHIimA6fBCkHg+7ELyIr/A13zlXQNwNDBdNJxfE4i1dMkBysIgCIOHKtQhRgYOeJg diff --git a/OneMore/Commands/Tagging/TaggedDialog.Designer.cs b/OneMore/Commands/Tagging/TaggedDialog.Designer.cs index c7055fcc9f..ebe5b5e461 100644 --- a/OneMore/Commands/Tagging/TaggedDialog.Designer.cs +++ b/OneMore/Commands/Tagging/TaggedDialog.Designer.cs @@ -30,12 +30,12 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TaggedDialog)); - this.searchButton = new System.Windows.Forms.Button(); - this.filterBox = new River.OneMoreAddIn.UI.FormTextBox(); - this.tagsLabel = new System.Windows.Forms.Label(); + this.searchButton = new River.OneMoreAddIn.UI.MoreButton(); + this.filterBox = new River.OneMoreAddIn.UI.MoreTextBox(); + this.tagsLabel = new River.OneMoreAddIn.UI.MoreLabel(); this.scopeBox = new System.Windows.Forms.ComboBox(); - this.introLabel = new System.Windows.Forms.Label(); - this.cancelButton = new System.Windows.Forms.Button(); + this.introLabel = new River.OneMoreAddIn.UI.MoreLabel(); + this.cancelButton = new River.OneMoreAddIn.UI.MoreButton(); this.searchPanel = new System.Windows.Forms.Panel(); this.opBox = new System.Windows.Forms.ComboBox(); this.clearLabel = new River.OneMoreAddIn.UI.MoreLinkLabel(); @@ -44,9 +44,9 @@ private void InitializeComponent() this.resultPanel = new System.Windows.Forms.Panel(); this.clearAllLabel = new River.OneMoreAddIn.UI.MoreLinkLabel(); this.checkAllLabel = new River.OneMoreAddIn.UI.MoreLinkLabel(); - this.indexButton = new System.Windows.Forms.Button(); - this.copyButton = new System.Windows.Forms.Button(); - this.moveButton = new System.Windows.Forms.Button(); + this.indexButton = new River.OneMoreAddIn.UI.MoreButton(); + this.copyButton = new River.OneMoreAddIn.UI.MoreButton(); + this.moveButton = new River.OneMoreAddIn.UI.MoreButton(); this.splitContainer = new System.Windows.Forms.SplitContainer(); this.searchPanel.SuspendLayout(); this.resultPanel.SuspendLayout(); @@ -59,12 +59,19 @@ private void InitializeComponent() // searchButton // this.searchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.searchButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.searchButton.Enabled = false; - this.searchButton.Image = ((System.Drawing.Image)(resources.GetObject("searchButton.Image"))); + this.searchButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.searchButton.Image = global::River.OneMoreAddIn.Properties.Resources.m_Search; + this.searchButton.ImageOver = null; this.searchButton.Location = new System.Drawing.Point(795, 49); this.searchButton.Name = "searchButton"; + this.searchButton.ShowBorder = true; this.searchButton.Size = new System.Drawing.Size(60, 32); + this.searchButton.StylizeImage = true; this.searchButton.TabIndex = 1; + this.searchButton.ThemedBack = null; + this.searchButton.ThemedFore = null; this.searchButton.UseVisualStyleBackColor = true; this.searchButton.Click += new System.EventHandler(this.Search); // @@ -72,11 +79,15 @@ private void InitializeComponent() // this.filterBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.filterBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.filterBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.filterBox.Location = new System.Drawing.Point(80, 52); this.filterBox.Name = "filterBox"; + this.filterBox.ProcessEnterKey = false; this.filterBox.Size = new System.Drawing.Size(422, 28); this.filterBox.TabIndex = 0; + this.filterBox.ThemedBack = null; + this.filterBox.ThemedFore = null; this.filterBox.TextChanged += new System.EventHandler(this.ChangedFilter); // // tagsLabel @@ -88,6 +99,8 @@ private void InitializeComponent() this.tagsLabel.Size = new System.Drawing.Size(48, 20); this.tagsLabel.TabIndex = 9; this.tagsLabel.Text = "Tags:"; + this.tagsLabel.ThemedBack = null; + this.tagsLabel.ThemedFore = null; // // scopeBox // @@ -113,23 +126,32 @@ private void InitializeComponent() this.introLabel.Size = new System.Drawing.Size(577, 20); this.introLabel.TabIndex = 11; this.introLabel.Text = "Enter one or more tags separated by commas. Use -tag to exclude indvidual tags"; + this.introLabel.ThemedBack = null; + this.introLabel.ThemedFore = null; // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(747, 327); this.cancelButton.Margin = new System.Windows.Forms.Padding(4, 5, 10, 9); this.cancelButton.Name = "cancelButton"; + this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(112, 35); + this.cancelButton.StylizeImage = false; this.cancelButton.TabIndex = 5; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.Cancel); // // searchPanel // - this.searchPanel.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.searchPanel.BackColor = System.Drawing.SystemColors.Control; this.searchPanel.Controls.Add(this.opBox); this.searchPanel.Controls.Add(this.clearLabel); this.searchPanel.Controls.Add(this.tagsFlow); @@ -161,18 +183,23 @@ private void InitializeComponent() // // clearLabel // + this.clearLabel.ActiveLinkColor = System.Drawing.Color.Orchid; this.clearLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.clearLabel.AutoSize = true; this.clearLabel.Cursor = System.Windows.Forms.Cursors.Hand; this.clearLabel.Enabled = false; this.clearLabel.HoverColor = System.Drawing.Color.MediumOrchid; - this.clearLabel.LinkColor = System.Drawing.Color.DodgerBlue; + this.clearLabel.LinkColor = System.Drawing.Color.MediumOrchid; this.clearLabel.Location = new System.Drawing.Point(790, 228); this.clearLabel.Name = "clearLabel"; this.clearLabel.Size = new System.Drawing.Size(65, 20); + this.clearLabel.StrictColors = false; this.clearLabel.TabIndex = 3; this.clearLabel.TabStop = true; this.clearLabel.Text = "Clear all"; + this.clearLabel.ThemedBack = null; + this.clearLabel.ThemedFore = null; + this.clearLabel.VisitedLinkColor = System.Drawing.Color.MediumOrchid; this.clearLabel.Click += new System.EventHandler(this.ClearFilters); // // tagsFlow @@ -181,6 +208,8 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.tagsFlow.AutoScroll = true; + this.tagsFlow.BackColor = System.Drawing.SystemColors.ControlLight; + this.tagsFlow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tagsFlow.Location = new System.Drawing.Point(22, 94); this.tagsFlow.Margin = new System.Windows.Forms.Padding(3, 9, 3, 3); this.tagsFlow.Name = "tagsFlow"; @@ -192,9 +221,12 @@ private void InitializeComponent() this.resultTree.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.resultTree.BackColor = System.Drawing.SystemColors.ControlLight; this.resultTree.CheckBoxes = true; this.resultTree.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawText; + this.resultTree.ForeColor = System.Drawing.SystemColors.ControlText; this.resultTree.HotTracking = true; + this.resultTree.LineColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100))))); this.resultTree.Location = new System.Drawing.Point(18, 40); this.resultTree.Margin = new System.Windows.Forms.Padding(10); this.resultTree.Name = "resultTree"; @@ -216,6 +248,7 @@ private void InitializeComponent() this.resultPanel.Controls.Add(this.resultTree); this.resultPanel.Controls.Add(this.cancelButton); this.resultPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.resultPanel.ForeColor = System.Drawing.SystemColors.ControlText; this.resultPanel.Location = new System.Drawing.Point(0, 0); this.resultPanel.Name = "resultPanel"; this.resultPanel.Padding = new System.Windows.Forms.Padding(10); @@ -224,76 +257,107 @@ private void InitializeComponent() // // clearAllLabel // + this.clearAllLabel.ActiveLinkColor = System.Drawing.Color.Orchid; this.clearAllLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.clearAllLabel.AutoSize = true; this.clearAllLabel.Cursor = System.Windows.Forms.Cursors.Hand; this.clearAllLabel.Enabled = false; this.clearAllLabel.HoverColor = System.Drawing.Color.MediumOrchid; - this.clearAllLabel.LinkColor = System.Drawing.Color.DodgerBlue; + this.clearAllLabel.LinkColor = System.Drawing.Color.MediumOrchid; this.clearAllLabel.Location = new System.Drawing.Point(715, 10); this.clearAllLabel.Name = "clearAllLabel"; this.clearAllLabel.Size = new System.Drawing.Size(139, 20); + this.clearAllLabel.StrictColors = false; this.clearAllLabel.TabIndex = 1; this.clearAllLabel.TabStop = true; this.clearAllLabel.Text = "Uncheck all pages"; + this.clearAllLabel.ThemedBack = null; + this.clearAllLabel.ThemedFore = null; + this.clearAllLabel.VisitedLinkColor = System.Drawing.Color.MediumOrchid; this.clearAllLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.ToggleChecks); // // checkAllLabel // + this.checkAllLabel.ActiveLinkColor = System.Drawing.Color.Orchid; this.checkAllLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.checkAllLabel.AutoSize = true; this.checkAllLabel.Cursor = System.Windows.Forms.Cursors.Hand; this.checkAllLabel.Enabled = false; this.checkAllLabel.HoverColor = System.Drawing.Color.MediumOrchid; - this.checkAllLabel.LinkColor = System.Drawing.Color.DodgerBlue; + this.checkAllLabel.LinkColor = System.Drawing.Color.MediumOrchid; this.checkAllLabel.Location = new System.Drawing.Point(578, 10); this.checkAllLabel.Margin = new System.Windows.Forms.Padding(3, 0, 10, 0); this.checkAllLabel.Name = "checkAllLabel"; this.checkAllLabel.Size = new System.Drawing.Size(121, 20); + this.checkAllLabel.StrictColors = false; this.checkAllLabel.TabIndex = 0; this.checkAllLabel.TabStop = true; this.checkAllLabel.Text = "Check all pages"; + this.checkAllLabel.ThemedBack = null; + this.checkAllLabel.ThemedFore = null; + this.checkAllLabel.VisitedLinkColor = System.Drawing.Color.MediumOrchid; this.checkAllLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.ToggleChecks); // // indexButton // this.indexButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.indexButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.indexButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.indexButton.Enabled = false; + this.indexButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.indexButton.ImageOver = null; this.indexButton.Location = new System.Drawing.Point(369, 326); this.indexButton.Margin = new System.Windows.Forms.Padding(4, 5, 10, 9); this.indexButton.Name = "indexButton"; + this.indexButton.ShowBorder = true; this.indexButton.Size = new System.Drawing.Size(112, 35); + this.indexButton.StylizeImage = false; this.indexButton.TabIndex = 2; this.indexButton.Text = "Index"; + this.indexButton.ThemedBack = null; + this.indexButton.ThemedFore = null; this.indexButton.UseVisualStyleBackColor = true; this.indexButton.Click += new System.EventHandler(this.IndexPressed); // // copyButton // this.copyButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.copyButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.copyButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.copyButton.Enabled = false; + this.copyButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.copyButton.ImageOver = null; this.copyButton.Location = new System.Drawing.Point(495, 326); this.copyButton.Margin = new System.Windows.Forms.Padding(4, 5, 10, 9); this.copyButton.Name = "copyButton"; + this.copyButton.ShowBorder = true; this.copyButton.Size = new System.Drawing.Size(112, 35); + this.copyButton.StylizeImage = false; this.copyButton.TabIndex = 3; this.copyButton.Text = "Copy"; + this.copyButton.ThemedBack = null; + this.copyButton.ThemedFore = null; this.copyButton.UseVisualStyleBackColor = true; this.copyButton.Click += new System.EventHandler(this.CopyPressed); // // moveButton // this.moveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.moveButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.moveButton.DialogResult = System.Windows.Forms.DialogResult.OK; this.moveButton.Enabled = false; + this.moveButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.moveButton.ImageOver = null; this.moveButton.Location = new System.Drawing.Point(621, 327); this.moveButton.Margin = new System.Windows.Forms.Padding(4, 5, 10, 9); this.moveButton.Name = "moveButton"; + this.moveButton.ShowBorder = true; this.moveButton.Size = new System.Drawing.Size(112, 35); + this.moveButton.StylizeImage = false; this.moveButton.TabIndex = 4; this.moveButton.Text = "Move"; + this.moveButton.ThemedBack = null; + this.moveButton.ThemedFore = null; this.moveButton.UseVisualStyleBackColor = true; this.moveButton.Click += new System.EventHandler(this.MovePressed); // @@ -327,6 +391,7 @@ private void InitializeComponent() this.CancelButton = this.cancelButton; this.ClientSize = new System.Drawing.Size(878, 644); this.Controls.Add(this.splitContainer); + this.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; @@ -347,12 +412,12 @@ private void InitializeComponent() #endregion - private System.Windows.Forms.Button searchButton; - private River.OneMoreAddIn.UI.FormTextBox filterBox; - private System.Windows.Forms.Label tagsLabel; + private UI.MoreButton searchButton; + private UI.MoreTextBox filterBox; + private UI.MoreLabel tagsLabel; private System.Windows.Forms.ComboBox scopeBox; - private System.Windows.Forms.Label introLabel; - private System.Windows.Forms.Button cancelButton; + private UI.MoreLabel introLabel; + private UI.MoreButton cancelButton; private System.Windows.Forms.Panel searchPanel; private System.Windows.Forms.FlowLayoutPanel tagsFlow; private UI.MoreLinkLabel clearLabel; @@ -361,9 +426,9 @@ private void InitializeComponent() private System.Windows.Forms.SplitContainer splitContainer; private UI.MoreLinkLabel clearAllLabel; private UI.MoreLinkLabel checkAllLabel; - private System.Windows.Forms.Button indexButton; - private System.Windows.Forms.Button copyButton; - private System.Windows.Forms.Button moveButton; + private UI.MoreButton indexButton; + private UI.MoreButton copyButton; + private UI.MoreButton moveButton; private System.Windows.Forms.ComboBox opBox; } } \ No newline at end of file diff --git a/OneMore/Commands/Tagging/TaggedDialog.resx b/OneMore/Commands/Tagging/TaggedDialog.resx index 04274eb5c3..8684ec1d48 100644 --- a/OneMore/Commands/Tagging/TaggedDialog.resx +++ b/OneMore/Commands/Tagging/TaggedDialog.resx @@ -120,29 +120,10 @@ True - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAxhJREFUOE+NkmtIk2EYhlc/+hXRUVELOtiP6GgHSiylfiQoGUbQiU4EQSaBJNHB - ZU5dY5qHZnkokVyYTpdb1nLTzW1u01k7lNMOSpaZmnNzc2767fDdfegXVhR0wQsv7/tc3M8DD+Nf1Jv6 - Fp4uarqawGsd2F2kw/67TThU8Kz9msiUIrBgHl32dzito7v23pEPhTIbsKNQhyTBG5ysNmNLTgvWXa/D - iTJtN//VSAhd/jtV79yhe7hy68osGfjmfowTfgw5Hahot0A3RoD18g2Cb7Xi2AO1FsBcWpslif+6OIwp - RUXnNxCEAyC8+Or04BRfh5gMMZSd/cgQmbE8vQ2shg9xtDbL/nyFI6qkAw6vAyRhA+nzw0sCbh8BQY8d - mzlKvB6cQDizGcfvN/JpbQZh71DQVo7Cl0wlkIQdLpIEAcr2E4DPBo/XhsN3ZVAPDCOSp0BcqbaLVmd4 - OTIREpGrCyTVmYApN8aoIQOkEyTpg8tP3X3jsBEe6vgQxW1BfLmul1ZniS/WOGLymuD0TMJDeuH3u0D4 - 3bAGSHS7pmAYcOGd1YNtGU9xtlIvoLVZLlRqrixKV6NE2QUHOQkvlWh1O5FcY8Fm5jOE36jHHjYf7MZe - 3JMZ1tHaDDmV0qBCSceBxJKmnvXXRUhVfEW/YwrXREasSGvHFo4EFRY7clVfEFmgwU2R6SytMhi1H0ci - EgoaBndyGgNsbd+xRJ7KuDpNgjTBK2zIkmBjthzNgy5MUPMrNVok3FEgvlSlm5ar3lq3H7wvcy7NVGIB - 14xteSo0dPbE5j43nM+u1bM3seqg/zQGn9eKqcA49KM2rOG2IZZnNDHKVJ9XHSqQ25dlGbD4tglr08VI - faKqSqe3TPAd8/cVNbsvi80Y9k/COOrBVm4zlrA0OFNSzWKcKZZagjNbsfS2Eeup3U+p7qyabusXcoTq - ozvSHnnP1XQgmv0CyzJliC6Svpeae4MYR/OFX4KzNQhjyXHpSdvjn8l/8lDfF3mxXFp+/pHclFKtZgmH - XEHTHznyrugjxS3KVLGFS+3NnOnH/4bB+AGj1xnTf6fgcQAAAABJRU5ErkJggg== - - True + AAABABIAICAAAAEACACoCAAAJgEAABAQAAABAAgAaAUAAM4JAABAQAAAAQAIACgWAAA2DwAAMDAAAAEA diff --git a/OneMore/Commands/Tagging/TaggingDialog.Designer.cs b/OneMore/Commands/Tagging/TaggingDialog.Designer.cs index 881843d655..7532d819f9 100644 --- a/OneMore/Commands/Tagging/TaggingDialog.Designer.cs +++ b/OneMore/Commands/Tagging/TaggingDialog.Designer.cs @@ -31,24 +31,24 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TaggingDialog)); this.buttonPanel = new System.Windows.Forms.Panel(); - this.okButton = new System.Windows.Forms.Button(); - this.cancelButton = new System.Windows.Forms.Button(); + this.okButton = new River.OneMoreAddIn.UI.MoreButton(); + this.cancelButton = new River.OneMoreAddIn.UI.MoreButton(); this.controlPanel = new System.Windows.Forms.Panel(); - this.tagLabel = new System.Windows.Forms.Label(); - this.introLabel = new System.Windows.Forms.Label(); - this.addButton = new System.Windows.Forms.Button(); - this.tagBox = new River.OneMoreAddIn.UI.FormTextBox(); + this.tagLabel = new River.OneMoreAddIn.UI.MoreLabel(); + this.introLabel = new River.OneMoreAddIn.UI.MoreLabel(); + this.addButton = new River.OneMoreAddIn.UI.MoreButton(); + this.tagBox = new River.OneMoreAddIn.UI.MoreTextBox(); this.splitter = new System.Windows.Forms.SplitContainer(); this.tagsFlow = new System.Windows.Forms.FlowLayoutPanel(); this.clearPanel = new System.Windows.Forms.Panel(); this.clearLabel = new River.OneMoreAddIn.UI.MoreLinkLabel(); this.suggestionPanel = new System.Windows.Forms.Panel(); this.suggestionsFlow = new System.Windows.Forms.FlowLayoutPanel(); - this.recentGroup = new System.Windows.Forms.GroupBox(); + this.recentGroup = new River.OneMoreAddIn.UI.MoreGroupBox(); this.recentFlow = new System.Windows.Forms.FlowLayoutPanel(); - this.commonGroup = new System.Windows.Forms.GroupBox(); + this.commonGroup = new River.OneMoreAddIn.UI.MoreGroupBox(); this.commonFlow = new System.Windows.Forms.FlowLayoutPanel(); - this.suggestionsLabel = new System.Windows.Forms.Label(); + this.suggestionsLabel = new River.OneMoreAddIn.UI.MoreLabel(); this.buttonPanel.SuspendLayout(); this.controlPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitter)).BeginInit(); @@ -64,6 +64,7 @@ private void InitializeComponent() // // buttonPanel // + this.buttonPanel.BackColor = System.Drawing.SystemColors.ControlLight; this.buttonPanel.Controls.Add(this.okButton); this.buttonPanel.Controls.Add(this.cancelButton); this.buttonPanel.Dock = System.Windows.Forms.DockStyle.Bottom; @@ -77,27 +78,42 @@ private void InitializeComponent() // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.okButton.ImageOver = null; this.okButton.Location = new System.Drawing.Point(722, 11); this.okButton.Name = "okButton"; + this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(100, 30); + this.okButton.StylizeImage = false; this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.cancelButton.ImageOver = null; this.cancelButton.Location = new System.Drawing.Point(828, 11); this.cancelButton.Name = "cancelButton"; + this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(100, 30); + this.cancelButton.StylizeImage = false; this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; // // controlPanel // + this.controlPanel.BackColor = System.Drawing.SystemColors.Control; this.controlPanel.Controls.Add(this.tagLabel); this.controlPanel.Controls.Add(this.introLabel); this.controlPanel.Controls.Add(this.addButton); @@ -105,7 +121,7 @@ private void InitializeComponent() this.controlPanel.Dock = System.Windows.Forms.DockStyle.Top; this.controlPanel.Location = new System.Drawing.Point(0, 0); this.controlPanel.Name = "controlPanel"; - this.controlPanel.Size = new System.Drawing.Size(941, 106); + this.controlPanel.Size = new System.Drawing.Size(941, 116); this.controlPanel.TabIndex = 9; // // tagLabel @@ -119,24 +135,36 @@ private void InitializeComponent() this.tagLabel.Size = new System.Drawing.Size(107, 22); this.tagLabel.TabIndex = 0; this.tagLabel.Text = "Page Tags"; + this.tagLabel.ThemedBack = null; + this.tagLabel.ThemedFore = null; // // introLabel // this.introLabel.AutoSize = true; - this.introLabel.Location = new System.Drawing.Point(9, 29); + this.introLabel.ForeColor = System.Drawing.SystemColors.ControlText; + this.introLabel.Location = new System.Drawing.Point(32, 40); this.introLabel.Name = "introLabel"; this.introLabel.Size = new System.Drawing.Size(206, 20); this.introLabel.TabIndex = 1; this.introLabel.Text = "Separate tags with commas"; + this.introLabel.ThemedBack = null; + this.introLabel.ThemedFore = null; // // addButton // this.addButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.addButton.Location = new System.Drawing.Point(828, 50); + this.addButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.addButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.addButton.ImageOver = null; + this.addButton.Location = new System.Drawing.Point(828, 61); this.addButton.Name = "addButton"; + this.addButton.ShowBorder = true; this.addButton.Size = new System.Drawing.Size(100, 30); + this.addButton.StylizeImage = false; this.addButton.TabIndex = 1; this.addButton.Text = "Add"; + this.addButton.ThemedBack = null; + this.addButton.ThemedFore = null; this.addButton.UseVisualStyleBackColor = true; this.addButton.Click += new System.EventHandler(this.AcceptInput); // @@ -144,24 +172,28 @@ private void InitializeComponent() // this.tagBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.tagBox.BackColor = System.Drawing.SystemColors.Info; - this.tagBox.Location = new System.Drawing.Point(18, 52); + this.tagBox.BackColor = System.Drawing.SystemColors.Window; + this.tagBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tagBox.Location = new System.Drawing.Point(36, 63); this.tagBox.Name = "tagBox"; - this.tagBox.Size = new System.Drawing.Size(804, 26); + this.tagBox.ProcessEnterKey = true; + this.tagBox.Size = new System.Drawing.Size(786, 26); this.tagBox.TabIndex = 0; + this.tagBox.ThemedBack = null; + this.tagBox.ThemedFore = null; // // splitter // this.splitter.BackColor = System.Drawing.SystemColors.GradientActiveCaption; this.splitter.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitter.Location = new System.Drawing.Point(0, 106); + this.splitter.Location = new System.Drawing.Point(0, 116); this.splitter.Margin = new System.Windows.Forms.Padding(3, 4, 3, 3); this.splitter.Name = "splitter"; this.splitter.Orientation = System.Windows.Forms.Orientation.Horizontal; // // splitter.Panel1 // - this.splitter.Panel1.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.splitter.Panel1.BackColor = System.Drawing.SystemColors.ControlLight; this.splitter.Panel1.Controls.Add(this.tagsFlow); this.splitter.Panel1.Controls.Add(this.clearPanel); this.splitter.Panel1.Padding = new System.Windows.Forms.Padding(15, 0, 15, 0); @@ -173,62 +205,69 @@ private void InitializeComponent() this.splitter.Panel2.Controls.Add(this.suggestionPanel); this.splitter.Panel2.Margin = new System.Windows.Forms.Padding(0, 0, 15, 0); this.splitter.Panel2MinSize = 300; - this.splitter.Size = new System.Drawing.Size(941, 532); - this.splitter.SplitterDistance = 180; + this.splitter.Size = new System.Drawing.Size(941, 522); + this.splitter.SplitterDistance = 201; this.splitter.SplitterWidth = 8; this.splitter.TabIndex = 8; // // tagsFlow // this.tagsFlow.AutoScroll = true; - this.tagsFlow.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.tagsFlow.BackColor = System.Drawing.SystemColors.ControlLight; this.tagsFlow.Dock = System.Windows.Forms.DockStyle.Fill; this.tagsFlow.Location = new System.Drawing.Point(15, 0); this.tagsFlow.MinimumSize = new System.Drawing.Size(0, 100); this.tagsFlow.Name = "tagsFlow"; - this.tagsFlow.Size = new System.Drawing.Size(911, 145); + this.tagsFlow.Size = new System.Drawing.Size(911, 166); this.tagsFlow.TabIndex = 4; // // clearPanel // - this.clearPanel.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.clearPanel.BackColor = System.Drawing.SystemColors.ControlLight; this.clearPanel.Controls.Add(this.clearLabel); this.clearPanel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.clearPanel.Location = new System.Drawing.Point(15, 145); + this.clearPanel.Location = new System.Drawing.Point(15, 166); this.clearPanel.Name = "clearPanel"; this.clearPanel.Size = new System.Drawing.Size(911, 35); this.clearPanel.TabIndex = 6; // // clearLabel // + this.clearLabel.ActiveLinkColor = System.Drawing.Color.Orchid; this.clearLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.clearLabel.AutoSize = true; this.clearLabel.Cursor = System.Windows.Forms.Cursors.Hand; this.clearLabel.Enabled = false; + this.clearLabel.ForeColor = System.Drawing.SystemColors.ControlText; this.clearLabel.HoverColor = System.Drawing.Color.MediumOrchid; - this.clearLabel.LinkColor = System.Drawing.Color.DodgerBlue; + this.clearLabel.LinkColor = System.Drawing.Color.MediumOrchid; this.clearLabel.Location = new System.Drawing.Point(822, 7); this.clearLabel.Margin = new System.Windows.Forms.Padding(3, 8, 8, 8); this.clearLabel.Name = "clearLabel"; this.clearLabel.Size = new System.Drawing.Size(87, 20); + this.clearLabel.StrictColors = false; this.clearLabel.TabIndex = 5; this.clearLabel.TabStop = true; this.clearLabel.Text = "Remove all"; + this.clearLabel.ThemedBack = null; + this.clearLabel.ThemedFore = null; + this.clearLabel.VisitedLinkColor = System.Drawing.Color.MediumOrchid; this.clearLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.RemoveAllTags); // // suggestionPanel // this.suggestionPanel.AutoSize = true; this.suggestionPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.suggestionPanel.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.suggestionPanel.BackColor = System.Drawing.SystemColors.Control; this.suggestionPanel.Controls.Add(this.suggestionsFlow); this.suggestionPanel.Controls.Add(this.suggestionsLabel); this.suggestionPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.suggestionPanel.ForeColor = System.Drawing.SystemColors.ControlText; this.suggestionPanel.Location = new System.Drawing.Point(0, 0); this.suggestionPanel.MinimumSize = new System.Drawing.Size(0, 200); this.suggestionPanel.Name = "suggestionPanel"; this.suggestionPanel.Padding = new System.Windows.Forms.Padding(10); - this.suggestionPanel.Size = new System.Drawing.Size(941, 344); + this.suggestionPanel.Size = new System.Drawing.Size(941, 313); this.suggestionPanel.TabIndex = 2; // // suggestionsFlow @@ -236,22 +275,23 @@ private void InitializeComponent() this.suggestionsFlow.AutoScroll = true; this.suggestionsFlow.AutoSize = true; this.suggestionsFlow.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.suggestionsFlow.BackColor = System.Drawing.SystemColors.ControlLight; this.suggestionsFlow.Controls.Add(this.recentGroup); this.suggestionsFlow.Controls.Add(this.commonGroup); this.suggestionsFlow.Dock = System.Windows.Forms.DockStyle.Fill; this.suggestionsFlow.Location = new System.Drawing.Point(10, 38); this.suggestionsFlow.MinimumSize = new System.Drawing.Size(400, 170); this.suggestionsFlow.Name = "suggestionsFlow"; - this.suggestionsFlow.Size = new System.Drawing.Size(921, 296); + this.suggestionsFlow.Padding = new System.Windows.Forms.Padding(15, 15, 0, 0); + this.suggestionsFlow.Size = new System.Drawing.Size(921, 265); this.suggestionsFlow.TabIndex = 5; this.suggestionsFlow.Resize += new System.EventHandler(this.SuggestionsResize); // // recentGroup // - this.recentGroup.BackColor = System.Drawing.SystemColors.ControlLightLight; this.recentGroup.Controls.Add(this.recentFlow); this.suggestionsFlow.SetFlowBreak(this.recentGroup, true); - this.recentGroup.Location = new System.Drawing.Point(3, 3); + this.recentGroup.Location = new System.Drawing.Point(18, 18); this.recentGroup.MinimumSize = new System.Drawing.Size(400, 80); this.recentGroup.Name = "recentGroup"; this.recentGroup.Padding = new System.Windows.Forms.Padding(5); @@ -272,10 +312,9 @@ private void InitializeComponent() // // commonGroup // - this.commonGroup.BackColor = System.Drawing.SystemColors.ControlLightLight; this.commonGroup.Controls.Add(this.commonFlow); this.suggestionsFlow.SetFlowBreak(this.commonGroup, true); - this.commonGroup.Location = new System.Drawing.Point(3, 89); + this.commonGroup.Location = new System.Drawing.Point(18, 104); this.commonGroup.MinimumSize = new System.Drawing.Size(400, 80); this.commonGroup.Name = "commonGroup"; this.commonGroup.Padding = new System.Windows.Forms.Padding(5); @@ -307,6 +346,8 @@ private void InitializeComponent() this.suggestionsLabel.Size = new System.Drawing.Size(120, 28); this.suggestionsLabel.TabIndex = 1; this.suggestionsLabel.Text = "Suggestions"; + this.suggestionsLabel.ThemedBack = null; + this.suggestionsLabel.ThemedFore = null; // // TaggingDialog // @@ -319,6 +360,7 @@ private void InitializeComponent() this.Controls.Add(this.splitter); this.Controls.Add(this.controlPanel); this.Controls.Add(this.buttonPanel); + this.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; @@ -349,23 +391,23 @@ private void InitializeComponent() #endregion private System.Windows.Forms.Panel buttonPanel; - private System.Windows.Forms.Button okButton; - private System.Windows.Forms.Button cancelButton; + private UI.MoreButton okButton; + private UI.MoreButton cancelButton; private System.Windows.Forms.Panel controlPanel; - private System.Windows.Forms.Label tagLabel; - private System.Windows.Forms.Label introLabel; - private System.Windows.Forms.Button addButton; - private UI.FormTextBox tagBox; + private UI.MoreLabel tagLabel; + private UI.MoreLabel introLabel; + private UI.MoreButton addButton; + private UI.MoreTextBox tagBox; private System.Windows.Forms.SplitContainer splitter; private System.Windows.Forms.FlowLayoutPanel tagsFlow; private System.Windows.Forms.Panel clearPanel; private UI.MoreLinkLabel clearLabel; private System.Windows.Forms.Panel suggestionPanel; private System.Windows.Forms.FlowLayoutPanel suggestionsFlow; - private System.Windows.Forms.GroupBox recentGroup; + private UI.MoreGroupBox recentGroup; private System.Windows.Forms.FlowLayoutPanel recentFlow; - private System.Windows.Forms.GroupBox commonGroup; + private UI.MoreGroupBox commonGroup; private System.Windows.Forms.FlowLayoutPanel commonFlow; - private System.Windows.Forms.Label suggestionsLabel; + private UI.MoreLabel suggestionsLabel; } } \ No newline at end of file diff --git a/OneMore/Commands/Tagging/TaggingDialog.cs b/OneMore/Commands/Tagging/TaggingDialog.cs index 816caf17db..d336ede9c7 100644 --- a/OneMore/Commands/Tagging/TaggingDialog.cs +++ b/OneMore/Commands/Tagging/TaggingDialog.cs @@ -1,10 +1,11 @@ //************************************************************************************************ -// Copyright © 2020 Steven M Cohn. All rights reserved. +// Copyright © 2020 Steven M Cohn. All rights reserved. //************************************************************************************************ namespace River.OneMoreAddIn.Commands { using River.OneMoreAddIn.Models; + using River.OneMoreAddIn.UI; using System; using System.Collections.Generic; using System.Drawing; @@ -15,7 +16,7 @@ namespace River.OneMoreAddIn.Commands using System.Web; using System.Windows.Forms; using System.Xml.Linq; - using Resx = River.OneMoreAddIn.Properties.Resources; + using Resx = Properties.Resources; internal partial class TaggingDialog : UI.MoreForm @@ -562,16 +563,22 @@ private void FetchCommonWords() private Label MakeLabel(string value, string text) { - var label = new Label + var manager = ThemeManager.Instance; + + var label = new MoreLabel { Name = value, Tag = value, AutoSize = true, + BorderStyle = BorderStyle.FixedSingle, + Cursor = Cursors.Hand, Margin = new Padding(4), Padding = new Padding(4, 5, 4, 5), Text = text, - BackColor = SystemColors.ControlLight, - Cursor = Cursors.Hand + BackColor = manager.GetColor("Control"), + ForeColor = manager.GetColor("ControlText"), + ThemedBack = "Control", + ThemedFore = "ControlText" }; label.Click += (sender, e) => @@ -581,12 +588,12 @@ private Label MakeLabel(string value, string text) label.MouseEnter += (sender, e) => { - ((Label)sender).BackColor = Color.FromKnownColor(KnownColor.LightSkyBlue); + ((Label)sender).BackColor = ThemeManager.Instance.GetColor("ButtonHighlight"); }; label.MouseLeave += (sender, e) => { - ((Label)sender).BackColor = SystemColors.ControlLight; + ((Label)sender).BackColor = ThemeManager.Instance.GetColor("Control"); }; return label; diff --git a/OneMore/OneMore.csproj b/OneMore/OneMore.csproj index 74e9050883..5bc400f198 100644 --- a/OneMore/OneMore.csproj +++ b/OneMore/OneMore.csproj @@ -1479,6 +1479,7 @@ TagControl.cs + Designer ImportDialog.cs diff --git a/OneMore/UI/HierarchyView.cs b/OneMore/UI/HierarchyView.cs index 32d89eb08f..e3f9175273 100644 --- a/OneMore/UI/HierarchyView.cs +++ b/OneMore/UI/HierarchyView.cs @@ -1,5 +1,5 @@ //************************************************************************************************ -// Copyright © 2020 Steven M Cohn. All rights reserved. +// Copyright © 2020 Steven M Cohn. All rights reserved. //************************************************************************************************ namespace River.OneMoreAddIn.UI @@ -9,7 +9,7 @@ namespace River.OneMoreAddIn.UI using System.Runtime.InteropServices; using System.Windows.Forms; using System.Xml.Linq; - using Resx = River.OneMoreAddIn.Properties.Resources; + using Resx = Properties.Resources; /// @@ -17,13 +17,16 @@ namespace River.OneMoreAddIn.UI /// notebooks, section groups, and sections, and possibly checkboxes for pages. Pages can also /// be hyperlinked. /// - internal class HierarchyView : TreeView + internal class HierarchyView : TreeView, ILoadControl { private const int CheckboxMargin = 4; // space between checkbox and label private const int ImageWidth = 28; // width of image plus margins private readonly IntPtr hcursor; private readonly IntPtr pcursor; + private Color backColor; + private Color foreColor; + private Color hotColor; /// @@ -84,7 +87,9 @@ private void DisplayResults(XElement root, XNamespace ns, TreeNodeCollection nod { node = new HierarchyNode(root.Attribute("name").Value, root) { - Hyperlinked = true + Hyperlinked = true, + BackColor = backColor, + ForeColor = foreColor }; nodes.Add(node); @@ -100,7 +105,12 @@ private void DisplayResults(XElement root, XNamespace ns, TreeNodeCollection nod return; } - node = new HierarchyNode(root.Attribute("name")?.Value, root); + node = new HierarchyNode(root.Attribute("name")?.Value, root) + { + BackColor = backColor, + ForeColor = foreColor + }; + nodes.Add(node); foreach (var element in root.Elements()) @@ -109,6 +119,16 @@ private void DisplayResults(XElement root, XNamespace ns, TreeNodeCollection nod } } + + void ILoadControl.OnLoad() + { + var manager = ThemeManager.Instance; + backColor = manager.GetColor("ControlLight"); + foreColor = manager.GetColor("ControlText"); + hotColor = manager.GetColor("HotTrack"); + } + + #region Results XML /* @@ -257,7 +277,8 @@ protected override void OnDrawNode(DrawTreeNodeEventArgs e) // done regardless of selection since mousedown on unselected will still draw background // expand bounds to fill gap between checkbox and label - e.Graphics.FillRectangle(SystemBrushes.Window, + using var fillBrush = new SolidBrush(e.Node.BackColor); + e.Graphics.FillRectangle(fillBrush, bounds.Left - CheckboxMargin, bounds.Top, bounds.Width + CheckboxMargin, bounds.Height); @@ -288,24 +309,34 @@ protected override void OnDrawNode(DrawTreeNodeEventArgs e) // draw the label... - Brush brush; - Font font; + Brush brush = null; + Font font = null; + var hot = ((e.State & TreeNodeStates.Hot) != 0) && (node?.Hyperlinked == true); - if (((e.State & TreeNodeStates.Hot) != 0) && (node?.Hyperlinked == true)) + try { - brush = SystemBrushes.HotTrack; - font = new Font(e.Node.NodeFont ?? Font, FontStyle.Underline); - //Cursor = Cursors.Hand; + if (hot) + { + brush = new SolidBrush(hotColor); + font = new Font(e.Node.NodeFont ?? Font, FontStyle.Underline); + } + else + { + brush = new SolidBrush(e.Node.ForeColor); + font = e.Node.NodeFont ?? Font; + } + + var left = node?.HierarchyLevel < HierarchyLevels.Page ? bounds.Left + 20 : bounds.Left; + e.Graphics.DrawString(e.Node.Text, font, brush, left, bounds.Top); } - else + finally { - brush = SystemBrushes.ControlText; - font = e.Node.NodeFont ?? Font; - //Cursor = Cursors.Default; + brush?.Dispose(); + if (hot) + { + font?.Dispose(); + } } - - var left = node?.HierarchyLevel < HierarchyLevels.Page ? bounds.Left + 20 : bounds.Left; - e.Graphics.DrawString(e.Node.Text, font, brush, left, bounds.Top); } diff --git a/OneMore/UI/MoreButton.cs b/OneMore/UI/MoreButton.cs index e312c562e6..bc8ad6548e 100644 --- a/OneMore/UI/MoreButton.cs +++ b/OneMore/UI/MoreButton.cs @@ -104,17 +104,12 @@ void ILoadControl.OnLoad() if (StylizeImage) { - var editor = new ImageEditor(); + var editor = new ImageEditor { Size = new Size(16, 16) }; if (manager.DarkMode) { editor.Style = ImageEditor.Stylization.Invert; } - if (Image.Height > 16) - { - editor.Size = new Size(16, 16); - } - using var img = Image; Image = editor.Apply(img); } diff --git a/OneMore/UI/MoreTextBox.cs b/OneMore/UI/MoreTextBox.cs index fe326b1b69..812d853193 100644 --- a/OneMore/UI/MoreTextBox.cs +++ b/OneMore/UI/MoreTextBox.cs @@ -1,21 +1,41 @@ //************************************************************************************************ -// Copyright © 2024 Steven M Cohn. All rights reserved. +// Copyright © 2020 Steven M Cohn. All rights reserved. //************************************************************************************************ namespace River.OneMoreAddIn.UI { using System; + using System.ComponentModel; using System.Windows.Forms; + /// + /// This is a standard TextBox that intercepts pressing the Enter key so it does not also + /// cause the default (accept) button of a dialog to be pressed. Instead, a press of the + /// Enter key is projected in its own custom event, PressedEnter. + /// internal class MoreTextBox : TextBox, ILoadControl { + private const int WM_KEYDOWN = 256; + + public MoreTextBox() { BorderStyle = BorderStyle.FixedSingle; } + /// + /// The event fired when the Enter key is pressed in this TextBox + /// + public event EventHandler PressedEnter; + + + [Category("OneMore"), + Description("Catch and process Enter key with ProcessedEnter event")] + public bool ProcessEnterKey { get; set; } + + public string ThemedBack { get; set; } @@ -35,5 +55,20 @@ protected override void OnEnabledChanged(EventArgs e) base.OnEnabledChanged(e); ((ILoadControl)this).OnLoad(); } + + + protected override bool ProcessCmdKey(ref Message m, Keys keyData) + { + if (ProcessEnterKey && m.Msg == WM_KEYDOWN && keyData == Keys.Enter) + { + PressedEnter?.Invoke(this, new EventArgs()); + + // stop further propagation + return true; + } + + // else default handlers... + return base.ProcessCmdKey(ref m, keyData); + } } } From 4a40dab6f28d08389f5886417c2c886ae6207bf7 Mon Sep 17 00:00:00 2001 From: Steven Cohn Date: Fri, 9 Feb 2024 23:12:15 -0500 Subject: [PATCH 8/9] message boxes --- OneMore/Commands/File/CopyFolderCommand.cs | 7 +-- .../Commands/References/GetImagesCommand.cs | 7 +-- .../Commands/Search/SearchAndReplaceDialog.cs | 1 - OneMore/Commands/Settings/FavoritesSheet.cs | 7 +-- OneMore/Commands/Settings/PluginsSheet.cs | 7 +-- .../Commands/Settings/SearchEngineSheet.cs | 7 +-- OneMore/Commands/Settings/SnippetsSheet.cs | 7 +-- OneMore/Commands/Styles/StyleDialog.cs | 5 +- OneMore/Commands/Tagging/TaggingDialog.cs | 5 +- OneMore/Commands/Tools/ClearLogCommand.cs | 8 +-- OneMore/Commands/Tools/ShowXmlDialog.cs | 8 +-- OneMore/Helpers/UIHelper.cs | 24 --------- OneMore/UI/MoreForm.cs | 21 +++++++- OneMore/UI/MoreMessageBox.Designer.cs | 54 +++++++++++++++---- OneMore/UI/MoreMessageBox.cs | 38 +++++++++++-- 15 files changed, 120 insertions(+), 86 deletions(-) diff --git a/OneMore/Commands/File/CopyFolderCommand.cs b/OneMore/Commands/File/CopyFolderCommand.cs index fba3e78ae2..514fff373e 100644 --- a/OneMore/Commands/File/CopyFolderCommand.cs +++ b/OneMore/Commands/File/CopyFolderCommand.cs @@ -75,12 +75,9 @@ private async Task Callback(string targetId) { logger.WriteLine("cannot copy a folder into itself or one of its children"); - MessageBox.Show( + UI.MoreMessageBox.Show(owner, Resx.CopyFolderCommand_InvalidTarget, - Resx.OneMoreTab_Label, - MessageBoxButtons.OK, MessageBoxIcon.Information, - MessageBoxDefaultButton.Button1, - MessageBoxOptions.DefaultDesktopOnly); + MessageBoxButtons.OK, MessageBoxIcon.Information); return; } diff --git a/OneMore/Commands/References/GetImagesCommand.cs b/OneMore/Commands/References/GetImagesCommand.cs index b0a5b4c555..8582509da3 100644 --- a/OneMore/Commands/References/GetImagesCommand.cs +++ b/OneMore/Commands/References/GetImagesCommand.cs @@ -64,12 +64,9 @@ public override async Task Execute(params object[] args) return; } - var result = MessageBox.Show( + var result = UI.MoreMessageBox.Show(owner, Resx.GetImagesCommand_Cite, - Resx.OneMoreTab_Label, - MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, - MessageBoxDefaultButton.Button2, - MessageBoxOptions.DefaultDesktopOnly); + MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question); if (result == DialogResult.Cancel) { diff --git a/OneMore/Commands/Search/SearchAndReplaceDialog.cs b/OneMore/Commands/Search/SearchAndReplaceDialog.cs index 735a595532..1ced171eb5 100644 --- a/OneMore/Commands/Search/SearchAndReplaceDialog.cs +++ b/OneMore/Commands/Search/SearchAndReplaceDialog.cs @@ -104,7 +104,6 @@ public string WhatText private void FocusOnWhat(object sender, EventArgs e) { - UIHelper.SetForegroundWindow(this); whatBox.Focus(); } diff --git a/OneMore/Commands/Settings/FavoritesSheet.cs b/OneMore/Commands/Settings/FavoritesSheet.cs index e45606695e..4e7f649126 100644 --- a/OneMore/Commands/Settings/FavoritesSheet.cs +++ b/OneMore/Commands/Settings/FavoritesSheet.cs @@ -118,12 +118,9 @@ private void DeleteItems(object sender, EventArgs e) ? favorites[first].Name : $"({gridView.SelectedRows.Count})"; - var result = MessageBox.Show( + var result = UI.MoreMessageBox.Show(this, string.Format(Resx.FavoritesSheet_DeleteMessage, text), - "OneMore", - MessageBoxButtons.YesNo, MessageBoxIcon.Question, - MessageBoxDefaultButton.Button2, - MessageBoxOptions.DefaultDesktopOnly); + MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (result != DialogResult.Yes) return; diff --git a/OneMore/Commands/Settings/PluginsSheet.cs b/OneMore/Commands/Settings/PluginsSheet.cs index 6b36a31096..a4c9c6884b 100644 --- a/OneMore/Commands/Settings/PluginsSheet.cs +++ b/OneMore/Commands/Settings/PluginsSheet.cs @@ -198,12 +198,9 @@ private void DeleteItem(object sender, EventArgs e) var plugin = plugins[rowIndex]; - var result = MessageBox.Show( + var result = UI.MoreMessageBox.Show(this, string.Format(Resx.PluginsSheet_ConfirmDelete, plugin.Name), - "OneMore", - MessageBoxButtons.YesNo, MessageBoxIcon.Question, - MessageBoxDefaultButton.Button2, - MessageBoxOptions.DefaultDesktopOnly); + MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (result != DialogResult.Yes) return; diff --git a/OneMore/Commands/Settings/SearchEngineSheet.cs b/OneMore/Commands/Settings/SearchEngineSheet.cs index ed3fd65481..254a9e71cf 100644 --- a/OneMore/Commands/Settings/SearchEngineSheet.cs +++ b/OneMore/Commands/Settings/SearchEngineSheet.cs @@ -206,12 +206,9 @@ private void deleteButton_Click(object sender, EventArgs e) var engine = engines[rowIndex]; - var result = MessageBox.Show( + var result = UI.MoreMessageBox.Show(this, string.Format(Resx.SearchEngineDialog_DeleteMessage, engine.Name), - "OneMore", - MessageBoxButtons.YesNo, MessageBoxIcon.Question, - MessageBoxDefaultButton.Button2, - MessageBoxOptions.DefaultDesktopOnly); + MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (result != DialogResult.Yes) return; diff --git a/OneMore/Commands/Settings/SnippetsSheet.cs b/OneMore/Commands/Settings/SnippetsSheet.cs index 54544ebe0b..7219032182 100644 --- a/OneMore/Commands/Settings/SnippetsSheet.cs +++ b/OneMore/Commands/Settings/SnippetsSheet.cs @@ -94,12 +94,9 @@ private void DeleteItem(object sender, EventArgs e) var snippet = snippets[rowIndex]; - var result = MessageBox.Show( + var result = UI.MoreMessageBox.Show(this, string.Format(Resx.SnippetsSheet_ConfirmDelete, snippet.Name), - "OneMore", - MessageBoxButtons.YesNo, MessageBoxIcon.Question, - MessageBoxDefaultButton.Button2, - MessageBoxOptions.DefaultDesktopOnly); + MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (result != DialogResult.Yes) return; diff --git a/OneMore/Commands/Styles/StyleDialog.cs b/OneMore/Commands/Styles/StyleDialog.cs index 7a445950a7..8359f3b4dd 100644 --- a/OneMore/Commands/Styles/StyleDialog.cs +++ b/OneMore/Commands/Styles/StyleDialog.cs @@ -808,8 +808,9 @@ private void RenameStyle(object sender, EventArgs e) private void DeleteStyle(object sender, EventArgs e) { - var result = MessageBox.Show(this, "Delete this custom style?", "Confirm", - MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2); + var result = UI.MoreMessageBox.Show(this, + "Delete this custom style?", + MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (result == DialogResult.Yes) { diff --git a/OneMore/Commands/Tagging/TaggingDialog.cs b/OneMore/Commands/Tagging/TaggingDialog.cs index d336ede9c7..4faeb01b49 100644 --- a/OneMore/Commands/Tagging/TaggingDialog.cs +++ b/OneMore/Commands/Tagging/TaggingDialog.cs @@ -641,10 +641,9 @@ private void AddTag(string text) private void RemoveAllTags(object sender, LinkLabelLinkClickedEventArgs e) { - var result = MessageBox.Show(this, + var result = UI.MoreMessageBox.Show(this, "Remove all tags from the current page?", - "Confirm", - MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2); + MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (result == DialogResult.Yes) { diff --git a/OneMore/Commands/Tools/ClearLogCommand.cs b/OneMore/Commands/Tools/ClearLogCommand.cs index 9bb93465fb..60faf8373b 100644 --- a/OneMore/Commands/Tools/ClearLogCommand.cs +++ b/OneMore/Commands/Tools/ClearLogCommand.cs @@ -23,12 +23,8 @@ public override async Task Execute(params object[] args) { if (File.Exists(logger.LogPath)) { - var result = MessageBox.Show( - Resx.ClearLog_Message, - Resx.ClearLog_Title, - MessageBoxButtons.YesNo, MessageBoxIcon.Question, - MessageBoxDefaultButton.Button1, - MessageBoxOptions.DefaultDesktopOnly); + var result = UI.MoreMessageBox.Show(owner, + Resx.ClearLog_Message, MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (result == DialogResult.Yes) { diff --git a/OneMore/Commands/Tools/ShowXmlDialog.cs b/OneMore/Commands/Tools/ShowXmlDialog.cs index e2995b9bf9..e3c319b461 100644 --- a/OneMore/Commands/Tools/ShowXmlDialog.cs +++ b/OneMore/Commands/Tools/ShowXmlDialog.cs @@ -132,8 +132,7 @@ protected override async void OnLoad(EventArgs e) protected override void OnShown(EventArgs e) { - //Location = new System.Drawing.Point(30, 30); - UIHelper.SetForegroundWindow(this); + base.OnShown(e); findBox.Focus(); } @@ -894,7 +893,10 @@ await ShowHierarchy(manualBox, private async void UpdatePage(object sender, EventArgs e) { - var result = UIHelper.ShowQuestion(Resx.ShowXmlDialog_WARNING); + //var result = UIHelper.ShowQuestion(Resx.ShowXmlDialog_WARNING); + var result = UI.MoreMessageBox.Show(this, + Resx.ShowXmlDialog_WARNING, MessageBoxButtons.YesNo, MessageBoxIcon.Question); + if (result == DialogResult.Yes) { try diff --git a/OneMore/Helpers/UIHelper.cs b/OneMore/Helpers/UIHelper.cs index da4f23897d..86a88086af 100644 --- a/OneMore/Helpers/UIHelper.cs +++ b/OneMore/Helpers/UIHelper.cs @@ -117,21 +117,6 @@ static void Main() } - public static void SetForegroundWindow (Form form) - { - var location = form.Location; - - Native.SetForegroundWindow(form.Handle); - form.BringToFront(); - form.TopMost = true; - form.Activate(); - form.TopMost = false; - - form.Location = location; - form.Focus(); - } - - public static void ShowInfo(IWin32Window window, string message) { MessageBox.Show(window, message, Resx.ProgramName, @@ -156,15 +141,6 @@ public static void ShowInfo(string message) /// /// The OneNote window, from ApplicationManager.Window /// The caption message to display - public static void ShowMessage(IWin32Window window, string message) - { - MessageBox.Show(window, message, Resx.ProgramName, - MessageBoxButtons.OK, MessageBoxIcon.None, - MessageBoxDefaultButton.Button1, - MessageBoxOptions.DefaultDesktopOnly); - } - - public static void ShowMessage(string message) { MessageBox.Show(message, Resx.ProgramName, diff --git a/OneMore/UI/MoreForm.cs b/OneMore/UI/MoreForm.cs index f3c566c973..2f63f19db0 100644 --- a/OneMore/UI/MoreForm.cs +++ b/OneMore/UI/MoreForm.cs @@ -198,9 +198,28 @@ private void LoadControls(Control.ControlCollection controls) protected override void OnShown(EventArgs e) { + base.OnShown(e); + // modeless dialogs would appear behind the OneNote window by default // so this forces the dialog to the foreground - UIHelper.SetForegroundWindow(this); + SetForegroundWindow(this); + } + + + private void SetForegroundWindow(Form form) + { + // a bunch of hocus-pocus to force the form to the foreground... + + var location = form.Location; + + Native.SetForegroundWindow(form.Handle); + form.BringToFront(); + form.TopMost = true; + form.Activate(); + form.TopMost = false; + + form.Location = location; + form.Focus(); } diff --git a/OneMore/UI/MoreMessageBox.Designer.cs b/OneMore/UI/MoreMessageBox.Designer.cs index e44e4a0263..1ec13da3ee 100644 --- a/OneMore/UI/MoreMessageBox.Designer.cs +++ b/OneMore/UI/MoreMessageBox.Designer.cs @@ -36,6 +36,7 @@ private void InitializeComponent() this.okButton = new River.OneMoreAddIn.UI.MoreButton(); this.cancelButton = new River.OneMoreAddIn.UI.MoreButton(); this.panel1 = new System.Windows.Forms.Panel(); + this.noButton = new River.OneMoreAddIn.UI.MoreButton(); this.topPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.iconBox)).BeginInit(); this.panel1.SuspendLayout(); @@ -53,12 +54,13 @@ private void InitializeComponent() this.topPanel.Margin = new System.Windows.Forms.Padding(0); this.topPanel.Name = "topPanel"; this.topPanel.Padding = new System.Windows.Forms.Padding(20); - this.topPanel.Size = new System.Drawing.Size(678, 157); + this.topPanel.Size = new System.Drawing.Size(706, 157); this.topPanel.TabIndex = 0; // // logLink // this.logLink.ActiveLinkColor = System.Drawing.Color.DarkOrchid; + this.logLink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.logLink.AutoSize = true; this.logLink.Cursor = System.Windows.Forms.Cursors.Hand; this.logLink.HoverColor = System.Drawing.Color.Orchid; @@ -66,16 +68,20 @@ private void InitializeComponent() this.logLink.Location = new System.Drawing.Point(90, 117); this.logLink.Name = "logLink"; this.logLink.Size = new System.Drawing.Size(246, 20); + this.logLink.StrictColors = false; this.logLink.TabIndex = 2; this.logLink.TabStop = true; this.logLink.Text = "Click to open the OneMore log file"; + this.logLink.ThemedBack = null; + this.logLink.ThemedFore = null; this.logLink.Visible = false; this.logLink.VisitedLinkColor = System.Drawing.Color.MediumOrchid; this.logLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OpenLog); // // messageBox // - this.messageBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.messageBox.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.messageBox.BackColor = System.Drawing.SystemColors.ControlLightLight; this.messageBox.BorderStyle = System.Windows.Forms.BorderStyle.None; @@ -86,7 +92,7 @@ private void InitializeComponent() this.messageBox.Name = "messageBox"; this.messageBox.ReadOnly = true; this.messageBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical; - this.messageBox.Size = new System.Drawing.Size(539, 91); + this.messageBox.Size = new System.Drawing.Size(567, 91); this.messageBox.TabIndex = 1; this.messageBox.TabStop = false; this.messageBox.Text = "This is the message"; @@ -104,52 +110,77 @@ private void InitializeComponent() // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.okButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.okButton.ImageOver = null; - this.okButton.Location = new System.Drawing.Point(551, 13); + this.okButton.Location = new System.Drawing.Point(337, 13); this.okButton.Name = "okButton"; - this.okButton.ThemedBack = null; - this.okButton.ThemedFore = null; this.okButton.ShowBorder = true; this.okButton.Size = new System.Drawing.Size(115, 36); + this.okButton.StylizeImage = false; this.okButton.TabIndex = 0; this.okButton.Text = "OK"; + this.okButton.ThemedBack = null; + this.okButton.ThemedFore = null; this.okButton.UseVisualStyleBackColor = true; this.okButton.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DoKeyDown); // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.cancelButton.ImageOver = null; - this.cancelButton.Location = new System.Drawing.Point(430, 13); + this.cancelButton.Location = new System.Drawing.Point(579, 13); this.cancelButton.Name = "cancelButton"; - this.cancelButton.ThemedBack = null; - this.cancelButton.ThemedFore = null; this.cancelButton.ShowBorder = true; this.cancelButton.Size = new System.Drawing.Size(115, 36); + this.cancelButton.StylizeImage = false; this.cancelButton.TabIndex = 1; this.cancelButton.Text = "Cancel"; + this.cancelButton.ThemedBack = null; + this.cancelButton.ThemedFore = null; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DoKeyDown); // // panel1 // this.panel1.BackColor = System.Drawing.SystemColors.Control; + this.panel1.Controls.Add(this.noButton); this.panel1.Controls.Add(this.cancelButton); this.panel1.Controls.Add(this.okButton); this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel1.ForeColor = System.Drawing.SystemColors.ControlText; this.panel1.Location = new System.Drawing.Point(0, 157); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(678, 61); + this.panel1.Size = new System.Drawing.Size(706, 61); this.panel1.TabIndex = 3; // + // noButton + // + this.noButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.noButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231))))); + this.noButton.DialogResult = System.Windows.Forms.DialogResult.No; + this.noButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.noButton.ImageOver = null; + this.noButton.Location = new System.Drawing.Point(458, 13); + this.noButton.Name = "noButton"; + this.noButton.ShowBorder = true; + this.noButton.Size = new System.Drawing.Size(115, 36); + this.noButton.StylizeImage = false; + this.noButton.TabIndex = 2; + this.noButton.Text = "No"; + this.noButton.ThemedBack = null; + this.noButton.ThemedFore = null; + this.noButton.UseVisualStyleBackColor = true; + // // MoreMessageBox // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(678, 218); + this.ClientSize = new System.Drawing.Size(706, 218); this.Controls.Add(this.topPanel); this.Controls.Add(this.panel1); this.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); @@ -179,5 +210,6 @@ private void InitializeComponent() private System.Windows.Forms.PictureBox iconBox; private River.OneMoreAddIn.UI.MoreRichLabel messageBox; private River.OneMoreAddIn.UI.MoreLinkLabel logLink; + private MoreButton noButton; } } \ No newline at end of file diff --git a/OneMore/UI/MoreMessageBox.cs b/OneMore/UI/MoreMessageBox.cs index 568dd50abf..7c23b34d0b 100644 --- a/OneMore/UI/MoreMessageBox.cs +++ b/OneMore/UI/MoreMessageBox.cs @@ -19,6 +19,11 @@ public MoreMessageBox() if (NeedsLocalizing()) { Text = Resx.ProgramName; + + Localize(new string[] + { + "noButton=word_No" + }); } messageBox.Clear(); @@ -45,21 +50,33 @@ public void AppendMessage(string message, Color color) public void SetMessage(string message) { + using var g = messageBox.CreateGraphics(); + var size = g.MeasureString(message, Font).ToSize(); + if (size.Height + Font.Height > messageBox.Height) + { + Height += Font.Height + (size.Height - messageBox.Height); + } + messageBox.Text = message; } public void SetButtons(MessageBoxButtons buttons) { + // OK | No | Cancel ... + if (buttons == MessageBoxButtons.OK) { + cancelButton.Visible = false; + noButton.Visible = false; + okButton.Left = cancelButton.Left; okButton.Text = Resx.word_OK; okButton.DialogResult = DialogResult.OK; - cancelButton.Visible = false; } else if (buttons == MessageBoxButtons.OKCancel) { - (cancelButton.Left, okButton.Left) = (okButton.Left, cancelButton.Left); + noButton.Visible = false; + okButton.Left = noButton.Left; okButton.Text = Resx.word_OK; okButton.DialogResult = DialogResult.OK; cancelButton.Text = Resx.word_Cancel; @@ -67,11 +84,22 @@ public void SetButtons(MessageBoxButtons buttons) } else if (buttons == MessageBoxButtons.YesNo) { - (cancelButton.Left, okButton.Left) = (okButton.Left, cancelButton.Left); + cancelButton.Visible = false; + okButton.Left = noButton.Left; okButton.Text = Resx.word_Yes; okButton.DialogResult = DialogResult.Yes; - cancelButton.Text = Resx.word_No; - cancelButton.DialogResult = DialogResult.No; + noButton.Left = cancelButton.Left; + noButton.Text = Resx.word_No; + noButton.DialogResult = DialogResult.No; + } + else if (buttons == MessageBoxButtons.YesNoCancel) + { + okButton.Text = Resx.word_Yes; + okButton.DialogResult = DialogResult.Yes; + noButton.Text = Resx.word_No; + noButton.DialogResult = DialogResult.No; + cancelButton.Text = Resx.word_Cancel; + cancelButton.DialogResult = DialogResult.Cancel; } } From c1e9c8c9c0eb8b2aa19cdcdd717fef7a1dc4733b Mon Sep 17 00:00:00 2001 From: Steven Cohn Date: Fri, 9 Feb 2024 23:14:22 -0500 Subject: [PATCH 9/9] yep --- OneMore/UI/MoreMessageBox.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/OneMore/UI/MoreMessageBox.cs b/OneMore/UI/MoreMessageBox.cs index 7c23b34d0b..327cd3e786 100644 --- a/OneMore/UI/MoreMessageBox.cs +++ b/OneMore/UI/MoreMessageBox.cs @@ -6,7 +6,7 @@ namespace River.OneMoreAddIn.UI { using System.Drawing; using System.Windows.Forms; - using Resx = River.OneMoreAddIn.Properties.Resources; + using Resx = Properties.Resources; internal partial class MoreMessageBox : MoreForm @@ -19,11 +19,6 @@ public MoreMessageBox() if (NeedsLocalizing()) { Text = Resx.ProgramName; - - Localize(new string[] - { - "noButton=word_No" - }); } messageBox.Clear();