diff --git a/McBitFont/Export.Designer.cs b/McBitFont/Export.Designer.cs index 772f7d4..8c138c2 100644 --- a/McBitFont/Export.Designer.cs +++ b/McBitFont/Export.Designer.cs @@ -29,6 +29,7 @@ this.cbHDir = new System.Windows.Forms.ComboBox(); this.cbOrder = new System.Windows.Forms.ComboBox(); this.gbOptions = new System.Windows.Forms.GroupBox(); + this.cbZeroes = new System.Windows.Forms.CheckBox(); this.cbHeader = new System.Windows.Forms.CheckBox(); this.cbComments = new System.Windows.Forms.CheckBox(); this.gbNumbers = new System.Windows.Forms.GroupBox(); @@ -42,7 +43,6 @@ this.cbFormat = new System.Windows.Forms.ComboBox(); this.btnGenerate = new System.Windows.Forms.Button(); this.btnClose = new System.Windows.Forms.Button(); - this.cbZeroes = new System.Windows.Forms.CheckBox(); this.gbScan.SuspendLayout(); this.gbOptions.SuspendLayout(); this.gbNumbers.SuspendLayout(); @@ -58,15 +58,13 @@ | System.Windows.Forms.AnchorStyles.Right))); this.txtOutput.AutoWordSelection = true; this.txtOutput.DetectUrls = false; - this.txtOutput.Font = new System.Drawing.Font("Lucida Console", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.txtOutput.Font = new System.Drawing.Font("Courier New", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); this.txtOutput.HideSelection = false; this.txtOutput.Location = new System.Drawing.Point(151, 12); this.txtOutput.Name = "txtOutput"; - this.txtOutput.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical; this.txtOutput.Size = new System.Drawing.Size(529, 507); this.txtOutput.TabIndex = 0; - this.txtOutput.Text = "// Comment.\nusing System;\n\npublic class Stuff : Form { \n public static void Main(" + - "String args) {\n }\n}\n\n\nTest\n123123\nCode code code\n\nAAAsdasdasd\n!"; + this.txtOutput.Text = ""; // // gbScan // @@ -129,6 +127,18 @@ this.gbOptions.TabStop = false; this.gbOptions.Text = "Options"; // + // cbZeroes + // + this.cbZeroes.AutoSize = true; + this.cbZeroes.Checked = true; + this.cbZeroes.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbZeroes.Location = new System.Drawing.Point(6, 65); + this.cbZeroes.Name = "cbZeroes"; + this.cbZeroes.Size = new System.Drawing.Size(98, 17); + this.cbZeroes.TabIndex = 2; + this.cbZeroes.Text = "Leading zeroes"; + this.cbZeroes.UseVisualStyleBackColor = true; + // // cbHeader // this.cbHeader.AutoSize = true; @@ -140,6 +150,7 @@ this.cbHeader.TabIndex = 1; this.cbHeader.Text = "Meta header"; this.cbHeader.UseVisualStyleBackColor = true; + this.cbHeader.CheckedChanged += new System.EventHandler(this.cbFormat_SelectedIndexChanged); // // cbComments // @@ -274,6 +285,7 @@ this.cbFormat.Name = "cbFormat"; this.cbFormat.Size = new System.Drawing.Size(121, 21); this.cbFormat.TabIndex = 6; + this.cbFormat.SelectedIndexChanged += new System.EventHandler(this.cbFormat_SelectedIndexChanged); // // btnGenerate // @@ -295,18 +307,6 @@ this.btnClose.Text = "Close"; this.btnClose.UseVisualStyleBackColor = true; // - // cbZeroes - // - this.cbZeroes.AutoSize = true; - this.cbZeroes.Checked = true; - this.cbZeroes.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbZeroes.Location = new System.Drawing.Point(6, 65); - this.cbZeroes.Name = "cbZeroes"; - this.cbZeroes.Size = new System.Drawing.Size(98, 17); - this.cbZeroes.TabIndex = 2; - this.cbZeroes.Text = "Leading zeroes"; - this.cbZeroes.UseVisualStyleBackColor = true; - // // Export // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/McBitFont/Export.cs b/McBitFont/Export.cs index b993b25..94f9fcb 100644 --- a/McBitFont/Export.cs +++ b/McBitFont/Export.cs @@ -14,6 +14,9 @@ namespace McBitFont { private MainForm mainForm; + //private List comments = new List(); + private Dictionary comments = new Dictionary(); + public Export(object sender) { InitializeComponent(); @@ -28,6 +31,31 @@ namespace McBitFont { cb.SelectedIndex = 0; } } + comments.Add("header", + "// File generated by McBitFont " + MainForm.version + "\n" + + "// made by Anton Mukhin (mcfly@mcflyer.ru)\n" + + "//\n" + + "//\n" + ); + comments.Add("scan_order", "// Scan order: "); + comments.Add("scan_hdir", "// Horizontal direction: "); + comments.Add("scan_vdir", "// Vertical direction: "); + + comments.Add("num_bit_order", "// Bit order: "); + comments.Add("num_base", "// Numbers base: "); + comments.Add("num_size", "// Numbers size: "); + + comments.Add("text_format", "// Text format: "); + comments.Add("text_lines", "// Numbers per line: "); + + comments.Add("font_header_map", + "// Font header map:\n" + + "// width; // Font width in pixels\n" + + "// height; // Font height in pixels\n" + + "// space; // Font space in pixels\n" + + "// first; // First character code\n" + + "// last; // Last character code\n" + ); } private void cbOrder_SelectedIndexChanged(object sender, EventArgs e) { @@ -49,29 +77,38 @@ namespace McBitFont { Regex r = new Regex("([ \\t{}():;])"); string[] tokens = r.Split(line); + string[] keywords = { "const", "array", "char", "byte" }; + string[] datatypes = { "uint8_t", "uint16_t", "uint32_t" }; foreach (string token in tokens) { // Set the tokens default color and font. txtOutput.SelectionColor = Color.Black; - txtOutput.SelectionFont = new Font("Lucida Console", (float)9.75, FontStyle.Regular); + txtOutput.SelectionFont = new Font("Courier New", (float)9.75, FontStyle.Regular); // Check for a comment. if (token == "//" || token.StartsWith("//")) { // Find the start of the comment and then extract the whole comment. int index = line.IndexOf("//"); string comment = line.Substring(index, line.Length - index); - txtOutput.SelectionColor = Color.Green; - txtOutput.SelectionFont = new Font("Lucida Console", (float)9.75, FontStyle.Italic); + txtOutput.SelectionColor = Color.FromArgb(0xFF, 0x3F, 0x7F, 0x5F); + txtOutput.SelectionFont = new Font("Courier New", (float)9.75, FontStyle.Regular); txtOutput.SelectedText = comment; break; } // Check whether the token is a keyword. - string[] keywords = { "public", "void", "using", "static", "class", "array", "char", "uint8_t", "uint16_t", "uint32_t", "byte" }; for (int i = 0; i < keywords.Length; i++) { if (keywords[i] == token) { // Apply alternative color and font to highlight keyword. - txtOutput.SelectionColor = Color.Blue; - txtOutput.SelectionFont = new Font("Lucida Console", (float)9.75, FontStyle.Bold); + txtOutput.SelectionColor = Color.FromArgb(0xFF, 0x7F, 0x00, 0x55); + txtOutput.SelectionFont = new Font("Courier New", (float)9.75, FontStyle.Bold); + break; + } + } + for (int i = 0; i < datatypes.Length; i++) { + if (datatypes[i] == token) { + // Apply alternative color and font to highlight data type. + txtOutput.SelectionColor = Color.FromArgb(0xFF, 0x00, 0x50, 0x32); ; + txtOutput.SelectionFont = new Font("Courier New", (float)9.75, FontStyle.Regular); break; } } @@ -87,8 +124,32 @@ namespace McBitFont { } private void btnGenerate_Click(object sender, EventArgs e) { + //string output = ""; txtOutput.Clear(); - + bool com = cbComments.Checked; + bool hdr = cbHeader.Checked; + int lines = cbLines.SelectedIndex; + + if (com) { + //Header comments + txtOutput.AppendText(comments["header"]); + txtOutput.AppendText(comments["scan_order"] + cbOrder.Text + "\n"); + txtOutput.AppendText(comments["scan_hdir"] + cbHDir.Text + "\n"); + txtOutput.AppendText(comments["scan_vdir"] + cbVDir.Text + "\n\n"); + + txtOutput.AppendText(comments["num_bit_order"] + cbBitOrder.Text + "\n"); + txtOutput.AppendText(comments["num_base"] + cbNumBase.Text + "\n"); + txtOutput.AppendText(comments["num_size"] + cbNumSize.Text + "\n\n"); + + txtOutput.AppendText(comments["text_format"] + cbFormat.Text + "\n"); + txtOutput.AppendText(comments["text_lines"] + cbLines.Text + "\n\n"); + + if (hdr) { + // comment about meta header map + txtOutput.AppendText(comments["font_header_map"] + "\n\n"); + } + } + int imin, jmin, imax, jmax, idir, jdir; if (cbOrder.SelectedIndex == 0) { if (cbHDir.SelectedIndex == 0) { @@ -140,15 +201,19 @@ namespace McBitFont { ushort bits = 8; + string dataType = "uint8_t"; switch (cbNumSize.SelectedIndex) { case 0: bits = 8; + dataType = "uint8_t"; break; case 1: bits = 16; + dataType = "uint16_t"; break; case 2: bits = 32; + dataType = "uint32_t"; break; } @@ -174,13 +239,23 @@ namespace McBitFont { break; } + //Array definition + txtOutput.AppendText("const " + dataType + " " + mainForm.prjName + "[] = {\n"); + + if (com) txtOutput.AppendText(" // Data:\n"); foreach ( MainForm.FrameMiniature f in mainForm.frames) { // For each frame string str; uint b = 0; - int t, x, y; + int t, x, y; // t - calculated bit number; x - actual x; y - actual y + + if (com && lines != 1) { + // Comments enabled and other than "1 symbol per line" selected + // Print a symbol comment before its data + txtOutput.AppendText(" // " + f.code.ToString() + " --> \n"); + } for (int i = imin; i != imax; i += idir) { - str = ""; + str = " "; for (int j = jmin; j != jmax; j += jdir) { if (jdir < 0) t = jmin - j; else t = j; @@ -203,7 +278,7 @@ namespace McBitFont { } if (((t + 1) % bits == 0) || j + jdir == jmax) { - if (str.Length > 0) str += " "; + if (str.Length > 2) str += " "; pref = (!cbZeroes.Checked && ((b < 10 && nbase == 16) || (b < 2 && nbase == 2))) ? "" : prefix; str += pref + Convert.ToString(b, nbase).PadLeft(pad, '0') + ','; } @@ -213,9 +288,20 @@ namespace McBitFont { } txtOutput.AppendText(Environment.NewLine); } + // Close array definition + txtOutput.AppendText("};\n"); txtOutput.SelectAll(); ParseText(); + txtOutput.SelectionStart = 0; + txtOutput.ScrollToCaret(); + } + + private void cbFormat_SelectedIndexChanged(object sender, EventArgs e) { + if (cbFormat.SelectedIndex == 1 && cbHeader.Checked) { + MessageBox.Show("Cannot pack the font meta header into 2D array!\nChoose 1D array or disable the meta header.\n(Setting array format to 1D array)", "No header in 2D array!", MessageBoxButtons.OK, MessageBoxIcon.Information); + cbFormat.SelectedIndex = 0; + } } } } diff --git a/McBitFont/Form1.Designer.cs b/McBitFont/Form1.Designer.cs index 225c1c1..e0eef10 100644 --- a/McBitFont/Form1.Designer.cs +++ b/McBitFont/Form1.Designer.cs @@ -68,6 +68,8 @@ this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dlgSave = new System.Windows.Forms.SaveFileDialog(); this.dlgOpen = new System.Windows.Forms.OpenFileDialog(); + this.applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.nudX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudY)).BeginInit(); this.panel1.SuspendLayout(); @@ -403,6 +405,7 @@ // // newToolStripMenuItem // + this.newToolStripMenuItem.Image = global::McBitFont.Properties.Resources.file; this.newToolStripMenuItem.Name = "newToolStripMenuItem"; this.newToolStripMenuItem.Size = new System.Drawing.Size(112, 22); this.newToolStripMenuItem.Text = "New"; @@ -410,6 +413,7 @@ // // openToolStripMenuItem // + this.openToolStripMenuItem.Image = global::McBitFont.Properties.Resources.folder_open; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.Size = new System.Drawing.Size(112, 22); this.openToolStripMenuItem.Text = "Open"; @@ -417,6 +421,7 @@ // // saveToolStripMenuItem // + this.saveToolStripMenuItem.Image = global::McBitFont.Properties.Resources.save; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.Size = new System.Drawing.Size(112, 22); this.saveToolStripMenuItem.Text = "Save as"; @@ -433,7 +438,8 @@ // this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.addSymbolToolStripMenuItem, - this.removeSymbolToolStripMenuItem}); + this.removeSymbolToolStripMenuItem, + this.applyToolStripMenuItem}); this.editToolStripMenuItem.Name = "editToolStripMenuItem"; this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); this.editToolStripMenuItem.Text = "Edit"; @@ -441,15 +447,17 @@ // addSymbolToolStripMenuItem // this.addSymbolToolStripMenuItem.Enabled = false; + this.addSymbolToolStripMenuItem.Image = global::McBitFont.Properties.Resources.action_add; this.addSymbolToolStripMenuItem.Name = "addSymbolToolStripMenuItem"; - this.addSymbolToolStripMenuItem.Size = new System.Drawing.Size(159, 22); + this.addSymbolToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.addSymbolToolStripMenuItem.Text = "Add symbol"; // // removeSymbolToolStripMenuItem // this.removeSymbolToolStripMenuItem.Enabled = false; + this.removeSymbolToolStripMenuItem.Image = global::McBitFont.Properties.Resources.action_remove; this.removeSymbolToolStripMenuItem.Name = "removeSymbolToolStripMenuItem"; - this.removeSymbolToolStripMenuItem.Size = new System.Drawing.Size(159, 22); + this.removeSymbolToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.removeSymbolToolStripMenuItem.Text = "Remove symbol"; // // toolsToolStripMenuItem @@ -461,57 +469,62 @@ this.shiftRightToolStripMenuItem, this.invertToolStripMenuItem, this.mirrorXToolStripMenuItem, - this.mirrorYToolStripMenuItem}); + this.mirrorYToolStripMenuItem, + this.exportToolStripMenuItem}); this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; this.toolsToolStripMenuItem.Size = new System.Drawing.Size(46, 20); this.toolsToolStripMenuItem.Text = "Tools"; // // shiftUpToolStripMenuItem // + this.shiftUpToolStripMenuItem.Image = global::McBitFont.Properties.Resources.arrow_top; this.shiftUpToolStripMenuItem.Name = "shiftUpToolStripMenuItem"; - this.shiftUpToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.shiftUpToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.shiftUpToolStripMenuItem.Text = "Shift Up"; this.shiftUpToolStripMenuItem.Click += new System.EventHandler(this.btnShiftUp_Click); // // shiftDownToolStripMenuItem // + this.shiftDownToolStripMenuItem.Image = global::McBitFont.Properties.Resources.arrow_down; this.shiftDownToolStripMenuItem.Name = "shiftDownToolStripMenuItem"; - this.shiftDownToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.shiftDownToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.shiftDownToolStripMenuItem.Text = "Shift Down"; this.shiftDownToolStripMenuItem.Click += new System.EventHandler(this.btnShiftDown_Click); // // shiftLeftToolStripMenuItem // + this.shiftLeftToolStripMenuItem.Image = global::McBitFont.Properties.Resources.arrow_back; this.shiftLeftToolStripMenuItem.Name = "shiftLeftToolStripMenuItem"; - this.shiftLeftToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.shiftLeftToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.shiftLeftToolStripMenuItem.Text = "Shift left"; this.shiftLeftToolStripMenuItem.Click += new System.EventHandler(this.btnShiftLeft_Click); // // shiftRightToolStripMenuItem // + this.shiftRightToolStripMenuItem.Image = global::McBitFont.Properties.Resources.arrow_next; this.shiftRightToolStripMenuItem.Name = "shiftRightToolStripMenuItem"; - this.shiftRightToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.shiftRightToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.shiftRightToolStripMenuItem.Text = "Shift Right"; this.shiftRightToolStripMenuItem.Click += new System.EventHandler(this.btnShiftRight_Click); // // invertToolStripMenuItem // this.invertToolStripMenuItem.Name = "invertToolStripMenuItem"; - this.invertToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.invertToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.invertToolStripMenuItem.Text = "Invert"; this.invertToolStripMenuItem.Click += new System.EventHandler(this.btnInvert_Click); // // mirrorXToolStripMenuItem // this.mirrorXToolStripMenuItem.Name = "mirrorXToolStripMenuItem"; - this.mirrorXToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.mirrorXToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.mirrorXToolStripMenuItem.Text = "Mirror X"; this.mirrorXToolStripMenuItem.Click += new System.EventHandler(this.btnMirrorX_Click); // // mirrorYToolStripMenuItem // this.mirrorYToolStripMenuItem.Name = "mirrorYToolStripMenuItem"; - this.mirrorYToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.mirrorYToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.mirrorYToolStripMenuItem.Text = "Mirror Y"; this.mirrorYToolStripMenuItem.Click += new System.EventHandler(this.btnMirrorY_Click); // @@ -532,6 +545,20 @@ this.dlgOpen.DefaultExt = "mbf"; this.dlgOpen.Filter = "McBitFont files|*.mbf|All files|*.*"; // + // applyToolStripMenuItem + // + this.applyToolStripMenuItem.Name = "applyToolStripMenuItem"; + this.applyToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.applyToolStripMenuItem.Text = "Apply"; + this.applyToolStripMenuItem.Click += new System.EventHandler(this.button2_Click); + // + // exportToolStripMenuItem + // + this.exportToolStripMenuItem.Name = "exportToolStripMenuItem"; + this.exportToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.exportToolStripMenuItem.Text = "Export"; + this.exportToolStripMenuItem.Click += new System.EventHandler(this.button1_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -616,6 +643,8 @@ private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem; private System.Windows.Forms.SaveFileDialog dlgSave; private System.Windows.Forms.OpenFileDialog dlgOpen; + private System.Windows.Forms.ToolStripMenuItem applyToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem exportToolStripMenuItem; } } diff --git a/McBitFont/Form1.cs b/McBitFont/Form1.cs index 9a5ffae..28307a2 100644 --- a/McBitFont/Form1.cs +++ b/McBitFont/Form1.cs @@ -48,6 +48,8 @@ namespace McBitFont { bool monospaced = false; bool modified = false; bool prjModified = false; + public const string version = "1.0"; + public string prjName = "Untitled"; public MainForm() { InitializeComponent(); @@ -75,6 +77,8 @@ namespace McBitFont { f = copyFrame(frames.Find(x => x.code == 0)); ListViewItem_SetSpacing(miniList, 50 + 2, 50 + 22); + + this.Text = "McBitFont " + version + " - " + prjName; } [DllImport("user32.dll")] @@ -488,6 +492,9 @@ namespace McBitFont { dotPanel.Refresh(); miniList.Refresh(); form.Dispose(); + + prjName = "Untitled"; + this.Text = "McBitFont " + version + " - " + prjName; } } @@ -522,6 +529,8 @@ namespace McBitFont { ms.Close(); } prjModified = false; + prjName = Path.GetFileNameWithoutExtension(dlgSave.FileName); + this.Text = "McBitFont " + version + " - " + prjName; } } @@ -542,6 +551,7 @@ namespace McBitFont { fs.Close(); } monospaced = sav.monospaced; + lblType.Text = monospaced ? "Monospaced" : "Variable width / Single"; frames = sav.frames; miniList.Items.Clear(); ilMiniatures.Images.Clear(); @@ -562,6 +572,9 @@ namespace McBitFont { miniList.Refresh(); modified = false; prjModified = false; + + prjName = Path.GetFileNameWithoutExtension(dlgOpen.FileName); + this.Text = "McBitFont " + version + " - " + prjName; } } diff --git a/McBitFont/McBitFont.csproj b/McBitFont/McBitFont.csproj index 5b56f4a..b8b4ffb 100644 --- a/McBitFont/McBitFont.csproj +++ b/McBitFont/McBitFont.csproj @@ -83,6 +83,7 @@ True Resources.resx + True SettingsSingleFileGenerator @@ -97,5 +98,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/McBitFont/New.Designer.cs b/McBitFont/New.Designer.cs index 27d0c49..60537f8 100644 --- a/McBitFont/New.Designer.cs +++ b/McBitFont/New.Designer.cs @@ -114,10 +114,10 @@ this.rbMono.Checked = true; this.rbMono.Location = new System.Drawing.Point(30, 71); this.rbMono.Name = "rbMono"; - this.rbMono.Size = new System.Drawing.Size(81, 17); + this.rbMono.Size = new System.Drawing.Size(87, 17); this.rbMono.TabIndex = 4; this.rbMono.TabStop = true; - this.rbMono.Text = "Monospace"; + this.rbMono.Text = "Monospaced"; this.rbMono.UseVisualStyleBackColor = true; // // rbVar diff --git a/McBitFont/Properties/Resources.Designer.cs b/McBitFont/Properties/Resources.Designer.cs index 1abb47c..e1c0540 100644 --- a/McBitFont/Properties/Resources.Designer.cs +++ b/McBitFont/Properties/Resources.Designer.cs @@ -1,53 +1,54 @@ //------------------------------------------------------------------------------ // -// Этот код создан программным средством. -// Версия среды выполнения: 4.0.30319.42000 +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 // -// Изменения в этом файле могут привести к неправильному поведению и будут утрачены, если -// код создан повторно. +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. // //------------------------------------------------------------------------------ namespace McBitFont.Properties { - - + using System; + + /// - /// Класс ресурсов со строгим типом для поиска локализованных строк и пр. + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. /// - // Этот класс был автоматически создан при помощи StronglyTypedResourceBuilder - // класс с помощью таких средств, как ResGen или Visual Studio. - // Для добавления или удаления члена измените файл .ResX, а затем перезапустите ResGen - // с параметром /str или заново постройте свой VS-проект. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// - /// Возврат кэшированного экземпляра ResourceManager, используемого этим классом. + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { get { - if ((resourceMan == null)) { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("McBitFont.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// - /// Переопределяет свойство CurrentUICulture текущего потока для всех - /// подстановки ресурсов с помощью этого класса ресурсов со строгим типом. + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -58,5 +59,95 @@ namespace McBitFont.Properties { resourceCulture = value; } } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap action_add { + get { + object obj = ResourceManager.GetObject("action_add", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap action_remove { + get { + object obj = ResourceManager.GetObject("action_remove", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow_back { + get { + object obj = ResourceManager.GetObject("arrow_back", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow_down { + get { + object obj = ResourceManager.GetObject("arrow_down", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow_next { + get { + object obj = ResourceManager.GetObject("arrow_next", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow_top { + get { + object obj = ResourceManager.GetObject("arrow_top", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap file { + get { + object obj = ResourceManager.GetObject("file", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap folder_open { + get { + object obj = ResourceManager.GetObject("folder_open", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap save { + get { + object obj = ResourceManager.GetObject("save", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/McBitFont/Properties/Resources.resx b/McBitFont/Properties/Resources.resx index af7dbeb..73dfd4b 100644 --- a/McBitFont/Properties/Resources.resx +++ b/McBitFont/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,37 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\action_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\action_remove.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow_back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow_next.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow_top.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\folder_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/McBitFont/Resources/action_add.png b/McBitFont/Resources/action_add.png new file mode 100644 index 0000000..f098f02 Binary files /dev/null and b/McBitFont/Resources/action_add.png differ diff --git a/McBitFont/Resources/action_remove.png b/McBitFont/Resources/action_remove.png new file mode 100644 index 0000000..9fa647a Binary files /dev/null and b/McBitFont/Resources/action_remove.png differ diff --git a/McBitFont/Resources/arrow_back.png b/McBitFont/Resources/arrow_back.png new file mode 100644 index 0000000..4b2b1ff Binary files /dev/null and b/McBitFont/Resources/arrow_back.png differ diff --git a/McBitFont/Resources/arrow_down.png b/McBitFont/Resources/arrow_down.png new file mode 100644 index 0000000..2ca0231 Binary files /dev/null and b/McBitFont/Resources/arrow_down.png differ diff --git a/McBitFont/Resources/arrow_next.png b/McBitFont/Resources/arrow_next.png new file mode 100644 index 0000000..f939ff7 Binary files /dev/null and b/McBitFont/Resources/arrow_next.png differ diff --git a/McBitFont/Resources/arrow_top.png b/McBitFont/Resources/arrow_top.png new file mode 100644 index 0000000..8073c30 Binary files /dev/null and b/McBitFont/Resources/arrow_top.png differ diff --git a/McBitFont/Resources/file.png b/McBitFont/Resources/file.png new file mode 100644 index 0000000..4f138b6 Binary files /dev/null and b/McBitFont/Resources/file.png differ diff --git a/McBitFont/Resources/folder_open.png b/McBitFont/Resources/folder_open.png new file mode 100644 index 0000000..c874458 Binary files /dev/null and b/McBitFont/Resources/folder_open.png differ diff --git a/McBitFont/Resources/save.png b/McBitFont/Resources/save.png new file mode 100644 index 0000000..8eaba51 Binary files /dev/null and b/McBitFont/Resources/save.png differ diff --git a/icons/action_add.png b/icons/action_add.png new file mode 100644 index 0000000..f098f02 Binary files /dev/null and b/icons/action_add.png differ diff --git a/icons/action_check.png b/icons/action_check.png new file mode 100644 index 0000000..42aea42 Binary files /dev/null and b/icons/action_check.png differ diff --git a/icons/action_delete.png b/icons/action_delete.png new file mode 100644 index 0000000..d51dc29 Binary files /dev/null and b/icons/action_delete.png differ diff --git a/icons/action_remove.png b/icons/action_remove.png new file mode 100644 index 0000000..9fa647a Binary files /dev/null and b/icons/action_remove.png differ diff --git a/icons/application.png b/icons/application.png new file mode 100644 index 0000000..285b143 Binary files /dev/null and b/icons/application.png differ diff --git a/icons/arrow_back.png b/icons/arrow_back.png new file mode 100644 index 0000000..4b2b1ff Binary files /dev/null and b/icons/arrow_back.png differ diff --git a/icons/arrow_down.png b/icons/arrow_down.png new file mode 100644 index 0000000..2ca0231 Binary files /dev/null and b/icons/arrow_down.png differ diff --git a/icons/arrow_next.png b/icons/arrow_next.png new file mode 100644 index 0000000..f939ff7 Binary files /dev/null and b/icons/arrow_next.png differ diff --git a/icons/arrow_top.png b/icons/arrow_top.png new file mode 100644 index 0000000..8073c30 Binary files /dev/null and b/icons/arrow_top.png differ diff --git a/icons/comments.png b/icons/comments.png new file mode 100644 index 0000000..5ed07c0 Binary files /dev/null and b/icons/comments.png differ diff --git a/icons/download.png b/icons/download.png new file mode 100644 index 0000000..67e0ac4 Binary files /dev/null and b/icons/download.png differ diff --git a/icons/file.png b/icons/file.png new file mode 100644 index 0000000..4f138b6 Binary files /dev/null and b/icons/file.png differ diff --git a/icons/folder.png b/icons/folder.png new file mode 100644 index 0000000..eb4fa1c Binary files /dev/null and b/icons/folder.png differ diff --git a/icons/folder_files.png b/icons/folder_files.png new file mode 100644 index 0000000..ec60d37 Binary files /dev/null and b/icons/folder_files.png differ diff --git a/icons/folder_open.png b/icons/folder_open.png new file mode 100644 index 0000000..c874458 Binary files /dev/null and b/icons/folder_open.png differ diff --git a/icons/letter.png b/icons/letter.png new file mode 100644 index 0000000..a8a0ea2 Binary files /dev/null and b/icons/letter.png differ diff --git a/icons/letter_open.png b/icons/letter_open.png new file mode 100644 index 0000000..af60d68 Binary files /dev/null and b/icons/letter_open.png differ diff --git a/icons/login.png b/icons/login.png new file mode 100644 index 0000000..aca4567 Binary files /dev/null and b/icons/login.png differ diff --git a/icons/maximize.png b/icons/maximize.png new file mode 100644 index 0000000..e573171 Binary files /dev/null and b/icons/maximize.png differ diff --git a/icons/minimize.png b/icons/minimize.png new file mode 100644 index 0000000..1fd833b Binary files /dev/null and b/icons/minimize.png differ diff --git a/icons/reply.png b/icons/reply.png new file mode 100644 index 0000000..98009be Binary files /dev/null and b/icons/reply.png differ diff --git a/icons/rss.png b/icons/rss.png new file mode 100644 index 0000000..1baa6ff Binary files /dev/null and b/icons/rss.png differ diff --git a/icons/save.png b/icons/save.png new file mode 100644 index 0000000..8eaba51 Binary files /dev/null and b/icons/save.png differ diff --git a/icons/search.png b/icons/search.png new file mode 100644 index 0000000..b222e82 Binary files /dev/null and b/icons/search.png differ diff --git a/icons/time.png b/icons/time.png new file mode 100644 index 0000000..841428b Binary files /dev/null and b/icons/time.png differ diff --git a/icons/user.png b/icons/user.png new file mode 100644 index 0000000..5602677 Binary files /dev/null and b/icons/user.png differ