Author: lluis
Date: 2006-11-23 13:49:16 -0500 (Thu, 23 Nov 2006)
New Revision: 68412
Modified:
trunk/monodevelop/Extras/ChangeLogAddIn/ChangeLog
trunk/monodevelop/Extras/ChangeLogAddIn/ChangeLogAddIn.mdp
trunk/monodevelop/Extras/ChangeLogAddIn/CommitDialogExtensionWidget.cs
trunk/monodevelop/Extras/ChangeLogAddIn/Makefile.am
trunk/monodevelop/Extras/ChangeLogAddIn/gtk-gui/generated.cs
trunk/monodevelop/Extras/ChangeLogAddIn/gtk-gui/gui.stetic
Log:
* ChangeLogAddIn.mdp, Makefile.am: Updated references to version
control add-in.
* gtk-gui/generated.cs, gtk-gui/gui.stetic: Updated.
* CommitDialogExtensionWidget.cs: Don't try to commit the ChangeLog
file if it is not really committable.
Modified: trunk/monodevelop/Extras/ChangeLogAddIn/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/ChangeLogAddIn/ChangeLog 2006-11-23 18:32:10 UTC
(rev 68411)
+++ trunk/monodevelop/Extras/ChangeLogAddIn/ChangeLog 2006-11-23 18:49:16 UTC
(rev 68412)
@@ -1,3 +1,11 @@
+2006-11-23 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * ChangeLogAddIn.mdp, Makefile.am: Updated references to version
+ control add-in.
+ * gtk-gui/generated.cs, gtk-gui/gui.stetic: Updated.
+ * CommitDialogExtensionWidget.cs: Don't try to commit the ChangeLog
+ file if it is not really committable.
+
2006-11-16 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* AddLogEntryDialog.cs: New dialog that shows a new entry to be added
Modified: trunk/monodevelop/Extras/ChangeLogAddIn/ChangeLogAddIn.mdp
===================================================================
--- trunk/monodevelop/Extras/ChangeLogAddIn/ChangeLogAddIn.mdp 2006-11-23
18:32:10 UTC (rev 68411)
+++ trunk/monodevelop/Extras/ChangeLogAddIn/ChangeLogAddIn.mdp 2006-11-23
18:49:16 UTC (rev 68412)
@@ -31,10 +31,9 @@
<ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Components" />
<ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.Projects" />
<ProjectReference type="Project" localcopy="True" refto="MonoDevelop.Ide"
/>
- <ProjectReference type="Project" localcopy="True"
refto="VersionControlAddIn" />
- <ProjectReference type="Project" localcopy="True" refto="VersionControl" />
<ProjectReference type="Gac" localcopy="True" refto="gtk-sharp,
Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="gdk-sharp,
Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Project" localcopy="True"
refto="MonoDevelop.VersionControl" />
</References>
<GtkDesignInfo>
<ExportedWidgets />
Modified: trunk/monodevelop/Extras/ChangeLogAddIn/CommitDialogExtensionWidget.cs
===================================================================
--- trunk/monodevelop/Extras/ChangeLogAddIn/CommitDialogExtensionWidget.cs
2006-11-23 18:32:10 UTC (rev 68411)
+++ trunk/monodevelop/Extras/ChangeLogAddIn/CommitDialogExtensionWidget.cs
2006-11-23 18:49:16 UTC (rev 68412)
@@ -2,8 +2,7 @@
using System;
using System.IO;
using Gtk;
-using VersionControl.AddIn;
-using VersionControl.Service;
+using MonoDevelop.VersionControl;
using MonoDevelop.Core;
using MonoDevelop.Projects.Text;
using MonoDevelop.Ide.Gui;
@@ -66,8 +65,11 @@
msgLabel.Markup = "<b><span foreground='red'>"
+ GettextCatalog.GetString ("There is no ChangeLog file in the path:") +
"</span></b>";
pathLabel.Text = cset.BaseLocalPath;
logButton.Sensitive = false;
+ } else if (!cset.Repository.CanCommit (logf)){
+ msgLabel.Markup = GettextCatalog.GetString
("The following ChangeLog file (<b><span foreground='red'>not
versioned</span></b>) will be updated:");
+ pathLabel.Text = logf;
} else {
- msgLabel.Markup = GettextCatalog.GetString
("The following changelog will be updated:");
+ msgLabel.Markup = GettextCatalog.GetString
("The following ChangeLog file will be updated:");
pathLabel.Text = logf;
}
notConfigured = false;
@@ -79,7 +81,7 @@
if (logf == null)
return true;
- if (!changeSet.ContainsFile (logf))
+ if (!changeSet.ContainsFile (logf) &&
changeSet.Repository.CanCommit (logf))
changeSet.AddFile (logf);
if (message == null)
Modified: trunk/monodevelop/Extras/ChangeLogAddIn/Makefile.am
===================================================================
--- trunk/monodevelop/Extras/ChangeLogAddIn/Makefile.am 2006-11-23 18:32:10 UTC
(rev 68411)
+++ trunk/monodevelop/Extras/ChangeLogAddIn/Makefile.am 2006-11-23 18:49:16 UTC
(rev 68412)
@@ -7,7 +7,6 @@
-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.Ide.dll \
-r:$(top_builddir)/build/AddIns/VersionControl/VersionControlAddIn.dll \
- -r:$(top_builddir)/build/AddIns/VersionControl/VersionControl.dll \
$(GECKO_SHARP_LIBS) \
$(GTK_SHARP_LIBS) \
$(GNOME_SHARP_LIBS) \
Modified: trunk/monodevelop/Extras/ChangeLogAddIn/gtk-gui/generated.cs
===================================================================
--- trunk/monodevelop/Extras/ChangeLogAddIn/gtk-gui/generated.cs
2006-11-23 18:32:10 UTC (rev 68411)
+++ trunk/monodevelop/Extras/ChangeLogAddIn/gtk-gui/generated.cs
2006-11-23 18:49:16 UTC (rev 68412)
@@ -85,10 +85,10 @@
Gtk.Button w11 = new Gtk.Button();
w11.UseStock = true;
w11.UseUnderline = true;
+ w11.CanDefault = true;
w11.CanFocus = true;
w11.Events = ((Gdk.EventMask)(0));
w11.Name = "button7";
- w11.CanDefault = true;
w11.Label = "gtk-cancel";
bindings["button7"] = w11;
cobj.AddActionWidget(w11, -6);
@@ -99,10 +99,10 @@
Gtk.Button w13 = new Gtk.Button();
w13.UseStock = true;
w13.UseUnderline = true;
+ w13.CanDefault = true;
w13.CanFocus = true;
w13.Events = ((Gdk.EventMask)(0));
w13.Name = "button119";
- w13.CanDefault = true;
w13.Label = "gtk-ok";
bindings["button119"] = w13;
cobj.AddActionWidget(w13, -5);
Modified: trunk/monodevelop/Extras/ChangeLogAddIn/gtk-gui/gui.stetic
===================================================================
--- trunk/monodevelop/Extras/ChangeLogAddIn/gtk-gui/gui.stetic 2006-11-23
18:32:10 UTC (rev 68411)
+++ trunk/monodevelop/Extras/ChangeLogAddIn/gtk-gui/gui.stetic 2006-11-23
18:49:16 UTC (rev 68412)
@@ -6,25 +6,25 @@
<property name="HelpButton">False</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="HasSeparator">False</property>
+ <property name="MemberName" />
<property name="Events">ButtonPressMask</property>
- <property name="MemberName" />
<child internal-child="VBox">
<widget class="Gtk.VBox" id="dialog_VBox">
<property name="BorderWidth">2</property>
+ <property name="MemberName" />
<property name="Events">ButtonPressMask</property>
- <property name="MemberName" />
<child>
<widget class="Gtk.VBox" id="vbox1">
<property name="Spacing">6</property>
<property name="BorderWidth">12</property>
+ <property name="MemberName" />
<property name="Events">0</property>
- <property name="MemberName" />
<child>
<widget class="Gtk.Label" id="label3">
<property name="LabelProp">ChangeLog entry:</property>
<property name="Xalign">0</property>
+ <property name="MemberName" />
<property name="Events">0</property>
- <property name="MemberName" />
</widget>
<packing>
<property name="Position">0</property>
@@ -38,15 +38,15 @@
<property name="VscrollbarPolicy">Automatic</property>
<property name="HscrollbarPolicy">Automatic</property>
<property name="ShadowType">In</property>
+ <property name="MemberName" />
<property name="CanFocus">True</property>
<property name="Events">0</property>
- <property name="MemberName" />
<child>
<widget class="Gtk.TextView" id="textview">
<property name="Text" />
+ <property name="MemberName" />
<property name="CanFocus">True</property>
<property name="Events">0</property>
- <property name="MemberName" />
</widget>
</child>
</widget>
@@ -69,8 +69,8 @@
<property name="LayoutStyle">End</property>
<property name="Spacing">10</property>
<property name="BorderWidth">5</property>
+ <property name="MemberName" />
<property name="Events">ButtonPressMask</property>
- <property name="MemberName" />
<child>
<widget class="Gtk.Button" id="button7">
<property name="UseStock">True</property>
@@ -78,10 +78,10 @@
<property name="StockId">gtk-cancel</property>
<property name="IsDialogButton">True</property>
<property name="ResponseId">-6</property>
+ <property name="MemberName" />
+ <property name="CanDefault">True</property>
<property name="CanFocus">True</property>
<property name="Events">0</property>
- <property name="MemberName" />
- <property name="CanDefault">True</property>
<property name="label">gtk-cancel</property>
</widget>
<packing>
@@ -96,10 +96,10 @@
<property name="StockId">gtk-ok</property>
<property name="IsDialogButton">True</property>
<property name="ResponseId">-5</property>
+ <property name="MemberName" />
+ <property name="CanDefault">True</property>
<property name="CanFocus">True</property>
<property name="Events">0</property>
- <property name="MemberName" />
- <property name="CanDefault">True</property>
<property name="label">gtk-ok</property>
</widget>
<packing>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
