Skip to content

Commit

Permalink
Try to fix xrWeatherEditor forms load error in Visual Studio.
Browse files Browse the repository at this point in the history
  • Loading branch information
@intorr
intorr committed Jan 3, 2018
1 parent 7c795da commit ad74c46
Show file tree
Hide file tree
Showing 8 changed files with 139 additions and 190 deletions.
33 changes: 16 additions & 17 deletions src/editors/xrWeatherEditor/window_ide.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -15,11 +20,6 @@ class engine_base;
} // namespace Editor
} // namespace XRay

namespace editor
{
ref class window_ide;
}

namespace WeifenLuo
{
namespace WinFormsUI
Expand Down Expand Up @@ -88,35 +88,34 @@ 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);
this->Controls->Add(this->EditorDock);
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:
Expand Down
16 changes: 5 additions & 11 deletions src/editors/xrWeatherEditor/window_levels.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>(
((((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>(((((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:
Expand Down
4 changes: 2 additions & 2 deletions src/editors/xrWeatherEditor/window_levels.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
83 changes: 39 additions & 44 deletions src/editors/xrWeatherEditor/window_tree_values.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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);
Expand All @@ -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;
Expand All @@ -179,92 +178,87 @@ 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<System::Windows::Forms::ImageListStreamer ^>(resources->GetObject(L"Images.ImageStream")));
//
this->Images->ImageStream = (cli::safe_cast<System::Windows::Forms::ImageListStreamer^>(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;
this->panel6->Location = System::Drawing::Point(0, 337);
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;
this->panel8->Location = System::Drawing::Point(313, 0);
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";
this->OK_Button->Size = System::Drawing::Size(75, 23);
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";
this->Cancel_Button->Size = System::Drawing::Size(75, 23);
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;
Expand All @@ -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<System::Byte>(204)));
this->Font = (gcnew System::Drawing::Font(L"Tahoma", 8.25F, System::Drawing::FontStyle::Regular, System::Drawing::GraphicsUnit::Point,
static_cast<System::Byte>(204)));
this->MaximizeBox = false;
this->MinimizeBox = false;
this->Name = L"window_tree_values";
Expand All @@ -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:
Expand Down
Loading

0 comments on commit ad74c46

Please sign in to comment.