Makor deb pkg fixes....

2017-03-31 22:13:21 -05:00
parent a0e6abc9a5
commit 5ecee17034
99 changed files with 147 additions and 152 deletions
@@ -1,9 +0,0 @@
-Package: FXWinWrap
-Version: 0.1-2
-Section: base
-Priority: optional
-Architecture: amd64
-Depends: openjdk-8-jre (>= 8u45-b14-1), mplayer2 (>=2.0-728-g2c378c7-4), gifsicle (>=1.86-1), nitrogen (>=1.5.2-2)
-Maintainer: Maxim Stewart [email protected]
-Description: FXWinWrap
- A GUI to handle setting XWinWrap options.
@@ -1,9 +0,0 @@
-Package: FXWinWrap
-Version: 0.1-2
-Section: base
-Priority: optional
-Architecture: i386
-Depends: openjdk-8-jre (>= 8u45-b14-1), mplayer2 (>=2.0-728-g2c378c7-4), gifsicle (>=1.86-1), nitrogen (>=1.5.2-2)
-Maintainer: Maxim Stewart [email protected]
-Description: FXWinWrap
- A GUI to handle setting XWinWrap options.
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=FXWinWrap
-Comment=JavaFX gui for XWinWrap
-Exec=/bin/fxwinwrap
-Icon=/opt/FXWinWrap/resources/fxwinwrap.png
-Terminal=false
-Type=Application
-Categories=Applications;System;
-MimeType=application/fxml;
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=FXWinWrap
-Comment=JavaFX gui for XWinWrap
-Exec=/bin/fxwinwrap
-Icon=/opt/FXWinWrap/resources/fxwinwrap.png
-Terminal=false
-Type=Application
-Categories=Applications;System;
-MimeType=application/fxml;
@@ -0,0 +1,5 @@
+find . -type f -exec chmod 644 {} +
+find . -type d -exec chmod 755 {} +
+
+chown -R root:root ./*/
+
@@ -1,9 +1,8 @@
-Package: FXWinWrap
+Package: fxwinwrap64
 Version: 0.1-1
 Section: base
 Priority: optional
 Architecture: amd64
 Depends: openjdk-8-jre (>= 8u45-b14-1)
 Maintainer: Maxim Stewart [email protected]
-Description: FXWinWrap
- A GUI to handle setting XWinWrap options.
+Description: A GUI to handle setting XWinWrap options.
@@ -6,5 +6,5 @@ Exec=/bin/fxwinwrap
 Icon=/opt/FXWinWrap/resources/fxwinwrap.png
 Terminal=false
 Type=Application
-Categories=Applications;System;
+Categories=System;
 MimeType=application/fxml;
@@ -1,9 +1,8 @@
-Package: FXWinWrap
+Package: fxwinwrap
 Version: 0.1-1
 Section: base
 Priority: optional
 Architecture: i386
 Depends: openjdk-8-jre (>= 8u45-b14-1)
 Maintainer: Maxim Stewart [email protected]
-Description: FXWinWrap
- A GUI to handle setting XWinWrap options.
+Description: A GUI to handle setting XWinWrap options.
@@ -6,5 +6,5 @@ Exec=/bin/fxwinwrap
 Icon=/opt/FXWinWrap/resources/fxwinwrap.png
 Terminal=false
 Type=Application
-Categories=Applications;System;
+Categories=System;
 MimeType=application/fxml;
@@ -1,9 +1,8 @@
-Package: FXWinWrap
+Package: fxwinwrap64
 Version: 0.1-2
 Section: base
 Priority: optional
 Architecture: amd64
 Depends: openjdk-8-jre (>= 8u45-b14-1), mplayer2 (>=2.0-728-g2c378c7-4), gifsicle (>=1.86-1), nitrogen (>=1.5.2-2)
 Maintainer: Maxim Stewart [email protected]
-Description: FXWinWrap
- A GUI to handle setting XWinWrap options.
+Description: A GUI to handle setting XWinWrap options.
@@ -14,7 +14,3 @@ if [ -x "`which xdg-desktop-menu 2>/dev/null`" ]; then
    xdg-desktop-menu uninstall /usr/share/applications/FXWinWrap.desktop
    xdg-desktop-menu forceupdate --mode user
 fi
-
-if [ -x "`which update-menus 2>/dev/null`" ]; then
-update-menus
-fi
@@ -6,5 +6,5 @@ Exec=/bin/fxwinwrap
 Icon=/opt/FXWinWrap/resources/fxwinwrap.png
 Terminal=false
 Type=Application
-Categories=Applications;System;
+Categories=System;
 MimeType=application/fxml;
@@ -1,9 +1,8 @@
-Package: FXWinWrap
+Package: fxwinwrap
 Version: 0.1-2
 Section: base
 Priority: optional
 Architecture: i386
 Depends: openjdk-8-jre (>= 8u45-b14-1), mplayer2 (>=2.0-728-g2c378c7-4), gifsicle (>=1.86-1), nitrogen (>=1.5.2-2)
 Maintainer: Maxim Stewart [email protected]
-Description: FXWinWrap
- A GUI to handle setting XWinWrap options.
+Description: A GUI to handle setting XWinWrap options.
@@ -14,7 +14,3 @@ if [ -x "`which xdg-desktop-menu 2>/dev/null`" ]; then
    xdg-desktop-menu uninstall /usr/share/applications/FXWinWrap.desktop
    xdg-desktop-menu forceupdate --mode user
 fi
-
-if [ -x "`which update-menus 2>/dev/null`" ]; then
-update-menus
-fi
@@ -6,5 +6,5 @@ Exec=/bin/fxwinwrap
 Icon=/opt/FXWinWrap/resources/fxwinwrap.png
 Terminal=false
 Type=Application
-Categories=Applications;System;
+Categories=System;
 MimeType=application/fxml;
@@ -0,0 +1,8 @@
+Package: fxwinwrap64
+Version: 0.1-3
+Section: base
+Priority: optional
+Architecture: amd64
+Depends: openjdk-8-jre (>= 8u45-b14-1), openjfx (>= 8u60-b27-4), ffmpegthumbnailer (>= 2.0.10-0.1), mplayer2 (>=2.0-728-g2c378c7-4), gifsicle (>=1.86-1), nitrogen (>=1.5.2-2)
+Maintainer: Maxim Stewart [email protected]
+Description: A GUI to handle setting XWinWrap options.
@@ -7,14 +7,10 @@ if [ -f /bin/fxwinwrap ]; then
 fi

 if [ -d /opt/FXWinWrap ]; then
-    rm -rf /bin/fxwinwrap
+    rm -rf /opt/FXWinWrap
 fi

 if [ -x "`which xdg-desktop-menu 2>/dev/null`" ]; then
    xdg-desktop-menu uninstall /usr/share/applications/FXWinWrap.desktop
    xdg-desktop-menu forceupdate --mode user
 fi
-
-if [ -x "`which update-menus 2>/dev/null`" ]; then
-update-menus
-fi
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=FXWinWrap
+Comment=JavaFX gui for XWinWrap
+Exec=/bin/fxwinwrap
+Icon=/opt/FXWinWrap/resources/fxwinwrap.png
+Terminal=false
+Type=Application
+Categories=System;
+MimeType=application/fxml;
@@ -0,0 +1,8 @@
+Package: fxwinwrap
+Version: 0.1-3
+Section: base
+Priority: optional
+Architecture: i386
+Depends: openjdk-8-jre (>= 8u45-b14-1), openjfx (>= 8u60-b27-4), ffmpegthumbnailer (>= 2.0.10-0.1), mplayer2 (>=2.0-728-g2c378c7-4), gifsicle (>=1.86-1), nitrogen (>=1.5.2-2)
+Maintainer: Maxim Stewart [email protected]
+Description: A GUI to handle setting XWinWrap options.
@@ -7,14 +7,10 @@ if [ -f /bin/fxwinwrap ]; then
 fi

 if [ -d /opt/FXWinWrap ]; then
-    rm -rf /bin/fxwinwrap
+    rm -rf /opt/FXWinWrap
 fi

 if [ -x "`which xdg-desktop-menu 2>/dev/null`" ]; then
    xdg-desktop-menu uninstall /usr/share/applications/FXWinWrap.desktop
    xdg-desktop-menu forceupdate --mode user
 fi
-
-if [ -x "`which update-menus 2>/dev/null`" ]; then
-update-menus
-fi
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=FXWinWrap
+Comment=JavaFX gui for XWinWrap
+Exec=/bin/fxwinwrap
+Icon=/opt/FXWinWrap/resources/fxwinwrap.png
+Terminal=false
+Type=Application
+Categories=System;
+MimeType=application/fxml;
@@ -1,5 +1,5 @@
 #!/bin/bash

 ### nohup is needed to keep child process alive from java's
-xterm -e ~/.animatedBGstarter.sh
-xterm -e ~/.animatedBGstarter2.sh
+xterm -e nohup ~/.animatedBGstarter.sh >/dev/null 2>&1
+xterm -e nohup ~/.animatedBGstarter2.sh >/dev/null 2>&1
@@ -89,11 +89,11 @@ public class Controller {
        thumbImgView.getChildren().clear();  // Clears children if any to setup for new images
        dirPathField.setText("" + directory);

-        for (int i=0; i<size; i++) {
+			     for (int i=0; i<size; i++) {
            String path = "" + fileList[i];
-            imgView.setFitWidth(535);
- 	    imgView.setFitHeight(345);
- 	    imgView.setLayoutY(posY);
+        				imgView.setFitWidth(535);
+ 											imgView.setFitHeight(345);
+ 											imgView.setLayoutY(posY);

            // Video or image click actions
            if (fileList[i].getName().contains(".mp4") || fileList[i].getName().contains(".mpeg") ||
@@ -109,35 +109,37 @@ public class Controller {
                    } catch(Throwable imgIOErr) {
                            System.out.println(imgIOErr);
                    }
-       	            imgView =  new ImageView("file:///tmp/image.png");
-		    thumbImgView.getChildren().add(imgView);
+        												imgView =  new ImageView("file:///tmp/image.png");
+					 		        				thumbImgView.getChildren().add(imgView);
                    imgView.setOnMouseClicked(mouse -> {
-		        if (mouse.getClickCount() == 2 && !mouse.isConsumed()) {
-			    mouse.consume();
-			    try {
+												            if (mouse.getClickCount() == 2 && !mouse.isConsumed()) {
+												                mouse.consume();
+								                    try {
                                  pb = Runtime.getRuntime().exec(vExec);
-			    } catch(IOException vidIOErr) {
-			          throw new UncheckedIOException(vidIOErr);
-			    }
-			}
+								                    } catch(IOException vidIOErr) {
+								                            throw new UncheckedIOException(vidIOErr);
+								                    }
+												            }
                        filePathField.setText(path);
                    });
            } else if(fileList[i].getName().contains(".png") || fileList[i].getName().contains(".jpg")||
                      fileList[i].getName().contains(".gif") || fileList[i].getName().contains(".jpeg")) {
-              	          imgView =  new ImageView("file://" + fileList[i]);
-			  thumbImgView.getChildren().add(imgView);
-			  final ImageView imgViewPoped =  new ImageView("file://" + fileList[i]);
+              												imgView =  new ImageView("file://" + fileList[i]);
+					 		              				thumbImgView.getChildren().add(imgView);
+												              final ImageView imgViewPoped =  new ImageView("file://" + fileList[i]);
+
                          imgView.setOnMouseClicked(mouse -> {
-			      if (mouse.getClickCount() == 2 && !mouse.isConsumed()) {
-				  mouse.consume();
-				  displayImg(imgViewPoped, path);
-       			      }
+								                      if (mouse.getClickCount() == 2 && !mouse.isConsumed()) {
+								                          mouse.consume();
+								                          displayImg(imgViewPoped, path);
+       								               }
                           filePathField.setText(path);
                           });
            } else {
                   System.out.println("Not a video or image file.");
            }
-        posY = posY + 355.0;								}
+        posY = posY + 355.0;
+								}
    }
    // View Image enlarged Note, sets up a seperate stage and scene with auto enlargment
    public void displayImg(ImageView imgViewPoped, String path) {
@@ -1,5 +1,5 @@
 #!/bin/bash

 ### nohup is needed to keep child process alive from java's
-xterm -e ~/.animatedBGstarter.sh
-xterm -e ~/.animatedBGstarter2.sh
+xterm -e nohup ~/.animatedBGstarter.sh >/dev/null 2>&1
+xterm -e nohup ~/.animatedBGstarter2.sh >/dev/null 2>&1
@@ -12,13 +12,14 @@ import javafx.scene.input.KeyCode;
 import javafx.scene.input.MouseEvent;
 import javafx.geometry.Insets;
 import java.io.*;
-
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;

 public class Controller {
 	 		private DirectoryChooser folderChooser = new DirectoryChooser();  // Selects a dir
-  		private FileChooser fileChooser = new FileChooser();  // Selects a file
 			private FileWriter fileWriter;  // Writes to files
    private File directory, sveFileLoc;  // Path to file or dir
+    private File[] fileList;
    private Image pth = new Image(".");  // Path to image
    private ImageView imgView = new ImageView(pth);  // Image view area
    private Process pb;  // Process runner
@@ -52,8 +53,6 @@ public class Controller {
        assert tilePane != null : "fx:id=\"tilePane\" was not injected: check your FXML file 'Window.fxml'.";
        assert useXSvrn != null : "fx:id=\"useXSvrn\" was not injected: check your FXML file 'Window.fxml'.";
        // Initialize your logic here: all @FXML variables will have been injected
-
-        ffmpegChker();
    }

    // Handler for TextArea[fx:id="dirPathField"] onKeyReleased
@@ -64,63 +63,80 @@ public class Controller {
            System.out.println(textAreaPth);
            newDir();
        }
-        else
-             System.out.println("Not calling newDir...");
+        else {}
+    }
+
+    @FXML void test(ActionEvent event) {
+        newDir2();
    }

    // Scan selected dir
    public void newDir() {
+        tilePane.getChildren().clear();
        Stage stage = new Stage();
        if (textAreaPth != "")
            directory = new File(textAreaPth);
-        else
+        else {
            directory = folderChooser.showDialog(stage);

-        File[] fileList = directory.listFiles();
-        int size = fileList.length;
-        tilePane.getChildren().clear();
+            if (directory != null) {
+                System.out.println("Directory: " + directory);
+             }
+        }
+
+        fileList = directory.listFiles();
        dirPathField.setText("" + directory);
-			     for (int i=0; i<size; i++) {
+
+			     for (int i=0; i<fileList.length; i++) {
+        												imgView = new ImageView();
+ 					              imgView.setFitWidth(300); // Need these here to get grid properly.
+						              imgView.setFitHeight(200);
+					 		        				tilePane.getChildren().add(imgView);
+        }
+    newDir2();
+    }
+    public void newDir2() {
+			     for (int i=0; i<fileList.length; i++) {
            String path = "" + fileList[i];
            if (fileList[i].getName().contains(".mp4") || fileList[i].getName().contains(".mpeg") ||
                fileList[i].getName().contains(".mpg") || fileList[i].getName().contains(".wmv") ||
                fileList[i].getName().contains(".mkv") || fileList[i].getName().contains(".flv") ||
                fileList[i].getName().contains(".webm") || fileList[i].getName().contains(".avi")) {
                    String movieImg = "ffmpegthumbnailer -w -t='00:30:00' -c png -i " + fileList[i] +
-                                                                " -s 300 -o /tmp/image.png",
+                                      " -s 300 -o /tmp/image.png",
                           vExec = "mplayer " + fileList[i];
                    try {
                        pb = Runtime.getRuntime().exec(movieImg);
                        pb.waitFor();
-                            System.out.println(movieImg);
                    } catch(Throwable imgIOErr) {
                            System.out.println(imgIOErr);
                    }
-        												imgView =  new ImageView("file:///tmp/image.png");
- 					              imgView.setFitWidth(300); // Need these here to get grid properly.
-						              imgView.setFitHeight(200);
-					 		        				tilePane.getChildren().add(imgView);
-                    imgView.setOnMouseClicked(mouse -> {
-												            if (mouse.getClickCount() == 2 && !mouse.isConsumed()) {
-												                mouse.consume();
-								                    try {
-                                  pb = Runtime.getRuntime().exec(vExec);
-								                    } catch(IOException vidIOErr) {
-								                            throw new UncheckedIOException(vidIOErr);
-								                    }
-												            }
-                        filePathField.setText(path);
+
+                    ImageView view = (ImageView) (tilePane.getChildren().get(i));
+                    pth = new Image("file:///tmp/image.png");
+
+                    view.setImage(pth);
+                    view.setOnMouseClicked(mouse -> {
+											            if (mouse.getClickCount() == 2 && !mouse.isConsumed()) {
+											                mouse.consume();
+							                    try {
+                                 pb = Runtime.getRuntime().exec(vExec);
+							                    } catch(IOException vidIOErr) {
+							                            throw new UncheckedIOException(vidIOErr);
+							                    }
+											            }
+                       filePathField.setText(path);
                    });
            } else if(fileList[i].getName().contains(".png") || fileList[i].getName().contains(".jpg")||
                      fileList[i].getName().contains(".gif") || fileList[i].getName().contains(".jpeg")) {
-												              imgView =  new ImageView("file://" + fileList[i]);
 			                       String title = "" + fileList[i];
-												              imgView.setFitWidth(300); // Need these here to get grid properly.
-												              imgView.setFitHeight(200);
-								 			              tilePane.getChildren().add(imgView);
+                          pth = new Image("file://" + fileList[i]);
+                          ImageView view = (ImageView) (tilePane.getChildren().get(i));
+
+                          view.setImage(pth);
 												              final ImageView imgViewPoped =  new ImageView("file://" + fileList[i]);
 			                       // image click actions
-			                       imgView.setOnMouseClicked(mouse -> {
+                              view.setOnMouseClicked(mouse -> {
 								                      if (mouse.getClickCount() == 2 && !mouse.isConsumed()) {
 								                          mouse.consume();
    			                           displayImg(imgViewPoped, title);
@@ -217,18 +233,6 @@ public class Controller {
    fileWriter.close();
    }

-    void ffmpegChker() throws Exception {
-            File ffmpgLoc = new File("/usr/bin/ffmpegthumbnailer");
-            boolean exists = ffmpgLoc.exists();
-            System.out.println("" + exists);
-            if (exists) {
-               System.out.println("Ffmpeg is present....");
-             } else {
-               String installer = System.getProperty("user.dir") + "/resources/bin/InstallFFMPEGTHUMB.sh";
-															pb = Runtime.getRuntime().exec(installer);
-															pb.waitFor();
-            }
-    }
    // Run changes
    @FXML void applySttngs(ActionEvent event) throws Exception {
        pb = Runtime.getRuntime().exec("killall xwinwrap &");
@@ -13,7 +13,7 @@ public class XWWMenu extends Application {
        scene.getStylesheets().add("resources/stylesheet.css");
        stage.setScene(scene);
        //stage.setResizable(false);  // keeps window from resizing
-        stage.setTitle("XWinWrap Menu");
+        stage.setTitle("FXWinWrap");
        stage.setMinWidth(800);
        stage.setMinHeight(600);
        stage.show();
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.collections.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.paint.*?>
-<?import javafx.scene.text.*?>
+<?import java.lang.String?>
+<?import javafx.collections.FXCollections?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.TilePane?>
+<?import javafx.scene.paint.Color?>
+<?import javafx.scene.text.Font?>
 <?scenebuilder-background-color 0x444444ff?>

-<AnchorPane minHeight="300.0" minWidth="300.0" prefHeight="600.0" prefWidth="950.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/2.2" fx:controller="Controller">
+<AnchorPane minHeight="300.0" minWidth="300.0" prefHeight="600.0" prefWidth="950.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Controller">
  <children>
    <TextField id="txtDirPath" fx:id="dirPathField" blendMode="DIFFERENCE" onKeyReleased="#onEnter" prefWidth="880.0" promptText="Directory Path" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="70.0" AnchorPane.topAnchor="0.0" />
    <Button fx:id="clear" mnemonicParsing="false" onAction="#clearBttnClick" text="Clear" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
@@ -146,7 +152,7 @@
    </ChoiceBox>
    <CheckBox fx:id="lftScrn" layoutX="211.0" mnemonicParsing="false" prefWidth="114.17000000000002" selected="true" text="Left Screen" AnchorPane.bottomAnchor="123.0" />
    <CheckBox fx:id="rghtScrn" allowIndeterminate="false" mnemonicParsing="false" prefWidth="114.17000000000002" text="Right Screen" AnchorPane.bottomAnchor="123.0" AnchorPane.rightAnchor="95.0" />
-    <CheckBox fx:id="useXSvrn" mnemonicParsing="false" text="Use XScreenSaver" AnchorPane.bottomAnchor="170.0" AnchorPane.leftAnchor="489.0" AnchorPane.rightAnchor="320.0" />
+    <CheckBox fx:id="useXSvrn" layoutX="459.0" layoutY="421.0" mnemonicParsing="false" prefHeight="18.0" prefWidth="168.0" text="Use XScreenSaver" AnchorPane.bottomAnchor="161.0" AnchorPane.leftAnchor="459.0" AnchorPane.rightAnchor="323.0" />
    <Label layoutX="211.0" text="Left Screen Resolutions:" AnchorPane.bottomAnchor="193.0" />
    <Label text="XScreenSaver List" AnchorPane.bottomAnchor="227.0" AnchorPane.leftAnchor="14.0" />
    <Label prefWidth="382.0" text="Note: Double click an image to view the video or image." textFill="$x1" AnchorPane.bottomAnchor="219.0" AnchorPane.leftAnchor="369.0" AnchorPane.rightAnchor="199.0" />