add icons for new ClassBrowser nodes

data/resources/image/BitmapResources/BitmapList.txt

@@ -23,7 +23,7 @@ BitmapResources-data\Icons.16x16.AdjustColor.png
 BitmapResources-data\Icons.16x16.ArrowDown.png
 BitmapResources-data\Icons.16x16.ArrowLeftRight.png
 BitmapResources-data\Icons.16x16.ArrowUp.png
-BitmapResources-data\Icons.16x16.Assembly.png
+BitmapResources-data\Icons.16x16.Collection.png
 BitmapResources-data\Icons.16x16.BoldText.png
 BitmapResources-data\Icons.16x16.BrowserAfter.png
 BitmapResources-data\Icons.16x16.BrowserBefore.png
@@ -85,7 +85,7 @@ BitmapResources-data\Icons.16x16.LowerToUpperCase.png
 BitmapResources-data\Icons.16x16.MyComputer.png
 BitmapResources-data\Icons.16x16.NETWORK.png
 BitmapResources-data\Icons.16x16.OK.png
-BitmapResources-data\Icons.16x16.OpenAssembly.png
+BitmapResources-data\Icons.16x16.OpenCollection.png
 BitmapResources-data\Icons.16x16.OutDent.png
 BitmapResources-data\Icons.16x16.PasteIcon.png
 BitmapResources-data\Icons.16x16.PersonalFiles.png
@@ -555,7 +555,11 @@ ClassBrowserIcons\Icons.16x16.NameSpace.png
 ClassBrowserIcons\Icons.16x16.Operator.png
 ClassBrowserIcons\Icons.16x16.Parameter.png
 ClassBrowserIcons\Icons.16x16.Struct.png
-
+ClassBrowserIcons\Icons.16x16.Workspace.png
+ClassBrowserIcons\Icons.16x16.Assembly.png
+ClassBrowserIcons\Icons.16x16.Module.png
+ClassBrowserIcons\Icons.16x16.AssemblyFromFile.png
+ClassBrowserIcons\Icons.16x16.AssemblyFromGAC.png
 
 -------------------------------------------------------------------------------
 Left original (other source than Fugue Iconlibrary)

data/resources/image/BitmapResources/BitmapResources.res

@@ -107,7 +107,7 @@ Icons.16x16.AdjustBackgroundColor					= BitmapResources-data\Icons.16x16.AdjustB
 Icons.16x16.HelpOpenFolder							= BitmapResources-data\Icons.16x16.HelpOpenFolder.png
 Icons.16x16.SmallIconsIcon							= BitmapResources-data\Icons.16x16.SmallIconsIcon.png
 Icons.16x16.HtmlElements.AnchorElement				= BitmapResources-data\Icons.16x16.HtmlElements.AnchorElement.png
-Icons.16x16.Assembly								= BitmapResources-data\Icons.16x16.Assembly.png
+Icons.16x16.Collection								= BitmapResources-data\Icons.16x16.Collection.png
 Icons.16x16.TipOfTheDay								= BitmapResources-data\Icons.16x16.TipOfTheDay.png
 Icons.16x16.Right									= BitmapResources-data\Icons.16x16.Right.png
 Icons.16x16.CDROM									= BitmapResources-data\Icons.16x16.CDROM.png
@@ -169,7 +169,7 @@ Icons.16x16.BuildCurrentSelectedProject				= BitmapResources-data\Icons.16x16.Bu
 Icons.16x16.HelpTopic								= BitmapResources-data\Icons.16x16.HelpTopic.png
 Icons.16x16.PrevWindowIcon							= BitmapResources-data\Icons.16x16.PrevWindowIcon.png
 Icons.16x16.HtmlElements.SelectElement				= BitmapResources-data\Icons.16x16.HtmlElements.SelectElement.png
-Icons.16x16.OpenAssembly							= BitmapResources-data\Icons.16x16.OpenAssembly.png
+Icons.16x16.OpenCollection							= BitmapResources-data\Icons.16x16.OpenCollection.png
 Icons.16x16.HtmlElements.InputSubmitElement			= BitmapResources-data\Icons.16x16.HtmlElements.InputSubmitElement.png
 Icons.16x16.CancelIcon								= BitmapResources-data\Icons.16x16.CancelIcon.png
 Icons.16x16.ItalicText								= BitmapResources-data\Icons.16x16.ItalicText.png
@@ -292,6 +292,12 @@ Icons.16x16.SharpQuery.AddConnection				= SharpQueryIcons\Icons.16x16.SharpQuery
 Icons.16x16.SharpQuery.Remove						= SharpQueryIcons\Icons.16x16.SharpQuery.Remove.png
 
 #ClassBrowser icons
