diff --git a/LICENSE b/LICENSE index 250a261d..5a64f413 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Dmitriy Yefremov +Copyright (c) 2018 Dmitriy Yefremov Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 51afcc18..a9b0123a 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,27 @@ # DemonEditor -Enigma2 channel and satellites list editor for GNU/Linux. -Experimental support of Neutrino-MP or others on the same basis (BPanther, etc). -Focused on the convenience of working in lists from the keyboard. The mouse is also fully supported (Drag and Drop etc) +Enigma2 channel and satellites list editor for GNU/Linux. +Experimental support of Neutrino-MP or others on the same basis (BPanther, etc). +Focused on the convenience of working in lists from the keyboard. The mouse is also fully supported (Drag and Drop etc) Keyboard shortcuts: -Ctrl + X, C, V, Up, Down, PageUp, PageDown, S, T, E, L, H, Space; Insert, Delete, F2. -Insert - copies the selected channels from the main list to the bouquet or inserts (creates) a new bouquet. -Ctrl + X - only in bouquet list. Ctrl + C - only in services list. -Clipboard is "rubber". There is an accumulation before the insertion! -Ctrl + E, F2 - edit/rename. -Ctrl + S, T, E in Satellites edit tool for create and edit satellite or transponder. -Ctrl + L - parental lock. -Ctrl + H - hide/skip. +Ctrl + X, C, V, Up, Down, PageUp, PageDown, S, T, E, L, H, Space; Insert, Delete, F2. +Insert - copies the selected channels from the main list to the bouquet or inserts (creates) a new bouquet. +Ctrl + X - only in bouquet list. Ctrl + C - only in services list. +Clipboard is "rubber". There is an accumulation before the insertion! +Ctrl + E, F2 - edit/rename. +Ctrl + S, T, E in Satellites edit tool for create and edit satellite or transponder. +Ctrl + L - parental lock. +Ctrl + H - hide/skip. -Ability to import IPTV into bouquet from m3u files! +Ability to import IPTV into bouquet from m3u files! -Tests only on OpenPLi based image with GM 990 Spark Reloaded receiver -in my preferred linux distro (Last Linux Mint 18.* - MATE 64-bit)! +Tests only in image based on OpenPLi or last BPanther(neutrino) images with GM 990 Spark Reloaded receiver +in my preferred linux distro (Last Linux Mint 18.* - MATE 64-bit)! Minimum requirements: Python >= 3.5.2 and GTK+ 3 with PyGObject bindings. Terrestrial and cable channels at the moment are not supported! +Note. To create a simple debian package, you can use the build-deb.sh + diff --git a/app/ui/__init__.py b/app/ui/__init__.py index e24b2f8b..cdd99b27 100644 --- a/app/ui/__init__.py +++ b/app/ui/__init__.py @@ -1,9 +1,11 @@ import gi +import os gi.require_version('Gtk', '3.0') from gi.repository import Gtk, Gdk -UI_RESOURCES_PATH = "app/ui/" # path to *.glade files +# path to *.glade files +UI_RESOURCES_PATH = "app/ui/" if os.path.exists("app/ui/") else "/usr/share/demoneditor/app/ui/" theme = Gtk.IconTheme.get_default() _IMAGE_MISSING = theme.load_icon("image-missing", 16, 0) if theme.lookup_icon("image-missing", 16, 0) else None diff --git a/app/ui/dialogs.glade b/app/ui/dialogs.glade index fbc14183..b05d25d0 100644 --- a/app/ui/dialogs.glade +++ b/app/ui/dialogs.glade @@ -10,7 +10,7 @@ normal DemonEditor 0.2.0 Pre-alpha - 2017 Dmitriy Yefremov + 2018 Dmitriy Yefremov dmitry.v.yefremov@gmail.com Enigma2 channel and satellites list editor for GNU/Linux diff --git a/build-deb.sh b/build-deb.sh new file mode 100644 index 00000000..5aa8295b --- /dev/null +++ b/build-deb.sh @@ -0,0 +1,19 @@ +#!/bin/env bash +VER="0.2.0_Pre-alpha" +B_PATH="dist/DemonEditor" +DEB_PATH="$B_PATH/usr/share/demoneditor" + +mkdir -p $B_PATH +cp -TRv deb $B_PATH +cp -Rv app $DEB_PATH +cp -Rv start.py $DEB_PATH + +cd dist +fakeroot dpkg-deb --build DemonEditor +mv DemonEditor.deb DemonEditor_$VER.deb + +rm -R DemonEditor + + + + diff --git a/deb/DEBIAN/control b/deb/DEBIAN/control index f972dcd6..17dbecfd 100644 --- a/deb/DEBIAN/control +++ b/deb/DEBIAN/control @@ -1,5 +1,5 @@ Package: DemonEditor -Version: 0.1.1-Pre-alpha +Version: 0.2.0-Pre-alpha Section: utils Priority: optional Architecture: all diff --git a/deb/DEBIAN/copyright b/deb/DEBIAN/copyright index 7c24661c..8a737879 100644 --- a/deb/DEBIAN/copyright +++ b/deb/DEBIAN/copyright @@ -5,7 +5,7 @@ Source: https://github.com/DYefremov/DemonEditor Files: * MIT License -Copyright (c) 2017 Dmitriy Yefremov +Copyright (c) 2018 Dmitriy Yefremov Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/deb/usr/share/demoneditor/LICENSE b/deb/usr/share/demoneditor/LICENSE index 250a261d..5a64f413 100644 --- a/deb/usr/share/demoneditor/LICENSE +++ b/deb/usr/share/demoneditor/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Dmitriy Yefremov +Copyright (c) 2018 Dmitriy Yefremov Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/deb/usr/share/demoneditor/README.md b/deb/usr/share/demoneditor/README.md index da4698e3..0158b037 100644 --- a/deb/usr/share/demoneditor/README.md +++ b/deb/usr/share/demoneditor/README.md @@ -1,23 +1,25 @@ # DemonEditor -Enigma2 channel and satellites list editor for GNU/Linux. -Focused on the convenience of working in lists from the keyboard. -The mouse is also fully supported (Drag and Drop etc) -Keyboard shortcuts: -Ctrl + X, C, V, Up, Down, PageUp, PageDown, S, T, E, L, H, Space; Insert, Delete, F2. -Insert - copies the selected channels from the main list to the bouquet or inserts (creates) a new bouquet. -Ctrl + X - only in bouquet list. -Ctrl + C - only in services list. Clipboard is "rubber". There is an accumulation before the insertion! -F2 - rename the bouquet. -Ctrl + S, T, E in Satellites edit tool for create and edit satellite or transponder. -Ctrl + L - parental lock. -Ctrl + H - hide/skip. +Enigma2 channel and satellites list editor for GNU/Linux. +Experimental support of Neutrino-MP or others on the same basis (BPanther, etc). +Focused on the convenience of working in lists from the keyboard. The mouse is also fully supported (Drag and Drop etc) -Ability to import IPTV into bouquet from m3u files! +Keyboard shortcuts: +Ctrl + X, C, V, Up, Down, PageUp, PageDown, S, T, E, L, H, Space; Insert, Delete, F2. +Insert - copies the selected channels from the main list to the bouquet or inserts (creates) a new bouquet. +Ctrl + X - only in bouquet list. Ctrl + C - only in services list. +Clipboard is "rubber". There is an accumulation before the insertion! +Ctrl + E, F2 - edit/rename. +Ctrl + S, T, E in Satellites edit tool for create and edit satellite or transponder. +Ctrl + L - parental lock. +Ctrl + H - hide/skip. -Tests only on OpenPLi based image with GM 990 Spark Reloaded receiver +Ability to import IPTV into bouquet from m3u files! + +Tests only in image based on OpenPLi or last BPanther(neutrino) images with GM 990 Spark Reloaded receiver in my preferred linux distro (Last Linux Mint 18.* - MATE 64-bit)! -Minimum requirements: Python >= 3.5.2 and GTK+ 3 with PyGObject bindings. +Minimum requirements: Python >= 3.5.2 and GTK+ 3 with PyGObject bindings. Terrestrial and cable channels at the moment are not supported! +