split code into multiple files

.gitignore

@@ -1 +1,2 @@
 build
+src/__pycache__

README.md

@@ -19,7 +19,7 @@ You have different options of building and running OctoTray:
 
 OctoTray can simply be run from the checked out repository, if all dependencies are installed.
 
-    ./src/octotray.py
+    ./src/main.py
 
 For this you need Python 3 as well as PyQt5.
 
@@ -53,31 +53,22 @@ To create your own bundle from source, simply run:
 
 The generated bundle will then be in 'build/mac/dist/OctoTray.app' as well as 'build/dist/OctoTray_Mac.zip'.
 
-### Arch Linux Package
-
-Create and install an Arch Linux package like this:
-
-    ./build_arch.sh
-    sudo pacman -U build/dist/octotray-0.3-1-any.pkg.tar.xz
-
-Then run it from your desktop environment menu or even add it to the autostart there.
-
-### Manual Installation on Linux
-
-You can also install the required files manually, which should work for most other Linux distribution and Unices:
-
-    sudo ./build_unix.sh
-
-After logging out and back in, you should find OctoTray in the menu of your graphical desktop environment.
-Take a look at the script to see exactly what is installed where.
-
 ### Pre-Built Linux Binary
 
-For completeness, a single pre-build Linux binary is also provided on GitHub, made with PyInstaller like the Windows build.
-It is however not recommended for productive use.
+A single pre-build Linux binary is also provided on GitHub, made with PyInstaller like the Windows build.
 
 To create it yourself, simply run:
 
     ./build_linux.sh
 
 The resulting binary will be in 'build/linux/dist' as well as 'build/dist/OctoTray_Linux.zip'.
+
+### Arch Linux Package
+
+Create and install an Arch Linux package like this:
+
+    ./build_arch.sh
+    sudo pacman -U build/dist/octotray-0.5-1-any.pkg.tar.xz
+
+Then run it from your desktop environment menu or even add it to the autostart there.
+This uses the same pre-built Linux binary as described above.

build_arch.sh

@@ -3,7 +3,9 @@
 rm -rf build/archlinux
 mkdir -p build/archlinux
 
