Nemcio/DemonEditor
1
0
Fork 0
mirror of https://github.com/DYefremov/DemonEditor.git synced 2026-07-01 00:27:26 +02:00
Code Issues Packages Projects Releases Activity

setting background color for the services

Browse Source
This commit is contained in:
DYefremov
2018-12-23 16:15:48 +03:00
parent ea1d536c6c
commit 0a06b36f60
7 changed files with 514 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/properties.py
View File

@@ -45,7 +45,8 @@ def get_default_settings():
"services_path": "/etc/enigma2/", "user_bouquet_path": "/etc/enigma2/",
"satellites_xml_path": "/etc/tuxbox/", "data_dir_path": DATA_PATH + "enigma2/",
"picons_path": "/usr/share/enigma2/picon", "picons_dir_path": DATA_PATH + "enigma2/picons/",
"v5_support": False, "http_api_support": False},
"v5_support": False, "http_api_support": False,
"use_colors": True, "new_color": "rgb(255,230,204)", "extra_color": "rgb(179,230,204)"},
Profile.NEUTRINO_MP.value: {
"host": "127.0.0.1", "port": "21", "user": "root", "password": "root",
"http_user": "", "http_password": "", "http_port": "80", "http_timeout": 2,

65
app/ui/main_app_window.py
View File

@@ -21,8 +21,8 @@ from app.ui.backup import BackupDialog
from .download_dialog import DownloadDialog
from .iptv import IptvDialog, SearchUnavailableDialog, IptvListConfigurationDialog
from .search import SearchProvider
from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, LOCKED_ICON, HIDE_ICON, IPTV_ICON, MOVE_KEYS, KeyboardKey, \
NEW_COLOR, EXTRA_COLOR, Column
from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, LOCKED_ICON, HIDE_ICON, IPTV_ICON, MOVE_KEYS, KeyboardKey, Column, \
EXTRA_COLOR, NEW_COLOR
from .dialogs import show_dialog, DialogType, get_chooser_dialog, WaitDialog, get_message
from .main_helper import insert_marker, move_items, rename, ViewTarget, set_flags, locate_in_services, \
scroll_to, get_base_model, update_picons_data, copy_picon_reference, assign_picon, remove_picon, \
@@ -166,6 +166,10 @@ class Application(Gtk.Application):
# http api
self._http_api = None
self._monitor_signal = False
# Colors
self._use_colors = False
self._NEW_COLOR = None # Color for new services in the main list
self._EXTRA_COLOR = None # Color for services with a extra name for the bouquet
builder = Gtk.Builder()
builder.set_translation_domain("demon-editor")
@@ -199,7 +203,6 @@ class Application(Gtk.Application):
# Status bar
self._ip_label = builder.get_object("ip_label")
self._ip_label.set_text(self._options.get(self._profile).get("host"))
self.update_profile_label()
self._receiver_info_box = builder.get_object("receiver_info_box")
self._receiver_info_label = builder.get_object("receiver_info_label")
self._signal_box = builder.get_object("signal_box")
@@ -213,7 +216,6 @@ class Application(Gtk.Application):
self._tv_count_label = builder.get_object("tv_count_label")
self._radio_count_label = builder.get_object("radio_count_label")
self._data_count_label = builder.get_object("data_count_label")
self.init_drag_and_drop() # drag and drop
# Force ctrl press event for view. Multiple selections in lists only with Space key(as in file managers)!!!
self._services_view.connect("key-press-event", self.force_ctrl)
self._fav_view.connect("key-press-event", self.force_ctrl)
@@ -239,6 +241,9 @@ class Application(Gtk.Application):
def do_startup(self):
Gtk.Application.do_startup(self)
self.update_profile_label()
self.init_drag_and_drop()
self.init_colors()
self.init_http_api()
def do_activate(self):
@@ -275,6 +280,44 @@ class Application(Gtk.Application):
self._bouquets_view.drag_dest_add_text_targets()
self._bouquets_view.drag_source_add_text_targets()
def init_colors(self, update=False):
""" Initialisation of background colors for the services.
If update=False - first call on program start, else - after options changes!
"""
profile = Profile(self._profile)
if profile is Profile.ENIGMA_2:
opts = self._options.get(self._profile)
self._use_colors = opts.get("use_colors", False)
if self._use_colors:
new_rgb = Gdk.RGBA()
extra_rgb = Gdk.RGBA()
new_rgb = new_rgb if new_rgb.parse(opts.get("new_color", NEW_COLOR)) else None
extra_rgb = extra_rgb if extra_rgb.parse(opts.get("extra_color", EXTRA_COLOR)) else None
if update:
gen = self.update_background_colors(new_rgb, extra_rgb)
GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
else:
self._NEW_COLOR = new_rgb
self._EXTRA_COLOR = extra_rgb
def update_background_colors(self, new_color, extra_color):
if extra_color != self._EXTRA_COLOR:
for row in self._fav_model:
if row[Column.FAV_BACKGROUND]:
row[Column.FAV_BACKGROUND] = extra_color
yield True
if new_color != self._NEW_COLOR:
for row in self._services_model:
if row[Column.SRV_BACKGROUND]:
row[Column.SRV_BACKGROUND] = new_color
yield True
self._NEW_COLOR = new_color
self._EXTRA_COLOR = extra_color
yield True
def force_ctrl(self, view, event):
""" Function for force ctrl press event for view """
event.state |= Gdk.ModifierType.CONTROL_MASK
@@ -799,15 +842,14 @@ class Application(Gtk.Application):
GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
def append_services_data(self, services):
profile = Profile(self._profile)
for srv in services:
tooltip, background = None, None
if profile is Profile.ENIGMA_2:
if self._use_colors:
flags = srv.flags_cas
if flags:
f_flags = list(filter(lambda x: x.startswith("f:"), flags.split(",")))
if f_flags and Flag.is_new(int(f_flags[0][2:])):
background = NEW_COLOR
background = self._NEW_COLOR
s = srv + (tooltip, background)
itr = self._services_model.append(s)
@@ -945,7 +987,7 @@ class Application(Gtk.Application):
if ex_services:
ex_srv_name = ex_services.get(srv_id)
if srv:
tooltip, background = None, EXTRA_COLOR if ex_srv_name else None
tooltip, background = None, self._EXTRA_COLOR if self._use_colors and ex_srv_name else None
self._fav_model.append((num + 1, srv.coded, ex_srv_name if ex_srv_name else srv.service, srv.locked,
srv.hide, srv.service_type, srv.pos, srv.fav_id,
self._picons.get(srv.picon_id, None), tooltip, background))
@@ -995,6 +1037,7 @@ class Application(Gtk.Application):
self.update_services_counts()
self.update_profile_label()
self.init_colors(True)
self.init_http_api()
def on_tree_view_key_press(self, view, event):
@@ -1568,6 +1611,7 @@ class Application(Gtk.Application):
self._services,
self._bouquets.get(self._bq_selected, None),
Profile(self._profile),
self._NEW_COLOR,
Action.EDIT).show()
self.on_locate_in_services(view)
@@ -1576,7 +1620,8 @@ class Application(Gtk.Application):
self._services_view,
self._fav_view,
self._services,
self._bouquets)
self._bouquets,
self._NEW_COLOR)
dialog.show()
def on_services_add_new(self, item):
@@ -1648,7 +1693,7 @@ class Application(Gtk.Application):
self._extra_bouquets[self._bq_selected] = {fav_id: response}
model.set(model.get_iter(paths), {Column.FAV_SERVICE: response, Column.FAV_TOOLTIP: None,
Column.FAV_BACKGROUND: EXTRA_COLOR})
Column.FAV_BACKGROUND: self._EXTRA_COLOR})
def on_set_default_name_for_bouquet(self, item):
selection = get_selection(self._fav_view, self._main_window)

