Author: lluis
Date: 2006-01-18 10:56:37 -0500 (Wed, 18 Jan 2006)
New Revision: 55732
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.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.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ResourceFolderNodeBuilder.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
Log:
2006-01-18 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Templates/FileTemplate.cs: Added an Id property,
which stores the codon Id.
*
MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs:
* MonoDevelop.Ide.Gui.Pads.ProjectPad/ResourceFolderNodeBuilder.cs:
* MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs:
* MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:
* MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs:
* MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs:
On project specific commands, save the affected project, not the
whole combine.
* MonoDevelop.Ide.Gui/ProjectOperations.cs: Added SaveProject method.
Added a CreateProjectFile overload with a parameter that can be
the id of the template to select by default in the new file dialog.
* MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs: Allow selecting
a template.
* MonoDevelop.Ide.Gui/Workbench.cs: Added null check.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2006-01-18
15:50:56 UTC (rev 55731)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2006-01-18
15:56:37 UTC (rev 55732)
@@ -1,3 +1,26 @@
+2006-01-18 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Templates/FileTemplate.cs: Added an Id property,
+ which stores the codon Id.
+
+ *
MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs:
+ * MonoDevelop.Ide.Gui.Pads.ProjectPad/ResourceFolderNodeBuilder.cs:
+ * MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs:
+ * MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs:
+ * MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs:
+ * MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs:
+ On project specific commands, save the affected project, not the
+ whole combine.
+
+ * MonoDevelop.Ide.Gui/ProjectOperations.cs: Added SaveProject method.
+ Added a CreateProjectFile overload with a parameter that can be
+ the id of the template to select by default in the new file dialog.
+
+ * MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs: Allow selecting
+ a template.
+
+ * MonoDevelop.Ide.Gui/Workbench.cs: Added null check.
+
2006-01-14 Andrés G. Aragoneses <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs: Replaced 'Combine'
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
2006-01-18 15:50:56 UTC (rev 55731)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
2006-01-18 15:56:37 UTC (rev 55732)
@@ -342,6 +342,19 @@
}
}
+ public void SaveProject (Project project)
+ {
+ IProgressMonitor monitor =
IdeApp.Workbench.ProgressMonitors.GetSaveProgressMonitor ();
+ try {
+ project.Save (monitor);
+ monitor.ReportSuccess (GettextCatalog.GetString
("Project saved."));
+ } catch (Exception ex) {
+ monitor.ReportError (GettextCatalog.GetString
("Save failed."), ex);
+ } finally {
+ monitor.Dispose ();
+ }
+ }
+
public void MarkFileDirty (string filename)
{
if (openCombine != null) {
@@ -462,7 +475,14 @@
public void CreateProjectFile (Project parentProject, string
basePath)
{
+ CreateProjectFile (parentProject, basePath, null);
+ }
+
+ public void CreateProjectFile (Project parentProject, string
basePath, string selectedTemplateId)
+ {
using (NewFileDialog nfd = new NewFileDialog
(parentProject, basePath)) {
+ if (selectedTemplateId != null)
+ nfd.SelectTemplate (selectedTemplateId);
nfd.Run ();
nfd.Dispose ();
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
2006-01-18 15:50:56 UTC (rev 55731)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
2006-01-18 15:56:37 UTC (rev 55732)
@@ -523,6 +523,9 @@
public void Invoke(string fileName)
{
newContent = binding.CreateContentForFile(fileName);
+ if (newContent == null)
+ return;
+
if (project != null)
{
newContent.HasProject = true;
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-01-18 15:50:56 UTC (rev 55731)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
2006-01-18 15:56:37 UTC (rev 55732)
@@ -69,6 +69,7 @@
}
InitializeTemplates ();
+ nameEntry.GrabFocus ();
}
void InitializeView()
@@ -119,6 +120,36 @@
}
}
+ public void SelectTemplate (string id)
+ {
+ TreeIter iter;
+ catStore.GetIterFirst (out iter);
+ SelectTemplate (iter, id);
+ }
+
+ public bool SelectTemplate (TreeIter iter, string id)
+ {
+ do {
+ foreach (TemplateItem item in
(ArrayList)(catStore.GetValue (iter, 2))) {
+ if (item.Template.Id == id) {
+ catView.Selection.SelectIter
(iter);
+ TemplateView.CurrentlySelected
= item;
+ return true;
+ }
+ }
+
+ TreeIter citer;
+ if (catStore.IterChildren (out citer, iter)) {
+ do {
+ if (SelectTemplate (citer, id))
+ return true;
+ } while (catStore.IterNext (ref citer));
+ }
+
+ } while (catStore.IterNext (ref iter));
+ return false;
+ }
+
Category GetCategory (string categoryname)
{
return GetCategory (categories, categoryname);
@@ -218,17 +249,19 @@
TreeModel mdl;
TreeIter iter;
if (catView.Selection.GetSelected (out mdl, out iter)) {
- //templateStore.Clear ();
- TemplateView.Clear ();
- foreach (TemplateItem item in
(ArrayList)((Gtk.TreeStore)mdl).GetValue (iter, 2)) {
- //templateStore.AppendValues
(item.Name, item.Template);
-
- TemplateView.AddIcon(new
Gtk.Image(Services.Resources.GetBitmap (item.Template.Icon, Gtk.IconSize.Dnd)),
item.Name, item);
- }
+ FillCategoryTemplates (iter);
okButton.Sensitive = false;
}
}
+ void FillCategoryTemplates (TreeIter iter)
+ {
+ TemplateView.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);
+ }
+ }
+
// list view event handlers
void SelectedIndexChange (object sender, EventArgs e)
{
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs
2006-01-18 15:50:56 UTC (rev 55731)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs
2006-01-18 15:56:37 UTC (rev 55732)
@@ -324,7 +324,7 @@
{
Project project = CurrentNode.GetParentDataItem
(typeof(Project), true) as Project;
IdeApp.ProjectOperations.CreateProjectFile (project,
GetFolderPath (CurrentNode.DataItem));
- IdeApp.ProjectOperations.SaveCombine();
+ IdeApp.ProjectOperations.SaveProject (project);
CurrentNode.Expanded = true;
}
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-01-18 15:50:56 UTC (rev 55731)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs
2006-01-18 15:56:37 UTC (rev 55732)
@@ -149,7 +149,7 @@
project.ProjectFiles.Add (folderFile);
}
project.ProjectFiles.Remove (file);
- IdeApp.ProjectOperations.SaveCombine();
+ IdeApp.ProjectOperations.SaveProject (project);
}
[CommandUpdateHandler (ProjectCommands.IncludeInBuild)]
@@ -168,7 +168,7 @@
} else {
finfo.BuildAction = BuildAction.Compile;
}
- IdeApp.ProjectOperations.SaveCombine();
+ IdeApp.ProjectOperations.SaveProject (finfo.Project);
}
[CommandUpdateHandler (ProjectCommands.IncludeInDeploy)]
@@ -190,7 +190,7 @@
} else {
project.DeployInformation.AddExcludedFile
(finfo.Name);
}
- IdeApp.ProjectOperations.SaveCombine();
+ 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-01-18 15:50:56 UTC (rev 55731)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectNodeBuilder.cs
2006-01-18 15:56:37 UTC (rev 55732)
@@ -306,7 +306,7 @@
{
Project p = (Project) CurrentNode.DataItem;
if (IdeApp.ProjectOperations.AddReferenceToProject (p))
- IdeApp.ProjectOperations.SaveCombine();
+ IdeApp.ProjectOperations.SaveProject (p);
}
public override DragOperation CanDragNode ()
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs
2006-01-18 15:50:56 UTC (rev 55731)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs
2006-01-18 15:56:37 UTC (rev 55732)
@@ -156,7 +156,7 @@
{
Project p = (Project) CurrentNode.GetParentDataItem
(typeof(Project), false);
if (IdeApp.ProjectOperations.AddReferenceToProject (p))
{
- IdeApp.ProjectOperations.SaveCombine();
+ IdeApp.ProjectOperations.SaveProject (p);
CurrentNode.Expanded = true;
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs
2006-01-18 15:50:56 UTC (rev 55731)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs
2006-01-18 15:56:37 UTC (rev 55732)
@@ -96,7 +96,7 @@
ProjectReference pref = (ProjectReference)
CurrentNode.DataItem;
Project project = CurrentNode.GetParentDataItem
(typeof(Project), false) as Project;
project.ProjectReferences.Remove (pref);
- IdeApp.ProjectOperations.SaveCombine ();
+ IdeApp.ProjectOperations.SaveProject (project);
}
[CommandHandler (ProjectCommands.LocalCopyReference)]
@@ -104,7 +104,8 @@
{
ProjectReference pref = (ProjectReference)
CurrentNode.DataItem;
pref.LocalCopy = !pref.LocalCopy;
- IdeApp.ProjectOperations.SaveCombine ();
+ Project project = CurrentNode.GetParentDataItem
(typeof(Project), false) as Project;
+ IdeApp.ProjectOperations.SaveProject (project);
}
[CommandUpdateHandler (ProjectCommands.LocalCopyReference)]
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ResourceFolderNodeBuilder.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ResourceFolderNodeBuilder.cs
2006-01-18 15:50:56 UTC (rev 55731)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ResourceFolderNodeBuilder.cs
2006-01-18 15:56:37 UTC (rev 55732)
@@ -112,7 +112,7 @@
foreach (string fileName in files)
project.AddFile (fileName,
BuildAction.EmbedAsResource);
- IdeApp.ProjectOperations.SaveCombine ();
+ IdeApp.ProjectOperations.SaveProject (project);
}
string[] AskFiles (Project project)
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
2006-01-18 15:50:56 UTC (rev 55731)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
2006-01-18 15:56:37 UTC (rev 55732)
@@ -32,6 +32,7 @@
{
public static ArrayList FileTemplates = new ArrayList();
+ string id;
string originator = null;
string created = null;
string lastmodified = null;
@@ -48,6 +49,12 @@
XmlElement fileoptions = null;
+ public string Id {
+ get {
+ return id;
+ }
+ }
+
public string WizardPath {
get {
return wizardpath;
@@ -201,6 +208,7 @@
foreach (FileTemplateCodon codon in codons) {
try {
FileTemplate t = LoadFileTemplate
(codon.AddIn, codon.Resource);
+ t.id = codon.ID;
FileTemplates.Add (t);
} catch (Exception e) {
Services.MessageService.ShowError (e,
String.Format (GettextCatalog.GetString ("Error loading template from resource
{0}"), codon.Resource));
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches