bug fixes after beta release with some changes in the readme file

.gitignore

@@ -4,5 +4,4 @@
 .settings
 out/
 target/
-data/
-temp/
+bundles/

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Ahmed Elzoughby <[email protected]>
+Copyright (c) 2019 Ahmed Elzoughby <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

META-INF/MANIFEST.MF

@@ -1,13 +1,14 @@
 Manifest-Version: 1.0
 Implementation-Title: Video Download Manager
 Implementation-Version: 1.0.0
-Implementation-Vendor: elzoughby
 JavaFX-Version: 8.0
-Created-By: elzoughby
-Class-Path: lib/ShellExecutor-1.1.jar lib/SystemTray-3.16.jar lib/gson
+Class-Path: lib/ShellExecutor-1.1.jar lib/SystemTray-3.17.jar lib/gson
  -2.8.5.jar lib/jna-platform-4.5.2.jar lib/jna-4.5.2.jar lib/controlsf
- x-8.40.14.jar lib/fx-gson-3.1.0.jar lib/javassist-3.23.0-GA.jar lib/a
+ x-8.40.14.jar lib/fx-gson-3.1.2.jar lib/javassist-3.23.0-GA.jar lib/a
  nnotations-15.0.jar lib/jsoup-1.11.3.jar lib/slf4j-api-1.7.25.jar lib
  /slf4j-nop-1.7.25.jar
-Main-Class: Main
+VDM-Class: VDM
+Created-By: elzoughby
+Implementation-Vendor: elzoughby
+Main-Class: VDM
 

README.md

@@ -1,59 +1,53 @@
-![VDM Logo](docs/assets/img/VDM-Wide-Light.png)
+![VDM Logo](assets/logo-wide.png)
+---
 
 **Video Download Manager [VDM]** is GUI client for the popular CLI application *Youtube-dl*. It has the features you need in a video downloader application and supports a very long list of video and audio streaming websites. VDM is free, cross-platform and open source application written in *Java* and the *JavaFX* toolkit. 
 
-
-
-
+![About VDM](assets/screenshot-1.png)
 
 Video Download Manager has the clean user interface that you can quickly get familiar with. It uses the evident colored icons to express its options. The new download options are categorized and distributed in a colored groups to provide easy and usable window with quick options picking.
 
-![home window](docs/assets/img/vdm-ui.png)
-
-
+![home window](assets/screenshot-2.png)
 
 With *VDM* you can download all the playlist items or select a specific items from it. You can download playlists from youtube and dailymotion, albums and groups from vimeo, courses from udemy, lynda and pluralsight, sets, playlists and stations from soundcloud and more collections from other video and audio streaming websites.
 
-![home window](docs/assets/img/vdm-playlist.png)
-
-
+![home window](assets/screenshot-3.png)
 
 You can start new downloads immediately or you can add them to the Queue for later downloading. The Queue can be started easily from the system tray icon or by starting one of its items. Whenever you start it, VDM will downlaod its items one by one consecutively.
 
-![home window](docs/assets/img/vdm-queue.png)
-
-
+![home window](assets/screenshot-4.png)
 
 For more Info:
 