38
app/ui/main_window.glade
View File

@@ -209,7 +209,7 @@ Author: Dmitriy Yefremov
<!-- column-name tooltip -->
<column type="gchararray"/>
<!-- column-name background -->
<column type="gchararray"/>
<column type="GdkRGBA"/>
</columns>
<signal name="row-deleted" handler="on_model_changed" swapped="no"/>
<signal name="row-inserted" handler="on_model_changed" swapped="no"/>
@@ -919,7 +919,7 @@ Author: Dmitriy Yefremov
<!-- column-name tooltip -->
<column type="gchararray"/>
<!-- column-name background -->
<column type="gchararray"/>
<column type="GdkRGBA"/>
</columns>
<signal name="row-deleted" handler="on_model_changed" swapped="no"/>
</object>
@@ -1741,6 +1741,7 @@ Author: Dmitriy Yefremov
<property name="xpad">2</property>
</object>
<attributes>
<attribute name="cell-background-rgba">21</attribute>
<attribute name="pixbuf">2</attribute>
</attributes>
</child>
@@ -1750,7 +1751,7 @@ Author: Dmitriy Yefremov
<property name="width_chars">25</property>
</object>
<attributes>
<attribute name="foreground">21</attribute>
<attribute name="cell-background-rgba">21</attribute>
<attribute name="text">3</attribute>
</attributes>
</child>
@@ -1759,6 +1760,7 @@ Author: Dmitriy Yefremov
<property name="xpad">2</property>
</object>
<attributes>
<attribute name="cell-background-rgba">21</attribute>
<attribute name="pixbuf">4</attribute>
</attributes>
</child>
@@ -1767,6 +1769,7 @@ Author: Dmitriy Yefremov
<property name="xpad">2</property>
</object>
<attributes>
<attribute name="cell-background-rgba">21</attribute>
<attribute name="pixbuf">5</attribute>
</attributes>
</child>
@@ -1786,6 +1789,7 @@ Author: Dmitriy Yefremov
<property name="width_chars">15</property>
</object>
<attributes>
<attribute name="cell-background-rgba">21</attribute>
<attribute name="text">6</attribute>
</attributes>
</child>
@@ -1804,6 +1808,7 @@ Author: Dmitriy Yefremov
<property name="xalign">0.51999998092651367</property>
</object>
<attributes>
<attribute name="cell-background-rgba">21</attribute>
<attribute name="text">7</attribute>
</attributes>
</child>
@@ -1817,6 +1822,7 @@ Author: Dmitriy Yefremov
<child>
<object class="GtkCellRendererPixbuf" id="picon_cellrendererpixbuf"/>
<attributes>
<attribute name="cell-background-rgba">21</attribute>
<attribute name="pixbuf">8</attribute>
</attributes>
</child>
@@ -1848,6 +1854,7 @@ Author: Dmitriy Yefremov
<property name="xalign">0.50999999046325684</property>
</object>
<attributes>
<attribute name="cell-background-rgba">21</attribute>
<attribute name="text">10</attribute>
</attributes>
</child>
@@ -1866,6 +1873,7 @@ Author: Dmitriy Yefremov
<property name="xalign">0.50999999046325684</property>
</object>
<attributes>
<attribute name="cell-background-rgba">21</attribute>
<attribute name="text">11</attribute>
</attributes>
</child>
@@ -1884,6 +1892,7 @@ Author: Dmitriy Yefremov
<property name="xalign">0.50999999046325684</property>
</object>
<attributes>
<attribute name="cell-background-rgba">21</attribute>
<attribute name="text">12</attribute>
</attributes>
</child>
@@ -1902,6 +1911,7 @@ Author: Dmitriy Yefremov
<property name="xalign">0.50999999046325684</property>
</object>
<attributes>
<attribute name="cell-background-rgba">21</attribute>
<attribute name="text">13</attribute>
</attributes>
</child>
@@ -1920,6 +1930,7 @@ Author: Dmitriy Yefremov
<property name="xalign">0.50999999046325684</property>
</object>
<attributes>
<attribute name="cell-background-rgba">21</attribute>
<attribute name="text">14</attribute>
</attributes>
</child>
@@ -1938,6 +1949,7 @@ Author: Dmitriy Yefremov
<property name="xalign">0.50999999046325684</property>
</object>
<attributes>
<attribute name="cell-background-rgba">21</attribute>
<attribute name="text">15</attribute>
</attributes>
</child>
@@ -1955,6 +1967,7 @@ Author: Dmitriy Yefremov
<property name="xalign">0.50999999046325684</property>
</object>
<attributes>
<attribute name="cell-background-rgba">21</attribute>
<attribute name="text">16</attribute>
</attributes>
</child>
@@ -2007,10 +2020,7 @@ Author: Dmitriy Yefremov
</attributes>
</child>
<child>
<object class="GtkCellRendererText" id="background_cellrenderertext"/>
<attributes>
<attribute name="text">21</attribute>
</attributes>
<object class="GtkCellRendererPixbuf" id="background_cellrenderertext"/>
</child>
</object>
</child>
@@ -2240,6 +2250,7 @@ Author: Dmitriy Yefremov
<property name="max_width_chars">5</property>
</object>
<attributes>
<attribute name="cell-background-rgba">10</attribute>
<attribute name="text">0</attribute>
</attributes>
</child>
@@ -2256,6 +2267,7 @@ Author: Dmitriy Yefremov
<property name="xpad">2</property>
</object>
<attributes>
<attribute name="cell-background-rgba">10</attribute>
<attribute name="pixbuf">8</attribute>
</attributes>
</child>
@@ -2264,6 +2276,7 @@ Author: Dmitriy Yefremov
<property name="xpad">2</property>
</object>
<attributes>
<attribute name="cell-background-rgba">10</attribute>
<attribute name="pixbuf">1</attribute>
</attributes>
</child>
@@ -2273,7 +2286,7 @@ Author: Dmitriy Yefremov
<property name="width_chars">25</property>
</object>
<attributes>
<attribute name="foreground">10</attribute>
<attribute name="cell-background-rgba">10</attribute>
<attribute name="text">2</attribute>
</attributes>
</child>
@@ -2282,6 +2295,7 @@ Author: Dmitriy Yefremov
<property name="xpad">2</property>
</object>
<attributes>
<attribute name="cell-background-rgba">10</attribute>
<attribute name="pixbuf">3</attribute>
</attributes>
</child>
@@ -2290,6 +2304,7 @@ Author: Dmitriy Yefremov
<property name="xpad">2</property>
</object>
<attributes>
<attribute name="cell-background-rgba">10</attribute>
<attribute name="pixbuf">4</attribute>
</attributes>
</child>
@@ -2306,6 +2321,7 @@ Author: Dmitriy Yefremov
<property name="xalign">0.50999999046325684</property>
</object>
<attributes>
<attribute name="cell-background-rgba">10</attribute>
<attribute name="text">5</attribute>
</attributes>
</child>
@@ -2321,6 +2337,7 @@ Author: Dmitriy Yefremov
<property name="xalign">0.50999999046325684</property>
</object>
<attributes>
<attribute name="cell-background-rgba">10</attribute>
<attribute name="text">6</attribute>
</attributes>
</child>
@@ -2349,10 +2366,7 @@ Author: Dmitriy Yefremov
</attributes>
</child>
<child>
<object class="GtkCellRendererText" id="fav_background_cellrenderertext"/>
<attributes>
<attribute name="text">10</attribute>
</attributes>
<object class="GtkCellRendererPixbuf" id="fav_background_cellrenderertext"/>
</child>
</object>
</child>

