Skip to content
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

Fix the problem that the menu is always before leaf #279

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix the problem that the menu is always before leaf #279

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56971b3
Fix the problem that the menu is always before leaf
it-linnan Dec 20, 2021
6dc7b64
Remove unused code
it-linnan Dec 20, 2021
e3029ea
Remove unused comment
it-linnan Dec 22, 2021
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
78 changes: 37 additions & 41 deletions Shuttle/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,11 @@ - (void) buildMenu:(NSArray*)data addToMenu:(NSMenu *)m {
// go through the array and sort out the menus and the leafs into
// separate bucks so we can sort them independently.
NSMutableDictionary* menus = [[NSMutableDictionary alloc] init];
NSMutableDictionary* leafs = [[NSMutableDictionary alloc] init];

for (NSDictionary* item in data) {
if (item[@"cmd"] && item[@"name"]) {
// this is a leaf
[leafs setObject:item forKey:item[@"name"]];
[menus setObject:item forKey:item[@"name"]];
} else {
// must be a menu - add all instances
for (NSString* key in item) {
Expand All @@ -380,50 +379,47 @@ - (void) buildMenu:(NSArray*)data addToMenu:(NSMenu *)m {
}

NSArray* menuKeys = [[menus allKeys] sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
NSArray* leafKeys = [[leafs allKeys] sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];

NSInteger pos = 0;

// create menus first
for (NSString* key in menuKeys) {
NSMenu* subMenu = [[NSMenu alloc] init];
NSMenuItem* menuItem = [[NSMenuItem alloc] init];
[self separatorSortRemoval:key];
[menuItem setTitle:menuName];
[menuItem setSubmenu:subMenu];
[m insertItem:menuItem atIndex:pos++];
if (addSeparator) {
[m insertItem:[NSMenuItem separatorItem] atIndex:pos++];
}
// build submenu
[self buildMenu:menus[key] addToMenu:subMenu];
}

// now create leafs
for (NSString *key in leafKeys) {
NSDictionary* cfg = leafs[key];
NSMenuItem* menuItem = [[NSMenuItem alloc] init];

//Get the command we are going to run in termainal
NSString *menuCmd = cfg[@"cmd"];
//Get the theme for this terminal session
NSString *termTheme = cfg[@"theme"];
//Get the name for the terminal session
NSString *termTitle = cfg[@"title"];
//Get the value of setting inTerminal
NSString *termWindow = cfg[@"inTerminal"];
//Get the menu name will will use this as the title if title is null.
[self separatorSortRemoval:cfg[@"name"]];

//Place the terminal command, theme, and title into an comma delimited string
NSString *menuRepObj = [NSString stringWithFormat:@"%@¬_¬%@¬_¬%@¬_¬%@¬_¬%@", menuCmd, termTheme, termTitle, termWindow, menuName];

[menuItem setTitle:menuName];
[menuItem setRepresentedObject:menuRepObj];
[menuItem setAction:@selector(openHost:)];
[m insertItem:menuItem atIndex:pos++];
if (addSeparator) {
[m insertItem:[NSMenuItem separatorItem] atIndex:pos++];
if([menus[key] isKindOfClass:[NSDictionary class]]){
NSDictionary* cfg = menus[key];
//Get the command we are going to run in termainal
NSString *menuCmd = cfg[@"cmd"];
//Get the theme for this terminal session
NSString *termTheme = cfg[@"theme"];
//Get the name for the terminal session
NSString *termTitle = cfg[@"title"];
//Get the value of setting inTerminal
NSString *termWindow = cfg[@"inTerminal"];
//Get the menu name will will use this as the title if title is null.
[self separatorSortRemoval:cfg[@"name"]];

//Place the terminal command, theme, and title into an comma delimited string
NSString *menuRepObj = [NSString stringWithFormat:@"%@¬_¬%@¬_¬%@¬_¬%@¬_¬%@", menuCmd, termTheme, termTitle, termWindow, menuName];

NSMenuItem* menuItem = [[NSMenuItem alloc] init];
[menuItem setTitle:menuName];
[menuItem setRepresentedObject:menuRepObj];
[menuItem setAction:@selector(openHost:)];
[m insertItem:menuItem atIndex:pos++];
if (addSeparator) {
[m insertItem:[NSMenuItem separatorItem] atIndex:pos++];
}
}else{
NSMenuItem* menuItem = [[NSMenuItem alloc] init];
NSMenu* subMenu = [[NSMenu alloc] init];
[self separatorSortRemoval:key];
[menuItem setTitle:menuName];
[menuItem setSubmenu:subMenu];
[m insertItem:menuItem atIndex:pos++];
if (addSeparator) {
[m insertItem:[NSMenuItem separatorItem] atIndex:pos++];
}
// build submenu
[self buildMenu:menus[key] addToMenu:subMenu];
}
}
}
Expand Down