leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

input: Special characters dialog

Browse source
This commit is contained in:
Ian Douglas Scott 2023-08-01 16:41:24 -07:00
parent 2a77cdacb4
commit e4d7c90f30
7 changed files with 253 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/app.rs
View file

@ -39,7 +39,8 @@ use crate::{
applets::{self, APPLET_DND_ICON_ID},
},
},
input, sound, system, time,
input::{self, keyboard},
sound, system, time,
},
subscription::desktop_files,
widget::{page_title, parent_page_button, search_header, sub_page_button},
@ -273,11 +274,11 @@ impl Application for SettingsApp {
crate::pages::Message::Input(message) => {
if matches!(message, input::Message::OpenKeyboardShortcuts) {
if let Some(id) = self.pages.page_id::<input::keyboard::shortcuts::Page>() {
self.activate_page(id);
return self.activate_page(id);
}
}
if let Some(page) = self.pages.page_mut::<input::Page>() {
page.update(message);
return page.update(message);
}
}
crate::pages::Message::External { .. } => {
@ -338,6 +339,16 @@ impl Application for SettingsApp {
{
return page.add_applet_view();
}
if let Some(Some(page)) =
(id == keyboard::ADD_INPUT_SOURCE_DIALOGUE_ID).then(|| self.pages.page::<input::Page>())
{
return page.add_input_source_view();
}
if let Some(Some(page)) = (id == keyboard::SPECIAL_CHARACTER_DIALOGUE_ID)
.then(|| self.pages.page::<input::Page>())
{
return page.special_character_key_view();
}
cosmic::iced::widget::responsive(|size| {
let is_condensed = (600.0 * self.scaling_factor) > size.width;

168
app/src/pages/input/keyboard/mod.rs
View file

@ -1,17 +1,67 @@
use apply::Apply;
use cosmic::iced::{
self,
widget::{self, horizontal_space},
Length,
use cosmic::{
iced::{
self,
widget::{self, horizontal_space},
window, Length,
},
iced_style, theme,
widget::settings,
};
use cosmic::iced_style;
use cosmic::widget::settings;
use cosmic_settings_page::Section;
use cosmic_settings_page::{self as page, section};
use cosmic_settings_page::{self as page, section, Section};
use slotmap::SlotMap;
use super::Message;
pub const ADD_INPUT_SOURCE_DIALOGUE_ID: window::Id = window::Id(2000);
pub const SPECIAL_CHARACTER_DIALOGUE_ID: window::Id = window::Id(2001);
static COMPOSE_OPTIONS: &[(&str, &str)] = &[
// ("Left Alt", "compose:lalt"), XXX?
("Right Alt", "compose:ralt"),
("Left Super", "compose:lwin"),
("Right Super", "compose:rwin"),
("Menu key", "compose:menu"),
("Right Ctrl", "compose:rctrl"),
("Caps Lock", "compose:caps"),
("Scroll Lock", "compose:sclk"),
("Print Screen", "compose:prsc"),
];
static ALTERNATE_CHARACTER_OPTIONS: &[(&str, &str)] = &[
("Left Alt", "lv3:lalt_switch"),
("Right Alt", "lv3:alt_switch"),
("Left Super", "lv3:lwin_switch"),
("Right Super", "lv3:win_switch"),
("Menu key", "lv3:menu_switch"),
// ("Right Ctrl", "lv3:"), XXX
("Caps Lock", "lv3:caps_switch"),
// ("Scroll Lock", "lv3:"), XXX
// ("Print Screen", "lv3"), XXX
];
#[derive(Copy, Clone, Debug)]
pub enum SpecialKey {
AlternateCharacters,
Compose,
}
impl SpecialKey {
pub fn title(self) -> String {
match self {
Self::Compose => "Compose".to_string(),
Self::AlternateCharacters => "Alternate Characters".to_string(),
}
}
pub fn prefix(self) -> &'static str {
match self {
Self::Compose => "compose:",
Self::AlternateCharacters => "lv3:",
}
}
}
fn popover_menu_row(label: String) -> cosmic::Element<'static, Message> {
widget::text(label)
.apply(widget::container)
@ -92,6 +142,68 @@ pub struct InputSource {
label: String,
}
impl super::Page {
pub fn add_input_source_view(&self) -> cosmic::Element<'static, crate::app::Message> {
widget::column![].into()
}
pub fn special_character_key_view(&self) -> cosmic::Element<'_, crate::app::Message> {
let Some(special_key) = self.special_character_dialog else {
return widget::text("").into();
};
let options = match special_key {
SpecialKey::Compose => COMPOSE_OPTIONS,
SpecialKey::AlternateCharacters => ALTERNATE_CHARACTER_OPTIONS,
};
let prefix = special_key.prefix();
let current = self
.xkb_options
.iter()
.find(|x| x.starts_with(prefix))
.map(String::as_str);
// TODO description, layout default
let mut list = cosmic::widget::list_column();
list = list.add(special_char_radio_row("None", None, current));
for (desc, id) in options {
list = list.add(special_char_radio_row(desc, Some(id), current));
}
widget::column![
cosmic::widget::header_bar()
.title(special_key.title())
.on_close(Message::CloseSpecialCharacterDialog),
cosmic::widget::container(
cosmic::widget::scrollable(cosmic::widget::container(list).padding(24))
.width(Length::Fill)
.height(Length::Fill)
)
.style(theme::Container::Background)
.width(Length::Fill)
.height(Length::Fill)
]
.apply(cosmic::Element::from)
.map(crate::pages::Message::Input)
.map(crate::app::Message::PageMessage)
}
}
fn special_char_radio_row<'a>(
desc: &'a str,
value: Option<&'static str>,
current_value: Option<&'a str>,
) -> cosmic::Element<'a, Message> {
settings::item_row(vec![iced::widget::radio(
desc,
value,
Some(current_value),
|_| Message::SpecialCharacterSelect(value),
)
.into()])
.into()
}
#[derive(Default)]
pub struct Page;
@ -161,8 +273,14 @@ fn special_character_entry() -> Section<crate::pages::Message> {
// TODO dialogs
settings::view_section(&section.title)
.add(settings::item(&descriptions[0], go_next_control()))
.add(settings::item(&descriptions[1], go_next_control()))
.add(go_next_item(
&descriptions[0],
Message::OpenSpecialCharacterDialog(SpecialKey::AlternateCharacters),
))
.add(go_next_item(
&descriptions[1],
Message::OpenSpecialCharacterDialog(SpecialKey::Compose),
))
.apply(cosmic::Element::from)
.map(crate::pages::Message::Input)
})
@ -172,21 +290,14 @@ fn keyboard_shortcuts() -> Section<crate::pages::Message> {
Section::default()
.title(fl!("keyboard-shortcuts"))
.descriptions(vec![fl!("keyboard-shortcuts", "desc")])
.view::<Page>(|binder, _page, section| {
.view::<Page>(|_binder, _page, section| {
let descriptions = &section.descriptions;
settings::view_section(&section.title)
.add(
settings::item(&descriptions[0], go_next_control())
.apply(widget::container)
.style(cosmic::theme::Container::custom(
cosmic::widget::list::column::style,
))
.apply(widget::button)
.style(cosmic::theme::Button::Transparent)
.padding(0)
.on_press(Message::OpenKeyboardShortcuts),
)
.add(go_next_item(
&descriptions[0],
Message::OpenKeyboardShortcuts,
))
.apply(cosmic::Element::from)
.map(crate::pages::Message::Input)
})
@ -199,3 +310,16 @@ fn go_next_control() -> cosmic::Element<'static, Message> {
)
.into()
}
fn go_next_item(description: &str, msg: Message) -> cosmic::Element<'_, Message> {
settings::item(description, go_next_control())
.apply(widget::container)
.style(cosmic::theme::Container::custom(
cosmic::widget::list::column::style,
))
.apply(widget::button)
.style(cosmic::theme::Button::Transparent)
.padding(0)
.on_press(msg)
.into()
}

