mirror/piper
1
0
Fork 0
mirror of https://github.com/libratbag/piper.git synced 2026-04-24 16:28:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add LED page to configure LEDs"

Browse Source 
This reverts commit 8078ecd2ba.
This commit is contained in:
Peter Hutterer
2017-07-27 21:24:10 +10:00
committed by GitHub
parent dbe753dd7b
commit c8db491096
5 changed files with 1 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/piper.gresource.xml
View File

@@ -4,7 +4,6 @@
<file>404.svg</file>
<file preprocess="xml-stripblanks">AboutDialog.ui</file>
<file preprocess="xml-stripblanks">ui/LedDialog.ui</file>
<file preprocess="xml-stripblanks">ui/OptionButton.ui</file>
<file preprocess="xml-stripblanks">ui/ResolutionRow.ui</file>
<file preprocess="xml-stripblanks">ui/ResolutionsPage.ui</file>

440
data/ui/LedDialog.ui
View File

@@ -1,440 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustment_brightness">
<property name="upper">255</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment_effect_rate">
<property name="lower">100</property>
<property name="upper">20000</property>
<property name="step_increment">50</property>
<property name="page_increment">50</property>
</object>
<template class="LedDialog" parent="GtkDialog">
<property name="width_request">400</property>
<property name="height_request">300</property>
<property name="can_focus">False</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkStack" id="stack">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="transition_type">slide-left-right</property>
<child>
<object class="GtkColorChooserWidget" id="colorchooser">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="rgba">rgb(237,212,0)</property>
<property name="use_alpha">False</property>
</object>
<packing>
<property name="name">solid</property>
<property name="title" translatable="yes">Solid</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkScale">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment_brightness</property>
<property name="round_digits">0</property>
<property name="digits">0</property>
<property name="draw_value">False</property>
<property name="value_pos">right</property>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Brightness</property>
<property name="track_visited_links">False</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
<object class="GtkScale">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment_effect_rate</property>
<property name="round_digits">0</property>
<property name="digits">0</property>
<property name="value_pos">right</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Hz</property>
<property name="justify">right</property>
<property name="track_visited_links">False</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Effect rate</property>
<property name="track_visited_links">False</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="name">cycle</property>
<property name="title" translatable="yes">Cycle</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkColorButton" id="colorbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="title" translatable="yes">Pick a Color for the LED</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Color</property>
<property name="track_visited_links">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkScale">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment_brightness</property>
<property name="digits">0</property>
<property name="draw_value">False</property>
<property name="value_pos">right</property>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Brightness</property>
<property name="track_visited_links">False</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
<object class="GtkScale">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment_effect_rate</property>
<property name="round_digits">0</property>
<property name="digits">0</property>
<property name="value_pos">right</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Hz</property>
<property name="justify">right</property>
<property name="track_visited_links">False</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Effect rate</property>
<property name="track_visited_links">False</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="name">breathing</property>
<property name="title" translatable="yes">Breathing</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-missing-image</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">This LED is off</property>
<property name="justify">center</property>
<property name="track_visited_links">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="name">off</property>
<property name="title" translatable="yes">Off</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>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkButton" id="cancel">
<property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
</child>
<child type="title">
<object class="GtkStackSwitcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stack">stack</property>
</object>
</child>
<child>
<object class="GtkButton" id="apply">
<property name="label" translatable="yes">Apply</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<style>
<class name="suggested-action"/>
</style>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="cancel">cancel</action-widget>
<action-widget response="apply" default="true">apply</action-widget>
</action-widgets>
</template>
</interface>

88
piper/leddialog.py
View File

