feat: shortcuts for color setters

crates/rnote-engine/src/engine/mod.rs

@@ -895,6 +895,20 @@ impl Engine {
             .handle_animation_frame(&mut engine_view_mut!(self));
     }
 
+    pub fn text_insert(&mut self, text: String, pos: Option<na::Vector2<f64>>) -> WidgetFlags {
+        let mut widget_flags = WidgetFlags::default();
+        if let Pen::Typewriter(typewriter) = self.penholder.current_pen_mut() {
+            widget_flags |= typewriter.insert_text(text, pos, &mut engine_view_mut!(self));
+        }
+        widget_flags
+    }
+
+    pub fn is_typewriter_in_progress(&self) -> bool {
+        self.penholder.current_pen_style(&engine_view!(self)) == crate::pens::PenStyle::Typewriter
+            && self.penholder.current_pen_progress()
+                == rnote_compose::penevent::PenProgress::InProgress
+    }
+
     pub fn current_pen_style_w_override(&self) -> PenStyle {
         self.penholder
             .current_pen_style_w_override(&engine_view!(self))

crates/rnote-ui/data/ui/shortcuts.ui

@@ -104,6 +104,12 @@
                 <property name="accelerator">&lt;ctrl&gt;6</property>
               </object>
             </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="title" translatable="yes">Color Selection</property>
+                <property name="accelerator">1 2 3 4 5 6 7 8 9</property>
+              </object>
+            </child>
           </object>
         </child>
         <child>

crates/rnote-ui/src/appwindow/actions.rs

@@ -124,6 +124,46 @@ impl RnAppWindow {
         self.add_action(&action_active_tab_move_right);
         let action_active_tab_close = gio::SimpleAction::new("active-tab-close", None);
         self.add_action(&action_active_tab_close);
+
+        let color_setters = {
+            let p = self.overlays().colorpicker();
+            [
+                [p.setter_1(), p.setter_2(), p.setter_3()],
+                [p.setter_4(), p.setter_5(), p.setter_6()],
+                [p.setter_7(), p.setter_8(), p.setter_9()],
+            ]
+            .concat()
+        };
+        for (i, setter) in color_setters.into_iter().enumerate() {
+            let action = gio::SimpleAction::new(&format!("set-color-{}", i + 1), None);
+            self.add_action(&action);
+            action.connect_activate(clone!(
+                #[weak(rename_to=appwindow)]
+                self,
+                move |_, _| {
+                    if let Some(widget) = GtkWindowExt::focus(&appwindow)
+                        .and_then(|w| w.dynamic_cast::<gtk4::Editable>().ok())
+                    {
+                        widget.delete_selection();
+                        let mut p = widget.position();
+                        widget.insert_text(&format!("{}", i + 1), &mut p);
+                        widget.set_position(p);
+                        return;
+                    }
+                    let Some(canvas) = appwindow.active_tab_canvas() else {
+                        return;
+                    };
+                    if canvas.engine_ref().is_typewriter_in_progress() {
+                        let widget_flags =
+                            canvas.engine_mut().text_insert(format!("{}", i + 1), None);
+                        appwindow.handle_widget_flags(widget_flags, &canvas);
+                    } else {
+                        setter.set_active(true);
+                    }
+                }
+            ));
+        }
+
         let action_drawing_pad_pressed_button_0 =
             gio::SimpleAction::new("drawing-pad-pressed-button-0", None);
         self.add_action(&action_drawing_pad_pressed_button_0);
@@ -1066,6 +1106,12 @@ impl RnAppWindow {
         app.set_accels_for_action("win.pen-style::eraser", &["<Ctrl>4", "<Ctrl>KP_4"]);
         app.set_accels_for_action("win.pen-style::selector", &["<Ctrl>5", "<Ctrl>KP_5"]);
         app.set_accels_for_action("win.pen-style::tools", &["<Ctrl>6", "<Ctrl>KP_6"]);
+        (1..=9).for_each(|i| {
+            app.set_accels_for_action(
+                &format!("win.set-color-{i}"),
+                &[&format!("{i}"), &format!("KP_{i}")],
+            )
+        });
 
         // shortcuts for devel build
         if config::PROFILE.to_lowercase().as_str() == "devel" {