From 3c4ae267b0331523d2bd1003b11e097d47b92570 Mon Sep 17 00:00:00 2001 From: Manu <52102823+Manu098vm@users.noreply.github.com> Date: Mon, 27 Jan 2025 00:07:52 +0100 Subject: [PATCH] Add CSV dump --- .../Resources/translations/lang_de.txt | 4 ++ .../Resources/translations/lang_en.txt | 4 ++ .../Resources/translations/lang_es.txt | 4 ++ .../Resources/translations/lang_fr.txt | 4 ++ .../Resources/translations/lang_it.txt | 4 ++ .../Resources/translations/lang_ja.txt | 4 ++ .../Resources/translations/lang_ko.txt | 4 ++ .../Resources/translations/lang_zh-Hans.txt | 4 ++ .../Resources/translations/lang_zh-Hant.txt | 4 ++ .../Forms/CalculatorForm.Designer.cs | 40 ++++++++++++++----- TeraFinder.Plugins/Forms/CalculatorForm.cs | 6 +++ TeraFinder.Plugins/Forms/CalculatorForm.resx | 4 +- .../Forms/RewardCalcForm.Designer.cs | 22 +++++++++- TeraFinder.Plugins/Forms/RewardCalcForm.cs | 6 +++ TeraFinder.Plugins/Forms/RewardCalcForm.resx | 4 +- TeraFinder.Plugins/Utils/GridUtil.cs | 28 ++++++------- 16 files changed, 115 insertions(+), 31 deletions(-) diff --git a/TeraFinder.Core/Resources/translations/lang_de.txt b/TeraFinder.Core/Resources/translations/lang_de.txt index 801a517f..4c4bd48d 100644 --- a/TeraFinder.Core/Resources/translations/lang_de.txt +++ b/TeraFinder.Core/Resources/translations/lang_de.txt @@ -101,7 +101,9 @@ CalculatorForm.grpFilters=Filters CalculatorForm.lblFound=Found: CalculatorForm.btnViewRewards=View Rewards CalculatorForm.btnSaveAll=Save All Results as TXT +CalculatorForm.btnSaveAllCsv=Save All Results as CSV CalculatorForm.btnSave=Save Selected Results as TXT +CalculatorForm.btnSaveCsv=Save Selected Results as CSV CalculatorForm.btnSavePk9=Save Selected Result as PK9 CalculatorForm.btnToPkmEditor=Send Selected Result to PKM Editor CalculatorForm.btnSendToEditor=Send Selected Result to Raid Editor @@ -135,7 +137,9 @@ RewardCalcForm.lblFound=Found: RewardCalcForm.chkAllResults=Show All Results(?) RewardCalcForm.btnSearch=Search RewardCalcForm.btnSaveAllTxt=Save All Results as TXT +RewardCalcForm.btnSaveAllCsv=Save All Results as CSV RewardCalcForm.btnSaveSelectedTxt=Save Selected Results as TXT +RewardCalcForm.btnSaveSelectedCsv=Save Selected Results as CSV RewardCalcForm.btnSendSelectedRaid=Send Selected Result to Raid Editor RewardCalcForm.lblEventCt=Event Index: RewardCalcForm.lblMap=Location: diff --git a/TeraFinder.Core/Resources/translations/lang_en.txt b/TeraFinder.Core/Resources/translations/lang_en.txt index 801a517f..4c4bd48d 100644 --- a/TeraFinder.Core/Resources/translations/lang_en.txt +++ b/TeraFinder.Core/Resources/translations/lang_en.txt @@ -101,7 +101,9 @@ CalculatorForm.grpFilters=Filters CalculatorForm.lblFound=Found: CalculatorForm.btnViewRewards=View Rewards CalculatorForm.btnSaveAll=Save All Results as TXT +CalculatorForm.btnSaveAllCsv=Save All Results as CSV CalculatorForm.btnSave=Save Selected Results as TXT +CalculatorForm.btnSaveCsv=Save Selected Results as CSV CalculatorForm.btnSavePk9=Save Selected Result as PK9 CalculatorForm.btnToPkmEditor=Send Selected Result to PKM Editor CalculatorForm.btnSendToEditor=Send Selected Result to Raid Editor @@ -135,7 +137,9 @@ RewardCalcForm.lblFound=Found: RewardCalcForm.chkAllResults=Show All Results(?) RewardCalcForm.btnSearch=Search RewardCalcForm.btnSaveAllTxt=Save All Results as TXT +RewardCalcForm.btnSaveAllCsv=Save All Results as CSV RewardCalcForm.btnSaveSelectedTxt=Save Selected Results as TXT +RewardCalcForm.btnSaveSelectedCsv=Save Selected Results as CSV RewardCalcForm.btnSendSelectedRaid=Send Selected Result to Raid Editor RewardCalcForm.lblEventCt=Event Index: RewardCalcForm.lblMap=Location: diff --git a/TeraFinder.Core/Resources/translations/lang_es.txt b/TeraFinder.Core/Resources/translations/lang_es.txt index 33c5d52c..80b56ce4 100644 --- a/TeraFinder.Core/Resources/translations/lang_es.txt +++ b/TeraFinder.Core/Resources/translations/lang_es.txt @@ -101,7 +101,9 @@ CalculatorForm.grpFilters=Filtro CalculatorForm.lblFound=Encontrado: CalculatorForm.btnViewRewards=Ver Recompensas CalculatorForm.btnSaveAll=Guardar resultados como TXT +CalculatorForm.btnSaveAllCsv=Guardar resultados como CSV CalculatorForm.btnSave=Guardar resultados seleccionados como TXT +CalculatorForm.btnSaveCsv=Guardar resultados seleccionados como CSV CalculatorForm.btnSavePk9=Guardar Resultado Seleccionado como PK9 CalculatorForm.btnToPkmEditor=Enviar Resultado Seleccionado a PKM Editor CalculatorForm.btnSendToEditor=Enviar Resultado Seleccionado a Raid Editor @@ -135,7 +137,9 @@ RewardCalcForm.lblFound=Encontrado: RewardCalcForm.chkAllResults=Mostrar todos los resultados (?) RewardCalcForm.btnSearch=Buscar RewardCalcForm.btnSaveAllTxt=Guardar resultados como TXT +RewardCalcForm.btnSaveAllCsv=Guardar resultados como CSV RewardCalcForm.btnSaveSelectedTxt=Guardar resultados seleccionados como TXT +RewardCalcForm.btnSaveSelectedCsv=Guardar resultados seleccionados como CSV RewardCalcForm.btnSendSelectedRaid=Enviar Resultado Seleccionado a Raid Editor RewardCalcForm.lblEventCt=Índice Evento: RewardCalcForm.lblMap=Ubicación: diff --git a/TeraFinder.Core/Resources/translations/lang_fr.txt b/TeraFinder.Core/Resources/translations/lang_fr.txt index 704ff17a..bcf0ff38 100644 --- a/TeraFinder.Core/Resources/translations/lang_fr.txt +++ b/TeraFinder.Core/Resources/translations/lang_fr.txt @@ -101,7 +101,9 @@ CalculatorForm.grpFilters=Filters CalculatorForm.lblFound=Found: CalculatorForm.btnViewRewards=View Rewards CalculatorForm.btnSaveAll=Save All Results as TXT +CalculatorForm.btnSaveAllCsv=Save All Results as CSV CalculatorForm.btnSave=Save Selected Results as TXT +CalculatorForm.btnSaveCsv=Save Selected Results as CSV CalculatorForm.btnSavePk9=Save Selected Result as PK9 CalculatorForm.btnToPkmEditor=Send Selected Result to PKM Editor CalculatorForm.btnSendToEditor=Send Selected Result to Raid Editor @@ -135,7 +137,9 @@ RewardCalcForm.lblFound=Found: RewardCalcForm.chkAllResults=Show All Results(?) RewardCalcForm.btnSearch=Search RewardCalcForm.btnSaveAllTxt=Save All Results as TXT +RewardCalcForm.btnSaveAllCsv=Save All Results as CSV RewardCalcForm.btnSaveSelectedTxt=Save Selected Results as TXT +RewardCalcForm.btnSaveSelectedCsv=Save Selected Results as CSV RewardCalcForm.btnSendSelectedRaid=Send Selected Result to Raid Editor RewardCalcForm.lblEventCt=Event Index: RewardCalcForm.lblMap=Location: diff --git a/TeraFinder.Core/Resources/translations/lang_it.txt b/TeraFinder.Core/Resources/translations/lang_it.txt index 2cbadf85..8f62e87c 100644 --- a/TeraFinder.Core/Resources/translations/lang_it.txt +++ b/TeraFinder.Core/Resources/translations/lang_it.txt @@ -101,7 +101,9 @@ CalculatorForm.grpFilters=Filtri CalculatorForm.lblFound=Trovati: CalculatorForm.btnViewRewards=Visualizza Ricompense CalculatorForm.btnSaveAll=Salva tutti i risultati come TXT +CalculatorForm.btnSaveAllCsv=Salva tutti i risultati come CSV CalculatorForm.btnSave=Salva i risultati selezionati come TXT +CalculatorForm.btnSaveCsv=Salva i risultati selezionati come CSV CalculatorForm.btnSavePk9=Salva il risultato selezionato come PK9 CalculatorForm.btnToPkmEditor=Invia il risultato selezionato al PKM Editor CalculatorForm.btnSendToEditor=Invia il risultato selezionato al Raid Editor @@ -135,7 +137,9 @@ RewardCalcForm.lblFound=Trovati: RewardCalcForm.chkAllResults=Mostra tutti i risultati (?) RewardCalcForm.btnSearch=Cerca RewardCalcForm.btnSaveAllTxt=Salva tutti i risultati come TXT +RewardCalcForm.btnSaveAllCsv=Salva tutti i risultati come CSV RewardCalcForm.btnSaveSelectedTxt=Salva i risultati selezionati come TXT +RewardCalcForm.btnSaveSelectedCsv=Salva i risultati selezionati come CSV RewardCalcForm.btnSendSelectedRaid=Invia il risultato selezionato al Raid Editor RewardCalcForm.lblEventCt=Indice Evento: RewardCalcForm.lblMap=Mappa: diff --git a/TeraFinder.Core/Resources/translations/lang_ja.txt b/TeraFinder.Core/Resources/translations/lang_ja.txt index 801a517f..4c4bd48d 100644 --- a/TeraFinder.Core/Resources/translations/lang_ja.txt +++ b/TeraFinder.Core/Resources/translations/lang_ja.txt @@ -101,7 +101,9 @@ CalculatorForm.grpFilters=Filters CalculatorForm.lblFound=Found: CalculatorForm.btnViewRewards=View Rewards CalculatorForm.btnSaveAll=Save All Results as TXT +CalculatorForm.btnSaveAllCsv=Save All Results as CSV CalculatorForm.btnSave=Save Selected Results as TXT +CalculatorForm.btnSaveCsv=Save Selected Results as CSV CalculatorForm.btnSavePk9=Save Selected Result as PK9 CalculatorForm.btnToPkmEditor=Send Selected Result to PKM Editor CalculatorForm.btnSendToEditor=Send Selected Result to Raid Editor @@ -135,7 +137,9 @@ RewardCalcForm.lblFound=Found: RewardCalcForm.chkAllResults=Show All Results(?) RewardCalcForm.btnSearch=Search RewardCalcForm.btnSaveAllTxt=Save All Results as TXT +RewardCalcForm.btnSaveAllCsv=Save All Results as CSV RewardCalcForm.btnSaveSelectedTxt=Save Selected Results as TXT +RewardCalcForm.btnSaveSelectedCsv=Save Selected Results as CSV RewardCalcForm.btnSendSelectedRaid=Send Selected Result to Raid Editor RewardCalcForm.lblEventCt=Event Index: RewardCalcForm.lblMap=Location: diff --git a/TeraFinder.Core/Resources/translations/lang_ko.txt b/TeraFinder.Core/Resources/translations/lang_ko.txt index e1dbe8c4..ef79558f 100644 --- a/TeraFinder.Core/Resources/translations/lang_ko.txt +++ b/TeraFinder.Core/Resources/translations/lang_ko.txt @@ -101,7 +101,9 @@ CalculatorForm.grpFilters=필터 CalculatorForm.lblFound=Found: CalculatorForm.btnViewRewards=보상 보기 CalculatorForm.btnSaveAll=모든 결과를 TXT로 저장 +CalculatorForm.btnSaveAllCsv=모든 결과를 CSV로 저장 CalculatorForm.btnSave=선택한 결과를 TXT로 저장 +CalculatorForm.btnSaveCsv=선택한 결과를 CSV로 저장 CalculatorForm.btnSavePk9=선택한 결과를 PK9로 저장 CalculatorForm.btnToPkmEditor=PKHeX로 선택한 결과 보내기 CalculatorForm.btnSendToEditor=레이드 편집기로 선택한 결과 보내기 @@ -135,7 +137,9 @@ RewardCalcForm.lblFound=Found: RewardCalcForm.chkAllResults=모든결과 보기(?) RewardCalcForm.btnSearch=검색 RewardCalcForm.btnSaveAllTxt=모든 결과를 TXT로 저장 +RewardCalcForm.btnSaveAllCsv=모든 결과를 CSV로 저장 RewardCalcForm.btnSaveSelectedTxt=선택한 결과를 TXT로 저장 +RewardCalcForm.btnSaveSelectedCsv=선택한 결과를 CSV로 저장 RewardCalcForm.btnSendSelectedRaid=레이드 편집기로 선택한 결과 보내기 RewardCalcForm.lblEventCt=이벤트 값: RewardCalcForm.lblMap=Location: diff --git a/TeraFinder.Core/Resources/translations/lang_zh-Hans.txt b/TeraFinder.Core/Resources/translations/lang_zh-Hans.txt index ed10025f..6e975cf2 100644 --- a/TeraFinder.Core/Resources/translations/lang_zh-Hans.txt +++ b/TeraFinder.Core/Resources/translations/lang_zh-Hans.txt @@ -101,7 +101,9 @@ CalculatorForm.grpFilters=筛选器 CalculatorForm.lblFound=找到: CalculatorForm.btnViewRewards=查看奖励 CalculatorForm.btnSaveAll=将所有结果保存为TXT +CalculatorForm.btnSaveAllCsv=将所有结果保存为CSV CalculatorForm.btnSave=将所选结果保存为TXT +CalculatorForm.btnSaveCsv=将所选结果保存为CSV CalculatorForm.btnSavePk9=将所选结果另存为PK9 CalculatorForm.btnToPkmEditor=将所选结果发送到PKM编辑器 CalculatorForm.btnSendToEditor=将所选结果发送到Raid编辑器 @@ -135,7 +137,9 @@ RewardCalcForm.lblFound=找到: RewardCalcForm.chkAllResults=显示所有结果(?) RewardCalcForm.btnSearch=搜索 RewardCalcForm.btnSaveAllTxt=将所有结果保存为TXT +RewardCalcForm.btnSaveAllCsv=将所有结果保存为CSV RewardCalcForm.btnSaveSelectedTxt=将所选结果保存为TXT +RewardCalcForm.btnSaveSelectedCsv=将所选结果保存为CSV RewardCalcForm.btnSendSelectedRaid=将所选结果发送到Raid编辑器 RewardCalcForm.lblEventCt=活动索引: RewardCalcForm.lblMap=地图: diff --git a/TeraFinder.Core/Resources/translations/lang_zh-Hant.txt b/TeraFinder.Core/Resources/translations/lang_zh-Hant.txt index db91227e..3eebc867 100644 --- a/TeraFinder.Core/Resources/translations/lang_zh-Hant.txt +++ b/TeraFinder.Core/Resources/translations/lang_zh-Hant.txt @@ -101,7 +101,9 @@ CalculatorForm.grpFilters=篩選器 CalculatorForm.lblFound=找到: CalculatorForm.btnViewRewards=查看獎勵 CalculatorForm.btnSaveAll=將所有結果轉儲為TXT +CalculatorForm.btnSaveAllCsv=將所有結果轉儲為CSV CalculatorForm.btnSave=將所選結果轉儲為TXT +CalculatorForm.btnSaveCsv=將所選結果轉儲為CSV CalculatorForm.btnSavePk9=將所選結果另存為PK9 CalculatorForm.btnToPkmEditor=將所選結果發送到PKM編輯器 CalculatorForm.btnSendToEditor=將所選結果發送到Raid編輯器 @@ -135,7 +137,9 @@ RewardCalcForm.lblFound=找到: RewardCalcForm.chkAllResults=顯示所有結果(?) RewardCalcForm.btnSearch=搜索 RewardCalcForm.btnSaveAllTxt=將所有結果轉儲為TXT +RewardCalcForm.btnSaveAllCsv=將所有結果轉儲為CSV RewardCalcForm.btnSaveSelectedTxt=將所選結果轉儲為TXT +RewardCalcForm.btnSaveSelectedCsv=將所選結果轉儲為CSV RewardCalcForm.btnSendSelectedRaid=將所選結果發送到Raid編輯器 RewardCalcForm.lblEventCt=活動索引: RewardCalcForm.lblMap=地图: diff --git a/TeraFinder.Plugins/Forms/CalculatorForm.Designer.cs b/TeraFinder.Plugins/Forms/CalculatorForm.Designer.cs index 1d7b327f..3c3faebe 100644 --- a/TeraFinder.Plugins/Forms/CalculatorForm.Designer.cs +++ b/TeraFinder.Plugins/Forms/CalculatorForm.Designer.cs @@ -95,6 +95,7 @@ private void InitializeComponent() nSpeMax = new NumericUpDown(); dataGrid = new DataGridView(); grpGameInfo = new GroupBox(); + lblTime = new Label(); txtSID = new TextBox(); lblSID = new Label(); txtTID = new TextBox(); @@ -110,7 +111,8 @@ private void InitializeComponent() btnToPkmEditor = new ToolStripMenuItem(); btnSendToEditor = new ToolStripMenuItem(); btnCopySeed = new ToolStripMenuItem(); - lblTime = new Label(); + btnSaveAllCsv = new ToolStripMenuItem(); + btnSaveCsv = new ToolStripMenuItem(); grpRaidDetails.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)numFrames).BeginInit(); grpFilters.SuspendLayout(); @@ -827,6 +829,16 @@ private void InitializeComponent() grpGameInfo.TabStop = false; grpGameInfo.Text = "Game Info"; // + // lblTime + // + lblTime.AutoSize = true; + lblTime.Location = new Point(207, 213); + lblTime.Name = "lblTime"; + lblTime.Size = new Size(20, 20); + lblTime.TabIndex = 35; + lblTime.Text = "T:"; + lblTime.Visible = false; + // // txtSID // txtSID.Location = new Point(116, 154); @@ -894,9 +906,9 @@ private void InitializeComponent() // contextMenuStrip // contextMenuStrip.ImageScalingSize = new Size(20, 20); - contextMenuStrip.Items.AddRange(new ToolStripItem[] { btnViewRewards, btnSaveAll, btnSave, btnSavePk9, btnToPkmEditor, btnSendToEditor, btnCopySeed }); + contextMenuStrip.Items.AddRange(new ToolStripItem[] { btnViewRewards, btnSaveAll, btnSaveAllCsv, btnSave, btnSaveCsv, btnSavePk9, btnToPkmEditor, btnSendToEditor, btnCopySeed }); contextMenuStrip.Name = "contextMenuStrip"; - contextMenuStrip.Size = new Size(313, 172); + contextMenuStrip.Size = new Size(313, 248); // // btnViewRewards // @@ -947,15 +959,19 @@ private void InitializeComponent() btnCopySeed.Text = "Copy Seed"; btnCopySeed.Click += btnCopySeed_Click; // - // lblTime + // btnSaveAllCsv // - lblTime.AutoSize = true; - lblTime.Location = new Point(207, 213); - lblTime.Name = "lblTime"; - lblTime.Size = new Size(20, 20); - lblTime.TabIndex = 35; - lblTime.Text = "T:"; - lblTime.Visible = false; + btnSaveAllCsv.Name = "btnSaveAllCsv"; + btnSaveAllCsv.Size = new Size(312, 24); + btnSaveAllCsv.Text = "Save All Results as CSV"; + btnSaveAllCsv.Click += btnSaveAllCSV_Click; + // + // btnSaveCsv + // + btnSaveCsv.Name = "btnSaveCsv"; + btnSaveCsv.Size = new Size(312, 24); + btnSaveCsv.Text = "Save Selected Results as CSV"; + btnSaveCsv.Click += btnSaveCSV_Click; // // CalculatorForm // @@ -1080,4 +1096,6 @@ private void InitializeComponent() private ComboBox cmbMap; private ToolStripMenuItem btnCopySeed; private Label lblTime; + private ToolStripMenuItem btnSaveAllCsv; + private ToolStripMenuItem btnSaveCsv; } \ No newline at end of file diff --git a/TeraFinder.Plugins/Forms/CalculatorForm.cs b/TeraFinder.Plugins/Forms/CalculatorForm.cs index 77d15dd0..46dd8b4a 100644 --- a/TeraFinder.Plugins/Forms/CalculatorForm.cs +++ b/TeraFinder.Plugins/Forms/CalculatorForm.cs @@ -145,7 +145,9 @@ private void GenerateDictionary() { "AltEC", "EC % 100 = 0" }, { "CalculatorForm.btnViewRewards", "View Rewards" }, { "CalculatorForm.btnSaveAll", "Save All Results as TXT" }, + { "CalculatorForm.btnSaveAllCsv", "Save All Results as CSV" }, { "CalculatorForm.btnSave", "Save Selected Results as TXT" }, + { "CalculatorForm.btnSaveCsv", "Save Selected Results as CSV" }, { "CalculatorForm.btnSavePk9", "Save Selected Result as PK9" }, { "CalculatorForm.btnToPkmEditor", "Send Selected Result to PKM Editor" }, { "CalculatorForm.btnSendToEditor", "Send Selected Result to Raid Editor" }, @@ -191,7 +193,9 @@ private void TranslateContextMenu() { btnViewRewards.Text = Strings["CalculatorForm.btnViewRewards"]; btnSaveAll.Text = Strings["CalculatorForm.btnSaveAll"]; + btnSaveAllCsv.Text = Strings["CalculatorForm.btnSaveAllCsv"]; btnSave.Text = Strings["CalculatorForm.btnSave"]; + btnSaveCsv.Text = Strings["CalculatorForm.btnSaveCsv"]; btnSavePk9.Text = Strings["CalculatorForm.btnSavePk9"]; btnToPkmEditor.Text = Strings["CalculatorForm.btnToPkmEditor"]; btnSendToEditor.Text = Strings["CalculatorForm.btnSendToEditor"]; @@ -742,8 +746,10 @@ private string[] TranslatedStars() ]; private void btnSaveAll_Click(object sender, EventArgs e) => dataGrid.SaveAllTxt(Editor.Language); + private void btnSaveAllCSV_Click(object sender, EventArgs e) => dataGrid.SaveAllTxt(Editor.Language, saveAsCsv: true); private void btnSave_Click(object sender, EventArgs e) => dataGrid.SaveSelectedTxt(Editor.Language); + private void btnSaveCSV_Click(object sender, EventArgs e) => dataGrid.SaveSelectedTxt(Editor.Language, saveAsCsv: true); private void btnToPkmEditor_Click(object sender, EventArgs e) => dataGrid.SendSelectedPk9Editor(this, Editor.Language, (TeraRaidMapParent)cmbMap.SelectedIndex); diff --git a/TeraFinder.Plugins/Forms/CalculatorForm.resx b/TeraFinder.Plugins/Forms/CalculatorForm.resx index 5f620d83..1cf3a720 100644 --- a/TeraFinder.Plugins/Forms/CalculatorForm.resx +++ b/TeraFinder.Plugins/Forms/CalculatorForm.resx @@ -1,7 +1,7 @@