Skip to content

Commit 241d4a0

Browse files
author
realmany
committed
update editor
1 parent 6a93893 commit 241d4a0

23 files changed

+469
-87
lines changed

‎Bin/DataEditor/config/editconfig.xml‎

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,48 @@
1-
<editParams>
1+
<editparams>
22
<params>
3-
<gridsize val="40.0"/>
3+
<gridsize val="40.000000"/>
44
</params>
5-
<themes curthemename="blue">
5+
<themes curthemename="dark">
66
<theme name="blue">
7-
<aui_backgournd val="41, 67, 95"/>
8-
<aui_captionbackground val="77, 96, 130"/>
9-
<aui_captionbackground_active val="255, 242, 157"/>
10-
<aui_border val="41, 57, 85"/>
11-
<aui_borderthin val="142, 155, 188"/>
12-
<aui_borderthin_center val="41, 57, 85"/>
13-
<aui_menubar_background val="214, 219, 233"/>
14-
<aui_toolbar_background val="207, 214, 233"/>
15-
<aui_toolbar_border val="207, 214, 233"/>
16-
<aui_toolbar_text val="0, 0, 0"/>
17-
<aui_tabbar val="54, 78, 111"/>
18-
<aui_tabbar_active val="255, 242, 157"/>
19-
<aui_tabbartext val="255, 255, 255"/>
20-
<aui_tabbartext_active val="0, 0, 0"/>
7+
<aui_backgournd val="41,67,95"/>
8+
<aui_captionbackground val="77,96,130"/>
9+
<aui_captionbackground_active val="255,242,157"/>
10+
<aui_captiontext val="255,255,255"/>
11+
<aui_captiontext_active val="0,0,0"/>
12+
<aui_border val="41,57,85"/>
13+
<aui_borderthin val="142,155,188"/>
14+
<aui_borderthin_center val="41,57,85"/>
15+
<aui_menubar_background val="214,219,233"/>
16+
<aui_toolbar_background val="207,214,233"/>
17+
<aui_toolbar_border val="207,214,233"/>
18+
<aui_toolbar_text val="0,0,0"/>
19+
<aui_tabbar val="54,78,111"/>
20+
<aui_tabbar_active val="255,242,157"/>
21+
<aui_tabbartext val="255,255,255"/>
22+
<aui_tabbartext_active val="0,0,0"/>
23+
<page_background val="255,255,255"/>
24+
<page_foreground val="0,0,0"/>
2125
</theme>
2226
<theme name="dark">
23-
<aui_backgournd val="45, 45, 48"/>
24-
<aui_captionbackground val="2, 0, 0"/>
25-
<aui_captionbackground_active val="0, 122, 204"/>
26-
<aui_border val="45, 45, 48"/>
27-
<aui_borderthin val="45, 45, 48"/>
28-
<aui_borderthin_center val="45, 45, 48"/>
29-
<aui_menubar_background val="45, 45, 48"/>
30-
<aui_toolbar_background val="45, 45, 48"/>
31-
<aui_toolbar_border val="45, 45, 48"/>
32-
<aui_toolbar_text val="255, 255, 255"/>
33-
<aui_tabbar val="45, 45, 48"/>
34-
<aui_tabbar_active val="0, 122, 204"/>
35-
<aui_tabbartext val="255, 255, 255"/>
36-
<aui_tabbartext_active val="255, 255, 255"/>
27+
<aui_backgournd val="45,45,48"/>
28+
<aui_captionbackground val="2,0,0"/>
29+
<aui_captionbackground_active val="0,122,204"/>
30+
<aui_captiontext val="200,200,200"/>
31+
<aui_captiontext_active val="255,255,255"/>
32+
<aui_border val="45,45,48"/>
33+
<aui_borderthin val="45,45,48"/>
34+
<aui_borderthin_center val="45,45,48"/>
35+
<aui_menubar_background val="45,45,48"/>
36+
<aui_toolbar_background val="45,45,48"/>
37+
<aui_toolbar_border val="45,45,48"/>
38+
<aui_toolbar_text val="255,255,255"/>
39+
<aui_tabbar val="45,45,48"/>
40+
<aui_tabbar_active val="0,122,204"/>
41+
<aui_tabbartext val="255,255,255"/>
42+
<aui_tabbartext_active val="255,255,255"/>
43+
<page_background val="45,45,48"/>
44+
<page_foreground val="150,150,150"/>
3745
</theme>
3846
</themes>
39-
</editParams>
47+
</editparams>
4048

