fix #67 #68

badarshahzad · Nov 30, 2017 · ca1dfef · ca1dfef
1 parent c720cea
commit ca1dfef
Show file tree

Hide file tree

Showing 32 changed files with 605 additions and 51 deletions.
diff --git 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
@@ -0,0 +1,11 @@
+
+/*******************************************************************************
+ *                                                                             *
+ * Label  			                                                       *
+ *                                                                             *
+ ******************************************************************************/
+
+.label:hover {
+     -fx-background-color: derive(#777777,80.0%);
+
+}
diff --git a/build/resources/main/css/stylesheet.css 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
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXTextField?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<BorderPane fx:id="borderPane" prefHeight="450.0" prefWidth="650.0" style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.DownloadController">
+   <top>
+      <GridPane opacity="0.84" style="-fx-background-color: #2959ea;" BorderPane.alignment="CENTER">
+        <columnConstraints>
+          <ColumnConstraints hgrow="SOMETIMES" maxWidth="364.0" minWidth="10.0" prefWidth="115.0" />
+            <ColumnConstraints hgrow="SOMETIMES" />
+          <ColumnConstraints hgrow="SOMETIMES" maxWidth="300.0" minWidth="300.0" prefWidth="300.0" />
+            <ColumnConstraints hgrow="SOMETIMES" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="50.0" minWidth="50.0" prefWidth="50.0" />
+        </columnConstraints>
+        <rowConstraints>
+          <RowConstraints />
+            <RowConstraints minHeight="10.0" prefHeight="60.0" vgrow="SOMETIMES" />
+        </rowConstraints>
+         <children>
+            <Label text="Downloads" textFill="#f4f4f4" GridPane.rowIndex="1">
+               <padding>
+                  <Insets left="20.0" />
+               </padding>
+               <font>
+                  <Font size="18.0" />
+               </font>
+               <GridPane.margin>
+                  <Insets left="10.0" />
+               </GridPane.margin>
+            </Label>
+            <JFXTextField fx:id="searchField" alignment="CENTER" focusColor="WHITE" minWidth="200.0" prefWidth="400.0" style="-fx-border-radius: 30;" GridPane.columnIndex="2" GridPane.rowIndex="1">
+               <font>
+                  <Font size="14.0" />
+               </font></JFXTextField>
+            <JFXButton fx:id="downloadMenu" alignment="TOP_RIGHT" contentDisplay="RIGHT" ripplerFill="WHITE" style="-fx-background-color: #2959cb;" text="+" textFill="WHITE" GridPane.columnIndex="4" GridPane.rowIndex="1">
+               <GridPane.margin>
+                  <Insets bottom="5.0" left="5.0" right="10.0" top="5.0" />
+               </GridPane.margin>
+            </JFXButton>
+            <JFXButton fx:id="search" text="Search" textFill="#f4f4f4" GridPane.columnIndex="3" GridPane.rowIndex="1">
+               <font>
+                  <Font size="14.0" />
+               </font>
+            </JFXButton>
+         </children>
+      </GridPane>
+   </top>
+   <left>
+      <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0" BorderPane.alignment="CENTER">
+         <children>
+            <JFXButton fx:id="clean" opacity="0.8" prefHeight="40.0" prefWidth="100.0" style="-fx-background-color: #2959ea;" text="Clean" textFill="#f4f4f4">
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="10.0" />
+               </padding>
+            </JFXButton>
+            <JFXButton fx:id="cancel" opacity="0.8" prefHeight="40.0" prefWidth="100.0" style="-fx-background-color: #2959ea;" text="Cancel" textFill="WHITE">
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="10.0" />
+               </padding>
+            </JFXButton>
+         </children>
+         <BorderPane.margin>
+            <Insets bottom="5.0" left="20.0" right="20.0" top="20.0" />
+         </BorderPane.margin>
+      </VBox>
+   </left>
+   <center>
+      <TableView fx:id="table" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
+   </center>
+</BorderPane>
diff --git a/build/resources/main/fxml/History.fxml b/build/resources/main/fxml/History.fxml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXTextField?>
+<?import com.jfoenix.controls.JFXTreeTableView?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.chart.PieChart?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TreeView?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<BorderPane fx:id="borderPaneHistory" prefHeight="450.0" prefWidth="650.0" style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.HistoryController">
+   <left>
+      <VBox fx:id="paneForChart" opacity="0.84" prefWidth="250.0" BorderPane.alignment="CENTER">
+         <children>
+            <TreeView fx:id="treeView" minHeight="200.0" minWidth="100.0" opacity="0.8" prefHeight="200.0" prefWidth="100.0">
+               <VBox.margin>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </VBox.margin>
+            </TreeView>
+            <PieChart fx:id="historyPieChart" />
+         </children>
+         <BorderPane.margin>
+            <Insets bottom="5.0" left="5.0" />
+         </BorderPane.margin>
+      </VBox>
+   </left>
+   <top>
+      <GridPane opacity="0.84" style="-fx-background-color: #2959ea;" BorderPane.alignment="CENTER">
+         <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="364.0" minWidth="10.0" prefWidth="200.0" />
+            <ColumnConstraints hgrow="SOMETIMES" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="300.0" minWidth="200.0" prefWidth="300.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="150.0" minWidth="150.0" prefWidth="150.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="150.0" prefWidth="150.0" />
+         </columnConstraints>
+         <rowConstraints>
+            <RowConstraints minHeight="10.0" prefHeight="60.0" vgrow="SOMETIMES" />
+         </rowConstraints>
+         <children>
+            <Label prefWidth="119.0" text="History" textFill="#f4f4f4">
+               <font>
+                  <Font size="18.0" />
+               </font>
+               <padding>
+                  <Insets left="20.0" />
+               </padding>
+            </Label>
+            <Label fx:id="selectedDeleteEntries" text="Selected" textFill="WHITE" GridPane.columnIndex="1" />
+            <JFXTextField fx:id="search" focusColor="WHITE" minWidth="200.0" onMouseClicked="#SearchDataInTable" prefWidth="400.0" GridPane.columnIndex="2">
+               <font>
+                  <Font size="14.0" />
+               </font></JFXTextField>
+            <JFXButton fx:id="btn" buttonType="RAISED" onMouseClicked="#deleteHistory" opacity="0.9" prefHeight="30.0" prefWidth="103.0" ripplerFill="#3c7cea" style="-fx-background-color: #3c7cea;" text="Clear History" textFill="WHITE" GridPane.columnIndex="5">
+               <GridPane.margin>
+                  <Insets bottom="5.0" left="20.0" right="5.0" top="5.0" />
+               </GridPane.margin>
+            </JFXButton>
+            <JFXButton fx:id="deleteSingle" buttonType="RAISED" opacity="0.9" prefHeight="30.0" prefWidth="125.0" ripplerFill="#3c7cea" style="-fx-background-color: #3c7cea;" text="Delete Seleted" textFill="WHITE" GridPane.columnIndex="4">
+               <GridPane.margin>
+                  <Insets bottom="5.0" left="20.0" right="5.0" top="5.0" />
+               </GridPane.margin>
+            </JFXButton>
+            <JFXButton fx:id="search1" text="Search" textFill="#f4f4f4" GridPane.columnIndex="3">
+               <font>
+                  <Font size="14.0" />
+               </font>
+            </JFXButton>
+         </children>
+         <BorderPane.margin>
+            <Insets />
+         </BorderPane.margin>
+      </GridPane>
+   </top>
+   <center>
+      <JFXTreeTableView fx:id="table" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
+   </center>
+</BorderPane>
diff --git a/build/resources/main/fxml/Login.fxml b/build/resources/main/fxml/Login.fxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXPasswordField?>
+<?import com.jfoenix.controls.JFXTextField?>
+<?import javafx.scene.effect.DropShadow?>
+<?import javafx.scene.layout.Pane?>
+
+<Pane fx:id="loginPane" prefHeight="400.0" prefWidth="400.0" style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.LoginController">
+   <children>
+      <JFXTextField fx:id="user" focusColor="#3c7cea" labelFloat="true" layoutX="69.0" layoutY="87.0" minHeight="50.0" minWidth="250.0" opacity="0.7" promptText="User name" style="-fx-background-radius: 10;" />
+      <JFXPasswordField fx:id="password" focusColor="#3c7cea" labelFloat="true" layoutX="69.0" layoutY="181.0" minHeight="50.0" minWidth="250.0" opacity="0.7" promptText="Password" style="-fx-background-radius: 10;" />
+      <JFXButton fx:id="login" buttonType="RAISED" layoutX="79.0" layoutY="308.0" prefHeight="42.0" prefWidth="100.0" ripplerFill="WHITE" style="-fx-background-color: #3c7cea; -fx-background-radius: 25;" text="Login" textFill="WHITE" />
+      <JFXButton fx:id="signup" buttonType="RAISED" layoutX="215.0" layoutY="310.0" prefHeight="42.0" prefWidth="100.0" ripplerFill="WHITE" style="-fx-background-color: #3c7cea; -fx-background-radius: 25;" text="Sign Up" textFill="WHITE" />
+   </children>
+   <effect>
+      <DropShadow blurType="GAUSSIAN" />
+   </effect>
+</Pane>
diff --git a/build/resources/main/fxml/MainFXML.fxml b/build/resources/main/fxml/MainFXML.fxml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.BorderPane?>
+
+
+<BorderPane fx:id="rootBorderPane" minWidth="700.0" prefHeight="600.0" prefWidth="700.0" style="-fx-background-color: #ffffff;" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.MainController" />