diff --git a/src/editors/xrWeatherEditor/window_ide.h b/src/editors/xrWeatherEditor/window_ide.h index 015e0a36bb6..29439f5b40f 100644 --- a/src/editors/xrWeatherEditor/window_ide.h +++ b/src/editors/xrWeatherEditor/window_ide.h @@ -6,6 +6,11 @@ using namespace System::Collections; using namespace System::Data; using namespace System::Drawing; +namespace editor +{ +ref class window_ide; +} + namespace XRay { namespace Editor @@ -15,11 +20,6 @@ class engine_base; } // namespace Editor } // namespace XRay -namespace editor -{ -ref class window_ide; -} - namespace WeifenLuo { namespace WinFormsUI @@ -88,21 +88,20 @@ public ref class window_ide : public System::Windows::Forms::Form { this->EditorDock = (gcnew WeifenLuo::WinFormsUI::DockPanel()); this->SuspendLayout(); - // - // Editor - // + // + // EditorDock + // this->EditorDock->ActiveAutoHideContent = nullptr; this->EditorDock->Dock = System::Windows::Forms::DockStyle::Fill; this->EditorDock->DocumentStyle = WeifenLuo::WinFormsUI::DocumentStyles::DockingSdi; - this->EditorDock->Font = (gcnew System::Drawing::Font( - L"Tahoma", 11, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::World)); + this->EditorDock->Font = (gcnew System::Drawing::Font(L"Tahoma", 11, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::World)); this->EditorDock->Location = System::Drawing::Point(0, 0); - this->EditorDock->Name = L"Editor"; + this->EditorDock->Name = L"EditorDock"; this->EditorDock->Size = System::Drawing::Size(632, 453); this->EditorDock->TabIndex = 17; - // + // // window_ide - // + // this->AutoScaleDimensions = System::Drawing::SizeF(6, 13); this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font; this->ClientSize = System::Drawing::Size(632, 453); @@ -110,13 +109,13 @@ public ref class window_ide : public System::Windows::Forms::Form this->Name = L"window_ide"; this->StartPosition = System::Windows::Forms::FormStartPosition::Manual; this->Text = L"editor"; - this->Deactivate += gcnew System::EventHandler(this, &window_ide::window_ide_Deactivate); - this->SizeChanged += gcnew System::EventHandler(this, &window_ide::window_ide_SizeChanged); this->Activated += gcnew System::EventHandler(this, &window_ide::window_ide_Activated); - this->FormClosing += - gcnew System::Windows::Forms::FormClosingEventHandler(this, &window_ide::window_ide_FormClosing); + this->Deactivate += gcnew System::EventHandler(this, &window_ide::window_ide_Deactivate); + this->FormClosing += gcnew System::Windows::Forms::FormClosingEventHandler(this, &window_ide::window_ide_FormClosing); this->LocationChanged += gcnew System::EventHandler(this, &window_ide::window_ide_LocationChanged); + this->SizeChanged += gcnew System::EventHandler(this, &window_ide::window_ide_SizeChanged); this->ResumeLayout(false); + } #pragma endregion protected: diff --git a/src/editors/xrWeatherEditor/window_levels.h b/src/editors/xrWeatherEditor/window_levels.h index 4042914318f..a2016015455 100644 --- a/src/editors/xrWeatherEditor/window_levels.h +++ b/src/editors/xrWeatherEditor/window_levels.h @@ -63,33 +63,27 @@ ref class window_levels : public WeifenLuo::WinFormsUI::DockContent { this->PropertyGrid = (gcnew XRay::SdkControls::PropertyGrid()); this->SuspendLayout(); - // - // PropertyGrid - // this->PropertyGrid->Dock = System::Windows::Forms::DockStyle::Fill; this->PropertyGrid->Location = System::Drawing::Point(0, 0); this->PropertyGrid->Name = L"PropertyGrid"; this->PropertyGrid->Size = System::Drawing::Size(292, 273); this->PropertyGrid->TabIndex = 0; this->PropertyGrid->ToolbarVisible = false; - // - // window_levels - // this->AutoScaleDimensions = System::Drawing::SizeF(6, 13); this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font; this->ClientSize = System::Drawing::Size(292, 273); this->Controls->Add(this->PropertyGrid); - this->DockableAreas = static_cast( - ((((WeifenLuo::WinFormsUI::DockAreas::Float | WeifenLuo::WinFormsUI::DockAreas::DockLeft) | - WeifenLuo::WinFormsUI::DockAreas::DockRight) | - WeifenLuo::WinFormsUI::DockAreas::DockTop) | - WeifenLuo::WinFormsUI::DockAreas::DockBottom)); + this->DockableAreas = static_cast(((((WeifenLuo::WinFormsUI::DockAreas::Float | WeifenLuo::WinFormsUI::DockAreas::DockLeft) + | WeifenLuo::WinFormsUI::DockAreas::DockRight) + | WeifenLuo::WinFormsUI::DockAreas::DockTop) + | WeifenLuo::WinFormsUI::DockAreas::DockBottom)); this->HideOnClose = true; this->Name = L"window_levels"; this->TabText = L"level weathers"; this->Text = L"level weathers"; this->Leave += gcnew System::EventHandler(this, &window_levels::window_levels_Leave); this->ResumeLayout(false); + } #pragma endregion private: diff --git a/src/editors/xrWeatherEditor/window_levels.resx b/src/editors/xrWeatherEditor/window_levels.resx index 19dc0dd8b39..d58980a38d7 100644 --- a/src/editors/xrWeatherEditor/window_levels.resx +++ b/src/editors/xrWeatherEditor/window_levels.resx @@ -112,9 +112,9 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/src/editors/xrWeatherEditor/window_tree_values.h b/src/editors/xrWeatherEditor/window_tree_values.h index a1cba185ba5..46a49d4ee64 100644 --- a/src/editors/xrWeatherEditor/window_tree_values.h +++ b/src/editors/xrWeatherEditor/window_tree_values.h @@ -103,8 +103,7 @@ ref class window_tree_values : public System::Windows::Forms::Form void InitializeComponent(void) { this->components = (gcnew System::ComponentModel::Container()); - System::ComponentModel::ComponentResourceManager ^ resources = - (gcnew System::ComponentModel::ComponentResourceManager(window_tree_values::typeid)); + System::ComponentModel::ComponentResourceManager^ resources = (gcnew System::ComponentModel::ComponentResourceManager(window_tree_values::typeid)); this->panel2 = (gcnew System::Windows::Forms::Panel()); this->panel3 = (gcnew System::Windows::Forms::Panel()); this->panel4 = (gcnew System::Windows::Forms::Panel()); @@ -124,41 +123,41 @@ ref class window_tree_values : public System::Windows::Forms::Form this->panel10->SuspendLayout(); this->panel8->SuspendLayout(); this->SuspendLayout(); - // + // // panel2 - // + // this->panel2->Dock = System::Windows::Forms::DockStyle::Left; this->panel2->Location = System::Drawing::Point(0, 0); this->panel2->Name = L"panel2"; this->panel2->Size = System::Drawing::Size(10, 383); this->panel2->TabIndex = 1; - // + // // panel3 - // + // this->panel3->Dock = System::Windows::Forms::DockStyle::Right; this->panel3->Location = System::Drawing::Point(489, 0); this->panel3->Name = L"panel3"; this->panel3->Size = System::Drawing::Size(10, 383); this->panel3->TabIndex = 2; - // + // // panel4 - // + // this->panel4->Dock = System::Windows::Forms::DockStyle::Bottom; this->panel4->Location = System::Drawing::Point(10, 373); this->panel4->Name = L"panel4"; this->panel4->Size = System::Drawing::Size(479, 10); this->panel4->TabIndex = 3; - // + // // panel1 - // + // this->panel1->Dock = System::Windows::Forms::DockStyle::Top; this->panel1->Location = System::Drawing::Point(10, 0); this->panel1->Name = L"panel1"; this->panel1->Size = System::Drawing::Size(479, 10); this->panel1->TabIndex = 4; - // + // // panel5 - // + // this->panel5->Controls->Add(this->TreeView); this->panel5->Controls->Add(this->panel7); this->panel5->Controls->Add(this->panel6); @@ -167,9 +166,9 @@ ref class window_tree_values : public System::Windows::Forms::Form this->panel5->Name = L"panel5"; this->panel5->Size = System::Drawing::Size(479, 363); this->panel5->TabIndex = 5; - // + // // TreeView - // + // this->TreeView->Dock = System::Windows::Forms::DockStyle::Fill; this->TreeView->HideSelection = false; this->TreeView->ImageIndex = 0; @@ -179,34 +178,29 @@ ref class window_tree_values : public System::Windows::Forms::Form this->TreeView->SelectedImageIndex = 0; this->TreeView->Size = System::Drawing::Size(479, 327); this->TreeView->TabIndex = 0; - this->TreeView->MouseDoubleClick += - gcnew System::Windows::Forms::MouseEventHandler(this, &window_tree_values::TreeView_MouseDoubleClick); - this->TreeView->AfterCollapse += - gcnew System::Windows::Forms::TreeViewEventHandler(this, &window_tree_values::TreeView_AfterCollapse); - this->TreeView->MouseClick += - gcnew System::Windows::Forms::MouseEventHandler(this, &window_tree_values::TreeView_MouseClick); - this->TreeView->AfterExpand += - gcnew System::Windows::Forms::TreeViewEventHandler(this, &window_tree_values::TreeView_AfterExpand); - // + this->TreeView->AfterCollapse += gcnew System::Windows::Forms::TreeViewEventHandler(this, &window_tree_values::TreeView_AfterCollapse); + this->TreeView->AfterExpand += gcnew System::Windows::Forms::TreeViewEventHandler(this, &window_tree_values::TreeView_AfterExpand); + this->TreeView->MouseClick += gcnew System::Windows::Forms::MouseEventHandler(this, &window_tree_values::TreeView_MouseClick); + this->TreeView->MouseDoubleClick += gcnew System::Windows::Forms::MouseEventHandler(this, &window_tree_values::TreeView_MouseDoubleClick); + // // Images - // - this->Images->ImageStream = - (cli::safe_cast(resources->GetObject(L"Images.ImageStream"))); + // + this->Images->ImageStream = (cli::safe_cast(resources->GetObject(L"Images.ImageStream"))); this->Images->TransparentColor = System::Drawing::Color::Fuchsia; this->Images->Images->SetKeyName(0, L"filter_closed.bmp"); this->Images->Images->SetKeyName(1, L"filter_opened.bmp"); this->Images->Images->SetKeyName(2, L"Document.bmp"); - // + // // panel7 - // + // this->panel7->Dock = System::Windows::Forms::DockStyle::Bottom; this->panel7->Location = System::Drawing::Point(0, 327); this->panel7->Name = L"panel7"; this->panel7->Size = System::Drawing::Size(479, 10); this->panel7->TabIndex = 1; - // + // // panel6 - // + // this->panel6->Controls->Add(this->panel10); this->panel6->Controls->Add(this->panel8); this->panel6->Dock = System::Windows::Forms::DockStyle::Bottom; @@ -214,27 +208,27 @@ ref class window_tree_values : public System::Windows::Forms::Form this->panel6->Name = L"panel6"; this->panel6->Size = System::Drawing::Size(479, 26); this->panel6->TabIndex = 0; - // + // // panel10 - // + // this->panel10->Controls->Add(this->TextBox); this->panel10->Dock = System::Windows::Forms::DockStyle::Fill; this->panel10->Location = System::Drawing::Point(0, 0); this->panel10->Name = L"panel10"; this->panel10->Size = System::Drawing::Size(313, 26); this->panel10->TabIndex = 6; - // + // // TextBox - // + // this->TextBox->Dock = System::Windows::Forms::DockStyle::Fill; this->TextBox->Location = System::Drawing::Point(0, 0); this->TextBox->Name = L"TextBox"; this->TextBox->ReadOnly = true; this->TextBox->Size = System::Drawing::Size(313, 21); this->TextBox->TabIndex = 6; - // + // // panel8 - // + // this->panel8->Controls->Add(this->OK_Button); this->panel8->Controls->Add(this->Cancel_Button); this->panel8->Dock = System::Windows::Forms::DockStyle::Right; @@ -242,9 +236,9 @@ ref class window_tree_values : public System::Windows::Forms::Form this->panel8->Name = L"panel8"; this->panel8->Size = System::Drawing::Size(166, 26); this->panel8->TabIndex = 4; - // + // // OK_Button - // + // this->OK_Button->DialogResult = System::Windows::Forms::DialogResult::OK; this->OK_Button->Location = System::Drawing::Point(8, 0); this->OK_Button->Name = L"OK_Button"; @@ -252,9 +246,9 @@ ref class window_tree_values : public System::Windows::Forms::Form this->OK_Button->TabIndex = 3; this->OK_Button->Text = L"&OK"; this->OK_Button->UseVisualStyleBackColor = true; - // + // // Cancel_Button - // + // this->Cancel_Button->DialogResult = System::Windows::Forms::DialogResult::Cancel; this->Cancel_Button->Location = System::Drawing::Point(91, 0); this->Cancel_Button->Name = L"Cancel_Button"; @@ -262,9 +256,9 @@ ref class window_tree_values : public System::Windows::Forms::Form this->Cancel_Button->TabIndex = 4; this->Cancel_Button->Text = L"&Cancel"; this->Cancel_Button->UseVisualStyleBackColor = true; - // + // // window_tree_values - // + // this->AcceptButton = this->OK_Button; this->AutoScaleDimensions = System::Drawing::SizeF(6, 13); this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font; @@ -275,8 +269,8 @@ ref class window_tree_values : public System::Windows::Forms::Form this->Controls->Add(this->panel4); this->Controls->Add(this->panel3); this->Controls->Add(this->panel2); - this->Font = (gcnew System::Drawing::Font(L"Tahoma", 8.25F, System::Drawing::FontStyle::Regular, - System::Drawing::GraphicsUnit::Point, static_cast(204))); + this->Font = (gcnew System::Drawing::Font(L"Tahoma", 8.25F, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, + static_cast(204))); this->MaximizeBox = false; this->MinimizeBox = false; this->Name = L"window_tree_values"; @@ -290,6 +284,7 @@ ref class window_tree_values : public System::Windows::Forms::Form this->panel10->PerformLayout(); this->panel8->ResumeLayout(false); this->ResumeLayout(false); + } #pragma endregion public: diff --git a/src/editors/xrWeatherEditor/window_tree_values.resx b/src/editors/xrWeatherEditor/window_tree_values.resx index 3a8c5da7896..6541e6af889 100644 --- a/src/editors/xrWeatherEditor/window_tree_values.resx +++ b/src/editors/xrWeatherEditor/window_tree_values.resx @@ -112,76 +112,76 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABc - DgAAAk1TRnQBSQFMAgEBAwEAAQQBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA - AwABEAMAAQEBAAEgBgABEP8AmwABtwGiAZMB/wFtAVMBPwH/AW0BUwE/Af8BbQFTAT8B/wFtAVMBPwH/ - AW0BUwE/Af8BbQFTAT8B/wFtAVMBPwH/AW0BUwE/Af8BbQFTAT8B/wFtAVMBPwH/UAABgAGEAY8B/wF3 - AYEBhQH/AWsBeAGBAf8BXAFoAXEB/wFNAVcBXwH/ATwBRQFMAf8BLgE1ATsB/wEhAScBLAH/ARkBHgEj - Af8BGQEeASMB/wEZAR4BIwH/ARkBHgEjAf8BGQEeASMB/wEZAR4BIwH/ARkBHgEjAf8BgAGEAY8B/wFx - AYEBjwH/AWsBgQGHAf8BYgF5AYEB/wFZAW0BegH/AU8BYQFsAf8BRAFTAV0B/wE5AUUBTgH/ATABOQFA - Af8BJgEtATQB/wEfASQBKQH/ARkBHQEhAf8BGQEeASMB/xQAAbcBogGTBf8BtwGiAZMB/wG3AaIBkwH/ - AbcBogGTAf8BtwGiAZMB/wG3AaIBkwH/AbcBogGTAf8BtwGiAZMB/wG3AaIBkwH/AW0BUwE/Af9QAAGB - AYcBkgH/AaIB3wHwAf8BewHNAeoB/wFUAbgB4gH/AUIBrgHbAf8BOAGpAdkB/wExAaEB0gH/ASwBmAHH - Af8BKwGOAbwB/wEpAYMBrgH/ASQBgQGrAf8BIAGBAakB/wEmAYEBnwH/ASoBfQGWAf8BIQEnASwB/wGB - AYcBkgH/AYkBoQGrAf8BdQGyAdQB/wELAY8BzQH/AQsBjwHNAf8BCwGPAc0B/wEPAYwBxwH/ARMBiAG+ - Af8BGgGCAbQB/wEgAYEBqQH/ASYBgQGfAf8BKgF9AZYB/wEtAVYBZwH/AZsBrQG1Af8QAAG3AaIBkwn/ - AfwB+gH5Af8B9wHxAe4B/wHxAecB4QH/AewB3QHVAf8B5gHTAckB/wHhAcoBvQH/AbcBogGTAf8BbQFT - AT8B/1AAAYEBigGVAf8BqgHoAfYB/wGVAeUB/AH/AYQB3wH7Af8BgAHWAfoB/wF1AdAB9wH/AWgBxgH0 - Af8BWwG+AfAB/wFMAbQB7AH/AUABqgHoAf8BNgGkAeYB/wErAZoB3wH/ASEBkAHXAf8BJgGBAZ8B/wEr - ATIBOAH/AYEBigGVAf8BgQG+AdMB/wGKAaQBrgH/AYEB3AL/AWoBzwL/AWABywL/AVcBxAH6Af8BTAG8 - AfUB/wFCAbMB8AH/ATkBqgHrAf8BLwGgAeUB/wEeAYwB1AH/AS4BcgGBAf8BaQF0AXgB/xAAAbcBogGT - Cf8D/gH/AfoB9wH1Af8B9QHtAekB/wHvAeMB3AH/AeoB2QHRAf8B5AHPAcQB/wG3AaIBkwH/AW0BUwE/ - Af9QAAGBAY4BmAH/AbAB6gH2Af8BnwHpAfsB/wGSAeQB/AH/AYEB3QH7Af8BgAHWAfoB/wFzAc4B9wH/ - AWgBxgH0Af8BWAG8AfAB/wFMAbQB7AH/AUABqgHoAf8BNQGjAeYB/wEoAZYB3AH/ASABgQGpAf8BOAE/ - AUYB/wGBAY4BmAH/AYEB0gHsAf8BiwGkAa0B/wGJAcIBzgH/AXwB2AL/AXAB0wL/AWcBzgL/AVwByQH+ - Af8BVAHBAfoB/wFKAbkB9QH/AT8BsAHuAf8BNAGoAekB/wEbAYUBzQH/AS0BVgFmAf8BsgHAAcYB/wwA - AbcBogGTDf8B/QH8AfsB/wH4AfMB8AH/AfIB6QHjAf8B7QHfAdgB/wHnAdUBywH/AbcBogGTAf8BbQFT - AT8B/1AAAYEBkQGcAf8BtgHtAfgB/wGqAewB+wH/AZsB6AH7Af8BjwHjAfwB/wGBAd0B+wH/AXwB1QH5 - Af8BcwHOAfcB/wFmAcUB9AH/AVgBvAHwAf8BSAGyAewB/wE9AakB6AH/AS8BngHiAf8BGwGCAbQB/wFG - AU4BVgH/AYEBkQGcAf8BgQHXAe8B/wGBAcUB4AH/AYwBpgGwAf8BgQHdAf4B/wFzAdMC/wFyAdQC/wFt - AdEC/wFjAc0C/wFZAccB/AH/AVEBvgH3Af8BRgG2AfIB/wE8AawB7AH/ATABdAGBAf8BgQGVAaEB/wwA - AboBpQGWEf8B+wH4AfcB/wH2Ae8B6wH/AfAB5QHfAf8B6wHbAdMB/wG3AaIBkwH/AW0BUwE/Af9QAAGD - AZUBnwH/Ab4B8AH5Af8BqwHwAfcB/wGlAewB+wH/AZgB5wH7Af8BiQHhAfwB/wGBAd0B+wH/AXwB1QH5 - Af8BcAHNAfcB/wFjAcQB8wH/AVYBuwHwAf8BSAGyAewB/wE3AaQB4wH/ARcBigG/Af8BVAFeAWcB/wGD - AZUBnwH/AYkB3AHxAf8BjAHiAv8BjQGoAbEB/wGMAboBxwH/AX8B2AL/AXIB1AL/AXIB1AL/AXIB1AL/ - AWoB0AL/AV8BzQL/AVYBxQH8Af8BTAG7AfcB/wE5AaIB2wH/AVwBcgF/Af8BsgHAAcYB/wgAAb4BqQGa - Ef8B/gH9AfwB/wH5AfUB8gH/AfQB6wHmAf8B7gHhAdoB/wG3AaIBkwH/AW0BUwE/Af9QAAGGAZkBowH/ - Ab4B8AH5Af8BtgHtAfgB/wGwAe4B+gH/AaQB6wH6Af8BlQHmAfsB/wGJAeEB/AH/AYEB3AH8Af8BfAHV - AfkB/wFwAc0B9wH/AWMBxAHzAf8BVAG5Ae8B/wFAAakB5wH/ARcBjwHHAf8BYgFuAXYB/wGGAZoBowH/ + DgAAAk1TRnQBSQFMAgEBAwEAASQBAAEkAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + AwABEAMAAQEBAAEgBgABEP8AmwABtwGiAZMB/wFpAU8BOwH/AWkBTwE7Af8BaQFPATsB/wFpAU8BOwH/ + AWkBTwE7Af8BaQFPATsB/wFpAU8BOwH/AWkBTwE7Af8BaQFPATsB/wFpAU8BOwH/UAABgAGEAY8B/wFz + AYEBhQH/AWcBdAGBAf8BWAFkAW0B/wFJAVMBWwH/ATgBQQFIAf8BKgExATcB/wEdASMBKAH/ARUBGgEf + Af8BFQEaAR8B/wEVARoBHwH/ARUBGgEfAf8BFQEaAR8B/wEVARoBHwH/ARUBGgEfAf8BgAGEAY8B/wFt + AYEBjwH/AWcBgQGHAf8BXgF1AYEB/wFVAWkBdgH/AUsBXQFoAf8BQAFPAVkB/wE1AUEBSgH/ASwBNQE8 + Af8BIgEpATAB/wEbASABJQH/ARUBGQEdAf8BFQEaAR8B/xQAAbcBogGTBf8BtwGiAZMB/wG3AaIBkwH/ + AbcBogGTAf8BtwGiAZMB/wG3AaIBkwH/AbcBogGTAf8BtwGiAZMB/wG3AaIBkwH/AWkBTwE7Af9QAAGB + AYcBkgH/AaIB3wHwAf8BdwHNAeoB/wFQAbgB4gH/AT4BrgHbAf8BNAGpAdkB/wEtAaEB0gH/ASgBmAHH + Af8BJwGOAbwB/wElAYMBrgH/ASABgQGrAf8BHAGBAakB/wEiAYEBnwH/ASYBeQGWAf8BHQEjASgB/wGB + AYcBkgH/AYkBoQGrAf8BcQGyAdQB/wEHAY8BzQH/AQcBjwHNAf8BBwGPAc0B/wELAYwBxwH/AQ8BiAG+ + Af8BFgGCAbQB/wEcAYEBqQH/ASIBgQGfAf8BJgF5AZYB/wEpAVIBYwH/AZsBrQG1Af8QAAG3AaIBkwn/ + AfwB+gH5Af8B9wHxAe4B/wHxAecB4QH/AewB3QHVAf8B5gHTAckB/wHhAcoBvQH/AbcBogGTAf8BaQFP + ATsB/1AAAYEBigGVAf8BqgHoAfYB/wGVAeUB/AH/AYQB3wH7Af8BgAHWAfoB/wFxAdAB9wH/AWQBxgH0 + Af8BVwG+AfAB/wFIAbQB7AH/ATwBqgHoAf8BMgGkAeYB/wEnAZoB3wH/AR0BkAHXAf8BIgGBAZ8B/wEn + AS4BNAH/AYEBigGVAf8BgQG+AdMB/wGKAaQBrgH/AYEB3AL/AWYBzwL/AVwBywL/AVMBxAH6Af8BSAG8 + AfUB/wE+AbMB8AH/ATUBqgHrAf8BKwGgAeUB/wEaAYwB1AH/ASoBbgGBAf8BZQFwAXQB/xAAAbcBogGT + Cf8D/gH/AfoB9wH1Af8B9QHtAekB/wHvAeMB3AH/AeoB2QHRAf8B5AHPAcQB/wG3AaIBkwH/AWkBTwE7 + Af9QAAGBAY4BmAH/AbAB6gH2Af8BnwHpAfsB/wGSAeQB/AH/AYEB3QH7Af8BgAHWAfoB/wFvAc4B9wH/ + AWQBxgH0Af8BVAG8AfAB/wFIAbQB7AH/ATwBqgHoAf8BMQGjAeYB/wEkAZYB3AH/ARwBgQGpAf8BNAE7 + AUIB/wGBAY4BmAH/AYEB0gHsAf8BiwGkAa0B/wGJAcIBzgH/AXgB2AL/AWwB0wL/AWMBzgL/AVgByQH+ + Af8BUAHBAfoB/wFGAbkB9QH/ATsBsAHuAf8BMAGoAekB/wEXAYUBzQH/ASkBUgFiAf8BsgHAAcYB/wwA + AbcBogGTDf8B/QH8AfsB/wH4AfMB8AH/AfIB6QHjAf8B7QHfAdgB/wHnAdUBywH/AbcBogGTAf8BaQFP + ATsB/1AAAYEBkQGcAf8BtgHtAfgB/wGqAewB+wH/AZsB6AH7Af8BjwHjAfwB/wGBAd0B+wH/AXgB1QH5 + Af8BbwHOAfcB/wFiAcUB9AH/AVQBvAHwAf8BRAGyAewB/wE5AakB6AH/ASsBngHiAf8BFwGCAbQB/wFC + AUoBUgH/AYEBkQGcAf8BgQHXAe8B/wGBAcUB4AH/AYwBpgGwAf8BgQHdAf4B/wFvAdMC/wFuAdQC/wFp + AdEC/wFfAc0C/wFVAccB/AH/AU0BvgH3Af8BQgG2AfIB/wE4AawB7AH/ASwBcAGBAf8BgQGVAaEB/wwA + AboBpQGWEf8B+wH4AfcB/wH2Ae8B6wH/AfAB5QHfAf8B6wHbAdMB/wG3AaIBkwH/AWkBTwE7Af9QAAGD + AZUBnwH/Ab4B8AH5Af8BqwHwAfcB/wGlAewB+wH/AZgB5wH7Af8BiQHhAfwB/wGBAd0B+wH/AXgB1QH5 + Af8BbAHNAfcB/wFfAcQB8wH/AVIBuwHwAf8BRAGyAewB/wEzAaQB4wH/ARMBigG/Af8BUAFaAWMB/wGD + AZUBnwH/AYkB3AHxAf8BjAHiAv8BjQGoAbEB/wGMAboBxwH/AXsB2AL/AW4B1AL/AW4B1AL/AW4B1AL/ + AWYB0AL/AVsBzQL/AVIBxQH8Af8BSAG7AfcB/wE1AaIB2wH/AVgBbgF7Af8BsgHAAcYB/wgAAb4BqQGa + Ef8B/gH9AfwB/wH5AfUB8gH/AfQB6wHmAf8B7gHhAdoB/wG3AaIBkwH/AWkBTwE7Af9QAAGGAZkBowH/ + Ab4B8AH5Af8BtgHtAfgB/wGwAe4B+gH/AaQB6wH6Af8BlQHmAfsB/wGJAeEB/AH/AYEB3AH8Af8BeAHV + AfkB/wFsAc0B9wH/AV8BxAHzAf8BUAG5Ae8B/wE8AakB5wH/ARMBjwHHAf8BXgFqAXIB/wGGAZoBowH/ AZIB4QHyAf8BmAHoAf0B/wGBAcQB3gH/AY4BpwGwAf8BgQHeAf0B/wGEAeAC/wGEAeAC/wGEAeAC/wGE - AeAC/wGBAd8C/wGBAd0C/wF/AdgC/wF2AdYC/wFhAakB0QH/AY8BmwGkAf8IAAHDAa4BnhX/AfwB+gH5 - Af8B9wHxAe4B/wHxAecB4QH/AbcBogGTAf8BbQFTAT8B/1AAAYkBnAGmAf8BvgHwAfkB/wG2Ae0B+AH/ - AbYB7QH4Af8BqwHwAfcB/wGiAewB+gH/AZUB5gH7Af8BiQHhAfwB/wGBAdwB/AH/AXoB0wH6Af8BbgHM - AfcB/wFgAcMB8wH/AVQBuQHvAf8BJAGZAc8B/wFuAXsBgQH/AYgBnAGlAf8BmgHmAfMB/wGfAesB+wH/ + AeAC/wGBAd8C/wGBAd0C/wF7AdgC/wFyAdYC/wFdAakB0QH/AY8BmwGkAf8IAAHDAa4BnhX/AfwB+gH5 + Af8B9wHxAe4B/wHxAecB4QH/AbcBogGTAf8BaQFPATsB/1AAAYkBnAGmAf8BvgHwAfkB/wG2Ae0B+AH/ + AbYB7QH4Af8BqwHwAfcB/wGiAewB+gH/AZUB5gH7Af8BiQHhAfwB/wGBAdwB/AH/AXYB0wH6Af8BagHM + AfcB/wFcAcMB8wH/AVABuQHvAf8BIAGZAc8B/wFqAXcBgQH/AYgBnAGlAf8BmgHmAfMB/wGfAesB+wH/ AZgB6AH+Af8BiwGsAbkB/wGLAawBuQH/AYoBqgG3Af8BiAGmAbMB/wGGAaMBrwH/AYMBnwGqAf8BgQGa AaYB/wGBAZUBoQH/AYEBkQGdAf8BgQGOAZkB/wGBAYsBlQH/AYEBiAGTAf8IAAHIAbIBoxX/A/4B/wH6 - AfcB9QH/AfUB7QHpAf8BtwGiAZMB/wFtAVMBPwH/UAABiwGgAagB/wG+AfAB+QH/Ab4B8AH5Af8BvgHw + AfcB9QH/AfUB7QHpAf8BtwGiAZMB/wFpAU8BOwH/UAABiwGgAagB/wG+AfAB+QH/Ab4B8AH5Af8BvgHw AfkB/wG+AfAB+QH/AbQB8gH4Af8BqgHsAfsB/wGgAekB+wH/AZUB5QH8Af8BigHfAfwB/wGBAdgB+wH/ - AX8B0gH4Af8BcwHKAfQB/wFoAcAB8QH/AW4BewGBAf8BiwGgAagB/wGgAeoB9gH/AaYB7gH5Af8BnwHr - AfsB/wGYAegB/gH/AYEB2gL/AXIB1AL/AXIB1AL/AXIB1AL/AXIB1AL/AXIB1AL/AXIB1AL/AYEBiAGT - Af8UAAHMAbYBpxn/Af0B/AH7Af8BtwGiAZMB/wG3AaIBkwH/AW4BVAFAAf9QAAGNAaEBqgH/AY0BoQGq + AXsB0gH4Af8BbwHKAfQB/wFkAcAB8QH/AWoBdwGBAf8BiwGgAagB/wGgAeoB9gH/AaYB7gH5Af8BnwHr + AfsB/wGYAegB/gH/AYEB2gL/AW4B1AL/AW4B1AL/AW4B1AL/AW4B1AL/AW4B1AL/AW4B1AL/AYEBiAGT + Af8UAAHMAbYBpxn/Af0B/AH7Af8BtwGiAZMB/wG3AaIBkwH/AWoBUAE8Af9QAAGNAaEBqgH/AY0BoQGq Af8BjQGhAaoB/wGNAaEBqgH/AY0BoQGqAf8BiwGfAagB/wGJAZwBpgH/AYkBmwGmAf8BhwGaAaQB/wGG AZkBowH/AYQBlgGgAf8BhAGWAaAB/wGDAZUBoAH/AYMBlQGgAf8BgAGEAY8B/wGOAaIBqwH/AacB7gH2 - Af8BqwHwAfcB/wGmAe4B+QH/AZ8B6wH7Af8BmAHoAf0B/wF8AdQB+wH/AYkBngGnAf8BhgGZAaMB/wGC - AZQBnwH/AYEBkAGaAf8BgQGMAZcB/wGBAYgBkwH/FAAB0QG7AasZ/wG3AaIBkwH/AW4BVAFAAf8BbgFU - AUAB/wFuAVQBQAH/UAABjwGkAawB/wGyAeQB7AH/AbYB7QH4Af8BtgHtAfgB/wGpAewB9gH/AZIB4QHz + Af8BqwHwAfcB/wGmAe4B+QH/AZ8B6wH7Af8BmAHoAf0B/wF4AdQB+wH/AYkBngGnAf8BhgGZAaMB/wGC + AZQBnwH/AYEBkAGaAf8BgQGMAZcB/wGBAYgBkwH/FAAB0QG7AasZ/wG3AaIBkwH/AWoBUAE8Af8BagFQ + ATwB/wFqAVABPAH/UAABjwGkAawB/wGyAeQB7AH/AbYB7QH4Af8BtgHtAfgB/wGpAewB9gH/AZIB4QHz Af8BjQGhAaoB/wHVAdwB4AH/HAABjwGkAawB/wGgAdIB2gH/AasB8AH3Af8BqwHwAfcB/wGmAe4B+QH/ - AZ8B6wH7Af8BjQGhAaoB/wHVAdwB4AH/KAAB1QG/Aa8Z/wG5AaQBlQH/AdQBxQG6Af8BbgFUAUAB/wHh + AZ8B6wH7Af8BjQGhAaoB/wHVAdwB4AH/KAAB1QG/Aa8Z/wG5AaQBlQH/AdQBxQG6Af8BagFQATwB/wHh AdUBzQH/UAAB2gHeAeEB/wGPAaQBrAH/AY8BpAGsAf8BjwGkAawB/wGPAaQBrAH/AY8BpAGsAf8B1QHc AeAB/yAAAdoB3gHhAf8BjwGkAawB/wGPAaQBrAH/AY8BpAGsAf8BjwGkAawB/wGPAaQBrAH/AdUB3AHg - Af8sAAHYAcIBshn/AcABqwGcAf8BbgFUAUAB/wHiAdYBzQH/2AAB2AHCAbIB/wHYAcIBsgH/AdgBwgGy + Af8sAAHYAcIBshn/AcABqwGcAf8BagFQATwB/wHiAdYBzQH/2AAB2AHCAbIB/wHYAcIBsgH/AdgBwgGy Af8B2AHCAbIB/wHYAcIBsgH/AdQBvgGuAf8BzwG5AakB/wHJAbMBpAH/AeIB1gHNAf//AFUAAUIBTQE+ BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAb/AgAE/wHAAQcCAAGAAgABBwHAAQcCAAGA AgABAwHAAQcCAAGAAgABAwHAAQcCAAGAAgABAQHAAQcCAAGAAgABAQHAAQcCAAGAAwABwAEHAgABgAMA diff --git a/src/editors/xrWeatherEditor/window_view.h b/src/editors/xrWeatherEditor/window_view.h index 48b7dd36a26..ce193e7aba7 100644 --- a/src/editors/xrWeatherEditor/window_view.h +++ b/src/editors/xrWeatherEditor/window_view.h @@ -75,8 +75,7 @@ ref class window_view : public WeifenLuo::WinFormsUI::DockContent void InitializeComponent(void) { this->components = (gcnew System::ComponentModel::Container()); - System::ComponentModel::ComponentResourceManager ^ resources = - (gcnew System::ComponentModel::ComponentResourceManager(window_view::typeid)); + System::ComponentModel::ComponentResourceManager^ resources = (gcnew System::ComponentModel::ComponentResourceManager(window_view::typeid)); this->MainToolBar = (gcnew System::Windows::Forms::ToolStrip()); this->EditButton = (gcnew System::Windows::Forms::ToolStripButton()); this->PauseButton = (gcnew System::Windows::Forms::ToolStripButton()); @@ -84,42 +83,28 @@ ref class window_view : public WeifenLuo::WinFormsUI::DockContent this->imageList1 = (gcnew System::Windows::Forms::ImageList(this->components)); this->MainToolBar->SuspendLayout(); this->SuspendLayout(); - // - // MainToolBar - // - this->MainToolBar->Items->AddRange( - gcnew cli::array(2){this->EditButton, this->PauseButton}); + this->MainToolBar->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(2) { this->EditButton, this->PauseButton }); this->MainToolBar->Location = System::Drawing::Point(0, 0); this->MainToolBar->Name = L"MainToolBar"; this->MainToolBar->Size = System::Drawing::Size(292, 25); this->MainToolBar->TabIndex = 16; this->MainToolBar->Text = L"toolStrip1"; - // - // EditButton - // this->EditButton->DisplayStyle = System::Windows::Forms::ToolStripItemDisplayStyle::Text; - this->EditButton->Image = (cli::safe_cast(resources->GetObject(L"EditButton.Image"))); + this->EditButton->Image = (cli::safe_cast(resources->GetObject(L"EditButton.Image"))); this->EditButton->ImageTransparentColor = System::Drawing::Color::Magenta; this->EditButton->Name = L"EditButton"; this->EditButton->Size = System::Drawing::Size(29, 22); this->EditButton->Text = L"Edit"; this->EditButton->Click += gcnew System::EventHandler(this, &window_view::EditButton_Click); - // - // PauseButton - // this->PauseButton->Checked = true; this->PauseButton->CheckState = System::Windows::Forms::CheckState::Checked; this->PauseButton->DisplayStyle = System::Windows::Forms::ToolStripItemDisplayStyle::Text; - this->PauseButton->Image = - (cli::safe_cast(resources->GetObject(L"PauseButton.Image"))); + this->PauseButton->Image = (cli::safe_cast(resources->GetObject(L"PauseButton.Image"))); this->PauseButton->ImageTransparentColor = System::Drawing::Color::Magenta; this->PauseButton->Name = L"PauseButton"; this->PauseButton->Size = System::Drawing::Size(40, 22); this->PauseButton->Text = L"Pause"; this->PauseButton->Click += gcnew System::EventHandler(this, &window_view::PauseButton_Click); - // - // ViewPanel - // this->ViewPanel->Dock = System::Windows::Forms::DockStyle::Fill; this->ViewPanel->Location = System::Drawing::Point(0, 25); this->ViewPanel->Name = L"ViewPanel"; @@ -127,22 +112,12 @@ ref class window_view : public WeifenLuo::WinFormsUI::DockContent this->ViewPanel->TabIndex = 17; this->ViewPanel->DoubleClick += gcnew System::EventHandler(this, &window_view::window_view_DoubleClick); this->ViewPanel->MouseLeave += gcnew System::EventHandler(this, &window_view::ViewPanel_MouseLeave); - this->ViewPanel->MouseDown += - gcnew System::Windows::Forms::MouseEventHandler(this, &window_view::ViewPanel_MouseDown); - this->ViewPanel->MouseMove += - gcnew System::Windows::Forms::MouseEventHandler(this, &window_view::ViewPanel_MouseMove); - this->ViewPanel->MouseClick += - gcnew System::Windows::Forms::MouseEventHandler(this, &window_view::ViewPanel_MouseClick); - // - // imageList1 - // - this->imageList1->ImageStream = (cli::safe_cast( - resources->GetObject(L"imageList1.ImageStream"))); + this->ViewPanel->MouseDown += gcnew System::Windows::Forms::MouseEventHandler(this, &window_view::ViewPanel_MouseDown); + this->ViewPanel->MouseMove += gcnew System::Windows::Forms::MouseEventHandler(this, &window_view::ViewPanel_MouseMove); + this->ViewPanel->MouseClick += gcnew System::Windows::Forms::MouseEventHandler(this, &window_view::ViewPanel_MouseClick); + this->imageList1->ImageStream = (cli::safe_cast(resources->GetObject(L"imageList1.ImageStream"))); this->imageList1->TransparentColor = System::Drawing::Color::Fuchsia; this->imageList1->Images->SetKeyName(0, L"color_picker.bmp"); - // - // window_view - // this->AutoScaleDimensions = System::Drawing::SizeF(6, 13); this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font; this->ClientSize = System::Drawing::Size(292, 273); @@ -166,6 +141,7 @@ ref class window_view : public WeifenLuo::WinFormsUI::DockContent this->MainToolBar->PerformLayout(); this->ResumeLayout(false); this->PerformLayout(); + } #pragma endregion public: diff --git a/src/editors/xrWeatherEditor/window_weather.h b/src/editors/xrWeatherEditor/window_weather.h index 47c2675ae8f..b9ba21704fe 100644 --- a/src/editors/xrWeatherEditor/window_weather.h +++ b/src/editors/xrWeatherEditor/window_weather.h @@ -72,8 +72,7 @@ ref class window_weather : public WeifenLuo::WinFormsUI::DockContent /// void InitializeComponent(void) { - System::ComponentModel::ComponentResourceManager ^ resources = - (gcnew System::ComponentModel::ComponentResourceManager(window_weather::typeid)); + System::ComponentModel::ComponentResourceManager^ resources = (gcnew System::ComponentModel::ComponentResourceManager(window_weather::typeid)); this->toolStrip1 = (gcnew System::Windows::Forms::ToolStrip()); this->SaveButton = (gcnew System::Windows::Forms::ToolStripButton()); this->ReloadWeatherButton = (gcnew System::Windows::Forms::ToolStripButton()); @@ -81,62 +80,42 @@ ref class window_weather : public WeifenLuo::WinFormsUI::DockContent this->PropertyGrid = (gcnew XRay::SdkControls::PropertyGrid()); this->toolStrip1->SuspendLayout(); this->SuspendLayout(); - // - // toolStrip1 - // - this->toolStrip1->Items->AddRange(gcnew cli::array(3){ - this->SaveButton, this->ReloadWeatherButton, this->ReloadAllWeathersButton}); + this->toolStrip1->Items->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(3) { + this->SaveButton, this->ReloadWeatherButton, + this->ReloadAllWeathersButton + }); this->toolStrip1->Location = System::Drawing::Point(0, 0); this->toolStrip1->Name = L"toolStrip1"; this->toolStrip1->Size = System::Drawing::Size(292, 25); this->toolStrip1->TabIndex = 1; this->toolStrip1->Text = L"toolStrip1"; - // - // SaveButton - // this->SaveButton->DisplayStyle = System::Windows::Forms::ToolStripItemDisplayStyle::Image; - this->SaveButton->Image = (cli::safe_cast(resources->GetObject(L"SaveButton.Image"))); + this->SaveButton->Image = (cli::safe_cast(resources->GetObject(L"SaveButton.Image"))); this->SaveButton->ImageTransparentColor = System::Drawing::Color::Magenta; this->SaveButton->Name = L"SaveButton"; this->SaveButton->Size = System::Drawing::Size(23, 22); this->SaveButton->Text = L"save weathers"; this->SaveButton->Click += gcnew System::EventHandler(this, &window_weather::SaveButton_Click); - // - // ReloadWeatherButton - // this->ReloadWeatherButton->DisplayStyle = System::Windows::Forms::ToolStripItemDisplayStyle::Image; - this->ReloadWeatherButton->Image = - (cli::safe_cast(resources->GetObject(L"ReloadWeatherButton.Image"))); + this->ReloadWeatherButton->Image = (cli::safe_cast(resources->GetObject(L"ReloadWeatherButton.Image"))); this->ReloadWeatherButton->ImageTransparentColor = System::Drawing::Color::Magenta; this->ReloadWeatherButton->Name = L"ReloadWeatherButton"; this->ReloadWeatherButton->Size = System::Drawing::Size(23, 22); this->ReloadWeatherButton->Text = L"Reload current weather only"; - this->ReloadWeatherButton->Click += - gcnew System::EventHandler(this, &window_weather::ReloadWeatherButton_Click); - // - // ReloadAllWeathersButton - // + this->ReloadWeatherButton->Click += gcnew System::EventHandler(this, &window_weather::ReloadWeatherButton_Click); this->ReloadAllWeathersButton->DisplayStyle = System::Windows::Forms::ToolStripItemDisplayStyle::Image; - this->ReloadAllWeathersButton->Image = - (cli::safe_cast(resources->GetObject(L"ReloadAllWeathersButton.Image"))); + this->ReloadAllWeathersButton->Image = (cli::safe_cast(resources->GetObject(L"ReloadAllWeathersButton.Image"))); this->ReloadAllWeathersButton->ImageTransparentColor = System::Drawing::Color::Magenta; this->ReloadAllWeathersButton->Name = L"ReloadAllWeathersButton"; this->ReloadAllWeathersButton->Size = System::Drawing::Size(23, 22); this->ReloadAllWeathersButton->Text = L"Reload all the weathers"; - this->ReloadAllWeathersButton->Click += - gcnew System::EventHandler(this, &window_weather::ReloadAllWeathersButton_Click); - // - // PropertyGrid - // + this->ReloadAllWeathersButton->Click += gcnew System::EventHandler(this, &window_weather::ReloadAllWeathersButton_Click); this->PropertyGrid->Dock = System::Windows::Forms::DockStyle::Fill; this->PropertyGrid->Location = System::Drawing::Point(0, 25); this->PropertyGrid->Name = L"PropertyGrid"; this->PropertyGrid->Size = System::Drawing::Size(292, 248); this->PropertyGrid->TabIndex = 2; this->PropertyGrid->ToolbarVisible = false; - // - // window_weather - // this->AutoScaleDimensions = System::Drawing::SizeF(6, 13); this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font; this->ClientSize = System::Drawing::Size(292, 273); @@ -150,6 +129,7 @@ ref class window_weather : public WeifenLuo::WinFormsUI::DockContent this->toolStrip1->PerformLayout(); this->ResumeLayout(false); this->PerformLayout(); + } #pragma endregion private: diff --git a/src/editors/xrWeatherEditor/window_weather_editor.h b/src/editors/xrWeatherEditor/window_weather_editor.h index 858b9d6b3f3..af9737fb427 100644 --- a/src/editors/xrWeatherEditor/window_weather_editor.h +++ b/src/editors/xrWeatherEditor/window_weather_editor.h @@ -8,6 +8,11 @@ using namespace System::Windows::Forms; using namespace System::Data; using namespace System::Drawing; +namespace editor +{ +ref class window_weather_editor; +} + namespace XRay { namespace Editor