‎Bin/DataEditor/scripts/functions.lua‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,13 @@ function e_OnPlayConfig()
150150
E_MainFrame:OnPlayConfig()
151151
end
152152

153+
function e_OnSetting()
154+
E_MainFrame:OnSetting()
155+
end
156+
157+
function e_OnAbout()
158+
end
159+
153160
-- edit mode
154161
function e_SetEditMode_Scene()
155162
PX2_EDIT:SetEditType(Edit.ET_SCENE)

‎Bin/DataEditor/scripts/language.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ function AddLanguages()
6060
PX2_LM:AddItem1("Setting", "设置")
6161

6262
PX2_LM:AddItem1("Help", "帮助")
63+
PX2_LM:AddItem1("About", "关于")
6364

6465
-- 编辑菜单
6566
PX2_LM:AddItem1("Create", "创建")

‎Bin/DataEditor/scripts/mainframe.lua‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ function e_CreateMainMenu()
6262
E_MainFrame:AddMenuItem(itemTool, PX2_LM:GetValue("VersionWindows"), "e_OnVersionWindows()", "edit")
6363
E_MainFrame:AddMenuItem(itemTool, PX2_LM:GetValue("VersionAndroid"), "e_OnVersionAndroid()", "edit")
6464
E_MainFrame:AddMenuItem(itemTool, PX2_LM:GetValue("VersionIOS"), "e_OnVersionIOS()", "edit")
65-
E_MainFrame:AddMenuItem(itemTool, PX2_LM:GetValue("Setting"), "e_OnSetting()", "edit")
65+
E_MainFrame:AddSeparater(itemTool)
66+
E_MainFrame:AddMenuItem(itemTool, PX2_LM:GetValue("Setting"), "e_OnSetting()", "")
6667
--help
6768
local itemHelp = E_MainFrame:AddMainMenuItem((PX2_LM:GetValue("Help")))
69+
E_MainFrame:AddMenuItem(itemHelp, PX2_LM:GetValue("About"), "e_OnAbout()", "")
6870
end

‎Bin/DataEditor/wxfbp/px2wxfbp.fbp‎

Lines changed: 157 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7477,7 +7477,7 @@
74777477
</object>
74787478
</object>
74797479
</object>
7480-
<object class="Dialog" expanded="1">
7480+
<object class="Dialog" expanded="0">
74817481
<property name="aui_managed">0</property>
74827482
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
74837483
<property name="bg"></property>
@@ -7539,16 +7539,16 @@
75397539
<event name="OnSetFocus"></event>
75407540
<event name="OnSize"></event>
75417541
<event name="OnUpdateUI"></event>
7542-
<object class="wxBoxSizer" expanded="1">
7542+
<object class="wxBoxSizer" expanded="0">
75437543
<property name="minimum_size"></property>
75447544
<property name="name">bSizer47</property>
75457545
<property name="orient">wxVERTICAL</property>
75467546
<property name="permission">none</property>
7547-
<object class="sizeritem" expanded="1">
7547+
<object class="sizeritem" expanded="0">
75487548
<property name="border">5</property>
75497549
<property name="flag">wxEXPAND|wxALIGN_CENTER_HORIZONTAL</property>
75507550
<property name="proportion">1</property>
7551-
<object class="wxBoxSizer" expanded="1">
7551+
<object class="wxBoxSizer" expanded="0">
75527552
<property name="minimum_size"></property>
75537553
<property name="name">bSizer48</property>
75547554
<property name="orient">wxVERTICAL</property>
@@ -7647,11 +7647,11 @@
76477647
</object>
76487648
</object>
76497649
</object>
7650-
<object class="sizeritem" expanded="1">
7650+
<object class="sizeritem" expanded="0">
76517651
<property name="border">5</property>
76527652
<property name="flag">wxEXPAND</property>
76537653
<property name="proportion">1</property>
7654-
<object class="wxBoxSizer" expanded="1">
7654+
<object class="wxBoxSizer" expanded="0">
76557655
<property name="minimum_size"></property>
76567656
<property name="name">bSizer51</property>
76577657
<property name="orient">wxHORIZONTAL</property>
@@ -9401,5 +9401,156 @@
94019401
</object>
94029402
</object>
94039403
</object>
9404+
<object class="Panel" expanded="1">
9405+
<property name="aui_managed">0</property>
9406+
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
9407+
<property name="bg">wxSYS_COLOUR_INACTIVECAPTION</property>
9408+
<property name="context_help"></property>
9409+
<property name="context_menu">1</property>
9410+
<property name="enabled">1</property>
9411+
<property name="event_handler">impl_virtual</property>
9412+
<property name="fg">wxSYS_COLOUR_3DLIGHT</property>
9413+
<property name="font"></property>
9414+
<property name="hidden">0</property>
9415+
<property name="id">wxID_ANY</property>
9416+
<property name="maximum_size"></property>
9417+
<property name="minimum_size"></property>
9418+
<property name="name">MyPanel3</property>
9419+
<property name="pos"></property>
9420+
<property name="size">500,300</property>
9421+
<property name="subclass"></property>
9422+
<property name="tooltip"></property>
9423+
<property name="window_extra_style"></property>
9424+
<property name="window_name"></property>
9425+
<property name="window_style">wxTAB_TRAVERSAL</property>
9426+
<event name="OnAuiFindManager"></event>
9427+
<event name="OnAuiPaneButton"></event>
9428+
<event name="OnAuiPaneClose"></event>
9429+
<event name="OnAuiPaneMaximize"></event>
9430+
<event name="OnAuiPaneRestore"></event>
9431+
<event name="OnAuiRender"></event>
9432+
<event name="OnChar"></event>
9433+
<event name="OnEnterWindow"></event>
9434+
<event name="OnEraseBackground"></event>
9435+
<event name="OnInitDialog"></event>
9436+
<event name="OnKeyDown"></event>
9437+
<event name="OnKeyUp"></event>
9438+
<event name="OnKillFocus"></event>
9439+
<event name="OnLeaveWindow"></event>
9440+
<event name="OnLeftDClick"></event>
9441+
<event name="OnLeftDown"></event>
9442+
<event name="OnLeftUp"></event>
9443+
<event name="OnMiddleDClick"></event>
9444+
<event name="OnMiddleDown"></event>
9445+
<event name="OnMiddleUp"></event>
9446+
<event name="OnMotion"></event>
9447+
<event name="OnMouseEvents"></event>
9448+
<event name="OnMouseWheel"></event>
9449+
<event name="OnPaint"></event>
9450+
<event name="OnRightDClick"></event>
9451+
<event name="OnRightDown"></event>
9452+
<event name="OnRightUp"></event>
9453+
<event name="OnSetFocus"></event>
9454+
<event name="OnSize"></event>
9455+
<event name="OnUpdateUI"></event>
9456+
<object class="wxBoxSizer" expanded="1">
9457+
<property name="minimum_size"></property>
9458+
<property name="name">bSizer68</property>
9459+
<property name="orient">wxVERTICAL</property>
9460+
<property name="permission">none</property>
9461+
<object class="sizeritem" expanded="1">
9462+
<property name="border">5</property>
9463+
<property name="flag">wxEXPAND</property>
9464+
<property name="proportion">0</property>
9465+
<object class="wxSearchCtrl" expanded="1">
9466+
<property name="BottomDockable">1</property>
9467+
<property name="LeftDockable">1</property>
9468+
<property name="RightDockable">1</property>
9469+
<property name="TopDockable">1</property>
9470+
<property name="aui_layer"></property>
9471+
<property name="aui_name"></property>
9472+
<property name="aui_position"></property>
9473+
<property name="aui_row"></property>
9474+
<property name="best_size"></property>
9475+
<property name="bg">wxSYS_COLOUR_HIGHLIGHT</property>
9476+
<property name="cancel_button">0</property>
9477+
<property name="caption"></property>
9478+
<property name="caption_visible">1</property>
9479+
<property name="center_pane">0</property>
9480+
<property name="close_button">1</property>
9481+
<property name="context_help"></property>
9482+
<property name="context_menu">1</property>
9483+
<property name="default_pane">0</property>
9484+
<property name="dock">Dock</property>
9485+
<property name="dock_fixed">0</property>
9486+
<property name="docking">Left</property>
9487+
<property name="enabled">1</property>
9488+
<property name="fg">wxSYS_COLOUR_HIGHLIGHT</property>
9489+
<property name="floatable">1</property>
9490+
<property name="font"></property>
9491+
<property name="gripper">0</property>
9492+
<property name="hidden">0</property>
9493+
<property name="id">wxID_ANY</property>
9494+
<property name="max_size"></property>
9495+
<property name="maximize_button">0</property>
9496+
<property name="maximum_size"></property>
9497+
<property name="min_size"></property>
9498+
<property name="minimize_button">0</property>
9499+
<property name="minimum_size"></property>
9500+
<property name="moveable">1</property>
9501+
<property name="name">m_searchCtrl1</property>
9502+
<property name="pane_border">1</property>
9503+
<property name="pane_position"></property>
9504+
<property name="pane_size"></property>
9505+
<property name="permission">protected</property>
9506+
<property name="pin_button">1</property>
9507+
<property name="pos"></property>
9508+
<property name="resize">Resizable</property>
9509+
<property name="search_button">1</property>
9510+
<property name="show">1</property>
9511+
<property name="size"></property>
9512+
<property name="style"></property>
9513+
<property name="subclass"></property>
9514+
<property name="toolbar_pane">0</property>
9515+
<property name="tooltip"></property>
9516+
<property name="validator_data_type"></property>
9517+
<property name="validator_style">wxFILTER_NONE</property>
9518+
<property name="validator_type">wxDefaultValidator</property>
9519+
<property name="validator_variable"></property>
9520+
<property name="value"></property>
9521+
<property name="window_extra_style"></property>
9522+
<property name="window_name"></property>
9523+
<property name="window_style"></property>
9524+
<event name="OnCancelButton"></event>
9525+
<event name="OnChar"></event>
9526+
<event name="OnEnterWindow"></event>
9527+
<event name="OnEraseBackground"></event>
9528+
<event name="OnKeyDown"></event>
9529+
<event name="OnKeyUp"></event>
9530+
<event name="OnKillFocus"></event>
9531+
<event name="OnLeaveWindow"></event>
9532+
<event name="OnLeftDClick"></event>
9533+
<event name="OnLeftDown"></event>
9534+
<event name="OnLeftUp"></event>
9535+
<event name="OnMiddleDClick"></event>
9536+
<event name="OnMiddleDown"></event>
9537+
<event name="OnMiddleUp"></event>
9538+
<event name="OnMotion"></event>
9539+
<event name="OnMouseEvents"></event>
9540+
<event name="OnMouseWheel"></event>
9541+
<event name="OnPaint"></event>
9542+
<event name="OnRightDClick"></event>
9543+
<event name="OnRightDown"></event>
9544+
<event name="OnRightUp"></event>
9545+
<event name="OnSearchButton"></event>
9546+
<event name="OnSetFocus"></event>
9547+
<event name="OnSize"></event>
9548+
<event name="OnText"></event>
9549+
<event name="OnTextEnter"></event>
9550+
<event name="OnUpdateUI"></event>
9551+
</object>
9552+
</object>
9553+
</object>
9554+
</object>
94049555
</object>
94059556
</wxFormBuilder_Project>

‎Bin/nirvana1.0.0.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Perspective=layout2|name=maintoolbar;caption=;state=2122368;dir=1;layer=10;row=0;pos=0;prop=100000;bestw=242;besth=28;minw=200;minh=28;maxw=200;maxh=28;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=Stage;caption=舞台;state=31459324;dir=5;layer=0;row=0;pos=0;prop=100000;bestw=20;besth=20;minw=0;minh=0;maxw=-1;maxh=-1;floatx=299;floaty=130;floatw=800;floath=600|name=LogicView;caption=逻辑;state=31459326;dir=3;layer=0;row=0;pos=0;prop=90549;bestw=200;besth=100;minw=200;minh=100;maxw=-1;maxh=-1;floatx=1296;floaty=757;floatw=400;floath=250|name=ProjView;caption=工程;state=31459324;dir=4;layer=1;row=0;pos=0;prop=100000;bestw=200;besth=100;minw=200;minh=100;maxw=-1;maxh=-1;floatx=0;floaty=0;floatw=960;floath=1040|name=PreView;caption=预览;state=31459324;dir=2;layer=0;row=1;pos=0;prop=47234;bestw=200;besth=100;minw=200;minh=100;maxw=-1;maxh=-1;floatx=1507;floaty=91;floatw=400;floath=250|name=ResView;caption=资源;state=31459324;dir=2;layer=0;row=1;pos=1;prop=152766;bestw=200;besth=100;minw=200;minh=100;maxw=-1;maxh=-1;floatx=1606;floaty=329;floatw=400;floath=250|name=InspView;caption=检视;state=31459324;dir=2;layer=1;row=0;pos=0;prop=146382;bestw=200;besth=100;minw=200;minh=100;maxw=-1;maxh=-1;floatx=1851;floaty=271;floatw=400;floath=250|name=ConsoleView;caption=控制台;state=31459324;dir=2;layer=1;row=0;pos=1;prop=53618;bestw=200;besth=100;minw=200;minh=100;maxw=-1;maxh=-1;floatx=1823;floaty=717;floatw=400;floath=250|name=TimeLine;caption=时间线;state=31459326;dir=3;layer=0;row=0;pos=0;prop=109451;bestw=200;besth=100;minw=200;minh=100;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|dock_size(1,10,0)=30|dock_size(2,0,1)=260|dock_size(2,1,0)=341|dock_size(5,0,0)=22|dock_size(4,1,0)=430|
1+
Perspective=layout2|name=maintoolbar;caption=;state=2105984;dir=1;layer=10;row=0;pos=0;prop=100000;bestw=242;besth=28;minw=200;minh=28;maxw=200;maxh=28;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=Stage;caption=舞台;state=31459324;dir=5;layer=0;row=0;pos=0;prop=100000;bestw=20;besth=20;minw=0;minh=0;maxw=-1;maxh=-1;floatx=299;floaty=130;floatw=800;floath=600|name=LogicView;caption=逻辑;state=31459326;dir=3;layer=0;row=0;pos=0;prop=90549;bestw=200;besth=100;minw=200;minh=100;maxw=-1;maxh=-1;floatx=1296;floaty=757;floatw=400;floath=250|name=ProjView;caption=工程;state=31459324;dir=4;layer=1;row=0;pos=0;prop=100000;bestw=200;besth=100;minw=200;minh=100;maxw=-1;maxh=-1;floatx=0;floaty=0;floatw=960;floath=1040|name=PreView;caption=预览;state=31475708;dir=2;layer=0;row=1;pos=0;prop=41702;bestw=200;besth=100;minw=200;minh=100;maxw=-1;maxh=-1;floatx=1507;floaty=91;floatw=400;floath=250|name=ResView;caption=资源;state=31459324;dir=2;layer=0;row=1;pos=1;prop=158298;bestw=200;besth=100;minw=200;minh=100;maxw=-1;maxh=-1;floatx=1606;floaty=329;floatw=400;floath=250|name=InspView;caption=检视;state=31459324;dir=2;layer=1;row=0;pos=0;prop=115957;bestw=200;besth=100;minw=200;minh=100;maxw=-1;maxh=-1;floatx=1851;floaty=271;floatw=400;floath=250|name=ConsoleView;caption=控制台;state=31459324;dir=2;layer=1;row=0;pos=1;prop=84043;bestw=200;besth=100;minw=200;minh=100;maxw=-1;maxh=-1;floatx=1823;floaty=717;floatw=400;floath=250|name=TimeLine;caption=时间线;state=31459326;dir=3;layer=0;row=0;pos=0;prop=109451;bestw=200;besth=100;minw=200;minh=100;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|dock_size(1,10,0)=30|dock_size(2,0,1)=371|dock_size(2,1,0)=331|dock_size(5,0,0)=22|dock_size(4,1,0)=349|

