diff --git a/src/DeepLClient/Controls/DocumentsPage.Designer.cs b/src/DeepLClient/Controls/DocumentsPage.Designer.cs index b867fb5..027dcd5 100644 --- a/src/DeepLClient/Controls/DocumentsPage.Designer.cs +++ b/src/DeepLClient/Controls/DocumentsPage.Designer.cs @@ -28,6 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + components = new System.ComponentModel.Container(); BtnBrowse = new Syncfusion.WinForms.Controls.SfButton(); TbSourceDocument = new TextBox(); LblSourceDocument = new Label(); @@ -44,6 +45,7 @@ private void InitializeComponent() CbSourceLanguage = new ComboBox(); LblFormalityInfo = new Label(); BtnClean = new Syncfusion.WinForms.Controls.SfButton(); + ToolTip = new ToolTip(components); SuspendLayout(); // // BtnBrowse @@ -68,6 +70,7 @@ private void InitializeComponent() BtnBrowse.Style.PressedForeColor = Color.Black; BtnBrowse.TabIndex = 1; BtnBrowse.Text = "browse"; + ToolTip.SetToolTip(BtnBrowse, "Browse your local computer for the document you want to translate"); BtnBrowse.UseVisualStyleBackColor = false; BtnBrowse.Click += BtnBrowse_Click; // @@ -108,9 +111,9 @@ private void InitializeComponent() BtnTranslate.Font = new Font("Segoe UI", 9.75F, FontStyle.Regular, GraphicsUnit.Point); BtnTranslate.ForeColor = Color.FromArgb(241, 241, 241); BtnTranslate.ImageSize = new Size(48, 48); - BtnTranslate.Location = new Point(486, 185); + BtnTranslate.Location = new Point(451, 185); BtnTranslate.Name = "BtnTranslate"; - BtnTranslate.Size = new Size(396, 86); + BtnTranslate.Size = new Size(431, 86); BtnTranslate.Style.BackColor = Color.FromArgb(63, 63, 70); BtnTranslate.Style.DisabledBackColor = Color.FromArgb(63, 63, 70); BtnTranslate.Style.FocusedBackColor = Color.FromArgb(63, 63, 70); @@ -121,6 +124,7 @@ private void InitializeComponent() BtnTranslate.Style.Image = Properties.Resources.book_icon_48; BtnTranslate.Style.PressedForeColor = Color.Black; BtnTranslate.TabIndex = 5; + ToolTip.SetToolTip(BtnTranslate, "Translate the document text into the selected language"); BtnTranslate.UseVisualStyleBackColor = false; BtnTranslate.Click += BtnTranslate_Click; // @@ -159,6 +163,7 @@ private void InitializeComponent() BtnOpenTranslatedFolder.Style.PressedForeColor = Color.Black; BtnOpenTranslatedFolder.TabIndex = 6; BtnOpenTranslatedFolder.Text = "open folder"; + ToolTip.SetToolTip(BtnOpenTranslatedFolder, "Open the translated document's folder"); BtnOpenTranslatedFolder.UseVisualStyleBackColor = false; BtnOpenTranslatedFolder.Click += BtnOpenTranslatedFolder_Click; // @@ -325,9 +330,18 @@ private void InitializeComponent() BtnClean.Style.Image = Properties.Resources.clean_icon_32; BtnClean.Style.PressedForeColor = Color.Black; BtnClean.TabIndex = 108; + ToolTip.SetToolTip(BtnClean, "Clear everything and prepare for a new translation"); BtnClean.UseVisualStyleBackColor = false; BtnClean.Click += BtnClean_Click; // + // ToolTip + // + ToolTip.AutoPopDelay = 5000; + ToolTip.BackColor = Color.FromArgb(241, 241, 241); + ToolTip.ForeColor = Color.FromArgb(45, 45, 48); + ToolTip.InitialDelay = 1000; + ToolTip.ReshowDelay = 100; + // // DocumentsPage // AllowDrop = true; @@ -379,5 +393,6 @@ private void InitializeComponent() private ComboBox CbSourceLanguage; private Label LblFormalityInfo; private Syncfusion.WinForms.Controls.SfButton BtnClean; + private ToolTip ToolTip; } } diff --git a/src/DeepLClient/Controls/DocumentsPage.cs b/src/DeepLClient/Controls/DocumentsPage.cs index d1c374b..7a06bb5 100644 --- a/src/DeepLClient/Controls/DocumentsPage.cs +++ b/src/DeepLClient/Controls/DocumentsPage.cs @@ -432,8 +432,8 @@ internal async void ExecuteTranslation() { var billedCharacters = Convert.ToDouble(state.BilledCharacters); LblState.Text = SubscriptionManager.UsingFreeSubscription() - ? $"translation complete!\r\n\r\nthe document has been billed for {billedCharacters} characters\r\nyou're on a free subscription, so no costs" - : $"translation complete!\r\n\r\nthe document has been billed for {billedCharacters} characters, costing {SubscriptionManager.CalculateCost(billedCharacters)}."; + ? $"translation complete!\r\n\r\nthe document has been billed for {billedCharacters:N0} characters\r\nyou're on a free subscription, so no costs" + : $"translation complete!\r\n\r\nthe document has been billed for {billedCharacters:N0} characters, costing {SubscriptionManager.CalculateCost(billedCharacters)}."; } else LblState.Text = "translation complete!"; diff --git a/src/DeepLClient/Controls/DocumentsPage.resx b/src/DeepLClient/Controls/DocumentsPage.resx index f298a7b..5a41fdd 100644 --- a/src/DeepLClient/Controls/DocumentsPage.resx +++ b/src/DeepLClient/Controls/DocumentsPage.resx @@ -57,4 +57,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 49, 25 + \ No newline at end of file diff --git a/src/DeepLClient/Controls/TextPage.Designer.cs b/src/DeepLClient/Controls/TextPage.Designer.cs index 6243f24..c2ae6cb 100644 --- a/src/DeepLClient/Controls/TextPage.Designer.cs +++ b/src/DeepLClient/Controls/TextPage.Designer.cs @@ -28,6 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TextPage)); BtnTranslate = new Syncfusion.WinForms.Controls.SfButton(); CbSourceLanguage = new ComboBox(); @@ -41,7 +42,6 @@ private void InitializeComponent() LblDetected = new Label(); label1 = new Label(); TbSource = new TextBox(); - TbTranslated = new TextBox(); BtnCopyClipboard = new Syncfusion.WinForms.Controls.SfButton(); LblClipboardCopied = new Label(); label2 = new Label(); @@ -50,6 +50,10 @@ private void InitializeComponent() BtnClean = new Syncfusion.WinForms.Controls.SfButton(); BtnSave = new Syncfusion.WinForms.Controls.SfButton(); BtnPrint = new Syncfusion.WinForms.Controls.SfButton(); + TbTranslated = new TextBox(); + TbSourceScroller = new Syncfusion.WinForms.Controls.SfScrollFrame(); + TbTranslatedScroller = new Syncfusion.WinForms.Controls.SfScrollFrame(); + ToolTip = new ToolTip(components); SuspendLayout(); // // BtnTranslate @@ -74,6 +78,7 @@ private void InitializeComponent() BtnTranslate.Style.Image = Properties.Resources.book_icon_48; BtnTranslate.Style.PressedForeColor = Color.Black; BtnTranslate.TabIndex = 1; + ToolTip.SetToolTip(BtnTranslate, "Translate the source text into the selected language"); BtnTranslate.UseVisualStyleBackColor = false; BtnTranslate.Click += BtnTranslate_Click; // @@ -235,23 +240,12 @@ private void InitializeComponent() TbSource.Location = new Point(14, 80); TbSource.Multiline = true; TbSource.Name = "TbSource"; + TbSource.ScrollBars = ScrollBars.Vertical; TbSource.Size = new Size(430, 535); TbSource.TabIndex = 0; TbSource.TextChanged += TbSource_TextChanged; TbSource.KeyDown += TbSource_KeyDown; // - // TbTranslated - // - TbTranslated.BackColor = Color.FromArgb(63, 63, 70); - TbTranslated.BorderStyle = BorderStyle.FixedSingle; - TbTranslated.ForeColor = Color.FromArgb(241, 241, 241); - TbTranslated.Location = new Point(549, 80); - TbTranslated.Multiline = true; - TbTranslated.Name = "TbTranslated"; - TbTranslated.ReadOnly = true; - TbTranslated.Size = new Size(428, 535); - TbTranslated.TabIndex = 2; - // // BtnCopyClipboard // BtnCopyClipboard.AccessibleDescription = ""; @@ -356,6 +350,7 @@ private void InitializeComponent() BtnClean.Style.Image = Properties.Resources.clean_icon_32; BtnClean.Style.PressedForeColor = Color.Black; BtnClean.TabIndex = 107; + ToolTip.SetToolTip(BtnClean, "Clear everything and prepare for a new translation"); BtnClean.UseVisualStyleBackColor = false; BtnClean.Click += BtnClean_Click; // @@ -381,6 +376,7 @@ private void InitializeComponent() BtnSave.Style.Image = Properties.Resources.save_icon_24; BtnSave.Style.PressedForeColor = Color.Black; BtnSave.TabIndex = 116; + ToolTip.SetToolTip(BtnSave, "Save the translated text"); BtnSave.UseVisualStyleBackColor = false; BtnSave.Click += BtnSave_Click; // @@ -406,15 +402,78 @@ private void InitializeComponent() BtnPrint.Style.Image = (Image)resources.GetObject("resource.Image"); BtnPrint.Style.PressedForeColor = Color.Black; BtnPrint.TabIndex = 115; + ToolTip.SetToolTip(BtnPrint, "Print the translated text"); BtnPrint.UseVisualStyleBackColor = false; BtnPrint.Click += BtnPrint_Click; // + // TbTranslated + // + TbTranslated.BackColor = Color.FromArgb(63, 63, 70); + TbTranslated.BorderStyle = BorderStyle.FixedSingle; + TbTranslated.ForeColor = Color.FromArgb(241, 241, 241); + TbTranslated.Location = new Point(549, 80); + TbTranslated.Multiline = true; + TbTranslated.Name = "TbTranslated"; + TbTranslated.ReadOnly = true; + TbTranslated.ScrollBars = ScrollBars.Vertical; + TbTranslated.Size = new Size(428, 535); + TbTranslated.TabIndex = 117; + // + // TbSourceScroller + // + TbSourceScroller.Control = TbSource; + TbSourceScroller.Style.HorizontalScrollBar.ScrollBarBackColor = Color.FromArgb(45, 45, 48); + TbSourceScroller.Style.VerticalScrollBar.ArrowButtonBackColor = Color.FromArgb(63, 63, 70); + TbSourceScroller.Style.VerticalScrollBar.ArrowButtonBorderColor = Color.FromArgb(63, 63, 70); + TbSourceScroller.Style.VerticalScrollBar.ArrowButtonForeColor = Color.FromArgb(241, 241, 241); + TbSourceScroller.Style.VerticalScrollBar.ArrowButtonHoverBackColor = Color.FromArgb(241, 241, 241); + TbSourceScroller.Style.VerticalScrollBar.ArrowButtonHoverForeColor = Color.FromArgb(63, 63, 70); + TbSourceScroller.Style.VerticalScrollBar.ArrowButtonPressedBackColor = Color.FromArgb(241, 241, 241); + TbSourceScroller.Style.VerticalScrollBar.ArrowButtonPressedForeColor = Color.FromArgb(63, 63, 70); + TbSourceScroller.Style.VerticalScrollBar.ScrollBarBackColor = Color.FromArgb(63, 63, 70); + TbSourceScroller.Style.VerticalScrollBar.ThumbBorderColor = SystemColors.WindowFrame; + TbSourceScroller.Style.VerticalScrollBar.ThumbColor = Color.FromArgb(63, 63, 70); + TbSourceScroller.Style.VerticalScrollBar.ThumbHoverBorderColor = Color.FromArgb(241, 241, 241); + TbSourceScroller.Style.VerticalScrollBar.ThumbHoverColor = Color.FromArgb(63, 63, 70); + TbSourceScroller.Style.VerticalScrollBar.ThumbPressedBorderColor = Color.FromArgb(241, 241, 241); + TbSourceScroller.Style.VerticalScrollBar.ThumbPressedColor = Color.FromArgb(63, 63, 70); + TbSourceScroller.ThemeName = ""; + // + // TbTranslatedScroller + // + TbTranslatedScroller.Control = TbTranslated; + TbTranslatedScroller.Style.HorizontalScrollBar.ScrollBarBackColor = Color.FromArgb(45, 45, 48); + TbTranslatedScroller.Style.VerticalScrollBar.ArrowButtonBackColor = Color.FromArgb(63, 63, 70); + TbTranslatedScroller.Style.VerticalScrollBar.ArrowButtonBorderColor = Color.FromArgb(63, 63, 70); + TbTranslatedScroller.Style.VerticalScrollBar.ArrowButtonForeColor = Color.FromArgb(241, 241, 241); + TbTranslatedScroller.Style.VerticalScrollBar.ArrowButtonHoverBackColor = Color.FromArgb(241, 241, 241); + TbTranslatedScroller.Style.VerticalScrollBar.ArrowButtonHoverForeColor = Color.FromArgb(63, 63, 70); + TbTranslatedScroller.Style.VerticalScrollBar.ArrowButtonPressedBackColor = Color.FromArgb(241, 241, 241); + TbTranslatedScroller.Style.VerticalScrollBar.ArrowButtonPressedForeColor = Color.FromArgb(63, 63, 70); + TbTranslatedScroller.Style.VerticalScrollBar.ScrollBarBackColor = Color.FromArgb(63, 63, 70); + TbTranslatedScroller.Style.VerticalScrollBar.ThumbBorderColor = SystemColors.WindowFrame; + TbTranslatedScroller.Style.VerticalScrollBar.ThumbColor = Color.FromArgb(63, 63, 70); + TbTranslatedScroller.Style.VerticalScrollBar.ThumbHoverBorderColor = Color.FromArgb(241, 241, 241); + TbTranslatedScroller.Style.VerticalScrollBar.ThumbHoverColor = Color.FromArgb(63, 63, 70); + TbTranslatedScroller.Style.VerticalScrollBar.ThumbPressedBorderColor = Color.FromArgb(241, 241, 241); + TbTranslatedScroller.Style.VerticalScrollBar.ThumbPressedColor = Color.FromArgb(63, 63, 70); + TbTranslatedScroller.ThemeName = ""; + // + // ToolTip + // + ToolTip.AutoPopDelay = 5000; + ToolTip.BackColor = Color.FromArgb(241, 241, 241); + ToolTip.ForeColor = Color.FromArgb(45, 45, 48); + ToolTip.InitialDelay = 1000; + ToolTip.ReshowDelay = 100; + // // TextPage // AllowDrop = true; AutoScaleDimensions = new SizeF(96F, 96F); AutoScaleMode = AutoScaleMode.Dpi; BackColor = Color.FromArgb(45, 45, 48); + Controls.Add(TbTranslated); Controls.Add(BtnSave); Controls.Add(BtnPrint); Controls.Add(BtnClean); @@ -423,7 +482,6 @@ private void InitializeComponent() Controls.Add(LblCharacters); Controls.Add(LblClipboardCopied); Controls.Add(BtnCopyClipboard); - Controls.Add(TbTranslated); Controls.Add(TbSource); Controls.Add(label1); Controls.Add(LblDetected); @@ -458,7 +516,6 @@ private void InitializeComponent() private Label LblDetectedInfo; private Label LblDetected; private Label label1; - private TextBox TbTranslated; private Syncfusion.WinForms.Controls.SfButton BtnCopyClipboard; private Label LblClipboardCopied; private Label label2; @@ -469,5 +526,9 @@ private void InitializeComponent() internal Syncfusion.WinForms.Controls.SfButton BtnTranslate; private Syncfusion.WinForms.Controls.SfButton BtnSave; private Syncfusion.WinForms.Controls.SfButton BtnPrint; + internal TextBox TbTranslated; + private Syncfusion.WinForms.Controls.SfScrollFrame TbSourceScroller; + private Syncfusion.WinForms.Controls.SfScrollFrame TbTranslatedScroller; + private ToolTip ToolTip; } } diff --git a/src/DeepLClient/Controls/TextPage.cs b/src/DeepLClient/Controls/TextPage.cs index a595c49..011b7f7 100644 --- a/src/DeepLClient/Controls/TextPage.cs +++ b/src/DeepLClient/Controls/TextPage.cs @@ -5,6 +5,7 @@ using Serilog; using System.Diagnostics.CodeAnalysis; using DeepLClient.Forms.Dialogs; +using Syncfusion.WinForms.Controls.Styles; namespace DeepLClient.Controls { diff --git a/src/DeepLClient/Controls/TextPage.resx b/src/DeepLClient/Controls/TextPage.resx index 4238e83..63b90f2 100644 --- a/src/DeepLClient/Controls/TextPage.resx +++ b/src/DeepLClient/Controls/TextPage.resx @@ -57,6 +57,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 348, 27 + @@ -66,4 +69,10 @@ 4fokFWShaAwAdGZUfyL/FuTvIUjurdQBaE0luFgHKUIAAAAASUVORK5CYII= + + 192, 22 + + + 17, 17 + \ No newline at end of file diff --git a/src/DeepLClient/Controls/UrlPage.Designer.cs b/src/DeepLClient/Controls/UrlPage.Designer.cs index a7268e8..44482df 100644 --- a/src/DeepLClient/Controls/UrlPage.Designer.cs +++ b/src/DeepLClient/Controls/UrlPage.Designer.cs @@ -28,6 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UrlPage)); BtnTranslate = new Syncfusion.WinForms.Controls.SfButton(); CbSourceLanguage = new ComboBox(); @@ -52,6 +53,7 @@ private void InitializeComponent() BtnPrint = new Syncfusion.WinForms.Controls.SfButton(); BtnSave = new Syncfusion.WinForms.Controls.SfButton(); BtnOpenInBrowser = new Syncfusion.WinForms.Controls.SfButton(); + ToolTip = new ToolTip(components); ((System.ComponentModel.ISupportInitialize)WebView).BeginInit(); PnlWebView.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)PbWarning).BeginInit(); @@ -79,6 +81,7 @@ private void InitializeComponent() BtnTranslate.Style.Image = Properties.Resources.book_icon_24; BtnTranslate.Style.PressedForeColor = Color.Black; BtnTranslate.TabIndex = 3; + ToolTip.SetToolTip(BtnTranslate, "Translate the webpage text into the selected language"); BtnTranslate.UseVisualStyleBackColor = false; BtnTranslate.Click += BtnTranslate_Click; // @@ -286,6 +289,7 @@ private void InitializeComponent() BtnClean.Style.Image = Properties.Resources.clean_icon_32; BtnClean.Style.PressedForeColor = Color.Black; BtnClean.TabIndex = 5; + ToolTip.SetToolTip(BtnClean, "Clear everything and prepare for a new translation"); BtnClean.UseVisualStyleBackColor = false; BtnClean.Click += BtnClean_Click; // @@ -444,6 +448,14 @@ private void InitializeComponent() BtnOpenInBrowser.UseVisualStyleBackColor = false; BtnOpenInBrowser.Click += BtnOpenInBrowser_Click; // + // ToolTip + // + ToolTip.AutoPopDelay = 5000; + ToolTip.BackColor = Color.FromArgb(241, 241, 241); + ToolTip.ForeColor = Color.FromArgb(45, 45, 48); + ToolTip.InitialDelay = 1000; + ToolTip.ReshowDelay = 100; + // // UrlPage // AllowDrop = true; @@ -509,5 +521,6 @@ private void InitializeComponent() private Syncfusion.WinForms.Controls.SfButton BtnPrint; private Syncfusion.WinForms.Controls.SfButton BtnSave; private Syncfusion.WinForms.Controls.SfButton BtnOpenInBrowser; + private ToolTip ToolTip; } } diff --git a/src/DeepLClient/Controls/UrlPage.resx b/src/DeepLClient/Controls/UrlPage.resx index 2523ebb..11138f6 100644 --- a/src/DeepLClient/Controls/UrlPage.resx +++ b/src/DeepLClient/Controls/UrlPage.resx @@ -57,6 +57,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 35, 26 + diff --git a/src/DeepLClient/DeepLClient.csproj b/src/DeepLClient/DeepLClient.csproj index 4f36483..a084283 100644 --- a/src/DeepLClient/DeepLClient.csproj +++ b/src/DeepLClient/DeepLClient.csproj @@ -8,7 +8,7 @@ enable Resources\icon_white_32.ico DeepL Translator - 2023.3.16.0 + 2023.3.17.0 LAB02 RESEARCH Front-end client for DeepL translation services. diff --git a/src/DeepLClient/Forms/Configuration.Designer.cs b/src/DeepLClient/Forms/Configuration.Designer.cs index 9083571..66a2a37 100644 --- a/src/DeepLClient/Forms/Configuration.Designer.cs +++ b/src/DeepLClient/Forms/Configuration.Designer.cs @@ -57,6 +57,7 @@ private void InitializeComponent() label5 = new Label(); CbAlwaysOnTop = new CheckBox(); LblNameInfo = new Label(); + ToolTip = new ToolTip(components); ((System.ComponentModel.ISupportInitialize)PbCost).BeginInit(); ((System.ComponentModel.ISupportInitialize)TbCostPerChar).BeginInit(); SuspendLayout(); @@ -492,6 +493,14 @@ private void InitializeComponent() LblNameInfo.Text = "?"; LblNameInfo.Click += LblNameInfo_Click; // + // ToolTip + // + ToolTip.AutoPopDelay = 5000; + ToolTip.BackColor = Color.FromArgb(241, 241, 241); + ToolTip.ForeColor = Color.FromArgb(45, 45, 48); + ToolTip.InitialDelay = 1000; + ToolTip.ReshowDelay = 100; + // // Configuration // AutoScaleDimensions = new SizeF(96F, 96F); @@ -576,5 +585,6 @@ private void InitializeComponent() private Label label5; internal CheckBox CbAlwaysOnTop; private Label LblNameInfo; + private ToolTip ToolTip; } } \ No newline at end of file diff --git a/src/DeepLClient/Forms/Configuration.cs b/src/DeepLClient/Forms/Configuration.cs index d187cd9..8bd2711 100644 --- a/src/DeepLClient/Forms/Configuration.cs +++ b/src/DeepLClient/Forms/Configuration.cs @@ -192,7 +192,7 @@ private void BtnStore_Click(object sender, EventArgs e) if (confirmNotPro != DialogResult.Yes) return; } } - + // set the new configuration Variables.AppSettings.User = user; Variables.AppSettings.DeepLAPIKey = api; diff --git a/src/DeepLClient/Forms/Configuration.resx b/src/DeepLClient/Forms/Configuration.resx index da6adbf..da9564b 100644 --- a/src/DeepLClient/Forms/Configuration.resx +++ b/src/DeepLClient/Forms/Configuration.resx @@ -57,6 +57,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 32, 24 + diff --git a/src/DeepLClient/Forms/Main.Designer.cs b/src/DeepLClient/Forms/Main.Designer.cs index 4f14d5e..638c0e7 100644 --- a/src/DeepLClient/Forms/Main.Designer.cs +++ b/src/DeepLClient/Forms/Main.Designer.cs @@ -46,6 +46,7 @@ private void InitializeComponent() TsExit = new ToolStripMenuItem(); LblWarning = new Label(); BtnAbout = new Syncfusion.WinForms.Controls.SfButton(); + ToolTip = new ToolTip(components); PnlTabs.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)TranslationTabs).BeginInit(); TranslationTabs.SuspendLayout(); @@ -110,6 +111,7 @@ private void InitializeComponent() TabText.TabForeColor = Color.FromArgb(241, 241, 241); TabText.TabIndex = 9; TabText.ThemesEnabled = false; + ToolTip.SetToolTip(TabText, "Text translations"); // // TabDocuments // @@ -120,30 +122,32 @@ private void InitializeComponent() TabDocuments.Font = new Font("Segoe UI", 10F, FontStyle.Regular, GraphicsUnit.Point); TabDocuments.Image = Properties.Resources.document_icon_18; TabDocuments.ImageSize = new Size(18, 18); - TabDocuments.Location = new Point(2, 1); + TabDocuments.Location = new Point(2, 41); TabDocuments.Name = "TabDocuments"; TabDocuments.ShowCloseButton = true; - TabDocuments.Size = new Size(993, 694); + TabDocuments.Size = new Size(993, 654); TabDocuments.TabBackColor = Color.FromArgb(45, 45, 48); TabDocuments.TabFont = new Font("Consolas", 18F, FontStyle.Regular, GraphicsUnit.Point); TabDocuments.TabForeColor = Color.FromArgb(241, 241, 241); TabDocuments.TabIndex = 10; TabDocuments.ThemesEnabled = false; + ToolTip.SetToolTip(TabDocuments, "Document translations"); // // TabUrl // TabUrl.AutoScroll = true; TabUrl.Image = Properties.Resources.globe_icon_24; TabUrl.ImageSize = new Size(18, 18); - TabUrl.Location = new Point(2, 1); + TabUrl.Location = new Point(2, 41); TabUrl.Name = "TabUrl"; TabUrl.ShowCloseButton = true; - TabUrl.Size = new Size(993, 694); + TabUrl.Size = new Size(993, 654); TabUrl.TabBackColor = Color.FromArgb(45, 45, 48); TabUrl.TabFont = new Font("Consolas", 18F, FontStyle.Regular, GraphicsUnit.Point); TabUrl.TabForeColor = Color.FromArgb(241, 241, 241); TabUrl.TabIndex = 11; TabUrl.ThemesEnabled = false; + ToolTip.SetToolTip(TabUrl, "Webpage translations"); // // BtnSubscription // @@ -167,6 +171,7 @@ private void InitializeComponent() BtnSubscription.Style.Image = Properties.Resources.price_icon_24; BtnSubscription.Style.PressedForeColor = Color.Black; BtnSubscription.TabIndex = 4; + ToolTip.SetToolTip(BtnSubscription, "Subscription information"); BtnSubscription.UseVisualStyleBackColor = false; BtnSubscription.Click += BtnSubscriptionInfo_Click; // @@ -191,6 +196,7 @@ private void InitializeComponent() BtnConfig.Style.Image = Properties.Resources.config_icon_24; BtnConfig.Style.PressedForeColor = Color.Black; BtnConfig.TabIndex = 5; + ToolTip.SetToolTip(BtnConfig, "Configuration options"); BtnConfig.UseVisualStyleBackColor = false; BtnConfig.Click += BtnConfig_Click; // @@ -215,6 +221,7 @@ private void InitializeComponent() BtnHide.Style.Image = Properties.Resources.hide_icon_24; BtnHide.Style.PressedForeColor = Color.Black; BtnHide.TabIndex = 6; + ToolTip.SetToolTip(BtnHide, "Hide the application"); BtnHide.UseVisualStyleBackColor = false; BtnHide.Click += BtnHide_Click; // @@ -311,9 +318,18 @@ private void InitializeComponent() BtnAbout.Style.Image = Properties.Resources.info_icon_24; BtnAbout.Style.PressedForeColor = Color.Black; BtnAbout.TabIndex = 73; + ToolTip.SetToolTip(BtnAbout, "About this application"); BtnAbout.UseVisualStyleBackColor = false; BtnAbout.Click += BtnAbout_Click; // + // ToolTip + // + ToolTip.AutoPopDelay = 5000; + ToolTip.BackColor = Color.FromArgb(241, 241, 241); + ToolTip.ForeColor = Color.FromArgb(45, 45, 48); + ToolTip.InitialDelay = 1000; + ToolTip.ReshowDelay = 100; + // // Main // AutoScaleDimensions = new SizeF(96F, 96F); @@ -366,5 +382,6 @@ private void InitializeComponent() internal Syncfusion.Windows.Forms.Tools.TabPageAdv TabUrl; internal NotifyIcon NotifyIcon; internal Label LblWarning; + private ToolTip ToolTip; } } \ No newline at end of file diff --git a/src/DeepLClient/Forms/Main.resx b/src/DeepLClient/Forms/Main.resx index 9277783..a90689a 100644 --- a/src/DeepLClient/Forms/Main.resx +++ b/src/DeepLClient/Forms/Main.resx @@ -57,6 +57,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 241, 17 + 17, 17 diff --git a/src/DeepLClient/Forms/SubscriptionInfo.Designer.cs b/src/DeepLClient/Forms/SubscriptionInfo.Designer.cs index 922c876..1e9a30c 100644 --- a/src/DeepLClient/Forms/SubscriptionInfo.Designer.cs +++ b/src/DeepLClient/Forms/SubscriptionInfo.Designer.cs @@ -28,6 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SubscriptionInfo)); BtnYes = new Syncfusion.WinForms.Controls.SfButton(); PbCost = new PictureBox(); @@ -41,6 +42,7 @@ private void InitializeComponent() LblCost = new Label(); label4 = new Label(); LblSubscriptionPage = new Label(); + ToolTip = new ToolTip(components); ((System.ComponentModel.ISupportInitialize)PbCost).BeginInit(); SuspendLayout(); // @@ -210,6 +212,14 @@ private void InitializeComponent() LblSubscriptionPage.Text = "open subscription webpage"; LblSubscriptionPage.Click += LblSubscriptionPage_Click; // + // ToolTip + // + ToolTip.AutoPopDelay = 5000; + ToolTip.BackColor = Color.FromArgb(241, 241, 241); + ToolTip.ForeColor = Color.FromArgb(45, 45, 48); + ToolTip.InitialDelay = 1000; + ToolTip.ReshowDelay = 100; + // // SubscriptionInfo // AutoScaleDimensions = new SizeF(96F, 96F); @@ -262,5 +272,6 @@ private void InitializeComponent() private Label LblCost; private Label label4; private Label LblSubscriptionPage; + private ToolTip ToolTip; } } \ No newline at end of file diff --git a/src/DeepLClient/Forms/SubscriptionInfo.resx b/src/DeepLClient/Forms/SubscriptionInfo.resx index da6adbf..0e7e837 100644 --- a/src/DeepLClient/Forms/SubscriptionInfo.resx +++ b/src/DeepLClient/Forms/SubscriptionInfo.resx @@ -57,6 +57,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 44, 25 + diff --git a/src/DeepLClient/Managers/UrlManager.cs b/src/DeepLClient/Managers/UrlManager.cs index 29ccfd9..cb5afec 100644 --- a/src/DeepLClient/Managers/UrlManager.cs +++ b/src/DeepLClient/Managers/UrlManager.cs @@ -129,7 +129,11 @@ internal static string WrapContentInHtml(string content, string title) htmlContent.AppendLine(""); htmlContent.AppendLine($"{title}"); htmlContent.AppendLine(""); htmlContent.AppendLine(""); htmlContent.AppendLine("");