Rooba
/
lapce
mirror of https://github.com/lapce/lapce.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add ability to open file/file diff from source control context menu (#1590) 

* open file/diff from source control context menu

* update changelog

* use matches macro
This commit is contained in:
Cameron 2022-10-23 15:41:54 +01:00 committed by GitHub
parent dad6a58c50
commit c53d8509d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -4,8 +4,9 @@
### Features/Changes
- [#1590](https://github.com/lapce/lapce/pull/1590): Added ability to open file and file diff from source control context menu
- [#1570](https://github.com/lapce/lapce/pull/1570): Added a basic tab context menu with common close actions
- [#1560](https://github.com/lapce/lapce/pull/1560): Added ability to copy active editor remote file path to clipboard.
- [#1560](https://github.com/lapce/lapce/pull/1560): Added ability to copy active editor remote file path to clipboard
- [#1510](https://github.com/lapce/lapce/1510): Added support to discard changes to a file
- [#1459](https://github.com/lapce/lapce/pull/1459): Implement icon theme system
- **This is a breaking change for colour themes!**

40
lapce-ui/src/source_control.rs
View File

@ -182,10 +182,46 @@ fn event(
let source_control = data.source_control.clone();
let target_file_diff =
source_control.file_diffs[target_line].0.clone();
let target_file_path = target_file_diff.path().clone();
let mut menu = druid::Menu::<LapceData>::new("");
let item = druid::MenuItem::new("Discard Changes")
let mut item = druid::MenuItem::new("Open Changes").command(
Command::new(
LAPCE_UI_COMMAND,
LapceUICommand::OpenFileDiff(
source_control.file_diffs[target_line]
.0
.path()
.clone(),
"head".to_string(),
),
Target::Auto,
),
);
menu = menu.entry(item);
let enable_open_file =
!matches!(target_file_diff, FileDiff::Deleted(_));
item = druid::MenuItem::new("Open File")
.enabled(enable_open_file)
.on_activate(move |ctx, _, _| {
ctx.submit_command(Command::new(
LAPCE_UI_COMMAND,
LapceUICommand::OpenFile(
target_file_path.clone(),
true,
),
Target::Auto,
));
});
menu = menu.entry(item);
menu = menu.separator();
item = druid::MenuItem::new("Discard Changes")
.on_activate(move |ctx, _, _| {
ctx.submit_command(Command::new(
LAPCE_COMMAND,
@ -193,7 +229,7 @@ fn event(
kind: CommandKind::Workbench(
LapceWorkbenchCommand::SourceControlDiscardTargetFileChanges
),
data: Some(serde_json::json!(target_file_diff))
data: Some(serde_json::json!(target_file_diff.clone()))
},
Target::Auto,
));