-​	https://elzoughby.github.io/vdm
+​	[https://elzoughby.github.io/vdm](https://elzoughby.github.io/vdm)
 
 
 
-#### Dependences:
+## Dependences
 
 - JRE 8
 - Python 2.7 or Python 3.x
 - FFMPEG or LibAV
 
 
 
+## How to run
 
-
-#### How to run:
-
-- ###### Normal Mode
+- ##### Normal Mode
 
   ```bash
   java -jar vdm.jar        # start the program maximized
   ```
 
-
-- ###### Silent Mode
+- ##### Silent Mode
 
   ```bash
   java -jar vdm.jar -s     # start the program minimized to tray
   ```
 
 
 
+## License
+
+Video Download Manager is distributed under the terms of the MIT license. See [LICENSE](LICENSE) for details. Opening a pull requests is assumed to signal agreement with these licensing terms.
+

VDM.iml

@@ -13,15 +13,15 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Maven: org.hildan.fxgson:fx-gson:3.1.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.jetbrains:annotations:15.0" level="project" />
-    <orderEntry type="library" name="Maven: com.dorkbox:SystemTray:3.16" level="project" />
+    <orderEntry type="library" name="Maven: org.hildan.fxgson:fx-gson:3.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:15.0" level="project" />
+    <orderEntry type="library" name="Maven: com.dorkbox:SystemTray:3.17" level="project" />
     <orderEntry type="library" name="Maven: com.dorkbox:ShellExecutor:1.1" level="project" />
     <orderEntry type="library" name="Maven: org.javassist:javassist:3.23.0-GA" level="project" />
     <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.5.2" level="project" />
     <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.5.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-nop:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-nop:1.7.25" level="project" />
     <orderEntry type="library" name="Maven: org.controlsfx:controlsfx:8.40.14" level="project" />
     <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
   </component>

pom.xml

@@ -36,23 +36,21 @@
         <dependency>
             <groupId>org.hildan.fxgson</groupId>
             <artifactId>fx-gson</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.2</version>
         </dependency>
 
         <dependency>
             <groupId>com.dorkbox</groupId>
             <artifactId>SystemTray</artifactId>
-            <version>3.16</version>
+            <version>3.17</version>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-nop</artifactId>
             <version>1.7.25</version>
-            <scope>test</scope>
         </dependency>
 
-
         <dependency>
             <groupId>org.controlsfx</groupId>
             <artifactId>controlsfx</artifactId>

src/main/java/AboutController.java

@@ -63,7 +63,7 @@ public static void showAboutDialog() {
     @Override
     public void initialize(URL url, ResourceBundle resourceBundle) {
 
-        versionLabel.setText(Main.VERSION);
+        versionLabel.setText(VDM.VERSION);
 
         aboutWindowVBox.setOnKeyPressed((KeyEvent keyEvent) -> {
             if(new KeyCodeCombination(KeyCode.ESCAPE).match(keyEvent))
@@ -92,7 +92,7 @@ private void closeBtnAction() {
     @FXML
     private void readLicense() {
         try {
-            Desktop.browseURL(Main.WEBSITE + "/license");
+            Desktop.browseURL(VDM.WEBSITE + "/license");
         } catch (IOException e) {
             new MessageDialog("Error opening the default web browser" +
                     "Try again later or report this issue", MessageDialog.Type.ERROR, MessageDialog.Buttons.CLOSE).show();
@@ -102,7 +102,7 @@ private void readLicense() {
     @FXML
     private void becomePatreon() {
         try {
-            Desktop.browseURL(Main.PATREON);
+            Desktop.browseURL(VDM.PATREON);
         } catch (IOException e) {
             new MessageDialog("Error opening the default web browser" +
                     "Try again later or report this issue", MessageDialog.Type.ERROR, MessageDialog.Buttons.CLOSE).show();

src/main/java/DataHandler.java

@@ -12,9 +12,9 @@
 
 public class DataHandler {
 
-    private static final String OS_NAME = Main.OS_NAME;
-    private static final String SEPARATOR = Main.SEPARATOR;
-    private static final String USER_HOME = Main.USER_HOME;
+    private static final String OS_NAME = VDM.OS_NAME;
+    private static final String SEPARATOR = VDM.SEPARATOR;
+    private static final String USER_HOME = VDM.USER_HOME;
 
     private static Gson gson = FxGson.coreBuilder().excludeFieldsWithoutExposeAnnotation().create();
     private static String appDataDirectory;
@@ -31,8 +31,8 @@ else if(OS_NAME.contains("mac"))
 
         // Fill the appPreferences with default values
         appPreferences = new HashMap<>();
-        appPreferences.put("Main.width", 800d);                         //Double
-        appPreferences.put("Main.height", 500d);                        //Double
+        appPreferences.put("VDM.width", 800d);                         //Double
+        appPreferences.put("VDM.height", 500d);                        //Double
         appPreferences.put("Home.hideLog", Boolean.FALSE);                 //Boolean
         appPreferences.put("Home.dividerPosition", 0.8d);               //Double
         appPreferences.put("Data.nextID", 0L);                          //Long
@@ -67,8 +67,8 @@ public static void readAppPreferences() {
 
                 if(objectInputStream.readUTF().equals("_VDM_")) {
 
-                    appPreferences.replace("Main.width", objectInputStream.readDouble());
-                    appPreferences.replace("Main.height", objectInputStream.readDouble());
+                    appPreferences.replace("VDM.width", objectInputStream.readDouble());
+                    appPreferences.replace("VDM.height", objectInputStream.readDouble());
                     appPreferences.replace("Home.hideLog", objectInputStream.readBoolean());
                     appPreferences.replace("Home.dividerPosition", objectInputStream.readDouble());
                     appPreferences.replace("Data.nextID", objectInputStream.readLong());
@@ -108,8 +108,8 @@ public  static void writeAppPreferences() {
 
             objectOutputStream.writeUTF("_VDM_");
 
-            objectOutputStream.writeDouble( (Double) appPreferences.get("Main.width"));
-            objectOutputStream.writeDouble( (Double) appPreferences.get("Main.height"));
+            objectOutputStream.writeDouble( (Double) appPreferences.get("VDM.width"));
+            objectOutputStream.writeDouble( (Double) appPreferences.get("VDM.height"));
             objectOutputStream.writeBoolean( (Boolean) appPreferences.get("Home.hideLog"));
             objectOutputStream.writeDouble( (Double) appPreferences.get("Home.dividerPosition"));
             objectOutputStream.writeLong( (Long) appPreferences.get("Data.nextID"));