From f0c7b38301088ac4962c83e28498a52cccd4dff0 Mon Sep 17 00:00:00 2001
From: nds <nds@opencascade.com>
Date: Wed, 27 Jul 2016 19:31:46 +0300
Subject: [PATCH] Issue #1658 New widget supporting nested option buttons :
 icons size corection (to be redrawn later)

---
 .../icons/plane_by_coincident_to_point_24x24.png | Bin 0 -> 1203 bytes
 .../icons/plane_by_distance_from_other_24x24.png | Bin 0 -> 1173 bytes
 .../icons/plane_by_rotation_24x24.png            | Bin 0 -> 1211 bytes
 src/ConstructionPlugin/plane_widget.xml          |   6 +++---
 .../InitializationPlugin_Plugin.cpp              |  15 ---------------
 5 files changed, 3 insertions(+), 18 deletions(-)
 create mode 100755 src/ConstructionPlugin/icons/plane_by_coincident_to_point_24x24.png
 create mode 100755 src/ConstructionPlugin/icons/plane_by_distance_from_other_24x24.png
 create mode 100755 src/ConstructionPlugin/icons/plane_by_rotation_24x24.png

diff --git a/src/ConstructionPlugin/icons/plane_by_coincident_to_point_24x24.png b/src/ConstructionPlugin/icons/plane_by_coincident_to_point_24x24.png
new file mode 100755
index 0000000000000000000000000000000000000000..13896b3101cea5ca6b6510cde958bde656d5f358
GIT binary patch
literal 1203
zcmV;k1WfyhP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGvt^fcVt^tf)bNB!N02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv000CcNkl<ZNK0eD21MKfxYUCay6iH`9y{e!
zg0VwZ`D2s#oTvIx>Ca3P@}4<nS3YydseEalRsPN~rxF$CR=%@IFZrP4AM+Y&Bm#)K
z26IY#h88Aw&-%6S=+*zrPv8E(;K-H#4a>LwuUxS1e@Jcj|I#_D|JN<u{D0Z0TVVOs
z=kEVsbN&GsuLa^2r|<kPnZ5F_R(Q%rsId?r<PgLv?Gc(DQrq=%?S%*bx8HmP#xwSu
z`QNr?_y75aF8#MkEB-%q=gI$Vt9SjMwf`Jk4KnWAeE6?%eD*F$_h2ok(LlpJJ(+>Q
zk{j7H;nT`9cmE-4$ep?v?1Svd3;wGG#s5$3oAbYZ>6ZV+vsR)QyzR!z|I>G$`KuZf
zw;jcB?a)w0S>G`KfU1r+i;iAHF&u=``se;n?40r6tEBP2yl>=x_rkjW(Jhle!GNM}
z`tH+z9kMI0%X)<wL5&6ipyBd9k!}{r1s9hbzwsAY0}OX>H~{qaq5re?o%^pBmHvOy
zwqyT$fqalSOwHos*Z+E#Ha}7hj17UB3;|01(O%AZH8<uRx`fqm5MFoj;s3_v+y1w&
z-u*wKX#y~Uw}2xVCJzcy*ZkW1a^B&g;%;tCP@^G0!8hutdr|$btVs+0WKUZ3JA2YX
z6r3?(-oJEU5G8ld1O`q0f2-6Ya8QBx>3wtmgXH`w+P(pUB}v9Tloe_$0sxbwlcZ;`
zx3pJ?H;@g)AR2+i-2!~XT>U-7Tml?`I78GWV4|37pd*wI#!?<3Hc~FWY)~Uf2ciz4
zOybV|`ar|Z0`W_6mw<S2mq79jL<izd0rEhDHvsW(ApQ@;*Tr4@U7*sG1E68eKtq3s
zxdi?Oy8auG{Rv3#hDuWp0K<Mh(D18bt^wLmA?gC4;d6ob8qfkgs1S7lFj!^*Ex0b~
z;%@*IA|EIO#RzFfq)8)VDff^zU>UPV-Z#n$T@D-82uqcM8ixv`JcET?3hVNdx@T1Z
zi|tAv2GLcCT{CJDI%m|v`1o)_*NkfWoT?V6kq98_;Kyf{oR`|O=}^n+bN8x&xC)A4
zY-AcMd)3*y)eXzG0xPWYLa4D2pcEJ<;Fw#T+_GkO8?fjtBNumV*xw8+o3d2>VuYYZ
z1B1oam&G=tG_rER`u6pg9#>-1NDQ92_gte#Nn^2UaGWf#q=uSqoW`UTmh4nGV|mxw
z3lGUQe8J%>^<njWZ7M;DataO(j9{~s{i0co6LOqV`{s6H(?l!=7WZ}G4ZU?*VM%IW
zgJD2FCetjTb9%$#6E|wGX(R@(IrpF{wrxt2ZbZ5%uwG||8Vv#ZF&PD3rOneKn<w@~
zwoL4W;i%S0{n2exCZgk*wkZ?hJErx<cT9)l;M(2^I^n5Sz!b;=H5LjO7yv5abm{+s
Ro>u?>002ovPDHLkV1oPkM-%`6

literal 0
HcmV?d00001

diff --git a/src/ConstructionPlugin/icons/plane_by_distance_from_other_24x24.png b/src/ConstructionPlugin/icons/plane_by_distance_from_other_24x24.png
new file mode 100755
index 0000000000000000000000000000000000000000..33fef45587a5fcf3ff6489bf6185542025c9e313
GIT binary patch
literal 1173
zcmV;G1Zw+<P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGvt^fcVt^tf)bNB!N02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv000C8Nkl<ZNK0ct2jXsSjIv%~Mka}Q_ndO8
zJ~-r5ezMCb{Q<|BWj`FU%6~XySHQ7j4l1@uFZpMgQutrqH}W6USP0M#4P}(`4Kp!`
z&pA4A+p#}u&p-H&fiFD#zv1$e|C_Ep{lD?b6EH?+ufO!@fAh*6e~n_Z4nvKG09oH~
zWrLW^9WASN{@8x=)qisFq;1FkS|sP6kn;+&gc{AjAng$<V;rAzylwUF-`j4y#Hx`H
z2I-r=`}AM6kc3^*o?-e>qZt^aJVWJ`17a4{E!pyW>-85{H50-h!zXP&_7@mOmu0-d
zjG;y|Fi3cWh{*XyPRXCX?DLju&#`JI2G2Qg;jd#(<qbu@C~v6I5TFs7I6Hs((m(4j
zJ^sJt`t$#ruRi;~>B>{0@J3){gCca^p^JY_6LU`k<Istrp#f?#6ljGde~)dO{42G0
zHW(*$&-|6pF%6CrJE#9l?w<7(34clMo(aZDT{FJKwomzDmsNfTm?Yg8fT<8_ECNV-
zgxKQ4GM=HfK+V=5EbST6ChHj*B<B-ug^cBWA`C!D9BL#Pz`=n*%r(G7%q8F^5HAsN
z^5uofPzQ)O2k-$6o(RN0f%qj5M@TvNGC`#&2jVV)wm?Il0r7tz{s+XnM4bcWpwg5B
zpn+R}_&X5)24aveK8ZO8<U^$?2cj+k$v{JEf%u-dOTZZ*P7`wpw1Y}h2Z*}_$p9@l
z3p9K)RERPl;^NOM>>3~l!$22n11-1!v|ziKlRqD^7-}3UkoF80b<V5Kh-{jW1H&H0
zjkUls=COir)TQu-{wx>{Yv{`gt?$VQt?NmL;gH(yjKHeSOuNkT0;rJ)Amb4%Xq{G?
z)wlU@%aY^Q>tMKj&7L0BptxuH(HS=v9KBkPhU<X17LJcxsRI`IT`qYw?NDPOKs6{<
z#HFA%qjUZK7GUXE2E$Hy)d%#VGj7Oug?|Q?x-ZR=^3I3U^{hu$gN&!`KHU&d)lsPt
zk}MB38d$1&hH^OMR3z6g-_{1KnJSPqcoa447IzK&3ycF$KKL)`7W^x;z89+n%TL{^
z0a{+K8Ii0b;1B@Gj6$BCth!OD0o98(c5b-*7{zc9Zd<dvS3M-*G0XyBFx{BE<3uaE
zx>aZIR>yZv?^O*=)D?B`Vg?(o797K6nOYQFGG|pMx&|2Ddi{BMOzY&8(w?E;6#Syz
z7S3Eg3ti39lQ(M;yJxj%N2QyC4Tb@;lzi{psY_Z{pSxd$t_c|fE0ji~xa=!#1$BFY
zl|PEwO;?|lXHJ;kW|ENSD(Mx>1~nQ29CNFtq)(VPrC`Rg350N1L+_%5t{Jn?#gltx
nPd19n^p*FH;(!_p1q=)T$jF6_Xvsvz00000NkvXXu0mjfJ!Tek

literal 0
HcmV?d00001

diff --git a/src/ConstructionPlugin/icons/plane_by_rotation_24x24.png b/src/ConstructionPlugin/icons/plane_by_rotation_24x24.png
new file mode 100755
index 0000000000000000000000000000000000000000..5a95ef625bbcdf5b6e26596c876e71aece0efc5c
GIT binary patch
literal 1211
zcmV;s1VsCZP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGvt^fcVt^tf)bNB!N02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv000CkNkl<ZNK37ieM}p57{_lLdyB3Nxw|6K
zxg~}d7Z@%}=(5dK?uu<F^m^r{QYv&%Xa|!qR@(8_ve80chO+)qY}gjroNl_94xy0A
z794gsWp64t)Tl8!r%TW{XJRz-x$?uIUMDPmlW*?wyWHpdyXSfGJ4{Hcx0F2agvsKR
zlvW#XN)v;Y{~x6ll&{d#yWLGkdVXMbJ1vRQ+=b}TtVPhOOoC>TFsT%+Af;&y4{xz~
z5BN{LKl$>zW52NVuG+Z<0C*EgGgnDkWqFWdroMi;l$pO)SD9q+28IuZ$A1f5{r+}$
zcy0k=TD=I&0{koRakyU*c|cNm3)U7@NXlP0F!1X6iQjqny#+8ld>nj=q?jo<ugA5<
z%nD!kJ4fG}i0u4c0>l&}0q~a*IL)M^<tgc$zJWI`e(@K0E&&9T1%PS<e^X4USD{CD
zq<43o4u15_tO62qbN@E75WvI7z-I*Ey!0;r(8>P@AY_`w0Mo$u9gd^9CH#A&j9G_v
zJ_z?25txvQUH;*okG~ZR$g?_|VC*&k<Sbl&2LA*hXJG`}VeJt36<Aw|P{Pu?I>T>`
zT@wsY)HHi|5I`oue}I1lUm_^x8eE6PGDf&8GX()7(E`+UZB~*}J&Mz+d;s<nl<EdS
zvn6of0-hu&wFzOOOYiod?;Zb6Fkrd|FxLxV&exN)x>B62z8``(2)GUoAWU>Y4?gJq
z<odq?UK$*|Dc@<YPLMJ&P$oI}5;(}e13l0I{00Ocj6m)t7}E=V{|GoX`uXibhp#U~
zyDb@~+0_7^0G|VA;@KJzz}vyMpyBNZ6J5}Q%hO=KRDshMZgMv7F+!%op(OmyKLv*f
znK}i%g5jH$u_VoAky%VKT8b_RxH28!>mT`1+tT4*qb+{~!7qcuJbb0Jcs@7=r{s%b
zH|8w8o8va-F2%FhW%yI<GHk1>^FtoqIXHStX>HlJu4r2VK-Zw1hryCmwn((8+?=0d
zc5Kh7bv&=MIIGzP&knB9Qx)Cboz(V*-5AvRO6!TYzm`=sHpR)+ivg%W@DPk>N>cuF
zB2`_Ru_F|2hF;aq#&9xNT2Bnx=^c%Q*yajLm%_ZaB3)Z1Lhwjgcz7yT5}#w<Ti6jg
z*9`p;gbCSua>$-%ZPh(iP_i8UVr7Y`T<Lu<+k9C*LvTq-zFwrPb?CgoA)62+ngeGp
z+7&f+Lx#>6hjAQ+B`COg0DTh7m!%h+ochexSarR}v>$dZ1Q9ZvXO@n>uuZXRkMW`P
z+?^vHm$M7tG&BJ?D3+;`0FEmydy4n>&mPX(H!xz;G<r(Y3(5$DMuI;-DO1J6QIHs)
zty!|cXnxwTuj|F;*Fvs_BR%fA?qJ(Y@9KKpT@yIoI@4ADqi&_uQJMCvi6o@lJVXXz
Z*q>r?61H-bs3rga002ovPDHLkV1hcVE4Kgu

literal 0
HcmV?d00001

diff --git a/src/ConstructionPlugin/plane_widget.xml b/src/ConstructionPlugin/plane_widget.xml
index 9085e2c76..be0311360 100644
--- a/src/ConstructionPlugin/plane_widget.xml
+++ b/src/ConstructionPlugin/plane_widget.xml
@@ -63,7 +63,7 @@
         <box id="by_distance_from_other"
              title="By distance from other"
              tooltip="Plane by distance from other plane."
-             icon="icons/Construction/plane_by_distance_from_other_32x32.png">
+             icon="icons/Construction/plane_by_distance_from_other_24x24.png">
           <doublevalue id="distance"
                        label="Distance"
                        tooltip="Distance from selected face to plane."
@@ -77,7 +77,7 @@
         <box id="by_coincident_to_point"
              title="By coincident to point"
              tooltip="Plane by coincident to point."
-             icon="icons/Construction/plane_by_coincident_to_point_32x32.png">
+             icon="icons/Construction/plane_by_coincident_to_point_24x24.png">
           <shape_selector id="coincident_point"
                           label="Point"
                           tooltip="Select point."
@@ -88,7 +88,7 @@
         <box id="by_rotation"
              title="By rotation"
              tooltip="Plane by rotation around axis."
-             icon="icons/Construction/plane_by_rotation_32x32.png">
+             icon="icons/Construction/plane_by_rotation_24x24.png">
           <shape_selector id="axis"
                           label="Axis"
                           tooltip="Select line for axis."
diff --git a/src/InitializationPlugin/InitializationPlugin_Plugin.cpp b/src/InitializationPlugin/InitializationPlugin_Plugin.cpp
index c03eb38d1..5317f7d7e 100644
--- a/src/InitializationPlugin/InitializationPlugin_Plugin.cpp
+++ b/src/InitializationPlugin/InitializationPlugin_Plugin.cpp
@@ -16,8 +16,6 @@
 
 #include <memory>
 
-#define NESTED_WIDGETS_FIX
-
 // the only created instance of this plugin
 static InitializationPlugin_Plugin* MY_INITIALIZATIONPLUGIN_INSTANCE =
     new InitializationPlugin_Plugin();
@@ -93,10 +91,6 @@ FeaturePtr InitializationPlugin_Plugin::createPlane(DocumentPtr theDoc, double t
 {
   FeaturePtr aPlane = theDoc->addFeature("Plane");
   aPlane->string("creation_method")->setValue("by_general_equation");
-#ifdef NESTED_WIDGETS_FIX
-  aPlane->string("by_other_plane_option")->setValue("by_distance_from_other");
-  aPlane->real("distance")->setValue(0);
-#endif
   aPlane->real("A")->setValue(theX);
   aPlane->real("B")->setValue(theY);
   aPlane->real("C")->setValue(theZ);
@@ -155,15 +149,6 @@ FeaturePtr InitializationPlugin_Plugin::createAxis(DocumentPtr theDoc, FeaturePt
   aAxis->real("Y_Direction")->setValue(theY);
   aAxis->real("Z_Direction")->setValue(theZ);
 
-#ifdef NESTED_WIDGETS_FIX
-  aAxis->string("use_offset1")->setValue("");
-  aAxis->real("offset1")->setValue(0);
-  aAxis->boolean("reverse_offset1")->setValue(false);
-  aAxis->string("use_offset2")->setValue("");
-  aAxis->real("offset2")->setValue(0);
-  aAxis->boolean("reverse_offset2")->setValue(false);
-#endif
-
   if (theX != 0) {
     aAxis->data()->setName("OX");
   } else if (theY != 0) {
-- 
2.39.2