chore: Rename DaemonBoard to Board

Author: ids1024

backend/src/board.rs

@@ -7,12 +7,8 @@ use std::{cell::Cell, collections::HashMap, rc::Rc};
 
 use crate::{BoardId, Daemon, DerefCell, Key, KeyMap, Layer, Layout};
 
-// GObject
-// Add changed signal
-// Want DerefCell, I guess... Or use OnceCell
-
 #[derive(Default)]
-pub struct DaemonBoardInner {
+pub struct BoardInner {
     daemon: DerefCell<Rc<dyn Daemon>>,
     board: DerefCell<BoardId>,
     model: DerefCell<String>,
@@ -26,13 +22,13 @@ pub struct DaemonBoardInner {
 }
 
 #[glib::object_subclass]
-impl ObjectSubclass for DaemonBoardInner {
+impl ObjectSubclass for BoardInner {
     const NAME: &'static str = "S76DaemonBoard";
     type ParentType = glib::Object;
-    type Type = DaemonBoard;
+    type Type = Board;
 }
 
-impl ObjectImpl for DaemonBoardInner {
+impl ObjectImpl for BoardInner {
     fn signals() -> &'static [Signal] {
         static SIGNALS: Lazy<Vec<Signal>> = Lazy::new(|| {
             vec![
@@ -45,10 +41,10 @@ impl ObjectImpl for DaemonBoardInner {
 }
 
 glib::wrapper! {
-    pub struct DaemonBoard(ObjectSubclass<DaemonBoardInner>);
+    pub struct Board(ObjectSubclass<BoardInner>);
 }
 
-impl DaemonBoard {
+impl Board {
     pub fn new(daemon: Rc<dyn Daemon>, board: BoardId) -> Result<Self, String> {
         let model = match daemon.model(board) {
             Ok(model) => model,
@@ -73,7 +69,7 @@ impl DaemonBoard {
         let has_led_save = daemon.led_save(board).is_ok();
         let has_matrix = daemon.matrix_get(board).is_ok();
 
-        let self_ = glib::Object::new::<DaemonBoard>(&[]).unwrap();
+        let self_ = glib::Object::new::<Board>(&[]).unwrap();
         self_.inner().daemon.set(daemon);
         self_.inner().board.set(board);
         self_.inner().model.set(model);
@@ -99,8 +95,8 @@ impl DaemonBoard {
         Ok(self_)
     }
 
-    fn inner(&self) -> &DaemonBoardInner {
-        DaemonBoardInner::from_instance(self)
+    fn inner(&self) -> &BoardInner {
+        BoardInner::from_instance(self)
     }
 
     pub(crate) fn set_leds_changed(&self) {

backend/src/key.rs

@@ -1,11 +1,11 @@
 use glib::clone::Downgrade;
 use std::{cell::Cell, char};
 
-use crate::{DaemonBoard, Hs, PhysicalLayoutKey, Rect, Rgb};
+use crate::{Board, Hs, PhysicalLayoutKey, Rect, Rgb};
 
 #[derive(Debug)]
 pub struct Key {
-    pub(crate) board: glib::WeakRef<DaemonBoard>,
+    pub(crate) board: glib::WeakRef<Board>,
     // Logical position (row, column)
     pub logical: (u8, u8),
     // Logical name (something like K01, where 0 is the row and 1 is the column)
@@ -32,7 +32,7 @@ pub struct Key {
 }
 
 impl Key {
-    pub(crate) fn new(board: &DaemonBoard, physical_key: &PhysicalLayoutKey) -> Self {
+    pub(crate) fn new(board: &Board, physical_key: &PhysicalLayoutKey) -> Self {
         let logical = physical_key.logical;
         let physical = physical_key.physical;
         let physical_name = physical_key.physical_name.clone();
@@ -121,7 +121,7 @@ impl Key {
         }
     }
 
-    fn board(&self) -> DaemonBoard {
+    fn board(&self) -> Board {
         self.board.upgrade().unwrap()
     }
 

backend/src/layer.rs

@@ -1,20 +1,20 @@
 use glib::clone::Downgrade;
 use std::cell::Cell;
 
-use crate::{DaemonBoard, Hs, Mode, Rgb};
+use crate::{Board, Hs, Mode, Rgb};
 
 #[derive(Debug)]
 pub struct Layer {
     layer: u8,
     index: u8,
-    board: glib::WeakRef<DaemonBoard>,
+    board: glib::WeakRef<Board>,
     mode: Cell<Option<(u8, u8)>>,
     brightness: Cell<i32>,
     color: Cell<Hs>,
 }
 
 impl Layer {
-    pub(crate) fn new(board: &DaemonBoard, layer: u8) -> Self {
+    pub(crate) fn new(board: &Board, layer: u8) -> Self {
         let index = if board.layout().meta.has_per_layer {
             0xf0 + layer
         } else {
@@ -63,7 +63,7 @@ impl Layer {
         }
     }
 
-    fn board(&self) -> DaemonBoard {
+    fn board(&self) -> Board {
         self.board.upgrade().unwrap()
     }
 

src/application/backlight.rs

@@ -6,11 +6,11 @@ use once_cell::sync::Lazy;
 use std::cell::{Cell, RefCell};
 
 use crate::{DerefCell, KeyboardColor, KeyboardColorIndex, SelectedKeys};
-use backend::{DaemonBoard, Hs, Mode};
+use backend::{Board, Hs, Mode};
 
 #[derive(Default)]
 pub struct BacklightInner {
-    board: DerefCell<DaemonBoard>,
+    board: DerefCell<Board>,
     disable_color_button: DerefCell<gtk::Button>,
     keyboard_color: DerefCell<KeyboardColor>,
     color_row: DerefCell<gtk::ListBoxRow>,
@@ -208,7 +208,7 @@ glib::wrapper! {
 }
 
 impl Backlight {
-    pub fn new(board: DaemonBoard) -> Self {
+    pub fn new(board: Board) -> Self {
         let max_brightness = board.max_brightness() as f64;
         let has_led_save = board.has_led_save();
 
@@ -242,7 +242,7 @@ impl Backlight {
         BacklightInner::from_instance(self)
     }
 
-    fn board(&self) -> &DaemonBoard {
+    fn board(&self) -> &Board {
         &self.inner().board
     }
 

src/application/keyboard.rs

@@ -12,12 +12,12 @@ use std::{
 
 use super::{show_error_dialog, Backlight, KeyboardLayer, Page, Picker};
 use crate::{DerefCell, SelectedKeys};
-use backend::{DaemonBoard, KeyMap, Layout};
+use backend::{Board, KeyMap, Layout};
 
 #[derive(Default)]
 pub struct KeyboardInner {
     action_group: DerefCell<gio::SimpleActionGroup>,
-    board: DerefCell<DaemonBoard>,
+    board: DerefCell<Board>,
     page: Cell<Page>,
     picker: RefCell<WeakRef<Picker>>,
     selected: RefCell<SelectedKeys>,
@@ -164,7 +164,7 @@ glib::wrapper! {
 }
 
 impl Keyboard {
-    pub fn new(board: DaemonBoard, debug_layers: bool) -> Self {
+    pub fn new(board: Board, debug_layers: bool) -> Self {
         let keyboard: Self = glib::Object::new(&[]).unwrap();
 
         let backlight = cascade! {
@@ -202,7 +202,7 @@ impl Keyboard {
         self.inner().action_group.upcast_ref()
     }
 
-    pub fn board(&self) -> &DaemonBoard {
+    pub fn board(&self) -> &Board {
         &self.inner().board
     }
 

src/application/keyboard_layer.rs

@@ -9,7 +9,7 @@ use std::{
 
 use super::Page;
 use crate::{DerefCell, SelectedKeys};
-use backend::{DaemonBoard, Key, Layer, Rect, Rgb};
+use backend::{Board, Key, Layer, Rect, Rgb};
 
 const SCALE: f64 = 64.0;
 const MARGIN: f64 = 2.;
@@ -18,7 +18,7 @@ const RADIUS: f64 = 4.;
 #[derive(Default)]
 pub struct KeyboardLayerInner {
     page: Cell<Page>,
-    board: DerefCell<DaemonBoard>,
+    board: DerefCell<Board>,
     selected: RefCell<SelectedKeys>,
     selectable: Cell<bool>,
     multiple: Cell<bool>,
@@ -204,7 +204,7 @@ glib::wrapper! {
 }
 
 impl KeyboardLayer {
-    pub fn new(page: Page, board: DaemonBoard) -> Self {
+    pub fn new(page: Page, board: Board) -> Self {
         let (width, height) = board
             .keys()
             .iter()

src/application/main_window.rs

@@ -7,7 +7,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 
 use super::{shortcuts_window, ConfiguratorApp, Keyboard, KeyboardLayer, Page, Picker};
 use crate::DerefCell;
-use backend::{Daemon, DaemonBoard, DaemonClient, DaemonDummy, DaemonServer};
+use backend::{Board, Daemon, DaemonClient, DaemonDummy, DaemonServer};
 
 #[derive(Default)]
 pub struct MainWindowInner {
@@ -164,7 +164,7 @@ impl MainWindow {
         let daemon = daemon();
 
         for i in daemon.boards().expect("Failed to load boards") {
-            match DaemonBoard::new(daemon.clone(), i) {
+            match Board::new(daemon.clone(), i) {
                 Ok(board) => window.add_keyboard(board),
                 Err(err) => error!("{}", err),
             }
@@ -175,7 +175,7 @@ impl MainWindow {
             let daemon = Rc::new(DaemonDummy::new(phony_board_names));
 
             for i in daemon.boards().unwrap() {
-                match DaemonBoard::new(daemon.clone(), i) {
+                match Board::new(daemon.clone(), i) {
                     Ok(board) => window.add_keyboard(board),
                     Err(err) => error!("{}", err),
                 }
@@ -216,7 +216,7 @@ impl MainWindow {
         inner.picker.set_keyboard(Some(keyboard.clone()));
     }
 
-    fn add_keyboard(&self, board: DaemonBoard) {
+    fn add_keyboard(&self, board: Board) {
         let app: ConfiguratorApp = self.get_application().unwrap().downcast().unwrap();
 
         let keyboard = cascade! {

src/choose_color.rs

@@ -3,10 +3,10 @@ use glib::clone;
 use gtk::prelude::*;
 
 use crate::ColorWheel;
-use backend::{DaemonBoard, Hs, Mode};
+use backend::{Board, Hs, Mode};
 
 pub fn choose_color<W: IsA<gtk::Widget>, F: Fn(Option<Hs>) + 'static>(
-    board: DaemonBoard,
+    board: Board,
     w: &W,
     title: &'static str,
     color: Option<Hs>,

src/keyboard_backlight_widget.rs

@@ -6,7 +6,7 @@ use gtk::prelude::*;
 use std::rc::Rc;
 
 use crate::{KeyboardColor, KeyboardColorIndex};
-use backend::{Daemon, DaemonBoard, DaemonS76Power};
+use backend::{Board, Daemon, DaemonS76Power};
 
 pub fn keyboard_backlight_widget() -> gtk::Widget {
     let stack = cascade! {
@@ -37,7 +37,7 @@ fn add_boards(stack: &gtk::Stack) -> Result<(), String> {
     let daemon = Rc::new(DaemonS76Power::new()?);
 
     for i in daemon.boards()? {
-        match DaemonBoard::new(daemon.clone(), i) {
+        match Board::new(daemon.clone(), i) {
             Ok(board) => {
                 let name = board.model().to_owned();
                 stack.add_titled(&page(board), &name, &name);
@@ -49,7 +49,7 @@ fn add_boards(stack: &gtk::Stack) -> Result<(), String> {
     Ok(())
 }
 
-fn page(board: DaemonBoard) -> gtk::Widget {
+fn page(board: Board) -> gtk::Widget {
     let max_brightness = board.max_brightness() as f64;
     let brightness = board.layers()[0].brightness() as f64;
     let brightness_scale = cascade! {

src/keyboard_color.rs

@@ -8,7 +8,7 @@ use std::{
 };
 
 use crate::{choose_color, ColorCircle, DerefCell, SelectedKeys};
-use backend::{DaemonBoard, Hs};
+use backend::{Board, Hs};
 
 #[derive(Clone)]
 pub enum KeyboardColorIndex {
@@ -25,7 +25,7 @@ impl Default for KeyboardColorIndex {
 #[derive(Default)]
 pub struct KeyboardColorInner {
     circle: DerefCell<ColorCircle>,
-    board: RefCell<Option<DaemonBoard>>,
+    board: RefCell<Option<Board>>,
     hs: Cell<Hs>,
     index: RefCell<KeyboardColorIndex>,
 }
@@ -105,7 +105,7 @@ glib::wrapper! {
 }
 
 impl KeyboardColor {
-    pub fn new(board: Option<DaemonBoard>, index: KeyboardColorIndex) -> Self {
+    pub fn new(board: Option<Board>, index: KeyboardColorIndex) -> Self {
         cascade! {
             glib::Object::new::<Self>(&[]).unwrap();
             ..set_board(board);
@@ -133,7 +133,7 @@ impl KeyboardColor {
         );
     }
 
-    fn board(&self) -> Option<Ref<DaemonBoard>> {
+    fn board(&self) -> Option<Ref<Board>> {
         let board = self.inner().board.borrow();
         if board.is_some() {
             Some(Ref::map(board, |x| x.as_ref().unwrap()))
@@ -142,7 +142,7 @@ impl KeyboardColor {
         }
     }
 
-    pub fn set_board(&self, board: Option<DaemonBoard>) {
+    pub fn set_board(&self, board: Option<Board>) {
         self.inner().circle.set_sensitive(board.is_some());
         *self.inner().board.borrow_mut() = board;
         self.read_color();