diff --git a/AppSettings.cs b/AppSettings.cs index 3d5d4ec..a00be9a 100644 --- a/AppSettings.cs +++ b/AppSettings.cs @@ -36,7 +36,6 @@ public AppSettings() config_cs["image_format"] = "PNG"; config_cs["image_quality"] = 100; config_cs["force_overwrite"] = false; - config_cs["leaflet"] = false; } public string GetArguments(PapyrusVariant variant, bool includeExePath, string worldPath, string outputPath) @@ -65,7 +64,7 @@ public string GetArguments(PapyrusVariant variant, bool includeExePath, string w additionalArgs[1] = String.Format("--limitx {0},{1} --limitz {2},{3}", config_cs["limitXZ_X1"] / divider, config_cs["limitXZ_X2"] / divider, config_cs["limitXZ_Z1"] / divider, config_cs["limitXZ_Z2"] / divider); } - arguments = String.Format(exePath + "-w \"{0}\" -o \"{1}\" --dim {2} -f {3} {4} --brillouin_j {5} --brillouin_divider {6} --brillouin_offset {7} --forceoverwrite {8} --use_leaflet_legacy {9} --htmlfile {10} {11} {12}", worldPath, outputPath, config_cs["dimension"], config_cs["image_format"].ToString().ToLower(), config_cs["image_quality"], config_cs["heightmap_j"], config_cs["heightmap_divider"], config_cs["heightmap_offset"], Convert.ToString(config_cs["force_overwrite"]).ToLower(), Convert.ToString(config_cs["leaflet"]).ToLower(), config_cs["html_filename"], additionalArgs[0], additionalArgs[1]); + arguments = String.Format(exePath + "-w \"{0}\" -o \"{1}\" --dim {2} -f {3} {4} --brillouin_j {5} --brillouin_divider {6} --brillouin_offset {7} --forceoverwrite {8} --htmlfile {9} {10} {11}", worldPath, outputPath, config_cs["dimension"], config_cs["image_format"].ToString().ToLower(), config_cs["image_quality"], config_cs["heightmap_j"], config_cs["heightmap_divider"], config_cs["heightmap_offset"], Convert.ToString(config_cs["force_overwrite"]).ToLower(), config_cs["html_filename"], additionalArgs[0], additionalArgs[1]).Trim(); break; diff --git a/Forms/FormConfigure.Designer.cs b/Forms/FormConfigure.Designer.cs index 03eca23..f6718a3 100644 --- a/Forms/FormConfigure.Designer.cs +++ b/Forms/FormConfigure.Designer.cs @@ -39,6 +39,7 @@ private void InitializeComponent() this.groupBox2 = new System.Windows.Forms.GroupBox(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.checkBoxIngameCoordinates = new System.Windows.Forms.CheckBox(); this.numericUpDownHeightmapDivider = new System.Windows.Forms.NumericUpDown(); this.numericUpDownHeightmapOffset = new System.Windows.Forms.NumericUpDown(); this.numericUpDownHeightmapJ = new System.Windows.Forms.NumericUpDown(); @@ -49,7 +50,6 @@ private void InitializeComponent() this.numericUpDownXzX2 = new System.Windows.Forms.NumericUpDown(); this.numericUpDownXzX1 = new System.Windows.Forms.NumericUpDown(); this.buttonCopyArgumentsCs = new System.Windows.Forms.Button(); - this.checkBoxLeaflet = new System.Windows.Forms.CheckBox(); this.label14 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); @@ -73,7 +73,6 @@ private void InitializeComponent() this.labelLimitY = new System.Windows.Forms.Label(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.label2 = new System.Windows.Forms.Label(); - this.checkBoxIngameCoordinates = new System.Windows.Forms.CheckBox(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.tabControl1.SuspendLayout(); @@ -203,7 +202,6 @@ private void InitializeComponent() this.tabPage1.Controls.Add(this.numericUpDownXzX2); this.tabPage1.Controls.Add(this.numericUpDownXzX1); this.tabPage1.Controls.Add(this.buttonCopyArgumentsCs); - this.tabPage1.Controls.Add(this.checkBoxLeaflet); this.tabPage1.Controls.Add(this.label14); this.tabPage1.Controls.Add(this.label13); this.tabPage1.Controls.Add(this.label12); @@ -234,6 +232,18 @@ private void InitializeComponent() this.tabPage1.Text = "PapyrusCS"; this.tabPage1.UseVisualStyleBackColor = true; // + // checkBoxIngameCoordinates + // + this.checkBoxIngameCoordinates.AutoSize = true; + this.checkBoxIngameCoordinates.Checked = true; + this.checkBoxIngameCoordinates.CheckState = System.Windows.Forms.CheckState.Checked; + this.checkBoxIngameCoordinates.Location = new System.Drawing.Point(151, 55); + this.checkBoxIngameCoordinates.Name = "checkBoxIngameCoordinates"; + this.checkBoxIngameCoordinates.Size = new System.Drawing.Size(122, 17); + this.checkBoxIngameCoordinates.TabIndex = 42; + this.checkBoxIngameCoordinates.Text = "In-game coordinates"; + this.checkBoxIngameCoordinates.UseVisualStyleBackColor = true; + // // numericUpDownHeightmapDivider // this.numericUpDownHeightmapDivider.Location = new System.Drawing.Point(226, 126); @@ -349,16 +359,6 @@ private void InitializeComponent() this.buttonCopyArgumentsCs.UseVisualStyleBackColor = true; this.buttonCopyArgumentsCs.Click += new System.EventHandler(this.buttonCopyArgumentsCs_Click); // - // checkBoxLeaflet - // - this.checkBoxLeaflet.AutoSize = true; - this.checkBoxLeaflet.Location = new System.Drawing.Point(107, 271); - this.checkBoxLeaflet.Name = "checkBoxLeaflet"; - this.checkBoxLeaflet.Size = new System.Drawing.Size(189, 17); - this.checkBoxLeaflet.TabIndex = 31; - this.checkBoxLeaflet.Text = "Use Leaflet instead of OpenLayers"; - this.checkBoxLeaflet.UseVisualStyleBackColor = true; - // // label14 // this.label14.AutoSize = true; @@ -583,7 +583,7 @@ private void InitializeComponent() this.tabPage2.Margin = new System.Windows.Forms.Padding(2); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(2); - this.tabPage2.Size = new System.Drawing.Size(301, 297); + this.tabPage2.Size = new System.Drawing.Size(301, 322); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "papyrus.js"; this.tabPage2.UseVisualStyleBackColor = true; @@ -598,18 +598,6 @@ private void InitializeComponent() this.label2.TabIndex = 0; this.label2.Text = "Not available..."; // - // checkBoxIngameCoordinates - // - this.checkBoxIngameCoordinates.AutoSize = true; - this.checkBoxIngameCoordinates.Checked = true; - this.checkBoxIngameCoordinates.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBoxIngameCoordinates.Location = new System.Drawing.Point(151, 55); - this.checkBoxIngameCoordinates.Name = "checkBoxIngameCoordinates"; - this.checkBoxIngameCoordinates.Size = new System.Drawing.Size(122, 17); - this.checkBoxIngameCoordinates.TabIndex = 42; - this.checkBoxIngameCoordinates.Text = "In-game coordinates"; - this.checkBoxIngameCoordinates.UseVisualStyleBackColor = true; - // // FormConfigure // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -681,7 +669,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox checkBoxForceOverwrite; private System.Windows.Forms.ComboBox comboBoxProfile; private System.Windows.Forms.Label label11; - private System.Windows.Forms.CheckBox checkBoxLeaflet; private System.Windows.Forms.Button buttonCopyArgumentsCs; private System.Windows.Forms.NumericUpDown numericUpDownImgQuality; private System.Windows.Forms.NumericUpDown numericUpDownLimitY; diff --git a/Forms/FormConfigure.cs b/Forms/FormConfigure.cs index 77049c4..4d45470 100644 --- a/Forms/FormConfigure.cs +++ b/Forms/FormConfigure.cs @@ -68,7 +68,6 @@ public FormConfigure(FormMain formMain) comboBoxImgFormat.SelectedItem = FormMain.Settings.config_cs["image_format"]; numericUpDownImgQuality.Value = (int)FormMain.Settings.config_cs["image_quality"]; checkBoxForceOverwrite.Checked = (bool)FormMain.Settings.config_cs["force_overwrite"]; - checkBoxLeaflet.Checked = (bool)FormMain.Settings.config_cs["leaflet"]; #endregion } @@ -155,7 +154,6 @@ public void ApplySettings() FormMain.Settings.config_cs["image_format"] = comboBoxImgFormat.SelectedItem.ToString(); FormMain.Settings.config_cs["image_quality"] = (int)numericUpDownImgQuality.Value; FormMain.Settings.config_cs["force_overwrite"] = (bool)checkBoxForceOverwrite.Checked; - FormMain.Settings.config_cs["leaflet"] = (bool)checkBoxLeaflet.Checked; #endregion // #region .js