| Newsgroups |
gmane.comp.gnome.mono.patches |
| Message-ID |
<0000014193460eed-d7e8aeb6-77e0-4a6a-a7df-0ec4bb0724a4-000000@email.amazonses.com> |
Branch: refs/heads/retina
Home: https://github.com/mono/monodevelop
Compare: https://github.com/mono/monodevelop/compare/600e1fd0dd5e...94e1c3a5f882
Commit: 556985878828849e206e919f98120e05c1ae3ed4
Author: Vaclav Vancura <[email protected]> (vancura)
Date: 2013-10-07 14:08:59 GMT
URL: https://github.com/mono/monodevelop/commit/556985878828849e206e919f98120e05c1ae3ed4
[Icons] New toolbar icons:
* btExecuteBase-Disabled.png → btn-execute-disabled-32.png
* btExecuteBase-Hover.png → btn-execute-hover-32.png
* btExecuteBase-Normal.png → btn-execute-normal-32.png
* btExecuteBase-Pressed.png → btn-execute-pressed-32.png
* icoExecute-Disabled.png → ico-execute-disabled.png
* icoExecute-Normal.png → ico-execute-normal.png
* icoStop-Disabled.png → ico-stop-disabled.png
* icoStop-Normal.png → ico-stop-normal.png
Changed paths:
M main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoundButton.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
Added paths:
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btn-execute-disabled-32.png
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btn-execute-hover-32.png
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btn-execute-normal-32.png
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btn-execute-pressed-32.png
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/ico-execute-disabled-32.png
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/ico-execute-normal-32.png
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/ico-stop-disabled-32.png
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/ico-stop-normal-32.png
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
Removed paths:
D main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btExecuteBase-Disabled.png
D main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btExecuteBase-Hover.png
D main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btExecuteBase-Normal.png
D main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btExecuteBase-Pressed.png
D main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/icoExecute-Disabled.png
D main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/icoExecute-Normal.png
D main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/icoStop-Disabled.png
D main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/icoStop-Normal.png
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoundButton.cs
===================================================================
@@ -64,16 +64,16 @@ public RoundButton ()
VisibleWindow = false;
SetSizeRequest (height, height);
- btnNormal = Xwt.Drawing.Image.FromResource (GetType (), "btExecuteBase-Normal.png");
-// btnInactive = new LazyImage ("btExecuteBase-Disabled.png");
- //btnPressed = new LazyImage ("btExecuteBase-Pressed.png");
-// btnHover = new LazyImage ("btExecuteBase-Hover.png");
+ btnNormal = Xwt.Drawing.Image.FromResource (GetType (), "btn-execute-normal-32.png");
+// btnInactive = new LazyImage ("btn-execute-disabled-32.png");
+// btnPressed = new LazyImage ("btn-execute-pressed-32.png");
+// btnHover = new LazyImage ("btn-execute-hover-32.png");
- iconRunNormal = Xwt.Drawing.Image.FromResource (GetType (), "icoExecute-Normal.png");
- iconRunDisabled = Xwt.Drawing.Image.FromResource (GetType (), "icoExecute-Disabled.png");
+ iconRunNormal = Xwt.Drawing.Image.FromResource (GetType (), "ico-execute-normal-32.png");
+ iconRunDisabled = Xwt.Drawing.Image.FromResource (GetType (), "ico-execute-disabled-32.png");
- iconStopNormal = Xwt.Drawing.Image.FromResource (GetType (), "icoStop-Normal.png");
- iconStopDisabled = Xwt.Drawing.Image.FromResource (GetType (), "icoStop-Disabled.png");
+ iconStopNormal = Xwt.Drawing.Image.FromResource (GetType (), "ico-stop-normal-32.png");
+ iconStopDisabled = Xwt.Drawing.Image.FromResource (GetType (), "ico-stop-disabled-32.png");
iconBuildNormal = Xwt.Drawing.Image.FromResource (GetType (), "icoBuild-Normal.png");
iconBuildDisabled = Xwt.Drawing.Image.FromResource (GetType (), "icoBuild-Disabled.png");
Removed: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btExecuteBase-Disabled.png
===================================================================
Removed: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btExecuteBase-Hover.png
===================================================================
Removed: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btExecuteBase-Normal.png
===================================================================
Removed: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btExecuteBase-Pressed.png
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btn-execute-disabled-32.png
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btn-execute-hover-32.png
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btn-execute-normal-32.png
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/btn-execute-pressed-32.png
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/ico-execute-disabled-32.png
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/ico-execute-normal-32.png
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/ico-stop-disabled-32.png
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/ico-stop-normal-32.png
===================================================================
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/[email protected]
===================================================================
Removed: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/icoExecute-Disabled.png
===================================================================
Removed: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/icoExecute-Normal.png
===================================================================
Removed: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/icoStop-Disabled.png
===================================================================
Removed: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/Theme/icoStop-Normal.png
===================================================================
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
===================================================================
@@ -758,29 +758,53 @@
<EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\btDebugBase-RightCap-Pressed.png">
<LogicalName>btDebugBase-RightCap-Pressed.png</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\btExecuteBase-Disabled.png">
- <LogicalName>btExecuteBase-Disabled.png</LogicalName>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\btn-execute-disabled-32.png">
+ <LogicalName>btn-execute-disabled-32.png</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\btExecuteBase-Hover.png">
- <LogicalName>btExecuteBase-Hover.png</LogicalName>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\[email protected]">
+ <LogicalName>[email protected]</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\btExecuteBase-Normal.png">
- <LogicalName>btExecuteBase-Normal.png</LogicalName>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\btn-execute-hover-32.png">
+ <LogicalName>btn-execute-hover-32.png</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\btExecuteBase-Pressed.png">
- <LogicalName>btExecuteBase-Pressed.png</LogicalName>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\[email protected]">
+ <LogicalName>[email protected]</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\icoExecute-Disabled.png">
- <LogicalName>icoExecute-Disabled.png</LogicalName>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\btn-execute-normal-32.png">
+ <LogicalName>btn-execute-normal-32.png</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\icoExecute-Normal.png">
- <LogicalName>icoExecute-Normal.png</LogicalName>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\[email protected]">
+ <LogicalName>[email protected]</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\icoStop-Disabled.png">
- <LogicalName>icoStop-Disabled.png</LogicalName>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\btn-execute-pressed-32.png">
+ <LogicalName>btn-execute-pressed-32.png</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\icoStop-Normal.png">
- <LogicalName>icoStop-Normal.png</LogicalName>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\[email protected]">
+ <LogicalName>[email protected]</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\ico-execute-disabled-32.png">
+ <LogicalName>ico-execute-disabled-32.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\[email protected]">
+ <LogicalName>[email protected]</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\ico-execute-normal-32.png">
+ <LogicalName>ico-execute-normal-32.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\[email protected]">
+ <LogicalName>[email protected]</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\ico-stop-disabled-32.png">
+ <LogicalName>ico-stop-disabled-32.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\[email protected]">
+ <LogicalName>[email protected]</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\ico-stop-normal-32.png">
+ <LogicalName>ico-stop-normal-32.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\[email protected]">
+ <LogicalName>[email protected]</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="MonoDevelop.Components.MainToolbar\Theme\notificationBuildingIcon.png">
<LogicalName>notificationBuildingIcon.png</LogicalName>
Commit: 94e1c3a5f882d93287c9d3c52d8f0a70c8a35451
Author: Vaclav Vancura <[email protected]> (vancura)
Date: 2013-10-07 14:12:13 GMT
URL: https://github.com/mono/monodevelop/commit/94e1c3a5f882d93287c9d3c52d8f0a70c8a35451
[Icons] New version control overlay icons:
* overlay_added.png → added-overlay-16.png
* overlay_conflicted.png → conflict-overlay-16.png
* overlay_controlled.png → versioned-overlay-16.png
* overlay_lock_required.png → lock-required-overlay-16.png
* overlay_locked.png → locked-overlay-16.png
* overlay_modified.png → modified-overlay-16.png
* overlay_normal.png → normal-overlay-16.png
* overlay_removed.png → removed-overlay-16.png
* overlay_unlocked.png → unlocked-overlay-16.png
* overlay_unversioned.png → unversioned-overlay-16.png
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
Added paths:
A main/src/addins/VersionControl/MonoDevelop.VersionControl/added-overlay-16.png
A main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
A main/src/addins/VersionControl/MonoDevelop.VersionControl/conflict-overlay-16.png
A main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
A main/src/addins/VersionControl/MonoDevelop.VersionControl/lock-required-overlay-16.png
A main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
A main/src/addins/VersionControl/MonoDevelop.VersionControl/locked-overlay-16.png
A main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
A main/src/addins/VersionControl/MonoDevelop.VersionControl/modified-overlay-16.png
A main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
A main/src/addins/VersionControl/MonoDevelop.VersionControl/normal-overlay-16.png
A main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
A main/src/addins/VersionControl/MonoDevelop.VersionControl/removed-overlay-16.png
A main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
A main/src/addins/VersionControl/MonoDevelop.VersionControl/unlocked-overlay-16.png
A main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
A main/src/addins/VersionControl/MonoDevelop.VersionControl/unversioned-overlay-16.png
A main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
A main/src/addins/VersionControl/MonoDevelop.VersionControl/versioned-overlay-16.png
A main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
Removed paths:
D main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_added.png
D main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_conflicted.png
D main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_controled.png
D main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_lock_required.png
D main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_locked.png
D main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_modified.png
D main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_normal.png
D main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_removed.png
D main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_unlocked.png
D main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_unversioned.png
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
===================================================================
@@ -113,41 +113,71 @@
<Reference Include="Mono.Cairo" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="overlay_added.png">
- <LogicalName>overlay_added.png</LogicalName>
+ <EmbeddedResource Include="added-overlay-16.png">
+ <LogicalName>added-overlay-16.png</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="overlay_modified.png">
- <LogicalName>overlay_modified.png</LogicalName>
+ <EmbeddedResource Include="[email protected]">
+ <LogicalName>[email protected]</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="overlay_conflicted.png">
- <LogicalName>overlay_conflicted.png</LogicalName>
+ <EmbeddedResource Include="modified-overlay-16.png">
+ <LogicalName>modified-overlay-16.png</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="overlay_normal.png">
- <LogicalName>overlay_normal.png</LogicalName>
+ <EmbeddedResource Include="[email protected]">
+ <LogicalName>[email protected]</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="overlay_locked.png">
- <LogicalName>overlay_locked.png</LogicalName>
+ <EmbeddedResource Include="conflict-overlay-16.png">
+ <LogicalName>conflict-overlay-16.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="[email protected]">
+ <LogicalName>[email protected]</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="normal-overlay-16.png">
+ <LogicalName>normal-overlay-16.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="[email protected]">
+ <LogicalName>[email protected]</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="locked-overlay-16.png">
+ <LogicalName>locked-overlay-16.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="[email protected]">
+ <LogicalName>[email protected]</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="VersionControl.addin.xml">
<LogicalName>VersionControl.addin.xml</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="overlay_removed.png">
- <LogicalName>overlay_removed.png</LogicalName>
+ <EmbeddedResource Include="removed-overlay-16.png">
+ <LogicalName>removed-overlay-16.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="[email protected]">
+ <LogicalName>[email protected]</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="repository.png">
<LogicalName>repository.png</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="overlay_controled.png">
- <LogicalName>overlay_controled.png</LogicalName>
+ <EmbeddedResource Include="versioned-overlay-16.png">
+ <LogicalName>versioned-overlay-16.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="[email protected]">
+ <LogicalName>[email protected]</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="unversioned-overlay-16.png">
+ <LogicalName>unversioned-overlay-16.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="[email protected]">
+ <LogicalName>[email protected]</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="lock-required-overlay-16.png">
+ <LogicalName>lock-required-overlay-16.png</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="overlay_unversioned.png">
- <LogicalName>overlay_unversioned.png</LogicalName>
+ <EmbeddedResource Include="[email protected]">
+ <LogicalName>[email protected]</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="overlay_lock_required.png">
- <LogicalName>overlay_lock_required.png</LogicalName>
+ <EmbeddedResource Include="unlocked-overlay-16.png">
+ <LogicalName>unlocked-overlay-16.png</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="overlay_unlocked.png">
- <LogicalName>overlay_unlocked.png</LogicalName>
+ <EmbeddedResource Include="[email protected]">
+ <LogicalName>[email protected]</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Policies.xml">
<LogicalName>Policies.xml</LogicalName>
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
===================================================================
@@ -32,10 +32,10 @@ public class VersionControlService
static Xwt.Drawing.Image overlay_unlocked;
// static Gdk.Pixbuf overlay_normal;
- static Xwt.Drawing.Image icon_modified;
- static Xwt.Drawing.Image icon_removed;
- static Xwt.Drawing.Image icon_conflicted;
- static Xwt.Drawing.Image icon_added;
+ static Xwt.Drawing.Image icon_modified;
+ static Xwt.Drawing.Image icon_removed;
+ static Xwt.Drawing.Image icon_conflicted;
+ static Xwt.Drawing.Image icon_added;
internal static Xwt.Drawing.Image icon_controled;
static Hashtable comments;
@@ -55,22 +55,22 @@ static VersionControlService ()
{
IdeApp.Initialized += delegate {
try {
- overlay_modified = Xwt.Drawing.Image.FromResource("overlay_modified.png");
- overlay_removed = Xwt.Drawing.Image.FromResource("overlay_removed.png");
- overlay_conflicted = Xwt.Drawing.Image.FromResource("overlay_conflicted.png");
- overlay_added = Xwt.Drawing.Image.FromResource("overlay_added.png");
- overlay_controled = Xwt.Drawing.Image.FromResource("overlay_controled.png");
- overlay_unversioned = Xwt.Drawing.Image.FromResource("overlay_unversioned.png");
- overlay_protected = Xwt.Drawing.Image.FromResource("overlay_lock_required.png");
- overlay_unlocked = Xwt.Drawing.Image.FromResource("overlay_unlocked.png");
- overlay_locked = Xwt.Drawing.Image.FromResource("overlay_locked.png");
- // overlay_normal = Gdk.Pixbuf.LoadFromResource("overlay_normal.png");
+ overlay_modified = Xwt.Drawing.Image.FromResource("modified-overlay-16.png");
+ overlay_removed = Xwt.Drawing.Image.FromResource("removed-overlay-16.png");
+ overlay_conflicted = Xwt.Drawing.Image.FromResource("conflict-overlay-16.png");
+ overlay_added = Xwt.Drawing.Image.FromResource("added-overlay-16.png");
+ overlay_controled = Xwt.Drawing.Image.FromResource("versioned-overlay-16.png");
+ overlay_unversioned = Xwt.Drawing.Image.FromResource("unversioned-overlay-16.png");
+ overlay_protected = Xwt.Drawing.Image.FromResource("lock-required-overlay-16.png");
+ overlay_unlocked = Xwt.Drawing.Image.FromResource("unlocked-overlay-16.png");
+ overlay_locked = Xwt.Drawing.Image.FromResource("locked-overlay-16.png");
+ //overlay_normal = Gdk.Pixbuf.LoadFromResource("normal-overlay-16.png");
- icon_modified = ImageService.GetIcon ("gtk-edit", Gtk.IconSize.Menu);
- icon_removed = ImageService.GetIcon (Gtk.Stock.Remove, Gtk.IconSize.Menu);
- icon_conflicted = ImageService.GetIcon (Gtk.Stock.DialogWarning, Gtk.IconSize.Menu);
- icon_added = ImageService.GetIcon (Gtk.Stock.Add, Gtk.IconSize.Menu);
- icon_controled = Xwt.Drawing.Image.FromResource("overlay_controled.png");
+ icon_modified = ImageService.GetIcon ("gtk-edit", Gtk.IconSize.Menu);
+ icon_removed = ImageService.GetIcon (Gtk.Stock.Remove, Gtk.IconSize.Menu);
+ icon_conflicted = ImageService.GetIcon (Gtk.Stock.DialogWarning, Gtk.IconSize.Menu);
+ icon_added = ImageService.GetIcon (Gtk.Stock.Add, Gtk.IconSize.Menu);
+ icon_controled = Xwt.Drawing.Image.FromResource("versioned-overlay-16.png");
} catch (Exception e) {
LoggingService.LogError ("Error while loading icons.", e);
}
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/added-overlay-16.png
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/conflict-overlay-16.png
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/lock-required-overlay-16.png
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/locked-overlay-16.png
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/modified-overlay-16.png
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/normal-overlay-16.png
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
===================================================================
Removed: main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_added.png
===================================================================
Removed: main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_conflicted.png
===================================================================
Removed: main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_controled.png
===================================================================
Removed: main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_lock_required.png
===================================================================
Removed: main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_locked.png
===================================================================
Removed: main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_modified.png
===================================================================
Removed: main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_normal.png
===================================================================
Removed: main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_removed.png
===================================================================
Removed: main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_unlocked.png
===================================================================
Removed: main/src/addins/VersionControl/MonoDevelop.VersionControl/overlay_unversioned.png
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/removed-overlay-16.png
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/unlocked-overlay-16.png
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/unversioned-overlay-16.png
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/versioned-overlay-16.png
===================================================================
Added: main/src/addins/VersionControl/MonoDevelop.VersionControl/[email protected]
===================================================================
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches