s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

action: Rename file to action.rs

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2019-10-09 08:11:28 +00:00
parent ef38fd3e64
commit da5a83f367
5 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/data.rs
View File

@ -384,7 +384,7 @@ fn create_action(
button_info: &HashMap<String, ButtonMeta>,
name: &str,
view_names: Vec<&String>,
) -> ::symbol::Action {
) -> ::action::Action {
let default_meta = ButtonMeta::default();
let symbol_meta = button_info.get(name)
.unwrap_or(&default_meta);
@ -440,12 +440,12 @@ fn create_action(
};
match &symbol_meta.action {
Some(Action::SetView(view_name)) => ::symbol::Action::SetLevel(
Some(Action::SetView(view_name)) => ::action::Action::SetLevel(
filter_view_name(name, view_name.clone(), &view_names)
),
Some(Action::Locking {
lock_view, unlock_view
}) => ::symbol::Action::LockLevel {
}) => ::action::Action::LockLevel {
lock: filter_view_name(name, lock_view.clone(), &view_names),
unlock: filter_view_name(
name,
@ -453,14 +453,14 @@ fn create_action(
&view_names
),
},
Some(Action::ShowPrefs) => ::symbol::Action::Submit {
Some(Action::ShowPrefs) => ::action::Action::Submit {
text: None,
keys: Vec::new(),
},
None => ::symbol::Action::Submit {
None => ::action::Action::Submit {
text: None,
keys: vec!(
::symbol::KeySym(keysym.unwrap()),
::action::KeySym(keysym.unwrap()),
),
},
}
@ -681,9 +681,9 @@ mod tests {
".",
Vec::new()
),
::symbol::Action::Submit {
::action::Action::Submit {
text: None,
keys: vec!(::symbol::KeySym("U002E".into())),
keys: vec!(::action::KeySym("U002E".into())),
}
);
}