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 0000000..22b624b Binary files /dev/null and b/build/resources/main/img/backword1.png differ diff --git a/build/resources/main/img/bookMarks[1].png b/build/resources/main/img/bookMarks[1].png new file mode 100644 index 0000000..17a743f Binary files /dev/null and b/build/resources/main/img/bookMarks[1].png differ diff --git a/build/resources/main/img/bookmark.png b/build/resources/main/img/bookmark.png new file mode 100644 index 0000000..b437d22 Binary files /dev/null and b/build/resources/main/img/bookmark.png differ diff --git a/build/resources/main/img/bookmarks.png b/build/resources/main/img/bookmarks.png new file mode 100644 index 0000000..17a743f Binary files /dev/null and b/build/resources/main/img/bookmarks.png differ diff --git a/build/resources/main/img/download.png b/build/resources/main/img/download.png new file mode 100644 index 0000000..c2c845e Binary files /dev/null and b/build/resources/main/img/download.png differ diff --git a/build/resources/main/img/downloads.png b/build/resources/main/img/downloads.png new file mode 100644 index 0000000..84848a4 Binary files /dev/null and b/build/resources/main/img/downloads.png differ diff --git a/build/resources/main/img/folder.png b/build/resources/main/img/folder.png new file mode 100644 index 0000000..283dc0a Binary files /dev/null and b/build/resources/main/img/folder.png differ diff --git a/build/resources/main/img/forward1.png b/build/resources/main/img/forward1.png new file mode 100644 index 0000000..9a048f1 Binary files /dev/null and b/build/resources/main/img/forward1.png differ diff --git a/build/resources/main/img/history.png b/build/resources/main/img/history.png new file mode 100644 index 0000000..3d7709b Binary files /dev/null and b/build/resources/main/img/history.png differ diff --git a/build/resources/main/img/home.png b/build/resources/main/img/home.png new file mode 100644 index 0000000..d89004e Binary files /dev/null and b/build/resources/main/img/home.png differ diff --git a/build/resources/main/img/newtab.png b/build/resources/main/img/newtab.png new file mode 100644 index 0000000..2ab5c16 Binary files /dev/null and b/build/resources/main/img/newtab.png differ diff --git a/build/resources/main/img/pdf.png b/build/resources/main/img/pdf.png new file mode 100644 index 0000000..853956d Binary files /dev/null and b/build/resources/main/img/pdf.png differ diff --git a/build/resources/main/img/pdfConverter.png b/build/resources/main/img/pdfConverter.png new file mode 100644 index 0000000..5f10ce3 Binary files /dev/null and b/build/resources/main/img/pdfConverter.png differ diff --git a/build/resources/main/img/refresh.png b/build/resources/main/img/refresh.png new file mode 100644 index 0000000..c82efd5 Binary files /dev/null and b/build/resources/main/img/refresh.png differ diff --git a/build/resources/main/img/search.png b/build/resources/main/img/search.png new file mode 100644 index 0000000..e84babd Binary files /dev/null and b/build/resources/main/img/search.png differ diff --git a/build/resources/main/img/setting.png b/build/resources/main/img/setting.png new file mode 100644 index 0000000..325ebe9 Binary files /dev/null and b/build/resources/main/img/setting.png differ diff --git a/build/resources/main/img/user.png b/build/resources/main/img/user.png new file mode 100644 index 0000000..24f9616 Binary files /dev/null and b/build/resources/main/img/user.png differ diff --git a/build/tmp/jar/MANIFEST.MF b/build/tmp/jar/MANIFEST.MF new file mode 100644 index 0000000..58630c0 --- /dev/null +++ b/build/tmp/jar/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d9d84e5..4059dbe 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Nov 16 20:48:50 PKT 2017 +#Thu Nov 30 15:09:12 PKT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-rc-2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip diff --git a/gradlew b/gradlew index 48e2bec..9d82f78 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash ############################################################################## ## @@ -6,30 +6,12 @@ ## ############################################################################## -# 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 +# 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