diff --git a/PCK-Studio/Forms/Additional-Popups/CreateTexturePack.Designer.cs b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.Designer.cs
similarity index 79%
rename from PCK-Studio/Forms/Additional-Popups/CreateTexturePack.Designer.cs
rename to PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.Designer.cs
index 242f1dcd..415a5649 100644
--- a/PCK-Studio/Forms/Additional-Popups/CreateTexturePack.Designer.cs
+++ b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.Designer.cs
@@ -1,6 +1,6 @@
namespace PckStudio
{
- partial class CreateTexturePack
+ partial class CreateTexturePackPrompt
{
///
/// Required designer variable.
@@ -28,11 +28,11 @@
///
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CreateTexturePack));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CreateTexturePackPrompt));
this.TextLabel = new System.Windows.Forms.Label();
this.OKButton = new System.Windows.Forms.Button();
this.InputTextBox = new MetroFramework.Controls.MetroTextBox();
- this.metroComboBox1 = new MetroFramework.Controls.MetroComboBox();
+ this.resolutionComboBox = new MetroFramework.Controls.MetroComboBox();
this.label1 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
@@ -80,24 +80,24 @@
this.InputTextBox.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
this.InputTextBox.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel);
//
- // metroComboBox1
+ // resolutionComboBox
//
- this.metroComboBox1.FormattingEnabled = true;
- resources.ApplyResources(this.metroComboBox1, "metroComboBox1");
- this.metroComboBox1.Items.AddRange(new object[] {
- resources.GetString("metroComboBox1.Items"),
- resources.GetString("metroComboBox1.Items1"),
- resources.GetString("metroComboBox1.Items2"),
- resources.GetString("metroComboBox1.Items3"),
- resources.GetString("metroComboBox1.Items4"),
- resources.GetString("metroComboBox1.Items5"),
- resources.GetString("metroComboBox1.Items6"),
- resources.GetString("metroComboBox1.Items7"),
- resources.GetString("metroComboBox1.Items8")});
- this.metroComboBox1.Name = "metroComboBox1";
- this.metroComboBox1.Style = MetroFramework.MetroColorStyle.Silver;
- this.metroComboBox1.Theme = MetroFramework.MetroThemeStyle.Dark;
- this.metroComboBox1.UseSelectable = true;
+ this.resolutionComboBox.FormattingEnabled = true;
+ resources.ApplyResources(this.resolutionComboBox, "resolutionComboBox");
+ this.resolutionComboBox.Items.AddRange(new object[] {
+ resources.GetString("resolutionComboBox.Items"),
+ resources.GetString("resolutionComboBox.Items1"),
+ resources.GetString("resolutionComboBox.Items2"),
+ resources.GetString("resolutionComboBox.Items3"),
+ resources.GetString("resolutionComboBox.Items4"),
+ resources.GetString("resolutionComboBox.Items5"),
+ resources.GetString("resolutionComboBox.Items6"),
+ resources.GetString("resolutionComboBox.Items7"),
+ resources.GetString("resolutionComboBox.Items8")});
+ this.resolutionComboBox.Name = "resolutionComboBox";
+ this.resolutionComboBox.Style = MetroFramework.MetroColorStyle.Silver;
+ this.resolutionComboBox.Theme = MetroFramework.MetroThemeStyle.Dark;
+ this.resolutionComboBox.UseSelectable = true;
//
// label1
//
@@ -112,11 +112,10 @@
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.label1);
- this.Controls.Add(this.metroComboBox1);
+ this.Controls.Add(this.resolutionComboBox);
this.Controls.Add(this.InputTextBox);
this.Controls.Add(this.OKButton);
this.Controls.Add(this.TextLabel);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "CreateTexturePack";
@@ -133,7 +132,7 @@
public System.Windows.Forms.Button OKButton;
public System.Windows.Forms.Label TextLabel;
private MetroFramework.Controls.MetroTextBox InputTextBox;
- private MetroFramework.Controls.MetroComboBox metroComboBox1;
+ private MetroFramework.Controls.MetroComboBox resolutionComboBox;
public System.Windows.Forms.Label label1;
}
}
\ No newline at end of file
diff --git a/PCK-Studio/Forms/Additional-Popups/CreateTexturePack.cs b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.cs
similarity index 68%
rename from PCK-Studio/Forms/Additional-Popups/CreateTexturePack.cs
rename to PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.cs
index 5a2946d4..b94620b8 100644
--- a/PCK-Studio/Forms/Additional-Popups/CreateTexturePack.cs
+++ b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.cs
@@ -4,22 +4,22 @@ using MetroFramework.Forms;
namespace PckStudio
{
- public partial class CreateTexturePack : MetroForm
+ public partial class CreateTexturePackPrompt : MetroForm
{
///
/// Text entered only access when DialogResult == DialogResult.OK
///
public string PackName => InputTextBox.Text;
- public string PackRes => metroComboBox1.Text;
+ public string PackRes => resolutionComboBox.Text;
- public CreateTexturePack()
+ public CreateTexturePackPrompt()
{
InitializeComponent();
}
private void OKBtn_Click(object sender, EventArgs e)
{
- if (metroComboBox1.SelectedIndex < 0)
+ if (resolutionComboBox.SelectedIndex < 0)
return;
DialogResult = DialogResult.OK;
}
diff --git a/PCK-Studio/Forms/Additional-Popups/CreateTexturePack.resx b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.resx
similarity index 99%
rename from PCK-Studio/Forms/Additional-Popups/CreateTexturePack.resx
rename to PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.resx
index 8c770886..d66ae6ea 100644
--- a/PCK-Studio/Forms/Additional-Popups/CreateTexturePack.resx
+++ b/PCK-Studio/Forms/Additional-Popups/CreateTexturePackPrompt.resx
@@ -213,55 +213,55 @@
2
-
+
23
-
+
x8
-
+
x16
-
+
x32
-
+
x48
-
+
x64
-
+
x80
-
+
x96
-
+
x112
-
+
x128
-
+
60, 39
-
+
165, 29
-
+
6
-
- metroComboBox1
+
+ resolutionComboBox
-
+
MetroFramework.Controls.MetroComboBox, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
+
$this
-
+
1
diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index d4feded7..e0d1412b 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -1298,7 +1298,7 @@ namespace PckStudio
private void texturePackToolStripMenuItem_Click(object sender, EventArgs e)
{
checkSaveState();
- CreateTexturePack packPrompt = new CreateTexturePack();
+ CreateTexturePackPrompt packPrompt = new CreateTexturePackPrompt();
if (packPrompt.ShowDialog() == DialogResult.OK)
{
currentPCK = InitializeTexturePack(new Random().Next(8000, int.MaxValue), 0, packPrompt.PackName, packPrompt.PackRes);
@@ -1311,7 +1311,7 @@ namespace PckStudio
private void mashUpPackToolStripMenuItem_Click(object sender, EventArgs e)
{
checkSaveState();
- CreateTexturePack packPrompt = new CreateTexturePack();
+ CreateTexturePackPrompt packPrompt = new CreateTexturePackPrompt();
if (packPrompt.ShowDialog() == DialogResult.OK)
{
currentPCK = InitializeMashUpPack(new Random().Next(8000, int.MaxValue), 0, packPrompt.PackName, packPrompt.PackRes);
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index 4c746964..1a92d8cb 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -276,11 +276,11 @@
AddLanguage.cs
-
+
Form
-
- CreateTexturePack.cs
+
+ CreateTexturePackPrompt.cs
Form
@@ -503,8 +503,8 @@
AddLanguage.cs
-
- CreateTexturePack.cs
+
+ CreateTexturePackPrompt.cs
Designer