Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/src/addins/MacPlatform/MacPlatform.cs42
-rw-r--r--main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj4
-rw-r--r--main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~contrast.pngbin0 -> 153 bytes
-rw-r--r--main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~contrast@2x.pngbin0 -> 237 bytes
-rw-r--r--main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~contrast.pngbin0 -> 152 bytes
-rw-r--r--main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~contrast@2x.pngbin0 -> 240 bytes
-rw-r--r--main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj2
-rw-r--r--main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~contrast.pngbin0 -> 157 bytes
-rw-r--r--main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~contrast@2x.pngbin0 -> 144 bytes
-rw-r--r--main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj8
-rw-r--r--main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-down-16~contrast.pngbin0 -> 109 bytes
-rw-r--r--main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-down-16~contrast@2x.pngbin0 -> 137 bytes
-rw-r--r--main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-up-16~contrast.pngbin0 -> 114 bytes
-rw-r--r--main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-up-16~contrast@2x.pngbin0 -> 138 bytes
-rw-r--r--main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~contrast.pngbin0 -> 188 bytes
-rw-r--r--main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~contrast@2x.pngbin0 -> 273 bytes
-rw-r--r--main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj4
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj22
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~contrast.pngbin0 -> 204 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~contrast@2x.pngbin0 -> 236 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-32~contrast.pngbin0 -> 316 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-32~contrast@2x.pngbin0 -> 373 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~contrast.pngbin0 -> 194 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~contrast@2x.pngbin0 -> 294 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~contrast.pngbin0 -> 295 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~contrast@2x.pngbin0 -> 461 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15~contrast.pngbin0 -> 100 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15~contrast@2x.pngbin0 -> 114 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~contrast.pngbin0 -> 286 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~contrast@2x.pngbin0 -> 476 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~contrast.pngbin0 -> 212 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~contrast@2x.pngbin0 -> 251 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-32~contrast.pngbin0 -> 251 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-32~contrast@2x.pngbin0 -> 437 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~contrast.pngbin0 -> 107 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~contrast@2x.pngbin0 -> 137 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~contrast.pngbin0 -> 141 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~contrast@2x.pngbin0 -> 172 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-32~contrast.pngbin0 -> 172 bytes
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-32~contrast@2x.pngbin0 -> 186 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Components/IdeTheme.cs20
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj44
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/add-16~contrast.pngbin0 -> 210 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/add-16~contrast@2x.pngbin0 -> 369 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/bug-16~contrast.pngbin0 -> 240 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/bug-16~contrast@2x.pngbin0 -> 400 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/build-task-success-16~contrast.pngbin0 -> 277 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/build-task-success-16~contrast@2x.pngbin0 -> 440 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/debug-all-16~contrast.pngbin0 -> 168 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/debug-all-16~contrast@2x.pngbin0 -> 243 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/done-16~contrast.pngbin0 -> 267 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/done-16~contrast@2x.pngbin0 -> 325 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/done-24~contrast.pngbin0 -> 281 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/done-24~contrast@2x.pngbin0 -> 438 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/done-32~contrast.pngbin0 -> 325 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/done-32~contrast@2x.pngbin0 -> 493 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/done-48~contrast.pngbin0 -> 438 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/done-48~contrast@2x.pngbin0 -> 780 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/element-enum-16~contrast.pngbin0 -> 147 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/element-enum-16~contrast@2x.pngbin0 -> 176 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/element-struct-16~contrast.pngbin0 -> 221 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/element-struct-16~contrast@2x.pngbin0 -> 415 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/execute-16~contrast.pngbin0 -> 162 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/execute-16~contrast@2x.pngbin0 -> 241 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/execute-all-16~contrast.pngbin0 -> 162 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/execute-all-16~contrast@2x.pngbin0 -> 263 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/go-back-16~contrast.pngbin0 -> 97 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/go-back-16~contrast@2x.pngbin0 -> 118 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/go-down-16~contrast.pngbin0 -> 109 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/go-down-16~contrast@2x.pngbin0 -> 137 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/go-forward-16~contrast.pngbin0 -> 97 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/go-forward-16~contrast@2x.pngbin0 -> 118 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/go-up-16~contrast.pngbin0 -> 114 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/go-up-16~contrast@2x.pngbin0 -> 138 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/help-16~contrast.pngbin0 -> 293 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/help-16~contrast@2x.pngbin0 -> 540 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/jump-to-16~contrast.pngbin0 -> 102 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/jump-to-16~contrast@2x.pngbin0 -> 145 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/redo-16~contrast.pngbin0 -> 213 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/redo-16~contrast@2x.pngbin0 -> 397 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/refresh-16~contrast.pngbin0 -> 218 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/refresh-16~contrast@2x.pngbin0 -> 409 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/updates-16~contrast.pngbin0 -> 246 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/updates-16~contrast@2x.pngbin0 -> 350 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/workspace-16~contrast.pngbin0 -> 111 bytes
-rw-r--r--main/src/core/MonoDevelop.Ide/icons/workspace-16~contrast@2x.pngbin0 -> 145 bytes
86 files changed, 138 insertions, 8 deletions
diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs
index 954c597a4a..54aaacc5c4 100644
--- a/main/src/addins/MacPlatform/MacPlatform.cs
+++ b/main/src/addins/MacPlatform/MacPlatform.cs
@@ -72,6 +72,11 @@ namespace MonoDevelop.MacIntegration
static bool initedGlobal;
bool setupFail, initedApp;
+ // hold a reference on all observer objects generated by the notification center
+ // NOTE: these objects should not be actively disposed on macOS 10.11 and later, unless removed manually
+ // not keeping a reference might cause a runtime crash when observers are added:
+ // KVO_IS_RETAINING_ALL_OBSERVERS_OF_THIS_OBJECT_IF_IT_CRASHES_AN_OBSERVER_WAS_OVERRELEASED_OR_SMASHED
+ List<IDisposable> notificationObservers = new List<IDisposable> ();
readonly Lazy<Dictionary<string, string>> mimemap = new Lazy<Dictionary<string, string>> (LoadMimeMap);
@@ -317,12 +322,12 @@ namespace MonoDevelop.MacIntegration
SwizzleNSApplication ();
var nc = NSNotificationCenter.DefaultCenter;
- nc.AddObserver ((NSString)"AtkCocoaAccessibilityEnabled", (NSNotification) => {
+ notificationObservers.Add (nc.AddObserver ((NSString)"AtkCocoaAccessibilityEnabled", (NSNotification) => {
LoggingService.LogInfo ($"VoiceOver on {IdeTheme.AccessibilityEnabled}");
if (!IdeTheme.AccessibilityEnabled) {
ShowVoiceOverNotice ();
}
- }, NSApplication.SharedApplication);
+ }, NSApplication.SharedApplication));
// Now that Cocoa has been initialized we can check whether the keyboard focus mode is turned on
// See System Preferences - Keyboard - Shortcuts - Full Keyboard Access
@@ -568,12 +573,23 @@ namespace MonoDevelop.MacIntegration
};
PatchGtkTheme ();
- NSNotificationCenter.DefaultCenter.AddObserver (NSCell.ControlTintChangedNotification, notif => Core.Runtime.RunInMainThread (
- delegate {
- Styles.LoadStyle();
- PatchGtkTheme();
- }));
+ if (MacSystemInformation.OsVersion >= MacSystemInformation.Mojave) {
+ IdeTheme.HighContrastThemeEnabled = GetIsHighContrastActive ();
+ notificationObservers.Add (NSApplication.SharedApplication.AddObserver ("effectiveAppearance", NSKeyValueObservingOptions.New, notif =>
+ Core.Runtime.RunInMainThread (() => {
+ IdeTheme.HighContrastThemeEnabled = GetIsHighContrastActive ();
+ PatchGtkTheme ();
+ })
+ ));
+ } else {
+ IdeTheme.HighContrastThemeEnabled = false;
+ notificationObservers.Add (NSNotificationCenter.DefaultCenter.AddObserver (NSCell.ControlTintChangedNotification, notif => Core.Runtime.RunInMainThread (
+ delegate {
+ Styles.LoadStyle ();
+ PatchGtkTheme ();
+ })));
+ }
if (MacSystemInformation.OsVersion < MacSystemInformation.Mojave) { // the shared color panel has full automatic theme support on Mojave
Styles.Changed += (s, a) => {
@@ -594,6 +610,18 @@ namespace MonoDevelop.MacIntegration
//IdeApp.Preferences.UserInterfaceTheme.Changed += (s,a) => PatchGtkTheme ();
}
+ static bool GetIsHighContrastActive ()
+ {
+ var highContrastAppearances = new string [] {
+ NSAppearance.NameAccessibilityHighContrastAqua,
+ NSAppearance.NameAccessibilityHighContrastDarkAqua,
+ NSAppearance.NameAccessibilityHighContrastVibrantDark,
+ NSAppearance.NameAccessibilityHighContrastVibrantLight,
+ };
+ // FindBestMatch will return the best matching a11y appearance or null if no high contrast appearance is in use
+ return NSApplication.SharedApplication.EffectiveAppearance.FindBestMatch (highContrastAppearances) != null;
+ }
+
static void UpdateColorPanelSubviewsAppearance (NSView view, NSAppearance appearance)
{
if (view.Class.Name == "NSPageableTableView")
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
index f13f296302..9840a0f4c6 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
@@ -307,6 +307,8 @@
<EmbeddedResource Include="icons\gutter-stack-15%402x.png" />
<EmbeddedResource Include="icons\gutter-stack-15~dark.png" />
<EmbeddedResource Include="icons\gutter-stack-15~dark%402x.png" />
+ <EmbeddedResource Include="icons\gutter-stack-15~contrast.png" />
+ <EmbeddedResource Include="icons\gutter-stack-15~contrast%402x.png" />
<EmbeddedResource Include="icons\gutter-tracepoint-15.png" />
<EmbeddedResource Include="icons\gutter-tracepoint-15%402x.png" />
<EmbeddedResource Include="icons\gutter-tracepoint-15~dark.png" />
@@ -333,6 +335,8 @@
<EmbeddedResource Include="icons\stack-pointer-16~disabled%402x.png" />
<EmbeddedResource Include="icons\stack-pointer-16~dark~disabled.png" />
<EmbeddedResource Include="icons\stack-pointer-16~dark~disabled%402x.png" />
+ <EmbeddedResource Include="icons\stack-pointer-16~contrast.png" />
+ <EmbeddedResource Include="icons\stack-pointer-16~contrast%402x.png" />
</ItemGroup>
<ItemGroup Condition=" '$(Configuration)' != 'DebugMac' AND '$(Configuration)' != 'ReleaseMac' ">
<EmbeddedResource Include="icons\pause-16.png" />
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~contrast.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~contrast.png
new file mode 100644
index 0000000000..a391d484a6
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~contrast.png
Binary files differ
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~contrast@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~contrast@2x.png
new file mode 100644
index 0000000000..a8750cf0f2
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~contrast.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~contrast.png
new file mode 100644
index 0000000000..e882fa6661
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~contrast.png
Binary files differ
diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~contrast@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~contrast@2x.png
new file mode 100644
index 0000000000..669a195289
--- /dev/null
+++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
index 45bdc1bcf6..0279289c01 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
@@ -290,6 +290,8 @@
<EmbeddedResource Include="icons\issues-ok-16%402x.png" />
<EmbeddedResource Include="icons\issues-ok-16~dark.png" />
<EmbeddedResource Include="icons\issues-ok-16~dark%402x.png" />
+ <EmbeddedResource Include="icons\issues-ok-16~contrast.png" />
+ <EmbeddedResource Include="icons\issues-ok-16~contrast%402x.png" />
<EmbeddedResource Include="icons\issues-suggestion-16.png" />
<EmbeddedResource Include="icons\issues-suggestion-16%402x.png" />
<EmbeddedResource Include="icons\issues-suggestion-16~dark.png" />
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~contrast.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~contrast.png
new file mode 100644
index 0000000000..259784ed76
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~contrast.png
Binary files differ
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~contrast@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~contrast@2x.png
new file mode 100644
index 0000000000..e9607738e8
--- /dev/null
+++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj
index ecab780b45..bc20959aa8 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj
@@ -129,8 +129,12 @@
<None Remove="icons\vs-find-replace-search-16%402x.png" />
<None Remove="icons\go-up-16.png" />
<None Remove="icons\go-up-16%402x.png" />
+ <None Remove="icons\go-up-16~contrast.png" />
+ <None Remove="icons\go-up-16~contrast%402x.png" />
<None Remove="icons\go-down-16.png" />
<None Remove="icons\go-down-16%402x.png" />
+ <None Remove="icons\go-down-16~contrast.png" />
+ <None Remove="icons\go-down-16~contrast%402x.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="icons\vs-find-replace-close-16.png" />
@@ -151,8 +155,12 @@
<EmbeddedResource Include="icons\vs-find-replace-search-16%402x.png" />
<EmbeddedResource Include="icons\go-up-16.png" />
<EmbeddedResource Include="icons\go-up-16%402x.png" />
+ <EmbeddedResource Include="icons\go-up-16~contrast.png" />
+ <EmbeddedResource Include="icons\go-up-16~contrast%402x.png" />
<EmbeddedResource Include="icons\go-down-16.png" />
<EmbeddedResource Include="icons\go-down-16%402x.png" />
+ <EmbeddedResource Include="icons\go-down-16~contrast.png" />
+ <EmbeddedResource Include="icons\go-down-16~contrast%402x.png" />
</ItemGroup>
<Target Name="BuildTextMate" BeforeTargets="Compile">
<MSBuild Projects="$(VSEditorCoreDirectory)src\TextMate\TMRegEx\TMRegEx.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-down-16~contrast.png b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-down-16~contrast.png
new file mode 100644
index 0000000000..88c5a138e8
--- /dev/null
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-down-16~contrast.png
Binary files differ
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-down-16~contrast@2x.png b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-down-16~contrast@2x.png
new file mode 100644
index 0000000000..30af51de9e
--- /dev/null
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-down-16~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-up-16~contrast.png b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-up-16~contrast.png
new file mode 100644
index 0000000000..4eedaaccb8
--- /dev/null
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-up-16~contrast.png
Binary files differ
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-up-16~contrast@2x.png b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-up-16~contrast@2x.png
new file mode 100644
index 0000000000..5b02659e38
--- /dev/null
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/go-up-16~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~contrast.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~contrast.png
new file mode 100644
index 0000000000..47292c9ae9
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~contrast.png
Binary files differ
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~contrast@2x.png b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~contrast@2x.png
new file mode 100644
index 0000000000..c9a0f918c4
--- /dev/null
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/icons/unit-success-16~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj
index 8c886db1e9..8d90b66ca7 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj
+++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj
@@ -91,6 +91,10 @@
<EmbeddedResource Include="Gui\icons\unit-loading-16~dark%402x.png" />
<EmbeddedResource Include="Gui\icons\unit-success-16.png" />
<EmbeddedResource Include="Gui\icons\unit-success-16%402x.png" />
+ <EmbeddedResource Include="Gui\icons\unit-success-16~contrast.png" />
+ <EmbeddedResource Include="Gui\icons\unit-success-16~contrast%402x.png" />
+ <EmbeddedResource Include="Gui\icons\unit-success-16~dark.png" />
+ <EmbeddedResource Include="Gui\icons\unit-success-16~dark%402x.png" />
<EmbeddedResource Include="MonoDevelop.UnitTesting.addin.xml" />
<EmbeddedResource Include="Gui\icons\pad-unit-test-16.png" />
<EmbeddedResource Include="Gui\icons\pad-unit-test-16%402x.png" />
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
index 7961134cc3..9d63654140 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
@@ -93,6 +93,8 @@
<EmbeddedResource Include="icons\added-overlay-16~sel%402x.png" />
<EmbeddedResource Include="icons\added-overlay-16~dark~sel.png" />
<EmbeddedResource Include="icons\added-overlay-16~dark~sel%402x.png" />
+ <EmbeddedResource Include="icons\added-overlay-16~contrast.png" />
+ <EmbeddedResource Include="icons\added-overlay-16~contrast%402x.png" />
<EmbeddedResource Include="icons\added-overlay-32.png" />
<EmbeddedResource Include="icons\added-overlay-32%402x.png" />
<EmbeddedResource Include="icons\added-overlay-32~dark.png" />
@@ -101,6 +103,8 @@
<EmbeddedResource Include="icons\added-overlay-32~sel%402x.png" />
<EmbeddedResource Include="icons\added-overlay-32~dark~sel.png" />
<EmbeddedResource Include="icons\added-overlay-32~dark~sel%402x.png" />
+ <EmbeddedResource Include="icons\added-overlay-32~contrast.png" />
+ <EmbeddedResource Include="icons\added-overlay-32~contrast%402x.png" />
<EmbeddedResource Include="icons\modified-overlay-16.png" />
<EmbeddedResource Include="icons\modified-overlay-16%402x.png" />
<EmbeddedResource Include="icons\modified-overlay-16~dark.png" />
@@ -210,6 +214,8 @@
<EmbeddedResource Include="icons\versioned-overlay-16~sel%402x.png" />
<EmbeddedResource Include="icons\versioned-overlay-16~dark~sel.png" />
<EmbeddedResource Include="icons\versioned-overlay-16~dark~sel%402x.png" />
+ <EmbeddedResource Include="icons\versioned-overlay-16~contrast.png" />
+ <EmbeddedResource Include="icons\versioned-overlay-16~contrast%402x.png" />
<EmbeddedResource Include="icons\versioned-overlay-32.png" />
<EmbeddedResource Include="icons\versioned-overlay-32%402x.png" />
<EmbeddedResource Include="icons\versioned-overlay-32~dark.png" />
@@ -218,6 +224,8 @@
<EmbeddedResource Include="icons\versioned-overlay-32~sel%402x.png" />
<EmbeddedResource Include="icons\versioned-overlay-32~dark~sel.png" />
<EmbeddedResource Include="icons\versioned-overlay-32~dark~sel%402x.png" />
+ <EmbeddedResource Include="icons\versioned-overlay-32~contrast.png" />
+ <EmbeddedResource Include="icons\versioned-overlay-32~contrast%402x.png" />
<EmbeddedResource Include="icons\unversioned-overlay-16.png" />
<EmbeddedResource Include="icons\unversioned-overlay-16%402x.png" />
<EmbeddedResource Include="icons\unversioned-overlay-16~dark.png" />
@@ -258,6 +266,8 @@
<EmbeddedResource Include="icons\unlocked-overlay-16~sel%402x.png" />
<EmbeddedResource Include="icons\unlocked-overlay-16~dark~sel.png" />
<EmbeddedResource Include="icons\unlocked-overlay-16~dark~sel%402x.png" />
+ <EmbeddedResource Include="icons\unlocked-overlay-16~contrast.png" />
+ <EmbeddedResource Include="icons\unlocked-overlay-16~contrast%402x.png" />
<EmbeddedResource Include="icons\unlocked-overlay-32.png" />
<EmbeddedResource Include="icons\unlocked-overlay-32%402x.png" />
<EmbeddedResource Include="icons\unlocked-overlay-32~dark.png" />
@@ -266,6 +276,8 @@
<EmbeddedResource Include="icons\unlocked-overlay-32~sel%402x.png" />
<EmbeddedResource Include="icons\unlocked-overlay-32~dark~sel.png" />
<EmbeddedResource Include="icons\unlocked-overlay-32~dark~sel%402x.png" />
+ <EmbeddedResource Include="icons\unlocked-overlay-32~contrast.png" />
+ <EmbeddedResource Include="icons\unlocked-overlay-32~contrast%402x.png" />
<EmbeddedResource Include="Policies.xml" />
<EmbeddedResource Include="icons\version-control-16.png" />
<EmbeddedResource Include="icons\version-control-16%402x.png" />
@@ -289,6 +301,8 @@
<EmbeddedResource Include="icons\diff-16~dark~disabled%402x.png" />
<EmbeddedResource Include="icons\gutter-added-15.png" />
<EmbeddedResource Include="icons\gutter-added-15%402x.png" />
+ <EmbeddedResource Include="icons\gutter-added-15~contrast.png" />
+ <EmbeddedResource Include="icons\gutter-added-15~contrast%402x.png" />
<EmbeddedResource Include="icons\gutter-removed-15.png" />
<EmbeddedResource Include="icons\gutter-removed-15%402x.png" />
<EmbeddedResource Include="icons\pull-16.png" />
@@ -315,6 +329,8 @@
<EmbeddedResource Include="icons\refresh-16~disabled%402x.png" />
<EmbeddedResource Include="icons\refresh-16~dark~disabled.png" />
<EmbeddedResource Include="icons\refresh-16~dark~disabled%402x.png" />
+ <EmbeddedResource Include="icons\refresh-16~contrast.png" />
+ <EmbeddedResource Include="icons\refresh-16~contrast%402x.png" />
<EmbeddedResource Include="icons\local-status-16.png" />
<EmbeddedResource Include="icons\local-status-16%402x.png" />
<EmbeddedResource Include="icons\local-status-16~dark.png" />
@@ -327,6 +343,8 @@
<EmbeddedResource Include="icons\commit-16~disabled%402x.png" />
<EmbeddedResource Include="icons\commit-16~dark~disabled.png" />
<EmbeddedResource Include="icons\commit-16~dark~disabled%402x.png" />
+ <EmbeddedResource Include="icons\commit-16~contrast.png" />
+ <EmbeddedResource Include="icons\commit-16~contrast%402x.png" />
<EmbeddedResource Include="icons\remote-status-16.png" />
<EmbeddedResource Include="icons\remote-status-16%402x.png" />
<EmbeddedResource Include="icons\remote-status-16~dark.png" />
@@ -343,6 +361,8 @@
<EmbeddedResource Include="icons\vcs-added-16~disabled%402x.png" />
<EmbeddedResource Include="icons\vcs-added-16~dark~disabled.png" />
<EmbeddedResource Include="icons\vcs-added-16~dark~disabled%402x.png" />
+ <EmbeddedResource Include="icons\vcs-added-16~contrast.png" />
+ <EmbeddedResource Include="icons\vcs-added-16~contrast%402x.png" />
<EmbeddedResource Include="icons\vcs-removed-16.png" />
<EmbeddedResource Include="icons\vcs-removed-16%402x.png" />
<EmbeddedResource Include="icons\vcs-removed-16~dark.png" />
@@ -399,6 +419,8 @@
<EmbeddedResource Include="icons\branch-16~disabled%402x.png" />
<EmbeddedResource Include="icons\branch-16~dark~disabled.png" />
<EmbeddedResource Include="icons\branch-16~dark~disabled%402x.png" />
+ <EmbeddedResource Include="icons\branch-16~contrast.png" />
+ <EmbeddedResource Include="icons\branch-16~contrast%402x.png" />
<EmbeddedResource Include="icons\tag-16.png" />
<EmbeddedResource Include="icons\tag-16%402x.png" />
<EmbeddedResource Include="icons\tag-16~dark.png" />
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~contrast.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~contrast.png
new file mode 100644
index 0000000000..334b2eae57
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~contrast.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~contrast@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~contrast@2x.png
new file mode 100644
index 0000000000..d1bc3f1062
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-32~contrast.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-32~contrast.png
new file mode 100644
index 0000000000..a3a1f04834
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-32~contrast.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-32~contrast@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-32~contrast@2x.png
new file mode 100644
index 0000000000..ba7d104c3b
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-32~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~contrast.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~contrast.png
new file mode 100644
index 0000000000..a397947b9f
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~contrast.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~contrast@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~contrast@2x.png
new file mode 100644
index 0000000000..b4abf2a2a2
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~contrast.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~contrast.png
new file mode 100644
index 0000000000..6c1b0fd3cb
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~contrast.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~contrast@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~contrast@2x.png
new file mode 100644
index 0000000000..4f70b36e17
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15~contrast.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15~contrast.png
new file mode 100644
index 0000000000..5bfab64c39
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15~contrast.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15~contrast@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15~contrast@2x.png
new file mode 100644
index 0000000000..937d45c9df
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~contrast.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~contrast.png
new file mode 100644
index 0000000000..5697f86c61
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~contrast.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~contrast@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~contrast@2x.png
new file mode 100644
index 0000000000..04f4af5c81
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~contrast.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~contrast.png
new file mode 100644
index 0000000000..483126d77b
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~contrast.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~contrast@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~contrast@2x.png
new file mode 100644
index 0000000000..c273ea8844
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-32~contrast.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-32~contrast.png
new file mode 100644
index 0000000000..c273ea8844
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-32~contrast.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-32~contrast@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-32~contrast@2x.png
new file mode 100644
index 0000000000..c9386bdc83
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-32~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~contrast.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~contrast.png
new file mode 100644
index 0000000000..3c3f4cf785
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~contrast.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~contrast@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~contrast@2x.png
new file mode 100644
index 0000000000..635dce7b87
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~contrast.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~contrast.png
new file mode 100644
index 0000000000..7d4a707f7b
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~contrast.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~contrast@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~contrast@2x.png
new file mode 100644
index 0000000000..b1868464d8
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~contrast@2x.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-32~contrast.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-32~contrast.png
new file mode 100644
index 0000000000..b1868464d8
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-32~contrast.png
Binary files differ
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-32~contrast@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-32~contrast@2x.png
new file mode 100644
index 0000000000..57cdd2e73c
--- /dev/null
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-32~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/IdeTheme.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/IdeTheme.cs
index 49299ad156..b8ace0dbbd 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/IdeTheme.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/IdeTheme.cs
@@ -47,6 +47,19 @@ namespace MonoDevelop.Components
public static Theme UserInterfaceTheme { get; private set; }
+ static bool? highContrastThemeEnabled;
+ internal static bool HighContrastThemeEnabled {
+ get {
+ return highContrastThemeEnabled ?? false;
+ }
+ set {
+ if (highContrastThemeEnabled != value) {
+ highContrastThemeEnabled = value;
+ UpdateStyles ();
+ }
+ }
+ }
+
static IdeTheme ()
{
DefaultGtkDataFolder = Environment.GetEnvironmentVariable ("GTK_DATA_PREFIX");
@@ -101,7 +114,7 @@ namespace MonoDevelop.Components
internal static void SetupXwtTheme ()
{
- Xwt.Drawing.Context.RegisterStyles ("dark", "disabled", "error");
+ Xwt.Drawing.Context.RegisterStyles ("dark", "disabled", "error", "contrast");
if (Core.Platform.IsMac) {
Xwt.Drawing.Context.RegisterStyles ("mac", "sel");
@@ -252,6 +265,11 @@ namespace MonoDevelop.Components
else
Xwt.Drawing.Context.ClearGlobalStyle ("dark");
+ if (HighContrastThemeEnabled)
+ Xwt.Drawing.Context.SetGlobalStyle ("contrast");
+ else
+ Xwt.Drawing.Context.ClearGlobalStyle ("contrast");
+
Styles.LoadStyle ();
UpdateXwtDefaults ();
#if MAC
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
index 93a320534d..1136d83ce5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
@@ -3056,6 +3056,50 @@
<EmbeddedResource Include="icons\browser-16~sel.png" />
<EmbeddedResource Include="icons\browser-16~sel%402x.png" />
<EmbeddedResource Include="MonoDevelop.Ide.Projects.FileNesting\FileNestingExtensionModel.addin.xml" />
+ <EmbeddedResource Include="icons\add-16~contrast.png" />
+ <EmbeddedResource Include="icons\add-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\bug-16~contrast.png" />
+ <EmbeddedResource Include="icons\bug-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\build-task-success-16~contrast.png" />
+ <EmbeddedResource Include="icons\build-task-success-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\debug-all-16~contrast.png" />
+ <EmbeddedResource Include="icons\debug-all-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\done-16~contrast.png" />
+ <EmbeddedResource Include="icons\done-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\done-24~contrast.png" />
+ <EmbeddedResource Include="icons\done-24~contrast%402x.png" />
+ <EmbeddedResource Include="icons\done-32~contrast.png" />
+ <EmbeddedResource Include="icons\done-32~contrast%402x.png" />
+ <EmbeddedResource Include="icons\done-48~contrast.png" />
+ <EmbeddedResource Include="icons\done-48~contrast%402x.png" />
+ <EmbeddedResource Include="icons\element-enum-16~contrast.png" />
+ <EmbeddedResource Include="icons\element-enum-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\element-struct-16~contrast.png" />
+ <EmbeddedResource Include="icons\element-struct-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\execute-16~contrast.png" />
+ <EmbeddedResource Include="icons\execute-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\execute-all-16~contrast.png" />
+ <EmbeddedResource Include="icons\execute-all-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\go-back-16~contrast.png" />
+ <EmbeddedResource Include="icons\go-back-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\go-down-16~contrast.png" />
+ <EmbeddedResource Include="icons\go-down-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\go-forward-16~contrast.png" />
+ <EmbeddedResource Include="icons\go-forward-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\go-up-16~contrast.png" />
+ <EmbeddedResource Include="icons\go-up-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\help-16~contrast.png" />
+ <EmbeddedResource Include="icons\help-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\jump-to-16~contrast.png" />
+ <EmbeddedResource Include="icons\jump-to-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\redo-16~contrast.png" />
+ <EmbeddedResource Include="icons\redo-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\refresh-16~contrast.png" />
+ <EmbeddedResource Include="icons\refresh-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\updates-16~contrast.png" />
+ <EmbeddedResource Include="icons\updates-16~contrast%402x.png" />
+ <EmbeddedResource Include="icons\workspace-16~contrast.png" />
+ <EmbeddedResource Include="icons\workspace-16~contrast%402x.png" />
</ItemGroup>
<ItemGroup>
<Compile Include="MonoDevelop.Components.Commands\ICustomCommandTarget.cs" />
diff --git a/main/src/core/MonoDevelop.Ide/icons/add-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/add-16~contrast.png
new file mode 100644
index 0000000000..52f2369850
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/add-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/add-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/add-16~contrast@2x.png
new file mode 100644
index 0000000000..196038ca50
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/add-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/bug-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/bug-16~contrast.png
new file mode 100644
index 0000000000..75304da31a
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/bug-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/bug-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/bug-16~contrast@2x.png
new file mode 100644
index 0000000000..98b70059ff
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/bug-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/build-task-success-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/build-task-success-16~contrast.png
new file mode 100644
index 0000000000..2bcf1934ec
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/build-task-success-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/build-task-success-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/build-task-success-16~contrast@2x.png
new file mode 100644
index 0000000000..1f22d14e7b
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/build-task-success-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/debug-all-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/debug-all-16~contrast.png
new file mode 100644
index 0000000000..ece0b45b2e
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/debug-all-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/debug-all-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/debug-all-16~contrast@2x.png
new file mode 100644
index 0000000000..ee590b39b3
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/debug-all-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/done-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/done-16~contrast.png
new file mode 100644
index 0000000000..4a0a2c4f31
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/done-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/done-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-16~contrast@2x.png
new file mode 100644
index 0000000000..8f93112344
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/done-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/done-24~contrast.png b/main/src/core/MonoDevelop.Ide/icons/done-24~contrast.png
new file mode 100644
index 0000000000..2938c15f2a
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/done-24~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/done-24~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-24~contrast@2x.png
new file mode 100644
index 0000000000..d38300ef0b
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/done-24~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/done-32~contrast.png b/main/src/core/MonoDevelop.Ide/icons/done-32~contrast.png
new file mode 100644
index 0000000000..8f93112344
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/done-32~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/done-32~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-32~contrast@2x.png
new file mode 100644
index 0000000000..d125668e95
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/done-32~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/done-48~contrast.png b/main/src/core/MonoDevelop.Ide/icons/done-48~contrast.png
new file mode 100644
index 0000000000..d38300ef0b
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/done-48~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/done-48~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-48~contrast@2x.png
new file mode 100644
index 0000000000..87335edcab
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/done-48~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/element-enum-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~contrast.png
new file mode 100644
index 0000000000..fc544949ce
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/element-enum-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~contrast@2x.png
new file mode 100644
index 0000000000..ab1a657f47
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/element-struct-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~contrast.png
new file mode 100644
index 0000000000..ed7b6aac49
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/element-struct-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~contrast@2x.png
new file mode 100644
index 0000000000..0416d67e9b
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/execute-16~contrast.png
new file mode 100644
index 0000000000..c8e82c2812
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/execute-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/execute-16~contrast@2x.png
new file mode 100644
index 0000000000..30427ac5b4
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/execute-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-all-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~contrast.png
new file mode 100644
index 0000000000..9eea7c8cc6
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-all-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~contrast@2x.png
new file mode 100644
index 0000000000..b9cbf8784b
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/go-back-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/go-back-16~contrast.png
new file mode 100644
index 0000000000..f3305bfe2f
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/go-back-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/go-back-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-back-16~contrast@2x.png
new file mode 100644
index 0000000000..eac08d681d
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/go-back-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/go-down-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/go-down-16~contrast.png
new file mode 100644
index 0000000000..88c5a138e8
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/go-down-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/go-down-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-down-16~contrast@2x.png
new file mode 100644
index 0000000000..30af51de9e
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/go-down-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/go-forward-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~contrast.png
new file mode 100644
index 0000000000..c0bb20e3c7
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/go-forward-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~contrast@2x.png
new file mode 100644
index 0000000000..6b934b8328
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/go-up-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/go-up-16~contrast.png
new file mode 100644
index 0000000000..4eedaaccb8
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/go-up-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/go-up-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-up-16~contrast@2x.png
new file mode 100644
index 0000000000..5b02659e38
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/go-up-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/help-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/help-16~contrast.png
new file mode 100644
index 0000000000..c32d2f4e51
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/help-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/help-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/help-16~contrast@2x.png
new file mode 100644
index 0000000000..ebbce81856
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/help-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/jump-to-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~contrast.png
new file mode 100644
index 0000000000..70b816c898
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/jump-to-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~contrast@2x.png
new file mode 100644
index 0000000000..eb2e79d68d
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/redo-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/redo-16~contrast.png
new file mode 100644
index 0000000000..43c937cd0d
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/redo-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/redo-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/redo-16~contrast@2x.png
new file mode 100644
index 0000000000..453e1545ed
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/redo-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/refresh-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/refresh-16~contrast.png
new file mode 100644
index 0000000000..573bc6fdb3
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/refresh-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/refresh-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/refresh-16~contrast@2x.png
new file mode 100644
index 0000000000..2de7579019
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/refresh-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/updates-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/updates-16~contrast.png
new file mode 100644
index 0000000000..723308f8e9
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/updates-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/updates-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/updates-16~contrast@2x.png
new file mode 100644
index 0000000000..2a0220716d
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/updates-16~contrast@2x.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-16~contrast.png b/main/src/core/MonoDevelop.Ide/icons/workspace-16~contrast.png
new file mode 100644
index 0000000000..e1aae4959e
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/workspace-16~contrast.png
Binary files differ
diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-16~contrast@2x.png b/main/src/core/MonoDevelop.Ide/icons/workspace-16~contrast@2x.png
new file mode 100644
index 0000000000..48dbdc930f
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/workspace-16~contrast@2x.png
Binary files differ