diff options
author | mike <mike@Caprica.local> | 2011-08-11 14:25:37 +0400 |
---|---|---|
committer | mike <mike@Caprica.local> | 2011-08-11 14:25:37 +0400 |
commit | 42b9925102ac61b5358bf99fcb0b1d6861731a0e (patch) | |
tree | 4d49c8f48cbc97537c5f15f937df5d0e3d80b5e9 /main/src/addins/VersionControl | |
parent | 02cb98cdd0fa5701868872895e7e08ff42b4a7bf (diff) | |
parent | 68c0ecd05bf4db44b0a80095973ab7c84b367136 (diff) |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/McsParser.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AutoSave.cs
main/src/core/Mono.Texteditor/Mono.TextEditor/CodeSegmentPreviewWindow.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/AssemblyCodeCompletionDatabase.cs
Diffstat (limited to 'main/src/addins/VersionControl')
9 files changed, 62 insertions, 40 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml index 0212509f93..c7b0fe1ccc 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml @@ -6,16 +6,16 @@ url = "http://www.monodevelop.com/" description = "Git support for the Version Control Add-in" category = "Version Control" - version = "2.6"> + version = "2.7"> <Runtime> <Import assembly="MonoDevelop.VersionControl.Git.dll"/> </Runtime> <Dependencies> - <Addin id="Core" version="2.6"/> - <Addin id="Ide" version="2.6"/> - <Addin id="VersionControl" version="2.6"/> + <Addin id="Core" version="2.7"/> + <Addin id="Ide" version="2.7"/> + <Addin id="VersionControl" version="2.7"/> </Dependencies> <Extension path="/MonoDevelop/VersionControl/VersionControlSystems"> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj index cd3312151c..efa8752a70 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj @@ -9,7 +9,6 @@ <OutputType>Library</OutputType> <RootNamespace>MonoDevelop.VersionControl.Git</RootNamespace> <AssemblyName>MonoDevelop.VersionControl.Git</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml index 164e31e333..8dfa56d052 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml @@ -6,13 +6,13 @@ url = "http://taubz.for.net/code/diff"
description = "Subversion support for Linux and MacOSX"
category = "Version Control"
- version = "2.6">
+ version = "2.7">
<Dependencies>
- <Addin id="Core" version="2.6"/>
- <Addin id="Ide" version="2.6"/>
- <Addin id="VersionControl" version="2.6"/>
- <Addin id="VersionControl.Subversion" version="2.6"/>
+ <Addin id="Core" version="2.7"/>
+ <Addin id="Ide" version="2.7"/>
+ <Addin id="VersionControl" version="2.7"/>
+ <Addin id="VersionControl.Subversion" version="2.7"/>
</Dependencies> <Extension path = "/MonoDevelop/VersionControl/VersionControlSystems">
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj index 0e3a925f84..e44368fc8c 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj @@ -9,7 +9,6 @@ <OutputType>Library</OutputType> <RootNamespace>MonoDevelop.VersionControl.Subversion.Unix</RootNamespace> <AssemblyName>MonoDevelop.VersionControl.Subversion.Unix</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml index 3dc67bee59..f7f9a4547f 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml @@ -7,12 +7,12 @@ description = "Subversion core engine"
category = "Version Control"
flags = "Hidden"
- version = "2.6">
+ version = "2.7">
<Dependencies>
- <Addin id="Core" version="2.6"/>
- <Addin id="Ide" version="2.6"/>
- <Addin id="VersionControl" version="2.6"/>
+ <Addin id="Core" version="2.7"/>
+ <Addin id="Ide" version="2.7"/>
+ <Addin id="VersionControl" version="2.7"/>
</Dependencies> <Extension path = "/MonoDevelop/Ide/Commands/VersionControl"> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj index 1864308f97..9db2e577bb 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.csproj @@ -9,7 +9,6 @@ <OutputType>Library</OutputType> <AssemblyName>MonoDevelop.VersionControl.Subversion</AssemblyName> <RootNamespace>MonoDevelop.VersionControl.Subversion</RootNamespace> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs index e1cdae8a76..35b5893a54 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs @@ -1013,9 +1013,7 @@ namespace MonoDevelop.VersionControl.Views } double start = y * Allocation.Height; - cr.Rectangle (0.5, 0.5 + curY, Allocation.Width, (start - curY)); - cr.Color = new Cairo.Color (1, 1, 1); - cr.Fill (); + FillGradient (cr, 0.5 + curY, start - curY); curY = start; double height = Math.Max (cr.LineWidth, count * Allocation.Height); @@ -1025,26 +1023,50 @@ namespace MonoDevelop.VersionControl.Views curY += height; } - cr.Rectangle (0.5, 0.5 + curY, Allocation.Width, Allocation.Height - curY); - cr.Color = new Cairo.Color (1, 1, 1); - cr.Fill (); - - cr.Rectangle (1, - Allocation.Height * adj.Value / adj.Upper + cr.LineWidth + 0.5, - Allocation.Width - 2, - Allocation.Height * (adj.PageSize / adj.Upper)); - cr.Color = new Cairo.Color (0, 0, 0, 0.5); - cr.StrokePreserve (); - - cr.Color = new Cairo.Color (0, 0, 0, 0.03); - cr.Fill (); + FillGradient (cr, 0.5 + curY, Allocation.Height - curY); + + DrawBar (cr, Allocation.Height * adj.Value / adj.Upper + cr.LineWidth + 0.5, Allocation.Height * (adj.PageSize / adj.Upper)); + cr.Rectangle (0.5, 0.5, Allocation.Width - 1, Allocation.Height - 1); cr.Color = (Mono.TextEditor.HslColor)Style.Dark (StateType.Normal); cr.Stroke (); } return true; } - + + void FillGradient (Cairo.Context cr, double y, double h) + { + cr.Rectangle (0.5, y, Allocation.Width, h); + var grad = new Cairo.LinearGradient (0, y, Allocation.Width, y); + var col = (Mono.TextEditor.HslColor)Style.Base (StateType.Normal); + col.L *= 0.95; + grad.AddColorStop (0, col); + grad.AddColorStop (0.7, (Mono.TextEditor.HslColor)Style.Base (StateType.Normal)); + grad.AddColorStop (1, col); + cr.Pattern = grad; + + cr.Fill (); + } + + void DrawBar (Cairo.Context cr, double y, double h) + { + const int barWidth = 8; + + MonoDevelop.Components.CairoExtensions.RoundedRectangle (cr, + 0.5 + (Allocation.Width - barWidth) / 2, + y, + barWidth, + h, + barWidth / 2); + + var color = (Mono.TextEditor.HslColor)Style.Mid (StateType.Normal); + color.L = 0.5; + var c = (Cairo.Color)color; + c.A = 0.6; + cr.Color = c; + cr.Fill (); + } + void IncPos(Mono.TextEditor.Utils.Hunk h, ref int pos) { pos += System.Math.Max (h.Inserted, h.Removed); diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj index f61493b117..fff71d2628 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj @@ -9,7 +9,6 @@ <OutputType>Library</OutputType> <AssemblyName>MonoDevelop.VersionControl</AssemblyName> <RootNamespace>MonoDevelop.VersionControl</RootNamespace> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml index 342dac1645..32a5b8c217 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml @@ -7,7 +7,7 @@ description = "A MonoDevelop addin for using version control systems like Subversion" category = "Version Control" flags = "Hidden" - version = "2.6"> + version = "2.7"> <Runtime> <Import file="comment.png" /> @@ -24,9 +24,9 @@ </Runtime> <Dependencies> - <Addin id="Core" version="2.6"/> - <Addin id="Ide" version="2.6"/> - <Addin id="SourceEditor2" version="2.6"/> + <Addin id="Core" version="2.7"/> + <Addin id="Ide" version="2.7"/> + <Addin id="SourceEditor2" version="2.7"/> </Dependencies> <ExtensionPoint path = "/MonoDevelop/VersionControl/VersionControlSystems" name = "Version control systems"> @@ -308,7 +308,11 @@ </Extension> <Extension path = "/MonoDevelop/Core/UserDataMigration"> - <Migration sourceVersion="2.4" kind="Cache" sourcePath="version-control-commit-msg" /> - <Migration sourceVersion="2.4" kind="Config" sourcePath="VersionControl.config" /> + <!-- 2.4 --> + <Migration sourceVersion="2.4" kind="Cache" path="version-control-commit-msg" /> + <Migration sourceVersion="2.4" kind="Config" path="VersionControl.config" /> + <!-- 2.6 --> + <Migration sourceVersion="2.6" kind="Cache" path="version-control-commit-msg" /> + <Migration sourceVersion="2.6" kind="Config" path="VersionControl.config" /> </Extension> </Addin> |