project hard fork

Dockerfile

@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # We cache go get gtk, to speed up builds.
 #RUN go get -tags ${GO_TAGS} -v github.com/gotk3/gotk3/gtk/...
 
-ADD . ${GOPATH}/src/github.com/mcuadros/OctoPrint-TFT/
+ADD . ${GOPATH}/src/github.com/Z-Bolt/OctoScreen/
 #RUN go get -tags ${GO_TAGS} -v ./...
 
-WORKDIR ${GOPATH}/src/github.com/mcuadros/OctoPrint-TFT/
+WORKDIR ${GOPATH}/src/github.com/Z-Bolt/OctoScreen/

LICENSE

@@ -629,7 +629,7 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    OctoPrint-TFT: A OctoPrint touch interface for TFT touch modules
+    OctoScreen: A OctoPrint touch interface for TFT touch modules
     Copyright (C) 2018 Máximo Cuadros Ortiz
 
     This program is free software: you can redistribute it and/or modify

Makefile

@@ -28,7 +28,7 @@ JESSIE_GO_TAGS := gtk_3_14
 # Build information
 #GIT_COMMIT = $(shell git rev-parse HEAD | cut -c1-7)
 #DEV_PREFIX := 1.0
-VERSION := 1.3
+VERSION := 2.0
 BUILD_DATE ?= $(shell date --utc +%Y%m%d-%H:%M:%S)
 #BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
 
@@ -37,7 +37,7 @@ BUILD_DATE ?= $(shell date --utc +%Y%m%d-%H:%M:%S)
 #endif
 
 # Package information
-PACKAGE_NAME = octoprint-tft
+PACKAGE_NAME = octoscreen
 
 # we export the variable to allow envsubst, substitute the vars in the
 # Dockerfiles
@@ -68,7 +68,7 @@ build-internal: prepare-internal
 prepare-internal:
 	dch --create -v $(VERSION)-1 --package $(PACKAGE_NAME) empty; \
 	cd $(WORKDIR)/..; \
-	tar -czf octoprint-tft_$(VERSION).orig.tar.gz --exclude-vcs OctoPrint-TFT
+	tar -czf octoscreen_$(VERSION).orig.tar.gz --exclude-vcs OctoScreen
 
 clean:
 	rm -rf ${BUILD_PATH}

README.md

@@ -57,13 +57,13 @@ sudo apt-get install xserver-xorg xinit
 ### Installation on Raspbian/OctoPi (recommended)
 
 The recommended way to install *OctoPrint-TFT* is use the `.deb` packages
