From 7113896da7f5ac1ee5ac7d93a3b80d79fedb844f Mon Sep 17 00:00:00 2001 From: nishikawa_takeshi Date: Tue, 27 Jan 2009 11:55:39 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=82=B9=E3=82=BF=E3=82=A8=E3=83=87?= =?UTF-8?q?=E3=82=A3=E3=82=BF:GUI=E3=81=A8=E6=8F=90=E5=87=BA=E7=A2=BA?= =?UTF-8?q?=E8=AA=8D=E6=9B=B8=E3=81=8B=E3=82=89=E4=BD=BF=E7=94=A8NAND?= =?UTF-8?q?=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF=E6=95=B0=E3=81=AE=E9=A0=85?= =?UTF-8?q?=E7=9B=AE=E3=82=92=E5=89=8A=E9=99=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlToolsRED@147 7061adef-622a-194b-ae81-725974e89856 --- .../MasterEditorTWL/MasterEditorTWL.ncb | Bin 11447296 -> 11447296 bytes .../MasterEditorTWL/MasterEditorTWL.suo | Bin 68096 -> 67584 bytes .../MasterEditorTWL/Debug/BuildLog.htm | Bin 20662 -> 15976 bytes .../MasterEditorTWL/MasterEditorTWL/Form1.h | 128 ++--- .../MasterEditorTWL/Form1.ja.resx | 152 +++-- .../MasterEditorTWL/Form1.resX | 525 +++++++----------- .../MasterEditorTWL/Form_lang.cpp | 3 - .../MasterEditorTWL/Form_srl.cpp | 1 - .../MasterEditorTWL/deliverable.cpp | 4 - .../resource/sheet_templete.xml | 23 +- 10 files changed, 321 insertions(+), 515 deletions(-) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 7d5cb291a0b9356d789addbcd7b32a93102a9594..9e60935f012be3a82517e649d3bf0f09e21979b1 100644 GIT binary patch delta 35558 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 W$x(8Qyi49A$H@si(er-lh5rWtJl~%H delta 10546 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 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index d65462dce37507a68320a5385a1d0957f37fe77c..354324c46e358fe8710a05f4ca89e1953db911d7 100644 GIT binary patch delta 1337 zcmZ{ie{54#6vywq@AY*p-PXP}wJw`$9cHj0P(u_LKSnlWim_cY2onClEE=3swpoW` zy1prY_$v%{7!o0jHkz2IaqF32_+y(GlSMHqsF`HJE*Tl%gspTkYC=7C=|3dpB%gQA z``&ZUJ@+y zh9%}f^%!RiRRM)QN-jj)`Z98;O zze&Q-OKu46iN+c=uDbr5Z$j(K8&tk%VIQHrZ33!F=edHjtqO<54TU|S-Tdz1=S%TG z=%NC89n!#Y1nYo3O6D-km%DP zRCz#sqF3vIv;n=YoUoJP6k(Y56AD zd&yX#7(9=`T0_@B}sFs-8d`e(f7k4LgJf%&mR z9DZol;mdds!cz}r%jp=iifnr2#Je0;jK7_2EI&qL-ElV*T-tS?13>d%`hDtVUvHsi z{51{cCSR4OkZs-LS46g&Fg(=--~Rm`^uM5?Kjq^Pxqjq~Q}8AwdPAHsOgtzsm^jV( P+JU;S_~GW-=)C?v>SKpU delta 2194 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 = (gcnew System::Windows::Forms::TextBox()); this->gboxSrl = (gcnew System::Windows::Forms::GroupBox()); this->tboxRemasterVer = (gcnew System::Windows::Forms::TextBox()); @@ -1045,13 +1045,11 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->labBracketL = (gcnew System::Windows::Forms::Label()); this->tboxSumSizeMB = (gcnew System::Windows::Forms::TextBox()); this->tboxSrlSize = (gcnew System::Windows::Forms::TextBox()); - this->labShopBlockUnit = (gcnew System::Windows::Forms::Label()); this->labArrow5 = (gcnew System::Windows::Forms::Label()); this->labArrow4 = (gcnew System::Windows::Forms::Label()); this->labArrow3 = (gcnew System::Windows::Forms::Label()); this->labArrow2 = (gcnew System::Windows::Forms::Label()); this->labArrow1 = (gcnew System::Windows::Forms::Label()); - this->tboxShopBlock = (gcnew System::Windows::Forms::TextBox()); this->tboxSumSize = (gcnew System::Windows::Forms::TextBox()); this->tboxTmdSizeFS = (gcnew System::Windows::Forms::TextBox()); this->tboxSubBannerSizeFS = (gcnew System::Windows::Forms::TextBox()); @@ -1061,9 +1059,7 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->tboxTmdSize = (gcnew System::Windows::Forms::TextBox()); this->tboxSubBannerSize = (gcnew System::Windows::Forms::TextBox()); this->labNandSize = (gcnew System::Windows::Forms::Label()); - this->labShopBlock2 = (gcnew System::Windows::Forms::Label()); this->labNandSizeFS = (gcnew System::Windows::Forms::Label()); - this->labShopBlock = (gcnew System::Windows::Forms::Label()); this->labSrlSize = (gcnew System::Windows::Forms::Label()); this->labSumSize2 = (gcnew System::Windows::Forms::Label()); this->labSumSize = (gcnew System::Windows::Forms::Label()); @@ -3063,15 +3059,15 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->gridSDK->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridSDK->ColumnHeadersVisible = false; this->gridSDK->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(1) {this->dataSDKVer}); - dataGridViewCellStyle1->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle1->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle1->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle6->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle6->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle6->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle1->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle1->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle1->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle1->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridSDK->DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle6->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle6->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle6->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle6->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridSDK->DefaultCellStyle = dataGridViewCellStyle6; this->gridSDK->Font = nullptr; this->gridSDK->Name = L"gridSDK"; this->gridSDK->ReadOnly = true; @@ -3097,15 +3093,15 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->gridLibrary->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridLibrary->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(2) {this->colLibPublisher, this->colLibName}); - dataGridViewCellStyle2->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle2->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle2->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle7->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle7->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle7->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle2->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle2->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle2->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle2->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle7->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle7->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle7->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle7->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridLibrary->DefaultCellStyle = dataGridViewCellStyle7; this->gridLibrary->Font = nullptr; this->gridLibrary->Name = L"gridLibrary"; this->gridLibrary->ReadOnly = true; @@ -3246,13 +3242,11 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->gboxNandSize->Controls->Add(this->labBracketL); this->gboxNandSize->Controls->Add(this->tboxSumSizeMB); this->gboxNandSize->Controls->Add(this->tboxSrlSize); - this->gboxNandSize->Controls->Add(this->labShopBlockUnit); this->gboxNandSize->Controls->Add(this->labArrow5); this->gboxNandSize->Controls->Add(this->labArrow4); this->gboxNandSize->Controls->Add(this->labArrow3); this->gboxNandSize->Controls->Add(this->labArrow2); this->gboxNandSize->Controls->Add(this->labArrow1); - this->gboxNandSize->Controls->Add(this->tboxShopBlock); this->gboxNandSize->Controls->Add(this->tboxSumSize); this->gboxNandSize->Controls->Add(this->tboxTmdSizeFS); this->gboxNandSize->Controls->Add(this->tboxSubBannerSizeFS); @@ -3262,10 +3256,8 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->gboxNandSize->Controls->Add(this->tboxTmdSize); this->gboxNandSize->Controls->Add(this->tboxSubBannerSize); this->gboxNandSize->Controls->Add(this->labNandSize); - this->gboxNandSize->Controls->Add(this->labShopBlock2); this->gboxNandSize->Controls->Add(this->labNandSizeFS); this->gboxNandSize->Controls->Add(this->tboxPrivateSize); - this->gboxNandSize->Controls->Add(this->labShopBlock); this->gboxNandSize->Controls->Add(this->labSrlSize); this->gboxNandSize->Controls->Add(this->labPrivateSize); this->gboxNandSize->Controls->Add(this->labSumSize2); @@ -3312,14 +3304,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->tboxSrlSize->Name = L"tboxSrlSize"; this->tboxSrlSize->ReadOnly = true; // - // labShopBlockUnit - // - this->labShopBlockUnit->AccessibleDescription = nullptr; - this->labShopBlockUnit->AccessibleName = nullptr; - resources->ApplyResources(this->labShopBlockUnit, L"labShopBlockUnit"); - this->labShopBlockUnit->Font = nullptr; - this->labShopBlockUnit->Name = L"labShopBlockUnit"; - // // labArrow5 // this->labArrow5->AccessibleDescription = nullptr; @@ -3360,16 +3344,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->labArrow1->Font = nullptr; this->labArrow1->Name = L"labArrow1"; // - // tboxShopBlock - // - this->tboxShopBlock->AccessibleDescription = nullptr; - this->tboxShopBlock->AccessibleName = nullptr; - resources->ApplyResources(this->tboxShopBlock, L"tboxShopBlock"); - this->tboxShopBlock->BackgroundImage = nullptr; - this->tboxShopBlock->Font = nullptr; - this->tboxShopBlock->Name = L"tboxShopBlock"; - this->tboxShopBlock->ReadOnly = true; - // // tboxSumSize // this->tboxSumSize->AccessibleDescription = nullptr; @@ -3458,14 +3432,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->labNandSize->Font = nullptr; this->labNandSize->Name = L"labNandSize"; // - // labShopBlock2 - // - this->labShopBlock2->AccessibleDescription = nullptr; - this->labShopBlock2->AccessibleName = nullptr; - resources->ApplyResources(this->labShopBlock2, L"labShopBlock2"); - this->labShopBlock2->Font = nullptr; - this->labShopBlock2->Name = L"labShopBlock2"; - // // labNandSizeFS // this->labNandSizeFS->AccessibleDescription = nullptr; @@ -3474,14 +3440,6 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->labNandSizeFS->Font = nullptr; this->labNandSizeFS->Name = L"labNandSizeFS"; // - // labShopBlock - // - this->labShopBlock->AccessibleDescription = nullptr; - this->labShopBlock->AccessibleName = nullptr; - resources->ApplyResources(this->labShopBlock, L"labShopBlock"); - this->labShopBlock->Font = nullptr; - this->labShopBlock->Name = L"labShopBlock"; - // // labSrlSize // this->labSrlSize->AccessibleDescription = nullptr; @@ -3837,15 +3795,15 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->gridWarn->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridWarn->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colWarnName, this->colWarnBegin, this->colWarnEnd, this->colWarnCause}); - dataGridViewCellStyle3->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle3->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle3->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle8->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle8->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle8->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle3->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle3->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle3->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle3->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridWarn->DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle8->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle8->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle8->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle8->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridWarn->DefaultCellStyle = dataGridViewCellStyle8; this->gridWarn->Font = nullptr; this->gridWarn->GridColor = System::Drawing::SystemColors::Control; this->gridWarn->Name = L"gridWarn"; @@ -3882,8 +3840,8 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; // this->gridError->AccessibleDescription = nullptr; this->gridError->AccessibleName = nullptr; - dataGridViewCellStyle4->BackColor = System::Drawing::Color::White; - this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle9->BackColor = System::Drawing::Color::White; + this->gridError->AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; resources->ApplyResources(this->gridError, L"gridError"); this->gridError->AutoSizeRowsMode = System::Windows::Forms::DataGridViewAutoSizeRowsMode::AllCellsExceptHeaders; this->gridError->BackgroundColor = System::Drawing::SystemColors::Control; @@ -3891,15 +3849,15 @@ private: System::Windows::Forms::DataGridViewTextBoxColumn^ dataSDKVer; this->gridError->ColumnHeadersHeightSizeMode = System::Windows::Forms::DataGridViewColumnHeadersHeightSizeMode::AutoSize; this->gridError->Columns->AddRange(gcnew cli::array< System::Windows::Forms::DataGridViewColumn^ >(4) {this->colErrorName, this->colErrorBegin, this->colErrorEnd, this->colErrorCause}); - dataGridViewCellStyle5->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; - dataGridViewCellStyle5->BackColor = System::Drawing::SystemColors::Window; - dataGridViewCellStyle5->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + dataGridViewCellStyle10->Alignment = System::Windows::Forms::DataGridViewContentAlignment::MiddleLeft; + dataGridViewCellStyle10->BackColor = System::Drawing::SystemColors::Window; + dataGridViewCellStyle10->Font = (gcnew System::Drawing::Font(L"MS UI Gothic", 9, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(128))); - dataGridViewCellStyle5->ForeColor = System::Drawing::SystemColors::ControlText; - dataGridViewCellStyle5->SelectionBackColor = System::Drawing::SystemColors::Highlight; - dataGridViewCellStyle5->SelectionForeColor = System::Drawing::SystemColors::HighlightText; - dataGridViewCellStyle5->WrapMode = System::Windows::Forms::DataGridViewTriState::True; - this->gridError->DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle10->ForeColor = System::Drawing::SystemColors::ControlText; + dataGridViewCellStyle10->SelectionBackColor = System::Drawing::SystemColors::Highlight; + dataGridViewCellStyle10->SelectionForeColor = System::Drawing::SystemColors::HighlightText; + dataGridViewCellStyle10->WrapMode = System::Windows::Forms::DataGridViewTriState::True; + this->gridError->DefaultCellStyle = dataGridViewCellStyle10; this->gridError->Font = nullptr; this->gridError->GridColor = System::Drawing::SystemColors::Control; this->gridError->Name = L"gridError"; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx index bdd8683..c194c1f 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.ja.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ROMデータ情報 + 73, 12 @@ -160,9 +163,6 @@ リマスターバージョン - - ROMデータ情報 - 79, 12 @@ -364,6 +364,9 @@ 担当者2を入力する(任意) + + 担当者2 + 37, 12 @@ -400,8 +403,8 @@ 貴社名 - - 担当者2 + + 担当者1 37, 12 @@ -439,8 +442,8 @@ 貴社名 - - 担当者1 + + 目的 54, 16 @@ -466,8 +469,8 @@ 一般販売用 - - 目的 + + 提出方法 56, 16 @@ -481,9 +484,6 @@ 郵送 - - 提出方法 - 65, 12 @@ -544,15 +544,15 @@ 製品コード + + Shared2ファイルサイズ + 123, 16 Shared2ファイル使用 - - Shared2ファイルサイズ - 70, 12 @@ -565,6 +565,9 @@ SDKバージョン + + TWL拡張情報 + 72, 12 @@ -577,9 +580,6 @@ TWL専用領域ROMオフセット - - TWL拡張情報 - 155, 12 @@ -587,10 +587,10 @@ TWLノーマル領域ROMオフセット - 121, 12 + 127, 12 - Privatセーブデータサイズ + Privateセーブデータサイズ 122, 12 @@ -616,6 +616,9 @@ tmpジャンプ許可 + + アクセスコントロール情報 + 98, 12 @@ -643,9 +646,6 @@ SDカード - - アクセスコントロール情報 - 24, 79 @@ -662,7 +662,7 @@ その他アプリ情報 - 236, 62 + 230, 68 74, 12 @@ -679,6 +679,12 @@ ROM提出情報 + + 51, 20 + + + ファイル + 211, 22 @@ -700,11 +706,11 @@ 一時保存した提出情報を開く - - 51, 20 + + 53, 20 - - ファイル + + マスター 280, 22 @@ -733,17 +739,17 @@ ミドルウェアリストのみを作成する(HTML形式) - - 53, 20 - - - マスター + + ROM基本情報 このタブの情報は編集不可です。データに誤りがある場合にはROMデータの作成時の設定を見直してください。 - - ROM基本情報 + + TWL拡張情報 + + + DSiメニュー上での起動制限 173, 12 @@ -751,26 +757,20 @@ DSiメニュー上での通信アイコン表示 - - DSiメニュー上での起動制限 - このタブの情報は編集不可です。データに誤りがある場合にはROMデータの作成時の設定を見直してください。 TWL拡張諸フラグ - - TWL拡張情報 + + DSiウェア情報 このタブの情報はDSiウェア(NANDアプリ)によって使用されるTWL本体内のNAND領域のサイズを確認する場合に必要です。<newline>アプリがゲームカード向けの場合にはNAND使用サイズの確認は必要ありません。 - - 38, 12 - - - ブロック + + DSiウェアによって使用されるNAND領域のサイズ 154, 23 @@ -781,15 +781,6 @@ ROM内登録情報 - - 154, 224 - - - 99, 12 - - - (1ブロック = 128KB) - 296, 23 @@ -799,15 +790,6 @@ 使用NANDサイズ - - 165, 210 - - - 74, 12 - - - 使用ブロック数 - 18, 44 @@ -847,11 +829,11 @@ その他ファイルサイズ - - DSiウェアによって使用されるNAND領域のサイズ + + リージョンとレーティング(要入力) - - DSiウェア情報 + + その他ROM仕様 210, 16 @@ -865,26 +847,23 @@ 写真交換対応 - - その他ROM仕様 - 読み込み時の設定に戻す このタブの各項目への入力は提出確認書およびマスターROMの作成のために必要です。<newline>これらの情報はマスターROMの作成時にROM内登録データとして登録されます(「その他ROM仕様」を除く)。 + + リージョンとレーティング情報 + 235, 16 レーティング表示不要 (ツール類のみ選択可) - - リージョンとレーティング情報 - - - リージョンとレーティング(要入力) + + 提出情報(要入力) (30文字以内) @@ -892,6 +871,9 @@ このタブの情報は提出確認書の作成に必要です。入力してください。 + + 海外版 + (30文字以内) @@ -901,21 +883,21 @@ (複数ある場合のみ) - - 海外版 - - - 提出情報(要入力) + + 会社情報(要入力) このタブの情報は提出確認書の作成に必要です。入力してください。 - - 会社情報(要入力) + + エラー情報 このタブには読み込んだROMデータの問題と本プログラムでの入力ミスが列挙されます。<newline>赤文字の項目は、本プログラムで修正不可です。ROMデータ作成時の設定をご確認ください。<newline>青文字の項目は、本プログラムで修正できますが、修正がマスターROMに反映されます。<newline>黒文字の項目は、提出確認書にのみ反映され、マスターROMには反映されません。 + + いつの情報を表示するか + 114, 16 @@ -928,9 +910,6 @@ ROMデータ読み込み時 - - いつの情報を表示するか - 339, 12 @@ -967,9 +946,6 @@ 要因 - - エラー情報 - 92, 12 diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX index 6268230..907e453 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.resX @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gboxTWLExInfo - gboxSrl @@ -167,9 +164,6 @@ 2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 10 @@ -191,6 +185,9 @@ gboxTWLExInfo + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 10 @@ -212,9 +209,6 @@ 3 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Europe and Australia @@ -227,12 +221,6 @@ 24, 99 - - tboxNormalRomOffset - - - 155, 224 - labShared2Size0 @@ -317,9 +305,6 @@ 66, 125 - - stripMaster - gboxNandSize @@ -414,15 +399,15 @@ Enable Temp App Jump - - True - 374, 145 aged 6 or older + + tabMain + 15, 74 @@ -460,7 +445,7 @@ 41 - 26 + 22 17 @@ -534,9 +519,6 @@ TWL Extended Flags - - 1 - 109, 106 @@ -583,7 +565,7 @@ 42, 19 - 316, 59 + 310, 65 0 @@ -612,9 +594,6 @@ 15 - - 52, 20 - tabSubmitInfo @@ -636,9 +615,6 @@ 8 - - 292, 210 - 12 @@ -678,9 +654,6 @@ 40 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -732,8 +705,11 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 225, 62 + + gboxSrl + + + 5 66, 75 @@ -747,9 +723,6 @@ 96, 19 - - 12 - labProductCode1Foreign @@ -786,6 +759,12 @@ labSubmitVer + + 1 + + + 67, 16 + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -816,8 +795,8 @@ 15 - - gboxParental + + 94, 19 gboxNandSize @@ -922,7 +901,7 @@ gboxForeign - 5 + 4 Error of Timing @@ -948,9 +927,6 @@ NoControl - - gboxNandSize - 4 @@ -988,7 +964,7 @@ gboxParental - 104, 84 + 104, 104 89, 19 @@ -1095,23 +1071,20 @@ 198, 18 - - gboxNandSize - NoControl True - - 66, 100 + + 153, 41 True - - 2 + + 3 23 @@ -1134,9 +1107,6 @@ 7 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 12 @@ -1150,7 +1120,7 @@ labIsCodec - 7 + 6 2 @@ -1171,7 +1141,7 @@ menuStrip1 - 12 + 10 58, 12 @@ -1203,8 +1173,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 27, 12 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 labBracketL @@ -1251,8 +1221,8 @@ 3 - - 3 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 37, 12 @@ -1260,18 +1230,12 @@ 6, 18 - - 11 - 2 Orignal Size - - tboxShopBlock - 5 @@ -1290,9 +1254,6 @@ 0 - - gboxNandSize - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1329,17 +1290,14 @@ 3 - - Right - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 46, 19 - - 8 + + stripMaster 82, 18 @@ -1389,9 +1347,6 @@ True - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 125, 19 @@ -1425,9 +1380,6 @@ A (All ages) - - 94, 19 - 2 @@ -1539,8 +1491,8 @@ (Arbitrary) - - tboxFax1 + + 89, 19 3 @@ -1590,9 +1542,6 @@ 66, 12 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tboxTel1 @@ -1623,9 +1572,6 @@ True - - B (aged 12 or older) - 6 @@ -1653,8 +1599,8 @@ True - - 67, 16 + + tboxFax1 18, 19 @@ -1731,12 +1677,15 @@ 36 - - 1 + + tboxIsGameCardOn 165, 68 + + 23, 152 + labCompany2 @@ -1800,9 +1749,6 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gboxNandSize - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1890,6 +1836,9 @@ 1 + + 5 + TWL Extended Info @@ -1902,9 +1851,6 @@ Right - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 6 @@ -1936,7 +1882,7 @@ 10 - 24 + 20 gboxParental @@ -1960,17 +1906,14 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 19 + 17 - - gboxSrl + + aged 16 or older 261, 19 - - labShopBlock - labCompany1 @@ -2037,8 +1980,8 @@ h - - 53, 91 + + This tab is for checking ROM data. When ROM data is illegal, please check settings of building ROM data. 25, 12 @@ -2127,11 +2070,8 @@ gboxTitleID - - 36, 20 - - - 153, 41 + + 52, 20 9 @@ -2166,6 +2106,9 @@ gboxSrl + + 12, 78 + NoControl @@ -2175,11 +2118,11 @@ gboxNandSize - - 4 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - aged 18 or older + + 66, 175 116, 56 @@ -2194,7 +2137,7 @@ Use Shared2 Files - 25 + 21 gboxParental @@ -2271,6 +2214,9 @@ 37 + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 16 @@ -2364,9 +2310,6 @@ 4 - - labShopBlock2 - 5 @@ -2394,9 +2337,6 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 95, 12 - Make a set of submission data @@ -2410,7 +2350,7 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 16 + 14 15, 56 @@ -2445,8 +2385,8 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 66, 200 + + True colErrorName @@ -2485,7 +2425,7 @@ 1 - 9 + 8 12, 93 @@ -2511,8 +2451,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + 0 377, 88 @@ -2604,9 +2544,6 @@ 300 - - 0 - aged 18 or older @@ -2646,9 +2583,6 @@ tboxTitleIDHi - - 13, 169 - False @@ -2818,7 +2752,7 @@ 14, 40 - 11 + 9 System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2829,6 +2763,9 @@ 5 + + Right + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2952,6 +2889,9 @@ 17, 12 + + 8 + CRC @@ -2973,24 +2913,15 @@ 8 - - True - tboxGuideRomInfo All ages - - 24 - 38, 19 - - tboxIsGameCardOn - 4 @@ -3039,8 +2970,8 @@ gboxPerson2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -3078,6 +3009,9 @@ True + + 2 + tabRomInfo @@ -3099,8 +3033,8 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 40, 12 + + tboxSubBannerSizeFS labSDK @@ -3157,7 +3091,7 @@ ESRB - 27 + 23 35 @@ -3234,9 +3168,6 @@ CODEC Mode - - aged 16 or older - stripItemSepMaster1 @@ -3297,6 +3228,9 @@ 101, 252 + + tboxSumSizeMB + tabSubmitInfo @@ -3321,8 +3255,8 @@ 12 - - Right + + aged 18 or older 12 @@ -3378,8 +3312,8 @@ 94, 19 - - 70, 12 + + 225, 102 3 @@ -3480,8 +3414,8 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Right + + gboxNandSize 0 @@ -3492,9 +3426,6 @@ 0 - - 7 - tabTWLInfo @@ -3552,9 +3483,6 @@ 36 - - True - 40 @@ -3627,9 +3555,6 @@ 18, 214 - - 167, 210 - 120, 16 @@ -3661,7 +3586,7 @@ 109, 134 - 31 + 27 gboxNandSize @@ -3684,8 +3609,8 @@ Rating Pending - - 39, 144 + + tabSubmitInfo Rating @@ -3783,6 +3708,9 @@ True + + 4 + True @@ -3831,9 +3759,6 @@ True - - 29 - rUsageDst @@ -3849,6 +3774,9 @@ gboxProd + + Unnecessary Rating (Available Only Tool App) + labNormalRomOffset @@ -3861,8 +3789,8 @@ 45, 12 - - tabMain + + labProductCode1 35, 12 @@ -3975,8 +3903,8 @@ 13 - - True + + 39, 144 777, 482 @@ -3994,7 +3922,7 @@ gboxSrl - 18 + 16 System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -4020,8 +3948,8 @@ 445, 60 - - tboxSumSize + + 96, 19 tabErrorInfo @@ -4032,8 +3960,8 @@ Release Ver. - - 4 + + 1 Input Contact2 @@ -4056,8 +3984,8 @@ 6 - - 18, 94 + + 27, 12 tabRomEditInfo @@ -4077,6 +4005,9 @@ gboxShared2Size + + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 89, 19 @@ -4117,7 +4048,7 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 13 + 11 288, 22 @@ -4281,14 +4212,14 @@ All ages - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6, 21 122, 19 - 22 + 19 225, 161 @@ -4386,8 +4317,8 @@ System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + None 8Mbit FLASH @@ -4395,8 +4326,8 @@ 4Mbit FLASH - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2Mbit FLASH 256Kbit FRAM @@ -4480,7 +4411,7 @@ (NAND Size Used by the ROM) - 17 + 15 tabRomEditInfo @@ -4492,7 +4423,7 @@ 14, 19 - 194, 62 + 194, 68 101, 96 @@ -4533,9 +4464,6 @@ 5 - - True - 37, 12 @@ -4629,17 +4557,14 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - PEGI Portugal - 292, 91 0 - - 66, 175 + + True tboxCaptionEx @@ -4687,7 +4612,7 @@ $this - 30 + 26 13, 44 @@ -4770,12 +4695,12 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 20 - cboxReleaseForeign + + 225, 62 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -4803,8 +4728,8 @@ Other - - 4 + + Submission Ver. stripItemOpenRom @@ -4863,17 +4788,11 @@ 52, 166 - - tboxSubBannerSizeFS - 6 - - 179, 47 - - 28 + 24 Right @@ -4887,9 +4806,6 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 89, 19 - Right @@ -4920,9 +4836,6 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Submission Ver. - ROM Size @@ -4965,20 +4878,17 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gboxNandSize - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 gboxAccess - - 109, 162 + + 12 - 14 + 12 gboxParental @@ -5001,6 +4911,9 @@ combOFLC + + 36, 20 + 50 @@ -5079,6 +4992,9 @@ rUsageSale + + 18, 94 + 0 @@ -5094,8 +5010,8 @@ 4 - - 5 + + 1 3 @@ -5127,21 +5043,18 @@ tboxFurigana2 - - 94, 19 + + 8 - - 12, 78 + + 66, 100 - 15 + 13 271, 6 - - labShopBlockUnit - → @@ -5160,8 +5073,8 @@ 19 - - tboxSumSizeMB + + gboxTWLExInfo NoControl @@ -5175,17 +5088,14 @@ ROM Type - - 96, 19 - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 1 - - tabSubmitInfo + + 109, 162 tboxConnectIcon @@ -5457,6 +5367,9 @@ labCapSubmitVer + + 53, 91 + 15 @@ -5503,7 +5416,7 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 21 + 18 Sum of Above Files @@ -5640,17 +5553,14 @@ 0 - - labProductCode1 + + tboxNormalRomOffset gboxNandSize - - 10 - - - 6, 21 + + True TEL @@ -5715,8 +5625,8 @@ True - - True + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 labLib @@ -5814,8 +5724,8 @@ Launch Date - - 225, 102 + + B (aged 12 or older) 9 @@ -5892,15 +5802,9 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 2 - - 8 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -5940,6 +5844,9 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 66, 200 + System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -6022,7 +5929,7 @@ stripItemSepFile1 - 6 + 5 System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -6030,9 +5937,6 @@ 4 - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - False @@ -6063,8 +5967,8 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + 13, 169 NTSC @@ -6111,8 +6015,8 @@ 6, 12 - - 12 + + True File @@ -6138,9 +6042,6 @@ 9 - - 392, 213 - gboxNandSize @@ -6195,21 +6096,12 @@ 12 - - 23 - colWarnEnd - - Blocks - 25 - - 8 - Open a ROM data file @@ -6240,9 +6132,15 @@ 1 + + 4 + 39 + + gboxParental + 251, 171 @@ -6312,8 +6210,8 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 5 + + 25 True @@ -6325,7 +6223,7 @@ 2 - 8 + 7 labProductNameLimit @@ -6423,17 +6321,17 @@ Other - - None + + True 6, 45 - - (1Block = 128KB) + + 179, 47 - - 2Mbit FLASH + + PEGI Portugal tabSubmitInfo @@ -6453,9 +6351,6 @@ 38, 12 - - This tab is for checking ROM data. When ROM data is illegal, please check settings of building ROM data. - 26 @@ -6495,8 +6390,8 @@ 109, 190 - - e-mail + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 gboxPerson1 @@ -6504,14 +6399,11 @@ MiddleRight - - True - labSumSize2 - 522, 245 + 522, 214 167, 22 @@ -6531,8 +6423,8 @@ 4, 21 - - Unnecessary Rating (Available Only Tool App) + + 11 gboxPerson2 @@ -6570,8 +6462,8 @@ 66, 200 - - 29 + + True True @@ -6669,6 +6561,9 @@ 2 + + e-mail + Game Title @@ -6702,6 +6597,9 @@ 3 + + tboxSumSize + gboxUsage @@ -6828,8 +6726,8 @@ 6, 50 - - Used Blocks + + 12 True @@ -6843,8 +6741,8 @@ Right - - 23, 152 + + Right System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -6888,9 +6786,6 @@ 4Kbit EEPROM - - True - tabRomInfo diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index 386ab66..7081f3e 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -358,12 +358,9 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) //resources->ApplyResources(this->tboxGuideDLCategory, L"tboxGuideDLCategory"); //resources->ApplyResources(this->gboxDLCategory, L"gboxDLCategory"); resources->ApplyResources(this->tboxGuideNandSizeInfo, L"tboxGuideNandSizeInfo"); - resources->ApplyResources(this->labShopBlockUnit, L"labShopBlockUnit"); resources->ApplyResources(this->gboxNandSize, L"gboxNandSize"); resources->ApplyResources(this->labNandSize, L"labNandSize"); - resources->ApplyResources(this->labShopBlock2, L"labShopBlock2"); resources->ApplyResources(this->labNandSizeFS, L"labNandSizeFS"); - resources->ApplyResources(this->labShopBlock, L"labShopBlock"); resources->ApplyResources(this->labSrlSize, L"labSrlSize"); resources->ApplyResources(this->labSumSize2, L"labSumSize2"); resources->ApplyResources(this->labSumSize, L"labSumSize"); diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index 8e41ecd..1ce22b9 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -128,7 +128,6 @@ void Form1::setSrlForms(void) this->tboxSumSize->Text = MasterEditorTWL::transSizeToStringKB( this->hSrl->hNandUsedSize->NandUsedSize ); //this->tboxSumSizeMB->Text = MasterEditorTWL::transSizeToStringMB( this->hSrl->hNandUsedSize->NandUsedSize, 2 ); this->tboxSumSizeMB->Text = MasterEditorTWL::transSizeToStringMB( this->hSrl->hNandUsedSize->NandUsedSize ); - this->tboxShopBlock->Text = this->hSrl->hNandUsedSize->NandUsedSizeBlock.ToString(); // Av if( this->hSrl->IsMediaNand ) diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp index 6bcb5b3..0c5c7de 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/deliverable.cpp @@ -530,10 +530,6 @@ ECDeliverableResult RCDeliverable::writeSpreadsheet( //node->FirstChild->Value = MasterEditorTWL::transSizeToStringMB( hSrl->hNandUsedSize->NandUsedSize, 2 ); node->FirstChild->Value = MasterEditorTWL::transSizeToStringMB( hSrl->hNandUsedSize->NandUsedSize ); } - if( node->FirstChild->Value->Equals( "TagHWBlocks" ) ) - { - node->FirstChild->Value = hSrl->hNandUsedSize->NandUsedSizeBlock.ToString(); - } // SRLɓo^ȂROMdl if( node->FirstChild->Value->Equals( "TagIsUGC" ) ) diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml index c34e69a..5a11fec 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml +++ b/build/tools/MasterEditor/MasterEditorTWL/resource/sheet_templete.xml @@ -69,13 +69,14 @@ - -