diff --git a/MetalMaxViewer/Form1.Designer.cs b/MetalMaxViewer/Form1.Designer.cs index 79109e7..445b2f7 100644 --- a/MetalMaxViewer/Form1.Designer.cs +++ b/MetalMaxViewer/Form1.Designer.cs @@ -45,8 +45,6 @@ private void InitializeComponent() this.abrirToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator(); this.guardarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.editarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.deshacerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.rehacerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -54,7 +52,6 @@ private void InitializeComponent() this.cortarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.copiarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pegarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.menuStrip1.SuspendLayout(); @@ -63,54 +60,51 @@ private void InitializeComponent() // pictureBox2 // this.pictureBox2.BackColor = System.Drawing.SystemColors.ActiveBorder; - this.pictureBox2.Location = new System.Drawing.Point(56, 554); - this.pictureBox2.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pictureBox2.Location = new System.Drawing.Point(28, 288); + this.pictureBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(576, 450); + this.pictureBox2.Size = new System.Drawing.Size(256, 192); this.pictureBox2.TabIndex = 1; this.pictureBox2.TabStop = false; // // pictureBox1 // - this.pictureBox1.BackColor = System.Drawing.Color.Transparent; - this.pictureBox1.BackgroundImage = global::MetalMaxViewer.Properties.Resources.bocadillo; - this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox1.BackColor = System.Drawing.SystemColors.ActiveBorder; + this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Arrow; - this.pictureBox1.Location = new System.Drawing.Point(56, 67); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(4); + this.pictureBox1.Location = new System.Drawing.Point(28, 35); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(576, 450); + this.pictureBox1.Size = new System.Drawing.Size(256, 192); this.pictureBox1.TabIndex = 2; this.pictureBox1.TabStop = false; // // listBox1 // this.listBox1.FormattingEnabled = true; - this.listBox1.ItemHeight = 25; - this.listBox1.Location = new System.Drawing.Point(1408, 67); - this.listBox1.Margin = new System.Windows.Forms.Padding(4); + this.listBox1.Location = new System.Drawing.Point(704, 35); + this.listBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.listBox1.Name = "listBox1"; - this.listBox1.Size = new System.Drawing.Size(330, 929); + this.listBox1.Size = new System.Drawing.Size(167, 485); this.listBox1.TabIndex = 3; this.listBox1.SelectedIndexChanged += new System.EventHandler(this.listBox1_SelectedIndexChanged); // // richTextBox1 // - this.richTextBox1.Location = new System.Drawing.Point(660, 167); - this.richTextBox1.Margin = new System.Windows.Forms.Padding(6); + this.richTextBox1.Location = new System.Drawing.Point(330, 87); this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(720, 267); + this.richTextBox1.Size = new System.Drawing.Size(362, 141); this.richTextBox1.TabIndex = 6; this.richTextBox1.Text = ""; this.richTextBox1.TextChanged += new System.EventHandler(this.richTextBox2_TextChanged); // // richTextBox2 // - this.richTextBox2.Location = new System.Drawing.Point(660, 554); - this.richTextBox2.Margin = new System.Windows.Forms.Padding(6); + this.richTextBox2.Location = new System.Drawing.Point(330, 288); this.richTextBox2.Name = "richTextBox2"; - this.richTextBox2.Size = new System.Drawing.Size(720, 267); + this.richTextBox2.Size = new System.Drawing.Size(362, 141); this.richTextBox2.TabIndex = 7; this.richTextBox2.Text = ""; this.richTextBox2.TextChanged += new System.EventHandler(this.richTextBox2_TextChanged); @@ -118,29 +112,29 @@ private void InitializeComponent() // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(920, 112); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(460, 58); + this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(70, 25); + this.label1.Size = new System.Drawing.Size(35, 13); this.label1.TabIndex = 8; this.label1.Text = "label1"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(1024, 112); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(512, 58); + this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(70, 25); + this.label2.Size = new System.Drawing.Size(35, 13); this.label2.TabIndex = 9; this.label2.Text = "label2"; // // button1 // - this.button1.Location = new System.Drawing.Point(826, 473); - this.button1.Margin = new System.Windows.Forms.Padding(4); + this.button1.Location = new System.Drawing.Point(413, 246); + this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(112, 37); + this.button1.Size = new System.Drawing.Size(56, 19); this.button1.TabIndex = 10; this.button1.Text = "<--"; this.button1.UseVisualStyleBackColor = true; @@ -148,10 +142,10 @@ private void InitializeComponent() // // button2 // - this.button2.Location = new System.Drawing.Point(1080, 473); - this.button2.Margin = new System.Windows.Forms.Padding(4); + this.button2.Location = new System.Drawing.Point(540, 246); + this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(112, 37); + this.button2.Size = new System.Drawing.Size(56, 19); this.button2.TabIndex = 11; this.button2.Text = "-->"; this.button2.UseVisualStyleBackColor = true; @@ -160,20 +154,20 @@ private void InitializeComponent() // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(920, 871); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(460, 453); + this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(70, 25); + this.label3.Size = new System.Drawing.Size(35, 13); this.label3.TabIndex = 12; this.label3.Text = "label3"; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(1024, 871); - this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label4.Location = new System.Drawing.Point(512, 453); + this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(70, 25); + this.label4.Size = new System.Drawing.Size(35, 13); this.label4.TabIndex = 13; this.label4.Text = "label4"; // @@ -185,8 +179,8 @@ private void InitializeComponent() this.editarToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Padding = new System.Windows.Forms.Padding(8, 4, 0, 4); - this.menuStrip1.Size = new System.Drawing.Size(1772, 44); + this.menuStrip1.Padding = new System.Windows.Forms.Padding(4, 2, 0, 2); + this.menuStrip1.Size = new System.Drawing.Size(885, 24); this.menuStrip1.TabIndex = 14; this.menuStrip1.Text = "menuStrip1"; // @@ -195,12 +189,10 @@ private void InitializeComponent() this.archivoToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.abrirToolStripMenuItem, this.toolStripSeparator, - this.guardarToolStripMenuItem, - this.toolStripSeparator1, - this.toolStripSeparator2}); + this.guardarToolStripMenuItem}); this.archivoToolStripMenuItem.Name = "archivoToolStripMenuItem"; - this.archivoToolStripMenuItem.Size = new System.Drawing.Size(115, 36); - this.archivoToolStripMenuItem.Text = "&Archivo"; + this.archivoToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.archivoToolStripMenuItem.Text = "&File"; // // abrirToolStripMenuItem // @@ -208,14 +200,14 @@ private void InitializeComponent() this.abrirToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.abrirToolStripMenuItem.Name = "abrirToolStripMenuItem"; this.abrirToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.abrirToolStripMenuItem.Size = new System.Drawing.Size(359, 44); - this.abrirToolStripMenuItem.Text = "&Abrir"; + this.abrirToolStripMenuItem.Size = new System.Drawing.Size(184, 26); + this.abrirToolStripMenuItem.Text = "&Open"; this.abrirToolStripMenuItem.Click += new System.EventHandler(this.abrirToolStripMenuItem_Click); // // toolStripSeparator // this.toolStripSeparator.Name = "toolStripSeparator"; - this.toolStripSeparator.Size = new System.Drawing.Size(356, 6); + this.toolStripSeparator.Size = new System.Drawing.Size(181, 6); // // guardarToolStripMenuItem // @@ -223,20 +215,10 @@ private void InitializeComponent() this.guardarToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.guardarToolStripMenuItem.Name = "guardarToolStripMenuItem"; this.guardarToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.guardarToolStripMenuItem.Size = new System.Drawing.Size(359, 44); - this.guardarToolStripMenuItem.Text = "&Guardar"; + this.guardarToolStripMenuItem.Size = new System.Drawing.Size(184, 26); + this.guardarToolStripMenuItem.Text = "&Save"; this.guardarToolStripMenuItem.Click += new System.EventHandler(this.GuardarToolStripMenuItem_Click); // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(356, 6); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(356, 6); - // // editarToolStripMenuItem // this.editarToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -245,32 +227,31 @@ private void InitializeComponent() this.toolStripSeparator3, this.cortarToolStripMenuItem, this.copiarToolStripMenuItem, - this.pegarToolStripMenuItem, - this.toolStripSeparator4}); + this.pegarToolStripMenuItem}); this.editarToolStripMenuItem.Name = "editarToolStripMenuItem"; - this.editarToolStripMenuItem.Size = new System.Drawing.Size(95, 36); - this.editarToolStripMenuItem.Text = "&Editar"; + this.editarToolStripMenuItem.Size = new System.Drawing.Size(39, 20); + this.editarToolStripMenuItem.Text = "&Edit"; // // deshacerToolStripMenuItem // this.deshacerToolStripMenuItem.Name = "deshacerToolStripMenuItem"; this.deshacerToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); - this.deshacerToolStripMenuItem.Size = new System.Drawing.Size(329, 44); - this.deshacerToolStripMenuItem.Text = "&Deshacer"; + this.deshacerToolStripMenuItem.Size = new System.Drawing.Size(184, 26); + this.deshacerToolStripMenuItem.Text = "&Undo"; this.deshacerToolStripMenuItem.Click += new System.EventHandler(this.deshacerToolStripMenuItem_Click); // // rehacerToolStripMenuItem // this.rehacerToolStripMenuItem.Name = "rehacerToolStripMenuItem"; this.rehacerToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); - this.rehacerToolStripMenuItem.Size = new System.Drawing.Size(329, 44); - this.rehacerToolStripMenuItem.Text = "&Rehacer"; + this.rehacerToolStripMenuItem.Size = new System.Drawing.Size(184, 26); + this.rehacerToolStripMenuItem.Text = "&Redo"; this.rehacerToolStripMenuItem.Click += new System.EventHandler(this.rehacerToolStripMenuItem_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(326, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(181, 6); // // cortarToolStripMenuItem // @@ -278,8 +259,8 @@ private void InitializeComponent() this.cortarToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.cortarToolStripMenuItem.Name = "cortarToolStripMenuItem"; this.cortarToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); - this.cortarToolStripMenuItem.Size = new System.Drawing.Size(329, 44); - this.cortarToolStripMenuItem.Text = "Cor&tar"; + this.cortarToolStripMenuItem.Size = new System.Drawing.Size(184, 26); + this.cortarToolStripMenuItem.Text = "Cu&t"; this.cortarToolStripMenuItem.Click += new System.EventHandler(this.cortarToolStripMenuItem_Click); // // copiarToolStripMenuItem @@ -288,8 +269,8 @@ private void InitializeComponent() this.copiarToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.copiarToolStripMenuItem.Name = "copiarToolStripMenuItem"; this.copiarToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.copiarToolStripMenuItem.Size = new System.Drawing.Size(329, 44); - this.copiarToolStripMenuItem.Text = "&Copiar"; + this.copiarToolStripMenuItem.Size = new System.Drawing.Size(184, 26); + this.copiarToolStripMenuItem.Text = "&Copy"; this.copiarToolStripMenuItem.Click += new System.EventHandler(this.copiarToolStripMenuItem_Click); // // pegarToolStripMenuItem @@ -298,20 +279,15 @@ private void InitializeComponent() this.pegarToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.pegarToolStripMenuItem.Name = "pegarToolStripMenuItem"; this.pegarToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); - this.pegarToolStripMenuItem.Size = new System.Drawing.Size(329, 44); - this.pegarToolStripMenuItem.Text = "&Pegar"; + this.pegarToolStripMenuItem.Size = new System.Drawing.Size(184, 26); + this.pegarToolStripMenuItem.Text = "&Paste"; this.pegarToolStripMenuItem.Click += new System.EventHandler(this.pegarToolStripMenuItem_Click); // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(326, 6); - // // Form1 // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1772, 1021); + this.ClientSize = new System.Drawing.Size(885, 537); this.Controls.Add(this.label4); this.Controls.Add(this.label3); this.Controls.Add(this.button2); @@ -324,8 +300,10 @@ private void InitializeComponent() this.Controls.Add(this.pictureBox1); this.Controls.Add(this.pictureBox2); this.Controls.Add(this.menuStrip1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MainMenuStrip = this.menuStrip1; - this.Margin = new System.Windows.Forms.Padding(4); + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.MaximizeBox = false; this.Name = "Form1"; this.Text = "Metal Max 3 Previewer"; this.Load += new System.EventHandler(this.Form1_Load); @@ -355,8 +333,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem abrirToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator; private System.Windows.Forms.ToolStripMenuItem guardarToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripMenuItem editarToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem deshacerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem rehacerToolStripMenuItem; @@ -364,7 +340,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem cortarToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem copiarToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem pegarToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; } } diff --git a/MetalMaxViewer/Form1.cs b/MetalMaxViewer/Form1.cs index dc0db10..902e213 100644 --- a/MetalMaxViewer/Form1.cs +++ b/MetalMaxViewer/Form1.cs @@ -49,7 +49,11 @@ private bool LoadFont() return false; } - variables.font = new NftrFont(fontPath); + NftrFont.CustomPalette = new Colour[2] { Colour.FromColor(Color.White), new Colour(254, 254, 254) }; + variables.FontWhite = new NftrFont(fontPath); + + NftrFont.CustomPalette = new Colour[2] { Colour.FromColor(Color.White), new Colour(0, 0, 0) }; + variables.FontBlack = new NftrFont(fontPath); return true; } @@ -73,6 +77,7 @@ public void ImportPO(string poFileName) inputPO.Dispose(); int contador = 0; listBox1.Items.Clear(); + variables.indice = 0; Array.Clear(variables.textoOriginal, 0, variables.textoOriginal.Length); Array.Clear(variables.textoTraducido, 0, variables.textoTraducido.Length); Array.Clear(variables.contexto, 0, variables.contexto.Length); @@ -101,26 +106,32 @@ public static class variables public static string textoAuxiliar = ""; public static int posAuxiliar = -1; public static int indice = -1; - public static NftrFont font; + + public static NftrFont FontWhite { get; set; } + + public static NftrFont FontBlack { get; set; } } - public void cambioImagen(string contenido) + + public void UpdateBackground(string poFile) { - if (contenido.Contains(".MSG.")) + if (poFile.Contains(".MSG.")) { - pictureBox1.BackgroundImage = Properties.Resources.bocadillo2; - pictureBox1.BackgroundImageLayout=ImageLayout.Stretch; - pictureBox2.BackgroundImage = Properties.Resources.bocadillo2; - pictureBox2.BackgroundImageLayout = ImageLayout.Stretch; + var image = Image.FromFile(Path.Combine("Resources", "bocadillo.jpg")); + pictureBox1.BackgroundImage = image; + pictureBox1.BackgroundImageLayout = ImageLayout.None; + pictureBox2.BackgroundImage = image; + pictureBox2.BackgroundImageLayout = ImageLayout.None; } - else if (contenido.Contains(".SET.")) + else if (poFile.Contains(".SET.")) { - pictureBox1.BackgroundImage = Properties.Resources.objetos; - pictureBox1.BackgroundImageLayout = ImageLayout.Stretch; - pictureBox2.BackgroundImage = Properties.Resources.objetos; - pictureBox2.BackgroundImageLayout = ImageLayout.Stretch; + var image = Image.FromFile(Path.Combine("Resources", "objetos.jpg")); + pictureBox1.BackgroundImage = image; + pictureBox1.BackgroundImageLayout = ImageLayout.None; + pictureBox2.BackgroundImage = image; + pictureBox2.BackgroundImageLayout = ImageLayout.None; } } - + public void colocarText(string texto1, string texto2, int x, int y) { int posJap = int.Parse(label1.Text); @@ -130,11 +141,15 @@ public void colocarText(string texto1, string texto2, int x, int y) splitText(texto1, texto2); var image = new Bitmap(this.pictureBox1.Width, this.pictureBox1.Height); var graphics = Graphics.FromImage(image); - variables.font.Painter.DrawString(variables.splittedOr[posJap], graphics, x, y); + variables.FontBlack.Painter.DrawString(variables.splittedOr[posJap], graphics, x + 1, y + 1, null, 4, 1); + variables.FontWhite.Painter.DrawString(variables.splittedOr[posJap], graphics, x, y, null, 4, 1); + this.pictureBox1.Image = image; var image2 = new Bitmap(this.pictureBox2.Width, this.pictureBox2.Height); var graphics2 = Graphics.FromImage(image2); - variables.font.Painter.DrawString(variables.splittedMod[posEn], graphics2, x, y); + variables.FontBlack.Painter.DrawString(variables.splittedMod[posEn], graphics2, x + 1, y + 1, null, 4, 1); + variables.FontWhite.Painter.DrawString(variables.splittedMod[posEn], graphics2, x, y, null, 4, 1); + this.pictureBox2.Image = image2; } @@ -165,11 +180,11 @@ public void cambioPosicion(int pos, int posText) { if (pos == 0) { - colocarText(variables.textoOriginal[posText], richTextBox2.Text, 10, 175); + colocarText(variables.textoOriginal[posText], richTextBox2.Text, 12, 144); } else if (pos == 1) { - int textSize = variables.font.Painter.GetStringLength(richTextBox2.Text); + int textSize = variables.FontWhite.Painter.GetStringLength(richTextBox2.Text, 1); colocarText(variables.textoOriginal[posText], richTextBox2.Text, pictureBox1.Width - textSize - 15, 110); } else if (pos == 2) @@ -227,9 +242,8 @@ void OpenPoFile() string filePath = openFileDialog.FileName; ImportPO(filePath); - cambioImagen(filePath); + UpdateBackground(filePath); } - } private void abrirToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/MetalMaxViewer/Form1.resx b/MetalMaxViewer/Form1.resx index c0fd8b2..a765fbe 100644 --- a/MetalMaxViewer/Form1.resx +++ b/MetalMaxViewer/Form1.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4 4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl @@ -140,7 +140,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3 8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ 1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH @@ -156,7 +156,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi LaVsERnRF5iCaSZJO1toCDVGFkgoFpWQWWRR2aIvUxm1BKN1wSnHCFw4TOCzue+9nPNw4eVVnav4Izzb QfxeGZ5TWaxT/rK3irzmC7CsusvC1G4IkbNLboIiDieF4GGUKeTeClDpppF8eeEu2PIfwfrzizSdw3Hk EnKlFpkMzV2wH77AosOFTV8A+vkl9CiHuJeLJNNZjM8tYWB0FkTvMAwmy/8ERTR6CwjlGAi1Ccence6C @@ -169,7 +169,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH Xe1Cr7qKDIMkZixwNhfWLGWbnuki0kXKzLU023KubBNPJrbRdOzocm6e2dPOO21mMS+CHvjcvOf9PF++ 79H9M+7RT2iRRsIi9sEAXe43yAvf2LpSHq28G9uAnytNT4jMLewtcQ2Ht2pF8ps/aOt+gccX5lxD694S +1BQFD1RkN5DSFa4Z3uONKbgHE3h8KZ4OJTC1J8UiSzmfhd2uf1CoJHbyKOsZokl0kKwm+aeJaov+wjO @@ -183,7 +183,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh FqYZRmJG1iKmUqKyLB2pqSm6vC1Nm5GXoeatEsVJ0RASR3eNzegikRq5lrV3857Fr/d9ddlICoL+8OfA Oef/e57zcIT/os7WLMw302muSGJ2689qqi7A44q8IzjtNYzarzHQm8tZtT8FmRqu6LToMxN+B8qhCbGR KVcDE85ajKUaxoaryEuL4UVXIudPB5Ko2oy98xjDptXERuz3hsgAOTzlqqMk6yjdllzE90UM9Wp5azlB diff --git a/MetalMaxViewer/MetalMaxViewer.csproj b/MetalMaxViewer/MetalMaxViewer.csproj index 297dea3..12cfd3e 100644 --- a/MetalMaxViewer/MetalMaxViewer.csproj +++ b/MetalMaxViewer/MetalMaxViewer.csproj @@ -68,20 +68,11 @@ Designer Resources.Designer.cs - - SettingsSingleFileGenerator - Settings.Designer.cs - True True Resources.resx - - True - Settings.settings - True - @@ -90,13 +81,14 @@ PreserveNewest - - - - + + PreserveNewest + - + + PreserveNewest + diff --git a/MetalMaxViewer/Properties/Resources.Designer.cs b/MetalMaxViewer/Properties/Resources.Designer.cs index 9b4022c..2d17f99 100644 --- a/MetalMaxViewer/Properties/Resources.Designer.cs +++ b/MetalMaxViewer/Properties/Resources.Designer.cs @@ -59,35 +59,5 @@ internal Resources() { resourceCulture = value; } } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap bocadillo { - get { - object obj = ResourceManager.GetObject("bocadillo", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap bocadillo2 { - get { - object obj = ResourceManager.GetObject("bocadillo2", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap objetos { - get { - object obj = ResourceManager.GetObject("objetos", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } } } diff --git a/MetalMaxViewer/Properties/Resources.resx b/MetalMaxViewer/Properties/Resources.resx index 0c6db8e..1af7de1 100644 --- a/MetalMaxViewer/Properties/Resources.resx +++ b/MetalMaxViewer/Properties/Resources.resx @@ -117,14 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\bocadillo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\bocadillo2.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\objetos.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - \ No newline at end of file diff --git a/MetalMaxViewer/Properties/Settings.Designer.cs b/MetalMaxViewer/Properties/Settings.Designer.cs deleted file mode 100644 index 80d29a3..0000000 --- a/MetalMaxViewer/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Este código fue generado por una herramienta. -// Versión de runtime:4.0.30319.42000 -// -// Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si -// se vuelve a generar el código. -// -//------------------------------------------------------------------------------ - -namespace MetalMaxViewer.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/MetalMaxViewer/Properties/Settings.settings b/MetalMaxViewer/Properties/Settings.settings deleted file mode 100644 index 3964565..0000000 --- a/MetalMaxViewer/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/MetalMaxViewer/Resources/LC12.NFTR b/MetalMaxViewer/Resources/LC12.NFTR index ecdc229..72d5794 100644 Binary files a/MetalMaxViewer/Resources/LC12.NFTR and b/MetalMaxViewer/Resources/LC12.NFTR differ diff --git a/MetalMaxViewer/Resources/bocadillo.jpg b/MetalMaxViewer/Resources/bocadillo.jpg index 67a83ca..b415281 100644 Binary files a/MetalMaxViewer/Resources/bocadillo.jpg and b/MetalMaxViewer/Resources/bocadillo.jpg differ diff --git a/MetalMaxViewer/Resources/bocadillo2.jpg b/MetalMaxViewer/Resources/bocadillo2.jpg deleted file mode 100644 index b415281..0000000 Binary files a/MetalMaxViewer/Resources/bocadillo2.jpg and /dev/null differ diff --git a/ThirdParties/NerdFontTerminatoR b/ThirdParties/NerdFontTerminatoR index 45b9473..0a7fe71 160000 --- a/ThirdParties/NerdFontTerminatoR +++ b/ThirdParties/NerdFontTerminatoR @@ -1 +1 @@ -Subproject commit 45b94733fcdd7b83f5d0faa299b080873014129d +Subproject commit 0a7fe71ae0ebe8c5ee98436f358cb68e10bef7a8