-cp -r src/* build/archlinux/
+./build_linux.sh
+cp -r build/linux/dist/OctoTray build/archlinux/octotray
+
 cp -r data/* build/archlinux/
 cp dist/PKGBUILD build/archlinux/
 

build_linux.sh

@@ -7,7 +7,7 @@ cp src/* build/linux/
 cp data/* build/linux/
 
 cd build/linux
-pyinstaller --noconfirm --onefile --name=OctoTray --add-data="octotray_icon.png:." octotray.py
+pyinstaller --noconfirm --onefile --name=OctoTray --add-data="octotray_icon.png:." main.py
 
 cd dist
 zip -r OctoTray_Linux.zip *

build_unix.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-cp src/octotray.py /usr/bin/octotray
-cp data/octotray_icon.png /usr/share/pixmaps/octotray_icon.png
-cp data/de.xythobuz.octotray.desktop /usr/share/applications/de.xythobuz.octotray.desktop

build_win.sh

@@ -8,7 +8,7 @@ cp data/* build/win/
 cp dist/setup_win.py build/win/
 
 cd build/win
-pyinstaller --noconfirm --onefile --name=OctoTray --windowed --add-data="octotray_icon.png;." --icon="octotray_icon.ico" octotray.py
+pyinstaller --noconfirm --onefile --name=OctoTray --windowed --add-data="octotray_icon.png;." --icon="octotray_icon.ico" main.py
 
 cd ../..
 mkdir -p build/dist/win

data/de.xythobuz.octotray.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Version=0.3
+Version=0.4
 Name=OctoTray
 Comment=Control OctoPrint instances from system tray
 Path=/usr/bin

dist/PKGBUILD

@@ -15,7 +15,7 @@ md5sums=(SKIP
 
 package() {
 	mkdir -p "$pkgdir/usr/bin"
-	cp octotray.py "$pkgdir/usr/bin/octotray"
+	cp octotray "$pkgdir/usr/bin/octotray"
 	mkdir -p "$pkgdir/usr/share/pixmaps"
 	cp octotray_icon.png "$pkgdir/usr/share/pixmaps/octotray_icon.png"
 	mkdir -p "$pkgdir/usr/share/applications"

dist/setup_mac.py

@@ -4,7 +4,7 @@
 from setuptools import setup
 
 APP_NAME = "OctoTray"
-APP = [ 'octotray.py' ]
+APP = [ 'main.py' ]
 DATA_FILES = [ 'octotray_icon.png' ]
 VERSION="0.4.0"
 
@@ -18,7 +18,7 @@ OPTIONS = {
         'CFBundleIdentifier': "de.xythobuz.octotray",
         'CFBundleVersion': VERSION,
         'CFBundleShortVersionString': VERSION,
-        'NSHumanReadableCopyright': u"Copyright © 2021, Thomas Buck, All Rights Reserved"
+        'NSHumanReadableCopyright': u"Copyright © 2021 - 2022, Thomas Buck, All Rights Reserved"
     }
 }
 

src/AspectRatioPixmapLabel.py

@@ -0,0 +1,41 @@
+#!/usr/bin/env python3
+
+# OctoTray Linux Qt System Tray OctoPrint client
+#
+# AspectRatioPixmapLabel.py
+#
+# see also:
+# https://doc.qt.io/qt-5/qtwidgets-widgets-imageviewer-example.html
+# https://stackoverflow.com/a/22618496
+
+from PyQt5.QtWidgets import QLabel
+from PyQt5.QtGui import QPixmap
+from PyQt5.QtCore import QSize, Qt
+
+class AspectRatioPixmapLabel(QLabel):
+    def __init__(self, *args, **kwargs):
+        super(AspectRatioPixmapLabel, self).__init__(*args, **kwargs)
+        self.setMinimumSize(1, 1)
+        self.setScaledContents(False)
+        self.pix = QPixmap(0, 0)
+
+    def setPixmap(self, p):
+        self.pix = p
+        super(AspectRatioPixmapLabel, self).setPixmap(self.scaledPixmap())
+
+    def heightForWidth(self, width):
+        if self.pix.isNull():
+            return self.height()
+        else:
+            return (self.pix.height() * width) / self.pix.width()
+
+    def sizeHint(self):
+        w = self.width()
+        return QSize(int(w), int(self.heightForWidth(w)))
+
+    def scaledPixmap(self):
+        return self.pix.scaled(self.size(), Qt.KeepAspectRatio, Qt.SmoothTransformation)
+
+    def resizeEvent(self, e):
+        if not self.pix.isNull():
+            super(AspectRatioPixmapLabel, self).setPixmap(self.scaledPixmap())

src/CamWindow.py

@@ -0,0 +1,282 @@
+#!/usr/bin/env python3
+
+# OctoTray Linux Qt System Tray OctoPrint client
+#
+# CamWindow.py
+#
+# see also:
+# https://doc.qt.io/qt-5/qtwidgets-widgets-imageviewer-example.html
+# https://stackoverflow.com/a/22618496
+
+import time
+from PyQt5 import QtNetwork
+from PyQt5.QtWidgets import QWidget, QLabel, QVBoxLayout, QHBoxLayout, QSlider, QPushButton
+from PyQt5.QtGui import QPixmap, QImageReader
+from PyQt5.QtCore import QUrl, QTimer, Qt
+from AspectRatioPixmapLabel import AspectRatioPixmapLabel
+
+class CamWindow(QWidget):
+    reloadDelayDefault = 1000 # in ms
+    statusDelayFactor = 2
+    reloadOn = True
+    sliderFactor = 100
+
+    def __init__(self, parent, printer, *args, **kwargs):
+        super(CamWindow, self).__init__(*args, **kwargs)
+        self.app = parent.app
+        self.manager = parent.manager
+        self.manager.finished.connect(self.handleResponse)
+        self.parent = parent
+        self.printer = printer
+        self.host = self.printer[0]
+        self.url = "http://" + self.host + ":8080/?action=snapshot"
+
+        self.setWindowTitle(parent.name + " Webcam Stream")
+        self.setWindowIcon(parent.icon)
+
+        box = QVBoxLayout()
+        self.setLayout(box)
+
+        label = QLabel(self.url)
+        box.addWidget(label, 0)
+        box.setAlignment(label, Qt.AlignHCenter)
+
+        slide = QHBoxLayout()
+        box.addLayout(slide, 0)
+
+        self.slideStaticLabel = QLabel("Refresh")
+        slide.addWidget(self.slideStaticLabel, 0)
+
+        self.slider = QSlider(Qt.Horizontal)
+        self.slider.setMinimum(int(100 / self.sliderFactor))
+        self.slider.setMaximum(int(2000 / self.sliderFactor))
+        self.slider.setTickInterval(int(100 / self.sliderFactor))
+        self.slider.setPageStep(int(100 / self.sliderFactor))
+        self.slider.setSingleStep(int(100 / self.sliderFactor))
+        self.slider.setTickPosition(QSlider.TicksBelow)
+        self.slider.setValue(int(self.reloadDelayDefault / self.sliderFactor))
+        self.slider.valueChanged.connect(self.sliderChanged)
+        slide.addWidget(self.slider, 1)
+
+        self.slideLabel = QLabel(str(self.reloadDelayDefault) + "ms")
+        slide.addWidget(self.slideLabel, 0)
+
+        self.img = AspectRatioPixmapLabel()
+        self.img.setPixmap(QPixmap(640, 480))
+        box.addWidget(self.img, 1)
+
+        self.statusLabel = QLabel("Status: unavailable")
+        box.addWidget(self.statusLabel, 0)
+        box.setAlignment(self.statusLabel, Qt.AlignHCenter)
+
+        self.method = self.parent.getMethod(self.printer[0], self.printer[1])
+        if self.method != "unknown":
+            controls_power = QHBoxLayout()
+            box.addLayout(controls_power, 0)
+
+            self.turnOnButton = QPushButton("Turn O&n")
+            self.turnOnButton.clicked.connect(self.turnOn)
+            controls_power.addWidget(self.turnOnButton)
+
+            self.turnOffButton = QPushButton("Turn O&ff")
+            self.turnOffButton.clicked.connect(self.turnOff)
+            controls_power.addWidget(self.turnOffButton)
+
+        controls_temp = QHBoxLayout()
+        box.addLayout(controls_temp, 0)
+
+        self.cooldownButton = QPushButton("&Cooldown")
+        self.cooldownButton.clicked.connect(self.cooldown)
+        controls_temp.addWidget(self.cooldownButton)
+
+        self.preheatToolButton = QPushButton("Preheat &Tool")
+        self.preheatToolButton.clicked.connect(self.preheatTool)
+        controls_temp.addWidget(self.preheatToolButton)
+
+        self.preheatBedButton = QPushButton("Preheat &Bed")
+        self.preheatBedButton.clicked.connect(self.preheatBed)
+        controls_temp.addWidget(self.preheatBedButton)
+
+        controls_home = QHBoxLayout()
+        box.addLayout(controls_home, 0)
+
+        self.homeAllButton = QPushButton("Home &All")
+        self.homeAllButton.clicked.connect(self.homeAll)
+        controls_home.addWidget(self.homeAllButton, 1)
+
+        self.homeXButton = QPushButton("Home &X")
+        self.homeXButton.clicked.connect(self.homeX)
+        controls_home.addWidget(self.homeXButton, 0)
+
+        self.homeYButton = QPushButton("Home &Y")
+        self.homeYButton.clicked.connect(self.homeY)
+        controls_home.addWidget(self.homeYButton, 0)
+
+        self.homeZButton = QPushButton("Home &Z")
+        self.homeZButton.clicked.connect(self.homeZ)
+        controls_home.addWidget(self.homeZButton, 0)
+
+        controls_move = QHBoxLayout()
+        box.addLayout(controls_move, 0)
+
+        self.XPButton = QPushButton("X+")
+        self.XPButton.clicked.connect(self.moveXP)
+        controls_move.addWidget(self.XPButton)
+
+        self.XMButton = QPushButton("X-")
+        self.XMButton.clicked.connect(self.moveXM)
+        controls_move.addWidget(self.XMButton)
+
+        self.YPButton = QPushButton("Y+")
+        self.YPButton.clicked.connect(self.moveYP)
+        controls_move.addWidget(self.YPButton)
+
+        self.YMButton = QPushButton("Y-")
+        self.YMButton.clicked.connect(self.moveYM)
+        controls_move.addWidget(self.YMButton)
+
+        self.ZPButton = QPushButton("Z+")
+        self.ZPButton.clicked.connect(self.moveZP)
+        controls_move.addWidget(self.ZPButton)
+
+        self.ZMButton = QPushButton("Z-")
+        self.ZMButton.clicked.connect(self.moveZM)
+        controls_move.addWidget(self.ZMButton)
+
+        controls_job = QHBoxLayout()
+        box.addLayout(controls_job, 0)
+
+        self.PauseButton = QPushButton("Pause/Resume")
+        self.PauseButton.clicked.connect(self.pauseResume)
+        controls_job.addWidget(self.PauseButton)
+
+        self.CancelButton = QPushButton("Cancel Job")
+        self.CancelButton.clicked.connect(self.cancelJob)
+        controls_job.addWidget(self.CancelButton)
+
+        self.loadImage()
+        self.loadStatus()
+
+    def pauseResume(self):
+        self.parent.printerPauseResume(self.printer)
+
+    def cancelJob(self):
+        self.parent.printerJobCancel(self.printer)
+
+    def moveXP(self):
+        self.parent.printerMoveAction(self.printer, "x", int(self.parent.jogMoveLength), True)
+
+    def moveXM(self):
+        self.parent.printerMoveAction(self.printer, "x", -1 * int(self.parent.jogMoveLength), True)
+
+    def moveYP(self):
+        self.parent.printerMoveAction(self.printer, "y", int(self.parent.jogMoveLength), True)
+
+    def moveYM(self):
+        self.parent.printerMoveAction(self.printer, "y", -1 * int(self.parent.jogMoveLength), True)
+
+    def moveZP(self):
+        self.parent.printerMoveAction(self.printer, "z", int(self.parent.jogMoveLength), True)
+
+    def moveZM(self):
+        self.parent.printerMoveAction(self.printer, "z", -1 * int(self.parent.jogMoveLength), True)
+
+    def homeX(self):
+        self.parent.printerHomingAction(self.printer, "x")
+
+    def homeY(self):
+        self.parent.printerHomingAction(self.printer, "y")
+
+    def homeZ(self):
+        self.parent.printerHomingAction(self.printer, "z")
+
+    def homeAll(self):
+        self.parent.printerHomingAction(self.printer, "xyz")
+
+    def turnOn(self):
+        if self.method == "psucontrol":
+            self.parent.printerOnAction(self.printer)
+        elif self.method == "system":
+            cmds = self.parent.getSystemCommands(self.printer[0], self.printer[1])
+            for cmd in cmds:
+                if "on" in cmd:
+                    self.parent.setSystemCommand(self.printer[0], self.printer[1], cmd)
+                    break
+
+    def turnOff(self):
+        if self.method == "psucontrol":
+            self.parent.printerOffAction(self.printer)
+        elif self.method == "system":
+            cmds = self.parent.getSystemCommands(self.printer[0], self.printer[1])
+            for cmd in cmds:
+                if "off" in cmd:
+                    self.parent.setSystemCommand(self.printer[0], self.printer[1], cmd)
+                    break
+
+    def cooldown(self):
+        self.parent.printerCooldown(self.printer)
+
+    def preheatTool(self):
+        self.parent.printerHeatTool(self.printer)
+
+    def preheatBed(self):
+        self.parent.printerHeatBed(self.printer)
+
+    def getHost(self):
+        return self.host
+
+    def sliderChanged(self):
+        self.slideLabel.setText(str(self.slider.value() * self.sliderFactor) + "ms")
+
+    def closeEvent(self, event):
+        self.reloadOn = False
+        self.url = ""
+        self.parent.removeWebcamWindow(self)
+
+    def scheduleLoadImage(self):
+        if self.reloadOn:
+            QTimer.singleShot(self.slider.value() * self.sliderFactor, self.loadImage)
+
+    def scheduleLoadStatus(self):
+        if self.reloadOn:
+            QTimer.singleShot(self.slider.value() * self.sliderFactor * self.statusDelayFactor, self.loadStatus)
+
+    def loadImage(self):
+        url = QUrl(self.url)
+        request = QtNetwork.QNetworkRequest(url)
+        self.manager.get(request)
+
+    def loadStatus(self):
+        s = "Status: "
+        t = self.parent.getTemperatureString(self.host, self.printer[1])
+        if len(t) > 0:
+            s += t
+        else:
+            s += "Unknown"
+
+        progress = self.parent.getProgress(self.host, self.printer[1])
+        if ("completion" in progress) and ("printTime" in progress) and ("printTimeLeft" in progress) and (progress["completion"] != None) and (progress["printTime"] != None) and (progress["printTimeLeft"] != None):
+            s += " - %.1f%%" % progress["completion"]
+            s += " - runtime "
+            s += time.strftime("%H:%M:%S", time.gmtime(progress["printTime"]))
+            s += " - "
+            s += time.strftime("%H:%M:%S", time.gmtime(progress["printTimeLeft"])) + " left"
+
+        self.statusLabel.setText(s)
+        self.scheduleLoadStatus()
+
+    def handleResponse(self, reply):
+        if reply.url().url() == self.url:
+            if reply.error() == QtNetwork.QNetworkReply.NoError:
+                reader = QImageReader(reply)
+                reader.setAutoTransform(True)
+                image = reader.read()
+                if image != None:
+                    if image.colorSpace().isValid():
+                        image.convertToColorSpace(QColorSpace.SRgb)
+                    self.img.setPixmap(QPixmap.fromImage(image))
+                    self.scheduleLoadImage()
+                else:
+                    print("Error decoding image: " + reader.errorString())
+            else:
+                print("Error loading image: " + reply.errorString())

src/MainWindow.py

@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+
+# OctoTray Linux Qt System Tray OctoPrint client
+#
+# MainWindow.py
+#
+# Used when calling application with arguments
+# '--windowed' or '-w' on command line,
+# or when no system tray is available.
+
+from PyQt5.QtWidgets import QWidget, QVBoxLayout
+
+class MainWindow(QWidget):
+    def __init__(self, parent, *args, **kwargs):
+        super(MainWindow, self).__init__(*args, **kwargs)
+        self.parent = parent
+
+        self.mainLayout = QVBoxLayout()
+        self.setLayout(self.mainLayout)
+        self.mainLayout.addWidget(self.parent.menu)
+
+        self.parent.menu.aboutToHide.connect(self.aboutToHide)
+
+    def aboutToHide(self):
+        self.parent.menu.show()
+
+    def closeEvent(self, event):
+        self.parent.exit()
+        event.accept()

src/octotray.py → src/OctoTray.py

@@ -2,552 +2,25 @@
 
 # OctoTray Linux Qt System Tray OctoPrint client
 #
-# depends on:
-# - python-pyqt5
+# OctoTray.py
 #
-# see also:
-# https://doc.qt.io/qt-5/qtwidgets-widgets-imageviewer-example.html
-# https://stackoverflow.com/a/22618496
+# Main application logic.
 
 import json
 import sys
-import os
 import time
-import string
 import urllib.parse
 import urllib.request
-import signal
 import operator
 import socket
 from os import path
-from PyQt5 import QtWidgets, QtGui, QtCore, QtNetwork
-from PyQt5.QtWidgets import QSystemTrayIcon, QAction, QMenu, QMessageBox, QWidget, QLabel, QVBoxLayout, QHBoxLayout, QDesktopWidget, QSizePolicy, QSlider, QLayout, QTableWidget, QTableWidgetItem, QPushButton, QApplication, QLineEdit, QGridLayout
-from PyQt5.QtGui import QIcon, QPixmap, QImageReader, QDesktopServices, QFontDatabase, QCursor, QIntValidator
-from PyQt5.QtCore import QCoreApplication, QSettings, QUrl, QTimer, QSize, Qt, QSettings
-
-class SettingsWindow(QWidget):
-    columns = [ "Hostname", "API Key", "Tool Preheat", "Bed Preheat" ]
-    presets = [ "octopi.local", "000000000_API_KEY_HERE_000000000", "0", "0" ]
-
-    def __init__(self, parent, *args, **kwargs):
-        super(SettingsWindow, self).__init__(*args, **kwargs)
-        self.parent = parent
-
-        self.setWindowTitle(parent.name + " Settings")
-        self.setWindowIcon(parent.icon)
-
-
-        box = QVBoxLayout()
-        self.setLayout(box)
-
-        staticSettings = QGridLayout()
-        box.addLayout(staticSettings, 0)
-
-        self.jogSpeedText = QLabel("Jog Speed")
-        staticSettings.addWidget(self.jogSpeedText, 0, 0)
-
-        self.jogSpeed = QLineEdit(str(self.parent.jogMoveSpeed))
-        self.jogSpeed.setValidator(QIntValidator(1, 6000))
-        staticSettings.addWidget(self.jogSpeed, 0, 1)
-
-        self.jogSpeedUnitText = QLabel("mm/min")
-        staticSettings.addWidget(self.jogSpeedUnitText, 0, 2)
-
-        self.jogLengthText = QLabel("Jog Length")
-        staticSettings.addWidget(self.jogLengthText, 1, 0)
-
-        self.jogLength = QLineEdit(str(self.parent.jogMoveLength))
-        self.jogLength.setValidator(QIntValidator(1, 100))
-        staticSettings.addWidget(self.jogLength, 1, 1)
-
-        self.jogLengthUnitText = QLabel("mm")
-        staticSettings.addWidget(self.jogLengthUnitText, 1, 2)
-
-        helpText = "Usage:\n"
-        helpText += "1st Column: Printer Hostname or IP address\n"
-        helpText += "2nd Column: OctoPrint API Key (32 char hexadecimal)\n"
-        helpText += "3rd Column: Tool Preheat Temperature (0 to disable)\n"
-        helpText += "4th Column: Bed Preheat Temperature (0 to disable)"
-        self.helpText = QLabel(helpText)
-        box.addWidget(self.helpText, 0)
-        box.setAlignment(self.helpText, Qt.AlignHCenter)
-
-        buttons = QHBoxLayout()
-        box.addLayout(buttons, 0)
-
-        self.add = QPushButton("&Add Printer")
-        self.add.clicked.connect(self.addPrinter)
-        buttons.addWidget(self.add)
-
-        self.remove = QPushButton("&Remove Printer")
-        self.remove.clicked.connect(self.removePrinter)
-        buttons.addWidget(self.remove)
-
-        printers = self.parent.readSettings()
-        self.rows = len(printers)
-        self.table = QTableWidget(self.rows, len(self.columns))
-        box.addWidget(self.table, 1)
-
-        for i in range(0, self.rows):
-            p = printers[i]
-            for j in range(0, len(self.columns)):
-                text = p[j]
-                if (j >= 2) and (j <= 3) and (text == None):
-                    text = "0"
-                item = QTableWidgetItem(text)
-                self.table.setItem(i, j, item)
-                if j == 1:
-                    font = item.font()
-                    font.setFamily(QFontDatabase.systemFont(QFontDatabase.FixedFont).family())
-                    item.setFont(font)
-
-        buttons2 = QHBoxLayout()
-        box.addLayout(buttons2, 0)
-
-        self.up = QPushButton("Move &Up")
-        self.up.clicked.connect(self.moveUp)
-        buttons2.addWidget(self.up)
-
-        self.down = QPushButton("Move &Down")
-        self.down.clicked.connect(self.moveDown)
-        buttons2.addWidget(self.down)
-
-        self.openWeb = QPushButton("&Open Web UI of selected")
-        self.openWeb.clicked.connect(self.openWebUI)
-        box.addWidget(self.openWeb, 0)
-
-        self.table.setHorizontalHeaderLabels(self.columns)
-        self.table.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustToContents)
-        self.table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows);
-        self.table.resizeColumnsToContents()
-
-        if self.rows <= 0:
-            self.addPrinter()
-
-    def tableToList(self):
-        printers = []
-        for i in range(0, self.rows):
-            p = []
-            for j in range(0, len(self.columns)):
-                text = self.table.item(i, j).text()
-                if (j >= 2) and (j <= 3) and (text == "0"):
-                    text = None
-                p.append(text)
-            printers.append(p)
-        return printers
-
-    def settingsValid(self, printers):
-        for p in printers:
-            # p[0] needs to be valid hostname or IP
-            # TODO
-
-            # p[1] needs to be valid API key (hexadecimal, 32 chars)
-            if (len(p[1]) != 32) or not all(c in string.hexdigits for c in p[1]):
-                return (False, "API Key not 32-digit hexadecimal")
-
-            # p[2] and p[3] need to be integer temperatures (0...999)
-            for s in [ p[2], p[3] ]:
-                if s == None:
-                    s = "0"
-                if (len(s) < 1) or (len(s) > 3) or not all(c in string.digits for c in s):
-                    return (False, "Temperature not a number from 0...999")
-
-        js = int(self.jogSpeed.text())
-        if (js < 1) or (js > 6000):
-            return (False, "Jog Speed not a number from 1...6000")
-
-        jl = int(self.jogLength.text())
-        if (jl < 1) or (jl > 100):
-            return (False, "Jog Length not a number from 1...100")
-
-        return (True, "")
-
-    def closeEvent(self, event):
-        oldPrinters = [item[0:len(self.columns)] for item in self.parent.printers]
-        newPrinters = self.tableToList()
-
-        valid, errorText = self.settingsValid(newPrinters)
-        if valid == False:
-            r = self.parent.showDialog(self.parent.name + " Settings Invalid", errorText + "!", "Do you want to edit it again?", True, True, False)
-            if r == True:
-                event.ignore()
-                return
-            else:
-                self.parent.removeSettingsWindow()
-                return
-
-        js = int(self.jogSpeed.text())
-        jl = int(self.jogLength.text())
-
-        if (oldPrinters != newPrinters) or (js != self.parent.jogMoveSpeed) or (jl != self.parent.jogMoveLength):
-            r = self.parent.showDialog(self.parent.name + " Settings Changed", "Do you want to save the new configuration?", "This will restart the application!", True, False, False)
-            if r == True:
-                self.parent.jogMoveSpeed = js
-                self.parent.jogMoveLength = jl
-                self.parent.writeSettings(newPrinters)
-                self.parent.restartApp()
-
-        self.parent.removeSettingsWindow()
-
-    def addPrinter(self):
-        self.rows += 1
-        self.table.setRowCount(self.rows)
-        for i in range(0, len(self.columns)):
-            item = QTableWidgetItem(self.presets[i])
-            self.table.setItem(self.rows - 1, i, item)
-            if i == 1:
-                font = item.font()
-                font.setFamily(QFontDatabase.systemFont(QFontDatabase.FixedFont).family())
-                item.setFont(font)
-        self.table.resizeColumnsToContents()
-        self.table.setCurrentItem(self.table.item(self.rows - 1, 0))
-
-    def removePrinter(self):
-        r = self.table.currentRow()
-        if (r >= 0) and (r < self.rows):
-            self.rows -= 1
-            self.table.removeRow(r)
-            self.table.setCurrentItem(self.table.item(min(r, self.rows - 1), 0))
-
-    def moveUp(self):
-        i = self.table.currentRow()
-        if i <= 0:
-            return
-        host = self.table.item(i, 0).text()
-        key = self.table.item(i, 1).text()
-        self.table.item(i, 0).setText(self.table.item(i - 1, 0).text())
-        self.table.item(i, 1).setText(self.table.item(i - 1, 1).text())
-        self.table.item(i - 1, 0).setText(host)
-        self.table.item(i - 1, 1).setText(key)
-        self.table.setCurrentItem(self.table.item(i - 1, 0))
-
-    def moveDown(self):
-        i = self.table.currentRow()
-        if i >= (self.rows - 1):
-            return
-        host = self.table.item(i, 0).text()
-        key = self.table.item(i, 1).text()
-        self.table.item(i, 0).setText(self.table.item(i + 1, 0).text())
-        self.table.item(i, 1).setText(self.table.item(i + 1, 1).text())
-        self.table.item(i + 1, 0).setText(host)
-        self.table.item(i + 1, 1).setText(key)
-        self.table.setCurrentItem(self.table.item(i + 1, 0))
-
-    def openWebUI(self):
-        host = self.table.item(self.table.currentRow(), 0).text()
-        self.parent.openBrowser(host)
-
-class AspectRatioPixmapLabel(QLabel):
-    def __init__(self, *args, **kwargs):
-        super(AspectRatioPixmapLabel, self).__init__(*args, **kwargs)
-        self.setMinimumSize(1, 1)
-        self.setScaledContents(False)
-        self.pix = QPixmap(0, 0)
-
-    def setPixmap(self, p):
-        self.pix = p
-        super(AspectRatioPixmapLabel, self).setPixmap(self.scaledPixmap())
-
-    def heightForWidth(self, width):
-        if self.pix.isNull():
-            return self.height()
-        else:
-            return (self.pix.height() * width) / self.pix.width()
-
-    def sizeHint(self):
-        w = self.width()
-        return QSize(int(w), int(self.heightForWidth(w)))
-
-    def scaledPixmap(self):
-        return self.pix.scaled(self.size(), Qt.KeepAspectRatio, Qt.SmoothTransformation)
-
-    def resizeEvent(self, e):
-        if not self.pix.isNull():
-            super(AspectRatioPixmapLabel, self).setPixmap(self.scaledPixmap())
-
-class CamWindow(QWidget):
-    reloadDelayDefault = 1000 # in ms
-    statusDelayFactor = 2
-    reloadOn = True
-    sliderFactor = 100
-
-    def __init__(self, parent, printer, *args, **kwargs):
-        super(CamWindow, self).__init__(*args, **kwargs)
-        self.app = parent.app
-        self.manager = parent.manager
-        self.manager.finished.connect(self.handleResponse)
-        self.parent = parent
-        self.printer = printer
-        self.host = self.printer[0]
-        self.url = "http://" + self.host + ":8080/?action=snapshot"
-
-        self.setWindowTitle(parent.name + " Webcam Stream")
-        self.setWindowIcon(parent.icon)
-
-        box = QVBoxLayout()
-        self.setLayout(box)
-
-        label = QLabel(self.url)
-        box.addWidget(label, 0)
-        box.setAlignment(label, Qt.AlignHCenter)
-
-        slide = QHBoxLayout()
-        box.addLayout(slide, 0)
-
-        self.slideStaticLabel = QLabel("Refresh")
-        slide.addWidget(self.slideStaticLabel, 0)
-
-        self.slider = QSlider(Qt.Horizontal)
-        self.slider.setMinimum(int(100 / self.sliderFactor))
-        self.slider.setMaximum(int(2000 / self.sliderFactor))
-        self.slider.setTickInterval(int(100 / self.sliderFactor))
-        self.slider.setPageStep(int(100 / self.sliderFactor))
-        self.slider.setSingleStep(int(100 / self.sliderFactor))
-        self.slider.setTickPosition(QSlider.TicksBelow)
-        self.slider.setValue(int(self.reloadDelayDefault / self.sliderFactor))
-        self.slider.valueChanged.connect(self.sliderChanged)
-        slide.addWidget(self.slider, 1)
-
-        self.slideLabel = QLabel(str(self.reloadDelayDefault) + "ms")
-        slide.addWidget(self.slideLabel, 0)
-
-        self.img = AspectRatioPixmapLabel()
-        self.img.setPixmap(QPixmap(640, 480))
-        box.addWidget(self.img, 1)
-
-        self.statusLabel = QLabel("Status: unavailable")
-        box.addWidget(self.statusLabel, 0)
-        box.setAlignment(self.statusLabel, Qt.AlignHCenter)
-
-        self.method = self.parent.getMethod(self.printer[0], self.printer[1])
-        if self.method != "unknown":
-            controls_power = QHBoxLayout()
-            box.addLayout(controls_power, 0)
-
-            self.turnOnButton = QPushButton("Turn O&n")
-            self.turnOnButton.clicked.connect(self.turnOn)
-            controls_power.addWidget(self.turnOnButton)
-
-            self.turnOffButton = QPushButton("Turn O&ff")
-            self.turnOffButton.clicked.connect(self.turnOff)
-            controls_power.addWidget(self.turnOffButton)
-
-        controls_temp = QHBoxLayout()
-        box.addLayout(controls_temp, 0)
-
-        self.cooldownButton = QPushButton("&Cooldown")
-        self.cooldownButton.clicked.connect(self.cooldown)
-        controls_temp.addWidget(self.cooldownButton)
-
-        self.preheatToolButton = QPushButton("Preheat &Tool")
-        self.preheatToolButton.clicked.connect(self.preheatTool)
-        controls_temp.addWidget(self.preheatToolButton)
-
-        self.preheatBedButton = QPushButton("Preheat &Bed")
-        self.preheatBedButton.clicked.connect(self.preheatBed)
-        controls_temp.addWidget(self.preheatBedButton)
-
-        controls_home = QHBoxLayout()
-        box.addLayout(controls_home, 0)
-
-        self.homeAllButton = QPushButton("Home &All")
-        self.homeAllButton.clicked.connect(self.homeAll)
-        controls_home.addWidget(self.homeAllButton, 1)
-
-        self.homeXButton = QPushButton("Home &X")
-        self.homeXButton.clicked.connect(self.homeX)
-        controls_home.addWidget(self.homeXButton, 0)
-
-        self.homeYButton = QPushButton("Home &Y")
-        self.homeYButton.clicked.connect(self.homeY)
-        controls_home.addWidget(self.homeYButton, 0)
-
-        self.homeZButton = QPushButton("Home &Z")
-        self.homeZButton.clicked.connect(self.homeZ)
-        controls_home.addWidget(self.homeZButton, 0)
-
-        controls_move = QHBoxLayout()
-        box.addLayout(controls_move, 0)
-
-        self.XPButton = QPushButton("X+")
-        self.XPButton.clicked.connect(self.moveXP)
-        controls_move.addWidget(self.XPButton)
-
-        self.XMButton = QPushButton("X-")
-        self.XMButton.clicked.connect(self.moveXM)
-        controls_move.addWidget(self.XMButton)
-
-        self.YPButton = QPushButton("Y+")
-        self.YPButton.clicked.connect(self.moveYP)
-        controls_move.addWidget(self.YPButton)
-
-        self.YMButton = QPushButton("Y-")
-        self.YMButton.clicked.connect(self.moveYM)
-        controls_move.addWidget(self.YMButton)
-
-        self.ZPButton = QPushButton("Z+")
-        self.ZPButton.clicked.connect(self.moveZP)
-        controls_move.addWidget(self.ZPButton)
-
-        self.ZMButton = QPushButton("Z-")
-        self.ZMButton.clicked.connect(self.moveZM)
-        controls_move.addWidget(self.ZMButton)
-
-        controls_job = QHBoxLayout()
-        box.addLayout(controls_job, 0)
-
-        self.PauseButton = QPushButton("Pause/Resume")
-        self.PauseButton.clicked.connect(self.pauseResume)
-        controls_job.addWidget(self.PauseButton)
-
-        self.CancelButton = QPushButton("Cancel Job")
-        self.CancelButton.clicked.connect(self.cancelJob)
-        controls_job.addWidget(self.CancelButton)
-
-        self.loadImage()
-        self.loadStatus()
-
-    def pauseResume(self):
-        self.parent.printerPauseResume(self.printer)
-
-    def cancelJob(self):
-        self.parent.printerJobCancel(self.printer)
-
-    def moveXP(self):
-        self.parent.printerMoveAction(self.printer, "x", int(self.parent.jogMoveLength), True)
-
-    def moveXM(self):
-        self.parent.printerMoveAction(self.printer, "x", -1 * int(self.parent.jogMoveLength), True)
-
-    def moveYP(self):
-        self.parent.printerMoveAction(self.printer, "y", int(self.parent.jogMoveLength), True)
-
-    def moveYM(self):
-        self.parent.printerMoveAction(self.printer, "y", -1 * int(self.parent.jogMoveLength), True)
-
-    def moveZP(self):
-        self.parent.printerMoveAction(self.printer, "z", int(self.parent.jogMoveLength), True)
-
-    def moveZM(self):
-        self.parent.printerMoveAction(self.printer, "z", -1 * int(self.parent.jogMoveLength), True)
-
-    def homeX(self):
-        self.parent.printerHomingAction(self.printer, "x")
-
-    def homeY(self):
-        self.parent.printerHomingAction(self.printer, "y")
-
-    def homeZ(self):
-        self.parent.printerHomingAction(self.printer, "z")
-
-    def homeAll(self):
-        self.parent.printerHomingAction(self.printer, "xyz")
-
-    def turnOn(self):
-        if self.method == "psucontrol":
-            self.parent.printerOnAction(self.printer)
-        elif self.method == "system":
-            cmds = self.parent.getSystemCommands(self.printer[0], self.printer[1])
-            for cmd in cmds:
-                if "on" in cmd:
-                    self.parent.setSystemCommand(self.printer[0], self.printer[1], cmd)
-                    break
-
-    def turnOff(self):
-        if self.method == "psucontrol":
-            self.parent.printerOffAction(self.printer)
-        elif self.method == "system":
-            cmds = self.parent.getSystemCommands(self.printer[0], self.printer[1])
-            for cmd in cmds:
-                if "off" in cmd:
-                    self.parent.setSystemCommand(self.printer[0], self.printer[1], cmd)
-                    break
-
-    def cooldown(self):
-        self.parent.printerCooldown(self.printer)
-
-    def preheatTool(self):
-        self.parent.printerHeatTool(self.printer)
-
-    def preheatBed(self):
-        self.parent.printerHeatBed(self.printer)
-
-    def getHost(self):
-        return self.host
-
-    def sliderChanged(self):
-        self.slideLabel.setText(str(self.slider.value() * self.sliderFactor) + "ms")
-
-    def closeEvent(self, event):
-        self.reloadOn = False
-        self.url = ""
-        self.parent.removeWebcamWindow(self)
-
-    def scheduleLoadImage(self):
-        if self.reloadOn:
-            QTimer.singleShot(self.slider.value() * self.sliderFactor, self.loadImage)
-
-    def scheduleLoadStatus(self):
-        if self.reloadOn:
-            QTimer.singleShot(self.slider.value() * self.sliderFactor * self.statusDelayFactor, self.loadStatus)
-
-    def loadImage(self):
-        url = QUrl(self.url)
-        request = QtNetwork.QNetworkRequest(url)
-        self.manager.get(request)
-
-    def loadStatus(self):
-        s = "Status: "
-        t = self.parent.getTemperatureString(self.host, self.printer[1])
-        if len(t) > 0:
-            s += t
-        else:
-            s += "Unknown"
-
-        progress = self.parent.getProgress(self.host, self.printer[1])
-        if ("completion" in progress) and ("printTime" in progress) and ("printTimeLeft" in progress) and (progress["completion"] != None) and (progress["printTime"] != None) and (progress["printTimeLeft"] != None):
-            s += " - %.1f%%" % progress["completion"]
-            s += " - runtime "
-            s += time.strftime("%H:%M:%S", time.gmtime(progress["printTime"]))
-            s += " - "
-            s += time.strftime("%H:%M:%S", time.gmtime(progress["printTimeLeft"])) + " left"
-
-        self.statusLabel.setText(s)
-        self.scheduleLoadStatus()
-
-    def handleResponse(self, reply):
-        if reply.url().url() == self.url:
-            if reply.error() == QtNetwork.QNetworkReply.NoError:
-                reader = QImageReader(reply)
-                reader.setAutoTransform(True)
-                image = reader.read()
-                if image != None:
-                    if image.colorSpace().isValid():
-                        image.convertToColorSpace(QColorSpace.SRgb)
-                    self.img.setPixmap(QPixmap.fromImage(image))
-                    self.scheduleLoadImage()
-                else:
-                    print("Error decoding image: " + reader.errorString())
-            else:
-                print("Error loading image: " + reply.errorString())
-
-class MainWindow(QWidget):
-    def __init__(self, parent, *args, **kwargs):
-        super(MainWindow, self).__init__(*args, **kwargs)
-        self.parent = parent
-
-        self.mainLayout = QVBoxLayout()
-        self.setLayout(self.mainLayout)
-        self.mainLayout.addWidget(self.parent.menu)
-
-        self.parent.menu.aboutToHide.connect(self.aboutToHide)
-
-    def aboutToHide(self):
-        self.parent.menu.show()
-
-    def closeEvent(self, event):
-        self.parent.exit()
-        event.accept()
+from PyQt5 import QtNetwork
+from PyQt5.QtWidgets import QSystemTrayIcon, QAction, QMenu, QMessageBox, QDesktopWidget
+from PyQt5.QtGui import QIcon, QPixmap, QDesktopServices, QCursor
+from PyQt5.QtCore import QCoreApplication, QSettings, QUrl
+from CamWindow import CamWindow
+from SettingsWindow import SettingsWindow
+from MainWindow import MainWindow
 
 class OctoTray():
     name = "OctoTray"
@@ -696,7 +169,7 @@ class OctoTray():
 
         self.iconPathName = None
         for p in self.iconPaths:
-            if os.path.isfile(path.join(p, self.iconName)):
+            if path.isfile(path.join(p, self.iconName)):
                 self.iconPathName = path.join(p, self.iconName)
                 break
         if self.iconPathName == None:
@@ -1181,23 +654,3 @@ class OctoTray():
             self.trayIcon.setVisible(False)
         else:
             self.mainWindow.setVisible(False)
-
-if __name__ == "__main__":
-    app = QApplication(sys.argv)
-    app.setQuitOnLastWindowClosed(False)
-
-    signal.signal(signal.SIGINT, signal.SIG_DFL)
-
-    inSysTray = QSystemTrayIcon.isSystemTrayAvailable()
-    if ("windowed" in sys.argv) or ("--windowed" in sys.argv) or ("-w" in sys.argv):
-        inSysTray = False
-
-    tray = OctoTray(app, inSysTray)
-    rc = app.exec_()
-
-    while rc == 42:
-        tray.closeAll()
-        tray = OctoTray(app, inSysTray)
-        rc = app.exec_()
-
-    sys.exit(rc)

src/SettingsWindow.py

@@ -0,0 +1,224 @@
+#!/usr/bin/env python3
+
+# OctoTray Linux Qt System Tray OctoPrint client
+#
+# SettingsWindow.py
+#
+# UI for changes to application configuration.
+
+import string
+from PyQt5 import QtWidgets
+from PyQt5.QtWidgets import QWidget, QLabel, QVBoxLayout, QHBoxLayout, QTableWidget, QTableWidgetItem, QPushButton, QLineEdit, QGridLayout
+from PyQt5.QtGui import QFontDatabase, QIntValidator
+from PyQt5.QtCore import Qt
+
+class SettingsWindow(QWidget):
+    columns = [ "Hostname", "API Key", "Tool Preheat", "Bed Preheat" ]
+    presets = [ "octopi.local", "000000000_API_KEY_HERE_000000000", "0", "0" ]
+
+    def __init__(self, parent, *args, **kwargs):
+        super(SettingsWindow, self).__init__(*args, **kwargs)
+        self.parent = parent
+
+        self.setWindowTitle(parent.name + " Settings")
+        self.setWindowIcon(parent.icon)
+
+        box = QVBoxLayout()
+        self.setLayout(box)
+
+        staticSettings = QGridLayout()
+        box.addLayout(staticSettings, 0)
+
+        self.jogSpeedText = QLabel("Jog Speed")
+        staticSettings.addWidget(self.jogSpeedText, 0, 0)
+
+        self.jogSpeed = QLineEdit(str(self.parent.jogMoveSpeed))
+        self.jogSpeed.setValidator(QIntValidator(1, 6000))
+        staticSettings.addWidget(self.jogSpeed, 0, 1)
+
+        self.jogSpeedUnitText = QLabel("mm/min")
+        staticSettings.addWidget(self.jogSpeedUnitText, 0, 2)
+
+        self.jogLengthText = QLabel("Jog Length")
+        staticSettings.addWidget(self.jogLengthText, 1, 0)
+
+        self.jogLength = QLineEdit(str(self.parent.jogMoveLength))
+        self.jogLength.setValidator(QIntValidator(1, 100))
+        staticSettings.addWidget(self.jogLength, 1, 1)
+
+        self.jogLengthUnitText = QLabel("mm")
+        staticSettings.addWidget(self.jogLengthUnitText, 1, 2)
+
+        helpText = "Usage:\n"
+        helpText += "1st Column: Printer Hostname or IP address\n"
+        helpText += "2nd Column: OctoPrint API Key (32 char hexadecimal)\n"
+        helpText += "3rd Column: Tool Preheat Temperature (0 to disable)\n"
+        helpText += "4th Column: Bed Preheat Temperature (0 to disable)"
+        self.helpText = QLabel(helpText)
+        box.addWidget(self.helpText, 0)
+        box.setAlignment(self.helpText, Qt.AlignHCenter)
+
+        buttons = QHBoxLayout()
+        box.addLayout(buttons, 0)
+
+        self.add = QPushButton("&Add Printer")
+        self.add.clicked.connect(self.addPrinter)
+        buttons.addWidget(self.add)
+
+        self.remove = QPushButton("&Remove Printer")
+        self.remove.clicked.connect(self.removePrinter)
+        buttons.addWidget(self.remove)
+
+        printers = self.parent.readSettings()
+        self.rows = len(printers)
+        self.table = QTableWidget(self.rows, len(self.columns))
+        box.addWidget(self.table, 1)
+
+        for i in range(0, self.rows):
+            p = printers[i]
+            for j in range(0, len(self.columns)):
+                text = p[j]
+                if (j >= 2) and (j <= 3) and (text == None):
+                    text = "0"
+                item = QTableWidgetItem(text)
+                self.table.setItem(i, j, item)
+                if j == 1:
+                    font = item.font()
+                    font.setFamily(QFontDatabase.systemFont(QFontDatabase.FixedFont).family())
+                    item.setFont(font)
+
+        buttons2 = QHBoxLayout()
+        box.addLayout(buttons2, 0)
+
+        self.up = QPushButton("Move &Up")
+        self.up.clicked.connect(self.moveUp)
+        buttons2.addWidget(self.up)
+
+        self.down = QPushButton("Move &Down")
+        self.down.clicked.connect(self.moveDown)
+        buttons2.addWidget(self.down)
+
+        self.openWeb = QPushButton("&Open Web UI of selected")
+        self.openWeb.clicked.connect(self.openWebUI)
+        box.addWidget(self.openWeb, 0)
+
+        self.table.setHorizontalHeaderLabels(self.columns)
+        self.table.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustToContents)
+        self.table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows);
+        self.table.resizeColumnsToContents()
+
+        if self.rows <= 0:
+            self.addPrinter()
+
+    def tableToList(self):
+        printers = []
+        for i in range(0, self.rows):
+            p = []
+            for j in range(0, len(self.columns)):
+                text = self.table.item(i, j).text()
+                if (j >= 2) and (j <= 3) and (text == "0"):
+                    text = None
+                p.append(text)
+            printers.append(p)
+        return printers
+
+    def settingsValid(self, printers):
+        for p in printers:
+            # p[0] needs to be valid hostname or IP
+            # TODO
+
+            # p[1] needs to be valid API key (hexadecimal, 32 chars)
+            if (len(p[1]) != 32) or not all(c in string.hexdigits for c in p[1]):
+                return (False, "API Key not 32-digit hexadecimal")
+
+            # p[2] and p[3] need to be integer temperatures (0...999)
+            for s in [ p[2], p[3] ]:
+                if s == None:
+                    s = "0"
+                if (len(s) < 1) or (len(s) > 3) or not all(c in string.digits for c in s):
+                    return (False, "Temperature not a number from 0...999")
+
+        js = int(self.jogSpeed.text())
+        if (js < 1) or (js > 6000):
+            return (False, "Jog Speed not a number from 1...6000")
+
+        jl = int(self.jogLength.text())
+        if (jl < 1) or (jl > 100):
+            return (False, "Jog Length not a number from 1...100")
+
+        return (True, "")
+
+    def closeEvent(self, event):
+        oldPrinters = [item[0:len(self.columns)] for item in self.parent.printers]
+        newPrinters = self.tableToList()
+
+        valid, errorText = self.settingsValid(newPrinters)
+        if valid == False:
+            r = self.parent.showDialog(self.parent.name + " Settings Invalid", errorText + "!", "Do you want to edit it again?", True, True, False)
+            if r == True:
+                event.ignore()
+                return
+            else:
+                self.parent.removeSettingsWindow()
+                return
+
+        js = int(self.jogSpeed.text())
+        jl = int(self.jogLength.text())
+
+        if (oldPrinters != newPrinters) or (js != self.parent.jogMoveSpeed) or (jl != self.parent.jogMoveLength):
+            r = self.parent.showDialog(self.parent.name + " Settings Changed", "Do you want to save the new configuration?", "This will restart the application!", True, False, False)
+            if r == True:
+                self.parent.jogMoveSpeed = js
+                self.parent.jogMoveLength = jl
+                self.parent.writeSettings(newPrinters)
+                self.parent.restartApp()
+
+        self.parent.removeSettingsWindow()
+
+    def addPrinter(self):
+        self.rows += 1
+        self.table.setRowCount(self.rows)
+        for i in range(0, len(self.columns)):
+            item = QTableWidgetItem(self.presets[i])
+            self.table.setItem(self.rows - 1, i, item)
+            if i == 1:
+                font = item.font()
+                font.setFamily(QFontDatabase.systemFont(QFontDatabase.FixedFont).family())
+                item.setFont(font)
+        self.table.resizeColumnsToContents()
+        self.table.setCurrentItem(self.table.item(self.rows - 1, 0))
+
+    def removePrinter(self):
+        r = self.table.currentRow()
+        if (r >= 0) and (r < self.rows):
+            self.rows -= 1
+            self.table.removeRow(r)
+            self.table.setCurrentItem(self.table.item(min(r, self.rows - 1), 0))
+
+    def moveUp(self):
+        i = self.table.currentRow()
+        if i <= 0:
+            return
+        host = self.table.item(i, 0).text()
+        key = self.table.item(i, 1).text()
+        self.table.item(i, 0).setText(self.table.item(i - 1, 0).text())
+        self.table.item(i, 1).setText(self.table.item(i - 1, 1).text())
+        self.table.item(i - 1, 0).setText(host)
+        self.table.item(i - 1, 1).setText(key)
+        self.table.setCurrentItem(self.table.item(i - 1, 0))
+
+    def moveDown(self):
+        i = self.table.currentRow()
+        if i >= (self.rows - 1):
+            return
+        host = self.table.item(i, 0).text()
+        key = self.table.item(i, 1).text()
+        self.table.item(i, 0).setText(self.table.item(i + 1, 0).text())
+        self.table.item(i, 1).setText(self.table.item(i + 1, 1).text())
+        self.table.item(i + 1, 0).setText(host)
+        self.table.item(i + 1, 1).setText(key)
+        self.table.setCurrentItem(self.table.item(i + 1, 0))
+
+    def openWebUI(self):
+        host = self.table.item(self.table.currentRow(), 0).text()
+        self.parent.openBrowser(host)

src/main.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+
+# OctoTray Linux Qt System Tray OctoPrint client
+#
+# main.py
+#
+# Entry point for OctoTray application.
+# Depends on 'python-pyqt5'.
+
+import sys
+import signal
+from PyQt5.QtWidgets import QSystemTrayIcon, QApplication
+from OctoTray import OctoTray
+
+app = QApplication(sys.argv)
+app.setQuitOnLastWindowClosed(False)
+
+signal.signal(signal.SIGINT, signal.SIG_DFL)
+
+inSysTray = QSystemTrayIcon.isSystemTrayAvailable()
+if ("windowed" in sys.argv) or ("--windowed" in sys.argv) or ("-w" in sys.argv):
+    inSysTray = False
+
+tray = OctoTray(app, inSysTray)
+rc = app.exec_()
+
+while rc == 42:
+    tray.closeAll()
+    tray = OctoTray(app, inSysTray)
+    rc = app.exec_()
+
+sys.exit(rc)