diff options
5 files changed, 69 insertions, 15 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitMessageStylePanelWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitMessageStylePanelWidget.cs index 94ea300203..c7e66e0ff0 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitMessageStylePanelWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitMessageStylePanelWidget.cs @@ -66,6 +66,7 @@ namespace MonoDevelop.VersionControl checkIndentEntries.Active = format.Style.Indent.Length > 0; checkIncludeDirs.Active = format.Style.IncludeDirectoryPaths; entryHeader.Text = ToCString (format.Style.Header.TrimEnd ('\n')); + checkWrap.Active = format.Style.Wrap; UpdatePreview (); updating = false; } @@ -168,5 +169,12 @@ namespace MonoDevelop.VersionControl format.Style.IncludeDirectoryPaths = checkIncludeDirs.Active; OnChanged (); } + + protected virtual void OnCheckWrapToggled (object sender, System.EventArgs e) + { + if (updating) return; + format.Style.Wrap = checkWrap.Active; + OnChanged (); + } } } diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs index f0fee7f80a..ea3ba611dd 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs @@ -110,7 +110,7 @@ namespace MonoDevelop.VersionControl fileSeparator2 = message_style.FileSeparator.Substring (si + 1); } - formatter.Wrap = WrappingType.Word; + formatter.Wrap = message_style.Wrap ? WrappingType.Word : WrappingType.None; formatter.LeftMargin = message_style.LineAlign; formatter.ParagraphStartMargin = 0; diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitMessageStyle.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitMessageStyle.cs index 9d2c04c453..2f0bf15090 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitMessageStyle.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitMessageStyle.cs @@ -43,6 +43,7 @@ namespace MonoDevelop.VersionControl LineAlign = 0; InterMessageLines = 1; IncludeDirectoryPaths = false; + Wrap = true; } [ItemProperty] @@ -69,6 +70,9 @@ namespace MonoDevelop.VersionControl [ItemProperty] public bool IncludeDirectoryPaths { get; set; } + [ItemProperty] + public bool Wrap { get; set; } + public void CopyFrom (CommitMessageStyle other) { Indent = other.Indent; @@ -78,6 +82,8 @@ namespace MonoDevelop.VersionControl LineAlign = other.LineAlign; InterMessageLines = other.InterMessageLines; Header = other.Header; + IncludeDirectoryPaths = other.IncludeDirectoryPaths; + Wrap = other.Wrap; } public bool Equals (CommitMessageStyle other) @@ -88,7 +94,9 @@ namespace MonoDevelop.VersionControl LastFilePostfix == other.LastFilePostfix && LineAlign == other.LineAlign && InterMessageLines == other.InterMessageLines && - Header == other.Header; + Header == other.Header && + IncludeDirectoryPaths == other.IncludeDirectoryPaths && + Wrap == other.Wrap; } } } diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.CommitMessageStylePanelWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.CommitMessageStylePanelWidget.cs index d2c649e10f..8687041e65 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.CommitMessageStylePanelWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.CommitMessageStylePanelWidget.cs @@ -16,6 +16,7 @@ namespace MonoDevelop.VersionControl private global::Gtk.CheckButton checkMsgInNewLine; private global::Gtk.CheckButton checkOneLinePerFile; private global::Gtk.CheckButton checkUseBullets; + private global::Gtk.CheckButton checkWrap; private global::Gtk.Label label9; private global::Gtk.ScrolledWindow GtkScrolledWindow; private global::Gtk.TextView textview; @@ -151,21 +152,35 @@ namespace MonoDevelop.VersionControl this.tableFlags.Add (this.checkUseBullets); global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.tableFlags [this.checkUseBullets])); w10.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child tableFlags.Gtk.Table+TableChild + this.checkWrap = new global::Gtk.CheckButton (); + this.checkWrap.CanFocus = true; + this.checkWrap.Name = "checkWrap"; + this.checkWrap.Label = global::Mono.Unix.Catalog.GetString ("Wrap"); + this.checkWrap.DrawIndicator = true; + this.checkWrap.UseUnderline = true; + this.tableFlags.Add (this.checkWrap); + global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.tableFlags [this.checkWrap])); + w11.TopAttach = ((uint)(3)); + w11.BottomAttach = ((uint)(4)); + w11.LeftAttach = ((uint)(1)); + w11.RightAttach = ((uint)(2)); + w11.YOptions = ((global::Gtk.AttachOptions)(4)); this.vbox1.Add (this.tableFlags); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.tableFlags])); - w11.Position = 1; - w11.Expand = false; - w11.Fill = false; + global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.tableFlags])); + w12.Position = 1; + w12.Expand = false; + w12.Fill = false; // Container child vbox1.Gtk.Box+BoxChild this.label9 = new global::Gtk.Label (); this.label9.Name = "label9"; this.label9.Xalign = 0F; this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("Preview:"); this.vbox1.Add (this.label9); - global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.label9])); - w12.Position = 2; - w12.Expand = false; - w12.Fill = false; + global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.label9])); + w13.Position = 2; + w13.Expand = false; + w13.Fill = false; // Container child vbox1.Gtk.Box+BoxChild this.GtkScrolledWindow = new global::Gtk.ScrolledWindow (); this.GtkScrolledWindow.Sensitive = false; @@ -179,14 +194,15 @@ namespace MonoDevelop.VersionControl this.textview.Name = "textview"; this.GtkScrolledWindow.Add (this.textview); this.vbox1.Add (this.GtkScrolledWindow); - global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkScrolledWindow])); - w14.Position = 3; + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.GtkScrolledWindow])); + w15.Position = 3; this.Add (this.vbox1); if ((this.Child != null)) { this.Child.ShowAll (); } this.Hide (); this.entryHeader.Changed += new global::System.EventHandler (this.OnEntryHeaderChanged); + this.checkWrap.Toggled += new global::System.EventHandler (this.OnCheckWrapToggled); this.checkUseBullets.Toggled += new global::System.EventHandler (this.OnCheckUseBulletsToggled); this.checkOneLinePerFile.Toggled += new global::System.EventHandler (this.OnCheckOneLinePerFileToggled); this.checkMsgInNewLine.Toggled += new global::System.EventHandler (this.OnCheckMsgInNewLineToggled); diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/gui.stetic b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/gui.stetic index 4cb77499eb..1c14ac7ecc 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/gui.stetic +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/gui.stetic @@ -1285,9 +1285,6 @@ <property name="RowSpacing">6</property> <property name="ColumnSpacing">6</property> <child> - <placeholder /> - </child> - <child> <widget class="Gtk.CheckButton" id="checkIncludeDirs"> <property name="MemberName" /> <property name="CanFocus">True</property> @@ -1450,6 +1447,31 @@ <property name="YShrink">False</property> </packing> </child> + <child> + <widget class="Gtk.CheckButton" id="checkWrap"> + <property name="MemberName" /> + <property name="CanFocus">True</property> + <property name="Label" translatable="yes">Wrap</property> + <property name="DrawIndicator">True</property> + <property name="HasLabel">True</property> + <property name="UseUnderline">True</property> + <signal name="Toggled" handler="OnCheckWrapToggled" /> + </widget> + <packing> + <property name="TopAttach">3</property> + <property name="BottomAttach">4</property> + <property name="LeftAttach">1</property> + <property name="RightAttach">2</property> + <property name="AutoSize">True</property> + <property name="YOptions">Fill</property> + <property name="XExpand">True</property> + <property name="XFill">True</property> + <property name="XShrink">False</property> + <property name="YExpand">False</property> + <property name="YFill">True</property> + <property name="YShrink">False</property> + </packing> + </child> </widget> <packing> <property name="Position">1</property> |