‎Phoenix3D/PX2Core/PX2StringHelp.cpp‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,14 +416,26 @@ std::string StringHelp::FormatSeconds (int seconds)
416416
{
417417
if (sec < 10)
418418
{
419-
text = StringHelp::IntToString(min) + ":" + "0" + StringHelp::IntToString(sec);
419+
text = StringHelp::IntToString(min) + ":" + "0"
420+
+ StringHelp::IntToString(sec);
420421
}
421422
else
422423
{
423-
text = StringHelp::IntToString(min) + ":" +StringHelp::IntToString(sec);
424+
text = StringHelp::IntToString(min) + ":" +
425+
StringHelp::IntToString(sec);
424426
}
425427
}
426428

427429
return text;
428430
}
431+
//----------------------------------------------------------------------------
432+
std::string StringHelp::FormatColor(int r, int g, int b)
433+
{
434+
std::string colorStr =
435+
StringHelp::IntToString(r) + "," +
436+
StringHelp::IntToString(g) + "," +
437+
StringHelp::IntToString(b);
438+
439+
return colorStr;
440+
}
429441
//----------------------------------------------------------------------------

‎Phoenix3D/PX2Core/PX2StringHelp.hpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ namespace PX2
7373
int length=-1); //< 如果length<0,表示传入的字符串是已\0结尾
7474

7575
static std::string FormatSeconds (int seconds);
76+
77+
static std::string FormatColor(int r, int g, int b);
7678
};
7779

7880
//----------------------------------------------------------------------------

0 commit comments

Comments
 (0)