From 01cda996f989cbad0a67d3181e9ceb38ed3338ac Mon Sep 17 00:00:00 2001 From: Vladimir Eliezer Tokarev Date: Sat, 27 Aug 2016 15:07:18 +0300 Subject: [PATCH] Connected the Welcome splash to straight channel section When start voting pressed in welcome splash panel strair channel loaded --- .../voting-booth-gui/main/ChainBuilder.class | Bin 928 -> 1292 bytes .../voting-booth-gui/main/TwoWayNode.class | Bin 305 -> 1025 bytes .../StraightChannelSectionController.class | Bin 0 -> 380 bytes .../StraightChannelSectionLoader.class | Bin 0 -> 1473 bytes .../straight_channel_section.fxml | 22 +++++++++--------- .../WelcomeSplashController.class | Bin 1141 -> 811 bytes .../welcome_splash/WelcomeSplashLoader.class | Bin 1365 -> 1358 bytes .../welcome_splash/welcome_splash_screen.fxml | 4 ++-- voting-booth-gui/src/main/ChainBuilder.java | 8 ++++++- .../StraightChannelSectionLoader.java | 5 +--- .../straight_channel_section.fxml | 22 +++++++++--------- .../WelcomeSplashController.java | 10 ++++++-- .../welcome_splash/WelcomeSplashLoader.java | 2 -- .../welcome_splash/welcome_splash_screen.fxml | 4 ++-- 14 files changed, 42 insertions(+), 35 deletions(-) create mode 100644 classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionController.class create mode 100644 classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionLoader.class diff --git a/classes/production/voting-booth-gui/main/ChainBuilder.class b/classes/production/voting-booth-gui/main/ChainBuilder.class index a938de00d8f0dea342e6873f2dcfc017ae574a4e..07519aac237c95ce01aaaea4ebb49cbcfb4c8818 100644 GIT binary patch literal 1292 zcmb7ETTc@~6#k}cSy)z}+}a`{f=bJ6QBk>6Q0gTnwUCrRcp^g?>5}a(+1+yaMLzpd z5=s04{wU*_SxRZZ7@PFW%$e_e=Q{iA_m7_d7VzFc51#6nG!R2ZimZ+)195qXW7@zB zW~G?ZVaavgfPrTQp5uj%1syLL+HLr=kWMX^@h7ycICcSzG$ z@XFlT=Dsb@S4u6c*a1U-p~`L7%2!CP*KFrN_$v%?wPi?V3P=2ee?7B;kRJ-GB;|^9 zW*+-?mHX#P!!U3cj@VCyQ}(K&bnNh;Qt&v@Gh`#5S9g1Xy0ms~Ln)GE3q#&>L*H{8 z$&!dzwobhreqN;12|W^oKDQ4mA?4$`!YPSzXnStMaV|1xfcDA}YA=Xjl-}R1iG8eL z*vfu0DC5IfSsY8BfsR)UM#-!BW%1FLeMsD_@|-NJiC!caCRGpqT@MLQnRtywhGk{b zi0HpkF|mY29m^(GkTdZHIhv71pUc9fK1*q06>HMvTOIFAtRqh;+?p1KUTJDM+ z_K&EP)OV$_J?rzvbwLRDNrWw3CSc}j7+TtxCg9z@pz&4_G~o<-NrXjlMs5c(w`M}l zY8L@EeQ{!YHJW&x$mO`m>CRq{tx9{7`@#*W)2Zg%-@K4y*M(|62!@V;0+z^@C!hUnCZBvM2ojlV&o zuLZDliP$a?v=yf7(7s$EE>G>n**f%PZ6>YN(UI0>>gb%hgt1GTt_zrT+-o` delta 346 zcmXAjJx&5q6otQeGw|fiFd_r^0}6`21BxOmFtJiAD@sBzN`WRAgO!b?-E6=u&_I-g z1-KZOV7#L*x##|!bKZS3@4EH%^En4vv}uy1j?TyZgaV6Gq=w)pqfsoT@in0*@MXi)_F1)VUcohTYzv*SL;RbLeqI!^7oR zbK=qDG@7g1=*$kHSNl0g$szGmSi2`@-X3Ptj}h~(wFWYZ z!^2O*ck)7GnZ@m>v~3En1pi#?OrCD*ZTCd=*j$n7gJ~bDS1ny#=Xq_Lss;b+N(22- z5)EW>VTA>aG(!^DoCVDfPe(Z;t8w43VAFgps84gu%UN@0I8J)%b)+X!n)SPUIw76TiZL8b2)j5skC31_b9ptb($8x5nIk>}t v>C(2CZPMvqEN79mM^?Cmb&pfjEWWN~%|`we&S#Eqe&o*#W^v>XjOyVZi)E`J delta 120 zcmZqV*vKSs>ff$?3=9k=3S*{mYH8#JlT*@eR4Vw z?`D*p{Ebo7j*XFlk%0-Qje&ucg^_`ofrWtqNV77qfoXOq&B4G4=5sM{1649I@Bm3B G23`PV=@N4Q diff --git a/classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionController.class b/classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionController.class new file mode 100644 index 0000000000000000000000000000000000000000..f9a079be970bcf0af66d3a85ef580044a5722e19 GIT binary patch literal 380 zcmbu5%}T>S6ot=i^P@3Z@eN!E>cVW?DMbjl3f-jCWtqmoT$#?mWUBaBt^^l8fDa|! zq}{u4E*$23^K-cO`{(luz%`CDjB%LaD8+=3+_L2`C5+E67KEsDkD4&4*y`D4z0!WJ zRz}E4xAIx9fgL<1u_c+B!Ce$yIk`U2ETrqec ezWe~a3m734O#}l6*b~i%eT;o%;z($JEB^&zKxFg) literal 0 HcmV?d00001 diff --git a/classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionLoader.class b/classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionLoader.class new file mode 100644 index 0000000000000000000000000000000000000000..a51271667f5f7f54da7ac30a6d7361965c4c7d5a GIT binary patch literal 1473 zcmbVMSx*yD6#i~07Rn%4p)865ZcvbM!5x)a)?@@iE9#5QrCiF8VTMcxg@2`qltdH5 zvp>rC-Is+;75I5+)ub5yQh~#PLWk zkM(stfhT%@n!vLpTJc;jFA{huFpw`SXXj_<3dP)9c41-KDq4%#sp;k7%%}HOaVcAv z6G&N`@~bo*>6XoW;M;Ebl|XCGb1Q*#gB9uQC;_9iR4l~b&!Qebp6(&kcOfadZMFFBA<6S3}Tvd2h!rsTo^mZs2_KQTSuJ2@G^&g0%IS z#XVCv1FylFy}Wpi1^Vh4Ia`}C?JR+}1}2f!Jl+{dqsu@CIt}D7#T?gYRZis0z_fmP za}iF*nKCegSp#$E5okZ2hQ-xQc1X>!X?y1U;!#ToGz{rJZ7QoE=g11XPxrvFaVTU7 z+RlgsT4=JYDq&>=2BQ%;HGef6R|V#WWs4wJYD#rUI3W%PjiY$VYebnAt(wlqC-ZpfPNecx7!K9K_QwE!FYWvnHJ}$)kOJf5Erv#ZtVwugfx?}T=%Kuqw=bav za3ga7k@=0-=S&q1sm3ZU9U!rfrp(Abntz0L*SMzW2gHlB+}*_M<9eNvH1UYS`wi~; zbdy>F{XECH5AYkrt(w;g_XfV)$^1l970E-iSkciqMC<#}kt!~aQqWvQ+vs;H#-N?2 qNfv}`AzT`_DZ4|+dm(}T2(U(=g~8qCE2jf(xJ#YbDJnxD=J0=mA$}nM literal 0 HcmV?d00001 diff --git a/classes/production/voting-booth-gui/main/straight_channel_section/straight_channel_section.fxml b/classes/production/voting-booth-gui/main/straight_channel_section/straight_channel_section.fxml index 86e2418..8bbd801 100644 --- a/classes/production/voting-booth-gui/main/straight_channel_section/straight_channel_section.fxml +++ b/classes/production/voting-booth-gui/main/straight_channel_section/straight_channel_section.fxml @@ -6,7 +6,7 @@ - + @@ -116,40 +116,40 @@ - +
- +
- +
- +
- +
- +
diff --git a/classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashController.class b/classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashController.class index 361d8335f0c58aaa41c386aed7e2d5554a6cbe59..4de9e655c43231ae13f987d60deb4756e89da76f 100644 GIT binary patch literal 811 zcmb7CT~8D-6g_2!9T=;?0s@Mnh`L~OUVOut7$PqYWaE-WpG+AF)XcP`(}DG8nHWhl z@dx;$jJMqdB8f51LvQcLIrrYv`T6VH4*<`xnqUm`N;Uv&p4$IJJ#f~B9i5H_EDUOgMM1&Qp;57 z4?pInHC!8{xI=0Ty2mP{0 zH{We#G+WX&waw+G@=GuNWrt^eQjT#X9QUzIRDX=#^$T!3z>2SV7~>JgW3(Bb{D)5T z2%&oC)a;5++u>PwURz6AkbZ|W-pu&|mG{#Sr4=GA`;KAuA{+GV2#=)n{1u^x2`}%( z8kc+wW0iDaBZj#v&=97FArWHw*ZemE=5?X-8hI&MMs{@V4D54Ab2^(L$Z?(Sd{BTJ zm~&RmEV~}*R$750y%QO_oF^~S(S=KW z_gX#a`u4T*oS>)927ONsF6`4d?dYr-_)!>mo(gFKv!kN6UaC}$OOLOEQ+dl19q<%+ zUin@3QaQBv@*fh~fe1(Ay%$Foj7qZfS+6UwTK$^~+{EgKZcm1{i7>}VZK}Z9q-fe~ zt}^g2mw;7A+J} z5NP~|!vaf;v_0vc+apVg8Zhx0kLj9aA?O08k>Z|oEmPc9pVV2O)SOO(bTl8u70PTn z1)Z7t7l=<o(Pi2~>qA`_N znqV0I0P6%2*!Tx9JquhX;Km%_W&(VON6CbT$%IC|afi$-YYQ1{PqB>ga0a%>G#+l7 t%#FAGjb+TTc8Ik*hxLS(Wft9tgf+4KGmMX9VG0x5YZ^0a`>s|!`vuMk)N23$ diff --git a/classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashLoader.class b/classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashLoader.class index 52a9f57dc3c432b01e157d2c082968c61fdd7274..b3007c8201513721491535b2db8fa64b5551f9b5 100644 GIT binary patch delta 62 zcmcc0b&hL70KY`ItB - + @@ -61,7 +61,7 @@
-