Skip to content

Commit d4128a2

Browse files
author
Pavel Kovalenko
committed
Delete editor_controls and use xrSdkControls instead.
1 parent 1f913bf commit d4128a2

File tree

81 files changed

+217
-840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+217
-840
lines changed

‎src/editor/editor.vcxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,13 @@
102102
</ItemDefinitionGroup>
103103
<ItemGroup>
104104
<Reference Include="DockPanelSkin">
105-
<HintPath>..\..\sdk\binaries\DockPanelSkin.dll</HintPath>
105+
<HintPath>$(xrSdkDir)binaries\DockPanelSkin.dll</HintPath>
106106
</Reference>
107107
<Reference Include="Flobbster.Windows.Forms.PropertyGrid">
108-
<HintPath>..\..\sdk\binaries\Flobbster.Windows.Forms.PropertyGrid.dll</HintPath>
108+
<HintPath>$(xrSdkDir)binaries\Flobbster.Windows.Forms.PropertyGrid.dll</HintPath>
109+
</Reference>
110+
<Reference Include="WeifenLuo.WinFormsUI.Docking">
111+
<HintPath>$(xrSdkDir)binaries\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
109112
</Reference>
110113
<Reference Include="Microsoft.VisualC">
111114
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
@@ -135,9 +138,6 @@
135138
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
136139
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
137140
</Reference>
138-
<Reference Include="WeifenLuo.WinFormsUI.Docking">
139-
<HintPath>..\..\sdk\binaries\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
140-
</Reference>
141141
</ItemGroup>
142142
<ItemGroup>
143143
<ClCompile Include="AssemblyInfo.cpp" />
@@ -345,8 +345,8 @@
345345
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
346346
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
347347
</ProjectReference>
348-
<ProjectReference Include="$(SolutionDir)editor_controls\editor_controls.vcxproj">
349-
<Project>{b45374aa-c7ed-42cf-bbd3-deaa2b7acb48}</Project>
348+
<ProjectReference Include="$(SolutionDir)editors\xrSdkControls\xrSdkControls.csproj">
349+
<Project>{e9dc16a3-d0fa-4924-af6e-f6fdf3ea0661}</Project>
350350
</ProjectReference>
351351
</ItemGroup>
352352
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎src/editor/property_boolean.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ property_boolean::!property_boolean ()
2929
delete (m_setter);
3030
}
3131

32-
System::Object ^property_boolean::get_value ()
32+
System::Object ^property_boolean::GetValue ()
3333
{
3434
return ((*m_getter)());
3535
}
3636

37-
void property_boolean::set_value (System::Object ^object)
37+
void property_boolean::SetValue (System::Object ^object)
3838
{
3939
(*m_setter) (safe_cast<bool>(object));
4040
}

‎src/editor/property_boolean.hpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
#define PROPERTY_BOOLEAN_HPP_INCLUDED
1111

1212
#include "property_holder_include.hpp"
13+
using XRay::SdkControls::IProperty;
1314

14-
public ref class property_boolean : public property_value {
15+
public ref class property_boolean : public IProperty {
1516
public:
1617
typedef editor::property_holder::boolean_getter_type boolean_getter_type;
1718
typedef editor::property_holder::boolean_setter_type boolean_setter_type;
@@ -23,8 +24,8 @@ public ref class property_boolean : public property_value {
2324
);
2425
virtual ~property_boolean ();
2526
!property_boolean ();
26-
virtual System::Object ^get_value ();
27-
virtual void set_value (System::Object ^object);
27+
virtual System::Object ^GetValue ();
28+
virtual void SetValue (System::Object ^object);
2829

2930
private:
3031
boolean_getter_type *m_getter;

‎src/editor/property_boolean_reference.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ property_boolean_reference::!property_boolean_reference ()
2424
delete (m_value);
2525
}
2626

27-
System::Object ^property_boolean_reference::get_value ()
27+
System::Object ^property_boolean_reference::GetValue ()
2828
{
2929
return (m_value->get());
3030
}
3131

32-
void property_boolean_reference::set_value (System::Object ^object)
32+
void property_boolean_reference::SetValue (System::Object ^object)
3333
{
3434
bool value = safe_cast<bool>(object);
3535
m_value->set (value);

‎src/editor/property_boolean_reference.hpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111

1212
#include "property_holder_include.hpp"
1313

14-
public ref class property_boolean_reference : public property_value {
14+
public ref class property_boolean_reference : public XRay::SdkControls::IProperty
15+
{
1516
public:
1617
property_boolean_reference (bool& value);
1718
virtual ~property_boolean_reference ();
1819
!property_boolean_reference ();
19-
virtual System::Object ^get_value ();
20-
virtual void set_value (System::Object ^object);
20+
virtual System::Object ^GetValue ();
21+
virtual void SetValue (System::Object ^object);
2122

2223
private:
2324
value_holder<bool>* m_value;

‎src/editor/property_boolean_values_value.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ property_boolean_values_value::property_boolean_values_value (
2323
m_collection->Add (to_string(values[i]));
2424
}
2525

26-
void property_boolean_values_value::set_value (Object ^object)
26+
void property_boolean_values_value::SetValue (Object ^object)
2727
{
2828
String^ string_value = dynamic_cast<String^>(object);
2929
int index = m_collection->IndexOf(string_value);
3030
VERIFY ((index < 2));
3131
VERIFY ((index >= 0));
32-
inherited::set_value ((index == 1));
32+
inherited::SetValue ((index == 1));
3333
}

‎src/editor/property_boolean_values_value.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public ref class property_boolean_values_value : public property_boolean {
2727
boolean_setter_type const &setter,
2828
LPCSTR values[2]
2929
);
30-
virtual void set_value (Object ^object) override;
30+
virtual void SetValue (Object ^object) override;
3131

3232
public:
3333
collection_type ^m_collection;

‎src/editor/property_boolean_values_value_reference.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ property_boolean_values_value_reference::property_boolean_values_value_reference
2222
m_collection->Add (to_string(values[i]));
2323
}
2424

25-
void property_boolean_values_value_reference::set_value (Object ^object)
25+
void property_boolean_values_value_reference::SetValue (Object ^object)
2626
{
2727
String^ string_value = dynamic_cast<String^>(object);
2828
int index = m_collection->IndexOf(string_value);
2929
VERIFY ((index < 2));
3030
VERIFY ((index >= 0));
31-
inherited::set_value ((index == 1));
31+
inherited::SetValue ((index == 1));
3232
}

‎src/editor/property_boolean_values_value_reference.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public ref class property_boolean_values_value_reference : public property_boole
2323

2424
public:
2525
property_boolean_values_value_reference (bool& value, LPCSTR values[2]);
26-
virtual void set_value (Object ^object) override;
26+
virtual void SetValue (Object ^object) override;
2727

2828
public:
2929
collection_type ^m_collection;

‎src/editor/property_collection_base.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ property_collection_base::!property_collection_base ()
2828
{
2929
}
3030

31-
Object ^property_collection_base::get_value ()
31+
Object ^property_collection_base::GetValue ()
3232
{
3333
return (this);
3434
}
3535

36-
void property_collection_base::set_value (Object ^object)
36+
void property_collection_base::SetValue (Object ^object)
3737
{
3838
}
3939

0 commit comments

Comments
 (0)