diff --git a/bin/v0.1-1/fxwinwrap-0-1-1-x64.deb b/bin/v0.1-1/fxwinwrap-0-1-1-x64.deb index 0027faf..6caa705 100644 Binary files a/bin/v0.1-1/fxwinwrap-0-1-1-x64.deb and b/bin/v0.1-1/fxwinwrap-0-1-1-x64.deb differ diff --git a/bin/v0.1-1/fxwinwrap-0-1-1-x86.deb b/bin/v0.1-1/fxwinwrap-0-1-1-x86.deb index 2315adf..2f3a54a 100644 Binary files a/bin/v0.1-1/fxwinwrap-0-1-1-x86.deb and b/bin/v0.1-1/fxwinwrap-0-1-1-x86.deb differ diff --git a/bin/v0.1-2/fxwinwrap-0-1-2-x64.deb b/bin/v0.1-2/fxwinwrap-0-1-2-x64.deb index 822b8e8..df71fe5 100644 Binary files a/bin/v0.1-2/fxwinwrap-0-1-2-x64.deb and b/bin/v0.1-2/fxwinwrap-0-1-2-x64.deb differ diff --git a/bin/v0.1-2/fxwinwrap-0-1-2-x86.deb b/bin/v0.1-2/fxwinwrap-0-1-2-x86.deb index 26dfeb2..5ab99b4 100644 Binary files a/bin/v0.1-2/fxwinwrap-0-1-2-x86.deb and b/bin/v0.1-2/fxwinwrap-0-1-2-x86.deb differ diff --git a/bin/v0.1-3/fxwinwrap-0-1-3-x64.deb b/bin/v0.1-3/fxwinwrap-0-1-3-x64.deb index 69ca12d..81438f6 100644 Binary files a/bin/v0.1-3/fxwinwrap-0-1-3-x64.deb and b/bin/v0.1-3/fxwinwrap-0-1-3-x64.deb differ diff --git a/bin/v0.1-3/fxwinwrap-0-1-3-x86.deb b/bin/v0.1-3/fxwinwrap-0-1-3-x86.deb index e476c6d..b5a7f7c 100644 Binary files a/bin/v0.1-3/fxwinwrap-0-1-3-x86.deb and b/bin/v0.1-3/fxwinwrap-0-1-3-x86.deb differ diff --git a/src/debs/build.sh b/src/debs/build.sh index 4a1846e..c59afaa 100644 --- a/src/debs/build.sh +++ b/src/debs/build.sh @@ -1,6 +1,32 @@ #!/bin/bash +# Fixes ownershp function main() { + sudo find . -type f -exec chmod 644 {} + + sudo find . -type d -exec chmod 755 {} + + sudo chown -R root:root ./*/ + + # Set postrm permissions + for i in `find . -name postrm`; do + sudo chmod 555 "${i}" + done + + # Set fxwinwrap permissions + for i in `find . -name fxwinwrap`; do + sudo chmod 755 "${i}" + done + + # Set xwinwrap permissions + for i in `find . -name xwinwrap`; do + sudo chmod 755 "${i}" + done + + sudo chmod 755 fxwinwrap*/opt/FXWinWrap/resources/bin/* +builder; +} + +#builds debs +function builder() { for i in `ls`; do if [[ -d "${i}" ]]; then dpkg --build "${i}" diff --git a/src/debs/fixOwnership.sh b/src/debs/fixOwnership.sh deleted file mode 100644 index 32db60d..0000000 --- a/src/debs/fixOwnership.sh +++ /dev/null @@ -1,5 +0,0 @@ -find . -type f -exec chmod 644 {} + -find . -type d -exec chmod 755 {} + - -chown -R root:root ./*/ - diff --git a/src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/resources/bin/StartXWW.sh b/src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/resources/bin/StartXWW.sh old mode 100644 new mode 100755 diff --git a/src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/resources/bin/ffmpegthumbnailer b/src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/resources/bin/ffmpegthumbnailer old mode 100644 new mode 100755 diff --git a/src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/resources/bin/StartXWW.sh b/src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/resources/bin/StartXWW.sh old mode 100644 new mode 100755 diff --git a/src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/resources/bin/ffmpegthumbnailer b/src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/resources/bin/ffmpegthumbnailer old mode 100644 new mode 100755 diff --git a/src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/resources/bin/StartXWW.sh b/src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/resources/bin/StartXWW.sh old mode 100644 new mode 100755 diff --git a/src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/resources/bin/ffmpegthumbnailer b/src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/resources/bin/ffmpegthumbnailer old mode 100644 new mode 100755 diff --git a/src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/resources/bin/StartXWW.sh b/src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/resources/bin/StartXWW.sh old mode 100644 new mode 100755 diff --git a/src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/resources/bin/ffmpegthumbnailer b/src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/resources/bin/ffmpegthumbnailer old mode 100644 new mode 100755 diff --git a/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$1.class b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$1.class new file mode 100644 index 0000000..5617668 Binary files /dev/null and b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$1.class differ diff --git a/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$2.class b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$2.class new file mode 100644 index 0000000..5016b7f Binary files /dev/null and b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$2.class differ diff --git a/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$3.class b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$3.class new file mode 100644 index 0000000..b92e323 Binary files /dev/null and b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$3.class differ diff --git a/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller.class b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller.class index ffc9272..7ed2162 100644 Binary files a/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller.class and b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller.class differ diff --git a/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/XWWMenu.class b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/XWWMenu.class index 272ff4c..e46b4f0 100644 Binary files a/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/XWWMenu.class and b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/XWWMenu.class differ diff --git a/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh old mode 100644 new mode 100755 diff --git a/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/bin/StartXWW.sh b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/bin/StartXWW.sh old mode 100644 new mode 100755 diff --git a/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$1.class b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$1.class new file mode 100644 index 0000000..5617668 Binary files /dev/null and b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$1.class differ diff --git a/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$2.class b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$2.class new file mode 100644 index 0000000..5016b7f Binary files /dev/null and b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$2.class differ diff --git a/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$3.class b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$3.class new file mode 100644 index 0000000..b92e323 Binary files /dev/null and b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$3.class differ diff --git a/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller.class b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller.class index ffc9272..7ed2162 100644 Binary files a/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller.class and b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller.class differ diff --git a/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/XWWMenu.class b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/XWWMenu.class index 272ff4c..e46b4f0 100644 Binary files a/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/XWWMenu.class and b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/XWWMenu.class differ diff --git a/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh old mode 100644 new mode 100755 diff --git a/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/bin/StartXWW.sh b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/bin/StartXWW.sh old mode 100644 new mode 100755 diff --git a/src/versions/v0.0.3/Controller$1.class b/src/versions/v0.0.3/Controller$1.class deleted file mode 100644 index 6c0ea41..0000000 Binary files a/src/versions/v0.0.3/Controller$1.class and /dev/null differ diff --git a/src/versions/v0.0.3/Controller.class b/src/versions/v0.0.3/Controller.class deleted file mode 100644 index 19ae5ea..0000000 Binary files a/src/versions/v0.0.3/Controller.class and /dev/null differ diff --git a/src/versions/v0.0.3/Controller.java b/src/versions/v0.0.3/Controller.java index 06c928b..1ee3cec 100644 --- a/src/versions/v0.0.3/Controller.java +++ b/src/versions/v0.0.3/Controller.java @@ -14,6 +14,9 @@ import javafx.geometry.Insets; import java.io.*; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; +import javafx.concurrent.Task; +import javafx.application.Platform; + public class Controller { private DirectoryChooser folderChooser = new DirectoryChooser(); // Selects a dir @@ -62,12 +65,12 @@ public class Controller { textAreaPth = dirPathField.getText(); System.out.println(textAreaPth); newDir(); - } + } else {} } @FXML void test(ActionEvent event) { - newDir2(); + newDir(); } // Scan selected dir @@ -88,12 +91,19 @@ public class Controller { dirPathField.setText("" + directory); for (int i=0; i() { + @Override public Void call() { + newDir2(); + return null; + }}; + + new Thread(getDir).start(); } public void newDir2() { for (int i=0; i { if (mouse.getClickCount() == 2 && !mouse.isConsumed()) { mouse.consume(); @@ -133,7 +146,11 @@ public class Controller { pth = new Image("file://" + fileList[i]); ImageView view = (ImageView) (tilePane.getChildren().get(i)); - view.setImage(pth); + Platform.runLater(new Runnable() { + @Override public void run() { + view.setImage(pth); + } + }); final ImageView imgViewPoped = new ImageView("file://" + fileList[i]); // image click actions view.setOnMouseClicked(mouse -> { diff --git a/src/versions/v0.0.3/XWWMenu.class b/src/versions/v0.0.3/XWWMenu.class deleted file mode 100644 index e46b4f0..0000000 Binary files a/src/versions/v0.0.3/XWWMenu.class and /dev/null differ diff --git a/src/versions/v0.0.3/clean.sh b/src/versions/v0.0.3/clean.sh new file mode 100755 index 0000000..4f850d5 --- /dev/null +++ b/src/versions/v0.0.3/clean.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +rm *.class