+Icons.16x16.AssemblyFromFile						= ClassBrowserIcons\Icons.16x16.AssemblyFromFile.png
+Icons.16x16.AssemblyFromGAC							= ClassBrowserIcons\Icons.16x16.AssemblyFromGAC.png
+
+Icons.16x16.Workspace								= ClassBrowserIcons\Icons.16x16.Workspace.png
+Icons.16x16.Assembly								= ClassBrowserIcons\Icons.16x16.Assembly.png
+Icons.16x16.Module									= ClassBrowserIcons\Icons.16x16.Module.png
 Icons.16x16.NameSpace								= ClassBrowserIcons\Icons.16x16.NameSpace.png
 Icons.16x16.Literal									= ClassBrowserIcons\Icons.16x16.Literal.png
 Icons.16x16.Reference								= ClassBrowserIcons\Icons.16x16.Reference.png

src/AddIns/Analysis/UnitTesting/UnitTesting.addin

@@ -101,7 +101,7 @@
 			             class="ICSharpCode.UnitTesting.AddNUnitReferenceCommand"/>
 			<ToolbarItem id = "CollapseSeparator" type = "Separator"/>
 			<ToolbarItem id      = "Collapse"
-			             icon    = "Icons.16x16.Assembly"
+			             icon    = "Icons.16x16.Collection"
 			             tooltip = "${res:MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip}"
 			             class   = "ICSharpCode.UnitTesting.CollapseAllTestsCommand"/>
 		</Condition>

src/AddIns/Debugger/Debugger.AddIn/Pads/ClassBrowserSupport.cs

@@ -125,7 +125,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		
 		public override object Icon {
 			get {
-				return IconService.GetImageSource("PadIcons.LoadedModules");
+				return SD.ResourceService.GetImageSource("Icons.16x16.Module");
 			}
 		}
 		

src/AddIns/Misc/AddinScout/Project/Src/Gui/AddinTreeView.cs

@@ -26,8 +26,8 @@ namespace AddInScout
 			treeView.ImageList = new ImageList();
 			treeView.ImageList.ColorDepth = ColorDepth.Depth32Bit;
 			treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.Class"));
-			treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.Assembly"));
-			treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.OpenAssembly"));
+			treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.Collection"));
+			treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.OpenCollection"));
 			treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.ClosedFolderBitmap"));
 			treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.OpenFolderBitmap"));
 			

src/AddIns/Misc/AddinScout/Project/Src/Gui/TreeTreeView.cs

@@ -23,8 +23,8 @@ namespace AddInScout
 			treeView.ImageList = new ImageList();
 			treeView.ImageList.ColorDepth = ColorDepth.Depth32Bit;
 			treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.Class"));
-			treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.Assembly"));
-			treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.OpenAssembly"));
+			treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.Collection"));
+			treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.OpenCollection"));
 			treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.ClosedFolderBitmap"));
 			treeView.ImageList.Images.Add(IconService.GetBitmap("Icons.16x16.OpenFolderBitmap"));
 			

src/AddIns/Misc/SearchAndReplace/Project/Gui/DefaultSearchResult.cs

@@ -87,13 +87,13 @@ namespace SearchAndReplace
 				
 				Button expandAll = new Button();
 				expandAll.SetValueToExtension(Button.ToolTipProperty, new LocalizeExtension("MainWindow.Windows.SearchResultPanel.ExpandAll.ToolTip"));
-				expandAll.Content = new Image { Height = 16, Source = PresentationResourceService.GetBitmapSource("Icons.16x16.OpenAssembly") };
+				expandAll.Content = new Image { Height = 16, Source = PresentationResourceService.GetBitmapSource("Icons.16x16.OpenCollection") };
 				expandAll.Click += delegate { ExpandCollapseAll(true); };
 				toolbarItems.Add(expandAll);
 				
 				Button collapseAll = new Button();
 				collapseAll.SetValueToExtension(Button.ToolTipProperty, new LocalizeExtension("MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip"));
-				collapseAll.Content = new Image { Height = 16, Source = PresentationResourceService.GetBitmapSource("Icons.16x16.Assembly") };
+				collapseAll.Content = new Image { Height = 16, Source = PresentationResourceService.GetBitmapSource("Icons.16x16.Collection") };
 				collapseAll.Click += delegate { ExpandCollapseAll(false); };
 				toolbarItems.Add(collapseAll);
 			}

src/Main/Base/Project/Dom/ClassBrowser/AssemblyTreeNode.cs

@@ -43,7 +43,7 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
 		
 		public override object Icon {
 			get {
-				return base.Icon;
+				return SD.ResourceService.GetImageSource("Icons.16x16.Assembly");
 			}
 		}
 	}

