From 383c201e105ed08b75111f9a3047c9c40300f1b5 Mon Sep 17 00:00:00 2001 From: badar Date: Fri, 2 Jun 2017 15:43:44 +0500 Subject: [PATCH] README updated --- README.md | 7 +++- README.md~ | 4 ++ SEGP/History.db | Bin 36864 -> 36864 bytes SEGP/bin/.gitignore | 24 +++++++++++ SEGP/bin/controllers/MainController$1.class | Bin 1562 -> 1562 bytes SEGP/bin/controllers/MainController$2.class | Bin 2289 -> 2289 bytes SEGP/bin/controllers/MainController.class | Bin 4882 -> 4792 bytes SEGP/bin/userInterface/MenuView$1.class | Bin 1848 -> 1762 bytes SEGP/bin/userInterface/MenuView.class | Bin 7249 -> 7138 bytes SEGP/src/controllers/MainController.java | 8 +--- SEGP/src/userInterface/MenuView.java | 44 ++++++++++---------- 11 files changed, 57 insertions(+), 30 deletions(-) create mode 100644 README.md~ diff --git a/README.md b/README.md index a32cb50..0d21b18 100644 --- a/README.md +++ b/README.md @@ -1 +1,6 @@ -# SEGP-Group3 \ No newline at end of file +# SEGP-Group3 + +[Jfx Browser Gif](https://twitter.com/badarshahzad54/status/859596238202691584) + +[Jfx Browser Demo](https://youtu.be/DH_6g4OcfyE?list=PLv2dKKz-juPaCQsqET0BH4pUsJw8pbjxb) + diff --git a/README.md~ b/README.md~ new file mode 100644 index 0000000..be6438e --- /dev/null +++ b/README.md~ @@ -0,0 +1,4 @@ +# SEGP-Group3 + +[Jfx Browser Demo](https://youtu.be/DH_6g4OcfyE?list=PLv2dKKz-juPaCQsqET0BH4pUsJw8pbjxb) + diff --git a/SEGP/History.db b/SEGP/History.db index ea025514c48d4dec6c9d12716a52f6cd1c40dfb6..f1236cb24d03aec2811f0749c378c76a9e22a02f 100644 GIT binary patch literal 36864 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 a0^gIsd9D9Rk#%-yVB(F*ck*YJ0saduCPLHz delta 40 rcmZozz|^pSX@WE(>qHr6M%Il9OZXSF7$`ungTP`I2Z7Bj27lxM@dOKw diff --git a/SEGP/bin/.gitignore b/SEGP/bin/.gitignore index 8eac31c..d500714 100644 --- a/SEGP/bin/.gitignore +++ b/SEGP/bin/.gitignore @@ -1,10 +1,34 @@ +/UndecoratorBis.jar +/bookmark.png +/bookmarks.png +/controlsfx-8.40.11.jar +/download.png +/downloads.png +/folder.png +/forward1.png +/history.png +/home.png +/itextpdf-5.5.1-javadoc.jar +/newtab.png +/pdf.png +/pdfConverter.png +/refresh.png +/screenshots/ +/search.png +/setting.png +/user.png /bookmarks/ /controllers/ /database/ /db/ /downloader/ /htmlToPdf/ +/itextpdf-5.5.1.jar +/jfoenix.jar /main/ /passwordVault/ /pdfcrowd/ +/pdfcrowd.jar +/sqlite-jdbc-3.16.1.jar +/testFx-3.1.2.jar /userInterface/ diff --git a/SEGP/bin/controllers/MainController$1.class b/SEGP/bin/controllers/MainController$1.class index 34dad3ff90d373a51acedaeb0126eb28cb446d44..574fba67e9bd523c7af10dd20fe86e9491844030 100644 GIT binary patch delta 23 ecmbQmGmB?~EGuLAWI0wZ)+z=rhU&?=tZM;FYz9pL delta 23 ecmbQmGmB?~EGuL6WI0wZ);b0*hWg35tZM;F;09R$ diff --git a/SEGP/bin/controllers/MainController$2.class b/SEGP/bin/controllers/MainController$2.class index 09f3bb1029917bfe475664fe5e6cfa0eaeb3a647..feeba9c1eee3ea5c004a003610b3fb6f4d293c4c 100644 GIT binary patch delta 41 wcmew;_)%~}13P2GXK@TD8@x^?rZy*`FYOo0X!oFyG9XGv}O{VNa|mF6T49N5=uI z!H+C=E1Y8qPH8xeGh)56Sv`jfGR`xs5|h$mkx^XIMO+diN|ap|bE?Ny&ym3u4NGxV zgw)!K>$oZ7hKQ^6(k=9fqiTfRA!3caA9oGbAVbs2=y6B2aPuR9dkk`8qRX4scdN*w zD5JpO*rRvqp`@N_4#m1V(ur0LBN!F4+{^BZUwl(?91mnnFjSU_Eqg=T+gnoUSh_u- z6L%7|q}pac$rOhNk2E~SJ_dVpf=J!TL?o$qbjWz}zg3!cG%I+ga-ys~P-bL6>R6wHY3glr5 z_s9KpfdU3dIxt8p|7ssZ6}I%2#l7aXd2!cYal_V#Y$1azhD;k~C7T5#7AwIMcjgN4 zH3mh^!m1v7gLMeQ&Qcy@!8{&X$1oL_oKIsT=(M1TLbW$oOPG%P-PRzbdS1lKENOBq zgBK}S%Ln&CA?-dw2MEu?N4|axBa8wf^x8WxRnEMDQc#BZ%rS(`8!V!~M)`a+lmU-6Bqk2o2sM(Z~VJ+;}Q^e24Z=>7wp CIJ2Dq delta 819 zcmZ9L`%6<{7{|Y_o1V*#;x;dhatzVJ%{7dE=z>rUg32UXAcKgGc@Sew*_LKO67)+! zAidE2qGe|0-8^2FmfcKJE=WGVn`Qd$@_c`C^`+VLP-m&7-%jLxHi75c9 zF+V6fL$f6#Xh(;FrMSUeQc=cD+!D~mw@PKEZrtWaB|qy+3RlVK#eg9kf5f?g?XDL%aXuL;~1|P4)b49F`u(kWxT;V0dM(w#btVr z55s$uawf^J!$w!F40mManAjPE%uA}pR<0CZu*dk-QVJsTPKR2pd3Xls?_#>+$U!HswB~zykWCB*rE#h>%7-wVqGD!b5G@dh!x^;Q;jLEZO5Ju> z$COvcL-Qn_1WmSQfpIjZp^C^O>&$T^f^LV|OM_pG;WeMNE-C1vD;YuoMoSTJ$?fHj4zaZB_xFqQ^kD0}BhI?POP$K4upN*Ui^hDi}E{ z7}yw?fTmka4rf!ZXWhY|t+j=LX9t6Vkp4CX!;L^0CI&$uDa616B)b^c8G0DB87458 zGfV=CF))ZhbTbGuhyZy&bAU1y42%Mf45AE{42%riKrv0A8ju~FTG|H~thO=OAdF=L sDq#R(kWowwx(q;D?7&QW1_vGJGoHc0`42QqS(?CLWPDzEVQyS#u%a=-@(Gfgh&Xn zFxFPSfQ|3rGSE21{ImS?Wxj&lA?N+)yhGOPX-v`~2!z9x_rWCIE z&{6ZNBk2G$WE9>;^{`qwQFsysw=}@4!k@3#Ye(hdTEk(UMIQ@_xZK6<081>JGpnL< z=F=Ke8|K?;T6^q2H$A7ye}RpbAM$3{J8|A6m24AeldwCadu5mLaJIu-OFWtp$uYTr zD|}p&q)C<=a@-N_@A@o8iAX0@R#-)aazt4}F(@-vI6ap?nR;WrL;fFa9=u_9Q+Apy Uw)?unuBeAN1&UHRLQ$d;f9icVx&QzG diff --git a/SEGP/bin/userInterface/MenuView.class b/SEGP/bin/userInterface/MenuView.class index 767cd71ea34772a6bd43d9f05fc5d5d6bc9a111e..4b9ec4bb1ee34575527366959737f37e4a0e2a36 100644 GIT binary patch delta 1317 zcmah|OKcNY6g}4-dz@r!kH?9Vabkzqe3EfcSX7V#rHHB$mI4w|6e&w53`vMdXdF=x zQeC=Z0Sg`#2vI4pMk)xJR7L5ctHJ__pn!x}q?G@^<<}NUd*94JQYjT9z5DL>ocr#3 zbFuyU3jO?>AASVz0p(Qq2nn&LGI470PgTA{&Elex6&LjFYQCk5a9`RPv7b^R8%~HX zbwym$_6Iqp;<7jyN{YSVFnujzAyb?TXDKh50yzZH^ahLbT5wT{k>DxS=pI*fn5(uHqIU-ou`4>?yUq zjg=~K6KN^#YPg5{qBYttPDIR#C-_~(Z-j*+Mrkn_4f&tqnfN(+j=uFe{LnjsC5%{W zn2%8j!fOpvxFpubR*0`6*(y>rJVHG;Ym4bfqc{}X7mQL&C0$s?62C!l(P_*KL251m6Ig00 z6S(p{uAXAAAFEkb!pHIgVt9;?SX<*(@cuDdT+0!IXCSp1j>&8T3Dk1E)J)bCNBafW z5x}pkFK}aJF0J-T6R3MvP{##?8>na5!0DSfB4KOJ;%4^*Zg*HY>kO8U!9(r!2A#FW$!~GX>v?5(ZRFMIXAWr_E#ufSdl199 zhe4Lx_*Onc2BkSO%D%hNECnbC(tYxw%^@tyJD8u5UyaMSY#zp4%($Bw%gngvJ&gQ} z=P>@4usrvS!MBX<^DrJ^#-q$Q#*D}Rmr?$?eyWo1hcpWF&hL_{c_qlCq@&eSni?H# d0p+r^kQQ-T1_~{vX0n*#7~ArjbT>@9`@cHf^;7@= delta 1480 zcmb7@Uu;uV9LK-E+q<@Qx9z=cce~rIb94jRyN!})0QsW{#5j^kVkAq5JlKu9QQNi9 zTTx<6!-FqADDe;<48cDyzG;Zs8Hqgjrimfb@D2U8+Kw|5&R5V6fU=XcKe z-S6j|-|u%WY@FGoezW++X#kH>J^+cJiz6ZZO^|!^M5paA9if#oDA*3xRM+!FTwc&}JR7Ds@6iJg=oT6QYw= zeS5W9db&_6jTWt!0=PQ<($B0vPJ023YB`rndou)$h(n{a-(9kwvh!tr+`91dWb);t+F-F zXOpu#o#>DyKGfdy$EhPg39&V{)~8caOvKI=V}xXORII2sFxh4?X2KRKFMkkr@F#(yAk3TOA214H87q~7=zVO+vCC;P2UJdP)L#%|CM z<4ic#Irt&DmX0KRu4S+#<2>8F-in5V=dYu4*{hSiBwWBO?{%~H7;_x0jM>D+hG~9^ zVQv|2ySVM1#!t>PmTO|-B)du2%6*JQfUDfkv-CBr!gcr1dP{2g&>39D9D@iyqss$6 z!$)y|9j9<*&oq7+F$b8ip^5p=(AcoTh`2|-g&FRU&ditAL z-3gPzs&8>S*2Jw9)sV|xL_6-dib~73rKq+Av4FqCOy_#v-&o`^E|Nxi%N^EhMa%S( z7BUA0hYXpcvm)(xrM`A$`GRVYh&2uxd6^_nY})9S$>&YxjI>Yo>~t#K;EMAo6)z{I zlau?TWVf$L{(GcGck8CashQ%`RJj@sA_x1f@R`f$F)8GvN0pq)Zu}p(yaZqWuexZ# z4>SA~hQG@22E&j12b`Y}vl~t|KG4nmOYlwifWO1=;|xE+@b?)0!TsPAVW^LyOqEC_ xZG;VeI>b+fQk141*Ls*T)aP3Lw3f1zW3LQkGHH<3!NB`GcYa^C2Apk;{{S$m95(;} diff --git a/SEGP/src/controllers/MainController.java b/SEGP/src/controllers/MainController.java index 0155da8..c617d24 100644 --- a/SEGP/src/controllers/MainController.java +++ b/SEGP/src/controllers/MainController.java @@ -50,8 +50,8 @@ public MainController() { public static TabPane tabPane = new TabPane(); private static Tab firstTab = new Tab("New Tab"); - - private static Tab addNewTab = new Tab("+"); + + private static final Tab addNewTab = new Tab("+"); public void setFirstTab(Tab firstTab) { this.firstTab = firstTab; @@ -115,10 +115,6 @@ public static Tab getAddNewTab() { return addNewTab; } - public void setAddNewTab(Tab addNewTab) { - this.addNewTab = addNewTab; - } - public void tabPaneChangeListener(TabPane tabpane) { tabpane.getSelectionModel().selectedItemProperty().addListener(new ChangeListener() { @Override diff --git a/SEGP/src/userInterface/MenuView.java b/SEGP/src/userInterface/MenuView.java index 8ff0e2f..578446c 100644 --- a/SEGP/src/userInterface/MenuView.java +++ b/SEGP/src/userInterface/MenuView.java @@ -53,7 +53,7 @@ public class MenuView { SingleSelectionModel selectedTab ; SingleSelectionModel fxSelectedTab ; - + public void setMenuViewListener(JFXButton history, JFXButton downloads, JFXButton bookmarks, JFXButton setting, TabPane tabPane, JFXDrawersStack drawersStack, JFXDrawer rightDrawer) { @@ -106,9 +106,9 @@ public void setMenuViewListener(JFXButton history, JFXButton downloads, JFXButto onClickHideHamburger(); - addAndSelectNewTab(tabs,tab,selectedTab,fxSelectedTab); + addAndSelectNewTab(tabs,tab,selectedTab,fxSelectedTab, 0); - fxSelectedTab.select(0); + // fxSelectedTab.select(0); tab.setText("History"); @@ -120,12 +120,12 @@ public void setMenuViewListener(JFXButton history, JFXButton downloads, JFXButto onClickHideHamburger(); - addAndSelectNewTab(tabs,tab,selectedTab,fxSelectedTab); + addAndSelectNewTab(tabs,tab,selectedTab,fxSelectedTab , 1); - fxSelectedTab.select(1); + // fxSelectedTab.select(1); tab.setText("Downloads"); - + }); // -------------------------------------------------------Bookmarks @@ -137,12 +137,12 @@ public void handle(ActionEvent event) { onClickHideHamburger(); - addAndSelectNewTab(tabs,tab,selectedTab,fxSelectedTab); + addAndSelectNewTab(tabs,tab,selectedTab,fxSelectedTab, 2); - fxSelectedTab.select(2); + // fxSelectedTab.select(2); tab.setText("Bookmarks"); - + } }); @@ -153,12 +153,12 @@ public void handle(ActionEvent event) { onClickHideHamburger(); - addAndSelectNewTab(tabs,tab,selectedTab,fxSelectedTab); + addAndSelectNewTab(tabs,tab,selectedTab,fxSelectedTab, 3); - fxSelectedTab.select(3); + // fxSelectedTab.select(3); tab.setText("Setting"); - + }); //As the bookmarks is not designed in fxml so: When the bookmarks tab @@ -198,7 +198,8 @@ public void changed(ObservableValue ov, Tab t, Tab newSelectedTab } - private void addAndSelectNewTab(ObservableList tabs, Tab tab2, SingleSelectionModel selectedTab, SingleSelectionModel fxSelectedTab) { + private void addAndSelectNewTab(ObservableList tabs, Tab tab2, SingleSelectionModel selectedTab, SingleSelectionModel fxSelectedTab + ,int selectedTabIndex) { // TODO Auto-generated method stub @@ -217,12 +218,18 @@ public void run() { openTabName.equals("Downloads") || openTabName.equals("Setting")) { - //selectedTab.select(a); + + // fxSelectedTab.select(selectedTabIndex); + System.out.println("Tab index:"+ selectedTabIndex); + + selectedTab.select(a); + return; } } + fxSelectedTab.select(selectedTabIndex); tabs.add(tabs.size() - 1, tab); selectedTab.select(tab); getBookMarkView(); @@ -230,16 +237,7 @@ public void run() { } }); } - - private void historyHandleBt(ActionEvent event) { - - // When the menu click Hamburger and DrawerStack will hide - onClickHideHamburger(); - addAndSelectNewTab(tabs,tab,selectedTab,fxSelectedTab); - - tab.setText("History"); - } public void getBookMarkView(){ BookMarks ob = new BookMarks();