From ca1dfef16c6d60a30bf7adadcb19bad5709fbe00 Mon Sep 17 00:00:00 2001 From: naeemkhan12 Date: Thu, 30 Nov 2017 15:24:18 +0500 Subject: [PATCH] fix #67 #68 --- build.gradle | 16 ++- build/resources/main/css/buttonStyles.css | 11 ++ build/resources/main/css/stylesheet.css | 137 ++++++++++++++++++++++ build/resources/main/fxml/Downloads.fxml | 86 ++++++++++++++ build/resources/main/fxml/History.fxml | 84 +++++++++++++ build/resources/main/fxml/Login.fxml | 19 +++ build/resources/main/fxml/MainFXML.fxml | 6 + build/resources/main/fxml/ProxySet.fxml | 27 +++++ build/resources/main/fxml/Setting.fxml | 79 +++++++++++++ build/resources/main/fxml/SignUp.fxml | 18 +++ build/resources/main/fxml/Tab.fxml | 83 +++++++++++++ build/resources/main/img/backword1.png | Bin 0 -> 125 bytes build/resources/main/img/bookMarks[1].png | Bin 0 -> 626 bytes build/resources/main/img/bookmark.png | Bin 0 -> 173 bytes build/resources/main/img/bookmarks.png | Bin 0 -> 626 bytes build/resources/main/img/download.png | Bin 0 -> 114 bytes build/resources/main/img/downloads.png | Bin 0 -> 503 bytes build/resources/main/img/folder.png | Bin 0 -> 3132 bytes build/resources/main/img/forward1.png | Bin 0 -> 133 bytes build/resources/main/img/history.png | Bin 0 -> 1108 bytes build/resources/main/img/home.png | Bin 0 -> 626 bytes build/resources/main/img/newtab.png | Bin 0 -> 197 bytes build/resources/main/img/pdf.png | Bin 0 -> 815 bytes build/resources/main/img/pdfConverter.png | Bin 0 -> 255 bytes build/resources/main/img/refresh.png | Bin 0 -> 249 bytes build/resources/main/img/search.png | Bin 0 -> 797 bytes build/resources/main/img/setting.png | Bin 0 -> 1003 bytes build/resources/main/img/user.png | Bin 0 -> 1565 bytes build/tmp/jar/MANIFEST.MF | 2 + gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 70 +++++------ gradlew.bat | 14 ++- 32 files changed, 605 insertions(+), 51 deletions(-) create mode 100644 build/resources/main/css/buttonStyles.css create mode 100644 build/resources/main/css/stylesheet.css create mode 100644 build/resources/main/fxml/Downloads.fxml create mode 100644 build/resources/main/fxml/History.fxml create mode 100644 build/resources/main/fxml/Login.fxml create mode 100644 build/resources/main/fxml/MainFXML.fxml create mode 100644 build/resources/main/fxml/ProxySet.fxml create mode 100644 build/resources/main/fxml/Setting.fxml create mode 100644 build/resources/main/fxml/SignUp.fxml create mode 100644 build/resources/main/fxml/Tab.fxml create mode 100644 build/resources/main/img/backword1.png create mode 100644 build/resources/main/img/bookMarks[1].png create mode 100644 build/resources/main/img/bookmark.png create mode 100644 build/resources/main/img/bookmarks.png create mode 100644 build/resources/main/img/download.png create mode 100644 build/resources/main/img/downloads.png create mode 100644 build/resources/main/img/folder.png create mode 100644 build/resources/main/img/forward1.png create mode 100644 build/resources/main/img/history.png create mode 100644 build/resources/main/img/home.png create mode 100644 build/resources/main/img/newtab.png create mode 100644 build/resources/main/img/pdf.png create mode 100644 build/resources/main/img/pdfConverter.png create mode 100644 build/resources/main/img/refresh.png create mode 100644 build/resources/main/img/search.png create mode 100644 build/resources/main/img/setting.png create mode 100644 build/resources/main/img/user.png create mode 100644 build/tmp/jar/MANIFEST.MF diff --git a/build.gradle b/build.gradle index b0dc337..baadc1f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,27 @@ -version '1.0-SNAPSHOT' - +version '1.0.0' apply plugin: 'java' +apply plugin: 'application' sourceCompatibility = 1.8 - +mainClassName = "application.Main" repositories { mavenCentral() + jcenter() } +task wrapper(type: Wrapper) { + gradleVersion = '2.0' //version required +} +jar { + baseName = 'Jfx-Browser' + version = '1.0.0' +} dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.7.2' compile 'com.jfoenix:jfoenix:1.10.0' compile 'de.jensd:fontawesomefx-fontawesome:4.7.0-5' - compile 'com.gluonhq:charm-down-desktop:3.0.0-b8' + compile 'com.gluonhq:charm-down-desktop:2.0.0' compile 'com.googlecode.json-simple:json-simple:1.1.1' compile 'org.controlsfx:controlsfx:8.40.11' compile 'org.xerial:sqlite-jdbc:3.16.1' diff --git a/build/resources/main/css/buttonStyles.css b/build/resources/main/css/buttonStyles.css new file mode 100644 index 0000000..4737cb3 --- /dev/null +++ b/build/resources/main/css/buttonStyles.css @@ -0,0 +1,11 @@ + +/******************************************************************************* + * * + * Label * + * * + ******************************************************************************/ + +.label:hover { + -fx-background-color: derive(#777777,80.0%); + +} \ No newline at end of file diff --git a/build/resources/main/css/stylesheet.css b/build/resources/main/css/stylesheet.css new file mode 100644 index 0000000..d680c13 --- /dev/null +++ b/build/resources/main/css/stylesheet.css @@ -0,0 +1,137 @@ + + + +/******************************************************************************* + * * + * Button * + * * + ******************************************************************************/ +#mybutton .button { + -fx-text-fill-color:white; + -fx-border-radius: 5.0 5.0 5.0 5.0, 5.0 5.0 5.0 5.0; + -fx-border-color: #2959ea; + -fx-border-width: 2.0; + -fx-background-radius: 0.0; + -fx-font-family: "Segoe UI", Helvetica, Arial, sans-serif; + -fx-font-size: 11.0pt; + -fx-background-color:derive(#2959ea,20.0%); + +} +#mybutton .button:hover { + -fx-background-color: derive(#2959ea,50.0%); +} +#setting .button { + -fx-background-radius: 5.0; +} + +/******************************************************************************* + * * + * Tab / Setting TabPane * + * * + ******************************************************************************/ + + + +#tabadded .tab-header-background{ + +} +#tabadded .tab:hover{ + -fx-background-color:derive(#bbbbbb,40.0%); + +} + + + +.tab-pane{ + -fx-tab-min-width:15.0px; + -fx-tab-max-width:120.0px; + -fx-tab-pref-width:120.0px; + + -fx-tab-min-height:30.0px; + -fx-tab-max-height:30.0px; +} + +.tab{ + + -fx-text-fill:white; + + +} +.tab:selected .focus-indicator { + + -fx-border-radius: 10 10 0 0 ; + -fx-border-insets: -7.0 -8.0 -8.0 -9.0 , -5.0 -8.0 -7.0 -7.0; +} + +.tab-header-area .tab{ + + -fx-padding:4.0 10.0 5.0 10.0; + -fx-background-radius: 10.0 10.0 0.0 0.0; +} +#addNewTab{ + + -fx-padding:5.0 10.0 5.0 10.0; + -fx-background-radius: 12.0 12.0 4.0 4.0; + + -fx-border-radius: 10 10 10 10; + + +} + +#settingTabPane .tab{ + -fx-background-color:derive(#2959ea,20.0%); + -fx-text-fill-color:white; + -fx-border-radius: 10.0; + -fx-spacing: 5.0; + -fx-opacity:0.9; + } + +#settingTabPane .tab-header-background{ + -fx-background-color:derive(#2959ea,20.0%); + -fx-opacity:0.9; +} + +#settingTabPane .tab:hover{ + -fx-background-color:derive(#2959ea,10.0%); + +} +#settingTabPane .tab:focused, +#settingTabPane .tab:default:focused{ + -fx-background-color:derive(#2959ea,20.0%); +} + +/******************************************************************************* + * * + * Label * + * * + ******************************************************************************/ + +#header .label:hover { + -fx-background-color: derive(#777777,80.0%); + +} + +/******************************************************************************* + * * + * ScrollBar * + * * + ******************************************************************************/ + + +.scroll-bar:vertical > .thumb, +.scroll-bar:horizontal > .thumb { + -fx-background-color: derive(#bbbbbb,5.0%); +} + +.scroll-bar:hover > .increment-button, +.scroll-bar:hover > .decrement-button { + + -fx-background-color: derive(#bbbbbb,30.0%); + +} + + +#righDrawerVbox{ + -fx-padding: 10.0,10.0,10.0,10.0; +} + diff --git a/build/resources/main/fxml/Downloads.fxml b/build/resources/main/fxml/Downloads.fxml new file mode 100644 index 0000000..6474af9 --- /dev/null +++ b/build/resources/main/fxml/Downloads.fxml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ diff --git a/build/resources/main/fxml/History.fxml b/build/resources/main/fxml/History.fxml new file mode 100644 index 0000000..f0438db --- /dev/null +++ b/build/resources/main/fxml/History.fxml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ diff --git a/build/resources/main/fxml/Login.fxml b/build/resources/main/fxml/Login.fxml new file mode 100644 index 0000000..154e4f0 --- /dev/null +++ b/build/resources/main/fxml/Login.fxml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/build/resources/main/fxml/MainFXML.fxml b/build/resources/main/fxml/MainFXML.fxml new file mode 100644 index 0000000..f3b054d --- /dev/null +++ b/build/resources/main/fxml/MainFXML.fxml @@ -0,0 +1,6 @@ + + + + + + diff --git a/build/resources/main/fxml/ProxySet.fxml b/build/resources/main/fxml/ProxySet.fxml new file mode 100644 index 0000000..ce4c951 --- /dev/null +++ b/build/resources/main/fxml/ProxySet.fxml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + diff --git a/build/resources/main/fxml/Setting.fxml b/build/resources/main/fxml/Setting.fxml new file mode 100644 index 0000000..702f78e --- /dev/null +++ b/build/resources/main/fxml/Setting.fxml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ diff --git a/build/resources/main/fxml/SignUp.fxml b/build/resources/main/fxml/SignUp.fxml new file mode 100644 index 0000000..08e5c11 --- /dev/null +++ b/build/resources/main/fxml/SignUp.fxml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/build/resources/main/fxml/Tab.fxml b/build/resources/main/fxml/Tab.fxml new file mode 100644 index 0000000..9c0a4dd --- /dev/null +++ b/build/resources/main/fxml/Tab.fxml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/resources/main/img/backword1.png b/build/resources/main/img/backword1.png new file mode 100644 index 0000000000000000000000000000000000000000..22b624b31f2a72ecb5a5c1493ebf0bc7563b6807 GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*17f%<*kP60R2iC<7j2xap{}?z@ zJp=#Ee`vtW&pTCK(f4N{TU=6XJ;RDW?9C<}o?X1hB`VrGr&aS9Em7sG{3P^HgMq;@ XQ}*l?dFh`(^B6o`{an^LB{Ts5c{L-V literal 0 HcmV?d00001 diff --git a/build/resources/main/img/bookMarks[1].png b/build/resources/main/img/bookMarks[1].png new file mode 100644 index 0000000000000000000000000000000000000000..17a743f9f4441f9dc58e377fcdc0989eca989064 GIT binary patch literal 626 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tmUKs7M+U~W1%@xC#RK_FN#5=* z4FB8v&+G^CI14-?i-EKU7`vU!wqsymT;l2C7!q;#?ezVAhXO>}?bq?Nl&KtW@u^{L zU)0UFuVHn!o|;WF|D{0TyR{5uryo3M*vHgp5EPN~Iv{U>?)Lh;(@KA4P583KGXDJg zIKOkPi;Y6OYi}KK5jpc>bHYq^g%`#L4ry={6mF1wn7+5-B!A;G(`QQBwUf=?eqm%> zZ*thBl=Z-oQxCt{B(^MQWzgvp8F>avXgSrb-RhtG^t zF`i@0kYo3At<;0!Q_SDLG-$_Fq=l+3I48UP%k|!!$Az!&S#4A{Q$WCAq4ZAw-8NyJ zH@NgCEe~OBa#OnIv2RPdEF(M5hXU`Xu@9Cq$IJ<0aIagywc*IKXzRZc(S09Y)qm=6 zXN#E8dY1Ee`6dQC`I^KNlE&L@#BSS~?iJVFeqO7}Yn|iK$$@*A9MvD+*%p0jW*F0x zeffr0r0S*`uVvX`F^92f+caUIaNFs(ze7H;rDneU&C|Vz`_`2k-xq4x?~s}BkKt+I zmir~gf}DU6r&{6~QIe8al4_M)lnSI6j0_CTbq$Pl4GlvKEv-yUtPD-H4NR>J4Cdd7 ynu($zH$NpatrDccOxM6j*T6Ewz|hLj#LCDFqT%wPi_?G_7(8A5T-G@yGywoPt@_~r literal 0 HcmV?d00001 diff --git a/build/resources/main/img/bookmark.png b/build/resources/main/img/bookmark.png new file mode 100644 index 0000000000000000000000000000000000000000..b437d2219ed3de6accb3a46aa9ac416fbbc006b3 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i5>FS$kP60Ri8~4t9;zO$*ZCmY zY#;Wu;OUGHs$pLhG-Dne4m-SpO;153s+q@G{jhc0b{<&=F-Kl89&O3G!$PtXwlZln zMKg>1ONls?z}Dj3pratazwJ5CSDr@&f}Cw^3po6E)g>26Mi{!>lvvbg)GW!s@br4_ Vg`ai*I)U~xc)I$ztaD0e0swN$IIREx literal 0 HcmV?d00001 diff --git a/build/resources/main/img/bookmarks.png b/build/resources/main/img/bookmarks.png new file mode 100644 index 0000000000000000000000000000000000000000..17a743f9f4441f9dc58e377fcdc0989eca989064 GIT binary patch literal 626 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tmUKs7M+U~W1%@xC#RK_FN#5=* z4FB8v&+G^CI14-?i-EKU7`vU!wqsymT;l2C7!q;#?ezVAhXO>}?bq?Nl&KtW@u^{L zU)0UFuVHn!o|;WF|D{0TyR{5uryo3M*vHgp5EPN~Iv{U>?)Lh;(@KA4P583KGXDJg zIKOkPi;Y6OYi}KK5jpc>bHYq^g%`#L4ry={6mF1wn7+5-B!A;G(`QQBwUf=?eqm%> zZ*thBl=Z-oQxCt{B(^MQWzgvp8F>avXgSrb-RhtG^t zF`i@0kYo3At<;0!Q_SDLG-$_Fq=l+3I48UP%k|!!$Az!&S#4A{Q$WCAq4ZAw-8NyJ zH@NgCEe~OBa#OnIv2RPdEF(M5hXU`Xu@9Cq$IJ<0aIagywc*IKXzRZc(S09Y)qm=6 zXN#E8dY1Ee`6dQC`I^KNlE&L@#BSS~?iJVFeqO7}Yn|iK$$@*A9MvD+*%p0jW*F0x zeffr0r0S*`uVvX`F^92f+caUIaNFs(ze7H;rDneU&C|Vz`_`2k-xq4x?~s}BkKt+I zmir~gf}DU6r&{6~QIe8al4_M)lnSI6j0_CTbq$Pl4GlvKEv-yUtPD-H4NR>J4Cdd7 ynu($zH$NpatrDccOxM6j*T6Ewz|hLj#LCDFqT%wPi_?G_7(8A5T-G@yGywoPt@_~r literal 0 HcmV?d00001 diff --git a/build/resources/main/img/download.png b/build/resources/main/img/download.png new file mode 100644 index 0000000000000000000000000000000000000000..c2c845e8494bcc13406458c6ed3b1f9fd8618a1d GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1OHUWakP60R38@G6Onq4g7bP0l+XkK5V;_b literal 0 HcmV?d00001 diff --git a/build/resources/main/img/downloads.png b/build/resources/main/img/downloads.png new file mode 100644 index 0000000000000000000000000000000000000000..84848a4cbde9fbf0d7e86a928a094e7230c4646b GIT binary patch literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tmUKs7M+U~W1%@xC#RK_FN#5=* z4FB8v&+G^CI14-?i-EKU7`vU!wqsym)bw<542d}WcDiF$vx7*R{qm`LOl=Mw>aTo@ z8t)yLv!G=D?3CN3?=A*tNW_Xb?&e@QXg<^2s%_hu=XoXf{{L4#XQTM(y{E`|iE9#x zd!A0dX8JQwal^9%ZW8t%&uF$ZD5{HJmOh)pJNNhtjYdwFMvVgb#=IkQwJ%Mdv*FQ7 z^UCCni6^S7BM+I!J9}ns_P+VasjN0)^G($$dp0e_U29$+EVi(>hnP%&i~e%_doG?!vBGpCF7#vDak*Lz|d1Iag8WRNi0dVN-jzT zQVd20hUU5k#=3@vA%>P#CdO7qX4(d(Rt5%#(qrbKXvob^$xN#RX)x0@Fw!-!3^6dY bGBmL=Hiu}~DSvAZPy>UftDnm{r-UW|jYP`W literal 0 HcmV?d00001 diff --git a/build/resources/main/img/folder.png b/build/resources/main/img/folder.png new file mode 100644 index 0000000000000000000000000000000000000000..283dc0a192ca788b7abe35d434174049aaa19ce4 GIT binary patch literal 3132 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 literal 0 HcmV?d00001 diff --git a/build/resources/main/img/history.png b/build/resources/main/img/history.png new file mode 100644 index 0000000000000000000000000000000000000000..3d7709b79792b9a9c785b169f9429e6744e3758d GIT binary patch literal 1108 zcmV-a1grarP)Ul%yIL+5$ohiP5e=Oms)6O9QxYryDV$n08}Kj3S9BF)_vk zfh`cfgOm~@n+9mbxKUuy4{d-E^#@V1-s~HfYf(gBynZ;=F$Sa{n~S2D_awBuaRO9JkB;w@;qY zq1QwrdEuFG+76l9p>KA;wOLeC#*7*Os-H9N|kt_Ej9z&$12*J#ja zmAZr|dV|*Ka_3@q*!Ls0BpAP7SdT{&^qvjr{?o3-=vO!)5}9!@A+?Q0L@s(PK{M?m zGa`}WmKQ^wk5-$&kfSCOXrk~d#iS#K!N%ftoo^teEu^*2dDY^aKG3ACkm&ga(l$t8 z+F9dO8yI)iG*Z?VmbcWvt$j1$Le=!pZvwO|WS~xCSkKG1W#CH4TazUPLQ?LP4vAY8 zDo*6?U@B$O^^&yCEMOof4>D?t2I_QpO;&^&tH6D}lt)U=exI0%DNEk-e}Gtv7Zmf5byUn1RwEven0NMz7c3#nyv8JDxSeA~ckZ}`mG@K*0o zD0at6GcY@fPOn>90X@`M8UNoFm+PI2E8P``Tn!$X)uyT##L{IlQ9z@kp=DmRz4D1S ztIOfU?ls^0qjA%JucGV)`fg()-+L};SI04Kb0&-}Gd{0uY`KM(;)D0QL)sG-E34h1 zS%cTf(pI|IYOV9Ot#Q2>(&q>LF3YL0T(fmHdm=6td0*S($IAVOHQrxj_?@0J{JvYw z;uMk5;dI&Y{gmyMr?wOgUS9A5GU%9{i|zYru2Ac&*P_W%`EZ3gXTZSXSEy<)f%TTC zQN<05UK!H!UzTEio}vF*!Ok zGdeXlD=;-WFfeY_UNZmy03~!qSaf7zbY(hiZ)9m^c>ppnF*YqQGA%GUR4_3*F*G_c aGAl4OIxsM)0`g`600006Cmt19dq%AO!p;)KQU4m_oF;DBsKg(y&`Th6% zo$B+FAD*0CqTpD~{b$=I{+*ATteWq>v2&Zq$lP_Ltg$~htw*6pQ@C8Z-mR6>sFzdJ z@9vT16|)YffAlydyTfhPFRnO&S4%E#JIa3I!j>c4PLp{Wb3Zt4+Oy^;_aWoR-E%hv z%&>Vc{juqT+q@0JH7!hg?LRhMSnO~_?_W!Gn^%RSM9`BPe0F}F6OG~o+@@Tat?wv$ zS1eATWR*(D2hXf+4>zxvc!%eEq3>bCI031chtcidi#IP^8M63f?^k~Xm%eM)DjYK= zDsQ>5bs>Xf9_Pj7=goijrS+WCw*8ec=d&xb?2Kj;z8lUA9iJSoG&;6>TLs_ZpU;+S zwyLGSa*@P6KCO()akb{Fi|m?o!&dP{&wUpZYu9(p-d&yT?$4i6LHpFda!orQ{&U`x zQ!HnmudeZb#m4tkvVv{5(S?{_O{MCuw=8e2Uf8#?IJD^6t|(rksfp?5K0bN5|Alzl z*OI6yhNlF95vN+>8c~vxSdwa$T$Bo=7>o=I&2i3|9?FP zGjlV`l;3R=Cl<1Ls{IFoAN4F2{ob;|p3C^Wm?b179x#UWs4YKy;J^Xq)cWLvgdHtv z_A`OXCAp_4A3Sg%q4Btqp3bLiNr@E?SZ8qGGcYiSahM$3eCrHQ$A{*|#)oXP{%G$} r>t9fEpvgVYh}mS71P7~xDg(nYS7VzAhtKE&-NoSP>gTe~DWM4fF;__e literal 0 HcmV?d00001 diff --git a/build/resources/main/img/pdf.png b/build/resources/main/img/pdf.png new file mode 100644 index 0000000000000000000000000000000000000000..853956d91269fb8d9fe709598445296e22466317 GIT binary patch literal 815 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tmUKs7M+U~W1%@xC#RK^Y$sR$z z3=CCj3=9n|3=F@3LJcn%7)pT}UnMXwSj}Ky5HFasE6@fg!Ib3f?!xfDz5mR9Adj=a zBeIx*fm;}a85w5HkpQYN^>lFzi8%ar`u_aO4kE|xcgnF^3VuxxnzD7O&Ov*D1eaLG zPW#4HE4UxcPjF7^aWFV|qCQ~bq&}XdO$(KSLakCff|ghrHrK9vJEwM^xAlj|(we*W z*zE6rf4BO%@t^6Ay{GDJqc~1?7`yqrVqhu1vC#dpkU^TmeA_g&eU$@zs%8)qs_aokQAqs98apiRo5>o2?afIJx>02|!>m}I%s`JYaDEnEYPRi@I%WpW& zdOMnF-KDLpFI0AhzJF!apy=PA_~2s7l&IxW`*l^M_oN)=6Id#$w9|ijKHGlH{W<9q zN_L)ip0`q$$7u1M_;&4W4NFd|UXMI`=Pl!z+1l@)-#)MK@>9*e?V9Vl&zKAAOt#kB#Fq zvbH_V@|7&C`nP%4Wc8cnqUO5m9N!2mbvi1^Vb%8CY_He(EnEv;*(F?m`60S$S!jbH z^EF1t+nU0?o0`I(J$O=~G=WkKR z?&;zfVsSb-VSzqJO2x?!^6WK7AM~$e++HM5)4B4YJ)_4yHi>o~UfzVLX%E%dRx@sA z6UaN5AgkbZxZa?D0UH||Yg=@N)CVihM~)@C{|PT@r~I12|y<>c)I$ztaD0e0sv39PDB6z literal 0 HcmV?d00001 diff --git a/build/resources/main/img/refresh.png b/build/resources/main/img/refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..c82efd5f5fdcbe7c85b26007a4543c35608495d8 GIT binary patch literal 249 zcmV0k3wZ_ zuBR}!Q3(&OAfF^B&F9p0*}aIAngIhZYQ(tfGWg1T^vI+&X->H&zR#X!tmk#yE@;ve;&z` zX9$>Xxt+wzD;LILS?zJ*o7R=pAuKNs276b(JGeXUX!F!6ZKv0VGGL1^KOBPx9QIxAWDk*>#(8&wTEa z`dYkgru>T;{YyPI3eP`&bA@X?hoRu}WYZv%M@cRlKeeBGAbowV+4JdX%E{MrML+XB zZr^k7aBBCj++Wu;x#eyw;@rJ&Q;)Ep+!Vdli}LR7vEH}Ear*k-qRPvr@D(KZA5Y|8 z`~8ydt!)!u>OVRz5%g_$n_vDa$N7bCD%V^-JX5qd&fsa+w6l6ko}{i%J{*7Ka<}I0 z#OodAy*u^!@0K0gn;iD3efQCexm9Nkh2uV*n6@P6g5mQ$&nfAX3hYR)Uy33Y$d{p_SwS_TU#pj1 zcI3uYDGo2DXReIil(Or3LuP39HLu@){a4O3)cm}@dK&MqD?Sfv>)tQE^e<*%l0&4o zuzO6wy$g2lc7#^$I{nmW(llF3-^k0ghts}%-Pd{Y)IrP2#EBORj!y{RZBrR>;D7&~ z8ezVDNPHb6Mw<&;$UW CyjURs literal 0 HcmV?d00001 diff --git a/build/resources/main/img/setting.png b/build/resources/main/img/setting.png new file mode 100644 index 0000000000000000000000000000000000000000..325ebe9589809cb8a8804ef9572cf51c0b58ee5c GIT binary patch literal 1003 zcmVxu4=+t!BZLSMHRV0eRK6oE zP$$<-T7r)}W|$b@CO``n24xncmZw^Mm z%}l_{Is7WbML_o@2XLv7gPg}}^gPu(VNFQAF?>?CpK(c=_E9Mh?&K8jbqcLVa)a>D ztJ8Z&X%b&HH1ge`RrKKBbeuUHpqFJ`{tUqsHPh^h*`<4Q1+;REK8A<_9s;y*#2^EA zvr`1!yfAIUQ9^`>nev`#UVhRVn9a(-`K4F;dECp&$h@OBGT|r_TNe04m3|%A=}=u; z!Yr5uoF}Zhwp=l8KV=M}pzw!&+Nq+AF`cpUuR`9@N;Mt4B94N>0Hqk3jb?`EqB%`G z%ng1@!~ftqhmx#Pn(1bk)8?Nvc3kAEkU}0x1$s4~Rr#{ZuR{>nU`~T9Gb#NmldP!r zE1ErEZ5|}}h9aN}(aap$ib0%^J}4V7z!xj7 z|NTRJ+f3~*!m_l-mydl10000bbVXQnWMOn=I%9HWVRU5xGB7bWEif}JF)>szIXW~j zIx;aUFf}?bFzol)6951JC3HntbYx+4WjbwdWNBu305UK!HZ3qREigG$FflqYG&(dn ZD=;-WFfilgsQ3T?002ovPDHLkV1h)Wx$^)3 literal 0 HcmV?d00001 diff --git a/build/resources/main/img/user.png b/build/resources/main/img/user.png new file mode 100644 index 0000000000000000000000000000000000000000..24f9616f37103f45053c0b26e4476eaf89dd66f3 GIT binary patch literal 1565 zcmV+&2IBdNP)0)mLJ>}tM6bPypm9mlDrsY$CbMFg3tsj(X04Eaa> z<5ZTWCIu?likeizYZqS#h{^&I4`pK|1opkRd+xR~8!T{k7qRmXGwl8S&gXuAkMld1 zfdBa-yx~jUTfT_mkgsqkGSOhN#5#QOd^lGPX3MeSZ22*7{3BbB0GA(7%@%TquPGA3 z<7Nc$MSi{zEE>KB;Y=P?z!m$->G#*kaD0NMT?bdH8e!`) z2}qy!h0O13VQJiSkOoa;?LW`2gp0f7Skc3J2ss@NuvOc`ZjAo6JbVmX3LrZr6r^H% zrE5C-Vdsfjcx`1Y@R=W<8sOV&=CT_gkgEDNc<`tPCXMp}@pwK95*8qY`7cg{=&AOm z?Ys^aX`q+pK}5)8I9^;m`XNRwCPfh%I8LwuR~@L(QxwTJG0j$)orvSxCEz$A z7y1nr!-cFw0ge-Fz|=#Pf6biYKj~&umsf!D86vo@>FPR{Im&%7Emxf%GtGZ(#a*p; zfZ-yO`d-(MKaciF!kontk|OG?Hd^3Kh$)iLGiPzcsGr3sU(mQk+N?M7x5vYCJf<7F zv3iYGSeK^;8%f1p%1XG2Yl@wN4u|WHsIP8Mp1#Q4HdA(A2YJfIk~7=z`k!Mzw*i;$ zEq^^h>i5N`>%+0C(6P}6XX^DTP4_$Q%!0_)Z9rs{dbqOllXc-DS4Wzw&{enez=!$u z+H*T)V%*Srte_(o1r)8y-5kYr39U~NJW zq|FT+R5Yk43adKcRCybiZMO8{Y(=5F>UkVu$3|!bTNWh(Q~>jsDQ5G$VD_iurL9nQ zPX}`5yuMtc#h(3Ky?{qK=nRN@B2ueB-2nxRVrZo^il)cgRYm77?r`cgAZpeGNu>F3 zsZ<*1X-1P(GE&n2_S^lhIuGUYCq8D#J21RrTJn1*U{np3k2Ie}z<4{F`kS`=hi(tCgm;I@+vk#QjTBvL9gEcQjuv56R&5ipH>8iW! zCacZ5airoI7BJ~R#Tx<+btHYkOy8kya|p7!;UP44=%7Pqzh(wb6oMpx8U4co{sZT% zvi;U~r%!LOZY$18{A#EQ9}+P6U|Bi|)ah4~qPgRJJ-(|C+gW=0jPPx7wb=&N4a!}L z0_-ATi-98UY*-S-$Gr!8(&LZ~Qu6e#H3r&B&vccOE)`5Uq&hV_G$2h875sFh8}K%z zHGdj!H9RUT%1qce@I?m!vU4AYtba3Q4$nEcJyi(Dj{Rm+blqsP*un>@I0$gn!SW1g z(B#in%B1$o?ij6KDm8|Ct=gQ6*@`^pEe8Rn=c#{NGH2QX$7hN$;$uITxVkS70!+hz5YMQq9#q1JCUdPm*T|i}wBp2j5;t7} \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -48,7 +30,6 @@ die ( ) { cygwin=false msys=false darwin=false -nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -59,11 +40,26 @@ case "`uname`" in MINGW* ) msys=true ;; - NONSTOP* ) - nonstop=true - ;; esac +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -89,7 +85,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -106,7 +102,7 @@ fi # For Darwin, add options to specify how the application appears in the dock if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:img=$APP_HOME/media/gradle.icns\"" + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi # For Cygwin, switch paths to Windows format before running java @@ -154,19 +150,11 @@ if $cygwin ; then esac fi -# Escape application args -save ( ) { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") } -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -exec "$JAVACMD" "$@" +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d..aec9973 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,9 +46,10 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windows variants +@rem Get command-line arguments, handling Windowz variants if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -59,6 +60,11 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ :execute @rem Setup the command line