diff --git a/bin/v0.1-1/FXWinWrap_0.1-1_x64.deb b/bin/v0.1-1/FXWinWrap_0.1-1_x64.deb deleted file mode 100644 index b3512fa..0000000 Binary files a/bin/v0.1-1/FXWinWrap_0.1-1_x64.deb and /dev/null 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 deleted file mode 100644 index c28add3..0000000 Binary files a/bin/v0.1-1/FXWinWrap_0.1-1_x86.deb and /dev/null differ diff --git a/bin/v0.1-1/fxwinwrap-0-1-1-x64.deb b/bin/v0.1-1/fxwinwrap-0-1-1-x64.deb new file mode 100644 index 0000000..0027faf Binary files /dev/null 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 new file mode 100644 index 0000000..2315adf Binary files /dev/null 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 deleted file mode 100644 index 7ce073c..0000000 Binary files a/bin/v0.1-2/FXWinWrap_0.1-2_x64.deb and /dev/null 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 deleted file mode 100644 index dcb2a0a..0000000 Binary files a/bin/v0.1-2/FXWinWrap_0.1-2_x86.deb and /dev/null 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 new file mode 100644 index 0000000..822b8e8 Binary files /dev/null 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 new file mode 100644 index 0000000..26dfeb2 Binary files /dev/null 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 deleted file mode 100644 index 66cb48d..0000000 Binary files a/bin/v0.1-3/FXWinWrap_0.1-3_x64.deb and /dev/null 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 deleted file mode 100644 index 1406b87..0000000 Binary files a/bin/v0.1-3/FXWinWrap_0.1-3_x86.deb and /dev/null 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 new file mode 100644 index 0000000..69ca12d Binary files /dev/null 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 new file mode 100644 index 0000000..e476c6d Binary files /dev/null and b/bin/v0.1-3/fxwinwrap-0-1-3-x86.deb differ diff --git a/src/debs/FXWinWrap_0.1-2_x64/DEBIAN/control b/src/debs/FXWinWrap_0.1-2_x64/DEBIAN/control deleted file mode 100644 index e08092a..0000000 --- a/src/debs/FXWinWrap_0.1-2_x64/DEBIAN/control +++ /dev/null @@ -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 maximstewart1@gmail.com -Description: FXWinWrap - A GUI to handle setting XWinWrap options. diff --git a/src/debs/FXWinWrap_0.1-2_x86/DEBIAN/control b/src/debs/FXWinWrap_0.1-2_x86/DEBIAN/control deleted file mode 100644 index 46aadf4..0000000 --- a/src/debs/FXWinWrap_0.1-2_x86/DEBIAN/control +++ /dev/null @@ -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 maximstewart1@gmail.com -Description: FXWinWrap - A GUI to handle setting XWinWrap options. diff --git a/src/debs/FXWinWrap_0.1-3_x64/usr/share/applications/FXWinWrap.desktop b/src/debs/FXWinWrap_0.1-3_x64/usr/share/applications/FXWinWrap.desktop deleted file mode 100644 index d4bf2de..0000000 --- a/src/debs/FXWinWrap_0.1-3_x64/usr/share/applications/FXWinWrap.desktop +++ /dev/null @@ -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; diff --git a/src/debs/FXWinWrap_0.1-3_x86/usr/share/applications/FXWinWrap.desktop b/src/debs/FXWinWrap_0.1-3_x86/usr/share/applications/FXWinWrap.desktop deleted file mode 100644 index d4bf2de..0000000 --- a/src/debs/FXWinWrap_0.1-3_x86/usr/share/applications/FXWinWrap.desktop +++ /dev/null @@ -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; diff --git a/src/debs/fixOwnership.sh b/src/debs/fixOwnership.sh new file mode 100644 index 0000000..32db60d --- /dev/null +++ b/src/debs/fixOwnership.sh @@ -0,0 +1,5 @@ +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/DEBIAN/control b/src/debs/fxwinwrap-0-1-1-x64/DEBIAN/control similarity index 64% rename from src/debs/FXWinWrap_0.1-1_x64/DEBIAN/control rename to src/debs/fxwinwrap-0-1-1-x64/DEBIAN/control index b5e06db..afdaba0 100644 --- a/src/debs/FXWinWrap_0.1-1_x64/DEBIAN/control +++ b/src/debs/fxwinwrap-0-1-1-x64/DEBIAN/control @@ -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 maximstewart1@gmail.com -Description: FXWinWrap - A GUI to handle setting XWinWrap options. +Description: A GUI to handle setting XWinWrap options. diff --git a/src/debs/FXWinWrap_0.1-1_x64/bin/fxwinwrap b/src/debs/fxwinwrap-0-1-1-x64/bin/fxwinwrap similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x64/bin/fxwinwrap rename to src/debs/fxwinwrap-0-1-1-x64/bin/fxwinwrap diff --git a/src/debs/FXWinWrap_0.1-1_x64/opt/FXWinWrap/Controller.class b/src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/Controller.class similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x64/opt/FXWinWrap/Controller.class rename to src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/Controller.class diff --git a/src/debs/FXWinWrap_0.1-1_x64/opt/FXWinWrap/XWWMenu.class b/src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/XWWMenu.class similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x64/opt/FXWinWrap/XWWMenu.class rename to src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/XWWMenu.class diff --git a/src/debs/FXWinWrap_0.1-1_x64/opt/FXWinWrap/launch.sh b/src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/launch.sh old mode 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x64/opt/FXWinWrap/launch.sh rename to src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/launch.sh diff --git a/src/debs/FXWinWrap_0.1-1_x64/opt/FXWinWrap/resources/Window.fxml b/src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/resources/Window.fxml similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x64/opt/FXWinWrap/resources/Window.fxml rename to src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/resources/Window.fxml 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 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x64/opt/FXWinWrap/resources/bin/StartXWW.sh rename to src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/resources/bin/StartXWW.sh 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 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x64/opt/FXWinWrap/resources/bin/ffmpegthumbnailer rename to src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/resources/bin/ffmpegthumbnailer diff --git a/src/debs/FXWinWrap_0.1-1_x64/opt/FXWinWrap/resources/fxwinwrap.png b/src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/resources/fxwinwrap.png similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x64/opt/FXWinWrap/resources/fxwinwrap.png rename to src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/resources/fxwinwrap.png diff --git a/src/debs/FXWinWrap_0.1-1_x64/opt/FXWinWrap/resources/startImg.jpg b/src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/resources/startImg.jpg similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x64/opt/FXWinWrap/resources/startImg.jpg rename to src/debs/fxwinwrap-0-1-1-x64/opt/FXWinWrap/resources/startImg.jpg diff --git a/src/debs/FXWinWrap_0.1-1_x64/usr/share/applications/FXWinWrap.desktop b/src/debs/fxwinwrap-0-1-1-x64/usr/share/applications/FXWinWrap.desktop similarity index 86% rename from src/debs/FXWinWrap_0.1-1_x64/usr/share/applications/FXWinWrap.desktop rename to src/debs/fxwinwrap-0-1-1-x64/usr/share/applications/FXWinWrap.desktop index d4bf2de..50fcf7b 100644 --- a/src/debs/FXWinWrap_0.1-1_x64/usr/share/applications/FXWinWrap.desktop +++ b/src/debs/fxwinwrap-0-1-1-x64/usr/share/applications/FXWinWrap.desktop @@ -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; diff --git a/src/debs/FXWinWrap_0.1-1_x86/DEBIAN/control b/src/debs/fxwinwrap-0-1-1-x86/DEBIAN/control similarity index 64% rename from src/debs/FXWinWrap_0.1-1_x86/DEBIAN/control rename to src/debs/fxwinwrap-0-1-1-x86/DEBIAN/control index 70eda4b..d0d65fa 100644 --- a/src/debs/FXWinWrap_0.1-1_x86/DEBIAN/control +++ b/src/debs/fxwinwrap-0-1-1-x86/DEBIAN/control @@ -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 maximstewart1@gmail.com -Description: FXWinWrap - A GUI to handle setting XWinWrap options. +Description: A GUI to handle setting XWinWrap options. diff --git a/src/debs/FXWinWrap_0.1-1_x86/bin/fxwinwrap b/src/debs/fxwinwrap-0-1-1-x86/bin/fxwinwrap similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x86/bin/fxwinwrap rename to src/debs/fxwinwrap-0-1-1-x86/bin/fxwinwrap diff --git a/src/debs/FXWinWrap_0.1-1_x86/opt/FXWinWrap/Controller.class b/src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/Controller.class similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x86/opt/FXWinWrap/Controller.class rename to src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/Controller.class diff --git a/src/debs/FXWinWrap_0.1-1_x86/opt/FXWinWrap/XWWMenu.class b/src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/XWWMenu.class similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x86/opt/FXWinWrap/XWWMenu.class rename to src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/XWWMenu.class diff --git a/src/debs/FXWinWrap_0.1-1_x86/opt/FXWinWrap/launch.sh b/src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/launch.sh old mode 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x86/opt/FXWinWrap/launch.sh rename to src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/launch.sh diff --git a/src/debs/FXWinWrap_0.1-1_x86/opt/FXWinWrap/resources/Window.fxml b/src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/resources/Window.fxml similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x86/opt/FXWinWrap/resources/Window.fxml rename to src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/resources/Window.fxml 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 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x86/opt/FXWinWrap/resources/bin/StartXWW.sh rename to src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/resources/bin/StartXWW.sh 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 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x86/opt/FXWinWrap/resources/bin/ffmpegthumbnailer rename to src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/resources/bin/ffmpegthumbnailer diff --git a/src/debs/FXWinWrap_0.1-1_x86/opt/FXWinWrap/resources/fxwinwrap.png b/src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/resources/fxwinwrap.png similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x86/opt/FXWinWrap/resources/fxwinwrap.png rename to src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/resources/fxwinwrap.png diff --git a/src/debs/FXWinWrap_0.1-1_x86/opt/FXWinWrap/resources/startImg.jpg b/src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/resources/startImg.jpg similarity index 100% rename from src/debs/FXWinWrap_0.1-1_x86/opt/FXWinWrap/resources/startImg.jpg rename to src/debs/fxwinwrap-0-1-1-x86/opt/FXWinWrap/resources/startImg.jpg diff --git a/src/debs/FXWinWrap_0.1-1_x86/usr/share/applications/FXWinWrap.desktop b/src/debs/fxwinwrap-0-1-1-x86/usr/share/applications/FXWinWrap.desktop similarity index 86% rename from src/debs/FXWinWrap_0.1-1_x86/usr/share/applications/FXWinWrap.desktop rename to src/debs/fxwinwrap-0-1-1-x86/usr/share/applications/FXWinWrap.desktop index d4bf2de..50fcf7b 100644 --- a/src/debs/FXWinWrap_0.1-1_x86/usr/share/applications/FXWinWrap.desktop +++ b/src/debs/fxwinwrap-0-1-1-x86/usr/share/applications/FXWinWrap.desktop @@ -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; diff --git a/src/debs/FXWinWrap_0.1-3_x64/DEBIAN/control b/src/debs/fxwinwrap-0-1-2-x64/DEBIAN/control similarity index 73% rename from src/debs/FXWinWrap_0.1-3_x64/DEBIAN/control rename to src/debs/fxwinwrap-0-1-2-x64/DEBIAN/control index e08092a..a6c8aa4 100644 --- a/src/debs/FXWinWrap_0.1-3_x64/DEBIAN/control +++ b/src/debs/fxwinwrap-0-1-2-x64/DEBIAN/control @@ -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 maximstewart1@gmail.com -Description: FXWinWrap - A GUI to handle setting XWinWrap options. +Description: A GUI to handle setting XWinWrap options. diff --git a/src/debs/FXWinWrap_0.1-2_x64/DEBIAN/postrm b/src/debs/fxwinwrap-0-1-2-x64/DEBIAN/postrm similarity index 84% rename from src/debs/FXWinWrap_0.1-2_x64/DEBIAN/postrm rename to src/debs/fxwinwrap-0-1-2-x64/DEBIAN/postrm index d6326d6..e0609c1 100755 --- a/src/debs/FXWinWrap_0.1-2_x64/DEBIAN/postrm +++ b/src/debs/fxwinwrap-0-1-2-x64/DEBIAN/postrm @@ -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 diff --git a/src/debs/FXWinWrap_0.1-2_x64/bin/fxwinwrap b/src/debs/fxwinwrap-0-1-2-x64/bin/fxwinwrap similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x64/bin/fxwinwrap rename to src/debs/fxwinwrap-0-1-2-x64/bin/fxwinwrap diff --git a/src/debs/FXWinWrap_0.1-2_x64/opt/FXWinWrap/Controller.class b/src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/Controller.class similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x64/opt/FXWinWrap/Controller.class rename to src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/Controller.class diff --git a/src/debs/FXWinWrap_0.1-2_x64/opt/FXWinWrap/XWWMenu.class b/src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/XWWMenu.class similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x64/opt/FXWinWrap/XWWMenu.class rename to src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/XWWMenu.class diff --git a/src/debs/FXWinWrap_0.1-2_x64/opt/FXWinWrap/launch.sh b/src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/launch.sh old mode 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x64/opt/FXWinWrap/launch.sh rename to src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/launch.sh diff --git a/src/debs/FXWinWrap_0.1-2_x64/opt/FXWinWrap/resources/Window.fxml b/src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/resources/Window.fxml similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x64/opt/FXWinWrap/resources/Window.fxml rename to src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/resources/Window.fxml 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 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x64/opt/FXWinWrap/resources/bin/StartXWW.sh rename to src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/resources/bin/StartXWW.sh 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 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x64/opt/FXWinWrap/resources/bin/ffmpegthumbnailer rename to src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/resources/bin/ffmpegthumbnailer diff --git a/src/debs/FXWinWrap_0.1-2_x64/opt/FXWinWrap/resources/fxwinwrap.png b/src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/resources/fxwinwrap.png similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x64/opt/FXWinWrap/resources/fxwinwrap.png rename to src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/resources/fxwinwrap.png diff --git a/src/debs/FXWinWrap_0.1-2_x64/opt/FXWinWrap/resources/stylesheet.css b/src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/resources/stylesheet.css similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x64/opt/FXWinWrap/resources/stylesheet.css rename to src/debs/fxwinwrap-0-1-2-x64/opt/FXWinWrap/resources/stylesheet.css diff --git a/src/debs/FXWinWrap_0.1-2_x64/usr/share/applications/FXWinWrap.desktop b/src/debs/fxwinwrap-0-1-2-x64/usr/share/applications/FXWinWrap.desktop similarity index 86% rename from src/debs/FXWinWrap_0.1-2_x64/usr/share/applications/FXWinWrap.desktop rename to src/debs/fxwinwrap-0-1-2-x64/usr/share/applications/FXWinWrap.desktop index d4bf2de..50fcf7b 100644 --- a/src/debs/FXWinWrap_0.1-2_x64/usr/share/applications/FXWinWrap.desktop +++ b/src/debs/fxwinwrap-0-1-2-x64/usr/share/applications/FXWinWrap.desktop @@ -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; diff --git a/src/debs/FXWinWrap_0.1-3_x86/DEBIAN/control b/src/debs/fxwinwrap-0-1-2-x86/DEBIAN/control similarity index 73% rename from src/debs/FXWinWrap_0.1-3_x86/DEBIAN/control rename to src/debs/fxwinwrap-0-1-2-x86/DEBIAN/control index 46aadf4..24c5763 100644 --- a/src/debs/FXWinWrap_0.1-3_x86/DEBIAN/control +++ b/src/debs/fxwinwrap-0-1-2-x86/DEBIAN/control @@ -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 maximstewart1@gmail.com -Description: FXWinWrap - A GUI to handle setting XWinWrap options. +Description: A GUI to handle setting XWinWrap options. diff --git a/src/debs/FXWinWrap_0.1-2_x86/DEBIAN/postrm b/src/debs/fxwinwrap-0-1-2-x86/DEBIAN/postrm similarity index 84% rename from src/debs/FXWinWrap_0.1-2_x86/DEBIAN/postrm rename to src/debs/fxwinwrap-0-1-2-x86/DEBIAN/postrm index d6326d6..e0609c1 100755 --- a/src/debs/FXWinWrap_0.1-2_x86/DEBIAN/postrm +++ b/src/debs/fxwinwrap-0-1-2-x86/DEBIAN/postrm @@ -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 diff --git a/src/debs/FXWinWrap_0.1-2_x86/bin/fxwinwrap b/src/debs/fxwinwrap-0-1-2-x86/bin/fxwinwrap similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x86/bin/fxwinwrap rename to src/debs/fxwinwrap-0-1-2-x86/bin/fxwinwrap diff --git a/src/debs/FXWinWrap_0.1-2_x86/opt/FXWinWrap/Controller.class b/src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/Controller.class similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x86/opt/FXWinWrap/Controller.class rename to src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/Controller.class diff --git a/src/debs/FXWinWrap_0.1-2_x86/opt/FXWinWrap/XWWMenu.class b/src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/XWWMenu.class similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x86/opt/FXWinWrap/XWWMenu.class rename to src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/XWWMenu.class diff --git a/src/debs/FXWinWrap_0.1-2_x86/opt/FXWinWrap/launch.sh b/src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/launch.sh old mode 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x86/opt/FXWinWrap/launch.sh rename to src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/launch.sh diff --git a/src/debs/FXWinWrap_0.1-2_x86/opt/FXWinWrap/resources/Window.fxml b/src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/resources/Window.fxml similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x86/opt/FXWinWrap/resources/Window.fxml rename to src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/resources/Window.fxml 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 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x86/opt/FXWinWrap/resources/bin/StartXWW.sh rename to src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/resources/bin/StartXWW.sh 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 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x86/opt/FXWinWrap/resources/bin/ffmpegthumbnailer rename to src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/resources/bin/ffmpegthumbnailer diff --git a/src/debs/FXWinWrap_0.1-2_x86/opt/FXWinWrap/resources/fxwinwrap.png b/src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/resources/fxwinwrap.png similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x86/opt/FXWinWrap/resources/fxwinwrap.png rename to src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/resources/fxwinwrap.png diff --git a/src/debs/FXWinWrap_0.1-2_x86/opt/FXWinWrap/resources/stylesheet.css b/src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/resources/stylesheet.css similarity index 100% rename from src/debs/FXWinWrap_0.1-2_x86/opt/FXWinWrap/resources/stylesheet.css rename to src/debs/fxwinwrap-0-1-2-x86/opt/FXWinWrap/resources/stylesheet.css diff --git a/src/debs/FXWinWrap_0.1-2_x86/usr/share/applications/FXWinWrap.desktop b/src/debs/fxwinwrap-0-1-2-x86/usr/share/applications/FXWinWrap.desktop similarity index 86% rename from src/debs/FXWinWrap_0.1-2_x86/usr/share/applications/FXWinWrap.desktop rename to src/debs/fxwinwrap-0-1-2-x86/usr/share/applications/FXWinWrap.desktop index d4bf2de..50fcf7b 100644 --- a/src/debs/FXWinWrap_0.1-2_x86/usr/share/applications/FXWinWrap.desktop +++ b/src/debs/fxwinwrap-0-1-2-x86/usr/share/applications/FXWinWrap.desktop @@ -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; diff --git a/src/debs/fxwinwrap-0-1-3-x64/DEBIAN/control b/src/debs/fxwinwrap-0-1-3-x64/DEBIAN/control new file mode 100644 index 0000000..bd3655c --- /dev/null +++ b/src/debs/fxwinwrap-0-1-3-x64/DEBIAN/control @@ -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 1itdominator@gmail.com +Description: A GUI to handle setting XWinWrap options. diff --git a/src/debs/FXWinWrap_0.1-3_x64/DEBIAN/postrm b/src/debs/fxwinwrap-0-1-3-x64/DEBIAN/postrm similarity index 78% rename from src/debs/FXWinWrap_0.1-3_x64/DEBIAN/postrm rename to src/debs/fxwinwrap-0-1-3-x64/DEBIAN/postrm index d6326d6..4e2c455 100755 --- a/src/debs/FXWinWrap_0.1-3_x64/DEBIAN/postrm +++ b/src/debs/fxwinwrap-0-1-3-x64/DEBIAN/postrm @@ -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 diff --git a/src/debs/FXWinWrap_0.1-3_x64/bin/fxwinwrap b/src/debs/fxwinwrap-0-1-3-x64/bin/fxwinwrap similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x64/bin/fxwinwrap rename to src/debs/fxwinwrap-0-1-3-x64/bin/fxwinwrap diff --git a/src/debs/fxwinwrap-0-1-3-x64/bin/xwinwrap b/src/debs/fxwinwrap-0-1-3-x64/bin/xwinwrap new file mode 100755 index 0000000..854eba6 Binary files /dev/null and b/src/debs/fxwinwrap-0-1-3-x64/bin/xwinwrap 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 similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x64/opt/FXWinWrap/Controller.class rename to src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller.class 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 similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x64/opt/FXWinWrap/XWWMenu.class rename to src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/XWWMenu.class diff --git a/src/debs/FXWinWrap_0.1-3_x64/opt/FXWinWrap/launch.sh b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/launch.sh old mode 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x64/opt/FXWinWrap/launch.sh rename to src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/launch.sh diff --git a/src/debs/FXWinWrap_0.1-3_x64/opt/FXWinWrap/resources/Window.fxml b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/Window.fxml similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x64/opt/FXWinWrap/resources/Window.fxml rename to src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/Window.fxml 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 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x64/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh rename to src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh 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 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x64/opt/FXWinWrap/resources/bin/StartXWW.sh rename to src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/bin/StartXWW.sh diff --git a/src/debs/FXWinWrap_0.1-3_x64/opt/FXWinWrap/resources/fxwinwrap.png b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/fxwinwrap.png similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x64/opt/FXWinWrap/resources/fxwinwrap.png rename to src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/fxwinwrap.png diff --git a/src/debs/FXWinWrap_0.1-3_x64/opt/FXWinWrap/resources/stylesheet.css b/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/stylesheet.css similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x64/opt/FXWinWrap/resources/stylesheet.css rename to src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/stylesheet.css diff --git a/src/debs/fxwinwrap-0-1-3-x64/usr/share/applications/FXWinWrap.desktop b/src/debs/fxwinwrap-0-1-3-x64/usr/share/applications/FXWinWrap.desktop new file mode 100644 index 0000000..50fcf7b --- /dev/null +++ b/src/debs/fxwinwrap-0-1-3-x64/usr/share/applications/FXWinWrap.desktop @@ -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; diff --git a/src/debs/fxwinwrap-0-1-3-x86/DEBIAN/control b/src/debs/fxwinwrap-0-1-3-x86/DEBIAN/control new file mode 100644 index 0000000..8968cc1 --- /dev/null +++ b/src/debs/fxwinwrap-0-1-3-x86/DEBIAN/control @@ -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 1itdominator@gmail.com +Description: A GUI to handle setting XWinWrap options. diff --git a/src/debs/FXWinWrap_0.1-3_x86/DEBIAN/postrm b/src/debs/fxwinwrap-0-1-3-x86/DEBIAN/postrm similarity index 78% rename from src/debs/FXWinWrap_0.1-3_x86/DEBIAN/postrm rename to src/debs/fxwinwrap-0-1-3-x86/DEBIAN/postrm index d6326d6..4e2c455 100755 --- a/src/debs/FXWinWrap_0.1-3_x86/DEBIAN/postrm +++ b/src/debs/fxwinwrap-0-1-3-x86/DEBIAN/postrm @@ -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 diff --git a/src/debs/FXWinWrap_0.1-3_x86/bin/fxwinwrap b/src/debs/fxwinwrap-0-1-3-x86/bin/fxwinwrap similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x86/bin/fxwinwrap rename to src/debs/fxwinwrap-0-1-3-x86/bin/fxwinwrap diff --git a/src/debs/fxwinwrap-0-1-3-x86/bin/xwinwrap b/src/debs/fxwinwrap-0-1-3-x86/bin/xwinwrap new file mode 100755 index 0000000..854eba6 Binary files /dev/null and b/src/debs/fxwinwrap-0-1-3-x86/bin/xwinwrap 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 similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x86/opt/FXWinWrap/Controller.class rename to src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller.class 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 similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x86/opt/FXWinWrap/XWWMenu.class rename to src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/XWWMenu.class diff --git a/src/debs/FXWinWrap_0.1-3_x86/opt/FXWinWrap/launch.sh b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/launch.sh old mode 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x86/opt/FXWinWrap/launch.sh rename to src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/launch.sh diff --git a/src/debs/FXWinWrap_0.1-3_x86/opt/FXWinWrap/resources/Window.fxml b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/Window.fxml similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x86/opt/FXWinWrap/resources/Window.fxml rename to src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/Window.fxml 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 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x86/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh rename to src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh 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 100755 new mode 100644 similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x86/opt/FXWinWrap/resources/bin/StartXWW.sh rename to src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/bin/StartXWW.sh diff --git a/src/debs/FXWinWrap_0.1-3_x86/opt/FXWinWrap/resources/fxwinwrap.png b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/fxwinwrap.png similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x86/opt/FXWinWrap/resources/fxwinwrap.png rename to src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/fxwinwrap.png diff --git a/src/debs/FXWinWrap_0.1-3_x86/opt/FXWinWrap/resources/stylesheet.css b/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/stylesheet.css similarity index 100% rename from src/debs/FXWinWrap_0.1-3_x86/opt/FXWinWrap/resources/stylesheet.css rename to src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/stylesheet.css diff --git a/src/debs/fxwinwrap-0-1-3-x86/usr/share/applications/.FXWinWrap.desktop.swp b/src/debs/fxwinwrap-0-1-3-x86/usr/share/applications/.FXWinWrap.desktop.swp new file mode 100644 index 0000000..be6e1a1 Binary files /dev/null and b/src/debs/fxwinwrap-0-1-3-x86/usr/share/applications/.FXWinWrap.desktop.swp differ diff --git a/src/debs/fxwinwrap-0-1-3-x86/usr/share/applications/FXWinWrap.desktop b/src/debs/fxwinwrap-0-1-3-x86/usr/share/applications/FXWinWrap.desktop new file mode 100644 index 0000000..50fcf7b --- /dev/null +++ b/src/debs/fxwinwrap-0-1-3-x86/usr/share/applications/FXWinWrap.desktop @@ -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; diff --git a/src/versions/v0.0.1/resources/bin/StartXWW.sh b/src/versions/v0.0.1/resources/bin/StartXWW.sh index efb9832..e276bde 100755 --- a/src/versions/v0.0.1/resources/bin/StartXWW.sh +++ b/src/versions/v0.0.1/resources/bin/StartXWW.sh @@ -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 diff --git a/src/versions/v0.0.2/Controller.java b/src/versions/v0.0.2/Controller.java index c36122b..007e0fd 100644 --- a/src/versions/v0.0.2/Controller.java +++ b/src/versions/v0.0.2/Controller.java @@ -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 { - 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) { diff --git a/src/versions/v0.0.2/resources/bin/StartXWW.sh b/src/versions/v0.0.2/resources/bin/StartXWW.sh index efb9832..e276bde 100755 --- a/src/versions/v0.0.2/resources/bin/StartXWW.sh +++ b/src/versions/v0.0.2/resources/bin/StartXWW.sh @@ -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 diff --git a/src/versions/v0.0.3/Controller$1.class b/src/versions/v0.0.3/Controller$1.class new file mode 100644 index 0000000..6c0ea41 Binary files /dev/null and b/src/versions/v0.0.3/Controller$1.class differ diff --git a/src/versions/v0.0.3/Controller.class b/src/versions/v0.0.3/Controller.class new file mode 100644 index 0000000..19ae5ea Binary files /dev/null and b/src/versions/v0.0.3/Controller.class differ diff --git a/src/versions/v0.0.3/Controller.java b/src/versions/v0.0.3/Controller.java index 393588e..06c928b 100644 --- a/src/versions/v0.0.3/Controller.java +++ b/src/versions/v0.0.3/Controller.java @@ -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 { - 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 &"); diff --git a/src/versions/v0.0.3/XWWMenu.class b/src/versions/v0.0.3/XWWMenu.class new file mode 100644 index 0000000..e46b4f0 Binary files /dev/null and b/src/versions/v0.0.3/XWWMenu.class differ diff --git a/src/versions/v0.0.3/XWWMenu.java b/src/versions/v0.0.3/XWWMenu.java index 2c9066b..0bc8f28 100644 --- a/src/versions/v0.0.3/XWWMenu.java +++ b/src/versions/v0.0.3/XWWMenu.java @@ -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(); diff --git a/src/versions/v0.0.3/resources/Window.fxml b/src/versions/v0.0.3/resources/Window.fxml index 341c076..0bcb4f6 100644 --- a/src/versions/v0.0.3/resources/Window.fxml +++ b/src/versions/v0.0.3/resources/Window.fxml @@ -1,16 +1,22 @@ - - - - - - - - + + + + + + + + + + + + + + - +