Skip to content

Move "New Branch" action to "New" submenu #1517

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

Closed
jeremypw wants to merge 1 commit into from
Closed

Move "New Branch" action to "New" submenu #1517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions src/FolderManager/FolderItem.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ namespace Scratch.FolderManager {
}

var direct_actions_section = new GLib.Menu ();
direct_actions_section.append_item (create_submenu_for_new ());
direct_actions_section.append_item (create_new_menuitem ());
direct_actions_section.append_item (rename_menu_item);
direct_actions_section.append_item (delete_item);

Expand Down Expand Up @@ -179,7 +179,7 @@ namespace Scratch.FolderManager {
return open_in_menu_item;
}

protected GLib.MenuItem create_submenu_for_new () {
protected virtual GLib.Menu create_submenu_for_new () {
var new_folder_item = new GLib.MenuItem (
_("Folder"),
GLib.Action.print_detailed_name (
Expand All @@ -200,9 +200,12 @@ namespace Scratch.FolderManager {
new_menu.append_item (new_folder_item);
new_menu.append_item (new_file_item);

var new_item = new GLib.MenuItem.submenu (_("New"), new_menu);
new_item.set_submenu (new_menu);
return new_menu;

}

protected GLib.MenuItem create_new_menuitem () {
var new_item = new GLib.MenuItem.submenu (_("New"), create_submenu_for_new ());
return new_item;
}

Expand Down
59 changes: 31 additions & 28 deletions src/FolderManager/ProjectFolderItem.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ namespace Scratch.FolderManager {
external_actions_section.append_item (create_submenu_for_open_in (file_type));

var folder_actions_section = new GLib.Menu ();
folder_actions_section.append_item (create_submenu_for_new ());
folder_actions_section.append_item (create_new_menuitem ());
if (monitored_repo != null) {
folder_actions_section.append_item (create_submenu_for_branch ());
}
Expand Down Expand Up @@ -301,6 +301,35 @@ namespace Scratch.FolderManager {
return menu;
}

protected override GLib.Menu create_submenu_for_new () {
var new_menu = base.create_submenu_for_new ();
if (monitored_repo != null) {
var new_branch_item = new GLib.MenuItem (
_("New Branch…"),
GLib.Action.print_detailed_name (
MainWindow.ACTION_PREFIX + MainWindow.ACTION_NEW_BRANCH,
file.path
)
);

new_branch_item.set_attribute_value (
"accel",
Utils.get_accel_for_action (
GLib.Action.print_detailed_name (
MainWindow.ACTION_PREFIX + MainWindow.ACTION_NEW_BRANCH,
""
)
)
);

var new_branch_section = new GLib.Menu ();
new_branch_section.append_item (new_branch_item);
new_menu.append_section (null, new_branch_section);
}

return new_menu;
}

protected GLib.MenuItem create_submenu_for_branch () {
// Ensures that action for relevant project is being used
view.actions.add_action (change_branch_action);
Expand All @@ -316,33 +345,7 @@ namespace Scratch.FolderManager {
);
}


var new_branch_item = new GLib.MenuItem (
_("New Branch…"),
GLib.Action.print_detailed_name (
MainWindow.ACTION_PREFIX + MainWindow.ACTION_NEW_BRANCH,
file.path
)
);

new_branch_item.set_attribute_value (
"accel",
Utils.get_accel_for_action (
GLib.Action.print_detailed_name (
MainWindow.ACTION_PREFIX + MainWindow.ACTION_NEW_BRANCH,
""
)
)
);

GLib.Menu bottom_section = new GLib.Menu ();
bottom_section.append_item (new_branch_item);

var menu = new GLib.Menu ();
menu.append_section (null, branch_selection_menu);
menu.append_section (null, bottom_section);

var menu_item = new GLib.MenuItem.submenu (_("Branch"), menu);
var menu_item = new GLib.MenuItem.submenu (_("Branch"), branch_selection_menu);
return menu_item;
}

Expand Down
Loading