9
app/src/pages/input/keyboard/shortcuts.rs
View file

@ -1,8 +1,5 @@
use apply::Apply;
use cosmic::iced::{
widget::{self, horizontal_space},
Length,
};
use cosmic::iced::widget;
use cosmic::widget::settings;
use cosmic::Element;
use cosmic_settings_page::Section;
@ -35,9 +32,9 @@ fn shortcuts() -> Section<crate::pages::Message> {
Section::default()
.descriptions(vec![])
.view::<Page>(|binder, _page, section| {
let descriptions = &section.descriptions;
let _descriptions = &section.descriptions;
let input = binder
let _input = binder
.page::<super::super::Page>()
.expect("input page not found");

62
app/src/pages/input/mod.rs
View file

@ -1,8 +1,23 @@
use crate::app;
use cosmic::{
iced::{self, wayland::actions::window::SctkWindowSettings, window},
iced_sctk::commands,
iced_widget::core::layout,
};
use cosmic_settings_page as page;
pub mod keyboard;
mod mouse;
#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
pub struct XkbConfig {
pub rules: String,
pub model: String,
pub layout: String,
pub variant: String,
pub options: Option<String>,
}
#[derive(Clone, Debug)]
pub enum Message {
SetAcceleration(bool),
@ -14,11 +29,16 @@ pub enum Message {
// seperate close message, to make sure another isn't closed?
ExpandInputSourcePopover(Option<String>),
OpenKeyboardShortcuts,
OpenSpecialCharacterDialog(keyboard::SpecialKey),
CloseSpecialCharacterDialog,
SpecialCharacterSelect(Option<&'static str>),
}
#[derive(derivative::Derivative)]
#[derivative(Default)]
pub struct Page {
// cosmic_config::Config
// Mouse
#[derivative(Default(value = "mouse::default_primary_button()"))]
primary_button: cosmic::widget::segmented_button::SingleSelectModel,
@ -32,11 +52,13 @@ pub struct Page {
expanded_source_popover: Option<String>,
#[derivative(Default(value = "keyboard::default_input_sources()"))]
sources: Vec<keyboard::InputSource>,
special_character_dialog: Option<keyboard::SpecialKey>,
xkb_options: Vec<String>,
}
impl Page {
// TODO
pub fn update(&mut self, message: Message) {
pub fn update(&mut self, message: Message) -> iced::Command<app::Message> {
match message {
Message::SetAcceleration(value) => {
self.acceleration = value;
@ -59,9 +81,45 @@ impl Page {
Message::ExpandInputSourcePopover(value) => {
self.expanded_source_popover = value;
}
// TODO Specially handled in app.rs
Message::OpenSpecialCharacterDialog(special_key) => {
self.special_character_dialog = Some(special_key);
let window_settings = SctkWindowSettings {
window_id: keyboard::SPECIAL_CHARACTER_DIALOGUE_ID,
app_id: Some("com.system76.CosmicSettings".to_string()),
title: Some(special_key.title()),
parent: Some(window::Id(0)),
autosize: false,
size_limits: layout::Limits::NONE
.min_width(300.0)
.max_width(800.0)
.min_height(200.0)
.max_height(1080.0),
size: (512, 420),
resizable: None,
client_decorations: true,
transparent: true,
};
return commands::window::get_window(window_settings);
}
Message::CloseSpecialCharacterDialog => {
self.special_character_dialog = None;
return commands::window::close_window(keyboard::SPECIAL_CHARACTER_DIALOGUE_ID);
}
Message::SpecialCharacterSelect(id) => {
if let Some(special_key) = self.special_character_dialog {
let prefix = special_key.prefix();
if let Some(idx) = self.xkb_options.iter().position(|x| x.starts_with(prefix)) {
self.xkb_options.remove(idx);
}
if let Some(id) = id {
self.xkb_options.push(id.to_string());
}
// TODO set in cosmic-config
}
}
Message::OpenKeyboardShortcuts => {}
}
iced::Command::none()
}
}

5
app/src/pages/input/mouse.rs
View file

@ -1,8 +1,5 @@
use apply::Apply;
use cosmic::iced::{
widget::{self, horizontal_space},
Length,
};
use cosmic::iced::widget;
use cosmic::widget::settings;
use cosmic::Element;
use cosmic_settings_page::Section;