statusicon: don't add an action to folders that have an error submenu
This commit is contained in:
parent
f5463f98ba
commit
548a876e1d
|
@ -177,12 +177,12 @@ namespace SparkleShare {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
folder_icon = IconTheme.Default.LoadIcon ("folder", 16, IconLookupFlags.GenericFallback);
|
folder_icon = IconTheme.Default.LoadIcon ("folder", 16, IconLookupFlags.GenericFallback);
|
||||||
|
item.Activated += Controller.OpenFolderDelegate (folder_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
item.Image = new Image (folder_icon);
|
item.Image = new Image (folder_icon);
|
||||||
(item.Child as Label).UseUnderline = false;
|
(item.Child as Label).UseUnderline = false;
|
||||||
|
|
||||||
item.Activated += Controller.OpenFolderDelegate (folder_name);
|
|
||||||
this.menu.Add (item);
|
this.menu.Add (item);
|
||||||
|
|
||||||
i++;
|
i++;
|
||||||
|
|
|
@ -222,6 +222,7 @@ namespace SparkleShare {
|
||||||
foreach (string folder_name in Controller.Folders) {
|
foreach (string folder_name in Controller.Folders) {
|
||||||
NSMenuItem item = new NSMenuItem ();
|
NSMenuItem item = new NSMenuItem ();
|
||||||
item.Title = folder_name;
|
item.Title = folder_name;
|
||||||
|
this.folder_menu_items [i] = item;
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty (Controller.FolderErrors [i])) {
|
if (!string.IsNullOrEmpty (Controller.FolderErrors [i])) {
|
||||||
item.Image = this.caution_image;
|
item.Image = this.caution_image;
|
||||||
|
@ -242,13 +243,11 @@ namespace SparkleShare {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
item.Image = this.folder_image;
|
item.Image = this.folder_image;
|
||||||
|
this.folder_menu_items [i].Activated += Controller.OpenFolderDelegate (folder_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
item.Image.Size = new SizeF (16, 16);
|
item.Image.Size = new SizeF (16, 16);
|
||||||
|
|
||||||
this.folder_menu_items [i] = item;
|
|
||||||
this.folder_menu_items [i].Activated += Controller.OpenFolderDelegate (folder_name);
|
|
||||||
|
|
||||||
i++;
|
i++;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -195,8 +195,6 @@ namespace SparkleShare {
|
||||||
Header = folder_name.Replace ("_", "__")
|
Header = folder_name.Replace ("_", "__")
|
||||||
};
|
};
|
||||||
|
|
||||||
subfolder_item.Click += Controller.OpenFolderDelegate (folder_name);
|
|
||||||
|
|
||||||
Image subfolder_image = new Image () {
|
Image subfolder_image = new Image () {
|
||||||
Source = SparkleUIHelpers.GetImageSource ("folder"),
|
Source = SparkleUIHelpers.GetImageSource ("folder"),
|
||||||
Width = 16,
|
Width = 16,
|
||||||
|
@ -227,6 +225,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
subfolder_item.Icon = subfolder_image;
|
subfolder_item.Icon = subfolder_image;
|
||||||
|
subfolder_item.Click += Controller.OpenFolderDelegate (folder_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.context_menu.Items.Add (subfolder_item);
|
this.context_menu.Items.Add (subfolder_item);
|
||||||
|
|
Loading…
Reference in a new issue