From 725589ddfc56e54bd2c76b8e2d325b33e94076ce Mon Sep 17 00:00:00 2001 From: Vladimir ELazar Tokarev Date: Sat, 4 Jun 2016 16:05:12 +0300 Subject: [PATCH] Createsd the settings panel the settings panel displays ndifferent options that can happen when on polliing station dashboard panel. --- .../src/pictures/[Originals]/bullets.png | Bin 0 -> 805 bytes .../src/pictures/[Originals]/exit.png | Bin 0 -> 1110 bytes .../src/pictures/[Originals]/settings.png | Bin 0 -> 20294 bytes .../src/pictures/[Originals]/women.png | Bin 0 -> 19770 bytes voting-station-gui/src/pictures/bullets.png | Bin 0 -> 407 bytes voting-station-gui/src/pictures/exit.png | Bin 0 -> 384 bytes voting-station-gui/src/pictures/settings.png | Bin 0 -> 996 bytes voting-station-gui/src/pictures/women.png | Bin 0 -> 930 bytes .../StatusLog/java/StatusLogLoader.java | 2 +- .../PollingStationDashboardController.java | 10 +- .../settings/fxml/settings.fxml | 123 ++++++++++++++++++ .../settings/java/SettingsUpdate.java | 11 ++ .../settings/java/settingsController.java | 22 ++++ .../settings/java/settingsLoader.java | 38 ++++++ 14 files changed, 203 insertions(+), 3 deletions(-) create mode 100644 voting-station-gui/src/pictures/[Originals]/bullets.png create mode 100644 voting-station-gui/src/pictures/[Originals]/exit.png create mode 100644 voting-station-gui/src/pictures/[Originals]/settings.png create mode 100644 voting-station-gui/src/pictures/[Originals]/women.png create mode 100644 voting-station-gui/src/pictures/bullets.png create mode 100644 voting-station-gui/src/pictures/exit.png create mode 100644 voting-station-gui/src/pictures/settings.png create mode 100644 voting-station-gui/src/pictures/women.png create mode 100644 voting-station-gui/src/polling_station_dashboard/settings/fxml/settings.fxml create mode 100644 voting-station-gui/src/polling_station_dashboard/settings/java/SettingsUpdate.java create mode 100644 voting-station-gui/src/polling_station_dashboard/settings/java/settingsController.java create mode 100644 voting-station-gui/src/polling_station_dashboard/settings/java/settingsLoader.java diff --git a/voting-station-gui/src/pictures/[Originals]/bullets.png b/voting-station-gui/src/pictures/[Originals]/bullets.png new file mode 100644 index 0000000000000000000000000000000000000000..b4e83843a3694fe711b8a262b9d5ba51010cdd37 GIT binary patch literal 805 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSoCO|{#S9E$svykh8Km+7C@5Lt z8c`CQpH@Y&?5R*dzbc0?+Dmv!2x0eb{}o zC~4E@Tq*xg+8_slK*KjZXJ4nO+NLY(k2~z;HLXo~6rLTGfBJyh|6K>4=)c~T%3;?! zYwL~r``Kahi}QWVEly^3pVT*A8`tuns9QLv$lu_!1;b`LmV`}5IsK&G>_4+-(JgO* z2BVLLQ(f;ZI(Kv5@2h(_8yFNA3S-}9=*V&&u=seR^4RCAvx~P2O!?>(a5SjknfJld z0u>T1#}7i>#BlgYVZpLJ0+W6|saEwV-!R>Y`|iPA%`oC(pJ#c2OBJ)RIs;P!!;#Xh zi#L|2Fg!kz{9N*Uc>cM&P7~fGcpq$im%!ir!9oIJWWoX)zH?K=os8z!tZ#YA_bn)6 zp>;%g0hF+~W%!b>&m%wK8H)phK*Nr8WhT@5SQ6$`ys>%w^VQj%(Hxg#b2N8ckbRRV zAji(kP;%~`@E>V?=e=BClb$}`@BEkJ>tz!jV}|oid-+Q@rR}y~xUX%OvFu^a0~%M3 z2e9*Q|1bWkc*XCw+wucc=SeT z(cC|EDy#M_^iG{v@t;Y+@zwS+@5|TTGA!BW@|){L1;eV=xsQ2|-{W%l&m5rpv2UBi zZojP>MH61uxbFY&`LTV^`t=OC-)pZY@Fwj1KiP*lz}CF7W9Q)z?Z&H5_UCQ<|LWMg z>h6|sM(eXLyaN8l=1JALmMJlu7MNrHV^-w~`=9@+w=?^HwD_@O-9_c;pKgn+1f_Hk dIB~O{k&U4!=wH^I>YfCUh^MQc%Q~loCICE+ZWsUn literal 0 HcmV?d00001 diff --git a/voting-station-gui/src/pictures/[Originals]/exit.png b/voting-station-gui/src/pictures/[Originals]/exit.png new file mode 100644 index 0000000000000000000000000000000000000000..557b3e21aebd211c2afab5972cca2a8c342f78b9 GIT binary patch literal 1110 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf4nJ za0`PlBg3pY5)2H?KRjI=Ln`LHy%U)y>?qRu@cvD2k!PkZk{%)sHUNy}ZHc4qF`a<7uTlYf^75c8^_uTl#_DGTUvp*!Eqp zbBUPW@Kr{-^qJn@b+=hJOio>1d}rBxf&YA)CnoNXd&6`;^3AThr#9So(=ORvyOL$P zu2fxwy2VeOt>+&(^K4}~-6ns{_I0nhWy(*-wveWXhy9J|$Ex#7{N^OK1vJe7a=&l8 z{r`T)$?~fa%vWQYZU9B%mkFDA1U5){Pf+?}_~CL0&KCS52th*g2Z|?K@Fx~Zsd)noa4ac73 z#H()L{I9$r%QPVTwU3ij5vR_f{RckwXGrsGX9;^)J?HNv#c2)?;}b)hd{;L<+tGa} z-=sxIbccuKA<3K~b^fMP9UkhhXakC><_6^fMO0LQTHM2efJ~(@)f-Vs{ap5j z=T&dGJ)Hd^f~htCOfXPJP0nk<2jkmH@th+2ge`&Wxf^vF50#%<#lm&puvu+ z&>!#S+v{Iyy~o7nBhSR{6VJ@9Q~pEC(Jk&!IH%DEv3*_%C$fKNH8Q?`*#7jbU|Fb! zYRy!I#!En1B`s4Rld1cIK2MypYD7cm4{4syH;=80Y?EKX;`fBZK7iBcv}9et;ln!J zPZa++s2V)e1d)#nfuzTo;vbD(6FfK{va8x&+s2{V3e+@libUN4A)S>^J}~q1Z`KLo zeaNom=x+*=lD!I&+OonDsCPyp2T`) zybp{I^Vx6EIGFxm*HwpHw*%TD|Mu&6eYlh}OYD2#4__Ux4cTUAWzGlw*t|sVVDj$3 zwBHSf=BuZ2`td%`Fkz}&{NeVJUsZn&7j>vHaO@JQF`t{zHY1;LYn%KLJ;!g` z85+bj{@5i=doc0iJ!xBqhu=k4vshn~&NpK63;0p18_i_S?#N)?sIT#7pO|jr>ctNd zy6aSbaIATLV}gTe~ HDWM4fg!=4x literal 0 HcmV?d00001 diff --git a/voting-station-gui/src/pictures/[Originals]/settings.png b/voting-station-gui/src/pictures/[Originals]/settings.png new file mode 100644 index 0000000000000000000000000000000000000000..d3d54e2731a1b097e592513e485a0edecb776285 GIT binary patch literal 20294 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 literal 0 HcmV?d00001 diff --git a/voting-station-gui/src/pictures/bullets.png b/voting-station-gui/src/pictures/bullets.png new file mode 100644 index 0000000000000000000000000000000000000000..96443a050ade6b86eec18872f20d46882c5bced5 GIT binary patch literal 407 zcmV;I0cie-P)JJ<<^JVLB20``^)K8BsW zU}xbAh_#JPK*10Y5u&jQh=^Zty(#XTcy{;hDr)5)hB;@>%%7P#Glg~(C^OxR^HXSr ze=VLv&=V=Rfd@=s9ebF^H++t_MooMfZ!0*;eFj1=g;R+kY-jg=G8^&DMAQnshEeR} z77Lj4*w;EdU^hFzEt)m9>B#0H^lXOH3rQnxfhBcz3SuhIuw~MF@j~)*lemsX3W!L^Bp(2 zG4*Uw`(ST*-e7-?`2U}h266{KBE!Gfz;FFmuf#!i@4~0Z?nUVA;Rj5p*6t_9@e%iW z_ppIOT%t%Nr&O=;2X|pRk8{5rEy5?~sm=PG;vZLCV->x3Qr!Rm002ovPDHLkV1l_y Bv-AJ} literal 0 HcmV?d00001 diff --git a/voting-station-gui/src/pictures/exit.png b/voting-station-gui/src/pictures/exit.png new file mode 100644 index 0000000000000000000000000000000000000000..ca9675a667219f6429df2e1f05ccd31b4b5ef934 GIT binary patch literal 384 zcmV-`0e}99P)H$FFBCv)d zuwa8&6a`Wi9Vg?#lX#@a@#N>lp7{=>QOP)=ETXO&5>+LlAzhHG2JV1Y;8>p38BkF9 z3*Zen)9|?LBVeblh2*CW>`G}rFlDMFu@=F%fz}ReE91H3J7}P<#l3-^NPgzPR(iWS zN}x9mELUq6+5!#mDD$6ESPr@o;IBX$xxZGhFb0IaNdPYb{SxSd+} literal 0 HcmV?d00001 diff --git a/voting-station-gui/src/pictures/settings.png b/voting-station-gui/src/pictures/settings.png new file mode 100644 index 0000000000000000000000000000000000000000..e6e5a267c52814e3acf3ede4618bf384b0a50f23 GIT binary patch literal 996 zcmVB$DZ z%x3s}A6}k$IX5?3(bzeCTfbL*1YkvuIMJl`&4{=}!XyayevCvb;h}z2zbnOQ9}N0o zv`UCybL7w6Y+G3r&l6aaaz0G5Bq@@ZIt75HEXwUOz51A&J)Lum3}7i}1OPeWhfo}Y zkV&p10RYl;KFI+z5wXI__snb!h-+P>eby_=-E~1l> zhq28$-&dE_(O%ixoN_wTblvWVxX9VLRm+$62d9lT9}(9`&I9O3mR(Kq+i$1HEnyc>6)Da{w7%&gd4-Qc`+0h&1`-$pHfm+da=LmRUZN<01=$VniEae z>=e03vIdZSFc_2|uBMz1=E%oWPDhNq-^?~bfV-`gun^L>Ip<|{Ssk4uJJEFA%OV#E z^Z;Z4@WEgPMk^%^L;5YGpSwthoc^R2UZ===6hg{rsV=L-lVm5Gu6=150|3s=&6*i) zJR=wY0!jc2BiSo^Z`?BepT_6|7qd?qM%)81UWdI5(x%;euwGnYv zKz8%_ob!b?wR=Eb2jl?$)2QMO4J2KPrdO7$XR7}3$niLU1i?YT%^!64rwH!oa(57r z5xkXB0CXF?g_UFMvz+qg$wwv08(mKOB|Sm%ud3+1Z)VSq+Ga1HZbCRopUlw8DQpXX zG`>VZGM1X*1^`zERsTGM^&pUPI@IO#fux%ueJ^Qb0E&ovVuhqULC-;=q$=h7H3&#b zg%_{(d-WGHRsYmXul~x6YrH>GM^#npW~%{2%s$pap^zKqp|MuH7r?!ekTuIqI6NOU>{xDb5+Be&l!r zgaB|F19XL8B`HgY$-=l9(j|h?bnQD`PQOTTe%LmzSx5_Q>h=K;NuNq~1ru!ikB{SRNLD@=462ZRlyt_;pAm5OW;5I+=?{{X#=G&(?sDwKH%4wU+SbC0 zS0tT^h~K$#h$KZ6#=ozsx_54-XJ=<-=XOEiI8HbOQN&YD0}&4d z!NBAKVKEUw3^X%QL=7|$5fec$GE*=!F&({wvc({Icy0iY!xgqs^4 zyOJYaIh*ajad2?(3V>sm2QkZfuVz{AO-U(0I}Y`|UY8`f@R8)5b7h|APwwyUzfUrf ztVoKa0Qj=3u7nW2N|NN7q@+Cu05~ie2?4@2B17Yd~uQHaa#rw zU>T#0s;as_gz(dFxb{evWiL7Bb|m-)j9Az8y=HM0V0pYGw*X1N%+5;6dcE$;olfVA zEbF~J9*^$n^?I*4$G-stGutrJq{--X;G&Mh5W=^ePUkbTxMF4<=iF|;pS?aBjqV!^ zR-X$Yd?#6d*>@Qz32@H+MWR}Ckz|w<%^SKG|a|8W;_G|-U z*@{&pjD)payyc8+{s*AJpue@bxq(F!P!#1=0M(Ip2uNTf6&Q)wf+!sgr$wM@J}<5w zNdzFg_df$jBqeRCMxq8#H$kc9i@H5G32elV#Cv}YXvP;vx-?C<0Tz;-l{AzP+JL7m zk|@3RKV(_&y>7Sr7D;e1vD+tRW|qbn?}#y8h|z8{voWAdf+tavJRse!_wIM^{dMpC zb?00y$pa!sqoE5Su&IqwlJizuOH=%$Nm?u?sk3O#e+eYN`tDrCN&o-=07*qoM6N<$ Eg0D%hKL7v# literal 0 HcmV?d00001 diff --git a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java index 12d403a..1ceabb0 100644 --- a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java +++ b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java @@ -12,7 +12,7 @@ import java.io.IOException; */ public class StatusLogLoader { - private static final String POLLING_STATION_DASHBOARD_FXML_PATH = "../fxml/status_log.fxml"; + private static final String POLLING_STATION_DASHBOARD_FXML_PATH = "../fxml/settings.fxml"; private Stage currentStage; private FXMLLoader fxmlLoader; diff --git a/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardController.java b/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardController.java index e44cfbc..234ea19 100644 --- a/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardController.java +++ b/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardController.java @@ -6,12 +6,13 @@ import javafx.scene.layout.GridPane; import javafx.scene.layout.Pane; import javafx.stage.Stage; import polling_station_dashboard.StatusLog.java.StatusLogUpdate; +import polling_station_dashboard.settings.java.SettingsUpdate; /** * Created by Vladimir Eliezer Tokarev on 28/05/2016. * PollingStationDashboardController controls the behavior of the polling station dashboard */ -public class PollingStationDashboardController implements StatusLogUpdate { +public class PollingStationDashboardController implements StatusLogUpdate, SettingsUpdate { private Stage currentStage; private GridPane statusLog; @@ -40,6 +41,12 @@ public class PollingStationDashboardController implements StatusLogUpdate { statusLogOpened = !statusLogOpened; } + @Override + public void UpdateSettings() { + + } + + private void showStatusLogButton(boolean showOrNot){ Button statusLogButton = (Button) currentStage.getScene().lookup("#StatusLogButton"); statusLogButton.setVisible(showOrNot); @@ -61,7 +68,6 @@ public class PollingStationDashboardController implements StatusLogUpdate { statusLogPane.setPrefWidth(expansionWidth); } - @FXML private void OnStatusLogPressed() { UpdateStatusLog(); diff --git a/voting-station-gui/src/polling_station_dashboard/settings/fxml/settings.fxml b/voting-station-gui/src/polling_station_dashboard/settings/fxml/settings.fxml new file mode 100644 index 0000000..4ca13cc --- /dev/null +++ b/voting-station-gui/src/polling_station_dashboard/settings/fxml/settings.fxml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/voting-station-gui/src/polling_station_dashboard/settings/java/SettingsUpdate.java b/voting-station-gui/src/polling_station_dashboard/settings/java/SettingsUpdate.java new file mode 100644 index 0000000..33caeb0 --- /dev/null +++ b/voting-station-gui/src/polling_station_dashboard/settings/java/SettingsUpdate.java @@ -0,0 +1,11 @@ +package polling_station_dashboard.settings.java; + +/** + * Created by Vladimir Eliezer Tokarev on 04/06/2016. + * SettingsUpdate gives the ability to update the settings object + * decouple settings from polling station dashboard + */ +public interface SettingsUpdate { + + void UpdateSettings(); +} diff --git a/voting-station-gui/src/polling_station_dashboard/settings/java/settingsController.java b/voting-station-gui/src/polling_station_dashboard/settings/java/settingsController.java new file mode 100644 index 0000000..0bdb122 --- /dev/null +++ b/voting-station-gui/src/polling_station_dashboard/settings/java/settingsController.java @@ -0,0 +1,22 @@ +package polling_station_dashboard.settings.java; + +import javafx.stage.Stage; + +/** + * Created by Vladimir Eliezer Tokarev on 04/06/2016. + * manages the button pressing of the settings + */ +public class settingsController { + + private Stage currentStage; + private SettingsUpdate settingsUpdater; + + public void SetStage(Stage stage){ + this.currentStage = stage; + } + + public void SetSettingsUpdate(SettingsUpdate updater){ + this.settingsUpdater = updater; + } + +} diff --git a/voting-station-gui/src/polling_station_dashboard/settings/java/settingsLoader.java b/voting-station-gui/src/polling_station_dashboard/settings/java/settingsLoader.java new file mode 100644 index 0000000..31e6557 --- /dev/null +++ b/voting-station-gui/src/polling_station_dashboard/settings/java/settingsLoader.java @@ -0,0 +1,38 @@ +package polling_station_dashboard.settings.java; + +import javafx.fxml.FXMLLoader; +import javafx.scene.layout.GridPane; +import javafx.stage.Stage; +import polling_station_dashboard.StatusLog.java.StatusLogController; +import polling_station_dashboard.StatusLog.java.StatusLogUpdate; + +import java.io.IOException; + +/** + * Created by Vladimir Eliezer Tokarev on 04/06/2016. + * Loads the settings fxml file + */ +public class settingsLoader { + + private static final String POLLING_STATION_DASHBOARD_FXML_PATH = "../fxml/settings.fxml"; + + private Stage currentStage; + private FXMLLoader fxmlLoader; + private SettingsUpdate settingsUpdater; + + public settingsLoader(Stage primaryStage, SettingsUpdate updater) throws IOException + { + currentStage = primaryStage; + settingsUpdater = updater; + fxmlLoader = new FXMLLoader(getClass().getResource(POLLING_STATION_DASHBOARD_FXML_PATH)); + } + + public GridPane GetSettingsInstance() throws IOException { + GridPane settings = fxmlLoader.load(); + settingsController controller = fxmlLoader.getController(); + controller.SetStage(currentStage); + controller.SetSettingsUpdate(settingsUpdater); + + return settings; + } +}