Author: lluis
Date: 2006-07-17 13:57:35 -0400 (Mon, 17 Jul 2006)
New Revision: 62681
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
Log:
2006-07-17 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs:
In IsValidName, don't crash if the language name is not provided.
* MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:
The IncludeInDeploy command now sets the new BuildAction.FileCopy
flag.
* MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs: Removed
unused command.
* MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs: Track api changes.
* MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs: Removed unused
treeview.
Renamed some fields for clarity. Catch some exceptions.
* MonoDevelop.Ide.mdp: Updated.
* MonoDevelop.Ide.Gui/ProjectOperations.cs: Removed unused method.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2006-07-17
17:57:15 UTC (rev 62680)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2006-07-17
17:57:35 UTC (rev 62681)
@@ -1,3 +1,17 @@
+2006-07-17 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs:
+ In IsValidName, don't crash if the language name is not provided.
+ * MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:
+ The IncludeInDeploy command now sets the new BuildAction.FileCopy
flag.
+ * MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs: Removed
+ unused command.
+ * MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs: Track api changes.
+ * MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs: Removed unused
treeview.
+ Renamed some fields for clarity. Catch some exceptions.
+ * MonoDevelop.Ide.mdp: Updated.
+ * MonoDevelop.Ide.Gui/ProjectOperations.cs: Removed unused method.
+
2006-07-12 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* Base.glade: Fix some accelerators in the new project dialog.
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
2006-07-17 17:57:15 UTC (rev 62680)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
2006-07-17 17:57:35 UTC (rev 62681)
@@ -390,15 +390,6 @@
openCombine.RenameFileInProjects (e.SourceFile,
e.TargetFile);
}
- public void Deploy (Project project)
- {
- foreach (Document doc in IdeApp.Workbench.Documents) {
- if (doc.IsDirty)
- doc.Save();
- }
- DeployInformation.Deploy (project);
- }
-
public void ShowOptions (CombineEntry entry)
{
ShowOptions (entry, null);
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs
2006-07-17 17:57:15 UTC (rev 62680)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs
2006-07-17 17:57:35 UTC (rev 62681)
@@ -126,10 +126,8 @@
foreach (string assemblyPath in
Runtime.SystemAssemblyService.GetAssemblyPaths (version)) {
try {
System.Reflection.AssemblyName an =
System.Reflection.AssemblyName.GetAssemblyName (assemblyPath);
- string package =
Runtime.SystemAssemblyService.GetPackageFromFullName (an.FullName);
- if (package == "MONO-SYSTEM")
- package = "Mono";
- store.AppendValues (an.Name,
an.Version.ToString (), System.IO.Path.GetFileName (assemblyPath), false,
an.FullName, package);
+ SystemPackage package =
Runtime.SystemAssemblyService.GetPackageFromFullName (an.FullName);
+ store.AppendValues (an.Name,
an.Version.ToString (), System.IO.Path.GetFileName (assemblyPath), false,
an.FullName, package.Name);
}catch {
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
2006-07-17 17:57:15 UTC (rev 62680)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
2006-07-17 17:57:35 UTC (rev 62681)
@@ -38,10 +38,8 @@
PixbufList cat_imglist;
TreeStore catStore;
- TreeStore templateStore;
Gtk.TreeView catView;
- Gtk.TreeView templateView;
- IconView TemplateView;
+ IconView iconView;
Button okButton;
Button cancelButton;
Label infoLabel;
@@ -136,7 +134,7 @@
foreach (TemplateItem item in
(ArrayList)(catStore.GetValue (iter, 2))) {
if (item.Template.Id == id) {
catView.Selection.SelectIter
(iter);
- TemplateView.CurrentlySelected
= item;
+ iconView.CurrentlySelected =
item;
return true;
}
}
@@ -289,9 +287,9 @@
void FillCategoryTemplates (TreeIter iter)
{
- TemplateView.Clear ();
+ iconView.Clear ();
foreach (TemplateItem item in
(ArrayList)(catStore.GetValue (iter, 2))) {
- TemplateView.AddIcon (new Gtk.Image
(Services.Resources.GetBitmap (item.Template.Icon, Gtk.IconSize.Dnd)),
item.Name, item);
+ iconView.AddIcon (new Gtk.Image
(Services.Resources.GetBitmap (item.Template.Icon, Gtk.IconSize.Dnd)),
item.Name, item);
}
}
@@ -308,18 +306,22 @@
void UpdateOkStatus ()
{
- TemplateItem sel = (TemplateItem)
TemplateView.CurrentlySelected;
- if (sel == null)
- return;
-
- FileTemplate item = sel.Template;
-
+ try {
+ TemplateItem sel = (TemplateItem)
iconView.CurrentlySelected;
+ if (sel == null)
+ return;
+
+ FileTemplate item = sel.Template;
+
- if (item != null) {
- infoLabel.Text = item.Description;
- okButton.Sensitive = item.IsValidName
(nameEntry.Text, sel.Language);
- } else {
- okButton.Sensitive = false;
+ if (item != null) {
+ infoLabel.Text = item.Description;
+ okButton.Sensitive = item.IsValidName
(nameEntry.Text, sel.Language);
+ } else {
+ okButton.Sensitive = false;
+ }
+ } catch (Exception ex) {
+ Runtime.LoggingService.Error (ex);
}
}
@@ -339,9 +341,8 @@
//propertyService.SetProperty("Dialogs.NewProjectDialog.LargeImages",
((RadioButton)ControlDictionary["largeIconsRadioButton"]).Checked);
//propertyService.SetProperty("Dialogs.NewFileDialog.LastSelectedCategory",
((TreeView)ControlDictionary["categoryTreeView"]).SelectedNode.Text);
- //if (templateView.Selection.GetSelected (out mdl, out
iter)) {
- if (TemplateView.CurrentlySelected != null &&
nameEntry.Text.Length > 0) {
- TemplateItem titem = (TemplateItem)
TemplateView.CurrentlySelected;
+ if (iconView.CurrentlySelected != null &&
nameEntry.Text.Length > 0) {
+ TemplateItem titem = (TemplateItem)
iconView.CurrentlySelected;
FileTemplate item = titem.Template;
try {
@@ -431,12 +432,9 @@
void InitializeComponents()
{
-
catStore = new Gtk.TreeStore (typeof(string),
typeof(ArrayList), typeof(ArrayList), typeof(Gdk.Pixbuf));
catStore.SetSortColumnId (0, SortType.Ascending);
- templateStore = new Gtk.TreeStore (typeof(string),
typeof(FileTemplate));
-
ScrolledWindow swindow1 = new ScrolledWindow();
swindow1.VscrollbarPolicy = PolicyType.Automatic;
swindow1.HscrollbarPolicy = PolicyType.Automatic;
@@ -444,8 +442,7 @@
catView = new Gtk.TreeView (catStore);
catView.WidthRequest = 160;
catView.HeadersVisible = false;
- templateView = new Gtk.TreeView (templateStore);
- TemplateView = new IconView();
+ iconView = new IconView();
TreeViewColumn catColumn = new TreeViewColumn ();
catColumn.Title = "categories";
@@ -456,13 +453,6 @@
catView.AppendColumn (catColumn);
- TreeViewColumn templateColumn = new TreeViewColumn ();
- templateColumn.Title = "template";
- CellRendererText tmpl_text_render = new
CellRendererText ();
- templateColumn.PackStart (tmpl_text_render, true);
- templateColumn.AddAttribute (tmpl_text_render, "text",
0);
- templateView.AppendColumn (templateColumn);
-
okButton = new Button (Gtk.Stock.New);
okButton.Clicked += new EventHandler (OpenEvent);
@@ -476,7 +466,7 @@
HBox viewbox = new HBox (false, 6);
swindow1.Add(catView);
viewbox.PackStart (swindow1,false,true,0);
- viewbox.PackStart(TemplateView, true, true,0);
+ viewbox.PackStart(iconView, true, true,0);
this.AddActionWidget (cancelButton,
(int)Gtk.ResponseType.Cancel);
this.AddActionWidget (okButton,
(int)Gtk.ResponseType.Ok);
@@ -496,8 +486,8 @@
cat_imglist.Add(Services.Resources.GetBitmap("md-closed-folder"));
catView.Selection.Changed += new EventHandler
(CategoryChange);
catView.RowActivated += new RowActivatedHandler
(CategoryActivated);
- TemplateView.IconSelected += new
EventHandler(SelectedIndexChange);
- TemplateView.IconDoubleClicked += new
EventHandler(OpenEvent);
+ iconView.IconSelected += new
EventHandler(SelectedIndexChange);
+ iconView.IconDoubleClicked += new
EventHandler(OpenEvent);
InitializeView ();
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
2006-07-17 17:57:15 UTC (rev 62680)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
2006-07-17 17:57:35 UTC (rev 62681)
@@ -175,21 +175,19 @@
[CommandUpdateHandler (ProjectCommands.IncludeInDeploy)]
public void OnUpdateIncludeInDeploy (CommandInfo info)
{
- Project project = (Project)
CurrentNode.GetParentDataItem (typeof(Project), false);
ProjectFile finfo = CurrentNode.DataItem as ProjectFile;
- info.Checked =
!project.DeployInformation.IsFileExcluded (finfo.Name);
+ info.Checked = finfo.BuildAction ==
BuildAction.FileCopy;
}
[CommandHandler (ProjectCommands.IncludeInDeploy)]
public void OnIncludeInDeploy ()
{
ProjectFile finfo = CurrentNode.DataItem as ProjectFile;
- Project project = (Project)
CurrentNode.GetParentDataItem (typeof(Project), false);
- if (project.DeployInformation.IsFileExcluded
(finfo.Name)) {
- project.DeployInformation.RemoveExcludedFile
(finfo.Name);
+ if (finfo.BuildAction == BuildAction.FileCopy) {
+ finfo.BuildAction = BuildAction.Nothing;
} else {
- project.DeployInformation.AddExcludedFile
(finfo.Name);
+ finfo.BuildAction = BuildAction.FileCopy;
}
IdeApp.ProjectOperations.SaveProject (finfo.Project);
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs
2006-07-17 17:57:15 UTC (rev 62680)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs
2006-07-17 17:57:35 UTC (rev 62681)
@@ -284,13 +284,6 @@
{
}
- [CommandHandler (ProjectCommands.Deploy)]
- public void OnProjectDeploy ()
- {
- Project selectedProject = CurrentNode.DataItem as
Project;
- IdeApp.ProjectOperations.Deploy (selectedProject);
- }
-
[CommandHandler (ProjectCommands.SetAsStartupProject)]
public void SetAsStartupProject ()
{
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
2006-07-17 17:57:15 UTC (rev 62680)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
2006-07-17 17:57:35 UTC (rev 62681)
@@ -231,12 +231,13 @@
public override bool IsValidName (string name, string language)
{
if (name.Length > 0) {
- IDotNetLanguageBinding binding =
GetDotNetLanguageBinding (language);
- System.CodeDom.Compiler.CodeDomProvider
provider = binding.GetCodeDomProvider ();
- if (provider != null)
- return provider.IsValidIdentifier
(name);
-
- return true;
+ if (language != null && language.Length > 0) {
+ IDotNetLanguageBinding binding =
GetDotNetLanguageBinding (language);
+ System.CodeDom.Compiler.CodeDomProvider
provider = binding.GetCodeDomProvider ();
+ if (provider != null)
+ return
provider.IsValidIdentifier (name);
+ }
+ return name.IndexOfAny (Path.InvalidPathChars)
== -1;
}
else
return false;
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
2006-07-17 17:57:15 UTC (rev 62680)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
2006-07-17 17:57:35 UTC (rev 62681)
@@ -1,15 +1,15 @@
-<Project name="MonoDevelop.Ide" fileversion="2.0" language="C#"
clr-version="Net_1_1" ctype="DotNetProject">
+<Project name="MonoDevelop.Ide" fileversion="2.0" language="C#"
clr-version="Net_2_0" ctype="DotNetProject">
<Configurations active="Debug">
<Configuration name="Debug" ctype="DotNetProjectConfiguration">
<Output directory="../../../build/AddIns/" assembly="MonoDevelop.Ide" />
<Build debugmode="True" target="Library" />
- <Execution runwithwarnings="True" consolepause="True" runtime="MsNet"
clr-version="Net_1_1" />
+ <Execution runwithwarnings="True" consolepause="True" runtime="MsNet"
clr-version="Net_2_0" />
<CodeGeneration compiler="Csc" warninglevel="4" optimize="False"
unsafecodeallowed="False" generateoverflowchecks="True" mainclass=""
generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
</Configuration>
<Configuration name="Release" ctype="DotNetProjectConfiguration">
<Output directory="../../../build/AddIns/" assembly="MonoDevelop.Ide" />
<Build debugmode="False" target="Library" />
- <Execution runwithwarnings="True" consolepause="True" runtime="MsNet"
clr-version="Net_1_1" />
+ <Execution runwithwarnings="True" consolepause="True" runtime="MsNet"
clr-version="Net_2_0" />
<CodeGeneration compiler="Csc" warninglevel="4" optimize="True"
unsafecodeallowed="False" generateoverflowchecks="True" mainclass=""
generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
</Configuration>
</Configurations>
@@ -246,10 +246,6 @@
<File
name="./MonoDevelop.Ide.Templates/CodeTranslationFileDescriptionTemplate.cs"
subtype="Code" buildaction="Compile" />
</Contents>
<References>
- <ProjectReference type="Gac" localcopy="True" refto="System,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <ProjectReference type="Gac" localcopy="True" refto="System.Drawing,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <ProjectReference type="Gac" localcopy="True" refto="System.Xml,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <ProjectReference type="Gac" localcopy="True"
refto="ICSharpCode.SharpZipLib, Version=0.84.0.0, Culture=neutral,
PublicKeyToken=1b03e6acf1164f73" />
<ProjectReference type="Project" localcopy="True" refto="MonoDevelop.Core"
/>
<ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Core.Gui" />
<ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Projects" />
@@ -257,11 +253,6 @@
<ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Components" />
<ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Documentation" />
<ProjectReference type="Project" localcopy="True" refto="MonoDevelop.Dock"
/>
- <ProjectReference type="Gac" localcopy="True" refto="System.Data,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <ProjectReference type="Gac" localcopy="True" refto="System.Web.Services,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
- <ProjectReference type="Gac" localcopy="True" refto="Mono.GetOptions,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
- <ProjectReference type="Gac" localcopy="True"
refto="System.Runtime.Remoting, Version=1.0.5000.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
<ProjectReference type="Assembly" localcopy="True"
refto="../../../contrib/log4net" />
<ProjectReference type="Gac" localcopy="True" refto="gecko-sharp,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=ccf7d78a55e9f021" />
<ProjectReference type="Gac" localcopy="True" refto="monodoc,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
@@ -274,5 +265,14 @@
<ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp,
Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="gtkhtml-sharp,
Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="pango-sharp,
Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="System,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Gac" localcopy="True" refto="System.Drawing,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <ProjectReference type="Gac" localcopy="True" refto="System.Xml,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Gac" localcopy="True"
refto="ICSharpCode.SharpZipLib, Version=2.84.0.0, Culture=neutral,
PublicKeyToken=1b03e6acf1164f73" />
+ <ProjectReference type="Gac" localcopy="True" refto="System.Data,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Gac" localcopy="True" refto="System.Web.Services,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+ <ProjectReference type="Gac" localcopy="True" refto="Mono.GetOptions,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+ <ProjectReference type="Gac" localcopy="True"
refto="System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
</References>
</Project>
\ No newline at end of file
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
