From 3b573311c8a1dc608eaa7dee37d259de2496d14b Mon Sep 17 00:00:00 2001 From: codereader Date: Thu, 1 Apr 2021 20:27:03 +0200 Subject: [PATCH] #5567: Rearrange the table --- install/ui/materialeditor.fbp | 680 +++++++++++++++++++--------------- install/ui/materialeditor.xrc | 175 ++++++--- 2 files changed, 505 insertions(+), 350 deletions(-) diff --git a/install/ui/materialeditor.fbp b/install/ui/materialeditor.fbp index 6f99d88b4d..e245d9fb30 100644 --- a/install/ui/materialeditor.fbp +++ b/install/ui/materialeditor.fbp @@ -1288,14 +1288,14 @@ wxVERTICAL none - 0 - wxEXPAND + 12 + wxEXPAND|wxLEFT|wxRIGHT 1 - 4 + 3 wxBOTH - 0,1,2,3 - 1 + 2 + 0 6 fgSizer21 @@ -1304,71 +1304,10 @@ 0 6 - 12 - wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Editor Image - 0 - - 0 - - - 0 - - 1 - m_staticText6811 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 12 - wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP + 6 + wxSHAPED 0 - + 1 1 1 @@ -1379,6 +1318,7 @@ + 1 0 @@ -1396,16 +1336,14 @@ 0 0 wxID_ANY - Diffuse - 0 0 0 - + -1,-1 1 - m_staticText681 + BasicEditorImageTabImage 1 @@ -1414,20 +1352,18 @@ Resizable 1 - - + 40,40 ; ; forward_declare 0 - -1 - 12 - wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP + 0 + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -1457,7 +1393,7 @@ 0 0 wxID_ANY - Bump + Editor Image: 0 0 @@ -1466,7 +1402,7 @@ 0 1 - m_staticText6812 + m_staticText6811 1 @@ -1487,69 +1423,94 @@ - 12 - wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP + 0 + wxEXPAND 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Specular - 0 - - 0 - - - 0 + - 1 - m_staticText6813 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 + bSizer82 + wxHORIZONTAL + none + + 0 + wxALIGN_CENTER_VERTICAL + 1 + + + bSizer811 + wxVERTICAL + none + + 0 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + BasicEditorImageEntry + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + - 12 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxSHAPED|wxTOP + 6 + wxSHAPED 0 1 @@ -1585,9 +1546,9 @@ 0 - 120,120 + -1,-1 1 - BasicEditorImageTabImage + BasicDiffuseTabImage 1 @@ -1596,7 +1557,7 @@ Resizable 1 - 120,120 + 40,40 ; ; forward_declare 0 @@ -1606,10 +1567,10 @@ - 12 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxSHAPED|wxTOP + 0 + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP 0 - + 1 1 1 @@ -1620,7 +1581,6 @@ - 1 0 @@ -1638,14 +1598,16 @@ 0 0 wxID_ANY + Diffusemap: + 0 0 0 - 120,120 + 1 - BasicDiffuseTabImage + m_staticText681 1 @@ -1654,76 +1616,106 @@ Resizable 1 - -1,-1 + + ; ; forward_declare 0 + -1 - 12 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxSHAPED|wxTOP + 0 + wxEXPAND 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - 120,120 - 1 - BasicBumpTabImage - 1 - - - protected - 1 - - Resizable - 1 - -1,-1 - ; ; forward_declare - 0 - - - - + + + bSizer84 + wxHORIZONTAL + none + + 0 + wxALIGN_CENTER_VERTICAL + 1 + + + bSizer83 + wxVERTICAL + none + + 0 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + BasicDiffuseImageEntry + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + - 12 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxSHAPED|wxTOP + 6 + wxSHAPED 0 1 @@ -1759,9 +1751,9 @@ 0 - 120,120 + -1,-1 1 - BasicSpecularTabImage + BasicBumpTabImage 1 @@ -1770,7 +1762,7 @@ Resizable 1 - -1,-1 + 40,40 ; ; forward_declare 0 @@ -1781,9 +1773,9 @@ 0 - wxALIGN_CENTER_HORIZONTAL|wxALL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP 0 - + 1 1 1 @@ -1811,15 +1803,16 @@ 0 0 wxID_ANY + Bumpmap: + 0 0 - 0 1 - BasicEditorImageEntry + m_staticText6812 1 @@ -1833,21 +1826,103 @@ ; ; forward_declare 0 - - wxFILTER_NONE - wxDefaultValidator - - + -1 0 - wxALIGN_CENTER_HORIZONTAL|wxALL + wxEXPAND + 1 + + + bSizer87 + wxHORIZONTAL + none + + 0 + wxALIGN_CENTER_VERTICAL + 1 + + + bSizer88 + wxVERTICAL + none + + 0 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + BasicBumpImageEntry + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + 6 + wxSHAPED 0 - + 1 1 1 @@ -1858,6 +1933,7 @@ + 1 0 @@ -1878,12 +1954,11 @@ 0 - 0 - + -1,-1 1 - BasicDiffuseImageEntry + BasicSpecularTabImage 1 @@ -1892,16 +1967,10 @@ Resizable 1 - - + 40,40 ; ; forward_declare 0 - - wxFILTER_NONE - wxDefaultValidator - - @@ -1909,9 +1978,9 @@ 0 - wxALIGN_CENTER_HORIZONTAL|wxALL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP 0 - + 1 1 1 @@ -1939,15 +2008,16 @@ 0 0 wxID_ANY + Specularmap: + 0 0 - 0 1 - BasicBumpImageEntry + m_staticText6813 1 @@ -1961,78 +2031,96 @@ ; ; forward_declare 0 - - wxFILTER_NONE - wxDefaultValidator - - + -1 0 - wxALIGN_CENTER_HORIZONTAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 + wxEXPAND + 1 + - 1 - BasicSpecularImageEntry - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - + bSizer90 + wxHORIZONTAL + none + + 0 + wxALIGN_CENTER_VERTICAL + 1 + + + bSizer891 + wxVERTICAL + none + + 0 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + BasicSpecularImageEntry + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + diff --git a/install/ui/materialeditor.xrc b/install/ui/materialeditor.xrc index 29ae434ab9..598151cb6d 100644 --- a/install/ui/materialeditor.xrc +++ b/install/ui/materialeditor.xrc @@ -230,114 +230,181 @@ wxVERTICAL - wxEXPAND - 0 + wxEXPAND|wxLEFT|wxRIGHT + 12 0 - 4 + 3 6 6 - 0,1,2,3 - 1 + 2 + 0 - wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP - 12 - - - -1 + wxSHAPED + 6 + + 40,40 + - wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP - 12 - - + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP + 0 + + -1 - wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP - 12 - - - -1 + wxEXPAND + 0 + + wxHORIZONTAL + + + wxALIGN_CENTER_VERTICAL + 0 + + wxVERTICAL + + + wxEXPAND + 0 + + + + + + - wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP - 12 - - - -1 + wxSHAPED + 6 + + 40,40 + - wxALIGN_CENTER_HORIZONTAL|wxALL|wxSHAPED|wxTOP - 12 - - 120,120 - + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP + 0 + + + -1 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxSHAPED|wxTOP - 12 - - + wxEXPAND + 0 + + wxHORIZONTAL + + + wxALIGN_CENTER_VERTICAL + 0 + + wxVERTICAL + + + wxALL|wxEXPAND + 0 + + + + + + - wxALIGN_CENTER_HORIZONTAL|wxALL|wxSHAPED|wxTOP - 12 + wxSHAPED + 6 + 40,40 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxSHAPED|wxTOP - 12 - - + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP + 0 + + + -1 - - wxALIGN_CENTER_HORIZONTAL|wxALL + + wxEXPAND 0 - - + + wxHORIZONTAL + + + wxALIGN_CENTER_VERTICAL + 0 + + wxVERTICAL + + + wxALL|wxEXPAND + 0 + + + + + + - wxALIGN_CENTER_HORIZONTAL|wxALL - 0 - - + wxSHAPED + 6 + + 40,40 + - wxALIGN_CENTER_HORIZONTAL|wxALL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP 0 - - + + + -1 - - wxALIGN_CENTER_HORIZONTAL|wxALL + + wxEXPAND 0 - - + + wxHORIZONTAL + + + wxALIGN_CENTER_VERTICAL + 0 + + wxVERTICAL + + + wxALL|wxEXPAND + 0 + + + + + +