7
app/ui/service_details_dialog.py
View File

@@ -6,7 +6,7 @@ from app.eparser import Service
from app.eparser.ecommons import MODULATION, Inversion, ROLL_OFF, Pilot, Flag, Pids, POLARIZATION, \
get_key_by_value, get_value_by_name, FEC_DEFAULT, PLS_MODE, SERVICE_TYPE
from app.properties import Profile
from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, HIDE_ICON, TEXT_DOMAIN, CODED_ICON, Column, NEW_COLOR
from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, HIDE_ICON, TEXT_DOMAIN, CODED_ICON, Column
from .dialogs import show_dialog, DialogType, Action
from .main_helper import get_base_model
@@ -31,7 +31,7 @@ class ServiceDetailsDialog:
_DIGIT_ENTRY_NAME = "digit-entry"
def __init__(self, transient, options, srv_view, fav_view, services, bouquets, action=Action.EDIT):
def __init__(self, transient, options, srv_view, fav_view, services, bouquets, new_color, action=Action.EDIT):
handlers = {"on_system_changed": self.on_system_changed,
"on_save": self.on_save,
"on_create_new": self.on_create_new,
@@ -58,6 +58,7 @@ class ServiceDetailsDialog:
self._old_service = None
self._services = services
self._bouquets = bouquets
self._new_color = new_color
self._transponder_services_iters = None
self._current_model = None
self._current_itr = None
@@ -370,7 +371,7 @@ class ServiceDetailsDialog:
if flags:
f_flags = list(filter(lambda x: x.startswith("f:"), flags.split(",")))
if f_flags and Flag.is_new(int(f_flags[0][2:])):
extra_data[Column.SRV_BACKGROUND] = NEW_COLOR
extra_data[Column.SRV_BACKGROUND] = self._new_color
self._current_model.set(self._current_itr, extra_data)
self._current_model.set(self._current_itr, {i: v for i, v in enumerate(service)})

733
app/ui/settings_dialog.glade
View File

@@ -33,11 +33,6 @@ Author: Dmitriy Yefremov
<!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
<!-- interface-copyright 2018 Dmitriy Yefremov -->
<!-- interface-authors Dmitriy Yefremov -->
<object class="GtkImage" id="reset_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-revert-to-saved</property>
</object>
<object class="GtkAdjustment" id="telnet_timeout_adjustment">
<property name="lower">1</property>
<property name="upper">10</property>
@@ -61,7 +56,7 @@ Author: Dmitriy Yefremov
<property name="skip_pager_hint">True</property>
<property name="gravity">center</property>
<child type="titlebar">
<object class="GtkHeaderBar">
<object class="GtkHeaderBar" id="header_bar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Options</property>
@@ -69,35 +64,21 @@ Author: Dmitriy Yefremov
<property name="spacing">2</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkBox">
<object class="GtkButton" id="ok_button">
<property name="width_request">48</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Ok</property>
<property name="always_show_image">True</property>
<child>
<object class="GtkButton" id="ok_button">
<property name="width_request">48</property>
<object class="GtkImage" id="ok_button_image">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Ok</property>
<property name="always_show_image">True</property>
<child>
<object class="GtkImage" id="ok_button_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-apply</property>
</object>
</child>
<property name="can_focus">False</property>
<property name="stock">gtk-apply</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="apply_button">
@@ -119,6 +100,31 @@ Author: Dmitriy Yefremov
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="reset_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Reset profile</property>
<property name="halign">end</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_bottom">5</property>
<property name="always_show_image">True</property>
<signal name="clicked" handler="on_reset" swapped="no"/>
<child>
<object class="GtkImage" id="reset_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-revert-to-saved</property>
</object>
</child>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
<child internal-child="vbox">
@@ -140,7 +146,7 @@ Author: Dmitriy Yefremov
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="position">2</property>
</packing>
</child>
<child>
@@ -169,8 +175,8 @@ Author: Dmitriy Yefremov
<object class="GtkBox" id="network_main_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
<property name="margin_right">10</property>
<property name="margin_left">6</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="orientation">vertical</property>
<child>
@@ -225,88 +231,6 @@ Author: Dmitriy Yefremov
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="stack_switcher_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkStackSwitcher" id="stack_switcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="stack">settings_stack</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkSpinner" id="test_spinner">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="test_connection_button">
<property name="label" translatable="yes">Test</property>
<property name="width_request">110</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Test connection</property>
<property name="image">test_button_image</property>
<property name="always_show_image">True</property>
<signal name="clicked" handler="on_connection_test" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkStack" id="settings_stack">
<property name="visible">True</property>
@@ -403,6 +327,98 @@ Author: Dmitriy Yefremov
<property name="title" translatable="yes">FTP</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="http_grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">2</property>
<property name="margin_bottom">5</property>
<property name="row_spacing">2</property>
<property name="column_spacing">2</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Login:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Password:</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="http_login_field">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="primary_icon_name">avatar-default-symbolic</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Port:</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="http_port_field">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">5</property>
<property name="width_chars">6</property>
<property name="max_width_chars">6</property>
<property name="text" translatable="yes">80</property>
<property name="primary_icon_name">network-workgroup-symbolic</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="http_password_field">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="visibility">False</property>
<property name="invisible_char">●</property>
<property name="text">root</property>
<property name="primary_icon_name">emblem-readonly</property>
<property name="primary_icon_activatable">False</property>
<property name="input_purpose">password</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
</object>
<packing>
<property name="name">http</property>
<property name="title" translatable="yes">HTTP</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="telnet_grid">
<property name="visible">True</property>
@@ -519,99 +535,89 @@ Author: Dmitriy Yefremov
<packing>
<property name="name">telnet</property>
<property name="title" translatable="yes">Telnet</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="stack_switcher_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkStackSwitcher" id="stack_switcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="stack">settings_stack</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="http_grid">
<object class="GtkSpinner" id="test_spinner">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="test_connection_button">
<property name="label" translatable="yes">Test</property>
<property name="width_request">110</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Test connection</property>
<property name="image">test_button_image</property>
<property name="always_show_image">True</property>
<signal name="clicked" handler="on_connection_test" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">2</property>
<property name="margin_bottom">5</property>
<property name="row_spacing">2</property>
<property name="column_spacing">2</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Login:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Password:</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="http_login_field">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="primary_icon_name">avatar-default-symbolic</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Port:</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="http_port_field">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">5</property>
<property name="width_chars">6</property>
<property name="max_width_chars">6</property>
<property name="text" translatable="yes">80</property>
<property name="primary_icon_name">network-workgroup-symbolic</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="http_password_field">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="visibility">False</property>
<property name="invisible_char">●</property>
<property name="text">root</property>
<property name="primary_icon_name">emblem-readonly</property>
<property name="primary_icon_activatable">False</property>
<property name="input_purpose">password</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
<placeholder/>
</child>
</object>
<packing>
<property name="name">http</property>
<property name="title" translatable="yes">HTTP</property>
<property name="position">2</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
</object>
@@ -701,8 +707,8 @@ Author: Dmitriy Yefremov
<object class="GtkBox" id="paths_main_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
<property name="margin_right">10</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="orientation">vertical</property>
<child>
@@ -837,7 +843,6 @@ Author: Dmitriy Yefremov
<object class="GtkFrame" id="local_file_paths_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
<property name="label_xalign">0.019999999552965164</property>
<property name="shadow_type">in</property>
<child>
@@ -929,7 +934,7 @@ Author: Dmitriy Yefremov
</packing>
</child>
<child>
<object class="GtkBox" id="profile_main_box">
<object class="GtkBox" id="program_main_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -937,9 +942,9 @@ Author: Dmitriy Yefremov
<object class="GtkFrame" id="settings_profile_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
<property name="margin_right">10</property>
<property name="margin_top">5</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_bottom">5</property>
<property name="label_xalign">0.019999999552965164</property>
<property name="shadow_type">in</property>
<child>
@@ -958,7 +963,6 @@ Author: Dmitriy Yefremov
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">center</property>
<property name="margin_top">5</property>
<property name="draw_indicator">True</property>
<property name="group">neutrino_radio_button</property>
<signal name="toggled" handler="on_profile_changed" swapped="no"/>
@@ -971,13 +975,11 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkRadioButton" id="neutrino_radio_button">
<property name="label">Neutrino-MP
(experimental)</property>
<property name="label">Neutrino-MP(experimental)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">center</property>
<property name="margin_top">5</property>
<property name="draw_indicator">True</property>
<property name="group">enigma_radio_button</property>
</object>
@@ -1004,29 +1006,167 @@ Author: Dmitriy Yefremov
</packing>
</child>
<child>
<object class="GtkFrame">
<object class="GtkBox" id="program_box">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
<property name="margin_right">10</property>
<property name="margin_top">10</property>
<property name="label_xalign">0.019999999552965164</property>
<property name="shadow_type">in</property>
<property name="margin_top">5</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<object class="GtkFrame" id="program_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_bottom">5</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkGrid">
<object class="GtkBox" id="parogram_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_bottom">5</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="set_color_switch_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">10</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Set background color for the services</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="set_color_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
<signal name="state-set" handler="on_set_color_switch_state" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="colors_grid">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="row_spacing">5</property>
<property name="column_spacing">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Marked as new:</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkColorButton" id="new_color_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">With an extra name in the bouquet:</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkColorButton" id="extra_color_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="extra_profile_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="label_xalign">0.019999999552965164</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkGrid" id="extra_support_grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">start</property>
<property name="margin_left">10</property>
<property name="margin_right">10</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="margin_bottom">10</property>
<property name="row_spacing">5</property>
<property name="column_spacing">10</property>
<property name="column_spacing">50</property>
<property name="column_homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="support_ver5_check_button">
<property name="label" translatable="yes">Ver. 5 support
@@ -1056,147 +1196,23 @@ Author: Dmitriy Yefremov
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<child type="label">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
<property name="margin_right">10</property>
<property name="margin_top">10</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Set text color for the services</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkSwitch">
<property name="visible">True</property>
<property name="can_focus">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
<property name="label" translatable="yes">Extra:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="row_spacing">5</property>
<property name="column_spacing">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Marked as new:</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkColorButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">With an extra name in the bouquet:</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkColorButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkButton" id="reset_button">
<property name="label" translatable="yes">Reset profile</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_bottom">5</property>
<property name="image">reset_image</property>
<property name="always_show_image">True</property>
<signal name="clicked" handler="on_reset" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child type="label">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Extra:</property>
</object>
<child>
<placeholder/>
</child>
</object>
<packing>
@@ -1207,8 +1223,8 @@ Author: Dmitriy Yefremov
</child>
</object>
<packing>
<property name="name">profile</property>
<property name="title" translatable="yes">Profile</property>
<property name="name">program</property>
<property name="title" translatable="yes">Program</property>
<property name="position">2</property>
</packing>
</child>
@@ -1223,9 +1239,12 @@ Author: Dmitriy Yefremov
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
<action-widgets>

63
app/ui/settings_dialog.py
View File

@@ -1,9 +1,12 @@
from enum import Enum
from gi.repository import Gdk
from app.commons import run_task, run_idle
from app.connections import test_telnet, test_ftp, TestException, test_http
from app.properties import write_config, Profile, get_default_settings
from .uicommons import Gtk, UI_RESOURCES_PATH, TEXT_DOMAIN
from app.ui.dialogs import get_message
from .uicommons import Gtk, UI_RESOURCES_PATH, TEXT_DOMAIN, NEW_COLOR, EXTRA_COLOR
from .main_helper import update_entry_data
@@ -26,7 +29,8 @@ class SettingsDialog:
"on_reset": self.on_reset,
"apply_settings": self.apply_settings,
"on_connection_test": self.on_connection_test,
"on_info_bar_close": self.on_info_bar_close}
"on_info_bar_close": self.on_info_bar_close,
"on_set_color_switch_state": self.on_set_color_switch_state}
builder = Gtk.Builder()
builder.set_translation_domain(TEXT_DOMAIN)
@@ -35,6 +39,8 @@ class SettingsDialog:
self._dialog = builder.get_object("settings_dialog")
self._dialog.set_transient_for(transient)
self._header_bar = builder.get_object("header_bar")
# Network
self._host_field = builder.get_object("host_field")
self._port_field = builder.get_object("port_field")
self._login_field = builder.get_object("login_field")
@@ -46,28 +52,41 @@ class SettingsDialog:
self._telnet_password_field = builder.get_object("telnet_password_field")
self._telnet_port_field = builder.get_object("telnet_port_field")
self._telnet_timeout_spin_button = builder.get_object("telnet_timeout_spin_button")
self._settings_stack = builder.get_object("settings_stack")
# Paths
self._services_field = builder.get_object("services_field")
self._user_bouquet_field = builder.get_object("user_bouquet_field")
self._satellites_xml_field = builder.get_object("satellites_xml_field")
self._data_dir_field = builder.get_object("data_dir_field")
self._picons_field = builder.get_object("picons_field")
self._picons_dir_field = builder.get_object("picons_dir_field")
# Info bar
self._info_bar = builder.get_object("info_bar")
self._message_label = builder.get_object("info_bar_message_label")
self._test_spinner = builder.get_object("test_spinner")
# Profile
self._enigma_radio_button = builder.get_object("enigma_radio_button")
self._neutrino_radio_button = builder.get_object("neutrino_radio_button")
self._support_ver5_check_button = builder.get_object("support_ver5_check_button")
self._support_http_api_check_button = builder.get_object("support_http_api_check_button")
self._settings_stack = builder.get_object("settings_stack")
self._info_bar = builder.get_object("info_bar")
self._message_label = builder.get_object("info_bar_message_label")
self._test_spinner = builder.get_object("test_spinner")
# Program
self._program_box = builder.get_object("program_box")
self._colors_grid = builder.get_object("colors_grid")
self._set_color_switch = builder.get_object("set_color_switch")
self._new_color_button = builder.get_object("new_color_button")
self._extra_color_button = builder.get_object("extra_color_button")
# Options
self._options = options
self._active_profile = options.get("profile")
self.set_settings()
profile = Profile(self._active_profile)
self.init_ui_elements(Profile(self._active_profile))
def init_ui_elements(self, profile):
is_enigma_profile = profile is Profile.ENIGMA_2
self._neutrino_radio_button.set_active(profile is Profile.NEUTRINO_MP)
self._support_ver5_check_button.set_sensitive(profile is not Profile.NEUTRINO_MP)
self._support_http_api_check_button.set_sensitive(profile is not Profile.NEUTRINO_MP)
self._settings_stack.get_child_by_name(Property.HTTP.value).set_visible(profile is not Profile.NEUTRINO_MP)
self._settings_stack.get_child_by_name(Property.HTTP.value).set_visible(is_enigma_profile)
self._program_box.set_sensitive(is_enigma_profile)
self.update_subtitle(profile)
def show(self):
response = self._dialog.run()
@@ -85,10 +104,13 @@ class SettingsDialog:
def on_profile_changed(self, item):
profile = Profile.ENIGMA_2 if self._enigma_radio_button.get_active() else Profile.NEUTRINO_MP
self._settings_stack.get_child_by_name(Property.HTTP.value).set_visible(profile is not Profile.NEUTRINO_MP)
self.set_profile(profile)
self._support_ver5_check_button.set_sensitive(profile is Profile.ENIGMA_2)
self._support_http_api_check_button.set_sensitive(profile is Profile.ENIGMA_2)
self._active_profile = profile.value
self.set_settings()
self.init_ui_elements(profile)
def update_subtitle(self, profile):
sub = "{} Enigma2" if profile is Profile.ENIGMA_2 else "{} Neutrino-MP"
self._header_bar.set_subtitle(sub.format(get_message("Profile:")))
def set_profile(self, profile):
self._active_profile = profile.value
@@ -127,6 +149,13 @@ class SettingsDialog:
if Profile(self._active_profile) is Profile.ENIGMA_2:
self._support_ver5_check_button.set_active(options.get("v5_support", False))
self._support_http_api_check_button.set_active(options.get("http_api_support", False))
self._set_color_switch.set_active(options.get("use_colors", False))
new_rgb = Gdk.RGBA()
new_rgb.parse(options.get("new_color", NEW_COLOR))
extra_rgb = Gdk.RGBA()
extra_rgb.parse(options.get("extra_color", EXTRA_COLOR))
self._new_color_button.set_rgba(new_rgb)
self._extra_color_button.set_rgba(extra_rgb)
def apply_settings(self, item=None):
profile = Profile.ENIGMA_2 if self._enigma_radio_button.get_active() else Profile.NEUTRINO_MP
@@ -153,6 +182,9 @@ class SettingsDialog:
if profile is Profile.ENIGMA_2:
options["v5_support"] = self._support_ver5_check_button.get_active()
options["http_api_support"] = self._support_http_api_check_button.get_active()
options["use_colors"] = self._set_color_switch.get_active()
options["new_color"] = self._new_color_button.get_rgba().to_string()
options["extra_color"] = self._extra_color_button.get_rgba().to_string()
write_config(self._options)
@@ -214,6 +246,9 @@ class SettingsDialog:
def on_info_bar_close(self, bar=None, resp=None):
self._info_bar.set_visible(False)
def on_set_color_switch_state(self, switch, state):
self._colors_grid.set_sensitive(state)
if __name__ == "__main__":
pass

4
app/ui/uicommons.py
View File

@@ -27,8 +27,8 @@ TV_ICON = theme.load_icon("tv-symbolic", 16, 0) if theme.lookup_icon("tv-symboli
IPTV_ICON = theme.load_icon("emblem-shared", 16, 0) if theme.load_icon("emblem-shared", 16, 0) else None
# Colors
NEW_COLOR = "#ff5c33" # Color for new services in the main list
EXTRA_COLOR = "#33adff" # Color for services with a extra name for the bouquet
NEW_COLOR = "rgb(255,230,204)" # Color for new services in the main list
EXTRA_COLOR = "rgb(179,230,204)" # Color for services with a extra name for the bouquet
class KeyboardKey(Enum):