Author: lluis
Date: 2008-01-22 05:23:39 -0500 (Tue, 22 Jan 2008)
New Revision: 93498
Modified:
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/ChangeLog
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
Log:
2008-01-22 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs: If a project is
selected in
the solution tree, activate the 'add to project' option by default.
* MonoDevelop.Ide.Gui/DefaultWorkbench.cs: Added missing null check.
Modified: branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/ChangeLog
===================================================================
--- branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/ChangeLog
2008-01-22 10:23:03 UTC (rev 93497)
+++ branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/ChangeLog
2008-01-22 10:23:39 UTC (rev 93498)
@@ -1,3 +1,9 @@
+2008-01-22 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs: If a project is
selected in
+ the solution tree, activate the 'add to project' option by default.
+ * MonoDevelop.Ide.Gui/DefaultWorkbench.cs: Added missing null check.
+
2008-01-20 Ankit Jain <[EMAIL PROTECTED]>
* templates/EmptyXMLFile.xft.xml:
Modified:
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
===================================================================
---
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
2008-01-22 10:23:03 UTC (rev 93497)
+++
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
2008-01-22 10:23:39 UTC (rev 93498)
@@ -452,7 +452,7 @@
{
if (e.IsDirectory) {
foreach (IViewContent content in
ViewContentCollection) {
- if
(content.ContentName.StartsWith(e.SourceFile)) {
+ if (content.ContentName != null &&
content.ContentName.StartsWith(e.SourceFile)) {
content.ContentName =
e.TargetFile + content.ContentName.Substring(e.SourceFile.Length);
}
}
Modified:
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
===================================================================
---
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
2008-01-22 10:23:03 UTC (rev 93497)
+++
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs
2008-01-22 10:23:39 UTC (rev 93498)
@@ -73,7 +73,6 @@
this.BorderWidth = 6;
this.HasSeparator = false;
- InitializeDialog (false);
InitializeComponents ();
nameEntry.GrabFocus ();
@@ -556,10 +555,12 @@
}
if (projects != null) {
+ Project curProject =
IdeApp.ProjectOperations.CurrentSelectedProject;
+
boxProject.Visible = true;
+ projectAddCheckbox.Active = curProject != null;
projectAddCheckbox.Toggled += new EventHandler
(AddToProjectToggled);
- Project curProject =
IdeApp.ProjectOperations.CurrentSelectedProject;
projectNames = new string [projects.Count];
int i = 0;
@@ -578,11 +579,11 @@
projectAddCombo.AppendText (pn);
projectAddCombo.Active = i;
- projectAddCombo.Sensitive = false;
+ projectAddCombo.Sensitive =
projectAddCheckbox.Active;
projectAddCombo.Changed += new EventHandler
(AddToProjectComboChanged);
- projectPathLabel.Sensitive = false;
- projectFolderEntry.Sensitive = false;
+ projectPathLabel.Sensitive =
projectAddCheckbox.Active;
+ projectFolderEntry.Sensitive =
projectAddCheckbox.Active;
if (curProject != null)
projectFolderEntry.Path =
curProject.BaseDirectory;
projectFolderEntry.PathChanged += new
EventHandler (AddToProjectPathChanged);
@@ -603,6 +604,7 @@
catView.RowActivated += new RowActivatedHandler
(CategoryActivated);
iconView.IconSelected += new
EventHandler(SelectedIndexChange);
iconView.IconDoubleClicked += new
EventHandler(OpenEvent);
+ InitializeDialog (false);
InitializeView ();
UpdateOkStatus ();
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
