diff --git a/src/editors/xrWeatherEditor/window_ide.h b/src/editors/xrWeatherEditor/window_ide.h index e7b38ce6970..80005cf5cdd 100644 --- a/src/editors/xrWeatherEditor/window_ide.h +++ b/src/editors/xrWeatherEditor/window_ide.h @@ -87,10 +87,6 @@ private: WeifenLuo::WinFormsUI::Docking::DockPanel ^ EditorDock; { this->EditorDock = (gcnew WeifenLuo::WinFormsUI::Docking::DockPanel()); this->SuspendLayout(); - // - // EditorDock - // - this->EditorDock->ActiveAutoHideContent = nullptr; this->EditorDock->Dock = System::Windows::Forms::DockStyle::Fill; this->EditorDock->DocumentStyle = WeifenLuo::WinFormsUI::Docking::DocumentStyle::DockingSdi; this->EditorDock->Font = (gcnew System::Drawing::Font(L"Tahoma", 11, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::World)); @@ -98,9 +94,6 @@ private: WeifenLuo::WinFormsUI::Docking::DockPanel ^ EditorDock; 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); diff --git a/src/editors/xrWeatherEditor/window_ide.resx b/src/editors/xrWeatherEditor/window_ide.resx index 19dc0dd8b39..d58980a38d7 100644 --- a/src/editors/xrWeatherEditor/window_ide.resx +++ b/src/editors/xrWeatherEditor/window_ide.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 fda8d1d0dd8..6686d22f923 100644 --- a/src/editors/xrWeatherEditor/window_tree_values.h +++ b/src/editors/xrWeatherEditor/window_tree_values.h @@ -98,41 +98,26 @@ private: System::Windows::Forms::Button ^ Cancel_Button; 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); @@ -141,9 +126,6 @@ private: System::Windows::Forms::Button ^ Cancel_Button; 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; @@ -157,25 +139,16 @@ private: System::Windows::Forms::Button ^ Cancel_Button; 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->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; @@ -183,27 +156,18 @@ private: System::Windows::Forms::Button ^ Cancel_Button; 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; @@ -211,9 +175,6 @@ private: System::Windows::Forms::Button ^ Cancel_Button; 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"; @@ -221,9 +182,6 @@ private: System::Windows::Forms::Button ^ Cancel_Button; 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"; @@ -231,9 +189,6 @@ private: System::Windows::Forms::Button ^ Cancel_Button; 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; @@ -244,7 +199,7 @@ private: System::Windows::Forms::Button ^ Cancel_Button; 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, + this->Font = (gcnew System::Drawing::Font(L"Tahoma", 8.25, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point, static_cast(204))); this->MaximizeBox = false; this->MinimizeBox = false; diff --git a/src/editors/xrWeatherEditor/window_tree_values.resx b/src/editors/xrWeatherEditor/window_tree_values.resx index 6541e6af889..30f1bd9721a 100644 --- a/src/editors/xrWeatherEditor/window_tree_values.resx +++ b/src/editors/xrWeatherEditor/window_tree_values.resx @@ -125,63 +125,63 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABc - 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/ + DgAAAk1TRnQBSQFMAgEBAwEAATQBAAE0AQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + AwABEAMAAQEBAAEgBgABEP8AmwABtwGiAZMB/wFnAU0BOQH/AWcBTQE5Af8BZwFNATkB/wFnAU0BOQH/ + AWcBTQE5Af8BZwFNATkB/wFnAU0BOQH/AWcBTQE5Af8BZwFNATkB/wFnAU0BOQH/UAABgAGEAY8B/wFx + AYEBhQH/AWUBcgGBAf8BVgFiAWsB/wFHAVEBWQH/ATYBPwFGAf8BKAEvATUB/wEbASEBJgH/ARMBGAEd + Af8BEwEYAR0B/wETARgBHQH/ARMBGAEdAf8BEwEYAR0B/wETARgBHQH/ARMBGAEdAf8BgAGEAY8B/wFr + AYEBjwH/AWUBgQGHAf8BXAFzAYEB/wFTAWcBdAH/AUkBWwFmAf8BPgFNAVcB/wEzAT8BSAH/ASoBMwE6 + Af8BIAEnAS4B/wEZAR4BIwH/ARMBFwEbAf8BEwEYAR0B/xQAAbcBogGTBf8BtwGiAZMB/wG3AaIBkwH/ + AbcBogGTAf8BtwGiAZMB/wG3AaIBkwH/AbcBogGTAf8BtwGiAZMB/wG3AaIBkwH/AWcBTQE5Af9QAAGB + AYcBkgH/AaIB3wHwAf8BdQHNAeoB/wFOAbgB4gH/ATwBrgHbAf8BMgGpAdkB/wErAaEB0gH/ASYBmAHH + Af8BJQGOAbwB/wEjAYMBrgH/AR4BgQGrAf8BGgGBAakB/wEgAYEBnwH/ASQBdwGWAf8BGwEhASYB/wGB + AYcBkgH/AYkBoQGrAf8BbwGyAdQB/wEFAY8BzQH/AQUBjwHNAf8BBQGPAc0B/wEJAYwBxwH/AQ0BiAG+ + Af8BFAGCAbQB/wEaAYEBqQH/ASABgQGfAf8BJAF3AZYB/wEnAVABYQH/AZsBrQG1Af8QAAG3AaIBkwn/ + AfwB+gH5Af8B9wHxAe4B/wHxAecB4QH/AewB3QHVAf8B5gHTAckB/wHhAcoBvQH/AbcBogGTAf8BZwFN + ATkB/1AAAYEBigGVAf8BqgHoAfYB/wGVAeUB/AH/AYQB3wH7Af8BgAHWAfoB/wFvAdAB9wH/AWIBxgH0 + Af8BVQG+AfAB/wFGAbQB7AH/AToBqgHoAf8BMAGkAeYB/wElAZoB3wH/ARsBkAHXAf8BIAGBAZ8B/wEl + ASwBMgH/AYEBigGVAf8BgQG+AdMB/wGKAaQBrgH/AYEB3AL/AWQBzwL/AVoBywL/AVEBxAH6Af8BRgG8 + AfUB/wE8AbMB8AH/ATMBqgHrAf8BKQGgAeUB/wEYAYwB1AH/ASgBbAGBAf8BYwFuAXIB/xAAAbcBogGT + Cf8D/gH/AfoB9wH1Af8B9QHtAekB/wHvAeMB3AH/AeoB2QHRAf8B5AHPAcQB/wG3AaIBkwH/AWcBTQE5 + Af9QAAGBAY4BmAH/AbAB6gH2Af8BnwHpAfsB/wGSAeQB/AH/AYEB3QH7Af8BgAHWAfoB/wFtAc4B9wH/ + AWIBxgH0Af8BUgG8AfAB/wFGAbQB7AH/AToBqgHoAf8BLwGjAeYB/wEiAZYB3AH/ARoBgQGpAf8BMgE5 + AUAB/wGBAY4BmAH/AYEB0gHsAf8BiwGkAa0B/wGJAcIBzgH/AXYB2AL/AWoB0wL/AWEBzgL/AVYByQH+ + Af8BTgHBAfoB/wFEAbkB9QH/ATkBsAHuAf8BLgGoAekB/wEVAYUBzQH/AScBUAFgAf8BsgHAAcYB/wwA + AbcBogGTDf8B/QH8AfsB/wH4AfMB8AH/AfIB6QHjAf8B7QHfAdgB/wHnAdUBywH/AbcBogGTAf8BZwFN + ATkB/1AAAYEBkQGcAf8BtgHtAfgB/wGqAewB+wH/AZsB6AH7Af8BjwHjAfwB/wGBAd0B+wH/AXYB1QH5 + Af8BbQHOAfcB/wFgAcUB9AH/AVIBvAHwAf8BQgGyAewB/wE3AakB6AH/ASkBngHiAf8BFQGCAbQB/wFA + AUgBUAH/AYEBkQGcAf8BgQHXAe8B/wGBAcUB4AH/AYwBpgGwAf8BgQHdAf4B/wFtAdMC/wFsAdQC/wFn + AdEC/wFdAc0C/wFTAccB/AH/AUsBvgH3Af8BQAG2AfIB/wE2AawB7AH/ASoBbgGBAf8BgQGVAaEB/wwA + AboBpQGWEf8B+wH4AfcB/wH2Ae8B6wH/AfAB5QHfAf8B6wHbAdMB/wG3AaIBkwH/AWcBTQE5Af9QAAGD + AZUBnwH/Ab4B8AH5Af8BqwHwAfcB/wGlAewB+wH/AZgB5wH7Af8BiQHhAfwB/wGBAd0B+wH/AXYB1QH5 + Af8BagHNAfcB/wFdAcQB8wH/AVABuwHwAf8BQgGyAewB/wExAaQB4wH/AREBigG/Af8BTgFYAWEB/wGD + AZUBnwH/AYkB3AHxAf8BjAHiAv8BjQGoAbEB/wGMAboBxwH/AXkB2AL/AWwB1AL/AWwB1AL/AWwB1AL/ + AWQB0AL/AVkBzQL/AVABxQH8Af8BRgG7AfcB/wEzAaIB2wH/AVYBbAF5Af8BsgHAAcYB/wgAAb4BqQGa + Ef8B/gH9AfwB/wH5AfUB8gH/AfQB6wHmAf8B7gHhAdoB/wG3AaIBkwH/AWcBTQE5Af9QAAGGAZkBowH/ + Ab4B8AH5Af8BtgHtAfgB/wGwAe4B+gH/AaQB6wH6Af8BlQHmAfsB/wGJAeEB/AH/AYEB3AH8Af8BdgHV + AfkB/wFqAc0B9wH/AV0BxAHzAf8BTgG5Ae8B/wE6AakB5wH/AREBjwHHAf8BXAFoAXAB/wGGAZoBowH/ AZIB4QHyAf8BmAHoAf0B/wGBAcQB3gH/AY4BpwGwAf8BgQHeAf0B/wGEAeAC/wGEAeAC/wGEAeAC/wGE - 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/ + AeAC/wGBAd8C/wGBAd0C/wF5AdgC/wFwAdYC/wFbAakB0QH/AY8BmwGkAf8IAAHDAa4BnhX/AfwB+gH5 + Af8B9wHxAe4B/wHxAecB4QH/AbcBogGTAf8BZwFNATkB/1AAAYkBnAGmAf8BvgHwAfkB/wG2Ae0B+AH/ + AbYB7QH4Af8BqwHwAfcB/wGiAewB+gH/AZUB5gH7Af8BiQHhAfwB/wGBAdwB/AH/AXQB0wH6Af8BaAHM + AfcB/wFaAcMB8wH/AU4BuQHvAf8BHgGZAc8B/wFoAXUBgQH/AYgBnAGlAf8BmgHmAfMB/wGfAesB+wH/ AZgB6AH+Af8BiwGsAbkB/wGLAawBuQH/AYoBqgG3Af8BiAGmAbMB/wGGAaMBrwH/AYMBnwGqAf8BgQGa AaYB/wGBAZUBoQH/AYEBkQGdAf8BgQGOAZkB/wGBAYsBlQH/AYEBiAGTAf8IAAHIAbIBoxX/A/4B/wH6 - AfcB9QH/AfUB7QHpAf8BtwGiAZMB/wFpAU8BOwH/UAABiwGgAagB/wG+AfAB+QH/Ab4B8AH5Af8BvgHw + AfcB9QH/AfUB7QHpAf8BtwGiAZMB/wFnAU0BOQH/UAABiwGgAagB/wG+AfAB+QH/Ab4B8AH5Af8BvgHw AfkB/wG+AfAB+QH/AbQB8gH4Af8BqgHsAfsB/wGgAekB+wH/AZUB5QH8Af8BigHfAfwB/wGBAdgB+wH/ - AXsB0gH4Af8BbwHKAfQB/wFkAcAB8QH/AWoBdwGBAf8BiwGgAagB/wGgAeoB9gH/AaYB7gH5Af8BnwHr - AfsB/wGYAegB/gH/AYEB2gL/AW4B1AL/AW4B1AL/AW4B1AL/AW4B1AL/AW4B1AL/AW4B1AL/AYEBiAGT - Af8UAAHMAbYBpxn/Af0B/AH7Af8BtwGiAZMB/wG3AaIBkwH/AWoBUAE8Af9QAAGNAaEBqgH/AY0BoQGq + AXkB0gH4Af8BbQHKAfQB/wFiAcAB8QH/AWgBdQGBAf8BiwGgAagB/wGgAeoB9gH/AaYB7gH5Af8BnwHr + AfsB/wGYAegB/gH/AYEB2gL/AWwB1AL/AWwB1AL/AWwB1AL/AWwB1AL/AWwB1AL/AWwB1AL/AYEBiAGT + Af8UAAHMAbYBpxn/Af0B/AH7Af8BtwGiAZMB/wG3AaIBkwH/AWgBTgE6Af9QAAGNAaEBqgH/AY0BoQGq Af8BjQGhAaoB/wGNAaEBqgH/AY0BoQGqAf8BiwGfAagB/wGJAZwBpgH/AYkBmwGmAf8BhwGaAaQB/wGG AZkBowH/AYQBlgGgAf8BhAGWAaAB/wGDAZUBoAH/AYMBlQGgAf8BgAGEAY8B/wGOAaIBqwH/AacB7gH2 - Af8BqwHwAfcB/wGmAe4B+QH/AZ8B6wH7Af8BmAHoAf0B/wF4AdQB+wH/AYkBngGnAf8BhgGZAaMB/wGC - AZQBnwH/AYEBkAGaAf8BgQGMAZcB/wGBAYgBkwH/FAAB0QG7AasZ/wG3AaIBkwH/AWoBUAE8Af8BagFQ - ATwB/wFqAVABPAH/UAABjwGkAawB/wGyAeQB7AH/AbYB7QH4Af8BtgHtAfgB/wGpAewB9gH/AZIB4QHz + Af8BqwHwAfcB/wGmAe4B+QH/AZ8B6wH7Af8BmAHoAf0B/wF2AdQB+wH/AYkBngGnAf8BhgGZAaMB/wGC + AZQBnwH/AYEBkAGaAf8BgQGMAZcB/wGBAYgBkwH/FAAB0QG7AasZ/wG3AaIBkwH/AWgBTgE6Af8BaAFO + AToB/wFoAU4BOgH/UAABjwGkAawB/wGyAeQB7AH/AbYB7QH4Af8BtgHtAfgB/wGpAewB9gH/AZIB4QHz Af8BjQGhAaoB/wHVAdwB4AH/HAABjwGkAawB/wGgAdIB2gH/AasB8AH3Af8BqwHwAfcB/wGmAe4B+QH/ - AZ8B6wH7Af8BjQGhAaoB/wHVAdwB4AH/KAAB1QG/Aa8Z/wG5AaQBlQH/AdQBxQG6Af8BagFQATwB/wHh + AZ8B6wH7Af8BjQGhAaoB/wHVAdwB4AH/KAAB1QG/Aa8Z/wG5AaQBlQH/AdQBxQG6Af8BaAFOAToB/wHh AdUBzQH/UAAB2gHeAeEB/wGPAaQBrAH/AY8BpAGsAf8BjwGkAawB/wGPAaQBrAH/AY8BpAGsAf8B1QHc AeAB/yAAAdoB3gHhAf8BjwGkAawB/wGPAaQBrAH/AY8BpAGsAf8BjwGkAawB/wGPAaQBrAH/AdUB3AHg - Af8sAAHYAcIBshn/AcABqwGcAf8BagFQATwB/wHiAdYBzQH/2AAB2AHCAbIB/wHYAcIBsgH/AdgBwgGy + Af8sAAHYAcIBshn/AcABqwGcAf8BaAFOAToB/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 dcdaba4c53d..552d1cb610b 100644 --- a/src/editors/xrWeatherEditor/window_view.h +++ b/src/editors/xrWeatherEditor/window_view.h @@ -87,7 +87,7 @@ private: System::Windows::Forms::ImageList ^ imageList1; 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->Size = System::Drawing::Size(31, 22); this->EditButton->Text = L"Edit"; this->EditButton->Click += gcnew System::EventHandler(this, &window_view::EditButton_Click); this->PauseButton->Checked = true; @@ -96,7 +96,7 @@ private: System::Windows::Forms::ImageList ^ imageList1; 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->Size = System::Drawing::Size(42, 22); this->PauseButton->Text = L"Pause"; this->PauseButton->Click += gcnew System::EventHandler(this, &window_view::PauseButton_Click); this->ViewPanel->Dock = System::Windows::Forms::DockStyle::Fill; @@ -105,10 +105,10 @@ private: System::Windows::Forms::ImageList ^ imageList1; this->ViewPanel->Size = System::Drawing::Size(292, 248); 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->MouseClick += gcnew System::Windows::Forms::MouseEventHandler(this, &window_view::ViewPanel_MouseClick); this->ViewPanel->MouseDown += gcnew System::Windows::Forms::MouseEventHandler(this, &window_view::ViewPanel_MouseDown); + this->ViewPanel->MouseLeave += gcnew System::EventHandler(this, &window_view::ViewPanel_MouseLeave); 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"); @@ -124,13 +124,13 @@ private: System::Windows::Forms::ImageList ^ imageList1; this->Name = L"window_view"; this->TabText = L"View"; this->Text = L"View"; - this->Deactivate += gcnew System::EventHandler(this, &window_view::window_view_Deactivate); - this->Paint += gcnew System::Windows::Forms::PaintEventHandler(this, &window_view::window_view_Paint); - this->SizeChanged += gcnew System::EventHandler(this, &window_view::window_view_SizeChanged); this->Activated += gcnew System::EventHandler(this, &window_view::window_view_Activated); - this->KeyUp += gcnew System::Windows::Forms::KeyEventHandler(this, &window_view::window_view_KeyUp); + this->Deactivate += gcnew System::EventHandler(this, &window_view::window_view_Deactivate); this->LocationChanged += gcnew System::EventHandler(this, &window_view::window_view_LocationChanged); + this->SizeChanged += gcnew System::EventHandler(this, &window_view::window_view_SizeChanged); + this->Paint += gcnew System::Windows::Forms::PaintEventHandler(this, &window_view::window_view_Paint); this->KeyDown += gcnew System::Windows::Forms::KeyEventHandler(this, &window_view::window_view_KeyDown); + this->KeyUp += gcnew System::Windows::Forms::KeyEventHandler(this, &window_view::window_view_KeyUp); this->MainToolBar->ResumeLayout(false); this->MainToolBar->PerformLayout(); this->ResumeLayout(false); diff --git a/src/editors/xrWeatherEditor/window_view.resx b/src/editors/xrWeatherEditor/window_view.resx index 8bb0f1ead01..8c216e14b21 100644 --- a/src/editors/xrWeatherEditor/window_view.resx +++ b/src/editors/xrWeatherEditor/window_view.resx @@ -112,61 +112,61 @@ 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 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL - U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI - VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ - QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4 - /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9 - cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j - 3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR - dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb - NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE - s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL - U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI - VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ - QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4 - /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9 - cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j - 3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR - dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb - NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE - s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== - + 130, 17 - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - AgAAAk1TRnQBSQFMAwEBAAEEAQABBAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA - ARADAAEBAQABIAYAARD/ABcAAr8BBQH/Ar8BBQH/Ar8BBQH/Ar8BBQH/Ar8BBQH/Ar8BBQH/Ar8BBQH/ - 4AACvwEFAf8CvwEFAf8DBQH/AwUB/wMFAf8CvwEFAf8CvwEFAf8CvwEFAf8CvwEFAf8CvwEFAf/cAAK/ - AQUB/wMFAf8CvwEFAf8CvwEFAf8DBQH/Ar8BBQH/Ar8BBQH/Ar8BBQH/5AADBQn/Ar8BBQH/AwUB//AA - AwUJ/wK/AQUB/wMFAf/wAAMFCf8CvwEFAf8DBQH/8AADBQn/A4EB/wMFAf/wAAMFCf8DgQH/AwUB/wQA - AwUB/+gAAwUJ/wOBAf8DBQH/AwUB/+wAAwUF/wMFAf8DBQH/AwUB/wMFAf/sAAMFAf8DBQH/AwUB/wMF - Af8DBQH/AwUB/+QAAwUB/wMFAf8DBQH/AwUB/wMFAf8DBQH/AwUB/wMFAf/oAAMFAf8DBQH/AwUB/wMF - Af8DBQH/AwUB/+wAAwUB/wPAAf8DBQH/AwUB/wMFAf/wAAMFAf8DBQH/AwUB/8QAAUIBTQE+BwABPgMA + AgAAAk1TRnQBSQFMAwEBAAEMAQABDAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA + ARADAAEBAQABIAYAARD/ABcAAr8BBAH/Ar8BBAH/Ar8BBAH/Ar8BBAH/Ar8BBAH/Ar8BBAH/Ar8BBAH/ + 4AACvwEEAf8CvwEEAf8DBAH/AwQB/wMEAf8CvwEEAf8CvwEEAf8CvwEEAf8CvwEEAf8CvwEEAf/cAAK/ + AQQB/wMEAf8CvwEEAf8CvwEEAf8DBAH/Ar8BBAH/Ar8BBAH/Ar8BBAH/5AADBAn/Ar8BBAH/AwQB//AA + AwQJ/wK/AQQB/wMEAf/wAAMECf8CvwEEAf8DBAH/8AADBAn/A4EB/wMEAf/wAAMECf8DgQH/AwQB/wQA + AwQB/+gAAwQJ/wOBAf8DBAH/AwQB/+wAAwQF/wMEAf8DBAH/AwQB/wMEAf/sAAMEAf8DBAH/AwQB/wME + Af8DBAH/AwQB/+QAAwQB/wMEAf8DBAH/AwQB/wMEAf8DBAH/AwQB/wMEAf/oAAMEAf8DBAH/AwQB/wME + Af8DBAH/AwQB/+wAAwQB/wPAAf8DBAH/AwQB/wMEAf/wAAMEAf8DBAH/AwQB/8QAAUIBTQE+BwABPgMA ASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAL/BgABgAH/BwABPwYAAYABfwYAAcEB/wYAAeAB/wYA AfABfwYAAfgBPwYAAfwBFwYAAf4BBwYAAf8BAwYAAf8BgQYAAf8HAAH/AcAGAAH/AeAGAAH/AfEGAAs= diff --git a/src/editors/xrWeatherEditor/window_weather.resx b/src/editors/xrWeatherEditor/window_weather.resx index b70ce18e457..43780295157 100644 --- a/src/editors/xrWeatherEditor/window_weather.resx +++ b/src/editors/xrWeatherEditor/window_weather.resx @@ -112,59 +112,58 @@ 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 - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAi1JREFUOE+tk91L - k3EUx/0XvO8m8KLbmhrDtVgNnnIOZdkwrIhSn/A1TZf5QoqladTyBbIVLp20Wk3CSUW+gCliIoulaGXm - iqY4fEUngsG33/lFzy/TuskfnMvP5zznnO8TFrYT78XzEKg87Stocy/jkXMBLc1B3LPNoKH+G6y3/Lhe - NYnyso8oLhpDQf4ILuT4oPQmsKcbqK9bx7/e2voGDEk9OJH0jJcicD9d4oKa6sW/8gQHF9Zw0PQSKpUM - 83GXEDgfznNBedn0toJf8OfAEiKNHhRdnsIxU6sQ2JtmueCS5dMWwe/wu4kg9khu5OWOIyHeLgSNdwJc - kJ01sknwJzzgC2CXzglZHobRaBOCutqvXCCnDSuC7eDuoS8Ij2nGyVOvERvbIAQ3aqbQ1Ql2SuDMuTcw - n+7n26aF0cz02dT5J9yLRPMrSJJVCK5WTKDDA5YBoNXxnd19FVWVc3yptDCaOTPDp8BxCe3Q66uFoKR4 - HK7HwAP7BgtOCIbk3E1lOmtBcnop7xwXz+CjLuh0FUJgKRhlMFB7O8Q7k4CFBJEaCd4PsxidnIOcfw2H - DW0c1hxyQKstFQKKpe0ulM8mAcHnC2/ivX8e/pllXLxiRZTOweAWRB24D01MoRBkZrxlc6/wmSP0Luze - J+FJRx88nQPo6h1C/6AXR4xmqLRNiGbwXnUj1Oo8IchK9yampvTxeFLCKCR0ZzoVbZsWRjNTVyqC90dn - C8H//NE/AEJWOr7cK6XnAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIzSURBVDhPrZLrS9NRGMd//0LvexP0orc1NYZrsRr8yjWU + ZcOwIrr9wltpuswLKZamUcsLZCtcOmm1moSTiryAKWIii6VoZeaKpji8ohPB4Nt5zn55sqIX0QPPm8P5 + fM55LtJ/iefPIqD0tS6hxbuIh+45NDWGcdcxhbrar7DfDOJaxThKSz6gsGAEeblDOH8uABWXJAK7OoHa + mlX8LVZW12BK6cLhlKc8VVySvE8WuKCqcl69+nsQHJ5bwW7LC2g0CqyHPELgfjDLBaUlk+r1jfED/hRa + QIzZh4JLEzhoaRYCZ8M0F1y0fVQRET/Db8fC2CZ7kZM9iqREpxDU3w5xQVbmkIpF41e4LxDCZoMbijII + s9khBDXVX7hAOTOoon+GOwc+Y1N8I44cfYWEhDohuF41gY52sFECx0++hvVYL+82NYxqpm/Ty1G4G8nW + l5BluxBcKRtDmw9sB4Bm1zc292VUlM/wplLDqOaM9MA6fCCpFUZjpRAUFY7C8wi471xjixOBKTV7Q1pO + 2JCaVhyFExm83wODoUwIbHnDDAaqb0X4ywSxY8ToZPjfT2N4fAZK7lXsNbVwWLfHBb2+WAhoLR13sP5t + EhB8Nv8G3gVnEZxaxIXLdsQaXAxuQuyue9DF5wtBRvobVvcSh7caPdiyQ8bjth742vvQ0T2A3n4/9pmt + 0OgbEMfg7dp6aLU5QpCZ5k8+faqHrydtGC0JzZlGRd2mhlHN9ColwTvjsoTg30OSvgNCVjq+glI0hgAA + AABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAdtJREFUOE9jYKAl - mLTlW8zEjV93zNn9+dGyA1+OrNj/ZcqyI1+liLKzd8PXHT0bPv/pXvf1eeOKT4/rF3+5M3fn58crDnz9 - hNWQ7lWv/i85+cUAZHrX2i/L+td/+Z0y4c0bl7wTvy1Tt/8xTdj03bXs7seZW7++WXXgy00UV6w89o+z - ccnL//P2f71av/xrQ9+mL3/iup7+cy04/t8uY+cvk9hVx53ytz40j1/6J6zjzc/FBz7fx/BG8czn/7Nm - ff5fOOfL/8iu9y+sErf8NYtf98MkemU+SLFv/Q4Vw7CFL1zLb76vX/plD4YBSX3P/ns3vfkf3fv5f9mc - N/81vCatNopa4QhXGBrKbJNx6Ldr2Z3X9Su/HMIwIKj56X+z4vv/PZtegV2S2PPof+3Ct5YwhcbGaax2 - 6Qf+etQ9+9a04vMWDAOcKh7/dyi69t8q8/h/k/ht/w2j1v7X8Jn6H6bQJHGNkm3m/n9+LS//5k97VEow - KkEBi6xI3Xuyu3PZzT9pE9/+q1/1n42gAegKLFL2XQxpe/cvrO5sLkmaE/s+KNnnnY/xb3r3z6fyyjcG - hv+MJBngUfnE2bfpwy+3ovM/jSNXeJGkGaQ4oudzpHPJ1UaDxJWiJGumiwYAQ/P2VM0tmakAAAAASUVO - RK5CYII= + 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 + QpUNGsDAAADQag5dG0+7cwAAAABJRU5ErkJggg== \ No newline at end of file diff --git a/src/editors/xrWeatherEditor/window_weather_editor.h b/src/editors/xrWeatherEditor/window_weather_editor.h index abfac2ea551..6d7eb424ad5 100644 --- a/src/editors/xrWeatherEditor/window_weather_editor.h +++ b/src/editors/xrWeatherEditor/window_weather_editor.h @@ -88,7 +88,7 @@ private: System::Windows::Forms::Panel ^ panel24; private: System::Windows::Forms::Label ^ label7; private: System::Windows::Forms::Panel ^ panel2; private: System::Windows::Forms::Panel ^ panel13; -private: XRay::SdkControls::PropertyGrid ^ blend; +private: XRay::SdkControls::PropertyGrid^ blend; private: System::Windows::Forms::Panel ^ panel15; private: System::Windows::Forms::Label ^ label6; private: System::Windows::Forms::Panel ^ panel22; @@ -130,8 +130,7 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; void InitializeComponent(void) { this->components = (gcnew System::ComponentModel::Container()); - System::ComponentModel::ComponentResourceManager ^ resources = - (gcnew System::ComponentModel::ComponentResourceManager(window_weather_editor::typeid)); + System::ComponentModel::ComponentResourceManager^ resources = (gcnew System::ComponentModel::ComponentResourceManager(window_weather_editor::typeid)); this->imageList1 = (gcnew System::Windows::Forms::ImageList(this->components)); this->panel23 = (gcnew System::Windows::Forms::Panel()); this->WeatherTrackBar = (gcnew System::Windows::Forms::TrackBar()); @@ -175,6 +174,7 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel17 = (gcnew System::Windows::Forms::Panel()); this->label5 = (gcnew System::Windows::Forms::Label()); this->panel18 = (gcnew System::Windows::Forms::Panel()); + this->ReloadTargetButton = (gcnew System::Windows::Forms::Button()); this->PasteTargetButton = (gcnew System::Windows::Forms::Button()); this->splitter1 = (gcnew System::Windows::Forms::Splitter()); this->panel12 = (gcnew System::Windows::Forms::Panel()); @@ -183,22 +183,21 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel16 = (gcnew System::Windows::Forms::Panel()); this->label4 = (gcnew System::Windows::Forms::Label()); this->panel21 = (gcnew System::Windows::Forms::Panel()); - this->PasteCurrentButton = (gcnew System::Windows::Forms::Button()); this->ReloadCurrentButton = (gcnew System::Windows::Forms::Button()); - this->ReloadTargetButton = (gcnew System::Windows::Forms::Button()); + this->PasteCurrentButton = (gcnew System::Windows::Forms::Button()); this->panel23->SuspendLayout(); - (cli::safe_cast(this->WeatherTrackBar))->BeginInit(); + (cli::safe_cast(this->WeatherTrackBar))->BeginInit(); this->panel25->SuspendLayout(); this->panel24->SuspendLayout(); this->panel1->SuspendLayout(); this->panel4->SuspendLayout(); - (cli::safe_cast(this->CurrentTimeTrackBar))->BeginInit(); + (cli::safe_cast(this->CurrentTimeTrackBar))->BeginInit(); this->panel10->SuspendLayout(); this->panel9->SuspendLayout(); this->panel3->SuspendLayout(); this->panel7->SuspendLayout(); this->panel6->SuspendLayout(); - (cli::safe_cast(this->TimeFactorNumericUpDown))->BeginInit(); + (cli::safe_cast(this->TimeFactorNumericUpDown))->BeginInit(); this->panel5->SuspendLayout(); this->panel2->SuspendLayout(); this->panel13->SuspendLayout(); @@ -212,17 +211,10 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel16->SuspendLayout(); this->panel21->SuspendLayout(); this->SuspendLayout(); - // - // imageList1 - // - this->imageList1->ImageStream = (cli::safe_cast( - resources->GetObject(L"imageList1.ImageStream"))); + this->imageList1->ImageStream = (cli::safe_cast(resources->GetObject(L"imageList1.ImageStream"))); this->imageList1->TransparentColor = System::Drawing::Color::Fuchsia; this->imageList1->Images->SetKeyName(0, L"DataContainer_PauseHS.bmp"); this->imageList1->Images->SetKeyName(1, L"DataContainer_MoveNextHS.png"); - // - // panel23 - // this->panel23->Controls->Add(this->WeatherTrackBar); this->panel23->Controls->Add(this->panel25); this->panel23->Controls->Add(this->panel24); @@ -231,9 +223,6 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel23->Name = L"panel23"; this->panel23->Size = System::Drawing::Size(367, 43); this->panel23->TabIndex = 2; - // - // WeatherTrackBar - // this->WeatherTrackBar->Dock = System::Windows::Forms::DockStyle::Fill; this->WeatherTrackBar->LargeChange = 1; this->WeatherTrackBar->Location = System::Drawing::Point(76, 21); @@ -242,33 +231,21 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->WeatherTrackBar->Size = System::Drawing::Size(291, 22); this->WeatherTrackBar->TabIndex = 15; this->WeatherTrackBar->TickStyle = System::Windows::Forms::TickStyle::None; - this->WeatherTrackBar->MouseDown += - gcnew System::Windows::Forms::MouseEventHandler(this, &window_weather_editor::WeatherTrackBar_MouseDown); - this->WeatherTrackBar->ValueChanged += - gcnew System::EventHandler(this, &window_weather_editor::WeatherTrackBar_ValueChanged); - this->WeatherTrackBar->MouseUp += - gcnew System::Windows::Forms::MouseEventHandler(this, &window_weather_editor::WeatherTrackBar_MouseUp); - // - // panel25 - // + this->WeatherTrackBar->ValueChanged += gcnew System::EventHandler(this, &window_weather_editor::WeatherTrackBar_ValueChanged); + this->WeatherTrackBar->MouseDown += gcnew System::Windows::Forms::MouseEventHandler(this, &window_weather_editor::WeatherTrackBar_MouseDown); + this->WeatherTrackBar->MouseUp += gcnew System::Windows::Forms::MouseEventHandler(this, &window_weather_editor::WeatherTrackBar_MouseUp); this->panel25->Controls->Add(this->label8); this->panel25->Dock = System::Windows::Forms::DockStyle::Top; this->panel25->Location = System::Drawing::Point(76, 0); this->panel25->Name = L"panel25"; this->panel25->Size = System::Drawing::Size(291, 21); this->panel25->TabIndex = 14; - // - // label8 - // this->label8->AutoSize = true; this->label8->Location = System::Drawing::Point(6, 4); this->label8->Name = L"label8"; this->label8->Size = System::Drawing::Size(71, 13); this->label8->TabIndex = 5; this->label8->Text = L"total weather:"; - // - // panel24 - // this->panel24->Controls->Add(this->CurrentTimeTextBox); this->panel24->Controls->Add(this->label7); this->panel24->Dock = System::Windows::Forms::DockStyle::Left; @@ -276,29 +253,19 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel24->Name = L"panel24"; this->panel24->Size = System::Drawing::Size(76, 43); this->panel24->TabIndex = 0; - // - // CurrentTimeTextBox - // this->CurrentTimeTextBox->Location = System::Drawing::Point(0, 22); this->CurrentTimeTextBox->Mask = L"00:00:00"; this->CurrentTimeTextBox->Name = L"CurrentTimeTextBox"; this->CurrentTimeTextBox->Size = System::Drawing::Size(70, 20); this->CurrentTimeTextBox->TabIndex = 5; this->CurrentTimeTextBox->TextAlign = System::Windows::Forms::HorizontalAlignment::Center; - this->CurrentTimeTextBox->TextChanged += - gcnew System::EventHandler(this, &window_weather_editor::CurrentTimeTextBox_TextChanged); - // - // label7 - // + this->CurrentTimeTextBox->TextChanged += gcnew System::EventHandler(this, &window_weather_editor::CurrentTimeTextBox_TextChanged); this->label7->AutoSize = true; this->label7->Location = System::Drawing::Point(0, 4); this->label7->Name = L"label7"; this->label7->Size = System::Drawing::Size(65, 13); this->label7->TabIndex = 4; this->label7->Text = L"current time:"; - // - // panel1 - // this->panel1->Controls->Add(this->panel4); this->panel1->Controls->Add(this->panel3); this->panel1->Dock = System::Windows::Forms::DockStyle::Top; @@ -306,9 +273,6 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel1->Name = L"panel1"; this->panel1->Size = System::Drawing::Size(367, 85); this->panel1->TabIndex = 3; - // - // panel4 - // this->panel4->Controls->Add(this->CurrentTimeTrackBar); this->panel4->Controls->Add(this->panel10); this->panel4->Controls->Add(this->panel9); @@ -317,46 +281,30 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel4->Name = L"panel4"; this->panel4->Size = System::Drawing::Size(367, 31); this->panel4->TabIndex = 1; - // - // CurrentTimeTrackBar - // this->CurrentTimeTrackBar->Dock = System::Windows::Forms::DockStyle::Top; this->CurrentTimeTrackBar->LargeChange = 1; this->CurrentTimeTrackBar->Location = System::Drawing::Point(113, 0); this->CurrentTimeTrackBar->Maximum = 1000; this->CurrentTimeTrackBar->Name = L"CurrentTimeTrackBar"; - this->CurrentTimeTrackBar->Size = System::Drawing::Size(254, 42); + this->CurrentTimeTrackBar->Size = System::Drawing::Size(254, 45); this->CurrentTimeTrackBar->TabIndex = 11; this->CurrentTimeTrackBar->TickStyle = System::Windows::Forms::TickStyle::None; - this->CurrentTimeTrackBar->MouseDown += gcnew System::Windows::Forms::MouseEventHandler( - this, &window_weather_editor::CurrentTimeTrackBar_MouseDown); - this->CurrentTimeTrackBar->ValueChanged += - gcnew System::EventHandler(this, &window_weather_editor::CurrentTimeTrackBar_ValueChanged); - this->CurrentTimeTrackBar->MouseUp += - gcnew System::Windows::Forms::MouseEventHandler(this, &window_weather_editor::CurrentTimeTrackBar_MouseUp); - // - // panel10 - // + this->CurrentTimeTrackBar->ValueChanged += gcnew System::EventHandler(this, &window_weather_editor::CurrentTimeTrackBar_ValueChanged); + this->CurrentTimeTrackBar->MouseDown += gcnew System::Windows::Forms::MouseEventHandler(this, &window_weather_editor::CurrentTimeTrackBar_MouseDown); + this->CurrentTimeTrackBar->MouseUp += gcnew System::Windows::Forms::MouseEventHandler(this, &window_weather_editor::CurrentTimeTrackBar_MouseUp); this->panel10->Controls->Add(this->NextFrameButton); this->panel10->Dock = System::Windows::Forms::DockStyle::Left; this->panel10->Location = System::Drawing::Point(78, 0); this->panel10->Name = L"panel10"; this->panel10->Size = System::Drawing::Size(35, 31); this->panel10->TabIndex = 9; - // - // NextFrameButton - // - this->NextFrameButton->Image = - (cli::safe_cast(resources->GetObject(L"NextFrameButton.Image"))); + this->NextFrameButton->Image = (cli::safe_cast(resources->GetObject(L"NextFrameButton.Image"))); this->NextFrameButton->Location = System::Drawing::Point(0, 0); this->NextFrameButton->Name = L"NextFrameButton"; this->NextFrameButton->Size = System::Drawing::Size(32, 23); this->NextFrameButton->TabIndex = 7; this->NextFrameButton->UseVisualStyleBackColor = true; this->NextFrameButton->Click += gcnew System::EventHandler(this, &window_weather_editor::NextFrameButton_Click); - // - // panel9 - // this->panel9->Controls->Add(this->PauseButton); this->panel9->Controls->Add(this->PreviousFrameButton); this->panel9->Dock = System::Windows::Forms::DockStyle::Left; @@ -364,9 +312,6 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel9->Name = L"panel9"; this->panel9->Size = System::Drawing::Size(78, 31); this->panel9->TabIndex = 8; - // - // PauseButton - // this->PauseButton->BackgroundImageLayout = System::Windows::Forms::ImageLayout::Center; this->PauseButton->ImageIndex = 0; this->PauseButton->ImageList = this->imageList1; @@ -376,21 +321,13 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->PauseButton->TabIndex = 7; this->PauseButton->UseVisualStyleBackColor = true; this->PauseButton->Click += gcnew System::EventHandler(this, &window_weather_editor::PauseButton_Click); - // - // PreviousFrameButton - // - this->PreviousFrameButton->Image = - (cli::safe_cast(resources->GetObject(L"PreviousFrameButton.Image"))); + this->PreviousFrameButton->Image = (cli::safe_cast(resources->GetObject(L"PreviousFrameButton.Image"))); this->PreviousFrameButton->Location = System::Drawing::Point(46, 0); this->PreviousFrameButton->Name = L"PreviousFrameButton"; this->PreviousFrameButton->Size = System::Drawing::Size(32, 23); this->PreviousFrameButton->TabIndex = 6; this->PreviousFrameButton->UseVisualStyleBackColor = true; - this->PreviousFrameButton->Click += - gcnew System::EventHandler(this, &window_weather_editor::PreviousFrameButton_Click); - // - // panel3 - // + this->PreviousFrameButton->Click += gcnew System::EventHandler(this, &window_weather_editor::PreviousFrameButton_Click); this->panel3->AutoSize = true; this->panel3->Controls->Add(this->panel8); this->panel3->Controls->Add(this->WeathersComboBox); @@ -402,17 +339,11 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel3->Name = L"panel3"; this->panel3->Size = System::Drawing::Size(367, 54); this->panel3->TabIndex = 0; - // - // panel8 - // this->panel8->Dock = System::Windows::Forms::DockStyle::Bottom; this->panel8->Location = System::Drawing::Point(85, 46); this->panel8->Name = L"panel8"; this->panel8->Size = System::Drawing::Size(196, 8); this->panel8->TabIndex = 10; - // - // WeathersComboBox - // this->WeathersComboBox->Dock = System::Windows::Forms::DockStyle::Top; this->WeathersComboBox->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList; this->WeathersComboBox->FormattingEnabled = true; @@ -421,29 +352,19 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->WeathersComboBox->Name = L"WeathersComboBox"; this->WeathersComboBox->Size = System::Drawing::Size(196, 21); this->WeathersComboBox->TabIndex = 9; - this->WeathersComboBox->SelectedIndexChanged += - gcnew System::EventHandler(this, &window_weather_editor::WeathersComboBox_SelectedIndexChanged); - // - // panel7 - // + this->WeathersComboBox->SelectedIndexChanged += gcnew System::EventHandler(this, &window_weather_editor::WeathersComboBox_SelectedIndexChanged); this->panel7->Controls->Add(this->label2); this->panel7->Dock = System::Windows::Forms::DockStyle::Top; this->panel7->Location = System::Drawing::Point(85, 0); this->panel7->Name = L"panel7"; this->panel7->Size = System::Drawing::Size(196, 25); this->panel7->TabIndex = 2; - // - // label2 - // this->label2->AutoSize = true; this->label2->Location = System::Drawing::Point(3, 7); this->label2->Name = L"label2"; this->label2->Size = System::Drawing::Size(48, 13); this->label2->TabIndex = 2; this->label2->Text = L"weather:"; - // - // panel6 - // this->panel6->Controls->Add(this->label1); this->panel6->Controls->Add(this->TimeFactorNumericUpDown); this->panel6->Dock = System::Windows::Forms::DockStyle::Left; @@ -451,32 +372,22 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel6->Name = L"panel6"; this->panel6->Size = System::Drawing::Size(85, 54); this->panel6->TabIndex = 1; - // - // label1 - // this->label1->AutoSize = true; this->label1->Location = System::Drawing::Point(0, 7); this->label1->Name = L"label1"; this->label1->Size = System::Drawing::Size(59, 13); this->label1->TabIndex = 1; this->label1->Text = L"time factor:"; - // - // TimeFactorNumericUpDown - // this->TimeFactorNumericUpDown->DecimalPlaces = 1; - this->TimeFactorNumericUpDown->Increment = System::Decimal(gcnew cli::array(4){10, 0, 0, 0}); + this->TimeFactorNumericUpDown->Increment = System::Decimal(gcnew cli::array< System::Int32 >(4) { 10, 0, 0, 0 }); this->TimeFactorNumericUpDown->Location = System::Drawing::Point(0, 25); - this->TimeFactorNumericUpDown->Maximum = System::Decimal(gcnew cli::array(4){100000, 0, 0, 0}); - this->TimeFactorNumericUpDown->Minimum = System::Decimal(gcnew cli::array(4){1, 0, 0, 131072}); + this->TimeFactorNumericUpDown->Maximum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 100000, 0, 0, 0 }); + this->TimeFactorNumericUpDown->Minimum = System::Decimal(gcnew cli::array< System::Int32 >(4) { 1, 0, 0, 131072 }); this->TimeFactorNumericUpDown->Name = L"TimeFactorNumericUpDown"; this->TimeFactorNumericUpDown->Size = System::Drawing::Size(70, 20); this->TimeFactorNumericUpDown->TabIndex = 0; - this->TimeFactorNumericUpDown->Value = System::Decimal(gcnew cli::array(4){1, 0, 0, 0}); - this->TimeFactorNumericUpDown->ValueChanged += - gcnew System::EventHandler(this, &window_weather_editor::TimeFactorNumericUpDown_ValueChanged); - // - // panel5 - // + this->TimeFactorNumericUpDown->Value = System::Decimal(gcnew cli::array< System::Int32 >(4) { 1, 0, 0, 0 }); + this->TimeFactorNumericUpDown->ValueChanged += gcnew System::EventHandler(this, &window_weather_editor::TimeFactorNumericUpDown_ValueChanged); this->panel5->Controls->Add(this->label3); this->panel5->Controls->Add(this->FramesComboBox); this->panel5->Dock = System::Windows::Forms::DockStyle::Right; @@ -484,18 +395,12 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel5->Name = L"panel5"; this->panel5->Size = System::Drawing::Size(86, 54); this->panel5->TabIndex = 0; - // - // label3 - // this->label3->AutoSize = true; this->label3->Location = System::Drawing::Point(11, 7); this->label3->Name = L"label3"; this->label3->Size = System::Drawing::Size(58, 13); this->label3->TabIndex = 13; this->label3->Text = L"time frame:"; - // - // FramesComboBox - // this->FramesComboBox->DropDownStyle = System::Windows::Forms::ComboBoxStyle::DropDownList; this->FramesComboBox->FormattingEnabled = true; this->FramesComboBox->Location = System::Drawing::Point(11, 25); @@ -503,15 +408,9 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->FramesComboBox->Name = L"FramesComboBox"; this->FramesComboBox->Size = System::Drawing::Size(75, 21); this->FramesComboBox->TabIndex = 12; - this->FramesComboBox->SelectedIndexChanged += - gcnew System::EventHandler(this, &window_weather_editor::FramesComboBox_SelectedIndexChanged); - this->FramesComboBox->DropDownClosed += - gcnew System::EventHandler(this, &window_weather_editor::FramesComboBox_DropDownClosed); - this->FramesComboBox->DropDown += - gcnew System::EventHandler(this, &window_weather_editor::FramesComboBox_DropDown); - // - // panel2 - // + this->FramesComboBox->DropDown += gcnew System::EventHandler(this, &window_weather_editor::FramesComboBox_DropDown); + this->FramesComboBox->SelectedIndexChanged += gcnew System::EventHandler(this, &window_weather_editor::FramesComboBox_SelectedIndexChanged); + this->FramesComboBox->DropDownClosed += gcnew System::EventHandler(this, &window_weather_editor::FramesComboBox_DropDownClosed); this->panel2->Controls->Add(this->panel13); this->panel2->Controls->Add(this->splitter2); this->panel2->Controls->Add(this->panel14); @@ -522,9 +421,6 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel2->Name = L"panel2"; this->panel2->Size = System::Drawing::Size(367, 248); this->panel2->TabIndex = 4; - // - // panel13 - // this->panel13->Controls->Add(this->blend); this->panel13->Controls->Add(this->panel15); this->panel13->Dock = System::Windows::Forms::DockStyle::Fill; @@ -532,18 +428,12 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel13->Name = L"panel13"; this->panel13->Size = System::Drawing::Size(131, 248); this->panel13->TabIndex = 24; - // - // blend - // this->blend->Dock = System::Windows::Forms::DockStyle::Fill; this->blend->Location = System::Drawing::Point(0, 25); this->blend->Name = L"blend"; this->blend->Size = System::Drawing::Size(131, 223); this->blend->TabIndex = 2; this->blend->ToolbarVisible = false; - // - // panel15 - // this->panel15->Controls->Add(this->label6); this->panel15->Controls->Add(this->panel22); this->panel15->Controls->Add(this->panel11); @@ -552,9 +442,6 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel15->Name = L"panel15"; this->panel15->Size = System::Drawing::Size(131, 25); this->panel15->TabIndex = 1; - // - // label6 - // this->label6->Dock = System::Windows::Forms::DockStyle::Fill; this->label6->Location = System::Drawing::Point(32, 0); this->label6->Name = L"label6"; @@ -562,60 +449,40 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->label6->TabIndex = 6; this->label6->Text = L"blend"; this->label6->TextAlign = System::Drawing::ContentAlignment::MiddleCenter; - // - // panel22 - // this->panel22->Controls->Add(this->CopyButton); this->panel22->Dock = System::Windows::Forms::DockStyle::Left; this->panel22->Location = System::Drawing::Point(0, 0); this->panel22->Name = L"panel22"; this->panel22->Size = System::Drawing::Size(32, 25); this->panel22->TabIndex = 5; - // - // CopyButton - // this->CopyButton->AutoSize = true; - this->CopyButton->Image = (cli::safe_cast(resources->GetObject(L"CopyButton.Image"))); + this->CopyButton->Image = (cli::safe_cast(resources->GetObject(L"CopyButton.Image"))); this->CopyButton->Location = System::Drawing::Point(0, 0); this->CopyButton->Name = L"CopyButton"; this->CopyButton->Size = System::Drawing::Size(32, 23); this->CopyButton->TabIndex = 2; this->CopyButton->UseVisualStyleBackColor = true; this->CopyButton->Click += gcnew System::EventHandler(this, &window_weather_editor::CopyButton_Click); - // - // panel11 - // this->panel11->Controls->Add(this->CreateFromButton); this->panel11->Dock = System::Windows::Forms::DockStyle::Right; this->panel11->Location = System::Drawing::Point(98, 0); this->panel11->Name = L"panel11"; this->panel11->Size = System::Drawing::Size(33, 25); this->panel11->TabIndex = 2; - // - // CreateFromButton - // this->CreateFromButton->AutoSize = true; - this->CreateFromButton->Image = - (cli::safe_cast(resources->GetObject(L"CreateFromButton.Image"))); + this->CreateFromButton->Image = (cli::safe_cast(resources->GetObject(L"CreateFromButton.Image"))); this->CreateFromButton->Location = System::Drawing::Point(0, 0); this->CreateFromButton->Name = L"CreateFromButton"; this->CreateFromButton->Size = System::Drawing::Size(32, 23); this->CreateFromButton->TabIndex = 3; this->CreateFromButton->UseVisualStyleBackColor = true; - this->CreateFromButton->Click += - gcnew System::EventHandler(this, &window_weather_editor::CreateFromButton_Click); - // - // splitter2 - // + this->CreateFromButton->Click += gcnew System::EventHandler(this, &window_weather_editor::CreateFromButton_Click); this->splitter2->Dock = System::Windows::Forms::DockStyle::Right; this->splitter2->Location = System::Drawing::Point(254, 0); this->splitter2->Name = L"splitter2"; this->splitter2->Size = System::Drawing::Size(3, 248); this->splitter2->TabIndex = 23; this->splitter2->TabStop = false; - // - // panel14 - // this->panel14->Controls->Add(this->target); this->panel14->Controls->Add(this->panel20); this->panel14->Controls->Add(this->panel17); @@ -624,26 +491,17 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel14->Name = L"panel14"; this->panel14->Size = System::Drawing::Size(110, 248); this->panel14->TabIndex = 22; - // - // target - // this->target->Dock = System::Windows::Forms::DockStyle::Fill; this->target->Location = System::Drawing::Point(0, 25); this->target->Name = L"target"; this->target->Size = System::Drawing::Size(110, 223); this->target->TabIndex = 24; this->target->ToolbarVisible = false; - // - // panel20 - // this->panel20->Dock = System::Windows::Forms::DockStyle::Right; this->panel20->Location = System::Drawing::Point(110, 25); this->panel20->Name = L"panel20"; this->panel20->Size = System::Drawing::Size(0, 223); this->panel20->TabIndex = 23; - // - // panel17 - // this->panel17->Controls->Add(this->label5); this->panel17->Controls->Add(this->panel18); this->panel17->Dock = System::Windows::Forms::DockStyle::Top; @@ -651,9 +509,6 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel17->Name = L"panel17"; this->panel17->Size = System::Drawing::Size(110, 25); this->panel17->TabIndex = 22; - // - // label5 - // this->label5->Dock = System::Windows::Forms::DockStyle::Fill; this->label5->Location = System::Drawing::Point(0, 0); this->label5->Name = L"label5"; @@ -661,9 +516,6 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->label5->TabIndex = 3; this->label5->Text = L"target"; this->label5->TextAlign = System::Drawing::ContentAlignment::MiddleCenter; - // - // panel18 - // this->panel18->Controls->Add(this->ReloadTargetButton); this->panel18->Controls->Add(this->PasteTargetButton); this->panel18->Dock = System::Windows::Forms::DockStyle::Right; @@ -671,30 +523,27 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel18->Name = L"panel18"; this->panel18->Size = System::Drawing::Size(64, 25); this->panel18->TabIndex = 2; - // - // PasteTargetButton - // + this->ReloadTargetButton->AutoSize = true; + this->ReloadTargetButton->Image = (cli::safe_cast(resources->GetObject(L"ReloadTargetButton.Image"))); + this->ReloadTargetButton->Location = System::Drawing::Point(32, 0); + this->ReloadTargetButton->Name = L"ReloadTargetButton"; + this->ReloadTargetButton->Size = System::Drawing::Size(32, 23); + this->ReloadTargetButton->TabIndex = 4; + this->ReloadTargetButton->UseVisualStyleBackColor = true; + this->ReloadTargetButton->Click += gcnew System::EventHandler(this, &window_weather_editor::ReloadTargetButton_Click); this->PasteTargetButton->AutoSize = true; - this->PasteTargetButton->Image = - (cli::safe_cast(resources->GetObject(L"PasteTargetButton.Image"))); + this->PasteTargetButton->Image = (cli::safe_cast(resources->GetObject(L"PasteTargetButton.Image"))); this->PasteTargetButton->Location = System::Drawing::Point(0, 0); this->PasteTargetButton->Name = L"PasteTargetButton"; this->PasteTargetButton->Size = System::Drawing::Size(32, 23); this->PasteTargetButton->TabIndex = 2; this->PasteTargetButton->UseVisualStyleBackColor = true; - this->PasteTargetButton->Click += - gcnew System::EventHandler(this, &window_weather_editor::PasteTargetButton_Click); - // - // splitter1 - // + this->PasteTargetButton->Click += gcnew System::EventHandler(this, &window_weather_editor::PasteTargetButton_Click); this->splitter1->Location = System::Drawing::Point(120, 0); this->splitter1->Name = L"splitter1"; this->splitter1->Size = System::Drawing::Size(3, 248); this->splitter1->TabIndex = 19; this->splitter1->TabStop = false; - // - // panel12 - // this->panel12->Controls->Add(this->current); this->panel12->Controls->Add(this->panel19); this->panel12->Controls->Add(this->panel16); @@ -703,26 +552,17 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel12->Name = L"panel12"; this->panel12->Size = System::Drawing::Size(120, 248); this->panel12->TabIndex = 18; - // - // current - // this->current->Dock = System::Windows::Forms::DockStyle::Fill; this->current->Location = System::Drawing::Point(0, 25); this->current->Name = L"current"; this->current->Size = System::Drawing::Size(120, 223); this->current->TabIndex = 19; this->current->ToolbarVisible = false; - // - // panel19 - // this->panel19->Dock = System::Windows::Forms::DockStyle::Left; this->panel19->Location = System::Drawing::Point(0, 25); this->panel19->Name = L"panel19"; this->panel19->Size = System::Drawing::Size(0, 223); this->panel19->TabIndex = 18; - // - // panel16 - // this->panel16->Controls->Add(this->label4); this->panel16->Controls->Add(this->panel21); this->panel16->Dock = System::Windows::Forms::DockStyle::Top; @@ -730,9 +570,6 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel16->Name = L"panel16"; this->panel16->Size = System::Drawing::Size(120, 25); this->panel16->TabIndex = 17; - // - // label4 - // this->label4->Dock = System::Windows::Forms::DockStyle::Fill; this->label4->Location = System::Drawing::Point(67, 0); this->label4->Name = L"label4"; @@ -740,9 +577,6 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->label4->TabIndex = 4; this->label4->Text = L"current"; this->label4->TextAlign = System::Drawing::ContentAlignment::MiddleCenter; - // - // panel21 - // this->panel21->AutoSize = true; this->panel21->Controls->Add(this->ReloadCurrentButton); this->panel21->Controls->Add(this->PasteCurrentButton); @@ -751,48 +585,22 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel21->Name = L"panel21"; this->panel21->Size = System::Drawing::Size(67, 25); this->panel21->TabIndex = 3; - // - // PasteCurrentButton - // - this->PasteCurrentButton->AutoSize = true; - this->PasteCurrentButton->Image = - (cli::safe_cast(resources->GetObject(L"PasteCurrentButton.Image"))); - this->PasteCurrentButton->Location = System::Drawing::Point(0, 0); - this->PasteCurrentButton->Name = L"PasteCurrentButton"; - this->PasteCurrentButton->Size = System::Drawing::Size(32, 23); - this->PasteCurrentButton->TabIndex = 2; - this->PasteCurrentButton->UseVisualStyleBackColor = true; - this->PasteCurrentButton->Click += - gcnew System::EventHandler(this, &window_weather_editor::PasteCurrentButton_Click); - // - // ReloadCurrentButton - // this->ReloadCurrentButton->AutoSize = true; - this->ReloadCurrentButton->Image = - (cli::safe_cast(resources->GetObject(L"ReloadCurrentButton.Image"))); + this->ReloadCurrentButton->Image = (cli::safe_cast(resources->GetObject(L"ReloadCurrentButton.Image"))); this->ReloadCurrentButton->Location = System::Drawing::Point(32, 0); this->ReloadCurrentButton->Name = L"ReloadCurrentButton"; this->ReloadCurrentButton->Size = System::Drawing::Size(32, 23); this->ReloadCurrentButton->TabIndex = 3; this->ReloadCurrentButton->UseVisualStyleBackColor = true; - this->ReloadCurrentButton->Click += - gcnew System::EventHandler(this, &window_weather_editor::ReloadCurrentButton_Click); - // - // ReloadTargetButton - // - this->ReloadTargetButton->AutoSize = true; - this->ReloadTargetButton->Image = - (cli::safe_cast(resources->GetObject(L"ReloadTargetButton.Image"))); - this->ReloadTargetButton->Location = System::Drawing::Point(32, 0); - this->ReloadTargetButton->Name = L"ReloadTargetButton"; - this->ReloadTargetButton->Size = System::Drawing::Size(32, 23); - this->ReloadTargetButton->TabIndex = 4; - this->ReloadTargetButton->UseVisualStyleBackColor = true; - this->ReloadTargetButton->Click += - gcnew System::EventHandler(this, &window_weather_editor::ReloadTargetButton_Click); - // - // window_weather_editor - // + this->ReloadCurrentButton->Click += gcnew System::EventHandler(this, &window_weather_editor::ReloadCurrentButton_Click); + this->PasteCurrentButton->AutoSize = true; + this->PasteCurrentButton->Image = (cli::safe_cast(resources->GetObject(L"PasteCurrentButton.Image"))); + this->PasteCurrentButton->Location = System::Drawing::Point(0, 0); + this->PasteCurrentButton->Name = L"PasteCurrentButton"; + this->PasteCurrentButton->Size = System::Drawing::Size(32, 23); + this->PasteCurrentButton->TabIndex = 2; + this->PasteCurrentButton->UseVisualStyleBackColor = true; + this->PasteCurrentButton->Click += gcnew System::EventHandler(this, &window_weather_editor::PasteCurrentButton_Click); this->AutoScaleDimensions = System::Drawing::SizeF(6, 13); this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font; this->ClientSize = System::Drawing::Size(367, 376); @@ -802,12 +610,11 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->Name = L"window_weather_editor"; this->TabText = L"weather editor"; this->Text = L"weather editor"; - this->SizeChanged += - gcnew System::EventHandler(this, &window_weather_editor::window_weather_editor_SizeChanged); + this->SizeChanged += gcnew System::EventHandler(this, &window_weather_editor::window_weather_editor_SizeChanged); this->Enter += gcnew System::EventHandler(this, &window_weather_editor::window_weather_editor_Enter); this->panel23->ResumeLayout(false); this->panel23->PerformLayout(); - (cli::safe_cast(this->WeatherTrackBar))->EndInit(); + (cli::safe_cast(this->WeatherTrackBar))->EndInit(); this->panel25->ResumeLayout(false); this->panel25->PerformLayout(); this->panel24->ResumeLayout(false); @@ -816,7 +623,7 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel1->PerformLayout(); this->panel4->ResumeLayout(false); this->panel4->PerformLayout(); - (cli::safe_cast(this->CurrentTimeTrackBar))->EndInit(); + (cli::safe_cast(this->CurrentTimeTrackBar))->EndInit(); this->panel10->ResumeLayout(false); this->panel9->ResumeLayout(false); this->panel3->ResumeLayout(false); @@ -824,7 +631,7 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel7->PerformLayout(); this->panel6->ResumeLayout(false); this->panel6->PerformLayout(); - (cli::safe_cast(this->TimeFactorNumericUpDown))->EndInit(); + (cli::safe_cast(this->TimeFactorNumericUpDown))->EndInit(); this->panel5->ResumeLayout(false); this->panel5->PerformLayout(); this->panel2->ResumeLayout(false); @@ -844,6 +651,7 @@ private: System::Windows::Forms::Button ^ ReloadCurrentButton; this->panel21->ResumeLayout(false); this->panel21->PerformLayout(); this->ResumeLayout(false); + } #pragma endregion public: diff --git a/src/editors/xrWeatherEditor/window_weather_editor.resx b/src/editors/xrWeatherEditor/window_weather_editor.resx index 2fd00185c88..50799707129 100644 --- a/src/editors/xrWeatherEditor/window_weather_editor.resx +++ b/src/editors/xrWeatherEditor/window_weather_editor.resx @@ -112,165 +112,165 @@ 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 - + 6, 3 - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA0 - BQAAAk1TRnQBSQFMAgEBAgEAAQQBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA - AwABEAMAAQEBAAEgBgABEP8A/wAkAAHTAYEBXQH/AZABZwFDAf8BkAFnAUMB/wgAAdMBgQFdAf8BkAFn - AUMB/wGQAWcBQwH/JAABMgIBAU4BAwIBAQO0AAHYAYEBSwH/AeEBgQFtAf8BlgFsAUcB/wgAAdgBgQFL - Af8B4QGBAW0B/wGWAWwBRwH/JAAB2AGBAUsB/wEyAgEBTbQAAdsBgQFQAf8B6QGEAXUB/wGeAXIBTAH/ - CAAB2wGBAVAB/wHpAYQBdQH/AZ4BcgFMAf8kAAHbAYEBUAH/AYwBYwFAAf8BLgIBAUWwAAHcAYEBVwH/ - AesBjwGBAf8BpgF4AVIB/wgAAdwBgQFXAf8B6wGPAYEB/wGmAXgBUgH/JAAB3AGBAVcB/wHUAYEBWwH/ - AYwBYwFAAf8BKQIBATysAAHdAYEBXgH/AesBkwGBAf8BrwF/AVcB/wgAAd0BgQFeAf8B6wGTAYEB/wGv - AX8BVwH/JAAB3QGBAV4B/wHmAYQBcAH/AdYBegE6Af8BjAFjAUAB/wEwAgEBSqgAAd8BgQFnAf8B7AGW - AYEB/wG3AYEBXgH/CAAB3wGBAWcB/wHsAZYBgQH/AbcBgQFeAf8kAAHfAYEBZwH/Ae4BnQGBAf8B9AGB - AVIB/wHWAXoBOgH/AYwBYwFAAf8BNAIBAVGkAAHhAYMBcAH/Ae4BnwGBAf8BwAGBAWMB/wgAAeEBgwFw - Af8B7gGfAYEB/wHAAYEBYwH/JAAB4QGDAXAB/wHvAa0BhQH/Af0BlwF/Af8B9AGBAVIB/wHWAXoBOgH/ - AaYBeAFSAf8BOgIBAV8BAwIBAQOcAAHiAYoBeAH/AfABqwGNAf8ByAGBAWkB/wgAAeIBigF4Af8B8AGr - AY0B/wHIAYEBaQH/JAAB4gGKAXgB/wH6AbYBlAH/Af0BpQGBAf8B/QGXAX8B/wHNAYEBWwH/ASsCAQE/ - AQMCAQEDoAAB5AGMAX8B/wHvAbQBlgH/AdABgQFuAf8IAAHkAYwBfwH/Ae8BtAGWAf8B0AGBAW4B/yQA - AeQBjAF/Af8B+gG+AZsB/wH9AbUBiQH/AdMBgQFlAf8BKwIBAT8BAwIBAQOkAAHlAZQBgQH/AfABvgGh - Af8B1gGBAXIB/wgAAeUBlAGBAf8B8AG+AaEB/wHWAYEBcgH/JAAB5QGUAYEB/wH7Ab8BngH/AWwCBwHr - ASoCAQE9AQMCAQEDqAAB5gGZAYEB/wHvAcQBqgH/AeABhwF2Af8IAAHmAZkBgQH/Ae8BxAGqAf8B4AGH - AXYB/yQAAeYBmQGBAf8B3gGLAX8B/wEeAgEBKAEDAgEBA6wAAecBmgGBAf8B5wGeAYEB/wHhAYgBfAH/ - CAAB5wGaAYEB/wHnAZ4BgQH/AeEBiAF8Af8kAAHnAZoBgQH/ARoCAQEiAQMCAQEC9AABFgIBARwBAwIB - AQL4AAEDAgEBA6gAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAT/BAAE/wQA - AfEBjwH5Af8EAAHxAY8B+QH/BAAB8QGPAfgB/wQAAfEBjwH4AX8EAAHxAY8B+AE/BAAB8QGPAfgBHwQA - AfEBjwH4AQcEAAHxAY8B+AEPBAAB8QGPAfgBHwQAAfEBjwH4AT8EAAHxAY8B+AF/BAAB8QGPAfgB/wQA - Av8B+QH/BAAC/wH7Af8EAAs= + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAe + BQAAAk1TRnQBSQFMAgEBAgEAAQwBAAEMAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + AwABEAMAAQEBAAEgBgABEP8A/wAkAAHTAYEBXAH/AZABZgFCAf8BkAFmAUIB/wgAAdMBgQFcAf8BkAFm + AUIB/wGQAWYBQgH/JAABMQIsAU4DAgEDtAAB2AGBAUoB/wHhAYEBbAH/AZYBawFGAf8IAAHYAYEBSgH/ + AeEBgQFsAf8BlgFrAUYB/yQAAdgBgQFKAf8BMQIsAU20AAHbAYEBTwH/AekBhAF0Af8BngFxAUsB/wgA + AdsBgQFPAf8B6QGEAXQB/wGeAXEBSwH/JAAB2wGBAU8B/wGMAWIBPwH/AS0CKQFFsAAB3AGBAVYB/wHr + AY8BgQH/AaYBdwFRAf8IAAHcAYEBVgH/AesBjwGBAf8BpgF3AVEB/yQAAdwBgQFWAf8B1AGBAVoB/wGM + AWIBPwH/ASgCJQE8rAAB3QGBAV0B/wHrAZMBgQH/Aa8BfgFWAf8IAAHdAYEBXQH/AesBkwGBAf8BrwF+ + AVYB/yQAAd0BgQFdAf8B5gGEAW8B/wHWAXkBOQH/AYwBYgE/Af8BLwIrAUqoAAHfAYEBZgH/AewBlgGB + Af8BtwGBAV0B/wgAAd8BgQFmAf8B7AGWAYEB/wG3AYEBXQH/JAAB3wGBAWYB/wHuAZ0BgQH/AfQBgQFR + Af8B1gF5ATkB/wGMAWIBPwH/ATMCLQFRpAAB4QGDAW8B/wHuAZ8BgQH/AcABgQFiAf8IAAHhAYMBbwH/ + Ae4BnwGBAf8BwAGBAWIB/yQAAeEBgwFvAf8B7wGtAYUB/wH9AZcBfgH/AfQBgQFRAf8B1gF5ATkB/wGm + AXcBUQH/ATkCMQFfAwIBA5wAAeIBigF3Af8B8AGrAY0B/wHIAYEBaAH/CAAB4gGKAXcB/wHwAasBjQH/ + AcgBgQFoAf8kAAHiAYoBdwH/AfoBtgGUAf8B/QGlAYEB/wH9AZcBfgH/Ac0BgQFaAf8BKgInAT8DAgED + oAAB5AGMAX4B/wHvAbQBlgH/AdABgQFtAf8IAAHkAYwBfgH/Ae8BtAGWAf8B0AGBAW0B/yQAAeQBjAF+ + Af8B+gG+AZsB/wH9AbUBiQH/AdMBgQFkAf8BKgInAT8DAgEDpAAB5QGUAYEB/wHwAb4BoQH/AdYBgQFx + Af8IAAHlAZQBgQH/AfABvgGhAf8B1gGBAXEB/yQAAeUBlAGBAf8B+wG/AZ4B/wFrAhUB6wEoAiYBPQMC + AQOoAAHmAZkBgQH/Ae8BxAGqAf8B4AGHAXUB/wgAAeYBmQGBAf8B7wHEAaoB/wHgAYcBdQH/JAAB5gGZ + AYEB/wHeAYsBfgH/ARwCGwEoAwIBA6wAAecBmgGBAf8B5wGeAYEB/wHhAYgBewH/CAAB5wGaAYEB/wHn + AZ4BgQH/AeEBiAF7Af8kAAHnAZoBgQH/AxgBIgMBAQL0AAMUARwDAQEC+AADAgEDqAABQgFNAT4HAAE+ + AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEABP8EAAT/BAAB8QGPAfkB/wQAAfEBjwH5Af8EAAHx + AY8B+AH/BAAB8QGPAfgBfwQAAfEBjwH4AT8EAAHxAY8B+AEfBAAB8QGPAfgBBwQAAfEBjwH4AQ8EAAHx + AY8B+AEfBAAB8QGPAfgBPwQAAfEBjwH4AX8EAAHxAY8B+AH/BAAC/wH5Af8EAAL/AfsB/wQACw== - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA - CxMBAJqcGAAAAXxJREFUOE9j+P//PwM6Tuh5woZNHJsYhmaQIqABpkDMQowhWA0onPX8f/zkt/bohoDE - G+Y9/xXb8fANzHCsBuTOfPY/ofve/7gJr72QvQMSX3Xk/f/w9gdA/RCvYzUgY8rT//P2//4f1HDzL9CA - bJghIPGF+z78D264ht8AoIb/s/f9+t+59e9/t9LL/4H8PJAhIPFpW97/96++gN+AyK5H/6ds+/W/ZOnf - /wnT//63yT0LNgQk3rv6w3+v0hP4DQhsfvi/de17sGbjki//paOv/TeOXPYfJF43/91/l/wD+A3wqLr/ - v2TuO7hmRZee/9I+qztA4vnT3vy3z9iO3wD70rv/A1uegW2GaF5ZDwpxkHj25Nf/LRLW4zfAIu/Of5uC - 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 + rkJggg== - + - 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 + TkSuQmCC - + - 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 - 3zFd8J/oO/gDpYIVhUFyWDsAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAsTAAALEwEAmpwYAAACX0lE + QVQ4T6WSa0hTYRjHD/TBvhRdqE99Koi+RFFB9SGjUAsvLYzEjMxFTKVkk6XpSC1N0eVtadqMvAw1b5Uo + KUUiJI7uGs7oIpEauZa1s3nP4tc5RwZNBgW98OPA+77/3/O8D0cA/gufmz3tOXTdzqS1KhVtTMh2X3c8 + CC21RXoJPFQVHMdpr2PSfoORwXySNUEUZeu5ZjRgyk6SCVwsYEZsZs7VxIyzHku5nqnxGpJjVbbXvSlc + OBtKinoH9p6TjHesRxt9SMotEsjhOVcDZTkn6LPmI34qYWzQwAfrKdoqVMRG+VOXto4XRQLxx0K8BU01 + BQsC8RbGtGgy9JEYEiI4Hx+OXqNCpw4lLiqAYu0GRRAZ7O8tqK80Mis2MuswMzWai+NVAraa1QoD1avo + K1/GU5OfEpYJ2L3VW2Ax5zDtqGJ6OIupN2eYfHkEsX05hdUd5JpbuXi1kRSjBV1mBbGpJqIT87wFlaWZ + TIyYmBzUMPEsFPejbXy5u0YJe9bc/E+crhmGx5xExF0iLMYgby8IKgrTEd9m4X4ShLt7M67OtYxUC0pl + eVXe6VEwN3QxMGRXwg96bRwIV8vHglCal8q3/nO4ujYh3luJo9mPoZuC0vaP+V98d0uVPzsZeG/H2v+R + 4CgdQVJ4/8HD+O/Zi1B8OQnH4zgpvIKvLUsZrV2CrUxAK71ZbtvTwXWpgxJLJ23dNuUrs2vLRoQrGYnK + D+KZsgeNNLA/Kz+0vlPCzff7aOh47iUILEw/Lf1hKtThgYTt26kcyNOW3+yp5gtFIA/CF0elacsX/obP + 8L+D8Bsb4cocWY3wtQAAAABJRU5ErkJggg== - + - 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 + 8L+D8Bsb4cocWY3wtQAAAABJRU5ErkJggg== - + 26 \ No newline at end of file diff --git a/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj b/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj index 932197390ef..2169829858b 100644 --- a/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj +++ b/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj @@ -140,6 +140,7 @@ + ..\..\..\sdk\binaries\WeifenLuo.WinFormsUI.Docking.dll