src/Main/Base/Project/Dom/ClassBrowser/WorkspaceTreeNode.cs

@@ -51,7 +51,7 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
 		
 		public override object Icon {
 			get {
-				return SD.ResourceService.GetImageSource("PadIcons.ClassBrowser");
+				return SD.ResourceService.GetImageSource("Icons.16x16.Workspace");
 			}
 		}
 		

src/Main/Base/Project/ICSharpCode.SharpDevelop.addin

@@ -238,7 +238,7 @@
 			             class   = "ICSharpCode.SharpDevelop.Project.Commands.RefreshProjectBrowser"/>
 			<ToolbarItem id = "PropertySeparator" type = "Separator"/>
 			<ToolbarItem id      = "Collapse"
-			             icon    = "Icons.16x16.Assembly"
+			             icon    = "Icons.16x16.Collection"
 			             tooltip = "${res:MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip}"
 			             class   = "ICSharpCode.SharpDevelop.Project.Commands.CollapseAllProjectBrowser"/>
 		</Condition>
@@ -921,9 +921,18 @@
 		
 		<ToolbarItem id = "NavigationSeparator" type  = "Separator"/>
 		<ToolbarItem id      = "OpenAssembly"
-		             icon    = "Icons.16x16.OpenProjectIcon"
-		             tooltip = "${res:MainWindow.Windows.ClassBrowser.OpenAssembly.ToolTip}"
-		             class   = "ICSharpCode.SharpDevelop.Dom.ClassBrowser.OpenAssemblyCommand"/>
+		             type    = "DropDownButton"
+		             icon    = "Icons.16x16.AssemblyFromFile"
+		             tooltip = "Open assembly">
+			<MenuItem id    = "OpenAssemblyFromFile"
+			          icon    = "Icons.16x16.AssemblyFromFile"
+			          label = "Open assembly from file"
+			          class = "ICSharpCode.SharpDevelop.Gui.ClassBrowser.OpenAssemblyFromFileCommand"/>
+			<MenuItem id    = "OpenAssemblyFromGAC"
+			          icon  = "Icons.16x16.AssemblyFromGAC"
+			          label = "Open assembly from GAC"
+			          class = "ICSharpCode.SharpDevelop.Gui.ClassBrowser.OpenAssemblyFromGACCommand"/>
+		</ToolbarItem>
 		<ToolbarItem id      = "SelectFilter"
 		             type    = "DropDownButton"
 		             icon    = "Icons.16x16.FindInFiles"
@@ -957,7 +966,7 @@
 		</ToolbarItem>
 		<ToolbarItem id = "NavigationSeparator" type  = "Separator"/>
 		<ToolbarItem id      = "Collapse"
-		             icon    = "Icons.16x16.Assembly"
+		             icon    = "Icons.16x16.Collection"
 		             tooltip = "${res:MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip}"
 		             class   = "ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserCollapseAll"/>
 	</Path>
@@ -2178,12 +2187,12 @@
 	<Path name = "/SharpDevelop/Pads/SearchResultPanel/Toolbar">
 		<Condition name = "Ownerstate" ownerstate = "DefaultMode" action = "Exclude">
 			<ToolbarItem id      = "ExpandAll"
-			             icon    = "Icons.16x16.OpenAssembly"
+			             icon    = "Icons.16x16.OpenCollection"
 			             tooltip = "${res:MainWindow.Windows.SearchResultPanel.ExpandAll.ToolTip}"
 			             class   = "SearchAndReplace.ExpandAll"/>
 			
 			<ToolbarItem id      = "CollapseAll"
-			             icon    = "Icons.16x16.Assembly"
+			             icon    = "Icons.16x16.Collection"
 			             tooltip = "${res:MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip}"
 			             class   = "SearchAndReplace.CollapseAll"/>
 			<ToolbarItem id = "ExpandCollapseSeparator" type = "Separator" />

src/Main/SharpDevelop/Dom/ClassBrowser/OpenAssemblyCommand.cs

@@ -2,17 +2,28 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using Microsoft.Win32;
 
 namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
 {
 	/// <summary>
-	/// Description of OpenAssemblyCommand.
+	/// Description of OpenAssemblyFromFileCommand.
 	/// </summary>
-	class OpenAssemblyCommand : SimpleCommand
+	class OpenAssemblyFromFileCommand : SimpleCommand
 	{
 		public override void Execute(object parameter)
 		{
+			throw new NotImplementedException();
+		}
+	}
+	
+	/// <summary>
+	/// Description of OpenAssemblyFromGACCommand.
+	/// </summary>
+	class OpenAssemblyFromGACCommand : SimpleCommand
+	{
+		public override void Execute(object parameter)
+		{
+			throw new NotImplementedException();
 		}
 	}
 }