diff --git a/java/LICENSE b/LICENSE
similarity index 100%
rename from java/LICENSE
rename to LICENSE
diff --git a/README.md b/README.md
index a7ace12..7934c52 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,22 @@
-# XWinWrap GUIs made from Java and JavaFX plus Gtk, Glade, and Python.
+# GWinWrap
+GWinWrap is a Gtk with Python gui to select videos for XWinWrap, images for Nitrogen Wallpaper Manager, and gifs for Gifsicle.
+It includes the XWinWrap binary and source code for Shantanu Goel's version of XWinWrap.
# Notes
-Both are intended to run the same but the Python version is faster and consumes less memory.
+Need python 2+
+
+# Images
+
+
+
+
+
+
+
+# TODO
+Nothing...
# Credit
-FXWinWrap Java Jar with Shell scripts, Gtk, Glade, and Python scripts by: Maxim Stewart -- https://www.itdominator.com/
+GWinWrap python and glade by: Maxim Stewart -- https://www.itdominator.com/
-XWinWrap binary and source by: Shantanu Goel -- http://tech.shantanugoel.com
+XWinWrap binary by: Shantanu Goel -- http://tech.shantanugoel.com
diff --git a/python/bin/gwinwrap-0-0-1-x64.deb b/bin/gwinwrap-0-0-1-x64.deb
similarity index 95%
rename from python/bin/gwinwrap-0-0-1-x64.deb
rename to bin/gwinwrap-0-0-1-x64.deb
index 3fddb8f..fb8b0fe 100644
Binary files a/python/bin/gwinwrap-0-0-1-x64.deb and b/bin/gwinwrap-0-0-1-x64.deb differ
diff --git a/python/images/pic1.png b/images/pic1.png
similarity index 100%
rename from python/images/pic1.png
rename to images/pic1.png
diff --git a/python/images/pic2.png b/images/pic2.png
similarity index 100%
rename from python/images/pic2.png
rename to images/pic2.png
diff --git a/python/images/pic3.png b/images/pic3.png
similarity index 100%
rename from python/images/pic3.png
rename to images/pic3.png
diff --git a/python/images/pic4.png b/images/pic4.png
similarity index 100%
rename from python/images/pic4.png
rename to images/pic4.png
diff --git a/python/images/pic5.png b/images/pic5.png
similarity index 100%
rename from python/images/pic5.png
rename to images/pic5.png
diff --git a/python/images/pic6.png b/images/pic6.png
similarity index 100%
rename from python/images/pic6.png
rename to images/pic6.png
diff --git a/java/README.md b/java/README.md
deleted file mode 100644
index c26a1d3..0000000
--- a/java/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# FXWinWrap
-FXXWinWrap is a JavaFX GUI to select videos for XWinWrap, images for Nitrogen Wallpaper Manager, and gifs for Gifsicle.
-It includes the XWinWrap binary and source code for Shantanu Goel's version of XWinWrap.
-
-
-# Notes
-v5 introduced the proper Jar structure and reduced some script requirements.
-
-# Images
-
-
-
-# TODO
-Nothing At This Time
-
-# Credit
-FXXWinWrap Java Jar by: Maxim Stewart -- https://www.itdominator.com/
-
-XWinWrap binary by: Shantanu Goel -- http://tech.shantanugoel.com
-
diff --git a/java/bin/v0.1-3/README.md b/java/bin/v0.1-3/README.md
deleted file mode 100644
index 51b4074..0000000
--- a/java/bin/v0.1-3/README.md
+++ /dev/null
@@ -1 +0,0 @@
-###Please use version 4 for improvements and stability. This package version is considered depricated!!
diff --git a/java/bin/v0.1-3/fxwinwrap-0-1-3-x64.deb b/java/bin/v0.1-3/fxwinwrap-0-1-3-x64.deb
deleted file mode 100644
index 81438f6..0000000
Binary files a/java/bin/v0.1-3/fxwinwrap-0-1-3-x64.deb and /dev/null differ
diff --git a/java/bin/v0.1-3/fxwinwrap-0-1-3-x86.deb b/java/bin/v0.1-3/fxwinwrap-0-1-3-x86.deb
deleted file mode 100644
index b5a7f7c..0000000
Binary files a/java/bin/v0.1-3/fxwinwrap-0-1-3-x86.deb and /dev/null differ
diff --git a/java/bin/v0.1-4/README.md b/java/bin/v0.1-4/README.md
deleted file mode 100644
index 23864ff..0000000
--- a/java/bin/v0.1-4/README.md
+++ /dev/null
@@ -1 +0,0 @@
-###Please use version 5 for improvements and stability. This package version is considered depricated!!
diff --git a/java/bin/v0.1-4/fxwinwrap-0-1-4-x64.deb b/java/bin/v0.1-4/fxwinwrap-0-1-4-x64.deb
deleted file mode 100644
index 68a3aac..0000000
Binary files a/java/bin/v0.1-4/fxwinwrap-0-1-4-x64.deb and /dev/null differ
diff --git a/java/bin/v0.1-4/fxwinwrap-0-1-4-x86.deb b/java/bin/v0.1-4/fxwinwrap-0-1-4-x86.deb
deleted file mode 100644
index 1662cca..0000000
Binary files a/java/bin/v0.1-4/fxwinwrap-0-1-4-x86.deb and /dev/null differ
diff --git a/java/bin/v0.1-5/fxwinwrap-0-1-5-x64.deb b/java/bin/v0.1-5/fxwinwrap-0-1-5-x64.deb
deleted file mode 100644
index ced92a4..0000000
Binary files a/java/bin/v0.1-5/fxwinwrap-0-1-5-x64.deb and /dev/null differ
diff --git a/java/bin/v0.1-5/fxwinwrap-0-1-5-x86.deb b/java/bin/v0.1-5/fxwinwrap-0-1-5-x86.deb
deleted file mode 100644
index 8fe5856..0000000
Binary files a/java/bin/v0.1-5/fxwinwrap-0-1-5-x86.deb and /dev/null differ
diff --git a/java/images/pic1.jpg b/java/images/pic1.jpg
deleted file mode 100644
index a88e9a8..0000000
Binary files a/java/images/pic1.jpg and /dev/null differ
diff --git a/java/images/pic2.jpg b/java/images/pic2.jpg
deleted file mode 100644
index 5323a61..0000000
Binary files a/java/images/pic2.jpg and /dev/null differ
diff --git a/java/src/debs/build.sh b/java/src/debs/build.sh
deleted file mode 100644
index 229f961..0000000
--- a/java/src/debs/build.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# Fixes ownershp
-function main() {
- sudo find . -type f -exec chmod 644 {} +
- sudo find . -type d -exec chmod 755 {} +
-
- # Set postrm permissions
- for i in `find . -name postrm`; do
- sudo chmod 755 "${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/*
-
- sudo chown -R root:root ./*/
-builder;
-}
-
-#builds debs
-function builder() {
- for i in `ls`; do
- if [[ -d "${i}" ]]; then
- dpkg --build "${i}"
- else
- echo "Not a dir."
- fi
- done
-}
-main;
diff --git a/java/src/debs/fxwinwrap-0-1-3-x64/DEBIAN/control b/java/src/debs/fxwinwrap-0-1-3-x64/DEBIAN/control
deleted file mode 100644
index bd3655c..0000000
--- a/java/src/debs/fxwinwrap-0-1-3-x64/DEBIAN/control
+++ /dev/null
@@ -1,8 +0,0 @@
-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/java/src/debs/fxwinwrap-0-1-3-x64/DEBIAN/postrm b/java/src/debs/fxwinwrap-0-1-3-x64/DEBIAN/postrm
deleted file mode 100755
index 4e2c455..0000000
--- a/java/src/debs/fxwinwrap-0-1-3-x64/DEBIAN/postrm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#postrm (script executed after uninstalling the package)
-#set -e
-
-if [ -f /bin/fxwinwrap ]; then
- rm /bin/fxwinwrap
-fi
-
-if [ -d /opt/FXWinWrap ]; then
- 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
diff --git a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$1.class b/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$1.class
deleted file mode 100644
index 5617668..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$1.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$2.class b/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$2.class
deleted file mode 100644
index 5016b7f..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$2.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$3.class b/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$3.class
deleted file mode 100644
index b92e323..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller$3.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller.class b/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller.class
deleted file mode 100644
index 7ed2162..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/Controller.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/XWWMenu.class b/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/XWWMenu.class
deleted file mode 100644
index e46b4f0..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/XWWMenu.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/launch.sh b/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/launch.sh
deleted file mode 100644
index c9fead3..0000000
--- a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/launch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-java XWWMenu
diff --git a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/Window.fxml b/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/Window.fxml
deleted file mode 100644
index 341c076..0000000
--- a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/Window.fxml
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh b/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh
deleted file mode 100755
index ca173f9..0000000
--- a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-
-function main() {
- notify-send -u critical "You need to install ffmpegthumbnailer to have FXWinWrap work properly..."
- xterm -e sudo apt install ffmpegthumbnailer
-}
-main;
diff --git a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/bin/StartXWW.sh b/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/bin/StartXWW.sh
deleted file mode 100755
index e81bcac..0000000
--- a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/bin/StartXWW.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-### nohup is needed to keep child processes alive from java's
-nohup bash ~/.animatedBGstarter.sh &> /dev/null &
-nohup bash ~/.animatedBGstarter2.sh &> /dev/null &
diff --git a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/fxwinwrap.png b/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/fxwinwrap.png
deleted file mode 100644
index cdd708d..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/fxwinwrap.png and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/stylesheet.css b/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/stylesheet.css
deleted file mode 100644
index e91c2fe..0000000
--- a/java/src/debs/fxwinwrap-0-1-3-x64/opt/FXWinWrap/resources/stylesheet.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.root {
- -fx-background: rgba(68, 68, 68, 0.8); // == #444444;
-}
diff --git a/java/src/debs/fxwinwrap-0-1-3-x64/usr/share/applications/FXWinWrap.desktop b/java/src/debs/fxwinwrap-0-1-3-x64/usr/share/applications/FXWinWrap.desktop
deleted file mode 100644
index 50fcf7b..0000000
--- a/java/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=System;
-MimeType=application/fxml;
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/DEBIAN/control b/java/src/debs/fxwinwrap-0-1-3-x86/DEBIAN/control
deleted file mode 100644
index 8968cc1..0000000
--- a/java/src/debs/fxwinwrap-0-1-3-x86/DEBIAN/control
+++ /dev/null
@@ -1,8 +0,0 @@
-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/java/src/debs/fxwinwrap-0-1-3-x86/DEBIAN/postrm b/java/src/debs/fxwinwrap-0-1-3-x86/DEBIAN/postrm
deleted file mode 100755
index 4e2c455..0000000
--- a/java/src/debs/fxwinwrap-0-1-3-x86/DEBIAN/postrm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#postrm (script executed after uninstalling the package)
-#set -e
-
-if [ -f /bin/fxwinwrap ]; then
- rm /bin/fxwinwrap
-fi
-
-if [ -d /opt/FXWinWrap ]; then
- 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
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/bin/fxwinwrap b/java/src/debs/fxwinwrap-0-1-3-x86/bin/fxwinwrap
deleted file mode 100755
index 99efd97..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-3-x86/bin/fxwinwrap and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$1.class b/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$1.class
deleted file mode 100644
index 5617668..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$1.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$2.class b/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$2.class
deleted file mode 100644
index 5016b7f..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$2.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$3.class b/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$3.class
deleted file mode 100644
index b92e323..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller$3.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller.class b/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller.class
deleted file mode 100644
index 7ed2162..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/Controller.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/XWWMenu.class b/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/XWWMenu.class
deleted file mode 100644
index e46b4f0..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/XWWMenu.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/launch.sh b/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/launch.sh
deleted file mode 100644
index c9fead3..0000000
--- a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/launch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-java XWWMenu
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/Window.fxml b/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/Window.fxml
deleted file mode 100644
index 341c076..0000000
--- a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/Window.fxml
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh b/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh
deleted file mode 100755
index ca173f9..0000000
--- a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-
-function main() {
- notify-send -u critical "You need to install ffmpegthumbnailer to have FXWinWrap work properly..."
- xterm -e sudo apt install ffmpegthumbnailer
-}
-main;
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/bin/StartXWW.sh b/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/bin/StartXWW.sh
deleted file mode 100755
index e81bcac..0000000
--- a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/bin/StartXWW.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-### nohup is needed to keep child processes alive from java's
-nohup bash ~/.animatedBGstarter.sh &> /dev/null &
-nohup bash ~/.animatedBGstarter2.sh &> /dev/null &
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/fxwinwrap.png b/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/fxwinwrap.png
deleted file mode 100644
index cdd708d..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/fxwinwrap.png and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/stylesheet.css b/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/stylesheet.css
deleted file mode 100644
index e91c2fe..0000000
--- a/java/src/debs/fxwinwrap-0-1-3-x86/opt/FXWinWrap/resources/stylesheet.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.root {
- -fx-background: rgba(68, 68, 68, 0.8); // == #444444;
-}
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/usr/share/applications/.FXWinWrap.desktop.swp b/java/src/debs/fxwinwrap-0-1-3-x86/usr/share/applications/.FXWinWrap.desktop.swp
deleted file mode 100644
index be6e1a1..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-3-x86/usr/share/applications/.FXWinWrap.desktop.swp and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-3-x86/usr/share/applications/FXWinWrap.desktop b/java/src/debs/fxwinwrap-0-1-3-x86/usr/share/applications/FXWinWrap.desktop
deleted file mode 100644
index 50fcf7b..0000000
--- a/java/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=System;
-MimeType=application/fxml;
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/DEBIAN/control b/java/src/debs/fxwinwrap-0-1-4-x64/DEBIAN/control
deleted file mode 100644
index bd3655c..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-x64/DEBIAN/control
+++ /dev/null
@@ -1,8 +0,0 @@
-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/java/src/debs/fxwinwrap-0-1-4-x64/DEBIAN/postrm b/java/src/debs/fxwinwrap-0-1-4-x64/DEBIAN/postrm
deleted file mode 100755
index 4e2c455..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-x64/DEBIAN/postrm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#postrm (script executed after uninstalling the package)
-#set -e
-
-if [ -f /bin/fxwinwrap ]; then
- rm /bin/fxwinwrap
-fi
-
-if [ -d /opt/FXWinWrap ]; then
- 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
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/bin/fxwinwrap b/java/src/debs/fxwinwrap-0-1-4-x64/bin/fxwinwrap
deleted file mode 100755
index 99efd97..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x64/bin/fxwinwrap and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/Controller$1.class b/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/Controller$1.class
deleted file mode 100644
index e29b9b2..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/Controller$1.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/Controller$2.class b/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/Controller$2.class
deleted file mode 100644
index 13d871e..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/Controller$2.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/Controller$3.class b/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/Controller$3.class
deleted file mode 100644
index c311c54..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/Controller$3.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/Controller.class b/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/Controller.class
deleted file mode 100644
index 4ea8d6d..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/Controller.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/XWWMenu.class b/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/XWWMenu.class
deleted file mode 100644
index e6144e0..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/XWWMenu.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/launch.sh b/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/launch.sh
deleted file mode 100644
index c9fead3..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/launch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-java XWWMenu
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/Window.fxml b/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/Window.fxml
deleted file mode 100644
index de9652b..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/Window.fxml
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh b/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh
deleted file mode 100755
index ca173f9..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-
-function main() {
- notify-send -u critical "You need to install ffmpegthumbnailer to have FXWinWrap work properly..."
- xterm -e sudo apt install ffmpegthumbnailer
-}
-main;
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/bin/StartXWW.sh b/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/bin/StartXWW.sh
deleted file mode 100755
index e81bcac..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/bin/StartXWW.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-### nohup is needed to keep child processes alive from java's
-nohup bash ~/.animatedBGstarter.sh &> /dev/null &
-nohup bash ~/.animatedBGstarter2.sh &> /dev/null &
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/fxwinwrap.png b/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/fxwinwrap.png
deleted file mode 100644
index cdd708d..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/fxwinwrap.png and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/stylesheet.css b/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/stylesheet.css
deleted file mode 100644
index e91c2fe..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-x64/opt/FXWinWrap/resources/stylesheet.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.root {
- -fx-background: rgba(68, 68, 68, 0.8); // == #444444;
-}
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/usr/share/applications/.FXWinWrap.desktop.swp b/java/src/debs/fxwinwrap-0-1-4-x64/usr/share/applications/.FXWinWrap.desktop.swp
deleted file mode 100644
index be6e1a1..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x64/usr/share/applications/.FXWinWrap.desktop.swp and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x64/usr/share/applications/FXWinWrap.desktop b/java/src/debs/fxwinwrap-0-1-4-x64/usr/share/applications/FXWinWrap.desktop
deleted file mode 100644
index 50fcf7b..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-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=System;
-MimeType=application/fxml;
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/DEBIAN/control b/java/src/debs/fxwinwrap-0-1-4-x86/DEBIAN/control
deleted file mode 100644
index 8968cc1..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-x86/DEBIAN/control
+++ /dev/null
@@ -1,8 +0,0 @@
-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/java/src/debs/fxwinwrap-0-1-4-x86/DEBIAN/postrm b/java/src/debs/fxwinwrap-0-1-4-x86/DEBIAN/postrm
deleted file mode 100755
index 4e2c455..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-x86/DEBIAN/postrm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#postrm (script executed after uninstalling the package)
-#set -e
-
-if [ -f /bin/fxwinwrap ]; then
- rm /bin/fxwinwrap
-fi
-
-if [ -d /opt/FXWinWrap ]; then
- 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
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/bin/fxwinwrap b/java/src/debs/fxwinwrap-0-1-4-x86/bin/fxwinwrap
deleted file mode 100755
index 99efd97..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x86/bin/fxwinwrap and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/Controller$1.class b/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/Controller$1.class
deleted file mode 100644
index e29b9b2..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/Controller$1.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/Controller$2.class b/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/Controller$2.class
deleted file mode 100644
index 13d871e..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/Controller$2.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/Controller$3.class b/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/Controller$3.class
deleted file mode 100644
index c311c54..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/Controller$3.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/Controller.class b/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/Controller.class
deleted file mode 100644
index 4ea8d6d..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/Controller.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/XWWMenu.class b/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/XWWMenu.class
deleted file mode 100644
index e6144e0..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/XWWMenu.class and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/launch.sh b/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/launch.sh
deleted file mode 100644
index c9fead3..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/launch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-java XWWMenu
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/Window.fxml b/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/Window.fxml
deleted file mode 100644
index de9652b..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/Window.fxml
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh b/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh
deleted file mode 100755
index ca173f9..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/bin/InstallFFMPEGTHUMB.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-
-function main() {
- notify-send -u critical "You need to install ffmpegthumbnailer to have FXWinWrap work properly..."
- xterm -e sudo apt install ffmpegthumbnailer
-}
-main;
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/bin/StartXWW.sh b/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/bin/StartXWW.sh
deleted file mode 100755
index e81bcac..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/bin/StartXWW.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-### nohup is needed to keep child processes alive from java's
-nohup bash ~/.animatedBGstarter.sh &> /dev/null &
-nohup bash ~/.animatedBGstarter2.sh &> /dev/null &
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/fxwinwrap.png b/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/fxwinwrap.png
deleted file mode 100644
index cdd708d..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/fxwinwrap.png and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/stylesheet.css b/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/stylesheet.css
deleted file mode 100644
index e91c2fe..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-x86/opt/FXWinWrap/resources/stylesheet.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.root {
- -fx-background: rgba(68, 68, 68, 0.8); // == #444444;
-}
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/usr/share/applications/.FXWinWrap.desktop.swp b/java/src/debs/fxwinwrap-0-1-4-x86/usr/share/applications/.FXWinWrap.desktop.swp
deleted file mode 100644
index be6e1a1..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-4-x86/usr/share/applications/.FXWinWrap.desktop.swp and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-4-x86/usr/share/applications/FXWinWrap.desktop b/java/src/debs/fxwinwrap-0-1-4-x86/usr/share/applications/FXWinWrap.desktop
deleted file mode 100644
index 50fcf7b..0000000
--- a/java/src/debs/fxwinwrap-0-1-4-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=System;
-MimeType=application/fxml;
diff --git a/java/src/debs/fxwinwrap-0-1-5-x64/DEBIAN/control b/java/src/debs/fxwinwrap-0-1-5-x64/DEBIAN/control
deleted file mode 100644
index 9add1eb..0000000
--- a/java/src/debs/fxwinwrap-0-1-5-x64/DEBIAN/control
+++ /dev/null
@@ -1,8 +0,0 @@
-Package: fxwinwrap64
-Version: 0.1-5
-Section: java
-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: FXWinWrap is a GUI to handle setting XWinWrap options.
diff --git a/java/src/debs/fxwinwrap-0-1-5-x64/DEBIAN/postrm b/java/src/debs/fxwinwrap-0-1-5-x64/DEBIAN/postrm
deleted file mode 100755
index 4e2c455..0000000
--- a/java/src/debs/fxwinwrap-0-1-5-x64/DEBIAN/postrm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#postrm (script executed after uninstalling the package)
-#set -e
-
-if [ -f /bin/fxwinwrap ]; then
- rm /bin/fxwinwrap
-fi
-
-if [ -d /opt/FXWinWrap ]; then
- 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
diff --git a/java/src/debs/fxwinwrap-0-1-5-x64/bin/fxwinwrap b/java/src/debs/fxwinwrap-0-1-5-x64/bin/fxwinwrap
deleted file mode 100755
index a0bf3f5..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-5-x64/bin/fxwinwrap and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-5-x64/opt/FXWinWrap/FXWinWrap.jar b/java/src/debs/fxwinwrap-0-1-5-x64/opt/FXWinWrap/FXWinWrap.jar
deleted file mode 100644
index e2e6c62..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-5-x64/opt/FXWinWrap/FXWinWrap.jar and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-5-x64/opt/FXWinWrap/FXWinWrap.png b/java/src/debs/fxwinwrap-0-1-5-x64/opt/FXWinWrap/FXWinWrap.png
deleted file mode 100644
index cdd708d..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-5-x64/opt/FXWinWrap/FXWinWrap.png and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-5-x64/opt/FXWinWrap/launch.sh b/java/src/debs/fxwinwrap-0-1-5-x64/opt/FXWinWrap/launch.sh
deleted file mode 100644
index 5b48d7a..0000000
--- a/java/src/debs/fxwinwrap-0-1-5-x64/opt/FXWinWrap/launch.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-function main() {
- java -Xms32m -Xmx100m -jar FXWinWrap.jar
-}
-main;
diff --git a/java/src/debs/fxwinwrap-0-1-5-x64/usr/share/applications/FXWinWrap.desktop b/java/src/debs/fxwinwrap-0-1-5-x64/usr/share/applications/FXWinWrap.desktop
deleted file mode 100644
index a01d94e..0000000
--- a/java/src/debs/fxwinwrap-0-1-5-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/FXWinWrap.png
-Terminal=false
-Type=Application
-Categories=System;
-MimeType=application/fxml;
diff --git a/java/src/debs/fxwinwrap-0-1-5-x64/usr/share/doc/fxwinwrap/copyright b/java/src/debs/fxwinwrap-0-1-5-x64/usr/share/doc/fxwinwrap/copyright
deleted file mode 100644
index 03e69e2..0000000
--- a/java/src/debs/fxwinwrap-0-1-5-x64/usr/share/doc/fxwinwrap/copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-FXWinWrap is copyright 2016, 2017 Maxim Stewart.
-FXWinWrap is currently developed by ITDominator <1itdominator@gmail.com>.
-
-License: GPLv2+
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-See /usr/share/common-licenses/GPL-2, or
- for the terms of the latest version
-of the GNU General Public License.
diff --git a/java/src/debs/fxwinwrap-0-1-5-x86/DEBIAN/control b/java/src/debs/fxwinwrap-0-1-5-x86/DEBIAN/control
deleted file mode 100644
index 6966b7f..0000000
--- a/java/src/debs/fxwinwrap-0-1-5-x86/DEBIAN/control
+++ /dev/null
@@ -1,8 +0,0 @@
-Package: fxwinwrap
-Version: 0.1-5
-Section: java
-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: FXWinWrap is a GUI to handle setting XWinWrap options.
diff --git a/java/src/debs/fxwinwrap-0-1-5-x86/DEBIAN/postrm b/java/src/debs/fxwinwrap-0-1-5-x86/DEBIAN/postrm
deleted file mode 100755
index 4e2c455..0000000
--- a/java/src/debs/fxwinwrap-0-1-5-x86/DEBIAN/postrm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#postrm (script executed after uninstalling the package)
-#set -e
-
-if [ -f /bin/fxwinwrap ]; then
- rm /bin/fxwinwrap
-fi
-
-if [ -d /opt/FXWinWrap ]; then
- 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
diff --git a/java/src/debs/fxwinwrap-0-1-5-x86/bin/fxwinwrap b/java/src/debs/fxwinwrap-0-1-5-x86/bin/fxwinwrap
deleted file mode 100755
index a0bf3f5..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-5-x86/bin/fxwinwrap and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-5-x86/bin/xwinwrap b/java/src/debs/fxwinwrap-0-1-5-x86/bin/xwinwrap
deleted file mode 100755
index 8c86fd3..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-5-x86/bin/xwinwrap and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-5-x86/opt/FXWinWrap/FXWinWrap.jar b/java/src/debs/fxwinwrap-0-1-5-x86/opt/FXWinWrap/FXWinWrap.jar
deleted file mode 100644
index e2e6c62..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-5-x86/opt/FXWinWrap/FXWinWrap.jar and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-5-x86/opt/FXWinWrap/FXWinWrap.png b/java/src/debs/fxwinwrap-0-1-5-x86/opt/FXWinWrap/FXWinWrap.png
deleted file mode 100644
index cdd708d..0000000
Binary files a/java/src/debs/fxwinwrap-0-1-5-x86/opt/FXWinWrap/FXWinWrap.png and /dev/null differ
diff --git a/java/src/debs/fxwinwrap-0-1-5-x86/opt/FXWinWrap/launch.sh b/java/src/debs/fxwinwrap-0-1-5-x86/opt/FXWinWrap/launch.sh
deleted file mode 100644
index 5b48d7a..0000000
--- a/java/src/debs/fxwinwrap-0-1-5-x86/opt/FXWinWrap/launch.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-function main() {
- java -Xms32m -Xmx100m -jar FXWinWrap.jar
-}
-main;
diff --git a/java/src/debs/fxwinwrap-0-1-5-x86/usr/share/applications/FXWinWrap.desktop b/java/src/debs/fxwinwrap-0-1-5-x86/usr/share/applications/FXWinWrap.desktop
deleted file mode 100644
index a01d94e..0000000
--- a/java/src/debs/fxwinwrap-0-1-5-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/FXWinWrap.png
-Terminal=false
-Type=Application
-Categories=System;
-MimeType=application/fxml;
diff --git a/java/src/versions/v0.0.3/Controller.java b/java/src/versions/v0.0.3/Controller.java
deleted file mode 100644
index 1ee3cec..0000000
--- a/java/src/versions/v0.0.3/Controller.java
+++ /dev/null
@@ -1,275 +0,0 @@
-import javafx.stage.*;
-import javafx.scene.Scene;
-import javafx.fxml.FXML;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.TilePane;
-import javafx.scene.control.*;
-import javafx.event.ActionEvent;
-import javafx.scene.input.KeyEvent;
-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;
-import javafx.concurrent.Task;
-import javafx.application.Platform;
-
-
-public class Controller {
- private DirectoryChooser folderChooser = new DirectoryChooser(); // Selects a dir
- 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
- private String tmpPath, resolution, xScreenVal, output,
- startScrpt = System.getProperty("user.dir") + "/resources/bin/StartXWW.sh", // Gets shell that starts stuff local
- textAreaPth = "";
- private int applyType = 1;
- private Stage fileChooserStage;
- @FXML private ListView selXScreenSvr;
- @FXML private Label dirLbl, errorField; // Labels
- @FXML private TilePane tilePane;
- @FXML private TextField dirPathField, filePathField; // Text fields
- @FXML private CheckBox lftScrn, rghtScrn, useXSvrn; // Check boxes
- @FXML private ChoiceBox listLftRes, listRgthRes, listSaveLoc; // Choice box fields
- @FXML private Button applyBttn, closeBttn, fileBttn, clear, // Buttons
- killBttn, restartBttn, saveBttn;
-
- // This method is called by the FXMLLoader when initialization is complete
- @FXML void initialize() throws Exception {
- assert clear != null : "fx:id=\"clear\" was not injected: check your FXML file 'Window.fxml'.";
- assert closeBttn != null : "fx:id=\"closeBttn\" was not injected: check your FXML file 'Window.fxml'.";
- assert dirLbl != null : "fx:id=\"dirLbl\" was not injected: check your FXML file 'Window.fxml'.";
- assert errorField != null : "fx:id=\"errorField\" was not injected: check your FXML file 'Window.fxml'.";
- assert filePathField != null : "fx:id=\"filePathField\" was not injected: check your FXML file 'Window.fxml'.";
- assert lftScrn != null : "fx:id=\"lftScrn\" was not injected: check your FXML file 'Window.fxml'.";
- assert listLftRes != null : "fx:id=\"listLftRes\" was not injected: check your FXML file 'Window.fxml'.";
- assert listRgthRes != null : "fx:id=\"listRgthRes\" was not injected: check your FXML file 'Window.fxml'.";
- assert listSaveLoc != null : "fx:id=\"listSaveLoc\" was not injected: check your FXML file 'Window.fxml'.";
- assert rghtScrn != null : "fx:id=\"rghtScrn\" was not injected: check your FXML file 'Window.fxml'.";
- assert selXScreenSvr != null : "fx:id=\"selXScreenSvr\" was not injected: check your FXML file 'Window.fxml'.";
- 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
- }
-
- // Handler for TextArea[fx:id="dirPathField"] onKeyReleased
- @FXML void setNewDir(MouseEvent event) { newDir(); }
- @FXML void onEnter(KeyEvent event) {
- if (event.getCode().equals(KeyCode.ENTER)) {
- textAreaPth = dirPathField.getText();
- System.out.println(textAreaPth);
- newDir();
- }
- else {}
- }
-
- @FXML void test(ActionEvent event) {
- newDir();
- }
-
- // Scan selected dir
- public void newDir() {
- tilePane.getChildren().clear();
- Stage stage = new Stage();
- if (textAreaPth != "")
- directory = new File(textAreaPth);
- else {
- directory = folderChooser.showDialog(stage);
-
- if (directory != null) {
- System.out.println("Directory: " + directory);
- }
- }
-
- fileList = directory.listFiles();
- 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();
- 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")) {
- String title = "" + fileList[i];
- pth = new Image("file://" + fileList[i]);
- ImageView view = (ImageView) (tilePane.getChildren().get(i));
-
- 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 -> {
- if (mouse.getClickCount() == 2 && !mouse.isConsumed()) {
- mouse.consume();
- displayImg(imgViewPoped, title);
- }
- filePathField.setText(path);
- });
- } else {
- System.out.println("Not a video or image file.");
- }
- }
- }
- // Open image in new window
- public void displayImg(ImageView imgViewPoped, String title) {
- Stage popOut = new Stage();
- Pane pane = new Pane();
- imgViewPoped.setLayoutX(0);
- imgViewPoped.setLayoutY(0);
- imgViewPoped.fitWidthProperty().bind(pane.widthProperty());
- imgViewPoped.fitHeightProperty().bind(pane.heightProperty());
- pane.getChildren().add(imgViewPoped);
- Scene scene = new Scene(pane, 1280, 900);
- popOut.setTitle(title);
- popOut.setScene(scene);
- popOut.show();
- }
-
- // Kill xwinwrap process
- @FXML void killXWinWrp(ActionEvent event) throws Exception {
- pb = Runtime.getRuntime().exec("killall xwinwrap &");
- pb.waitFor();
- }
- // Restart xwinwrap process
- @FXML void restartXWinWrp(ActionEvent event) throws Exception {
- pb = Runtime.getRuntime().exec("killall xwinwrap &");
- pb = Runtime.getRuntime().exec(startScrpt);
- pb.waitFor();
- }
- // Pass resolution values
- @FXML void passXScreenVal() {
- xScreenVal = "" + selXScreenSvr.getSelectionModel().getSelectedItem();
- }
- // Preliminary setup to save settings to files
- @FXML void saveToFile(ActionEvent saveEvent) throws Exception {
-
- // Saves to file with selected and needed settings
- if(filePathField.getText().toLowerCase().contains(".jpg") ||
- filePathField.getText().toLowerCase().contains(".jpeg") ||
- filePathField.getText().toLowerCase().contains(".png") ||
- filePathField.getText().toLowerCase().contains(".gif"))
- sveFileLoc = new File(System.getProperty("user.home") + "/" + ".config/nitrogen/bg-saved.cfg");
- else
- sveFileLoc = new File(System.getProperty("user.home") + "/" + listSaveLoc.getValue());
-
- fileWriter = new FileWriter(sveFileLoc);
- errorField.setText("");
- if (lftScrn.isSelected() == true && rghtScrn.isSelected() == true)
- errorField.setText("Please only check one...");
- else if (lftScrn.isSelected() == false && rghtScrn.isSelected() == false)
- errorField.setText("Please check one...");
- else if (lftScrn.isSelected() == true && rghtScrn.isSelected() == false) {
- resolution = "" + listLftRes.getValue();
- startSave();
- }
- else if (rghtScrn.isSelected() == true && lftScrn.isSelected() == false) {
- resolution = "" + listLftRes.getValue() + "" + listRgthRes.getValue();
- startSave();
- } else { startSave(); }
- }
- // Save settings to files
- void startSave() throws Exception {
- // XSCREENSAVER
- if (useXSvrn.isSelected() == true) {
- output = "xwinwrap -ov -g " + resolution + " -st -sp -b -nf -s -ni -- /usr/lib/xscreensaver/" + xScreenVal + " -window-id WID -root";
- fileWriter.write(output);
- applyType = 1;
- // GIF
- } else if (filePathField.getText().toLowerCase().contains(".gif")) {
- output = "xwinwrap -ov -g " + resolution + " -st -sp -b -nf -s -ni -- gifview -a -w WID " + filePathField.getText();
- fileWriter.write(output);
- applyType = 1;
- // Standard images using nitrogen
- } else if(filePathField.getText().toLowerCase().contains(".jpg") ||
- filePathField.getText().toLowerCase().contains(".png")) {
- output = "[xin_0] \n file=" + filePathField.getText() + "\nmode=0 \nbgcolor=#000000\n" +
- "[xin_1] \nfile=" + filePathField.getText() + "\nmode=0 \nbgcolor=#000000";
- fileWriter.write(output);
- applyType = 2;
- //VIDEO
- } else {
- output = "xwinwrap -ov -g " + resolution + " -st -sp -b -nf -s -ni -- mplayer -wid WID -really-quiet -nosound -loop 0 " + filePathField.getText();
- fileWriter.write(output);
- applyType = 1;
- }
- fileWriter.close();
- }
-
- // Run changes
- @FXML void applySttngs(ActionEvent event) throws Exception {
- pb = Runtime.getRuntime().exec("killall xwinwrap &");
- if (applyType == 1) {
- pb = Runtime.getRuntime().exec(startScrpt);
- pb.waitFor();
- } else if (applyType == 2) {
- pb = Runtime.getRuntime().exec("nitrogen --restore");
- pb.waitFor();
- } else
- pb = Runtime.getRuntime().exec("nitrogen --restore");
- pb.waitFor();
- }
- // Clean selection to start new search.
- @FXML void clearBttnClick(ActionEvent event) {
- tilePane.getChildren().clear();
- tilePane.getChildren().addAll(dirLbl);
- dirPathField.setText("");
- filePathField.setText("");
- }
- // Closes program
- @FXML void closeProg(ActionEvent event) { System.exit(0); }
-}
diff --git a/java/src/versions/v0.0.3/XWWMenu.java b/java/src/versions/v0.0.3/XWWMenu.java
deleted file mode 100644
index 0bc8f28..0000000
--- a/java/src/versions/v0.0.3/XWWMenu.java
+++ /dev/null
@@ -1,23 +0,0 @@
-import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
-import javafx.stage.Stage;
-import javafx.scene.Scene;
-import javafx.scene.layout.AnchorPane;
-
-
-
-public class XWWMenu extends Application {
- @Override
- public void start(final Stage stage) throws Exception {
- Scene scene = new Scene(FXMLLoader.load(XWWMenu.class.getResource("resources/Window.fxml")));
- scene.getStylesheets().add("resources/stylesheet.css");
- stage.setScene(scene);
- //stage.setResizable(false); // keeps window from resizing
- stage.setTitle("FXWinWrap");
- stage.setMinWidth(800);
- stage.setMinHeight(600);
- stage.show();
- }
- // needed because you know... it's java.
- public static void main(String[] args) { launch(args); }
-}
diff --git a/java/src/versions/v0.0.3/clean.sh b/java/src/versions/v0.0.3/clean.sh
deleted file mode 100755
index 4f850d5..0000000
--- a/java/src/versions/v0.0.3/clean.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-rm *.class
diff --git a/java/src/versions/v0.0.3/fxwinwrap_exec_bin.cpp b/java/src/versions/v0.0.3/fxwinwrap_exec_bin.cpp
deleted file mode 100644
index 4ea961e..0000000
--- a/java/src/versions/v0.0.3/fxwinwrap_exec_bin.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include
-#include
-#include
-using namespace std;
-
-int main() {
- chdir("/opt/FXWinWrap/");
- system("bash launch.sh");
-return 0;
-}
diff --git a/java/src/versions/v0.0.3/launch.sh b/java/src/versions/v0.0.3/launch.sh
deleted file mode 100755
index c9fead3..0000000
--- a/java/src/versions/v0.0.3/launch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-java XWWMenu
diff --git a/java/src/versions/v0.0.3/resources/Window.fxml b/java/src/versions/v0.0.3/resources/Window.fxml
deleted file mode 100644
index 0bcb4f6..0000000
--- a/java/src/versions/v0.0.3/resources/Window.fxml
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/src/versions/v0.0.3/resources/bin/InstallFFMPEGTHUMB.sh b/java/src/versions/v0.0.3/resources/bin/InstallFFMPEGTHUMB.sh
deleted file mode 100755
index ca173f9..0000000
--- a/java/src/versions/v0.0.3/resources/bin/InstallFFMPEGTHUMB.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-
-function main() {
- notify-send -u critical "You need to install ffmpegthumbnailer to have FXWinWrap work properly..."
- xterm -e sudo apt install ffmpegthumbnailer
-}
-main;
diff --git a/java/src/versions/v0.0.3/resources/bin/StartXWW.sh b/java/src/versions/v0.0.3/resources/bin/StartXWW.sh
deleted file mode 100755
index e81bcac..0000000
--- a/java/src/versions/v0.0.3/resources/bin/StartXWW.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-### nohup is needed to keep child processes alive from java's
-nohup bash ~/.animatedBGstarter.sh &> /dev/null &
-nohup bash ~/.animatedBGstarter2.sh &> /dev/null &
diff --git a/java/src/versions/v0.0.3/resources/fxwinwrap.png b/java/src/versions/v0.0.3/resources/fxwinwrap.png
deleted file mode 100644
index cdd708d..0000000
Binary files a/java/src/versions/v0.0.3/resources/fxwinwrap.png and /dev/null differ
diff --git a/java/src/versions/v0.0.3/resources/stylesheet.css b/java/src/versions/v0.0.3/resources/stylesheet.css
deleted file mode 100644
index cf3a3b2..0000000
--- a/java/src/versions/v0.0.3/resources/stylesheet.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.root {
- -fx-background: rgba(68, 68, 68, 0.8); // == #444444;
-}
-.button {
-}
diff --git a/java/src/versions/v0.0.4/Controller.java b/java/src/versions/v0.0.4/Controller.java
deleted file mode 100644
index 964616f..0000000
--- a/java/src/versions/v0.0.4/Controller.java
+++ /dev/null
@@ -1,250 +0,0 @@
-import javafx.stage.Stage;
-import javafx.stage.DirectoryChooser;
-import javafx.scene.Scene;
-import javafx.fxml.FXML;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.TilePane;
-import javafx.scene.control.*;
-import javafx.event.ActionEvent;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.MouseEvent;
-import javafx.geometry.Insets;
-import javafx.concurrent.Task;
-import javafx.application.Platform;
-
-import java.io.File;
-import java.io.UncheckedIOException;
-import java.io.IOException;
-import java.io.FileWriter;
-
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-
-
-public class Controller {
- private DirectoryChooser folderChooser = new DirectoryChooser(); // Selects a dir
- 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
- private String tmpPath, resolution, xScreenVal, output, textAreaPth = "",
- startScrpt = System.getProperty("user.dir") + "/resources/bin/StartXWW.sh"; // Gets shell that starts stuff local
- private int applyType = 1;
- private Stage fileChooserStage;
- @FXML private ListView selXScreenSvr;
- @FXML private Label dirLbl; // Labels
- @FXML private TilePane tilePane;
- @FXML private TextField dirPathField, filePathField; // Text fields
- @FXML private CheckBox useXSvrn; // Check boxes
- @FXML private ChoiceBox playbackResolution, setMonPosOffset, listSaveLoc; // Choice box fields
- @FXML private Button applyBttn, closeBttn, fileBttn, clear, killBttn, saveBttn; // Buttons
-
- @FXML void initialize() throws Exception {
- assert dirPathField != null : "fx:id=\"dirPathField\" was not injected: check your FXML file 'Window.fxml'.";
- assert clear != null : "fx:id=\"clear\" was not injected: check your FXML file 'Window.fxml'.";
- assert filePathField != null : "fx:id=\"filePathField\" was not injected: check your FXML file 'Window.fxml'.";
- assert tilePane != null : "fx:id=\"tilePane\" was not injected: check your FXML file 'Window.fxml'.";
- assert dirLbl != null : "fx:id=\"dirLbl\" was not injected: check your FXML file 'Window.fxml'.";
- assert selXScreenSvr != null : "fx:id=\"selXScreenSvr\" was not injected: check your FXML file 'Window.fxml'.";
- assert closeBttn != null : "fx:id=\"closeBttn\" was not injected: check your FXML file 'Window.fxml'.";
- assert listSaveLoc != null : "fx:id=\"listSaveLoc\" was not injected: check your FXML file 'Window.fxml'.";
- assert setMonPosOffset != null : "fx:id=\"setMonPosOffset\" was not injected: check your FXML file 'Window.fxml'.";
- assert playbackResolution != null : "fx:id=\"playbackResolution\" was not injected: check your FXML file 'Window.fxml'.";
- assert useXSvrn != null : "fx:id=\"useXSvrn\" was not injected: check your FXML file 'Window.fxml'.";
- }
-
- @FXML void setNewDir(MouseEvent event) { newDir(); }
- @FXML void onEnter(KeyEvent event) {
- if (event.getCode().equals(KeyCode.ENTER)) {
- textAreaPth = dirPathField.getText();
- System.out.println(textAreaPth);
- newDir();
- } else {}
- }
-
- // Scan selected dir
- public void newDir() {
- tilePane.getChildren().clear();
- Stage stage = new Stage();
- if (textAreaPth != "")
- directory = new File(textAreaPth);
- else {
- directory = folderChooser.showDialog(stage);
-
- if (directory != null) {
- System.out.println("Directory: " + directory);
- }
- }
-
- fileList = directory.listFiles();
- 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();
- try {
- pb = Runtime.getRuntime().exec(vExec);
- } catch(IOException vidIOErr) {
- throw new UncheckedIOException(vidIOErr);
- }
- }
- filePathField.setText(path);
- });
- } else if(tmpP.toLowerCase().matches("^.*?(png|jpg|jpeg|gif).*$")) {
- ImageView view = (ImageView) (tilePane.getChildren().get(i));
- String title = "file://" + fileList[i];
- pth = new Image(title);
-
- Platform.runLater(new Runnable() {
- @Override public void run() { view.setImage(pth); }
- });
-
- final ImageView imgViewPoped = new ImageView(title);
- // image click actions
- view.setOnMouseClicked(mouse -> {
- if (mouse.getClickCount() == 2 && !mouse.isConsumed()) {
- mouse.consume();
- displayImg(imgViewPoped, title);
- }
- filePathField.setText(path);
- });
- } else { System.out.println("Not a video or image file."); }
- }
- }
- // Open image in new window
- public void displayImg(ImageView imgViewPoped, String title) {
- Stage popOut = new Stage();
- Pane pane = new Pane();
- imgViewPoped.setLayoutX(0);
- imgViewPoped.setLayoutY(0);
- imgViewPoped.fitWidthProperty().bind(pane.widthProperty());
- imgViewPoped.fitHeightProperty().bind(pane.heightProperty());
- pane.getChildren().add(imgViewPoped);
- Scene scene = new Scene(pane, 1280, 900);
- popOut.setTitle(title);
- popOut.setScene(scene);
- popOut.show();
- }
-
- @FXML void toggleXscreenUsageField(MouseEvent event) {
- if (useXSvrn.isSelected() == true)
- selXScreenSvr.setDisable(false);
- else if (useXSvrn.isSelected() == false)
- selXScreenSvr.setDisable(true);
- }
-
- // Kill xwinwrap process
- @FXML void killXWinWrp(ActionEvent event) throws Exception {
- pb = Runtime.getRuntime().exec("killall xwinwrap &");
- pb.waitFor();
- }
-
- // Pass resolution values
- @FXML void passXScreenVal() {
- xScreenVal = "" + selXScreenSvr.getSelectionModel().getSelectedItem();
- }
- // Preliminary setup to save settings to files
- @FXML void saveToFile(ActionEvent saveEvent) throws Exception {
- // Saves to file with selected and needed settings
- if(filePathField.getText().toLowerCase().matches("^.*?(png|jpg|jpeg|gif).*$"))
- sveFileLoc = new File(System.getProperty("user.home") + "/" + ".config/nitrogen/bg-saved.cfg");
- else
- sveFileLoc = new File(System.getProperty("user.home") + "/" + listSaveLoc.getValue());
-
- fileWriter = new FileWriter(sveFileLoc);
- resolution = "" + playbackResolution.getValue() + "" + setMonPosOffset.getValue();
- startSave();
- }
- // Save settings to files
- void startSave() throws Exception {
- // XSCREENSAVER
- if (useXSvrn.isSelected() == true) {
- output = "xwinwrap -ov -g " + resolution + " -st -sp -b -nf -s -ni -- /usr/lib/xscreensaver/" + xScreenVal + " -window-id WID -root";
- fileWriter.write(output);
- applyType = 1;
- // GIF
- } else if (filePathField.getText().toLowerCase().contains(".gif")) {
- output = "xwinwrap -ov -g " + resolution + " -st -sp -b -nf -s -ni -- gifview -a -w WID " + filePathField.getText();
- fileWriter.write(output);
- applyType = 1;
- // Standard images using nitrogen
- } else if(filePathField.getText().toLowerCase().contains(".jpg") ||
- filePathField.getText().toLowerCase().contains(".png")) {
- output = "[xin_0] \n file=" + filePathField.getText() + "\nmode=0 \nbgcolor=#000000\n" +
- "[xin_1] \nfile=" + filePathField.getText() + "\nmode=0 \nbgcolor=#000000";
- fileWriter.write(output);
- applyType = 2;
- //VIDEO
- } else {
- output = "xwinwrap -ov -g " + resolution + " -st -sp -b -nf -s -ni -- mplayer -wid WID -really-quiet -ao null -loop 0 " + filePathField.getText();
- fileWriter.write(output);
- applyType = 1;
- }
- fileWriter.close();
- }
-
- // Run changes
- @FXML void applySttngs(ActionEvent event) throws Exception {
- pb = Runtime.getRuntime().exec("killall xwinwrap &");
- if (applyType == 1) {
- pb = Runtime.getRuntime().exec(startScrpt);
- pb.waitFor();
- } else if (applyType == 2) {
- pb = Runtime.getRuntime().exec("nitrogen --restore");
- pb.waitFor();
- } else
- pb = Runtime.getRuntime().exec("nitrogen --restore");
- pb.waitFor();
- }
- // Clean selection to start new search.
- @FXML void clearBttnClick(ActionEvent event) {
- tilePane.getChildren().clear();
- tilePane.getChildren().addAll(dirLbl);
- dirPathField.setText("");
- filePathField.setText("");
- }
- // Closes program
- @FXML void closeProg(ActionEvent event) { System.exit(0); }
-}
diff --git a/java/src/versions/v0.0.4/XWWMenu.java b/java/src/versions/v0.0.4/XWWMenu.java
deleted file mode 100644
index 78afb9b..0000000
--- a/java/src/versions/v0.0.4/XWWMenu.java
+++ /dev/null
@@ -1,21 +0,0 @@
-import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
-import javafx.stage.Stage;
-import javafx.scene.Scene;
-import javafx.scene.layout.AnchorPane;
-
-
-public class XWWMenu extends Application {
- @Override
- public void start(final Stage stage) throws Exception {
- Scene scene = new Scene(FXMLLoader.load(XWWMenu.class.getResource("resources/Window.fxml")));
- scene.getStylesheets().add("resources/stylesheet.css");
- stage.setScene(scene);
- stage.setTitle("FXWinWrap");
- stage.setMinWidth(800);
- stage.setMinHeight(600);
- stage.show();
- }
- // needed because you know... it's java.
- public static void main(String[] args) { launch(args); }
-}
diff --git a/java/src/versions/v0.0.4/clean.sh b/java/src/versions/v0.0.4/clean.sh
deleted file mode 100755
index 4f850d5..0000000
--- a/java/src/versions/v0.0.4/clean.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-rm *.class
diff --git a/java/src/versions/v0.0.4/fxwinwrap_exec_bin.cpp b/java/src/versions/v0.0.4/fxwinwrap_exec_bin.cpp
deleted file mode 100644
index 4ea961e..0000000
--- a/java/src/versions/v0.0.4/fxwinwrap_exec_bin.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include
-#include
-#include
-using namespace std;
-
-int main() {
- chdir("/opt/FXWinWrap/");
- system("bash launch.sh");
-return 0;
-}
diff --git a/java/src/versions/v0.0.4/launch.sh b/java/src/versions/v0.0.4/launch.sh
deleted file mode 100755
index c9fead3..0000000
--- a/java/src/versions/v0.0.4/launch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-java XWWMenu
diff --git a/java/src/versions/v0.0.4/resources/Window.fxml b/java/src/versions/v0.0.4/resources/Window.fxml
deleted file mode 100644
index de9652b..0000000
--- a/java/src/versions/v0.0.4/resources/Window.fxml
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/src/versions/v0.0.4/resources/bin/InstallFFMPEGTHUMB.sh b/java/src/versions/v0.0.4/resources/bin/InstallFFMPEGTHUMB.sh
deleted file mode 100755
index ca173f9..0000000
--- a/java/src/versions/v0.0.4/resources/bin/InstallFFMPEGTHUMB.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-
-function main() {
- notify-send -u critical "You need to install ffmpegthumbnailer to have FXWinWrap work properly..."
- xterm -e sudo apt install ffmpegthumbnailer
-}
-main;
diff --git a/java/src/versions/v0.0.4/resources/bin/StartXWW.sh b/java/src/versions/v0.0.4/resources/bin/StartXWW.sh
deleted file mode 100755
index e81bcac..0000000
--- a/java/src/versions/v0.0.4/resources/bin/StartXWW.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-### nohup is needed to keep child processes alive from java's
-nohup bash ~/.animatedBGstarter.sh &> /dev/null &
-nohup bash ~/.animatedBGstarter2.sh &> /dev/null &
diff --git a/java/src/versions/v0.0.4/resources/fxwinwrap.png b/java/src/versions/v0.0.4/resources/fxwinwrap.png
deleted file mode 100644
index cdd708d..0000000
Binary files a/java/src/versions/v0.0.4/resources/fxwinwrap.png and /dev/null differ
diff --git a/java/src/versions/v0.0.4/resources/stylesheet.css b/java/src/versions/v0.0.4/resources/stylesheet.css
deleted file mode 100644
index cf3a3b2..0000000
--- a/java/src/versions/v0.0.4/resources/stylesheet.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.root {
- -fx-background: rgba(68, 68, 68, 0.8); // == #444444;
-}
-.button {
-}
diff --git a/java/src/versions/v0.0.5/FXWinWrap/buildJar.sh b/java/src/versions/v0.0.5/FXWinWrap/buildJar.sh
deleted file mode 100755
index 03b8737..0000000
--- a/java/src/versions/v0.0.5/FXWinWrap/buildJar.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-function main() {
- jar cvfm FXWinWrap.jar manifest.txt com/itdominator/fxwinwrap/*.class \
- com/itdominator/fxwinwrap/resources
- chmod +x FXWinWrap.jar
- mv FXWinWrap.jar ../
-}
-main;
diff --git a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/Controller$1.class b/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/Controller$1.class
deleted file mode 100644
index 8cd898c..0000000
Binary files a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/Controller$1.class and /dev/null differ
diff --git a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/Controller$2.class b/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/Controller$2.class
deleted file mode 100644
index 2318468..0000000
Binary files a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/Controller$2.class and /dev/null differ
diff --git a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/Controller$3.class b/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/Controller$3.class
deleted file mode 100644
index 0d8fb79..0000000
Binary files a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/Controller$3.class and /dev/null differ
diff --git a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/Controller.class b/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/Controller.class
deleted file mode 100644
index 8d15d73..0000000
Binary files a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/Controller.class and /dev/null differ
diff --git a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/FXWinWrap.class b/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/FXWinWrap.class
deleted file mode 100644
index 095061d..0000000
Binary files a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/FXWinWrap.class and /dev/null differ
diff --git a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/resources/FXWinWrap.fxml b/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/resources/FXWinWrap.fxml
deleted file mode 100644
index c511502..0000000
--- a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/resources/FXWinWrap.fxml
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/resources/FXWinWrap.png b/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/resources/FXWinWrap.png
deleted file mode 100644
index cdd708d..0000000
Binary files a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/resources/FXWinWrap.png and /dev/null differ
diff --git a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/resources/bin/StartXWW.sh b/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/resources/bin/StartXWW.sh
deleted file mode 100755
index e81bcac..0000000
--- a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/resources/bin/StartXWW.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-### nohup is needed to keep child processes alive from java's
-nohup bash ~/.animatedBGstarter.sh &> /dev/null &
-nohup bash ~/.animatedBGstarter2.sh &> /dev/null &
diff --git a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/resources/stylesheet.css b/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/resources/stylesheet.css
deleted file mode 100644
index cf3a3b2..0000000
--- a/java/src/versions/v0.0.5/FXWinWrap/com/itdominator/fxwinwrap/resources/stylesheet.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.root {
- -fx-background: rgba(68, 68, 68, 0.8); // == #444444;
-}
-.button {
-}
diff --git a/java/src/versions/v0.0.5/FXWinWrap/manifest.txt b/java/src/versions/v0.0.5/FXWinWrap/manifest.txt
deleted file mode 100644
index b3e8cca..0000000
--- a/java/src/versions/v0.0.5/FXWinWrap/manifest.txt
+++ /dev/null
@@ -1 +0,0 @@
-Main-Class: com.itdominator.fxwinwrap.FXWinWrap
diff --git a/java/src/versions/v0.0.5/FXWinWrap/src/Controller.java b/java/src/versions/v0.0.5/FXWinWrap/src/Controller.java
deleted file mode 100644
index fdf4d39..0000000
--- a/java/src/versions/v0.0.5/FXWinWrap/src/Controller.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package com.itdominator.fxwinwrap;
-
-import javafx.stage.Stage;
-import javafx.stage.DirectoryChooser;
-import javafx.scene.Scene;
-import javafx.fxml.FXML;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.TilePane;
-import javafx.scene.control.*;
-import javafx.event.ActionEvent;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.MouseEvent;
-import javafx.geometry.Insets;
-import javafx.concurrent.Task;
-import javafx.application.Platform;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.BufferedReader;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-
-
-public class Controller {
- // Classes
-
- // FXML Stuff
- @FXML private ListView selXScreenSvr;
- @FXML private Label dirLbl;
- @FXML private TilePane tilePane;
- @FXML private TextField dirPathField, filePathField;
- @FXML private CheckBox useXSvrn;
- @FXML private ChoiceBox playbackResolution, setMonPosOffset, listSaveLoc;
- @FXML private Button applyBttn, closeBttn, fileBttn, clear, killBttn, saveBttn;
-
- // Generics
- private DirectoryChooser folderChooser = new DirectoryChooser();
- private FileWriter fileWriter;
- private File tempShFile, directory, sveFileLoc;
- private File[] fileList;
- private Image pth; // Path to image
- private ImageView imgView = new ImageView(pth);
- private Process pb; // Process runner
- private Stage fileChooserStage;
- private String tmpPath, resolution, xScreenVal, output, textAreaPth = "";
- private int applyType = 1;
-
- @FXML void initialize() throws Exception {
- assert dirPathField != null : "fx:id=\"dirPathField\" was not injected: check your FXML file 'Window.fxml'.";
- assert clear != null : "fx:id=\"clear\" was not injected: check your FXML file 'Window.fxml'.";
- assert filePathField != null : "fx:id=\"filePathField\" was not injected: check your FXML file 'Window.fxml'.";
- assert tilePane != null : "fx:id=\"tilePane\" was not injected: check your FXML file 'Window.fxml'.";
- assert dirLbl != null : "fx:id=\"dirLbl\" was not injected: check your FXML file 'Window.fxml'.";
- assert selXScreenSvr != null : "fx:id=\"selXScreenSvr\" was not injected: check your FXML file 'Window.fxml'.";
- assert closeBttn != null : "fx:id=\"closeBttn\" was not injected: check your FXML file 'Window.fxml'.";
- assert listSaveLoc != null : "fx:id=\"listSaveLoc\" was not injected: check your FXML file 'Window.fxml'.";
- assert setMonPosOffset != null : "fx:id=\"setMonPosOffset\" was not injected: check your FXML file 'Window.fxml'.";
- assert playbackResolution != null : "fx:id=\"playbackResolution\" was not injected: check your FXML file 'Window.fxml'.";
- assert useXSvrn != null : "fx:id=\"useXSvrn\" was not injected: check your FXML file 'Window.fxml'.";
-
- try {
- tempShFile = File.createTempFile("StartXWW", ".sh", new File("/tmp/"));
- tempShFile.setExecutable(true, true);
- tempShFile.deleteOnExit();
-
- FileWriter fileWriter = new FileWriter(tempShFile);
- InputStream in = getClass().getResourceAsStream("resources/bin/StartXWW.sh");
- BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(in));
- String line = "";
-
- while((line = bufferedReader.readLine()) != null) {
- fileWriter.write(line + "\n");
- }
-
- // Always close files.
- fileWriter.close();
- in.close();
- bufferedReader.close();
- } catch (Exception e) { }
- }
-
- @FXML void setNewDir(MouseEvent event) { newDir(); }
- @FXML void onEnter(KeyEvent event) {
- if (event.getCode().equals(KeyCode.ENTER)) {
- textAreaPth = dirPathField.getText();
- newDir();
- } else {}
- }
-
- // Scan selected dir
- public void newDir() {
- tilePane.getChildren().clear();
- Stage stage = new Stage();
- if (textAreaPth != "")
- directory = new File(textAreaPth);
- else {
- directory = folderChooser.showDialog(stage);
- }
-
- fileList = directory.listFiles();
- 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();
- try {
- pb = Runtime.getRuntime().exec(vExec);
- } catch(IOException vidIOErr) {
- throw new UncheckedIOException(vidIOErr);
- }
- }
- filePathField.setText(path);
- });
- } else if(tmpP.toLowerCase().matches("^.*?(png|jpg|jpeg|gif).*$")) {
- ImageView view = (ImageView) (tilePane.getChildren().get(i));
- String title = "file://" + fileList[i];
- pth = new Image(title);
-
- Platform.runLater(new Runnable() {
- @Override public void run() { view.setImage(pth); }
- });
-
- final ImageView imgViewPoped = new ImageView(title);
- // image click actions
- view.setOnMouseClicked(mouse -> {
- if (mouse.getClickCount() == 2 && !mouse.isConsumed()) {
- mouse.consume();
- displayImg(imgViewPoped, title);
- }
- filePathField.setText(path);
- });
- } else { System.out.println("Not a video or image file."); }
- }
- }
- // Open image in new window
- public void displayImg(ImageView imgViewPoped, String title) {
- Stage popOut = new Stage();
- Pane pane = new Pane();
- Scene scene = new Scene(pane, 1280, 900);
- imgViewPoped.setLayoutX(0);
- imgViewPoped.setLayoutY(0);
- imgViewPoped.fitWidthProperty().bind(pane.widthProperty());
- imgViewPoped.fitHeightProperty().bind(pane.heightProperty());
- pane.getChildren().add(imgViewPoped);
- popOut.setTitle(title);
- popOut.setScene(scene);
- popOut.show();
- }
-
- @FXML void toggleXscreenUsageField(MouseEvent event) {
- if (useXSvrn.isSelected() == true)
- selXScreenSvr.setDisable(false);
- else if (useXSvrn.isSelected() == false)
- selXScreenSvr.setDisable(true);
- }
-
- // Kill xwinwrap process
- @FXML void killXWinWrp(ActionEvent event) throws Exception {
- pb = Runtime.getRuntime().exec("killall xwinwrap &");
- pb.waitFor();
- }
-
- // Pass resolution values
- @FXML void passXScreenVal() {
- xScreenVal = "" + selXScreenSvr.getSelectionModel().getSelectedItem();
- }
- // Preliminary setup to save settings to files
- @FXML void saveToFile(ActionEvent saveEvent) throws Exception {
- // Saves to file with selected and needed settings
- if(filePathField.getText().toLowerCase().matches("^.*?(png|jpg|jpeg|gif).*$"))
- sveFileLoc = new File(System.getProperty("user.home") + "/" + ".config/nitrogen/bg-saved.cfg");
- else
- sveFileLoc = new File(System.getProperty("user.home") + "/" + listSaveLoc.getValue());
-
- fileWriter = new FileWriter(sveFileLoc);
- resolution = "" + playbackResolution.getValue() + "" + setMonPosOffset.getValue();
- startSave();
- }
- // Save settings to files
- void startSave() throws Exception {
- // XSCREENSAVER
- if (useXSvrn.isSelected() == true) {
- output = "xwinwrap -ov -g " + resolution + " -st -sp -b -nf -s -ni -- /usr/lib/xscreensaver/" + xScreenVal + " -window-id WID -root";
- fileWriter.write(output);
- applyType = 1;
- // GIF
- } else if (filePathField.getText().toLowerCase().contains(".gif")) {
- output = "xwinwrap -ov -g " + resolution + " -st -sp -b -nf -s -ni -- gifview -a -w WID " + filePathField.getText();
- fileWriter.write(output);
- applyType = 1;
- // Standard images using nitrogen
- } else if(filePathField.getText().toLowerCase().contains(".jpg") ||
- filePathField.getText().toLowerCase().contains(".png")) {
- output = "[xin_0] \n file=" + filePathField.getText() + "\nmode=0 \nbgcolor=#000000\n" +
- "[xin_1] \nfile=" + filePathField.getText() + "\nmode=0 \nbgcolor=#000000";
- fileWriter.write(output);
- applyType = 2;
- //VIDEO
- } else {
- output = "xwinwrap -ov -g " + resolution + " -st -sp -b -nf -s -ni -- mplayer -wid WID -really-quiet -ao null -loop 0 " + filePathField.getText();
- fileWriter.write(output);
- applyType = 1;
- }
- fileWriter.close();
- }
-
- // Run changes
- @FXML void applySttngs(ActionEvent event) throws Exception {
- pb = Runtime.getRuntime().exec("killall xwinwrap &");
- if (applyType == 1) {
- pb = Runtime.getRuntime().exec("bash -c '" + tempShFile.toString() + "'");
- pb.waitFor();
- } else if (applyType == 2) {
- pb = Runtime.getRuntime().exec("nitrogen --restore");
- pb.waitFor();
- } else
- pb = Runtime.getRuntime().exec("nitrogen --restore");
- pb.waitFor();
- }
-
- // Clean selection to start new search.
- @FXML void clearBttnClick(ActionEvent event) {
- tilePane.getChildren().clear();
- tilePane.getChildren().addAll(dirLbl);
- dirPathField.setText("");
- filePathField.setText("");
- }
-
- // Closes program
- @FXML void closeProg(ActionEvent event) { System.exit(0); }
-}
diff --git a/java/src/versions/v0.0.5/FXWinWrap/src/FXWinWrap.java b/java/src/versions/v0.0.5/FXWinWrap/src/FXWinWrap.java
deleted file mode 100644
index 3f05931..0000000
--- a/java/src/versions/v0.0.5/FXWinWrap/src/FXWinWrap.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.itdominator.fxwinwrap;
-
-import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
-import javafx.stage.Stage;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-
-import java.util.logging.Level;
-import java.io.IOException;
-
-
-public class FXWinWrap extends Application {
- // Classes
-
- @Override public void start(Stage stage) {
- try {
- FXMLLoader loader = new FXMLLoader(getClass().getResource("resources/FXWinWrap.fxml"));
- loader.setController(new Controller());
- loader.load();
- Scene scene = new Scene(loader.getRoot());
- scene.getStylesheets().add("/com/itdominator/fxwinwrap/resources/stylesheet.css");
- stage.setTitle("FXWinWrap");
- stage.setScene(scene);
- } catch (IOException startException) {
- String message = "\nFXWinWrap Failed to launch...\n";
- System.out.println(message + startException);
- }
- stage.getIcons().add(new Image(FXWinWrap.class.getResourceAsStream("resources/FXWinWrap.png")));
- stage.setResizable(true);
- stage.show();
- }
- public static void main(String[] args) { launch(args); }
-}
diff --git a/java/src/versions/v0.0.5/FXWinWrap/src/unix_compile.sh b/java/src/versions/v0.0.5/FXWinWrap/src/unix_compile.sh
deleted file mode 100755
index 1ff8c1c..0000000
--- a/java/src/versions/v0.0.5/FXWinWrap/src/unix_compile.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# -Xlint:unchecked
-function main() {
- javac *.java
- rm ../com/itdominator/fxwinwrap/*.class
- mv *.class ../com/itdominator/fxwinwrap/
-}
-main;
diff --git a/java/src/versions/v0.0.5/XWinWrap/Makefile b/java/src/versions/v0.0.5/XWinWrap/Makefile
deleted file mode 100644
index f5d3b31..0000000
--- a/java/src/versions/v0.0.5/XWinWrap/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-all: all64 all32
-
-all64:
- gcc -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -lX11 -lXext -lXrender xwinwrap.c -o xwinwrap
- -mkdir x86_64
- mv ./xwinwrap ./x86_64
-
-all32:
- gcc -m32 -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -lX11 -lXext -lXrender xwinwrap.c -o xwinwrap
- -mkdir i386
- mv ./xwinwrap ./i386
-
-install64:
- cp x86_64/xwinwrap /usr/bin
-
-install32:
- cp i386/xwinwrap /usr/bin
-
-clean:
- -rm -rf x86_64/ i386/
-
-
diff --git a/java/src/versions/v0.0.5/XWinWrap/xwinwrap.c b/java/src/versions/v0.0.5/XWinWrap/xwinwrap.c
deleted file mode 100644
index 5167663..0000000
--- a/java/src/versions/v0.0.5/XWinWrap/xwinwrap.c
+++ /dev/null
@@ -1,459 +0,0 @@
-/*
- * Copyright © 2005 Novell, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Novell, Inc. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Novell, Inc. makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: David Reveman
- */
-
-/*
- * Modified by: Shantanu Goel
- * Tech Blog: http://tech.shantanugoel.com
- * Blog: http://blog.shantanugoel.com
- * Home Page: http://tech.shantanugoel.com/projects/linux/shantz-xwinwrap
- *
- * Changelog:
- * 15-Jan-09: 1. Fixed the bug where XFetchName returning a NULL for "name"
- * resulted in a crash.
- * 2. Provided an option to specify the desktop window name.
- * 3. Added debug messages
- *
- * 24-Aug-08: 1. Fixed the geometry option (-g) so that it works
- * 2. Added override option (-ov), for seamless integration with
- * desktop like a background in non-fullscreen modes
- * 3. Added shape option (-sh), to create non-rectangular windows.
- * Currently supporting circlular and triangular windows
- */
-
- /*
- * Modified by: Maxim Stewart
- * Tech Blog: https://www.itdominator.com/
- *
- * Changelog:
- * 3-March-19: 1. Cleaned up code formatting.
- * 2. Removed unused DEBUG_MSG reference.
- * 3. Moved functions to a more reasonable order.
- * 4. Compile dev library list 32 & 64 bit:
- * # 32
- * sudo apt install libxext-dev:i386 libxrender-dev:i386 libc6-dev-i386
- *
- * # 64
- * sudo apt install libxext-dev libxrender-dev libc6-dev
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#define WIDTH 512
-#define HEIGHT 384
-#define OPAQUE 0xffffffff
-#define NAME "xwinwrap"
-#define VERSION "0.3"
-#define DESKTOP_WINDOW_NAME_MAX_SIZE 25
-#define DEFAULT_DESKTOP_WINDOW_NAME "Desktop"
-#define DEBUG_MSG(x) if(debug) { fprintf(stderr, x); }
-
-typedef enum {
- SHAPE_RECT = 0,
- SHAPE_CIRCLE,
- SHAPE_TRIG,
-} win_shape;
-
-static pid_t pid = 0;
-static char **childArgv = 0;
-static int nChildArgv = 0;
-int debug = 0;
-char desktop_window_name[DESKTOP_WINDOW_NAME_MAX_SIZE];
-
-static int addArguments(char **argv, int n) {
- char **newArgv;
- int i;
-
- newArgv = realloc (childArgv, sizeof (char *) * (nChildArgv + n));
- if (!newArgv)
- return 0;
-
- for (i = 0; i < n; i++)
- newArgv[nChildArgv + i] = argv[i];
-
- childArgv = newArgv;
- nChildArgv += n;
-
- return n;
-}
-
-static void setWindowOpacity(Display *dpy, Window win, unsigned int opacity) {
- CARD32 o;
- o = opacity;
- XChangeProperty (dpy, win, XInternAtom (dpy, "_NET_WM_WINDOW_OPACITY", 0),
- XA_CARDINAL, 32, PropModeReplace,
- (unsigned char *) &o, 1);
-}
-
-static Visual * findArgbVisual(Display *dpy, int scr) {
- XVisualInfo *xvi;
- XVisualInfo template;
- int nvi;
- int i;
- XRenderPictFormat *format;
- Visual *visual;
-
- template.screen = scr;
- template.depth = 32;
- template.class = TrueColor;
-
- xvi = XGetVisualInfo (dpy,
- VisualScreenMask |
- VisualDepthMask |
- VisualClassMask,
- &template,
- &nvi);
-
- if (!xvi)
- return 0;
-
- visual = 0;
- for (i = 0; i < nvi; i++) {
- format = XRenderFindVisualFormat (dpy, xvi[i].visual);
- if (format->type == PictTypeDirect && format->direct.alphaMask) {
- visual = xvi[i].visual;
- break;
- }
- }
-
- XFree (xvi);
- return visual;
-}
-
-static Window find_desktop_window(Display *display, int screen,
- Window *root, Window *p_desktop) {
- int i;
- unsigned int n;
- Window win = *root;
- Window troot, parent, *children;
- char *name;
- int status;
- int width = DisplayWidth(display, screen);
- int height = DisplayHeight(display, screen);
- XWindowAttributes attrs;
-
- XQueryTree(display, *root, &troot, &parent, &children, &n);
- for (i = 0; i < (int) n; i++) {
- status = XFetchName(display, children[i], &name);
- status |= XGetWindowAttributes(display, children[i], &attrs);
-
- if ((status != 0) && (NULL != name)) {
- if( (attrs.map_state != 0) && (attrs.width == width) &&
- (attrs.height == height) && (!strcmp(name, desktop_window_name)) ) {
- win = children[i];
- XFree(children);
- XFree(name);
- *p_desktop = win;
- return win;
- }
-
- if(name)
- XFree(name);
- }
- }
-
- DEBUG_MSG("Desktop Window Not found\n");
- return 0;
-}
-
-static void usage (void) {
- fprintf(stderr, "%s v%s- Modified by Shantanu Goel. Visit http://tech.shantanugoel.com for updates, queries and feature requests\n", NAME, VERSION);
- fprintf (stderr, "\nUsage: %s [-g {w}x{h}+{x}+{y}] [-ni] [-argb] [-fs] [-s] [-st] [-sp] [-a] "
- "[-b] [-nf] [-o OPACITY] [-sh SHAPE] [-ov]-- COMMAND ARG1...\n", NAME);
- fprintf (stderr, "Options:\n \
- -g - Specify Geometry (w=width, h=height, x=x-coord, y=y-coord. ex: -g 640x480+100+100)\n \
- -ni - Ignore Input\n \
- -d - Desktop Window Hack. Provide name of the \"Desktop\" window as parameter \
- -argb - RGB\n \
- -fs - Full Screen\n \
- -s - Sticky\n \
- -st - Skip Taskbar\n \
- -sp - Skip Pager\n \
- -a - Above\n \
- -b - Below\n \
- -nf - No Focus\n \
- -o - Opacity value between 0 to 1 (ex: -o 0.20)\n \
- -sh - Shape of window (choose between rectangle, circle or triangle. Default is rectangle)\n \
- -ov - Set override_redirect flag (For seamless desktop background integration in non-fullscreenmode)\n \
- -debug - Enable debug messages\n");
-}
-
-static void sigHandler (int sig) { kill(pid, sig); }
-
-int main (int argc, char **argv) {
- Display *dpy;
- Window win;
- Window root;
- Window p_desktop = 0;
- int screen;
- XSizeHints xsh;
- XWMHints xwmh;
- char widArg[256];
- char *widArgv[] = { widArg };
- char *endArg = NULL;
- int i;
- int status = 0;
- unsigned int opacity = OPAQUE;
- int x = 0;
- int y = 0;
- unsigned int width = WIDTH;
- unsigned int height = HEIGHT;
- int argb = 0;
- int fullscreen = 0;
- int noInput = 0;
- int noFocus = 0;
- Atom state[256];
- int nState = 0;
- int override = 0;
- win_shape shape = SHAPE_RECT;
- Pixmap mask;
- GC mask_gc;
- XGCValues xgcv;
-
-
- dpy = XOpenDisplay (NULL);
- if (!dpy) {
- fprintf (stderr, "%s: Error: couldn't open display\n", argv[0]);
- return 1;
- }
-
- screen = DefaultScreen (dpy);
- root = RootWindow (dpy, screen);
- strcpy(desktop_window_name, DEFAULT_DESKTOP_WINDOW_NAME);
-
- for (i = 1; i < argc; i++) {
- if (strcmp(argv[i], "-g") == 0) {
- if (++i < argc)
- XParseGeometry (argv[i], &x, &y, &width, &height);
- } else if (strcmp(argv[i], "-ni") == 0) {
- noInput = 1;
- } else if (strcmp(argv[i], "-d") == 0) {
- ++i;
- strcpy(desktop_window_name, argv[i]);
- } else if (strcmp(argv[i], "-argb") == 0) {
- argb = 1;
- } else if (strcmp(argv[i], "-fs") == 0) {
- state[nState++] = XInternAtom (dpy, "_NET_WM_STATE_FULLSCREEN", 0);
- fullscreen = 1;
- } else if (strcmp(argv[i], "-s") == 0) {
- state[nState++] = XInternAtom (dpy, "_NET_WM_STATE_STICKY", 0);
- } else if (strcmp(argv[i], "-st") == 0) {
- state[nState++] = XInternAtom (dpy, "_NET_WM_STATE_SKIP_TASKBAR", 0);
- } else if (strcmp(argv[i], "-sp") == 0) {
- state[nState++] = XInternAtom (dpy, "_NET_WM_STATE_SKIP_PAGER", 0);
- } else if (strcmp(argv[i], "-a") == 0) {
- state[nState++] = XInternAtom (dpy, "_NET_WM_STATE_ABOVE", 0);
- } else if (strcmp(argv[i], "-b") == 0) {
- state[nState++] = XInternAtom (dpy, "_NET_WM_STATE_BELOW", 0);
- } else if (strcmp(argv[i], "-nf") == 0) {
- noFocus = 1;
- } else if (strcmp(argv[i], "-o") == 0) {
- if (++i < argc)
- opacity = (unsigned int) (atof (argv[i]) * OPAQUE);
- } else if (strcmp(argv[i], "-sh") == 0) {
- if (++i < argc) {
- if(strcasecmp(argv[i], "circle") == 0) {
- shape = SHAPE_CIRCLE;
- } else if(strcasecmp(argv[i], "triangle") == 0) {
- shape = SHAPE_TRIG;
- }
- }
- } else if (strcmp(argv[i], "-ov") == 0) {
- override = 1;
- } else if (strcmp(argv[i], "-debug") == 0) {
- debug = 1;
- } else if (strcmp(argv[i], "--") == 0) {
- break;
- } else {
- usage ();
- return 1;
- }
- }
-
- for (i = i + 1; i < argc; i++) {
- if (strcmp(argv[i], "WID") == 0)
- addArguments (widArgv, 1);
- else
- addArguments (&argv[i], 1);
- }
-
- if (!nChildArgv) {
- fprintf (stderr, "%s: Error: couldn't create command line\n", argv[0]);
- usage ();
- return 1;
- }
-
- addArguments (&endArg, 1);
-
- if (fullscreen) {
- xsh.flags = PSize | PPosition;
- xsh.width = DisplayWidth (dpy, screen);
- xsh.height = DisplayHeight (dpy, screen);
- } else {
- xsh.flags = PSize;
- xsh.width = width;
- xsh.height = height;
- }
-
- xwmh.flags = InputHint;
- xwmh.input = !noFocus;
-
- if (argb) {
- XSetWindowAttributes attr;
- Visual *visual;
-
- visual = findArgbVisual (dpy, screen);
- if (!visual) {
- fprintf (stderr, "%s: Error: couldn't find argb visual\n", argv[0]);
- return 1;
- }
-
- attr.background_pixel = 0;
- attr.border_pixel = 0;
- attr.colormap = XCreateColormap (dpy, root, visual, AllocNone);
-
- win = XCreateWindow (dpy, root, 0, 0, xsh.width, xsh.height, 0, 32,
- InputOutput, visual,
- CWBackPixel | CWBorderPixel | CWColormap, &attr);
- } else {
- XSetWindowAttributes attr;
- attr.override_redirect = override;
-
- if( override && find_desktop_window(dpy, screen, &root, &p_desktop) ) {
- win = XCreateWindow (dpy, p_desktop, x, y, xsh.width, xsh.height, 0,
- CopyFromParent, InputOutput, CopyFromParent,
- CWOverrideRedirect, &attr);
- } else {
- win = XCreateWindow (dpy, root, x, y, xsh.width, xsh.height, 0,
- CopyFromParent, InputOutput, CopyFromParent,
- CWOverrideRedirect, &attr);
- }
- }
-
- XSetWMProperties (dpy, win, NULL, NULL, argv, argc, &xsh, &xwmh, NULL);
-
- if (opacity != OPAQUE)
- setWindowOpacity (dpy, win, opacity);
-
- if (noInput) {
- Region region;
-
- region = XCreateRegion ();
- if (region) {
- XShapeCombineRegion (dpy, win, ShapeInput, 0, 0, region, ShapeSet);
- XDestroyRegion (region);
- }
- }
-
- if (nState)
- XChangeProperty (dpy, win, XInternAtom (dpy, "_NET_WM_STATE", 0),
- XA_ATOM, 32, PropModeReplace, (unsigned char *) state, nState);
-
- if (shape) {
- mask = XCreatePixmap(dpy, win, width, height, 1);
- mask_gc = XCreateGC(dpy, mask, 0, &xgcv);
-
- switch(shape) {
- //Nothing special to be done if it's a rectangle
- case SHAPE_CIRCLE:
- /* fill mask */
- XSetForeground(dpy, mask_gc, 0);
- XFillRectangle(dpy, mask, mask_gc, 0, 0, width, height);
-
- XSetForeground(dpy, mask_gc, 1);
- XFillArc(dpy, mask, mask_gc, 0, 0, width, height, 0, 23040);
- break;
-
- case SHAPE_TRIG:
- {
- XPoint points[3] = { {0, height},
- {width/2, 0},
- {width, height} };
-
- XSetForeground(dpy, mask_gc, 0);
- XFillRectangle(dpy, mask, mask_gc, 0, 0, width, height);
-
- XSetForeground(dpy, mask_gc, 1);
- XFillPolygon(dpy, mask, mask_gc, points, 3, Complex, CoordModeOrigin);
- }
- break;
- default:
- break;
- }
- /* combine */
- XShapeCombineMask(dpy, win, ShapeBounding, 0, 0, mask, ShapeSet);
- }
-
- XMapWindow (dpy, win);
-
- if(p_desktop == 0)
- XLowerWindow(dpy, win);
-
- XSync (dpy, win);
- sprintf (widArg, "0x%x", (int) win);
- pid = fork ();
-
- switch (pid) {
- case -1:
- perror ("fork");
- return 1;
- case 0:
- execvp (childArgv[0], childArgv);
- perror (childArgv[0]);
- exit (2);
- break;
- default:
- break;
- }
-
- signal (SIGTERM, sigHandler);
- signal (SIGINT, sigHandler);
-
- for (;;) {
- if (waitpid (pid, &status, 0) != -1) {
- if (WIFEXITED (status))
- fprintf (stderr, "%s died, exit status %d\n", childArgv[0],
- WEXITSTATUS (status));
- break;
- }
- }
-
- XDestroyWindow (dpy, win);
- XCloseDisplay (dpy);
- return 0;
-}
diff --git a/java/src/versions/v0.0.5/compileBin.sh b/java/src/versions/v0.0.5/compileBin.sh
deleted file mode 100755
index a01b6b1..0000000
--- a/java/src/versions/v0.0.5/compileBin.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-function main() {
- c++ -s fxwinwrap_exec_bin.cpp -o fxwinwrap
-}
-main;
diff --git a/java/src/versions/v0.0.5/fxwinwrap_exec_bin.cpp b/java/src/versions/v0.0.5/fxwinwrap_exec_bin.cpp
deleted file mode 100644
index 4ea961e..0000000
--- a/java/src/versions/v0.0.5/fxwinwrap_exec_bin.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include
-#include
-#include
-using namespace std;
-
-int main() {
- chdir("/opt/FXWinWrap/");
- system("bash launch.sh");
-return 0;
-}
diff --git a/java/src/versions/v0.0.5/launch.sh b/java/src/versions/v0.0.5/launch.sh
deleted file mode 100755
index 5b48d7a..0000000
--- a/java/src/versions/v0.0.5/launch.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-function main() {
- java -Xms32m -Xmx100m -jar FXWinWrap.jar
-}
-main;
diff --git a/python/LICENSE b/python/LICENSE
deleted file mode 100644
index 23cb790..0000000
--- a/python/LICENSE
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- {description}
- Copyright (C) {year} {fullname}
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- {signature of Ty Coon}, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/python/README.md b/python/README.md
deleted file mode 100644
index 7934c52..0000000
--- a/python/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# GWinWrap
-GWinWrap is a Gtk with Python gui to select videos for XWinWrap, images for Nitrogen Wallpaper Manager, and gifs for Gifsicle.
-It includes the XWinWrap binary and source code for Shantanu Goel's version of XWinWrap.
-
-# Notes
-Need python 2+
-
-# Images
-
-
-
-
-
-
-
-# TODO
-Nothing...
-
-# Credit
-GWinWrap python and glade by: Maxim Stewart -- https://www.itdominator.com/
-
-XWinWrap binary by: Shantanu Goel -- http://tech.shantanugoel.com
diff --git a/python/src/debs/chownAll.sh b/python/src/debs/chownAll.sh
deleted file mode 100644
index 44bef62..0000000
--- a/python/src/debs/chownAll.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-function main() {
- sudo chown -R abaddon:abaddon .
-}
-main;
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/bin/xwinwrap b/python/src/debs/gwinwrap-0-0-1-x64/bin/xwinwrap
deleted file mode 100755
index 26eafd7..0000000
Binary files a/python/src/debs/gwinwrap-0-0-1-x64/bin/xwinwrap and /dev/null differ
diff --git a/python/src/debs/build.sh b/src/debs/build.sh
similarity index 100%
rename from python/src/debs/build.sh
rename to src/debs/build.sh
diff --git a/java/src/debs/chownAll.sh b/src/debs/chownAll.sh
similarity index 100%
rename from java/src/debs/chownAll.sh
rename to src/debs/chownAll.sh
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/DEBIAN/control b/src/debs/gwinwrap-0-0-1-x64/DEBIAN/control
similarity index 100%
rename from python/src/debs/gwinwrap-0-0-1-x64/DEBIAN/control
rename to src/debs/gwinwrap-0-0-1-x64/DEBIAN/control
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/DEBIAN/postrm b/src/debs/gwinwrap-0-0-1-x64/DEBIAN/postrm
similarity index 100%
rename from python/src/debs/gwinwrap-0-0-1-x64/DEBIAN/postrm
rename to src/debs/gwinwrap-0-0-1-x64/DEBIAN/postrm
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/bin/gwinwrap b/src/debs/gwinwrap-0-0-1-x64/bin/gwinwrap
similarity index 100%
rename from python/src/debs/gwinwrap-0-0-1-x64/bin/gwinwrap
rename to src/debs/gwinwrap-0-0-1-x64/bin/gwinwrap
diff --git a/java/src/debs/fxwinwrap-0-1-5-x64/bin/xwinwrap b/src/debs/gwinwrap-0-0-1-x64/bin/xwinwrap
similarity index 100%
rename from java/src/debs/fxwinwrap-0-1-5-x64/bin/xwinwrap
rename to src/debs/gwinwrap-0-0-1-x64/bin/xwinwrap
diff --git a/python/src/versions/0.0.1/GWinWrap/GWinWrap.py b/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/GWinWrap.py
old mode 100755
new mode 100644
similarity index 92%
rename from python/src/versions/0.0.1/GWinWrap/GWinWrap.py
rename to src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/GWinWrap.py
index 7123417..c0c8f85
--- a/python/src/versions/0.0.1/GWinWrap/GWinWrap.py
+++ b/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/GWinWrap.py
@@ -18,18 +18,27 @@ gdk.threads_init()
class GWinWrap:
def __init__(self):
- self.builder = gtk.Builder()
+ self.builder = gtk.Builder()
self.builder.add_from_file("resources/GWinWrap.glade")
# Get window and connect signals
- window = self.builder.get_object("Main")
+ self.window = self.builder.get_object("Main")
self.builder.connect_signals(self)
- window.connect("delete-event", gtk.main_quit)
- self.stateSaver = SaveStateToXWinWarp()
- self.sttngsSver = SaveGWinWrapSettings()
- monitors = self.setWindowData(window)
+ self.window.connect("delete-event", gtk.main_quit)
+ self.screen = self.window.get_screen()
+ self.visual = self.screen.get_rgba_visual()
+ if self.visual != None and self.screen.is_composited():
+ self.window.set_visual(self.visual)
- print(monitors[1])
+ self.window.set_app_paintable(True)
+ self.window.connect("draw", self.area_draw)
+
+ # bind css file
+ cssProvider = gtk.CssProvider()
+ cssProvider.load_from_path('resources/stylesheet.css')
+ screen = gdk.Screen.get_default()
+ styleContext = gtk.StyleContext()
+ styleContext.add_provider_for_screen(screen, cssProvider, gtk.STYLE_PROVIDER_PRIORITY_USER)
# Add filter to allow only folders to be selected
dialog = self.builder.get_object("selectedDirDialog")
@@ -39,6 +48,9 @@ class GWinWrap:
# Get reference to remove and add it back...
self.gridLabel = self.builder.get_object("gridLabel")
+ self.stateSaver = SaveStateToXWinWarp()
+ self.sttngsSver = SaveGWinWrapSettings()
+
self.focusedImg = gtk.Image()
self.usrHome = os.path.expanduser('~')
self.xScreenVal = None
@@ -70,25 +82,8 @@ class GWinWrap:
self.imgVwr = None
self.retrieveSettings()
- window.show()
+ self.window.show()
- def setWindowData(self, window):
- screen = window.get_screen()
- visual = screen.get_rgba_visual()
- if visual != None and screen.is_composited():
- window.set_visual(visual)
-
- window.set_app_paintable(True)
- window.connect("draw", self.area_draw)
-
- # bind css file
- cssProvider = gtk.CssProvider()
- cssProvider.load_from_path('resources/stylesheet.css')
- screen = gdk.Screen.get_default()
- styleContext = gtk.StyleContext()
- styleContext.add_provider_for_screen(screen, cssProvider, gtk.STYLE_PROVIDER_PRIORITY_USER)
-
- return self.getMonitorData(screen)
def area_draw(self, widget, cr):
cr.set_source_rgba(0, 0, 0, 0.64)
@@ -96,18 +91,7 @@ class GWinWrap:
cr.paint()
cr.set_operator(cairo.OPERATOR_OVER)
- def getMonitorData(self, screen):
- monitors = []
- wxhxny = []
- for m in range(screen.get_n_monitors()):
- monitors.append(screen.get_monitor_geometry(m))
-
- wxhxny.append(monitors)
- for monitor in monitors:
- wxhxny.append(str(monitor.width) + "x" + str(monitor.height) + "+" + str(monitor.x) + "+" + str(monitor.y))
-
- return wxhxny
def setNewDir(self, widget, data=None):
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/GWinWrap.glade b/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/GWinWrap.glade
similarity index 100%
rename from python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/GWinWrap.glade
rename to src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/GWinWrap.glade
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/GWinWrap.png b/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/GWinWrap.png
similarity index 100%
rename from python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/GWinWrap.png
rename to src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/GWinWrap.png
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/folder.png b/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/folder.png
similarity index 100%
rename from python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/folder.png
rename to src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/folder.png
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/picture.png b/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/picture.png
similarity index 100%
rename from python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/picture.png
rename to src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/picture.png
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/player.png b/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/player.png
similarity index 100%
rename from python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/player.png
rename to src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/icons/player.png
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/stylesheet.css b/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/stylesheet.css
similarity index 100%
rename from python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/stylesheet.css
rename to src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/stylesheet.css
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/SaveGWinWrapSettings.py b/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/SaveGWinWrapSettings.py
similarity index 100%
rename from python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/SaveGWinWrapSettings.py
rename to src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/SaveGWinWrapSettings.py
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/SaveStateToXWinWarp.py b/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/SaveStateToXWinWarp.py
similarity index 98%
rename from python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/SaveStateToXWinWarp.py
rename to src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/SaveStateToXWinWarp.py
index 6bebc5f..ee0045d 100644
--- a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/SaveStateToXWinWarp.py
+++ b/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/SaveStateToXWinWarp.py
@@ -55,7 +55,7 @@ class SaveStateToXWinWarp:
applyType = 2;
# VIDEO
else:
- output = "xwinwrap -ov -g " + self.resolution + " -st -sp -b -nf -s -ni -- mplayer -wid WID -really-quiet -ao null -loop 0 " + self.toSavePath;
+ output = "xwinwrap -ov -g " + self.resolution + " -st -sp -b -nf -s -ni -- mplayer -wid WID -really-quiet -ao null -loop 0 '" + self.toSavePath + "'";
pass
if self.fileWriter:
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/__init__.py b/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/__init__.py
similarity index 100%
rename from python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/__init__.py
rename to src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/__init__.py
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/usr/share/applications/GWinWrap.desktop b/src/debs/gwinwrap-0-0-1-x64/usr/share/applications/GWinWrap.desktop
similarity index 77%
rename from python/src/debs/gwinwrap-0-0-1-x64/usr/share/applications/GWinWrap.desktop
rename to src/debs/gwinwrap-0-0-1-x64/usr/share/applications/GWinWrap.desktop
index 1d130b6..157de6e 100644
--- a/python/src/debs/gwinwrap-0-0-1-x64/usr/share/applications/GWinWrap.desktop
+++ b/src/debs/gwinwrap-0-0-1-x64/usr/share/applications/GWinWrap.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
Name=GWinWrap
Comment=Glade gui with python controls for XWinWrap
Exec=/bin/gwinwrap
-Icon=/opt/GWinWrap/resources/GWinWrap.png
+Icon=/opt/GWinWrap/resources/icons/GWinWrap.png
Terminal=false
Type=Application
Categories=System;
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/usr/share/doc/gwinwrap/copyright b/src/debs/gwinwrap-0-0-1-x64/usr/share/doc/gwinwrap/copyright
similarity index 100%
rename from python/src/debs/gwinwrap-0-0-1-x64/usr/share/doc/gwinwrap/copyright
rename to src/debs/gwinwrap-0-0-1-x64/usr/share/doc/gwinwrap/copyright
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/GWinWrap.py b/src/versions/0.0.1/GWinWrap/GWinWrap.py
similarity index 97%
rename from python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/GWinWrap.py
rename to src/versions/0.0.1/GWinWrap/GWinWrap.py
index 7123417..2a7fa52 100755
--- a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/GWinWrap.py
+++ b/src/versions/0.0.1/GWinWrap/GWinWrap.py
@@ -20,14 +20,14 @@ class GWinWrap:
def __init__(self):
self.builder = gtk.Builder()
self.builder.add_from_file("resources/GWinWrap.glade")
+ self.builder.connect_signals(self)
# Get window and connect signals
- window = self.builder.get_object("Main")
- self.builder.connect_signals(self)
- window.connect("delete-event", gtk.main_quit)
self.stateSaver = SaveStateToXWinWarp()
self.sttngsSver = SaveGWinWrapSettings()
+ window = self.builder.get_object("Main")
monitors = self.setWindowData(window)
+ window.connect("delete-event", gtk.main_quit)
print(monitors[1])
@@ -37,7 +37,7 @@ class GWinWrap:
dialog.add_filter(filefilter)
# Get reference to remove and add it back...
- self.gridLabel = self.builder.get_object("gridLabel")
+ self.gridLabel = self.builder.get_object("gridLabel")
self.focusedImg = gtk.Image()
self.usrHome = os.path.expanduser('~')
@@ -141,7 +141,7 @@ class GWinWrap:
if file.lower().endswith(('.mkv', '.avi', '.flv', '.mov', '.m4v', '.mpg', '.wmv', '.mpeg', '.mp4', '.webm')):
fileHash = hashlib.sha256(str.encode(fullPathFile)).hexdigest()
hashImgpth = self.usrHome + "/.thumbnails/normal/" + fileHash + ".png"
- if os.path.isfile(hashImgpth) == False:
+ if isfile(hashImgpth) == False:
self.generateThumbnail(fullPathFile, hashImgpth)
thumbnl = self.createGtkImage(hashImgpth, [310, 310])
@@ -235,11 +235,11 @@ class GWinWrap:
def mouseOver(self, widget, eve, args):
hand_cursor = gdk.Cursor(gdk.CursorType.HAND2)
- self.window.get_window().set_cursor(hand_cursor)
+ self.builder.get_object("Main").get_window().set_cursor(hand_cursor)
def mouseOut(self, widget, eve, args):
watch_cursor = gdk.Cursor(gdk.CursorType.LEFT_PTR)
- self.window.get_window().set_cursor(watch_cursor)
+ self.builder.get_object("Main").get_window().set_cursor(watch_cursor)
def toggleXscreenUsageField(self, widget, data=None):
useXscreenSaver = self.builder.get_object("useXScrnList")
diff --git a/python/src/versions/0.0.1/GWinWrap/resources/GWinWrap.glade b/src/versions/0.0.1/GWinWrap/resources/GWinWrap.glade
similarity index 99%
rename from python/src/versions/0.0.1/GWinWrap/resources/GWinWrap.glade
rename to src/versions/0.0.1/GWinWrap/resources/GWinWrap.glade
index 671cdbc..bcbb44a 100644
--- a/python/src/versions/0.0.1/GWinWrap/resources/GWinWrap.glade
+++ b/src/versions/0.0.1/GWinWrap/resources/GWinWrap.glade
@@ -115,12 +115,10 @@
diff --git a/python/src/versions/0.0.1/GWinWrap/resources/icons/GWinWrap.png b/src/versions/0.0.1/GWinWrap/resources/icons/GWinWrap.png
similarity index 100%
rename from python/src/versions/0.0.1/GWinWrap/resources/icons/GWinWrap.png
rename to src/versions/0.0.1/GWinWrap/resources/icons/GWinWrap.png
diff --git a/python/src/versions/0.0.1/GWinWrap/resources/icons/folder.png b/src/versions/0.0.1/GWinWrap/resources/icons/folder.png
similarity index 100%
rename from python/src/versions/0.0.1/GWinWrap/resources/icons/folder.png
rename to src/versions/0.0.1/GWinWrap/resources/icons/folder.png
diff --git a/python/src/versions/0.0.1/GWinWrap/resources/icons/picture.png b/src/versions/0.0.1/GWinWrap/resources/icons/picture.png
similarity index 100%
rename from python/src/versions/0.0.1/GWinWrap/resources/icons/picture.png
rename to src/versions/0.0.1/GWinWrap/resources/icons/picture.png
diff --git a/python/src/versions/0.0.1/GWinWrap/resources/icons/player.png b/src/versions/0.0.1/GWinWrap/resources/icons/player.png
similarity index 100%
rename from python/src/versions/0.0.1/GWinWrap/resources/icons/player.png
rename to src/versions/0.0.1/GWinWrap/resources/icons/player.png
diff --git a/python/src/versions/0.0.1/GWinWrap/resources/stylesheet.css b/src/versions/0.0.1/GWinWrap/resources/stylesheet.css
similarity index 100%
rename from python/src/versions/0.0.1/GWinWrap/resources/stylesheet.css
rename to src/versions/0.0.1/GWinWrap/resources/stylesheet.css
diff --git a/python/src/versions/0.0.1/GWinWrap/utils/SaveGWinWrapSettings.py b/src/versions/0.0.1/GWinWrap/utils/SaveGWinWrapSettings.py
similarity index 100%
rename from python/src/versions/0.0.1/GWinWrap/utils/SaveGWinWrapSettings.py
rename to src/versions/0.0.1/GWinWrap/utils/SaveGWinWrapSettings.py
diff --git a/python/src/versions/0.0.1/GWinWrap/utils/SaveStateToXWinWarp.py b/src/versions/0.0.1/GWinWrap/utils/SaveStateToXWinWarp.py
similarity index 98%
rename from python/src/versions/0.0.1/GWinWrap/utils/SaveStateToXWinWarp.py
rename to src/versions/0.0.1/GWinWrap/utils/SaveStateToXWinWarp.py
index 6bebc5f..ee0045d 100644
--- a/python/src/versions/0.0.1/GWinWrap/utils/SaveStateToXWinWarp.py
+++ b/src/versions/0.0.1/GWinWrap/utils/SaveStateToXWinWarp.py
@@ -55,7 +55,7 @@ class SaveStateToXWinWarp:
applyType = 2;
# VIDEO
else:
- output = "xwinwrap -ov -g " + self.resolution + " -st -sp -b -nf -s -ni -- mplayer -wid WID -really-quiet -ao null -loop 0 " + self.toSavePath;
+ output = "xwinwrap -ov -g " + self.resolution + " -st -sp -b -nf -s -ni -- mplayer -wid WID -really-quiet -ao null -loop 0 '" + self.toSavePath + "'";
pass
if self.fileWriter:
diff --git a/python/src/versions/0.0.1/GWinWrap/utils/__init__.py b/src/versions/0.0.1/GWinWrap/utils/__init__.py
similarity index 100%
rename from python/src/versions/0.0.1/GWinWrap/utils/__init__.py
rename to src/versions/0.0.1/GWinWrap/utils/__init__.py
diff --git a/src/versions/0.0.1/GWinWrap/utils/__pycache__/SaveGWinWrapSettings.cpython-36.pyc b/src/versions/0.0.1/GWinWrap/utils/__pycache__/SaveGWinWrapSettings.cpython-36.pyc
new file mode 100644
index 0000000..23ecc42
Binary files /dev/null and b/src/versions/0.0.1/GWinWrap/utils/__pycache__/SaveGWinWrapSettings.cpython-36.pyc differ
diff --git a/src/versions/0.0.1/GWinWrap/utils/__pycache__/SaveStateToXWinWarp.cpython-36.pyc b/src/versions/0.0.1/GWinWrap/utils/__pycache__/SaveStateToXWinWarp.cpython-36.pyc
new file mode 100644
index 0000000..638f235
Binary files /dev/null and b/src/versions/0.0.1/GWinWrap/utils/__pycache__/SaveStateToXWinWarp.cpython-36.pyc differ
diff --git a/src/versions/0.0.1/GWinWrap/utils/__pycache__/__init__.cpython-36.pyc b/src/versions/0.0.1/GWinWrap/utils/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 0000000..b2f720f
Binary files /dev/null and b/src/versions/0.0.1/GWinWrap/utils/__pycache__/__init__.cpython-36.pyc differ
diff --git a/python/src/versions/0.0.1/XWinWrap/Makefile b/src/versions/0.0.1/XWinWrap/Makefile
similarity index 100%
rename from python/src/versions/0.0.1/XWinWrap/Makefile
rename to src/versions/0.0.1/XWinWrap/Makefile
diff --git a/python/src/versions/0.0.1/XWinWrap/xwinwrap.c b/src/versions/0.0.1/XWinWrap/xwinwrap.c
similarity index 100%
rename from python/src/versions/0.0.1/XWinWrap/xwinwrap.c
rename to src/versions/0.0.1/XWinWrap/xwinwrap.c
diff --git a/python/src/versions/0.0.1/compileBin.sh b/src/versions/0.0.1/compileBin.sh
similarity index 100%
rename from python/src/versions/0.0.1/compileBin.sh
rename to src/versions/0.0.1/compileBin.sh
diff --git a/python/src/versions/0.0.1/gwinwrap_exec_bin.cpp b/src/versions/0.0.1/gwinwrap_exec_bin.cpp
similarity index 100%
rename from python/src/versions/0.0.1/gwinwrap_exec_bin.cpp
rename to src/versions/0.0.1/gwinwrap_exec_bin.cpp