@@ -1,88 +0,0 @@
# Copyright (C) 2017 Jente Hidskes <hjdskes@gmail.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from .gi_composites import GtkTemplate
from .ratbagd import RatbagdLed
import gi
gi.require_version("Gtk", "3.0")
from gi.repository import Gdk, GObject, Gtk
@GtkTemplate(ui="/org/freedesktop/Piper/ui/LedDialog.ui")
class LedDialog(Gtk.Dialog):
"""A Gtk.Dialog subclass to implement the dialog that shows the
configuration options for the LED effects."""
__gtype_name__ = "LedDialog"
stack = GtkTemplate.Child()
colorchooser = GtkTemplate.Child()
colorbutton = GtkTemplate.Child()
adjustment_brightness = GtkTemplate.Child()
adjustment_effect_rate = GtkTemplate.Child()
def __init__(self, ratbagd_led, *args, **kwargs):
"""Instantiates a new LedDialog.
@param ratbagd_led The LED to configure, as ratbagd.RatbagdLed.
"""
Gtk.Dialog.__init__(self, *args, **kwargs)
self.init_template()
self._led = ratbagd_led
self._modes = {
"solid": RatbagdLed.MODE_ON,
"cycle": RatbagdLed.MODE_CYCLE,
"breathing": RatbagdLed.MODE_BREATHING,
"off": RatbagdLed.MODE_OFF
}
mode = self._led.mode
for k, v in self._modes.items():
if mode == v:
self.stack.set_visible_child_name(k)
rgba = self._get_led_color_as_rgba()
self.colorchooser.set_rgba(rgba)
self.colorbutton.set_rgba(rgba)
self.adjustment_brightness.set_value(self._led.brightness)
self.adjustment_effect_rate.set_value(self._led.effect_rate)
def _get_led_color_as_rgba(self):
# Helper function to convert ratbagd's 0-255 color range to a Gdk.RGBA
# with a 0.0-1.0 color range.
r, g, b = self._led.color
return Gdk.RGBA(r / 255.0, g / 255.0, b / 255.0, 1.0)
@GObject.Property
def mode(self):
visible_child = self.stack.get_visible_child_name()
return self._modes[visible_child]
@GObject.Property
def color(self):
if self.mode == RatbagdLed.MODE_ON:
rgba = self.colorchooser.get_rgba()
else:
rgba = self.colorbutton.get_rgba()
return (rgba.red * 255.0, rgba.green * 255.0, rgba.blue * 255.0)
@GObject.Property
def brightness(self):
return self.adjustment_brightness.get_value()
@GObject.Property
def effect_rate(self):
return self.adjustment_effect_rate.get_value()

92
piper/ledspage.py
View File

@@ -1,92 +0,0 @@
# Copyright (C) 2017 Jente Hidskes <hjdskes@gmail.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from gettext import gettext as _
from .leddialog import LedDialog
from .mousemap import MouseMap
from .optionbutton import OptionButton
from .ratbagd import RatbagdLed
import gi
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk
class LedsPage(Gtk.Box):
"""The third stack page, exposing the LED configuration."""
__gtype_name__ = "LedsPage"
def __init__(self, ratbagd_device, *args, **kwargs):
"""Instantiates a new LedsPage.
@param ratbag_device The ratbag device to configure, as
ratbagd.RatbagdDevice
"""
Gtk.Box.__init__(self, *args, **kwargs)
self._device = ratbagd_device
self._init_ui()
def _init_ui(self):
profile = self._device.active_profile
mousemap = MouseMap("#Leds", self._device, spacing=20, border_width=20)
self.pack_start(mousemap, True, True, 0)
sizegroup = Gtk.SizeGroup(Gtk.SizeGroupMode.HORIZONTAL)
for led in profile.leds:
index = led.index
mode = self._mode_to_string(led.mode)
button = OptionButton("LED {}: {}".format(index, mode))
button.connect("clicked", self._on_button_clicked, led)
led.connect("notify::mode", self._on_led_mode_changed, button)
mousemap.add(button, "#led{}".format(index))
sizegroup.add_widget(button)
def _on_led_mode_changed(self, led, pspec, button):
mode = self._mode_to_string(led.mode)
button.set_label("LED {}: {}".format(led.index, mode))
def _on_button_clicked(self, button, led):
# Presents the LedDialog to configure the LED corresponding to the
# clicked button.
dialog = LedDialog(led, transient_for=self.get_toplevel())
dialog.connect("response", self._on_dialog_response, button, led)
dialog.present()
def _on_dialog_response(self, dialog, response, button, led):
# The user either pressed cancel or apply. If it's apply, apply the
# changes before closing the dialog, otherwise just close the dialog.
if response == Gtk.ResponseType.APPLY:
led.mode = dialog.mode
led.color = dialog.color
led.brightness = dialog.brightness
led.effect_rate = dialog.effect_rate
dialog.destroy()
def _mode_to_string(self, mode):
# Converts a RatbagdLed mode to a string.
if mode == RatbagdLed.MODE_ON:
return _("solid")
elif mode == RatbagdLed.MODE_CYCLE:
return _("cycle")
elif mode == RatbagdLed.MODE_BREATHING:
return _("breathing")
elif mode == RatbagdLed.MODE_OFF:
return _("off")
else:
return _("n/a")

3
piper/window.py
View File

@@ -19,7 +19,6 @@ from gettext import gettext as _
from .gi_composites import GtkTemplate
from .ratbagd import RatbagErrorCode
from .resolutionspage import ResolutionsPage
from .ledspage import LedsPage
import gi
gi.require_version("Gtk", "3.0")
@@ -50,7 +49,7 @@ class Window(Gtk.ApplicationWindow):
self._device = self._fetch_ratbag_device()
self.stack.add_titled(ResolutionsPage(self._device), "resolutions", _("Resolutions"))
self.stack.add_titled(LedsPage(self._device), "leds", _("LEDs"))
self.stack.set_visible_child_name("resolutions")
def _fetch_ratbag_device(self):
"""Get the first ratbag device available. If there are multiple