Skip to content

Commit

Permalink
Merge pull request #237 from lastbattle/staging
Browse files Browse the repository at this point in the history
Staging -- UX refinement:
  • Loading branch information
lastbattle authored Jul 4, 2024
2 parents 131fbdb + 3ce77a6 commit c84b4fb
Show file tree
Hide file tree
Showing 21 changed files with 2,255 additions and 2,044 deletions.
34 changes: 34 additions & 0 deletions HaRepacker/Converter/BooleanToVisibilityConverter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
using HaRepacker.GUI.Controls;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data;
using System.Windows;

namespace HaRepacker.Converter {

/// <summary>
/// Boolean to System.Windows.Visiblity converter.
/// If true, return Visiblity.Collapsed
/// otherelse return Visibility.Visible
/// </summary>
public class BooleanToVisibilityConverter : IValueConverter {

public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) {
bool res = (bool)value;

if (res)
return Visibility.Collapsed;

return Visibility.Visible;
}

public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) {
Visibility visibility = (Visibility)value;

return visibility == Visibility.Collapsed ? true: false;
}
}
}
45 changes: 0 additions & 45 deletions HaRepacker/GUI/OptionsForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions HaRepacker/GUI/OptionsForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ public OptionsForm()

// Theme color
themeColor__comboBox.SelectedIndex = Program.ConfigurationManager.UserSettings.ThemeColor;

// API Key
openAI_apiKey_textBox.Text = Program.ConfigurationManager.ApplicationSettings.OpenAI_ApiKey;
}


Expand Down Expand Up @@ -80,9 +77,6 @@ private void okButton_Click(object sender, EventArgs e)
Program.ConfigurationManager.UserSettings.LineBreakType = (LineBreak)lineBreakBox.SelectedIndex;
Program.ConfigurationManager.UserSettings.ThemeColor = themeColor__comboBox.SelectedIndex;

// APi key
Program.ConfigurationManager.ApplicationSettings.OpenAI_ApiKey = openAI_apiKey_textBox.Text;

Program.ConfigurationManager.Save();
Close();
}
Expand Down
144 changes: 6 additions & 138 deletions HaRepacker/GUI/OptionsForm.resx
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
<value>19</value>
</data>
<data name="loadRelated.Text" xml:space="preserve">
<value>Autoload related Wz (Map.wz, Map001.wz, Map002.wz)</value>
<value>Auto-load related Wz (Map.wz, Map001.wz, Map002.wz)</value>
</data>
<data name="&gt;&gt;loadRelated.Name" xml:space="preserve">
<value>loadRelated</value>
Expand All @@ -175,7 +175,7 @@
<value>6</value>
</data>
<data name="okButton.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 399</value>
<value>2, 289</value>
</data>
<data name="okButton.Size" type="System.Drawing.Size, System.Drawing">
<value>157, 33</value>
Expand All @@ -196,10 +196,10 @@
<value>$this</value>
</data>
<data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
<value>3</value>
<value>2</value>
</data>
<data name="cancelButton.Location" type="System.Drawing.Point, System.Drawing">
<value>163, 399</value>
<value>161, 289</value>
</data>
<data name="cancelButton.Size" type="System.Drawing.Size, System.Drawing">
<value>157, 33</value>
Expand All @@ -220,7 +220,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;cancelButton.ZOrder" xml:space="preserve">
<value>2</value>
<value>1</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
Expand Down Expand Up @@ -550,135 +550,6 @@
<value>$this</value>
</data>
<data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="linkLabel1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="linkLabel1.Location" type="System.Drawing.Point, System.Drawing">
<value>42, 48</value>
</data>
<data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>243, 18</value>
</data>
<data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="linkLabel1.Text" xml:space="preserve">
<value>https://platform.openai.com/account/api-keys</value>
</data>
<data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
<value>linkLabel1</value>
</data>
<data name="&gt;&gt;linkLabel1.Type" xml:space="preserve">
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;linkLabel1.Parent" xml:space="preserve">
<value>panel2</value>
</data>
<data name="&gt;&gt;linkLabel1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="label6.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label6.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 26</value>
</data>
<data name="label6.Size" type="System.Drawing.Size, System.Drawing">
<value>85, 13</value>
</data>
<data name="label6.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
</data>
<data name="label6.Text" xml:space="preserve">
<value>OpenAI API key</value>
</data>
<data name="&gt;&gt;label6.Name" xml:space="preserve">
<value>label6</value>
</data>
<data name="&gt;&gt;label6.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label6.Parent" xml:space="preserve">
<value>panel2</value>
</data>
<data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="openAI_apiKey_textBox.Location" type="System.Drawing.Point, System.Drawing">
<value>97, 23</value>
</data>
<data name="openAI_apiKey_textBox.Size" type="System.Drawing.Size, System.Drawing">
<value>214, 22</value>
</data>
<data name="openAI_apiKey_textBox.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;openAI_apiKey_textBox.Name" xml:space="preserve">
<value>openAI_apiKey_textBox</value>
</data>
<data name="&gt;&gt;openAI_apiKey_textBox.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;openAI_apiKey_textBox.Parent" xml:space="preserve">
<value>panel2</value>
</data>
<data name="&gt;&gt;openAI_apiKey_textBox.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="label4.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9.75pt, style=Bold</value>
</data>
<data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label4.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
<data name="label4.Size" type="System.Drawing.Size, System.Drawing">
<value>38, 13</value>
</data>
<data name="label4.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="label4.Text" xml:space="preserve">
<value>AI</value>
</data>
<data name="&gt;&gt;label4.Name" xml:space="preserve">
<value>label4</value>
</data>
<data name="&gt;&gt;label4.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label4.Parent" xml:space="preserve">
<value>panel2</value>
</data>
<data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 292</value>
</data>
<data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
<value>323, 75</value>
</data>
<data name="panel2.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
</data>
<data name="&gt;&gt;panel2.Name" xml:space="preserve">
<value>panel2</value>
</data>
<data name="&gt;&gt;panel2.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;panel2.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
Expand All @@ -688,14 +559,11 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>323, 435</value>
<value>323, 327</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8pt</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>
</data>
Expand Down
Loading

0 comments on commit c84b4fb

Please sign in to comment.