diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.Designer.cs b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.Designer.cs index 1abde016e..9f406d7ed 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.Designer.cs +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.Designer.cs @@ -16,8 +16,8 @@ protected override void Dispose(bool disposing) if (disposing && (components != null)) { components.Dispose(); - qrCodeImage.Dispose(); - barcodeImage.Dispose(); + if (qrCodeImage!=null) qrCodeImage.Dispose(); + if (barcodeImage!=null) barcodeImage.Dispose(); // qrCode.Dispose(); } base.Dispose(disposing); @@ -31,6 +31,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GCodeForBarcode)); this.btnGenerateBarcode1D = new System.Windows.Forms.Button(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); @@ -49,7 +50,7 @@ private void InitializeComponent() this.label2 = new System.Windows.Forms.Label(); this.nUDScanGap1D = new System.Windows.Forms.NumericUpDown(); this.label1 = new System.Windows.Forms.Label(); - this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.CbBarcodeSelect = new System.Windows.Forms.ComboBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.gBLogo = new System.Windows.Forms.GroupBox(); this.btnLogoInvert = new System.Windows.Forms.Button(); @@ -84,7 +85,9 @@ private void InitializeComponent() this.nUDScanGap2D = new System.Windows.Forms.NumericUpDown(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.CbInsertCode = new System.Windows.Forms.CheckBox(); - this.button3 = new System.Windows.Forms.Button(); + this.BtnHelp = new System.Windows.Forms.Button(); + this.BtnSaveIni = new System.Windows.Forms.Button(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); @@ -107,6 +110,7 @@ private void InitializeComponent() // resources.ApplyResources(this.btnGenerateBarcode1D, "btnGenerateBarcode1D"); this.btnGenerateBarcode1D.Name = "btnGenerateBarcode1D"; + this.toolTip1.SetToolTip(this.btnGenerateBarcode1D, resources.GetString("btnGenerateBarcode1D.ToolTip")); this.btnGenerateBarcode1D.UseVisualStyleBackColor = true; this.btnGenerateBarcode1D.Click += new System.EventHandler(this.BtnGenerateBarcodeClick); // @@ -122,6 +126,7 @@ private void InitializeComponent() // resources.ApplyResources(this.btnGenerateBarcode2D, "btnGenerateBarcode2D"); this.btnGenerateBarcode2D.Name = "btnGenerateBarcode2D"; + this.toolTip1.SetToolTip(this.btnGenerateBarcode2D, resources.GetString("btnGenerateBarcode2D.ToolTip")); this.btnGenerateBarcode2D.UseVisualStyleBackColor = true; this.btnGenerateBarcode2D.Click += new System.EventHandler(this.BtnGenerateQRCode_Click); // @@ -132,6 +137,7 @@ private void InitializeComponent() resources.ApplyResources(this.tabControl1, "tabControl1"); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; + this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.TabControl1_SelectedIndexChanged); // // tabPage1 // @@ -148,7 +154,7 @@ private void InitializeComponent() this.tabPage1.Controls.Add(this.label2); this.tabPage1.Controls.Add(this.nUDScanGap1D); this.tabPage1.Controls.Add(this.label1); - this.tabPage1.Controls.Add(this.comboBox1); + this.tabPage1.Controls.Add(this.CbBarcodeSelect); this.tabPage1.Controls.Add(this.btnGenerateBarcode1D); resources.ApplyResources(this.tabPage1, "tabPage1"); this.tabPage1.Name = "tabPage1"; @@ -165,6 +171,7 @@ private void InitializeComponent() // resources.ApplyResources(this.btnCheckBarcode1D, "btnCheckBarcode1D"); this.btnCheckBarcode1D.Name = "btnCheckBarcode1D"; + this.toolTip1.SetToolTip(this.btnCheckBarcode1D, resources.GetString("btnCheckBarcode1D.ToolTip")); this.btnCheckBarcode1D.UseVisualStyleBackColor = true; this.btnCheckBarcode1D.Click += new System.EventHandler(this.BtnCheckBarcode1D_Click); // @@ -258,12 +265,14 @@ private void InitializeComponent() resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; // - // comboBox1 + // CbBarcodeSelect // - this.comboBox1.FormattingEnabled = true; - resources.ApplyResources(this.comboBox1, "comboBox1"); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.ComboBox1_SelectedIndexChanged); + this.CbBarcodeSelect.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::GrblPlotter.Properties.Settings.Default, "importBarcode1DName", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.CbBarcodeSelect.FormattingEnabled = true; + resources.ApplyResources(this.CbBarcodeSelect, "CbBarcodeSelect"); + this.CbBarcodeSelect.Name = "CbBarcodeSelect"; + this.CbBarcodeSelect.Text = global::GrblPlotter.Properties.Settings.Default.importBarcode1DName; + this.toolTip1.SetToolTip(this.CbBarcodeSelect, resources.GetString("CbBarcodeSelect.ToolTip")); // // tabPage2 // @@ -449,6 +458,7 @@ private void InitializeComponent() // resources.ApplyResources(this.btnCheckBarcode2D, "btnCheckBarcode2D"); this.btnCheckBarcode2D.Name = "btnCheckBarcode2D"; + this.toolTip1.SetToolTip(this.btnCheckBarcode2D, resources.GetString("btnCheckBarcode2D.ToolTip")); this.btnCheckBarcode2D.UseVisualStyleBackColor = true; this.btnCheckBarcode2D.Click += new System.EventHandler(this.BtnCheckBarcode2D_Click); // @@ -537,20 +547,32 @@ private void InitializeComponent() this.CbInsertCode.Name = "CbInsertCode"; this.CbInsertCode.UseVisualStyleBackColor = true; // - // button3 + // BtnHelp // - this.button3.BackColor = System.Drawing.Color.SkyBlue; - resources.ApplyResources(this.button3, "button3"); - this.button3.Name = "button3"; - this.button3.Tag = "id=form-barcode"; - this.button3.UseVisualStyleBackColor = false; - this.button3.Click += new System.EventHandler(this.button3_Click); + this.BtnHelp.BackColor = System.Drawing.Color.SkyBlue; + resources.ApplyResources(this.BtnHelp, "BtnHelp"); + this.BtnHelp.Name = "BtnHelp"; + this.BtnHelp.Tag = "id=form-barcode"; + this.toolTip1.SetToolTip(this.BtnHelp, resources.GetString("BtnHelp.ToolTip")); + this.BtnHelp.UseVisualStyleBackColor = false; + this.BtnHelp.Click += new System.EventHandler(this.BtnHelp_Click); + // + // BtnSaveIni + // + this.BtnSaveIni.BackColor = System.Drawing.Color.SkyBlue; + resources.ApplyResources(this.BtnSaveIni, "BtnSaveIni"); + this.BtnSaveIni.Name = "BtnSaveIni"; + this.BtnSaveIni.Tag = "id=form-text"; + this.toolTip1.SetToolTip(this.BtnSaveIni, resources.GetString("BtnSaveIni.ToolTip")); + this.BtnSaveIni.UseVisualStyleBackColor = false; + this.BtnSaveIni.Click += new System.EventHandler(this.BtnSaveIni_Click); // // GCodeForBarcode // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.button3); + this.Controls.Add(this.BtnSaveIni); + this.Controls.Add(this.BtnHelp); this.Controls.Add(this.CbInsertCode); this.Controls.Add(this.tabControl1); this.Name = "GCodeForBarcode"; @@ -589,7 +611,7 @@ private void InitializeComponent() private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage2; - private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.ComboBox CbBarcodeSelect; private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.Button btnCheckBarcode1D; private System.Windows.Forms.Label lblWidth1D; @@ -635,6 +657,8 @@ private void InitializeComponent() private System.Windows.Forms.TextBox tBWLAN1; private System.Windows.Forms.RadioButton radioButton1; public System.Windows.Forms.CheckBox CbInsertCode; - private System.Windows.Forms.Button button3; + private System.Windows.Forms.Button BtnHelp; + private System.Windows.Forms.Button BtnSaveIni; + private System.Windows.Forms.ToolTip toolTip1; } } \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.ar.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.ar.resx index 82ba813c5..3ad6c2d3c 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.ar.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.ar.resx @@ -216,4 +216,25 @@ أدخل الرمز في العرض ثنائي الأبعاد (في الموضع 0 ؛ 0) + + حساب الباركود وإنشاء G-Code + + + حساب QR.Code وإنشاء G-Code + + + حساب الباركود وإظهار الصورة + + + ملاحظة: يمكن استخدام بعض الرموز الشريطية مع الأرقام/الأرقام فقط. + + + حساب رمز الاستجابة السريعة وإظهار الصورة + + + مساعدة على الانترنت + + + احفظ إعدادات هذه النافذة كملف INI + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.cs b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.cs index df5b77df0..a5cf7a929 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.cs +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.cs @@ -1,7 +1,7 @@ /* GRBL-Plotter. Another GCode sender for GRBL. This file is part of the GRBL-Plotter application. - Copyright (C) 2020-2022 Sven Hasemann contact: svenhb@web.de + Copyright (C) 2020-2024 Sven Hasemann contact: svenhb@web.de This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,6 +21,7 @@ You should have received a copy of the GNU General Public License and using https://github.com/codebude/QRCoder * 2020-12-09 line 166, 264 no return of Gcode, must be picked up at Graphic.GCode * 2021-07-14 code clean up / code quality + * 2024-02-10 add process automation */ using QRCoder; @@ -33,8 +34,6 @@ You should have received a copy of the GNU General Public License using System.Windows.Forms; using static QRCoder.PayloadGenerator; -//#pragma warning disable CA1303 // Do not pass literals as localized parameters - namespace GrblPlotter { public partial class GCodeForBarcode : Form @@ -56,21 +55,60 @@ public GCodeForBarcode() private void GCodeForBarcode_Load(object sender, EventArgs e) { for (int i = 0; i < Enum.GetNames(typeof(BarcodeCreation.TYPE)).Length; i++) - comboBox1.Items.Add(((BarcodeCreation.TYPE)i).ToString()); - comboBox1.SelectedIndex = Properties.Settings.Default.importBarcode1DType; + CbBarcodeSelect.Items.Add(((BarcodeCreation.TYPE)i).ToString()); + + UpdateIniVariables(); + } + + public void UpdateIniVariables() + { + string tmpText = Properties.Settings.Default.importBarcode1DName; + if (tmpText == "") + { CbBarcodeSelect.SelectedIndex = 0; } + else + { + for (int i = 0; i < CbBarcodeSelect.Items.Count; i++) + { + if (CbBarcodeSelect.Items[i].ToString() == tmpText) + { + CbBarcodeSelect.SelectedIndex = i; + break; + } + } + } + + if (Properties.Settings.Default.importBarcode1DSelect) + tabControl1.SelectedTab = tabPage1; + else + tabControl1.SelectedTab = tabPage2; } - private void ComboBox1_SelectedIndexChanged(object sender, EventArgs e) + internal void SetText1D(string tmp) + { + tabControl1.SelectedIndex = 0; + textBox1.Text = tmp; + btnGenerateBarcode1D.PerformClick(); + } + internal void SetText2D(string tmp) + { + tabControl1.SelectedIndex = 1; + tCQRPayload.SelectedIndex = 0; + tBQRText.Text = tmp; + btnGenerateBarcode2D.PerformClick(); + } + internal void SetUrl2D(string tmp) { - Properties.Settings.Default.importBarcode1DType = comboBox1.SelectedIndex; + tabControl1.SelectedIndex = 1; + tCQRPayload.SelectedIndex = 1; + tBQRURL.Text = tmp; + btnGenerateBarcode2D.PerformClick(); } private void BtnCheckBarcode1D_Click(object sender, EventArgs e) { - Logger.Trace("Check Barcode Type:{0} Text:{1}", ((BarcodeCreation.TYPE)comboBox1.SelectedIndex).ToString(), textBox1.Text); - // barcodegcode = ""; + Logger.Trace("Check Barcode Type:{0} Text:{1}", ((BarcodeCreation.TYPE)CbBarcodeSelect.SelectedIndex).ToString(), textBox1.Text); BarcodeCreation.Barcode b = new BarcodeCreation.Barcode(); - barcodeImage = b.Encode((BarcodeCreation.TYPE)comboBox1.SelectedIndex, textBox1.Text);//, Color.Black, Color.White, 200, 100); + barcodeImage = b.Encode((BarcodeCreation.TYPE)CbBarcodeSelect.SelectedIndex, textBox1.Text);//, Color.Black, Color.White, 200, 100); if (b.GetError) { pictureBox1.Image = null; } @@ -79,15 +117,13 @@ private void BtnCheckBarcode1D_Click(object sender, EventArgs e) pictureBox1.Image = barcodeImage; btnClipboardBarcode1D.Visible = true; } - // b.Dispose(); - // barcodeImage.Dispose(); } public void BtnGenerateBarcodeClick(object sender, EventArgs e) { - Logger.Trace(culture, "Generate Barcode Type:{0} Text:{1}", ((BarcodeCreation.TYPE)comboBox1.SelectedIndex).ToString(), textBox1.Text); - // barcodegcode = ""; + Logger.Trace(culture, "Generate Barcode Type:{0} Text:{1}", ((BarcodeCreation.TYPE)CbBarcodeSelect.SelectedIndex).ToString(), textBox1.Text); + BarcodeCreation.Barcode b = new BarcodeCreation.Barcode(); - barcodeImage = b.Encode((BarcodeCreation.TYPE)comboBox1.SelectedIndex, textBox1.Text);//, Color.Black, Color.White, 200, 100); + barcodeImage = b.Encode((BarcodeCreation.TYPE)CbBarcodeSelect.SelectedIndex, textBox1.Text);//, Color.Black, Color.White, 200, 100); if (b.GetError) { pictureBox1.Image = null; } @@ -97,8 +133,6 @@ public void BtnGenerateBarcodeClick(object sender, EventArgs e) GenerateGCode1D(b.EncodedValue, b.EncodedType.ToString(), (double)nUDHeight1D.Value); btnClipboardBarcode1D.Visible = true; } - // b.Dispose(); - // barcodeImage.Dispose(); } private void GenerateGCode1D(string code, string type, double height) @@ -231,7 +265,6 @@ private void GenerateQR() // qrGenerator.Dispose(); pictureBox2.Image = qrCodeImage; btnClipboardBarcode2D.Visible = true; - // qrCodeImage.Dispose(); } public void GenerateGCode2D() @@ -317,14 +350,16 @@ private void CheckPixel(int xp, int yp, bool goUp, double factor) } private void BtnClipboardBarcode1D_Click(object sender, EventArgs e) - { if (pictureBox1.Image != null) - System.Windows.Forms.Clipboard.SetImage(pictureBox1.Image); - } + { + if (pictureBox1.Image != null) + System.Windows.Forms.Clipboard.SetImage(pictureBox1.Image); + } private void BtnClipboardBarcode2D_Click(object sender, EventArgs e) - { if (pictureBox2.Image != null) - System.Windows.Forms.Clipboard.SetImage(pictureBox2.Image); - } + { + if (pictureBox2.Image != null) + System.Windows.Forms.Clipboard.SetImage(pictureBox2.Image); + } private void CbInsertLogo_CheckedChanged(object sender, EventArgs e) { gBLogo.Visible = cBInsertLogo.Checked; } @@ -384,12 +419,12 @@ private void BtnLogoFromFile_Click(object sender, EventArgs e) } } - private void button3_Click(object sender, EventArgs e) + private void BtnHelp_Click(object sender, EventArgs e) { string url = "https://grbl-plotter.de/index.php?"; try { - Button clickedLink = sender as Button; + System.Windows.Forms.Button clickedLink = sender as System.Windows.Forms.Button; Process.Start(url + clickedLink.Tag.ToString()); } catch (Exception err) @@ -398,6 +433,53 @@ private void button3_Click(object sender, EventArgs e) MessageBox.Show("Could not open the link: " + err.Message, "Error"); } } + private void BtnSaveIni_Click(object sender, EventArgs e) + { + try + { + SaveFileDialog sfd = new SaveFileDialog + { + Filter = "Machine Ini files (*.ini)|*.ini", + FileName = "CreateBarcode_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".ini" + }; + if (sfd.ShowDialog() == DialogResult.OK) + { + var MyIni = new IniFile(sfd.FileName); + MyIni.WriteSection(IniFile.sectionBarcode); //"Create Text"); + Logger.Info("Save machine parameters as {0}", sfd.FileName); + } + sfd.Dispose(); + } + catch (Exception err) + { + EventCollector.StoreException("BtnSaveIni_Click " + err.Message); + Logger.Error(err, "BtnSaveIni_Click "); + MessageBox.Show("SaveMachineParameters: \r\n" + err.Message, "Error"); + } + } + + private void TabControl1_SelectedIndexChanged(object sender, EventArgs e) + { + Properties.Settings.Default.importBarcode1DSelect = (tabControl1.SelectedIndex == 0); + } + } + + public partial class IniFile + { + internal static string[,] keyValueBarcode = { + {"1D Name", "importBarcode1DName" }, + {"1D Height", "importBarcode1DHeight" }, + {"1D Lines", "importBarcode1DLines" }, + {"1D Width", "importBarcode1DScanGap" }, + {"1D Text", "importBarcode1DText" }, + {"1D Selected", "importBarcode1DSelect" }, + {"2D Lines", "importBarcode2DLines" }, + {"2D Width", "importBarcode2DScanGap"}, + {"2D Border", "importBarcode2DBorder" }, + {"2D Text", "importBarcode2DText" }, + {"2D URL", "importBarcode2DText" } + }; + internal static string sectionBarcode = "Create Barcode"; } } diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.cs.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.cs.resx index f5f7bcccd..03f601462 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.cs.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.cs.resx @@ -216,4 +216,25 @@ Vložte kód do 2D zobrazení (na pozici 0;0) + + Vypočítejte čárový kód a vygenerujte G-kód + + + Vypočítejte QR.Code a vygenerujte G-Code + + + Vypočítejte čárový kód a ukažte obrázek + + + Poznámka: Některé čárové kódy lze použít pouze s čísly/číslicemi. + + + Vypočítejte QR kód a ukažte obrázek + + + Online podpora + + + Uložte nastavení tohoto okna jako INI soubor + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.de-DE.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.de-DE.resx index c40984027..bcb1092db 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.de-DE.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.de-DE.resx @@ -189,4 +189,25 @@ Code in 2D-Ansicht einfügen (an Position 0;0) + + Barcode berechnen und G-Code generieren + + + QR.Code berechnen und G-Code generieren + + + Barcode berechnen und Bild anzeigen + + + Hinweis: Einige Barcodes können nur mit Zahlen/Ziffern verwendet werden. + + + QR-Code berechnen und Bild anzeigen + + + Onlinehilfe + + + Speichern Sie die Einstellungen dieses Fensters als INI-Datei + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.es.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.es.resx index b6b682a05..edeeb4fe5 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.es.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.es.resx @@ -216,4 +216,25 @@ Insertar código en la vista 2D (en la posición 0;0) + + Calcular código de barras y generar código G + + + Calcular código QR y generar código G + + + Calcular código de barras y mostrar imagen. + + + Nota: algunos códigos de barras solo se pueden usar con números/dígitos. + + + Calcular código QR y mostrar imagen + + + Ayuda en linea + + + Guarde la configuración de esta ventana como archivo INI + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.fr.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.fr.resx index 8e6aa4ceb..c4fa19a09 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.fr.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.fr.resx @@ -216,4 +216,25 @@ Insérer le code dans la vue 2D (à la position 0;0) + + Calculer le code-barres et générer le G-Code + + + Calculer le QR.Code et générer le G-Code + + + Calculer le code-barres et afficher l'image + + + Remarque : certains codes-barres ne peuvent être utilisés qu'avec des chiffres/chiffres. + + + Calculer le code QR et afficher l'image + + + Aide en ligne + + + Enregistrez les paramètres de cette fenêtre sous forme de fichier INI + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.it.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.it.resx index 73dfb6af7..c6a4c6c1d 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.it.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.it.resx @@ -216,4 +216,25 @@ Inserisci il codice nella vista 2D (alla posizione 0;0) + + Calcola il codice a barre e genera il codice G + + + Calcola QR.Code e genera G-Code + + + Calcola il codice a barre e mostra l'immagine + + + Nota: alcuni codici a barre possono essere utilizzati solo con numeri/cifre. + + + Calcola il codice QR e mostra l'immagine + + + Aiuto online + + + Salva le impostazioni di questa finestra come file INI + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.ja.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.ja.resx index 949f4c5a0..62407ae78 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.ja.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.ja.resx @@ -216,4 +216,25 @@ 2Dビューにコードを挿入します（位置0; 0） + + バーコードを計算してGコードを生成する + + + QR.Codeを計算してGコードを生成 + + + バーコードを計算して画像を表示 + + + 注: 一部のバーコードは数字/数字でのみ使用できます。 + + + QRコードを計算して画像を表示 + + + オンラインヘルプ + + + このウィンドウの設定をINIファイルとして保存します + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.pl.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.pl.resx index b824eec1d..c2f84a45f 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.pl.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.pl.resx @@ -219,4 +219,25 @@ G-Code kodu kreskowego + + Oblicz kod kreskowy i wygeneruj G-Code + + + Oblicz kod QR i wygeneruj kod G + + + Oblicz kod kreskowy i pokaż obraz + + + Uwaga: niektórych kodów kreskowych można używać wyłącznie z liczbami/cyframi. + + + Oblicz kod QR i pokaż obraz + + + Pomoc online + + + Zapisz ustawienia tego okna jako plik INI + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.pt.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.pt.resx index a15dc84d5..e7d201c71 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.pt.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.pt.resx @@ -216,4 +216,25 @@ Insira o código na visualização 2D (na posição 0;0) + + Calcular código de barras e gerar G-Code + + + Calcule QR.Code e gere G-Code + + + Calcular código de barras e mostrar imagem + + + Nota: alguns códigos de barras só podem ser usados ​​com números/dígitos. + + + Calcular QR-Code e mostrar imagem + + + Ajuda online + + + Salve as configurações desta janela como arquivo INI + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.resx index b84cf103c..fc9902574 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.resx @@ -131,6 +131,9 @@ Generate Barcode + + Calculate barcode and generate G-Code + btnGenerateBarcode1D @@ -180,6 +183,9 @@ Generate QR-Code + + Calculate QR.Code and generate G-Code + btnGenerateBarcode2D @@ -231,6 +237,9 @@ Check Barcode + + Calculate barcode and show image + btnCheckBarcode1D @@ -501,25 +510,28 @@ 12 - + 306, 6 - + 256, 21 - + 3 - - comboBox1 + + Note: some barcodes can only used with numbers/digits. + + + CbBarcodeSelect - + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tabPage1 - + 13 @@ -529,7 +541,7 @@ 3, 3, 3, 3 - 568, 327 + 572, 327 0 @@ -549,18 +561,6 @@ 0 - - 6, 60 - - - 180, 23 - - - 32 - - - Invert image - btnLogoInvert @@ -573,18 +573,6 @@ 0 - - 6, 38 - - - 180, 23 - - - 31 - - - Load from File - btnLogoFromFile @@ -597,18 +585,6 @@ 1 - - 6, 16 - - - 180, 23 - - - 30 - - - Paste from Clipboard - btnLogoFromClipboard @@ -621,18 +597,6 @@ 2 - - 274, 13 - - - 70, 70 - - - Zoom - - - 29 - pictureBox3 @@ -672,45 +636,6 @@ 0 - - 6, 8 - - - True - - - 330, 60 - - - 16 - - - tBQRText - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tPQR1 - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 342, 74 - - - 0 - - - Text - tPQR1 @@ -723,42 +648,6 @@ 0 - - 6, 6 - - - 329, 20 - - - 0 - - - tBQRURL - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tPQR2 - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 342, 74 - - - 1 - - - URL - tPQR2 @@ -771,337 +660,91 @@ 1 - - True - - - 87, 51 - - - 64, 17 - - - 9 - - - no auth. - - - radioButton1 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + tabPage3 - - 0 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + tCQRPayload - - 268, 8 + + 2 - - 68, 17 + + 6, 192 - - 8 + + 350, 100 - - is hidden + + 30 - - cBWLAN1 + + tCQRPayload - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage3 + + tabPage2 - + 1 - - True + + 362, 212 - - 6, 53 + + 200, 23 - - 75, 13 + + 27 - - 7 + + Copy Image to clipboard - - Authentication + + False - - label11 + + btnClipboardBarcode2D - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage3 + + tabPage2 - + 2 - + True - - 285, 51 + + 6, 75 - - 50, 17 + + 82, 17 - - 6 + + 28 - - WEP + + Insert Logo - - rBWLAN2 + + cBInsertLogo - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage3 + + tabPage2 - - 3 - - - True - - - 169, 51 - - - 92, 17 - - - 5 - - - WPA / WPA2 - - - rBWLAN1 - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage3 - - - 4 - - - True - - - 6, 31 - - - 53, 13 - - - 4 - - - Password - - - label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage3 - - - 5 - - - True - - - 6, 9 - - - 32, 13 - - - 3 - - - SSID - - - label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage3 - - - 6 - - - 87, 28 - - - 248, 20 - - - 2 - - - tBWLAN2 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage3 - - - 7 - - - 87, 6 - - - 174, 20 - - - 1 - - - tBWLAN1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage3 - - - 8 - - - 4, 22 - - - 3, 3, 3, 3 - - - 342, 74 - - - 2 - - - WLAN - - - tabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tCQRPayload - - - 2 - - - 6, 192 - - - 350, 100 - - - 30 - - - tCQRPayload - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 1 - - - 362, 212 - - - 200, 23 - - - 27 - - - Copy Image to clipboard - - - False - - - btnClipboardBarcode2D - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 2 - - - True - - - 6, 75 - - - 82, 17 - - - 28 - - - Insert Logo - - - cBInsertLogo - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - + 3 @@ -1116,6 +759,9 @@ Check QR-Code + + Calculate QR-Code and show image + btnCheckBarcode2D @@ -1342,7 +988,7 @@ 3, 3, 3, 3 - 568, 327 + 572, 327 1 @@ -1363,10 +1009,10 @@ 1 - 6, 6 + 1, 1 - 576, 353 + 580, 353 3 @@ -1381,31 +1027,397 @@ $this - 2 + 3 - - 17, 17 - - - True + + 6, 60 - - NoControl + + 180, 23 - - 316, 361 + + 32 - - 216, 17 + + Invert image - - 15 + + 6, 38 - - Insert code into 2D-view (at position 0;0) + + 180, 23 - - CbInsertCode + + 31 + + + Load from File + + + 6, 16 + + + 180, 23 + + + 30 + + + Paste from Clipboard + + + 274, 13 + + + 70, 70 + + + Zoom + + + 29 + + + tBQRText + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tPQR1 + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 342, 74 + + + 0 + + + Text + + + 6, 8 + + + True + + + 330, 60 + + + 16 + + + tBQRURL + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tPQR2 + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 342, 74 + + + 1 + + + URL + + + 6, 6 + + + 329, 20 + + + 0 + + + radioButton1 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 0 + + + cBWLAN1 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 1 + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 2 + + + rBWLAN2 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 3 + + + rBWLAN1 + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 4 + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 5 + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 6 + + + tBWLAN2 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 7 + + + tBWLAN1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage3 + + + 8 + + + 4, 22 + + + 3, 3, 3, 3 + + + 342, 74 + + + 2 + + + WLAN + + + True + + + 87, 51 + + + 64, 17 + + + 9 + + + no auth. + + + True + + + 268, 8 + + + 68, 17 + + + 8 + + + is hidden + + + True + + + 6, 53 + + + 75, 13 + + + 7 + + + Authentication + + + True + + + 285, 51 + + + 50, 17 + + + 6 + + + WEP + + + True + + + 169, 51 + + + 92, 17 + + + 5 + + + WPA / WPA2 + + + True + + + 6, 31 + + + 53, 13 + + + 4 + + + Password + + + True + + + 6, 9 + + + 32, 13 + + + 3 + + + SSID + + + 87, 28 + + + 248, 20 + + + 2 + + + 87, 6 + + + 174, 20 + + + 1 + + + True + + + NoControl + + + 316, 361 + + + 216, 17 + + + 15 + + + Insert code into 2D-view (at position 0;0) + + + CbInsertCode System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1414,38 +1426,68 @@ $this - 1 + 2 - + NoControl - - 10, 357 + + 556, 0 - + 23, 23 - + 45 - + ? - - button3 + + Online Help + + + BtnHelp + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + NoControl + + + 528, 0 + + + 23, 23 + + + 47 + + + 💾 + + + Save settings of this window as INI file + + + BtnSaveIni - + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 0 - - True - 6, 13 @@ -1467,10 +1509,25 @@ System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolTip1 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + GCodeForBarcode System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 156, 17 + + + 17, 17 + + + True + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.ru.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.ru.resx index 8b21dd6b8..be9db9490 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.ru.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.ru.resx @@ -216,4 +216,25 @@ Вставить код в 2D-вид (в позиции 0;0) + + Рассчитать штрих-код и сгенерировать G-код + + + Рассчитайте QR.Code и сгенерируйте G-код + + + Рассчитать штрих-код и показать изображение + + + Примечание. Некоторые штрих-коды можно использовать только с цифрами. + + + Рассчитайте QR-код и покажите изображение + + + Онлайн помощь + + + Сохраните настройки этого окна как INI-файл. + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.tr.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.tr.resx index 0e7aceda1..874395386 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.tr.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.tr.resx @@ -216,4 +216,25 @@ Kodu 2B görünüme ekleyin (0;0 konumunda) + + Barkodu hesaplayın ve G Kodu oluşturun + + + QR.Code'u hesaplayın ve G-Code'u oluşturun + + + Barkodu hesapla ve resmi göster + + + Not: Bazı barkodlar yalnızca sayı/rakamlarla kullanılabilir. + + + QR Kodunu hesaplayın ve resmi gösterin + + + Çevrimiçi yardım + + + Bu pencerenin ayarlarını INI dosyası olarak kaydedin + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.zh-CN.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.zh-CN.resx index d517ebe1a..17f7d5bef 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.zh-CN.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromBarcode.zh-CN.resx @@ -216,4 +216,25 @@ 将代码插入二维视图（位置 0;0） + + 计算条形码并生成G代码 + + + 计算QR.Code并生成G-Code + + + 计算条形码并显示图像 + + + 注意：某些条形码只能与数字/数字一起使用。 + + + 计算二维码并显示图像 + + + 网上帮助 + + + 将此窗口的设置保存为 INI 文件 + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromImage.cs b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromImage.cs index d6ad5074b..3305c3fec 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromImage.cs +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromImage.cs @@ -1477,6 +1477,7 @@ private void BtnLoadUseCase_Click(object sender, EventArgs e) var MyIni = new IniFile(path); Logger.Trace("Load use case: '{0}'", path); MyIni.ReadAll(); // ReadImport(); + // UpdateIniVariables(); Properties.Settings.Default.useCaseLastLoaded = lBUseCase.Text; ; lblLastUseCase.Text = lBUseCase.Text; diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromShape.Designer.cs b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromShape.Designer.cs index fd4e72853..8b1dbe5a9 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromShape.Designer.cs +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromShape.Designer.cs @@ -983,7 +983,7 @@ private void InitializeComponent() this.button3.Tag = "id=form-shape"; this.toolTip1.SetToolTip(this.button3, resources.GetString("button3.ToolTip")); this.button3.UseVisualStyleBackColor = false; - this.button3.Click += new System.EventHandler(this.button3_Click); + this.button3.Click += new System.EventHandler(this.BtnHelp_Click); // // GCodeFromShape // diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromShape.cs b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromShape.cs index cbc7c8cda..f9dbb4e43 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromShape.cs +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromShape.cs @@ -1295,7 +1295,7 @@ private void NudToolDiameter_ValueChanged(object sender, EventArgs e) CheckInsideShape(); } - private void button3_Click(object sender, EventArgs e) + private void BtnHelp_Click(object sender, EventArgs e) { string url = "https://grbl-plotter.de/index.php?"; try diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.Designer.cs b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.Designer.cs index 5f2d18651..6704e9563 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.Designer.cs +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.Designer.cs @@ -50,7 +50,6 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GCodeFromText)); this.label1 = new System.Windows.Forms.Label(); - this.cBFont = new System.Windows.Forms.ComboBox(); this.btnApply = new System.Windows.Forms.Button(); this.GbFont1 = new System.Windows.Forms.GroupBox(); this.nUDLineBreak = new System.Windows.Forms.NumericUpDown(); @@ -60,11 +59,13 @@ private void InitializeComponent() this.nUDFontDistance = new System.Windows.Forms.NumericUpDown(); this.label10 = new System.Windows.Forms.Label(); this.nUDFontSize = new System.Windows.Forms.NumericUpDown(); + this.cBFont = new System.Windows.Forms.ComboBox(); this.RbAlign3 = new System.Windows.Forms.RadioButton(); this.RbAlign2 = new System.Windows.Forms.RadioButton(); this.RbAlign1 = new System.Windows.Forms.RadioButton(); this.btnCancel = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.cBImportGraphicNoise = new System.Windows.Forms.CheckBox(); this.CbOutline = new System.Windows.Forms.CheckBox(); this.cBToolTable = new System.Windows.Forms.CheckBox(); this.CbHatchFill = new System.Windows.Forms.CheckBox(); @@ -75,14 +76,16 @@ private void InitializeComponent() this.cBPauseWord = new System.Windows.Forms.CheckBox(); this.cBPauseChar = new System.Windows.Forms.CheckBox(); this.label2 = new System.Windows.Forms.Label(); + this.BtnSaveIni = new System.Windows.Forms.Button(); + this.BtnHelp = new System.Windows.Forms.Button(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.LblInfoWidth = new System.Windows.Forms.Label(); this.LblInfoHeight = new System.Windows.Forms.Label(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); - this.NUDWidth = new System.Windows.Forms.NumericUpDown(); this.NUDHeight = new System.Windows.Forms.NumericUpDown(); this.BtnSetWidth = new System.Windows.Forms.Button(); this.BtnSetHeight = new System.Windows.Forms.Button(); + this.NUDWidth = new System.Windows.Forms.NumericUpDown(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.CbWordWrap = new System.Windows.Forms.CheckBox(); @@ -110,15 +113,14 @@ private void InitializeComponent() this.button2 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.fontDialog1 = new System.Windows.Forms.FontDialog(); - this.button8 = new System.Windows.Forms.Button(); this.GbFont1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nUDLineBreak)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDFontLine)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDFontDistance)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nUDFontSize)).BeginInit(); this.groupBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.NUDWidth)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUDHeight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUDWidth)).BeginInit(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -134,12 +136,6 @@ private void InitializeComponent() this.label1.Name = "label1"; this.toolTip1.SetToolTip(this.label1, resources.GetString("label1.ToolTip")); // - // cBFont - // - this.cBFont.FormattingEnabled = true; - resources.ApplyResources(this.cBFont, "cBFont"); - this.cBFont.Name = "cBFont"; - // // btnApply // resources.ApplyResources(this.btnApply, "btnApply"); @@ -164,6 +160,7 @@ private void InitializeComponent() // // nUDLineBreak // + this.nUDLineBreak.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::GrblPlotter.Properties.Settings.Default, "createTextHersheyLineBreak", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.nUDLineBreak.Increment = new decimal(new int[] { 10, 0, @@ -181,23 +178,20 @@ private void InitializeComponent() 0, 0}); this.nUDLineBreak.Name = "nUDLineBreak"; - this.nUDLineBreak.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); + this.nUDLineBreak.Value = global::GrblPlotter.Properties.Settings.Default.createTextHersheyLineBreak; // // cBLineBreak // resources.ApplyResources(this.cBLineBreak, "cBLineBreak"); - this.cBLineBreak.Checked = global::GrblPlotter.Properties.Settings.Default.createTextLineBreakEnable; - this.cBLineBreak.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::GrblPlotter.Properties.Settings.Default, "createTextLineBreakEnable", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.cBLineBreak.Checked = global::GrblPlotter.Properties.Settings.Default.createTextHersheyLineBreakEnable; + this.cBLineBreak.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::GrblPlotter.Properties.Settings.Default, "createTextHersheyLineBreakEnable", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.cBLineBreak.Name = "cBLineBreak"; this.toolTip1.SetToolTip(this.cBLineBreak, resources.GetString("cBLineBreak.ToolTip")); this.cBLineBreak.UseVisualStyleBackColor = true; // // nUDFontLine // + this.nUDFontLine.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::GrblPlotter.Properties.Settings.Default, "createTextHersheyLineDistance", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.nUDFontLine.DecimalPlaces = 1; resources.ApplyResources(this.nUDFontLine, "nUDFontLine"); this.nUDFontLine.Maximum = new decimal(new int[] { @@ -211,11 +205,7 @@ private void InitializeComponent() 0, 0}); this.nUDFontLine.Name = "nUDFontLine"; - this.nUDFontLine.Value = new decimal(new int[] { - 15, - 0, - 0, - 0}); + this.nUDFontLine.Value = global::GrblPlotter.Properties.Settings.Default.createTextHersheyLineDistance; // // label11 // @@ -225,6 +215,7 @@ private void InitializeComponent() // // nUDFontDistance // + this.nUDFontDistance.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::GrblPlotter.Properties.Settings.Default, "createTextHersheyLetterDistance", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.nUDFontDistance.DecimalPlaces = 1; this.nUDFontDistance.Increment = new decimal(new int[] { 1, @@ -243,6 +234,7 @@ private void InitializeComponent() 0, -2147483648}); this.nUDFontDistance.Name = "nUDFontDistance"; + this.nUDFontDistance.Value = global::GrblPlotter.Properties.Settings.Default.createTextHersheyLetterDistance; // // label10 // @@ -252,6 +244,7 @@ private void InitializeComponent() // // nUDFontSize // + this.nUDFontSize.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::GrblPlotter.Properties.Settings.Default, "createTextHersheyFontSize", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.nUDFontSize.DecimalPlaces = 1; resources.ApplyResources(this.nUDFontSize, "nUDFontSize"); this.nUDFontSize.Maximum = new decimal(new int[] { @@ -265,13 +258,17 @@ private void InitializeComponent() 0, 0}); this.nUDFontSize.Name = "nUDFontSize"; - this.nUDFontSize.Value = new decimal(new int[] { - 10, - 0, - 0, - 0}); + this.nUDFontSize.Value = global::GrblPlotter.Properties.Settings.Default.createTextHersheyFontSize; this.nUDFontSize.ValueChanged += new System.EventHandler(this.NudFontSize_ValueChanged); // + // cBFont + // + this.cBFont.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::GrblPlotter.Properties.Settings.Default, "createTextHersheyFontName", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.cBFont.FormattingEnabled = true; + resources.ApplyResources(this.cBFont, "cBFont"); + this.cBFont.Name = "cBFont"; + this.cBFont.Text = global::GrblPlotter.Properties.Settings.Default.createTextHersheyFontName; + // // RbAlign3 // resources.ApplyResources(this.RbAlign3, "RbAlign3"); @@ -307,7 +304,7 @@ private void InitializeComponent() // // groupBox1 // - this.groupBox1.Controls.Add(this.button8); + this.groupBox1.Controls.Add(this.cBImportGraphicNoise); this.groupBox1.Controls.Add(this.CbOutline); this.groupBox1.Controls.Add(this.cBToolTable); this.groupBox1.Controls.Add(this.CbHatchFill); @@ -322,6 +319,15 @@ private void InitializeComponent() this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // + // cBImportGraphicNoise + // + resources.ApplyResources(this.cBImportGraphicNoise, "cBImportGraphicNoise"); + this.cBImportGraphicNoise.Checked = global::GrblPlotter.Properties.Settings.Default.importGraphicNoiseEnable; + this.cBImportGraphicNoise.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::GrblPlotter.Properties.Settings.Default, "importGraphicNoiseEnable", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + this.cBImportGraphicNoise.Name = "cBImportGraphicNoise"; + this.toolTip1.SetToolTip(this.cBImportGraphicNoise, resources.GetString("cBImportGraphicNoise.ToolTip")); + this.cBImportGraphicNoise.UseVisualStyleBackColor = true; + // // CbOutline // resources.ApplyResources(this.CbOutline, "CbOutline"); @@ -394,6 +400,26 @@ private void InitializeComponent() resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; // + // BtnSaveIni + // + this.BtnSaveIni.BackColor = System.Drawing.Color.SkyBlue; + resources.ApplyResources(this.BtnSaveIni, "BtnSaveIni"); + this.BtnSaveIni.Name = "BtnSaveIni"; + this.BtnSaveIni.Tag = "id=form-text"; + this.toolTip1.SetToolTip(this.BtnSaveIni, resources.GetString("BtnSaveIni.ToolTip")); + this.BtnSaveIni.UseVisualStyleBackColor = false; + this.BtnSaveIni.Click += new System.EventHandler(this.BtnSaveIni_Click); + // + // BtnHelp + // + this.BtnHelp.BackColor = System.Drawing.Color.SkyBlue; + resources.ApplyResources(this.BtnHelp, "BtnHelp"); + this.BtnHelp.Name = "BtnHelp"; + this.BtnHelp.Tag = "id=form-text"; + this.toolTip1.SetToolTip(this.BtnHelp, resources.GetString("BtnHelp.ToolTip")); + this.BtnHelp.UseVisualStyleBackColor = false; + this.BtnHelp.Click += new System.EventHandler(this.BtnHelp_Click); + // // LblInfoWidth // resources.ApplyResources(this.LblInfoWidth, "LblInfoWidth"); @@ -415,29 +441,9 @@ private void InitializeComponent() this.toolTip1.SetToolTip(this.linkLabel1, resources.GetString("linkLabel1.ToolTip")); this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkLabel_LinkClicked); // - // NUDWidth - // - resources.ApplyResources(this.NUDWidth, "NUDWidth"); - this.NUDWidth.Maximum = new decimal(new int[] { - 1000000, - 0, - 0, - 0}); - this.NUDWidth.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 65536}); - this.NUDWidth.Name = "NUDWidth"; - this.toolTip1.SetToolTip(this.NUDWidth, resources.GetString("NUDWidth.ToolTip")); - this.NUDWidth.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // // NUDHeight // + this.NUDHeight.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::GrblPlotter.Properties.Settings.Default, "createTextSystemSizeY", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); resources.ApplyResources(this.NUDHeight, "NUDHeight"); this.NUDHeight.Maximum = new decimal(new int[] { 1000000, @@ -451,11 +457,7 @@ private void InitializeComponent() 65536}); this.NUDHeight.Name = "NUDHeight"; this.toolTip1.SetToolTip(this.NUDHeight, resources.GetString("NUDHeight.ToolTip")); - this.NUDHeight.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); + this.NUDHeight.Value = global::GrblPlotter.Properties.Settings.Default.createTextSystemSizeY; // // BtnSetWidth // @@ -473,6 +475,24 @@ private void InitializeComponent() this.BtnSetHeight.UseVisualStyleBackColor = true; this.BtnSetHeight.Click += new System.EventHandler(this.BtnSetHeight_Click); // + // NUDWidth + // + this.NUDWidth.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::GrblPlotter.Properties.Settings.Default, "createTextSystemSizeX", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); + resources.ApplyResources(this.NUDWidth, "NUDWidth"); + this.NUDWidth.Maximum = new decimal(new int[] { + 1000000, + 0, + 0, + 0}); + this.NUDWidth.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 65536}); + this.NUDWidth.Name = "NUDWidth"; + this.toolTip1.SetToolTip(this.NUDWidth, resources.GetString("NUDWidth.ToolTip")); + this.NUDWidth.Value = global::GrblPlotter.Properties.Settings.Default.createTextSystemSizeX; + // // tabControl1 // this.tabControl1.Controls.Add(this.tabPage1); @@ -515,7 +535,8 @@ private void InitializeComponent() // RbFont1 // resources.ApplyResources(this.RbFont1, "RbFont1"); - this.RbFont1.Checked = true; + this.RbFont1.Checked = global::GrblPlotter.Properties.Settings.Default.createTextHersheySelect; + this.RbFont1.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::GrblPlotter.Properties.Settings.Default, "createTextHersheySelect", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); this.RbFont1.Name = "RbFont1"; this.RbFont1.TabStop = true; this.RbFont1.UseVisualStyleBackColor = true; @@ -545,6 +566,7 @@ private void InitializeComponent() this.tBText.ForeColor = System.Drawing.Color.Black; this.tBText.Name = "tBText"; this.tBText.Text = global::GrblPlotter.Properties.Settings.Default.createTextFontText; + this.tBText.FontChanged += new System.EventHandler(this.TbText_FontChanged); this.tBText.TextChanged += new System.EventHandler(this.TbText_TextChanged); // // GbFont2 @@ -683,21 +705,13 @@ private void InitializeComponent() this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.BtnLoadGraphic_Click); // - // button8 - // - this.button8.BackColor = System.Drawing.Color.SkyBlue; - resources.ApplyResources(this.button8, "button8"); - this.button8.Name = "button8"; - this.button8.Tag = "id=form-text"; - this.toolTip1.SetToolTip(this.button8, resources.GetString("button8.ToolTip")); - this.button8.UseVisualStyleBackColor = false; - this.button8.Click += new System.EventHandler(this.button8_Click); - // // GCodeFromText // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; + this.Controls.Add(this.BtnHelp); + this.Controls.Add(this.BtnSaveIni); this.Controls.Add(this.tabControl1); this.Name = "GCodeFromText"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.TextForm_FormClosing); @@ -711,8 +725,8 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.nUDFontSize)).EndInit(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.NUDWidth)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUDHeight)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUDWidth)).EndInit(); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabPage1.PerformLayout(); @@ -790,6 +804,8 @@ private void InitializeComponent() private System.Windows.Forms.NumericUpDown NUDWidth; private System.Windows.Forms.CheckBox CbWordWrap; private System.Windows.Forms.CheckBox CbOutline; - private System.Windows.Forms.Button button8; + private System.Windows.Forms.Button BtnHelp; + private System.Windows.Forms.Button BtnSaveIni; + private System.Windows.Forms.CheckBox cBImportGraphicNoise; } } \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.ar.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.ar.resx index 18436212b..aec9ce8d5 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.ar.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.ar.resx @@ -279,4 +279,16 @@ حساب وتعيين حجم الخط للوصول إلى ارتفاع النص المحدد + + يحفظ إعدادات هذه النافذة كملف INI + + + مساعدة على الانترنت + + + زد الضوضاء + + + يُنشئ خطوطًا متذبذبة، وإعدادات في [الإعداد - استيراد الرسومات - استيراد المسار - تعديلات المسار] + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.cs b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.cs index 2af1b8358..55cf2f19a 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.cs +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.cs @@ -1,7 +1,7 @@ /* GRBL-Plotter. Another GCode sender for GRBL. This file is part of the GRBL-Plotter application. - Copyright (C) 2015-2023 Sven Hasemann contact: svenhb@web.de + Copyright (C) 2015-2024 Sven Hasemann contact: svenhb@web.de This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,7 +37,8 @@ You should have received a copy of the GNU General Public License * 2023-11-02 l:139 f:FillFontSelector check if index is in range * 2023-11-24 l:414 f:BtnSelectFont_Click add try/catch on fontDialog1.ShowDialog - Problem: if a newly installed font was selected, after closing the dialog with 'ok': "main Form ThreadException - Only TrueType fonts are supported. This is not a TrueType font." - * + * 2024-02-06 add process automation + * 2024-02-22 update proprties after loading ini-file */ using System; @@ -54,6 +55,7 @@ You should have received a copy of the GNU General Public License // Hershey code from: http://www.evilmadscientist.com/2011/hershey-text-an-inkscape-extension-for-engraving-fonts/ namespace GrblPlotter { + public partial class GCodeFromText : Form { private static Font textFont; @@ -61,11 +63,11 @@ public partial class GCodeFromText : Form private static Font initFont; private static Color initColor; - // Trace, Debug, Info, Warn, Error, Fatal private static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger(); private static readonly CultureInfo culture = CultureInfo.InvariantCulture; +#region load_close public GCodeFromText() { this.Icon = Properties.Resources.Icon; @@ -78,6 +80,9 @@ public GCodeFromText() private void TextForm_Load(object sender, EventArgs e) { + initFont = textFont = tBText.Font; + initColor = textColor = tBText.ForeColor; + FillFontSelector(); Location = Properties.Settings.Default.locationTextForm; @@ -107,29 +112,73 @@ private void TextForm_Load(object sender, EventArgs e) } CBToolTable_CheckedChanged(sender, e); - nUDFontSize.Value = Properties.Settings.Default.createTextFontSize; - nUDFontLine.Value = Properties.Settings.Default.createTextLineDistance; - nUDFontDistance.Value = Properties.Settings.Default.createTextFontDistance; - nUDLineBreak.Value = Properties.Settings.Default.createTextLineBreak; + UpdateIniVariables(); + + LoadPicture("svg"); + } - initFont = tBText.Font; + private bool iniWasSet = false; + public void UpdateIniVariables() + { textFont = Properties.Settings.Default.createTextSystemFont; + + float newSize = Properties.Settings.Default.createTextSystemFontSize; + + if ((newSize > 0) && (newSize < Single.MaxValue)) + { + textFont = new Font(textFont.Name, newSize, textFont.Style);//, GraphicsUnit.Millimeter); + tBText.Font = textFont; + ShowTextSize(); + } + + iniWasSet = true; + LblInfoFont.Text = textFont.FontFamily.Name.ToString(); - initColor = textColor = tBText.ForeColor; + textColor = ColorTranslator.FromHtml(Properties.Settings.Default.createTextFontColor); //tBText.ForeColor; - Logger.Info("TextForm_Load initFont:'{0}'", initFont); - Logger.Info("TextForm_Load textFont:'{0}'", textFont); + int tmp = Properties.Settings.Default.createTextAlignment; + if (tmp == 1) { tBText.TextAlign = HorizontalAlignment.Left; } + else if (tmp == 2) { tBText.TextAlign = HorizontalAlignment.Center; } + else if (tmp == 3) { tBText.TextAlign = HorizontalAlignment.Right; } - if ((textFont == null) || (textFont.Size == null)) + string tmpText = Properties.Settings.Default.createTextHersheyFontName; + if ((tmpText == "") || (tmpText == "cBFont")) + cBFont.SelectedIndex = 0; + else { - Logger.Error("TextForm_Load font unknown '{0}'", textFont); - textFont = initFont; + for (int i = 0; i < cBFont.Items.Count; i++) + { + if (cBFont.Items[i].ToString() == tmpText) + { + cBFont.SelectedIndex = i; + break; + } + } } + if (!Properties.Settings.Default.createTextHersheySelect) + { RbFont2.PerformClick(); } + else + { RbFont1_CheckedChanged(null, null); } + + tBText.Text = Properties.Settings.Default.createTextFontText; + tBText.Invalidate(); ShowTextSize(); - RbFont1_CheckedChanged(sender, e); + } - LoadPicture("svg"); + internal void SetText(string tmp, string opt, double size) + { + tBText.Text = tmp; + /* if (opt.ToLower().Contains("w")) + { if (size > 0) { NUDWidth.Value = (decimal)size;} + BtnSetWidth.PerformClick(); + } + if (opt.ToLower().Contains("h")) + { if (size > 0) { NUDHeight.Value = (decimal)size;} + BtnSetHeight.PerformClick(); + } + */ + btnApply.PerformClick(); } private void FillFontSelector() @@ -138,35 +187,37 @@ private void FillFontSelector() cBFont.Items.AddRange(GCodeFromFont.GetHersheyFontNames()); cBFont.Items.AddRange(GCodeFromFont.FontFileName()); - int tmpIndex = Properties.Settings.Default.createTextFontIndex; - if (cBFont.Items.Count > 0) + string tmpText = Properties.Settings.Default.createTextHersheyFontName; + if (tmpText == "") + cBFont.SelectedIndex = 0; + else { - if ((tmpIndex < 0) || (tmpIndex >= cBFont.Items.Count)) - { cBFont.SelectedIndex = tmpIndex = Properties.Settings.Default.createTextFontIndex = 0; } - else - { cBFont.SelectedIndex = tmpIndex; } + for (int i = 0; i < cBFont.Items.Count; i++) + { + if (cBFont.Items[i].ToString() == tmpText) + { + cBFont.SelectedIndex = i; + break; + } + } } } private void TextForm_FormClosing(object sender, FormClosingEventArgs e) - { SaveSettings(); } - + { SaveSettings(); + Logger.Trace("++++++ GCodeFromText STOP ++++++"); + } +#endregion private void SaveSettings() { - Properties.Settings.Default.createTextFontSize = nUDFontSize.Value; - Properties.Settings.Default.createTextLineDistance = nUDFontLine.Value; - Properties.Settings.Default.createTextFontDistance = nUDFontDistance.Value; - Properties.Settings.Default.createTextLineBreak = nUDLineBreak.Value; - - Logger.Trace("++++++ GCodeFromText STOP ++++++"); - Properties.Settings.Default.createTextFontIndex = cBFont.SelectedIndex; Properties.Settings.Default.locationTextForm = Location; - Properties.Settings.Default.createTextSystemFont = textFont; - + Properties.Settings.Default.createTextSystemFontSize = textFont.Size; + Properties.Settings.Default.createTextFontColor = ColorTranslator.ToHtml(textColor); Properties.Settings.Default.Save(); } +#region form_controls // get text, break it into chars, get path, etc... This event needs to be assigned in MainForm to poll text private void BtnApply_Click(object sender, EventArgs e) // in MainForm: _text_form.btnApply.Click += getGCodeFromText; { CreateText(); } @@ -176,7 +227,7 @@ public void CreateText() VisuGCode.pathBackground.Reset(); Graphic.CleanUp(); Graphic.Init(Graphic.SourceType.Text, "", null, null); - Graphic.graphicInformation.ApplyHatchFill = CbHatchFill.Checked; // false; // no SVG import with fillColor "none" + Graphic.graphicInformation.ApplyHatchFill = CbHatchFill.Checked; Graphic.graphicInformation.OptionNodesOnly = false; Graphic.graphicInformation.OptionCodeSortDistance = false; Graphic.graphicInformation.OptionZFromWidth = false; @@ -206,7 +257,10 @@ public void CreateText() SaveSettings(); GCodeFromFont.Reset(); GCodeFromFont.GCText = tBText.Text; - GCodeFromFont.GCFontName = cBFont.Items[cBFont.SelectedIndex].ToString(); + GCodeFromFont.GCFontName = cBFont.Text;// cBFont.Items[cBFont.SelectedIndex].ToString(); + Logger.Trace("cbfont via index: '{0}' name: '{1}'", GCodeFromFont.GCFontName, cBFont.Text); + + GCodeFromFont.GCHeight = (double)nUDFontSize.Value; GCodeFromFont.GCFontDistance = (double)nUDFontDistance.Value; GCodeFromFont.GCLineDistance = (double)(nUDFontLine.Value / nUDFontSize.Value); @@ -216,7 +270,7 @@ public void CreateText() GCodeFromFont.GCPauseLine = cBPauseLine.Checked; GCodeFromFont.GCConnectLetter = cBConnectLetter.Checked; - if (Properties.Settings.Default.createTextLineBreakEnable) + if (Properties.Settings.Default.createTextHersheyLineBreakEnable) GCodeFromFont.GetCode((double)nUDLineBreak.Value); // do automatic page break else GCodeFromFont.GetCode(0); // no page break @@ -229,6 +283,7 @@ public void CreateText() else { Graphic.SetFont(tBText.Font, cBPauseChar.Checked); // CreateText + Logger.Trace("CreateText fontsize:{0} size:{1}", textFont.Size, tBText.Font.Size); StringAlignment alignment = StringAlignment.Near; if (RbAlign2.Checked) { alignment = StringAlignment.Center; } @@ -236,7 +291,7 @@ public void CreateText() Graphic.AddText(GetWrappedText(), alignment); } - + Logger.Trace("●●●● Create Text"); Graphic.CreateGCode(); // result is saved as stringbuilder in Graphic.GCode; } @@ -318,7 +373,6 @@ private void CBToolTable_CheckedChanged(object sender, EventArgs e) cBTool.Enabled = enabled; } - #region pan_zoom private void BtnLoadGraphic_Click(object sender, EventArgs e) { string s = (sender as Button).Text.ToLower(culture); @@ -425,6 +479,7 @@ private void BtnSelectFont_Click(object sender, EventArgs e) LblInfoFont.Text = textFont.FontFamily.Name.ToString(); textColor = tBText.ForeColor = fontDialog1.Color; ShowTextSize(); + SaveSettings(); } } catch (Exception err) @@ -438,9 +493,11 @@ private void BtnSelectFont_Click(object sender, EventArgs e) private void RbAlign1_CheckedChanged(object sender, EventArgs e) { - if (RbAlign1.Checked) { tBText.TextAlign = HorizontalAlignment.Left; } - else if (RbAlign2.Checked) { tBText.TextAlign = HorizontalAlignment.Center; } - else if (RbAlign3.Checked) { tBText.TextAlign = HorizontalAlignment.Right; } + int tmp = 0; + if (RbAlign1.Checked) { tBText.TextAlign = HorizontalAlignment.Left; tmp = 1; } + else if (RbAlign2.Checked) { tBText.TextAlign = HorizontalAlignment.Center; tmp = 2; } + else if (RbAlign3.Checked) { tBText.TextAlign = HorizontalAlignment.Right; tmp = 3; } + Properties.Settings.Default.createTextAlignment = tmp; } private void RbFont1_CheckedChanged(object sender, EventArgs e) @@ -479,12 +536,17 @@ private void ShowTextSize() try { if ((textFont.Size != null) && (textFont.FontFamily != null)) - Graphic.SetFont(textFont); // ShowTextSize + Graphic.SetFont(textFont); else - { textFont = initFont; Graphic.SetFont(textFont); }// ShowTextSize + { + textFont = initFont; + Graphic.SetFont(textFont); + } RectangleF b = Graphic.GetTextBounds(GetWrappedText(), StringAlignment.Near); LblInfoSize.Text = string.Format("{0} pt", textFont.Size); + // Properties.Settings.Default.createTextSystemFontSize = textFont.Size; + LblInfoWidth.Text = string.Format("{0,9:0.00}", b.Width); LblInfoHeight.Text = string.Format("{0,9:0.00}", b.Height); } @@ -513,7 +575,7 @@ private void BtnSetWidth_Click(object sender, EventArgs e) float newSize = (float)NUDWidth.Value * textFont.Size / b.Width; if ((newSize > 0) && (newSize < Single.MaxValue)) { - textFont = new Font(textFont.Name, newSize, textFont.Style); + textFont = new Font(textFont.Name, newSize, textFont.Style);//,GraphicsUnit.Millimeter); tBText.Font = textFont; ShowTextSize(); } @@ -527,8 +589,7 @@ private void BtnSetHeight_Click(object sender, EventArgs e) float newSize = (float)NUDHeight.Value * textFont.Size / b.Height; if ((newSize > 0) && (newSize < Single.MaxValue)) { - textFont = new Font(textFont.Name, newSize, textFont.Style); - tBText.Font = textFont; + textFont = new Font(textFont.Name, newSize, textFont.Style);//, GraphicsUnit.Millimeter); ShowTextSize(); } else @@ -569,7 +630,7 @@ private void CbOutline_CheckedChanged(object sender, EventArgs e) } } - private void button8_Click(object sender, EventArgs e) + private void BtnHelp_Click(object sender, EventArgs e) { string url = "https://grbl-plotter.de/index.php?"; try @@ -583,5 +644,85 @@ private void button8_Click(object sender, EventArgs e) MessageBox.Show("Could not open the link: " + err.Message, "Error"); } } + + private void BtnSaveIni_Click(object sender, EventArgs e) + { + SaveSettings(); + try + { + SaveFileDialog sfd = new SaveFileDialog + { + Filter = "Machine Ini files (*.ini)|*.ini", + FileName = "CreateText_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".ini" + }; + if (sfd.ShowDialog() == DialogResult.OK) + { + var MyIni = new IniFile(sfd.FileName); + MyIni.WriteSection(IniFile.sectionText); //"Create Text"); + Logger.Info("Save machine parameters as {0}", sfd.FileName); + } + sfd.Dispose(); + } + catch (Exception err) + { + EventCollector.StoreException("BtnSaveIni_Click " + err.Message); + Logger.Error(err, "BtnSaveIni_Click "); + MessageBox.Show("SaveMachineParameters: \r\n" + err.Message, "Error"); + } + } +GraphicsUnit units = GraphicsUnit.Point; + private void TbText_FontChanged(object sender, EventArgs e) + { + Logger.Trace("tBText_FontChanged iniWasSet:{0}", iniWasSet); + if (iniWasSet) + { + float newSize = Properties.Settings.Default.createTextSystemFontSize; + if ((newSize > 0) && (newSize < Single.MaxValue)) + { + textFont = new Font(textFont.Name, newSize, textFont.Style, GraphicsUnit.Millimeter); + tBText.Font = textFont; + ShowTextSize(); + } + } + + iniWasSet = false; + } + } + + public partial class IniFile + { + internal static string[,] keyValueText = { + {"Hershey Font", "createTextHersheyFontName" }, + {"Hershey Letter Height", "createTextHersheyFontSize" }, + {"Hershey Letter Distance", "createTextHersheyLetterDistance" }, + {"Hershey Line Distance", "createTextHersheyLineDistance" }, + {"Hershey Line Break", "createTextHersheyLineBreak" }, + {"Hershey Line Break Enable", "createTextHersheyLineBreakEnable" }, + {"System Font", "createTextSystemFont" }, + {"System Font Size", "createTextSystemFontSize" }, + {"System Font Set Size X", "createTextSystemSizeX" }, + {"System Font Set Size Y", "createTextSystemSizeY" }, + {"System Font Color", "createTextFontColor" }, + {"Font Use Hershey", "createTextHersheySelect" }, + {"Alignment", "createTextAlignment" }, + {"Text", "createTextFontText" }, + + {"Hatch Fill Enable", "importGraphicHatchFillEnable"}, + {"Hatch Fill Cross", "importGraphicHatchFillCross"}, + {"Hatch Fill Distance", "importGraphicHatchFillDistance"}, + {"Hatch Fill Angle", "importGraphicHatchFillAngle"}, + {"Hatch Fill Angle Inc Enable", "importGraphicHatchFillAngleInc"}, + {"Hatch Fill Angle Inc", "importGraphicHatchFillAngle2" }, + {"Hatch Fill Inset Enable", "importGraphicHatchFillInsetEnable"}, + {"Hatch Fill Inset Enable2", "importGraphicHatchFillInsetEnable2"}, + {"Hatch Fill Delete Path", "importGraphicHatchFillDeletePath"}, + {"Hatch Fill Inset Distance", "importGraphicHatchFillInset"}, + {"Hatch Fill Noise", "importGraphicHatchFillNoise" }, + + {"Noise Enable","importGraphicNoiseEnable"}, + {"Noise Amplitude","importGraphicNoiseAmplitude"}, + {"Noise Densitiy","importGraphicNoiseDensity"} + }; + internal static string sectionText = "Create Text"; } -} +} \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.cs.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.cs.resx index 289e279c6..da7b69808 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.cs.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.cs.resx @@ -279,4 +279,16 @@ Vypočítejte a nastavte velikost písma tak, aby dosáhla dané výšky textu + + Uloží nastavení tohoto okna jako INI soubor + + + Online podpora + + + Přidat šum + + + Generuje vratké čáry, nastavení v [Nastavení - Import grafiky - Import cesty - Úpravy cesty] + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.de-DE.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.de-DE.resx index 9eecb5f07..65ca75db4 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.de-DE.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.de-DE.resx @@ -274,4 +274,16 @@ in Setup SVG-Import Berechnen und setzen Sie die Schriftgröße, um die angegebene Texthöhe zu erreichen + + Speichert die Einstellungen dieses Fensters als INI-Datei + + + Onlinehilfe + + + Rauschen hinzufügen + + + Erzeugt wackelige Linien, Einstellungen in [Setup – Grafikimport – Pfadimport – Pfadänderungen] + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.es.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.es.resx index 4b4962b49..83183f6d7 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.es.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.es.resx @@ -273,4 +273,16 @@ Calcule y configure el tamaño de fuente para alcanzar la altura del texto dada + + Guarda la configuración de esta ventana como archivo INI + + + Ayuda en linea + + + Añadir ruido + + + Genera líneas tambaleantes, configuraciones en [Configuración - Importación de gráficos - Importación de ruta - Modificaciones de ruta] + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.fr.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.fr.resx index 11aa56acf..ffefad83b 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.fr.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.fr.resx @@ -273,4 +273,16 @@ Calculer et définir la taille de la police pour atteindre la hauteur de texte donnée + + Enregistre les paramètres de cette fenêtre sous forme de fichier INI + + + Aide en ligne + + + Ajoute du bruit + + + Génère des lignes bancales, paramètres dans [Configuration - Importation de graphiques - Importation de chemin - Modifications de chemin] + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.it.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.it.resx index 12bfd5cd2..d0cd58a12 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.it.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.it.resx @@ -279,4 +279,16 @@ Calcola e imposta la dimensione del carattere per raggiungere l'altezza del testo specificata + + Salva le impostazioni di questa finestra come file INI + + + Aiuto online + + + Aggiungi del rumore + + + Genera linee traballanti, impostazioni in [Setup - Importazione grafica - Importazione percorso - Modifiche percorso] + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.ja.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.ja.resx index d949b1ca1..10add7b73 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.ja.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.ja.resx @@ -279,4 +279,16 @@ 指定されたテキストの高さに達するように font-size を計算して設定します + + このウィンドウの設定をINIファイルとして保存します + + + オンラインヘルプ + + + ノイズを追加 + + + 線のぐらつきの発生 [セットアップ - グラフィックスインポート - パスインポート - パス修正] の設定 + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.pl.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.pl.resx index 94272444e..56f4d943e 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.pl.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.pl.resx @@ -279,4 +279,16 @@ Utwórz G-Code dla tekstu + + Zapisuje ustawienia tego okna jako plik INI + + + Pomoc online + + + Dodać hałas + + + Generuje chwiejne linie, ustawienia w [Konfiguracja - Import grafiki - Import ścieżki - Modyfikacje ścieżki] + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.pt.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.pt.resx index ea3f3f174..10ec9823e 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.pt.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.pt.resx @@ -273,4 +273,16 @@ Calcule e defina o tamanho da fonte para atingir a altura do texto + + Salva as configurações desta janela como arquivo INI + + + Ajuda online + + + Adicionar ruído + + + Gera linhas instáveis, configurações em [Configuração - Importação de gráficos - Importação de caminho - Modificações de caminho] + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.resx index a1f154fa8..1e82884d5 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.resx @@ -138,9 +138,6 @@ Letter height - - 17, 17 - Height of letters @@ -156,27 +153,6 @@ 7 - - 6, 15 - - - 219, 21 - - - 6 - - - cBFont - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont1 - - - 8 - NoControl @@ -204,111 +180,6 @@ 6 - - nUDLineBreak - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont1 - - - 0 - - - cBLineBreak - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont1 - - - 1 - - - nUDFontLine - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont1 - - - 2 - - - label11 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont1 - - - 3 - - - nUDFontDistance - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont1 - - - 4 - - - label10 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont1 - - - 5 - - - nUDFontSize - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont1 - - - 6 - - - 6, 14 - - - 230, 128 - - - 10 - - - GbFont1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 10 - 165, 101 @@ -507,6 +378,48 @@ 6 + + 6, 15 + + + 219, 21 + + + 6 + + + cBFont + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GbFont1 + + + 8 + + + 6, 14 + + + 230, 128 + + + 10 + + + GbFont1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage1 + + + 10 + True @@ -627,34 +540,38 @@ 7 - + + True + + NoControl - - 423, -1 + + 9, 42 - - 23, 23 + + 73, 17 - - 45 + + 20 - - ? + + Add noise - - Online help + + Generate wobbly lines, settings in [Setup - Graphics import - Path import - Path modifications] + - - button8 + + cBImportGraphicNoise - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + groupBox1 - + 0 @@ -700,7 +617,7 @@ NoControl - 9, 51 + 9, 69 146, 17 @@ -793,7 +710,7 @@ 4 - 42, 68 + 42, 86 172, 21 @@ -820,7 +737,7 @@ NoControl - 6, 71 + 6, 89 31, 13 @@ -937,10 +854,10 @@ NoControl - 6, 91 + 6, 109 - 251, 45 + 416, 17 0 @@ -984,6 +901,66 @@ 1 + + NoControl + + + 646, 0 + + + 23, 23 + + + 46 + + + 💾 + + + Save settings of this window as INI file + + + BtnSaveIni + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + NoControl + + + 674, 0 + + + 23, 23 + + + 45 + + + ? + + + Online help + + + BtnHelp + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + NoControl @@ -1089,33 +1066,6 @@ 4 - - 120, 72 - - - 59, 20 - - - 18 - - - Right - - - Set desired text width and adapt font-size to reach it. - - - NUDWidth - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont2 - - - 3 - 120, 90 @@ -1203,19 +1153,46 @@ 0 - - True - - - NoControl - - - 489, 161 + + 120, 72 - - 78, 17 + + 59, 20 - + + 18 + + + Right + + + Set desired text width and adapt font-size to reach it. + + + NUDWidth + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GbFont2 + + + 3 + + + True + + + NoControl + + + 489, 161 + + + 78, 17 + + 18 @@ -1380,282 +1357,6 @@ 8 - - LblHeight - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont2 - - - 7 - - - LblWidth - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont2 - - - 8 - - - LblInfoSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont2 - - - 9 - - - LblSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont2 - - - 10 - - - LblInfoFont - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont2 - - - 11 - - - LblFont - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont2 - - - 12 - - - BtnSelectFont - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GbFont2 - - - 13 - - - 6, 158 - - - 230, 129 - - - 17 - - - GbFont2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 9 - - - 4, 22 - - - 3, 3, 3, 3 - - - 691, 315 - - - 0 - - - Text creation - - - tabPage1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 0 - - - button7 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 0 - - - panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 1 - - - button6 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 2 - - - button5 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 3 - - - button4 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 4 - - - button3 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 5 - - - button2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 6 - - - button1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 7 - - - 4, 22 - - - 3, 3, 3, 3 - - - 691, 315 - - - 1 - - - Hershey Font information - - - tabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 1 - - - 1, 1 - - - 699, 341 - - - 13 - - - tabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - True @@ -1863,6 +1564,54 @@ 13 + + 6, 158 + + + 230, 129 + + + 17 + + + GbFont2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage1 + + + 9 + + + 4, 22 + + + 3, 3, 3, 3 + + + 691, 315 + + + 0 + + + Text creation + + + tabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 0 + NoControl @@ -1890,6 +1639,21 @@ 0 + + NoControl + + + 3, 3 + + + 376, 268 + + + Zoom + + + 5 + pictureBox1 @@ -1923,33 +1687,6 @@ 1 - - NoControl - - - 3, 3 - - - 376, 268 - - - Zoom - - - 5 - - - pictureBox1 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 0 - NoControl @@ -2112,12 +1849,54 @@ 7 - - 114, 17 - - - True - + + 4, 22 + + + 3, 3, 3, 3 + + + 691, 315 + + + 1 + + + Hershey Font information + + + tabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabControl1 + + + 1 + + + 1, 1 + + + 699, 341 + + + 13 + + + tabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + 6, 13 @@ -2151,4 +1930,13 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 114, 17 + + + True + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.ru.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.ru.resx index 05578add2..b01c741bd 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.ru.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.ru.resx @@ -279,4 +279,16 @@ Рассчитать и установить размер шрифта для достижения заданной высоты текста + + Сохраняет настройки этого окна в виде INI-файла. + + + Онлайн помощь + + + Добавлять шум + + + Генерирует шаткие линии, настройки в [Настройка - Импорт графики - Импорт пути - Изменение пути] + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.tr.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.tr.resx index 39d3b2a1c..386d8a609 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.tr.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.tr.resx @@ -279,4 +279,16 @@ Metinden G Kodu Oluşturun + + Bu pencerenin ayarlarını INI dosyası olarak kaydeder + + + Çevrimiçi yardım + + + Gürültü ekle + + + [Ayar - Grafikleri içe aktarma - Yolu içe aktarma - Yol değişiklikleri] bölümünde titrek çizgiler ve ayarlar oluşturur + \ No newline at end of file diff --git a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.zh-CN.resx b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.zh-CN.resx index 11f2c76fd..95c1cc446 100644 --- a/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.zh-CN.resx +++ b/GRBL-Plotter/GCodeCreation/CreateFromForm/GCodeFromText.zh-CN.resx @@ -279,4 +279,16 @@ 计算并设置字体大小以达到给定的文本高度 + + 将此窗口的设置保存为 INI 文件 + + + 网上帮助 + + + 添加噪音 + + + 生成摆动线，在【设置-图形导入-路径导入-路径修改】中设置 + \ No newline at end of file