-from the [Releases](https://github.com/mcuadros/OctoPrint-TFT/releases) page. The packages
+from the [Releases](https://github.com/Z-Bolt/OctoPrint-TFT/releases) page. The packages
 are available for Debian based distributions such as Raspbian and OctoPi for
 versions `jessie` and `stretch`.
 
 For example for a Raspbian Jessie:
 ```sh
-> wget https://github.com/mcuadros/OctoPrint-TFT/releases/download/v0.1.0/octoprint-tft_0.1.0-1.jessie_armhf.deb
+> wget https://github.com/Z-Bolt/OctoPrint-TFT/releases/download/v0.1.0/octoprint-tft_0.1.0-1.jessie_armhf.deb
 > dpkg -i octoprint-tft_0.1.0-1.jessie_armhf.deb
 ```
 

debian/control

@@ -1,21 +1,21 @@
-Source: octoprint-tft
+Source: octoscreen
 Section: devel
 Priority: optional
 Maintainer: Debian Go Packaging Team <[email protected]>
-Uploaders: Máximo Cuadros <mcuadros@gmail.com>
+Uploaders: Máximo Cuadros <aleksei.wm@gmail.com>
 Build-Depends: debhelper (>= 9),
                dh-golang,
                dh-systemd,
                libcairo2-dev (>= 1.14.0),
                libgtk-3-dev (>= 3.14)
 Standards-Version: 4.1.1
-Homepage: https://github.com/mcuadros/OctoPrint-TFT
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-go/packages/octoprint-tft.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-go/packages/octoprint-tft.git
-XS-Go-Import-Path: github.com/mcuadros/OctoPrint-TFT
+Homepage: https://github.com/Z-Bolt/OctoScreen
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-go/packages/octoscreen.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-go/packages/octoscreen.git
+XS-Go-Import-Path: github.com/Z-Bolt/OctoScreen
 Testsuite: autopkgtest-pkg-go
 
-Package: octoprint-tft
+Package: octoscreen
 Architecture: any
 Built-Using: ${misc:Built-Using}
 Depends: ${shlibs:Depends},
@@ -26,7 +26,7 @@ Depends: ${shlibs:Depends},
          xinit
 Provides: x-display-manager
 Description: A OctoPrint touch interface for TFT touch modules based on GTK+3
- OctoPrint-TFT OctoPrint-TFT, a touch interface for TFT touch modules
+ OOctoScreen OOctoScreen, a touch interface for TFT touch modules
  based on GTK+3.
  .
  Is a X application to be executed directly in the X Server without any

debian/copyright

@@ -1,13 +1,13 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: OctoPrint-TFT
-Source: https://github.com/mcuadros/OctoPrint-TFT
+Upstream-Name: OctoScreen
+Source: https://github.com/Z-Bolt/OctoScreen
 
 Files: *
 Copyright: 2017 Máximo Cuadros
 License: MIT License
 
 Files: debian/*
-Copyright: 2017 Máximo Cuadros <mcuadros@gmail.com>
+Copyright: 2017 Máximo Cuadros <aleksei.wm@gmail.com>
 License: MIT License
 Comment: Debian packaging is licensed under the same terms as upstream
 

debian/local/insserv.conf.d/octoscreen

@@ -0,0 +1 @@
+$x-display-manager octoscreen

debian/local/octoprint-tft-environment → debian/local/octoscreen/config

@@ -1,24 +1,25 @@
 # Location of the OctoPrint's config.yaml file. If empty the file will
 # be search at the `pi` home folder or the current user. Only used for locally
 # installed OctoPrint servers.
-OCTOPRINT_CONFIG_FILE=/home/octoprint/.octoprint/config.yaml
+OCTOPRINT_CONFIG_FILE=/home/pi/.octoprint/config.yaml
 
 # OctoPrint HTTP address, example `http://localhost:5000`, if OctoPrint is
 # locally installed will be read from the config file.
 OCTOPRINT_HOST=http://localhost:5000
 
-# OctoPrint-TFT expects an API key to be supplied. This API key can be either
+# OctoScreen expects an API key to be supplied. This API key can be either
 # the globally configured one or a user specific one if “Access Control”.
 # http://docs.octoprint.org/en/master/api/general.html, if OctoPrint is
 # locally installed will be read from the config file.
 OCTOPRINT_APIKEY=
 
 # Location of the application theme.
-OCTOPRINT_TFT_STYLE_PATH=/opt/octoprint-tft/styles/z-bolt/
+
+OCTOSCREEN_STYLE_PATH=/opt/octoscreen/styles/z-bolt/
 
 # Resolution of the application, should be configured to the resolution of your
 # screen, for example 800x480. By default 480x320.
-OCTOPRINT_TFT_RESOLUTION=
+OCTOSCREEN_RESOLUTION=
 
 # Location of file for logging (Optional)
-OCTOPRINT_TFT_LOG_FILE=
+OCTOSCREEN_LOG_FILE=

debian/octoprint-tft.config → debian/octoscreen.config

@@ -9,7 +9,7 @@ set -e
 # source debconf library
 . /usr/share/debconf/confmodule
 
-THIS_PACKAGE=octoprint-tft
+THIS_PACKAGE=octoscreen
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
 # set default display manager

debian/octoscreen.install

@@ -0,0 +1,2 @@
+debian/local/octoscreen	etc
+debian/local/insserv.conf.d			    etc

debian/octoprint-tft.postinst → debian/octoscreen.postinst

@@ -4,7 +4,7 @@ set -e
 
 . /usr/share/debconf/confmodule
 
-THIS_PACKAGE=octoprint-tft
+THIS_PACKAGE=octoscreen
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
 # debconf is not a registry, so we only fiddle with the default file if

debian/octoprint-tft.service → debian/octoscreen.service

@@ -1,14 +1,14 @@
 [Unit]
-Description=OctoPrint-TFT
+Description=OctoScreen
 Conflicts[email protected]
 After=systemd-user-sessions.service [email protected] plymouth-quit.service
 
 [Service]
 Type=notify
 NotifyAccess=all
-EnvironmentFile=/etc/octoprint-tft-environment
-ExecStart=/usr/bin/xinit /usr/bin/OctoPrint-TFT -- :0 -nolisten tcp -nocursor
-ExecStartPost=/etc/disablescreenblank.sh 0
+EnvironmentFile=/etc/octoscreen/config
+ExecStart=/usr/bin/xinit /usr/bin/OctoScreen -- :0 -nolisten tcp -nocursor
+ExecStartPost=/etc/octoscreen/disablescreenblank.sh 0
 StandardOutput=journal
 Restart=always
 WatchdogSec=10s

debian/rules

@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export DH_VERBOSE := 1
-export DH_GOPKG := github.com/mcuadros/OctoPrint-TFT
+export DH_GOPKG := github.com/Z-Bolt/OctoScreen
 export DH_GOLANG_INSTALL_ALL := 1
 export DH_GOLANG_EXCLUDES := vendor
 
@@ -22,9 +22,9 @@ override_dh_golang:
 	# dh_golang errors out because the go compiler used was not installed via a package. Therefore the step is skipped
 
 override_dh_install:
-	mkdir -p $(CURDIR)/debian/octoprint-tft/opt/octoprint-tft/
-	cp -r styles $(CURDIR)/debian/octoprint-tft/opt/octoprint-tft/
-	rm -rf $(CURDIR)/debian/octoprint-tft/usr/share/gocode
+	mkdir -p $(CURDIR)/debian/octoscreen/opt/octoscreen/
+	cp -r styles $(CURDIR)/debian/octoscreen/opt/octoscreen/
+	rm -rf $(CURDIR)/debian/octoscreen/usr/share/gocode
 	dh_install -XLICENSE
 
 override_dh_auto_test:

debian/watch

@@ -1,4 +1,4 @@
 version=3
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/octoprint-tft-\$1\.tar\.gz/,\
+opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/octoscreen-\$1\.tar\.gz/,\
 uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/\$1~\$2\$3/ \
-  https://github.com/mcuadros/OctoPrint-TFT/tags .*/v?(\d\S*)\.tar\.gz
+  https://github.com/Z-Bolt/OctoScreen/tags .*/v?(\d\S*)\.tar\.gz

main.go

@@ -9,14 +9,14 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/Z-Bolt/OctoScreen/ui"
 	"github.com/gotk3/gotk3/gtk"
-	"github.com/mcuadros/OctoPrint-TFT/ui"
 	"gopkg.in/yaml.v1"
 )
 
 const (
-	EnvStylePath  = "OCTOPRINT_TFT_STYLE_PATH"
-	EnvResolution = "OCTOPRINT_TFT_RESOLUTION"
+	EnvStylePath  = "OCTOSCREEN_STYLE_PATH"
+	EnvResolution = "OCTOSCREEN_RESOLUTION"
 	EnvBaseURL    = "OCTOPRINT_HOST"
 	EnvAPIKey     = "OCTOPRINT_APIKEY"
 	EnvConfigFile = "OCTOPRINT_CONFIG_FILE"