diff --git a/bin/gwinwrap-0-0-1-x64.deb b/bin/gwinwrap-0-0-1-x64.deb index c394fa5..3c3e925 100644 Binary files a/bin/gwinwrap-0-0-1-x64.deb and b/bin/gwinwrap-0-0-1-x64.deb differ diff --git a/src/GWinWrap/GWinWrap.desktop b/src/GWinWrap/GWinWrap.desktop new file mode 100644 index 0000000..543fdb6 --- /dev/null +++ b/src/GWinWrap/GWinWrap.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=GWinWrap +Comment=Glade gui with python controls for XWinWrap +Exec=gwinwrap +Icon=/opt/GWinWrap/resources/icons/GWinWrap.png +Terminal=false +Type=Application +Categories=Accessories;System;Settings; diff --git a/src/GWinWrap/GWinWrap.sh b/src/GWinWrap/GWinWrap.sh deleted file mode 100755 index 6ef2628..0000000 --- a/src/GWinWrap/GWinWrap.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# set -o xtrace ## To debug scripts -# set -o errexit ## To exit on error -# set -o errunset ## To exit if a variable is referenced but not set - - -function main() { - # GTK_DEBUG=interactive python3 ./GWinWrap.py - python3 ./GWinWrap.py -} -main $@; diff --git a/src/GWinWrap/GWinWrap.py b/src/GWinWrap/__init__.py similarity index 89% rename from src/GWinWrap/GWinWrap.py rename to src/GWinWrap/__init__.py index 0ea29f8..0beb3ee 100644 --- a/src/GWinWrap/GWinWrap.py +++ b/src/GWinWrap/__init__.py @@ -30,7 +30,7 @@ class Main: # Gets the methods from the classes and sets to handler. # Then, builder connects to any signals it needs. classes = [CrossClassSignals(settings)] - + handlers = {} for c in classes: methods = inspect.getmembers(c, predicate=inspect.ismethod) @@ -39,11 +39,3 @@ class Main: builder.connect_signals(handlers) window = settings.createWindow() window.show() - - -if __name__ == "__main__": - try: - main = Main() - gtk.main() - except Exception as e: - print(e) diff --git a/src/GWinWrap/__main__.py b/src/GWinWrap/__main__.py new file mode 100644 index 0000000..60c7ea2 --- /dev/null +++ b/src/GWinWrap/__main__.py @@ -0,0 +1,9 @@ +from __init__ import Main, gtk + + +if __name__ == "__main__": + try: + main = Main() + gtk.main() + except Exception as e: + print(e) diff --git a/src/gwinwrap_exec_bin.cpp b/src/gwinwrap_exec_bin.cpp index 16c77a7..81978ec 100644 --- a/src/gwinwrap_exec_bin.cpp +++ b/src/gwinwrap_exec_bin.cpp @@ -5,6 +5,6 @@ using namespace std; int main() { chdir("/opt/GWinWrap/"); - system("python3 GWinWrap.py"); + system("python3 ."); return 0; }