Skip to content

Commit dd6a5e4

Browse files
committed
Update 1.3
- fix error 'index out of range' when add to all - improved tag translation
1 parent 73846de commit dd6a5e4

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

BooruDatasetTagManager/DatasetManager.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ public void AddTagToAll(string tag, AddingType addType, int pos=-1)
102102
{
103103
item.Value.Tags.Add(tag);
104104
}
105+
else if (pos < 0)
106+
{
107+
item.Value.Tags.Insert(0, tag);
108+
}
105109
else
106110
item.Value.Tags.Insert(pos, tag);
107111
break;

BooruDatasetTagManager/Form1.cs

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -345,11 +345,7 @@ private void toolStripButton7_Click(object sender, EventArgs e)
345345
if (addTag.ShowDialog() == DialogResult.OK)
346346
{
347347
int customIndex = (int)addTag.numericUpDown1.Value;
348-
if ((dataGridView1.RowCount>0) && (customIndex >= dataGridView1.RowCount || customIndex < 0))
349-
{
350-
MessageBox.Show("Selected position out of range!");
351-
return;
352-
}
348+
353349
DatasetManager.AddingType addType = (DatasetManager.AddingType)Enum.Parse(typeof(DatasetManager.AddingType), (string)addTag.comboBox1.SelectedItem);
354350
Program.DataManager.AddTagToAll(addTag.textBox1.Text, addType, customIndex);
355351
Program.DataManager.UpdateData();
@@ -379,7 +375,16 @@ private void toolStripButton7_Click(object sender, EventArgs e)
379375
}
380376
case DatasetManager.AddingType.Custom:
381377
{
382-
dataGridView1.Rows.Insert(customIndex, addTag.textBox1.Text);
378+
if (customIndex >= dataGridView1.RowCount)
379+
{
380+
dataGridView1.Rows.Add(addTag.textBox1.Text);
381+
}
382+
else if (customIndex < 0)
383+
{
384+
dataGridView1.Rows.Insert(0, addTag.textBox1.Text);
385+
}
386+
else
387+
dataGridView1.Rows.Insert(customIndex, addTag.textBox1.Text);
383388
break;
384389
}
385390
}
@@ -502,6 +507,8 @@ private void toolStripButton10_Click(object sender, EventArgs e)
502507
{
503508
dataGridView1.Rows.Add(tagsBuffer[i]);
504509
}
510+
if (isTranslate)
511+
FillTranslation();
505512
SetStatus("Pasted!");
506513
}
507514
else
@@ -546,6 +553,7 @@ private void translateTagsToolStripMenuItem_Click(object sender, EventArgs e)
546553
dataGridView1.Columns.Add("Translation", "Translation");
547554
dataGridView1.Columns["Translation"].ReadOnly = true;
548555
dataGridView1.Columns["Translation"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
556+
FillTranslation();
549557
}
550558
else
551559
{
@@ -641,6 +649,9 @@ private void toolStripButton15_Click(object sender, EventArgs e)
641649
string[] lines = text.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
642650
for (int i = 0; i < lines.Length; i++)
643651
dataGridView1.Rows.Add(lines[i].ToLower().Trim());
652+
653+
if (isTranslate)
654+
FillTranslation();
644655
}
645656
}
646657

BooruDatasetTagManager/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// Можно задать все значения или принять номера сборки и редакции по умолчанию
3333
// используя "*", как показано ниже:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.2.0.0")]
36-
[assembly: AssemblyFileVersion("1.2.0.0")]
35+
[assembly: AssemblyVersion("1.3.0.0")]
36+
[assembly: AssemblyFileVersion("1.3.0.0")]

0 commit comments

Comments
 (0)