Author: lluis
Date: 2007-02-10 17:35:35 -0500 (Sat, 10 Feb 2007)
New Revision: 72590
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/Base.glade
trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/AssemblyReferencePanel.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ProjectReferencePanel.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdStatusBar.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
Log:
* MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs: Added
null check.
* MonoDevelop.Ide.Templates/ProjectTemplate.cs: Don't crash if some
properties of a template are not set.
* Base.glade: Made the references dialog a bit bigger by default. Also
removed the expander, since there is now an VPaned which can be
used to shrink the refs list.
* MonoDevelop.Ide.Gui.Dialogs/AssemblyReferencePanel.cs: Show the
project path by default in the file browser.
* MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs: Show an icon
for each selected reference.
* MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs: Show an icon
together with the name of the reference.
* MonoDevelop.Ide.Gui.Dialogs/ProjectReferencePanel.cs: Make sure the
cyclic reference warning is shown at the end of the list.
* MonoDevelop.Ide.mdp, Makefile.am: Synchronized mdp project with
makefile.
* MonoDevelop.Ide.Gui/SdStatusBar.cs: Make sure the status bar is at
least hight enough to show an icon of Menu size.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/Base.glade
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/Base.glade 2007-02-10
22:13:14 UTC (rev 72589)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/Base.glade 2007-02-10
22:35:35 UTC (rev 72590)
@@ -556,9 +556,9 @@
<property name="title">Edit References</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="default_width">570</property>
- <property name="default_height">400</property>
+ <property name="modal">True</property>
+ <property name="default_width">520</property>
+ <property name="default_height">570</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">True</property>
<property name="decorated">True</property>
@@ -625,7 +625,8 @@
<child>
<widget class="GtkVPaned" id="vpaned1">
<property name="visible">True</property>
- <property name="position">250</property>
+ <property name="can_focus">True</property>
+ <property name="position">325</property>
<child>
<widget class="GtkNotebook" id="mainBook">
@@ -686,19 +687,42 @@
</widget>
<packing>
<property name="shrink">False</property>
- <property name="resize">False</property>
+ <property name="resize">True</property>
</packing>
</child>
<child>
- <widget class="GtkExpander" id="expander2">
- <property name="height_request">100</property>
+ <widget class="GtkVBox" id="vbox76">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="expanded">True</property>
- <property name="spacing">0</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
<child>
+ <widget class="GtkLabel" id="label114">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Selected
references:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkHBox" id="hbox4">
<property name="height_request">150</property>
<property name="visible">True</property>
@@ -709,8 +733,8 @@
<widget class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property
name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
@@ -776,34 +800,16 @@
</packing>
</child>
</widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label103">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Selected
references</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
- <property name="shrink">False</property>
- <property name="resize">True</property>
+ <property name="shrink">True</property>
+ <property name="resize">False</property>
</packing>
</child>
</widget>
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2007-02-10
22:13:14 UTC (rev 72589)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2007-02-10
22:35:35 UTC (rev 72590)
@@ -1,3 +1,25 @@
+2007-02-10 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs: Added
+ null check.
+ * MonoDevelop.Ide.Templates/ProjectTemplate.cs: Don't crash if some
+ properties of a template are not set.
+ * Base.glade: Made the references dialog a bit bigger by default. Also
+ removed the expander, since there is now an VPaned which can be
+ used to shrink the refs list.
+ * MonoDevelop.Ide.Gui.Dialogs/AssemblyReferencePanel.cs: Show the
+ project path by default in the file browser.
+ * MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs: Show an icon
+ for each selected reference.
+ * MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs: Show an icon
+ together with the name of the reference.
+ * MonoDevelop.Ide.Gui.Dialogs/ProjectReferencePanel.cs: Make sure the
+ cyclic reference warning is shown at the end of the list.
+ * MonoDevelop.Ide.mdp, Makefile.am: Synchronized mdp project with
+ makefile.
+ * MonoDevelop.Ide.Gui/SdStatusBar.cs: Make sure the status bar is at
+ least hight enough to show an icon of Menu size.
+
2007-02-08 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* Makefile.am: Fix variable name.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am 2007-02-10
22:13:14 UTC (rev 72589)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am 2007-02-10
22:35:35 UTC (rev 72590)
@@ -1,30 +1,30 @@
REFS = \
- -r:System \
- -r:System.Drawing \
- -r:System.Xml \
- -r:ICSharpCode.SharpZipLib \
- -r:System.Data \
- -r:System.Web.Services \
- -r:Mono.Posix \
- -r:Mono.GetOptions \
- -r:System.Runtime.Remoting \
+ $(GECKO_SHARP_LIBS) \
$(GLADE_SHARP_LIBS) \
+ $(GNOME_SHARP_LIBS) \
+ $(GNOME_VFS_SHARP_LIBS) \
$(GTK_SHARP_LIBS) \
+ $(GTKHTML_SHARP_LIBS) \
$(MONODOC_LIBS) \
- $(GECKO_SHARP_LIBS) \
- $(GNOME_VFS_SHARP_LIBS) \
- $(GNOME_SHARP_LIBS) \
- $(GTKHTML_SHARP_LIBS) \
- -r:$(top_builddir)/build/bin/log4net.dll \
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.Components.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.Dock.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Core.Gui.dll \
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Documentation.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Documentation.dll \
- -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll
+ -r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll \
+ -r:$(top_builddir)/build/bin/log4net.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:ICSharpCode.SharpZipLib \
+ -r:Mono.GetOptions \
+ -r:Mono.Posix \
+ -r:System \
+ -r:System.Data \
+ -r:System.Drawing \
+ -r:System.Runtime.Remoting \
+ -r:System.Web.Services \
+ -r:System.Xml
FILES = \
gtk-gui/generated.cs \
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdStatusBar.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdStatusBar.cs
2007-02-10 22:13:14 UTC (rev 72589)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdStatusBar.cs
2007-02-10 22:35:35 UTC (rev 72590)
@@ -86,6 +86,10 @@
Progress.Hide ();
Progress.PulseStep = 0.3;
+
+ int w, h;
+ Gtk.Icon.SizeLookup (IconSize.Menu, out w, out h);
+ statusLabel.HeightRequest = h;
}
public void SetModeStatus (string status)
@@ -117,7 +121,7 @@
currentStatusImage = null;
}
if (message != null)
- statusLabel.Text = " " + message;
+ statusLabel.Text = " " + message.Replace ("\n",
" ");
else
statusLabel.Text = "";
}
@@ -132,7 +136,7 @@
}
if (message != null)
- statusLabel.Text = message;
+ statusLabel.Text = message.Replace ("\n", " ");
else
statusLabel.Text = "";
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/AssemblyReferencePanel.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/AssemblyReferencePanel.cs
2007-02-10 22:13:14 UTC (rev 72589)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/AssemblyReferencePanel.cs
2007-02-10 22:35:35 UTC (rev 72590)
@@ -22,7 +22,7 @@
SelectReferenceDialog selectDialog;
FileChooserWidget chooser;
- public AssemblyReferencePanel(SelectReferenceDialog
selectDialog)
+ public AssemblyReferencePanel (SelectReferenceDialog
selectDialog)
{
this.selectDialog = selectDialog;
@@ -53,6 +53,11 @@
ShowAll();
}
+ public void SetBasePath (string path)
+ {
+ chooser.SetCurrentFolder (path);
+ }
+
void SelectReferenceDialog(object sender, EventArgs e)
{
string[] selectedFiles = new
string[chooser.Filenames.Length];
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
2007-02-10 22:13:14 UTC (rev 72589)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GacReferencePanel.cs
2007-02-10 22:35:35 UTC (rev 72590)
@@ -20,31 +20,40 @@
SelectReferenceDialog selectDialog;
ClrVersion version;
- TreeStore store;
+ ListStore store;
TreeView treeView;
public GacReferencePanel(SelectReferenceDialog selectDialog)
{
this.selectDialog = selectDialog;
- store = new TreeStore (typeof (string), typeof
(string), typeof(string), typeof(bool), typeof(string), typeof(string));
+ store = new ListStore (typeof (string), typeof
(string), typeof(string), typeof(bool), typeof(string), typeof(string));
treeView = new TreeView (store);
TreeViewColumn firstColumn = new TreeViewColumn ();
- firstColumn.Title = GettextCatalog.GetString
("Reference Name");
CellRendererToggle tog_render = new CellRendererToggle
();
tog_render.Toggled += new Gtk.ToggledHandler
(AddReference);
firstColumn.PackStart (tog_render, false);
firstColumn.AddAttribute (tog_render, "active", 3);
+ treeView.AppendColumn (firstColumn);
+
+ TreeViewColumn secondColumn = new TreeViewColumn ();
+ secondColumn.Title = GettextCatalog.GetString
("Assembly");
+ CellRendererPixbuf crp = new CellRendererPixbuf ();
+ secondColumn.PackStart (crp, false);
+ crp.StockId = "md-package";
+
CellRendererText text_render = new CellRendererText ();
- firstColumn.PackStart (text_render, true);
- firstColumn.AddAttribute (text_render, "text", 0);
+ secondColumn.PackStart (text_render, true);
+ secondColumn.AddAttribute (text_render, "text", 0);
- treeView.AppendColumn (firstColumn);
- firstColumn.Resizable = true;
+ treeView.AppendColumn (secondColumn);
+
treeView.AppendColumn (GettextCatalog.GetString
("Version"), new CellRendererText (), "text", 1);
treeView.AppendColumn (GettextCatalog.GetString
("Package"), new CellRendererText (), "text", 5);
+
+ treeView.Columns[1].Resizable = true;
store.SetSortColumnId (0, SortType.Ascending);
store.SetSortFunc (0, new TreeIterCompareFunc
(SortTree));
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ProjectReferencePanel.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ProjectReferencePanel.cs
2007-02-10 22:13:14 UTC (rev 72589)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ProjectReferencePanel.cs
2007-02-10 22:35:35 UTC (rev 72590)
@@ -27,7 +27,7 @@
this.selectDialog = selectDialog;
store = new ListStore (typeof (string), typeof
(string), typeof(Project), typeof(bool), typeof(Gdk.Pixbuf), typeof(bool));
- store.SetSortColumnId (0, SortType.Ascending);
+ store.DefaultSortFunc = new Gtk.TreeIterCompareFunc
(CompareNodes);
treeView = new TreeView (store);
TreeViewColumn firstColumn = new TreeViewColumn ();
@@ -104,6 +104,15 @@
} while (store.IterNext (ref looping_iter));
}
+ int CompareNodes (Gtk.TreeModel model, Gtk.TreeIter a,
Gtk.TreeIter b)
+ {
+ string s1 = (string) store.GetValue (a, 0);
+ string s2 = (string) store.GetValue (b, 0);
+ if (s1 == string.Empty) return 1;
+ if (s2 == string.Empty) return -1;
+ return String.Compare (s1, s2, true);
+ }
+
void PopulateListView (Project configureProject)
{
Combine openCombine =
IdeApp.ProjectOperations.CurrentOpenCombine;
@@ -129,7 +138,7 @@
}
if (circDeps)
- store.AppendValues ("" + (char)200, "<span
foreground='dimgrey'>" + GettextCatalog.GetString ("(Projects referencing '{0}'
are not shown,\nsince cyclic dependencies are not allowed)",
configureProject.Name) + "</span>", null, false, null, false);
+ store.AppendValues ("", "<span
foreground='dimgrey'>" + GettextCatalog.GetString ("(Projects referencing '{0}'
are not shown,\nsince cyclic dependencies are not allowed)",
configureProject.Name) + "</span>", null, false, null, false);
}
bool ProjectReferencesProject (Project project, string
targetProject)
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs
2007-02-10 22:13:14 UTC (rev 72589)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SelectReferenceDialog.cs
2007-02-10 22:35:35 UTC (rev 72590)
@@ -21,22 +21,24 @@
internal class SelectReferenceDialog
{
- TreeStore refTreeStore;
+ ListStore refTreeStore;
[Widget] Dialog AddReferenceDialog;
[Widget] TreeView ReferencesTreeView;
// [Widget] Button okbutton;
// [Widget] Button cancelbutton;
[Widget] Button RemoveReferenceButton;
[Widget] Notebook mainBook;
+
GacReferencePanel gacRefPanel;
-
ProjectReferencePanel projectRefPanel;
+ AssemblyReferencePanel assemblyRefPanel;
Project configureProject;
const int NameColumn = 0;
const int TypeNameColumn = 1;
const int LocationColumn = 2;
const int ProjectReferenceColumn = 3;
+ const int IconColumn = 4;
public ProjectReferenceCollection ReferenceInformations {
get {
@@ -69,11 +71,12 @@
public void SetProject (Project configureProject)
{
this.configureProject = configureProject;
- ((TreeStore) ReferencesTreeView.Model).Clear ();
+ ((ListStore) ReferencesTreeView.Model).Clear ();
projectRefPanel.SetProject (configureProject);
gacRefPanel.SetProject (configureProject);
gacRefPanel.Reset ();
+ assemblyRefPanel.SetBasePath
(configureProject.BaseDirectory);
foreach (ProjectReference refInfo in
configureProject.ProjectReferences)
AddReference (refInfo);
@@ -97,7 +100,7 @@
TreeIter AddAssemplyReference (ProjectReference refInfo)
{
- return refTreeStore.AppendValues
(System.IO.Path.GetFileName (refInfo.Reference), GetTypeText (refInfo),
System.IO.Path.GetFullPath (refInfo.Reference), refInfo);
+ return refTreeStore.AppendValues
(System.IO.Path.GetFileName (refInfo.Reference), GetTypeText (refInfo),
System.IO.Path.GetFullPath (refInfo.Reference), refInfo, "md-closed-folder");
}
TreeIter AddProjectReference (ProjectReference refInfo)
@@ -108,14 +111,15 @@
Project p = c.FindProject (refInfo.Reference);
if (p == null) return TreeIter.Zero;
+ string iconName = Services.Icons.GetImageForProjectType
(p.ProjectType);
projectRefPanel.SignalRefChange (refInfo.Reference,
true);
- return refTreeStore.AppendValues
(System.IO.Path.GetFileName (refInfo.Reference), GetTypeText (refInfo),
p.BaseDirectory, refInfo);
+ return refTreeStore.AppendValues
(System.IO.Path.GetFileName (refInfo.Reference), GetTypeText (refInfo),
p.BaseDirectory, refInfo, iconName);
}
TreeIter AddGacReference (ProjectReference refInfo)
{
gacRefPanel.SignalRefChange (refInfo.Reference, true);
- return refTreeStore.AppendValues
(System.IO.Path.GetFileNameWithoutExtension (refInfo.Reference), GetTypeText
(refInfo), refInfo.Reference, refInfo);
+ return refTreeStore.AppendValues
(System.IO.Path.GetFileNameWithoutExtension (refInfo.Reference), GetTypeText
(refInfo), refInfo.Reference, refInfo, "md-package");
}
public SelectReferenceDialog(Project configureProject)
@@ -123,21 +127,32 @@
Glade.XML refXML = new Glade.XML (null, "Base.glade",
"AddReferenceDialog", null);
refXML.Autoconnect (this);
- refTreeStore = new TreeStore (typeof (string),
typeof(string), typeof(string), typeof(ProjectReference));
+ refTreeStore = new ListStore (typeof (string),
typeof(string), typeof(string), typeof(ProjectReference), typeof(string));
ReferencesTreeView.Model = refTreeStore;
- ReferencesTreeView.AppendColumn
(GettextCatalog.GetString("Reference Name"), new CellRendererText (), "text",
NameColumn);
+ TreeViewColumn col = new TreeViewColumn ();
+ col.Title = GettextCatalog.GetString("Reference");
+ CellRendererPixbuf crp = new CellRendererPixbuf ();
+ col.PackStart (crp, false);
+ col.AddAttribute (crp, "stock-id", IconColumn);
+ CellRendererText text_render = new CellRendererText ();
+ col.PackStart (text_render, true);
+ col.AddAttribute (text_render, "text", NameColumn);
+
+ ReferencesTreeView.AppendColumn (col);
ReferencesTreeView.AppendColumn
(GettextCatalog.GetString ("Type"), new CellRendererText (), "text",
TypeNameColumn);
ReferencesTreeView.AppendColumn
(GettextCatalog.GetString ("Location"), new CellRendererText (), "text",
LocationColumn);
projectRefPanel = new ProjectReferencePanel (this);
gacRefPanel = new GacReferencePanel (this);
+ assemblyRefPanel = new AssemblyReferencePanel (this);
SetProject (configureProject);
mainBook.RemovePage (mainBook.CurrentPage);
mainBook.AppendPage (gacRefPanel, new Label
(GettextCatalog.GetString ("Packages")));
mainBook.AppendPage (projectRefPanel, new Label
(GettextCatalog.GetString ("Projects")));
- mainBook.AppendPage (new AssemblyReferencePanel (this),
new Label (GettextCatalog.GetString (".Net Assembly")));
+ mainBook.AppendPage (assemblyRefPanel, new Label
(GettextCatalog.GetString (".Net Assembly")));
+ mainBook.Page = 0;
ReferencesTreeView.Selection.Changed += new
EventHandler (OnChanged);
AddReferenceDialog.ShowAll ();
OnChanged (null, null);
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
2007-02-10 22:13:14 UTC (rev 72589)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
2007-02-10 22:35:35 UTC (rev 72590)
@@ -190,9 +190,9 @@
{
this.id = id;
- originator =
doc.DocumentElement.Attributes["originator"].InnerText;
- created =
doc.DocumentElement.Attributes["created"].InnerText;
- lastmodified =
doc.DocumentElement.Attributes["lastModified"].InnerText;
+ originator = doc.DocumentElement.GetAttribute
("originator");
+ created = doc.DocumentElement.GetAttribute
("created");
+ lastmodified = doc.DocumentElement.GetAttribute
("lastModified");
XmlElement config =
doc.DocumentElement["TemplateConfiguration"];
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
2007-02-10 22:13:14 UTC (rev 72589)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
2007-02-10 22:35:35 UTC (rev 72590)
@@ -130,6 +130,9 @@
fileName = sps.Parse (name,
HashtableToStringArray (tags));
}
+ if (fileName == null)
+ throw new InvalidOperationException ("File name
not provided in template");
+
//give it an extension if it didn't get one
(compatibility with pre-substition behaviour)
if (Path.GetExtension (fileName).Length == 0) {
if (!string.IsNullOrEmpty (defaultExtension)) {
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
2007-02-10 22:13:14 UTC (rev 72589)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
2007-02-10 22:35:35 UTC (rev 72590)
@@ -289,15 +289,15 @@
<ProjectReference type="Gac" localcopy="True" refto="gdk-sharp,
Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="gtk-sharp,
Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Project" localcopy="True" refto="MonoDevelop.Core"
/>
+ <ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Projects.Gui" />
+ <ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Documentation" />
<ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Components" />
<ProjectReference type="Project" localcopy="True" refto="MonoDevelop.Dock"
/>
<ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Core.Gui" />
<ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Projects" />
- <ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Documentation" />
- <ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Projects.Gui" />
<ProjectReference type="Assembly" localcopy="True"
refto="../../../build/bin/log4net.dll" />
</References>
- <MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="./Makefile.am"
ExecuteTargetName="" SyncReferences="True" IsAutotoolsProject="True"
RelativeConfigureInPath="../../../" OutputDirVar="" AssemblyNameVar="">
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True"
RelativeMakefileName="./Makefile.am" ExecuteTargetName="" SyncReferences="True"
IsAutotoolsProject="True" RelativeConfigureInPath="../../../" OutputDirVar=""
AssemblyNameVar="">
<BuildFilesVar Sync="True" Name="FILES" />
<DeployFilesVar />
<ResourcesVar Sync="True" Name="RES" />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches