diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln
index 2d712af83f..d0c263d9aa 100644
--- a/SharpDevelop.Tests.sln
+++ b/SharpDevelop.Tests.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-# SharpDevelop 4.1.0.8000
+# SharpDevelop 4.2.0.8225-alpha
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 20d411bf94..aac26f38e3 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -249,17 +249,17 @@
WebProjectOptionsPanel.xaml
-
+
+
AddServiceReferenceDialog.xaml
Code
-
-
+
+
AdvancedServiceDialog.xaml
Code
-
-
+
ToolNotFoundDialog.cs
@@ -842,8 +842,8 @@
ProjectOptionPanel.cs
-
-
+
+
@@ -872,6 +872,7 @@
ICSharpCode.Core
False
+
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AddServiceReferenceDialog.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceDialog.xaml
similarity index 88%
rename from src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AddServiceReferenceDialog.xaml
rename to src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceDialog.xaml
index 1fa4a5bcd0..0cbfa5c5b4 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AddServiceReferenceDialog.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceDialog.xaml
@@ -1,6 +1,6 @@
+ http://blogs.msdn.com/b/chkoenig/archive/2008/05/24/hierarchical-databinding-in-wpf.aspx
+ http://www.codeproject.com/KB/WPF/TreeViewWithViewModel.aspx?msg=3663052
+ -->
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AddServiceReferenceDialog.xaml.cs b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceDialog.xaml.cs
similarity index 89%
rename from src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AddServiceReferenceDialog.xaml.cs
rename to src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceDialog.xaml.cs
index 04fd52f5f9..db89ad8e2e 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AddServiceReferenceDialog.xaml.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceDialog.xaml.cs
@@ -16,7 +16,9 @@ using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
-namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog
+using ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference;
+
+namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
{
///
/// Interaction logic for AddServiceReferenceDialog.xaml
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AddServiceReferenceViewModel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceViewModel.cs
similarity index 91%
rename from src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AddServiceReferenceViewModel.cs
rename to src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceViewModel.cs
index e9808be16d..b76b46dfec 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AddServiceReferenceViewModel.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AddServiceReferenceViewModel.cs
@@ -19,16 +19,20 @@ using System.Runtime.Remoting.Messaging;
using System.Web.Services.Description;
using System.Web.Services.Discovery;
using System.Windows;
+using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Input;
+using System.Windows.Media.Imaging;
using ICSharpCode.Core;
+using ICSharpCode.Core.Presentation;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Widgets;
+using ICSharpCode.SharpDevelop.Widgets.Resources;
using Microsoft.Win32;
-namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog
+namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
{
///
/// Description of AddServiceReferenceViewModel.
@@ -44,7 +48,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog
string serviceDescriptionMessage;
string namespacePrefix = String.Empty;
- private ObservableCollection twoValues;
+ private ObservableCollection twoValues;
private List mruServices = new List();
private string selectedService;
@@ -75,7 +79,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog
GoCommand = new RelayCommand(ExecuteGo,CanExecuteGo);
DiscoverCommand = new RelayCommand(ExecuteDiscover,CanExecuteDiscover);
AdvancedDialogCommand = new RelayCommand(ExecuteAdvancedDialogCommand,CanExecuteAdvancedDialogCommand);
- TwoValues = new ObservableCollection();
+ TwoValues = new ObservableCollection();
}
@@ -351,7 +355,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog
}
- public ObservableCollection TwoValues {
+ public ObservableCollection TwoValues {
get { return twoValues; }
set {
twoValues = value;
@@ -359,26 +363,25 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog
}
}
+ //http://mikehadlow.blogspot.com/2006/06/simple-wsdl-object.html
void UpdateListView ()
{
ServiceDescription desc = null;
TwoValues.Clear();
- string l = String.Empty;
- string r;
if(ServiceItem.Tag is ServiceDescription) {
desc = (ServiceDescription)ServiceItem.Tag;
- r = desc.RetrievalUrl;
- var tv = new TwoValue(l,r);
+ var tv = new ImageAndDescription(PresentationResourceService.GetBitmapSource("Icons.16x16.Interface"),
+ desc.RetrievalUrl);
TwoValues.Add(tv);
}
- else if(ServiceItem.Tag is PortType) {
+ else if(ServiceItem.Tag is PortType)
+ {
PortType portType = (PortType)ServiceItem.Tag;
foreach (Operation op in portType.Operations)
- {
- l = op.Name;
- r = op.Documentation;
- TwoValues.Add(new TwoValue(l,r));
+ {
+ TwoValues.Add(new ImageAndDescription(PresentationResourceService.GetBitmapSource("Icons.16x16.Method"),
+ op.Name));
}
}
}
@@ -418,16 +421,16 @@ namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog
}
- public class TwoValue
+ public class ImageAndDescription
{
- public TwoValue(string left,string right)
+ public ImageAndDescription(BitmapSource bitmapSource,string description)
{
- LeftValue = left;
- RightValue = right;
+ Image = bitmapSource;
+ Description = description;
}
- public string LeftValue {get;set;}
- public string RightValue {get;set;}
+ public BitmapSource Image {get;set;}
+ public string Description {get;set;}
}
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AdvancedServiceDialog.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceDialog.xaml
similarity index 97%
rename from src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AdvancedServiceDialog.xaml
rename to src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceDialog.xaml
index d144d7b449..e24e23d62f 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AdvancedServiceDialog.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceDialog.xaml
@@ -1,9 +1,9 @@
+ /// Interaction logic for AdvancedServiceDialog.xaml
+ ///
+ public partial class AdvancedServiceDialog : Window
+ {
+ public AdvancedServiceDialog()
+ {
+ InitializeComponent();
+ }
+
+ void okButtonClick(object sender, RoutedEventArgs e)
+ {
+ this.DialogResult = true;
+ Close();
+ }
+
+ void cancelButtonClick(object sender, RoutedEventArgs e)
+ {
+ this.DialogResult = false;
+ Close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AdvancedServiceViewModel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceViewModel.cs
similarity index 98%
rename from src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AdvancedServiceViewModel.cs
rename to src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceViewModel.cs
index 20ed867d14..9dbf2244a2 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/AdvancedServiceViewModel.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceViewModel.cs
@@ -12,7 +12,7 @@ using System.ComponentModel;
using ICSharpCode.SharpDevelop.Widgets;
-namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog
+namespace ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference
{
///
/// Description of AdvancedServiceViewModel.
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/ReferenceFolderNodeCommands.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/ReferenceFolderNodeCommands.cs
index 7aa4566fcd..a8ccf83426 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/ReferenceFolderNodeCommands.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/ReferenceFolderNodeCommands.cs
@@ -8,9 +8,10 @@ using System.Web.Services.Discovery;
using System.Windows.Forms;
using System.Xml;
-using ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog;
+using ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference;
using ICSharpCode.SharpDevelop.Gui.OptionPanels;
namespace ICSharpCode.SharpDevelop.Project.Commands