Skip to content

Correct built-in open and save menu items. #930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luleyleo merged 3 commits into from
May 15, 2020
+11 −7
Merged

Correct built-in open and save menu items. #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bcfbbe
Correct built-in open and save menu items.
luleyleo May 15, 2020
88fd060
Update save_ellipsis docs.
luleyleo May 15, 2020
322976e
Merge branch 'master' into fix-open-and-save-menus
luleyleo May 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ While some features like the clipboard, menus or file dialogs are not yet availa
- GTK: Support file filters in open/save dialogs. ([#903] by [@jneem])
- X11: Support key and mouse button state. ([#920] by [@jneem])
- Routing `LifeCycle::FocusChanged` to descendant widgets. ([#925] by [@yrns])
- Built-in open and save menu items now show the correct label and submit the right commands. ([#930] by [@finnerale])

### Visual

Expand Down Expand Up @@ -173,6 +174,7 @@ While some features like the clipboard, menus or file dialogs are not yet availa
[#924]: https://github.com/xi-editor/druid/pull/924
[#925]: https://github.com/xi-editor/druid/pull/925
[#928]: https://github.com/xi-editor/druid/pull/928
[#930]: https://github.com/xi-editor/druid/pull/930
[#940]: https://github.com/xi-editor/druid/pull/940
[#942]: https://github.com/xi-editor/druid/pull/942

Expand Down
16 changes: 9 additions & 7 deletions druid/src/menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,8 +519,8 @@ pub mod sys {
.append(new())
.append(open())
.append(close())
.append(save().disabled())
.append(save_as().disabled())
.append(save_ellipsis())
.append(save_as())
// revert to saved?
.append(print().disabled())
.append(page_setup().disabled())
Expand Down Expand Up @@ -563,11 +563,13 @@ pub mod sys {
.hotkey(RawMods::Ctrl, "s")
}

/// The 'Save' menu item.
/// The 'Save...' menu item.
///
/// This is used if we need to show a dialog to select save location.
pub fn save_ellipsis<T: Data>() -> MenuItem<T> {
MenuItem::new(
LocalizedString::new("common-menu-file-save"),
commands::SAVE_FILE,
LocalizedString::new("common-menu-file-save-ellipsis"),
commands::SHOW_SAVE_PANEL,
)
.hotkey(RawMods::Ctrl, "s")
}
Expand Down Expand Up @@ -742,7 +744,7 @@ pub mod sys {
pub fn open_file<T: Data>() -> MenuItem<T> {
MenuItem::new(
LocalizedString::new("common-menu-file-open"),
commands::OPEN_FILE,
commands::SHOW_OPEN_PANEL,
)
.hotkey(RawMods::Meta, "o")
}
Expand Down Expand Up @@ -771,7 +773,7 @@ pub mod sys {
pub fn save_ellipsis<T: Data>() -> MenuItem<T> {
MenuItem::new(
LocalizedString::new("common-menu-file-save-ellipsis"),
commands::SAVE_FILE,
commands::SHOW_SAVE_PANEL,
)
.hotkey(RawMods::Meta, "s")
}
Expand Down