diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2014-06-27 13:57:20 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2014-06-27 13:57:20 +0400 |
| commit | 5aaf473ee8fb097fc88165097c8cede1e362768f (patch) | |
| tree | cf1e9bdc27864ca7804b51e943f47076f425d36d /main/src/addins/ChangeLogAddIn | |
| parent | 3a9df9bc6875aff7bb03f7736bee780b4f071d91 (diff) | |
| parent | 29e49044b88eece48606cc128d779e7dbf2d622c (diff) | |
Merge branch 'master' into retina-editor
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/ExportCodeGenerator.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringContext.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp/ExpandSelectionHandler.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp/PathedDocumentTextEditorExtension.cs
main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
main/src/addins/MonoDevelop.DocFood/MonoDevelop.DocFood/DocFoodTextEditorExtension.cs
main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultMarker.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisBatchRunner.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedSymbolsHandler.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueTooltipProvider.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/DebugTextMarker.cs
main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Gui/BaseXmlEditorExtension.cs
main/src/core/Mono.Texteditor/Mono.TextEditor/TextLineMarker.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextLinkModeEventArgs.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResult.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
main/tests/UnitTests/MonoDevelop.SourceEditor/DebugTooltipTests.cs
Diffstat (limited to 'main/src/addins/ChangeLogAddIn')
| -rw-r--r-- | main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs | 5 | ||||
| -rw-r--r-- | main/src/addins/ChangeLogAddIn/AddinInfo.cs | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs b/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs index 4a318731fe..9b96e905d6 100644 --- a/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs +++ b/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs @@ -31,6 +31,7 @@ using System.Collections.Generic; using Gtk; using MonoDevelop.Ide; using MonoDevelop.Components; +using MonoDevelop.Ide.Fonts; namespace MonoDevelop.ChangeLogAddIn { @@ -46,8 +47,7 @@ namespace MonoDevelop.ChangeLogAddIn { Build (); - Pango.FontDescription font = Pango.FontDescription.FromString (DesktopService.DefaultMonospaceFont); - textview.ModifyFont (font); + textview.ModifyFont (FontService.MonospaceFont); textview.WrapMode = WrapMode.None; textview.AcceptsTab = true; Pango.TabArray tabs = new Pango.TabArray (1, true); @@ -56,7 +56,6 @@ namespace MonoDevelop.ChangeLogAddIn textview.SizeRequested += delegate { textview.WidthRequest = GetStringWidth (String.Empty.PadRight (80)); }; - font.Dispose (); store = new ListStore (typeof(ChangeLogEntry), typeof(Xwt.Drawing.Image), typeof(string)); fileList.Model = store; diff --git a/main/src/addins/ChangeLogAddIn/AddinInfo.cs b/main/src/addins/ChangeLogAddIn/AddinInfo.cs index c6c6d29311..27bf353b35 100644 --- a/main/src/addins/ChangeLogAddIn/AddinInfo.cs +++ b/main/src/addins/ChangeLogAddIn/AddinInfo.cs @@ -6,7 +6,7 @@ using Mono.Addins.Description; [assembly:Addin ("ChangeLogAddIn", Namespace = "MonoDevelop", Version = MonoDevelop.BuildInfo.Version, - Flags = AddinFlags.Hidden, + EnabledByDefault = false, Category = "Version Control")] [assembly:AddinName ("ChangeLog Add-in")] |