diff options
3316 files changed, 15588 insertions, 6160 deletions
diff --git a/.gitmodules b/.gitmodules index 229897ee7f..3b13665738 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,6 +14,7 @@ [submodule "main/external/mono-addins"] path = main/external/mono-addins url = git://github.com/mono/mono-addins.git + branch = master [submodule "main/external/ikvm"] path = main/external/ikvm url = git://github.com/mono/ikvm-fork.git diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..373db3f86b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,7 @@ +// Local Monodevelop VS Code settings +// Prevents trailing spaces removal and other formatting issues which VSCode usually does. +{ + "editor.insertSpaces": false, + "files.trimTrailingWhitespace": false, + "files.insertFinalNewline": false +} diff --git a/main/build/MacOSX/monostub.m b/main/build/MacOSX/monostub.m index cea74e09f5..7ddfd5f454 100644 --- a/main/build/MacOSX/monostub.m +++ b/main/build/MacOSX/monostub.m @@ -192,7 +192,7 @@ int main (int argc, char **argv) NSString *appDir = [[NSBundle mainBundle] bundlePath]; // can be overridden with plist string MonoMinVersion - NSString *req_mono_version = @"4.2"; + NSString *req_mono_version = @"4.3"; // can be overridden with either plist bool MonoUseSGen or MONODEVELOP_USE_SGEN env bool use_sgen = YES; bool need64Bit = false; @@ -248,7 +248,8 @@ int main (int argc, char **argv) if (libmono == NULL) { fprintf (stderr, "Failed to load libmono%s-2.0.dylib: %s\n", use_sgen ? "sgen" : "", dlerror ()); - exit_with_message ("This application requires the Mono framework.", argv[0]); + NSString *msg = [NSString stringWithFormat:@"This application requires Mono %s or newer.", [req_mono_version UTF8String]]; + exit_with_message ((char *)[msg UTF8String], argv[0]); } mono_main _mono_main = (mono_main) dlsym (libmono, "mono_main"); @@ -270,8 +271,10 @@ int main (int argc, char **argv) } char *mono_version = _mono_get_runtime_build_info (); - if (!check_mono_version (mono_version, [req_mono_version UTF8String])) - exit_with_message ("This application requires a newer version of the Mono framework.", argv[0]); + if (!check_mono_version (mono_version, [req_mono_version UTF8String])) { + NSString *msg = [NSString stringWithFormat:@"This application requires a newer version (%s+) of the Mono framework.", [req_mono_version UTF8String]]; + exit_with_message ((char *)[msg UTF8String], argv[0]); + } extra_argv = get_mono_env_options (&extra_argc); diff --git a/main/external/mono-addins b/main/external/mono-addins -Subproject b812a4f37bc9ce27e7eaa2e657b1f8336061978 +Subproject b60e1a765e72e3a2329531513a28690f8e0523d diff --git a/main/external/xwt b/main/external/xwt -Subproject 9cee0e6dd9d445a95beb0b6528de78fc633a403 +Subproject 82b2666fb604fee11309960225c6de1d41a9307 diff --git a/main/po/ca.po b/main/po/ca.po index 0239e2ffcb..d0e85e1a43 100644 --- a/main/po/ca.po +++ b/main/po/ca.po @@ -15646,7 +15646,7 @@ msgid "Print operation failed." msgstr "S'ha produït un error en l'operació d'impressió." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/cs.po b/main/po/cs.po index 43392707ec..81458a8373 100644 --- a/main/po/cs.po +++ b/main/po/cs.po @@ -15486,7 +15486,7 @@ msgid "Print operation failed." msgstr "Operace tisku selhala." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/da.po b/main/po/da.po index 8da244b26c..43f76636e8 100644 --- a/main/po/da.po +++ b/main/po/da.po @@ -16267,7 +16267,7 @@ msgid "Print operation failed." msgstr "Det mislykkedes at gemme." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/de.po b/main/po/de.po index 29f58223c3..01e0195055 100644 --- a/main/po/de.po +++ b/main/po/de.po @@ -15305,8 +15305,8 @@ msgid "Print operation failed." msgstr "Druckoperation fehlgeschlagen." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" -msgstr "'F2' für Fokus" +msgid "Press F2 to focus" +msgstr "F2 für Fokus" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 msgid "Clipboard ring" diff --git a/main/po/es.po b/main/po/es.po index fdad3cb9d5..4b3f9fef9d 100644 --- a/main/po/es.po +++ b/main/po/es.po @@ -15729,7 +15729,7 @@ msgid "Print operation failed." msgstr "La operación de impresión ha fallado." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/fr.po b/main/po/fr.po index 33211eb9cf..2932a5aec8 100644 --- a/main/po/fr.po +++ b/main/po/fr.po @@ -15874,7 +15874,7 @@ msgid "Print operation failed." msgstr "L'impression a échoué." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/gl.po b/main/po/gl.po index 799d8c2a9d..3c99e07386 100644 --- a/main/po/gl.po +++ b/main/po/gl.po @@ -16031,7 +16031,7 @@ msgid "Print operation failed." msgstr "Fallou a operación de impresión." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/hu.po b/main/po/hu.po index c7bd6374dc..c8ce76a015 100644 --- a/main/po/hu.po +++ b/main/po/hu.po @@ -15757,7 +15757,7 @@ msgid "Print operation failed." msgstr "Nem sikerült nyomtatni." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/id.po b/main/po/id.po index 2b6909fae6..d1b27668b2 100644 --- a/main/po/id.po +++ b/main/po/id.po @@ -16186,7 +16186,7 @@ msgid "Print operation failed." msgstr "Operasi mencetak/print gagal." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/it.po b/main/po/it.po index 6ee0730a26..90d0a22be8 100644 --- a/main/po/it.po +++ b/main/po/it.po @@ -15882,7 +15882,7 @@ msgid "Print operation failed." msgstr "Stampa non riuscita." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/ja.po b/main/po/ja.po index 9831044bb8..9b8f477a8c 100644 --- a/main/po/ja.po +++ b/main/po/ja.po @@ -15670,7 +15670,7 @@ msgid "Print operation failed." msgstr "印刷処理に失敗しました。" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/ko.po b/main/po/ko.po index f4ad4936bd..0f15e7a374 100644 --- a/main/po/ko.po +++ b/main/po/ko.po @@ -14125,7 +14125,7 @@ msgid "Print operation failed." msgstr "인쇄 작업이 실패함." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/messages.po b/main/po/messages.po index 09e8b0c93f..adccfcf4e9 100644 --- a/main/po/messages.po +++ b/main/po/messages.po @@ -14412,7 +14412,7 @@ msgid "Print operation failed." msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/nb.po b/main/po/nb.po index 2ae4118f3a..c6865813b6 100644 --- a/main/po/nb.po +++ b/main/po/nb.po @@ -14681,7 +14681,7 @@ msgid "Print operation failed." msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/nl.po b/main/po/nl.po index d468231fd8..80014670f8 100644 --- a/main/po/nl.po +++ b/main/po/nl.po @@ -16276,7 +16276,7 @@ msgid "Print operation failed." msgstr "Printopdracht mislukt." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/pl.po b/main/po/pl.po index 83eed9dbbb..fd8ca557d7 100644 --- a/main/po/pl.po +++ b/main/po/pl.po @@ -16167,7 +16167,7 @@ msgid "Print operation failed." msgstr "Zapisywanie nie powiodło się." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/pt.po b/main/po/pt.po index 901216da97..6716fb6129 100644 --- a/main/po/pt.po +++ b/main/po/pt.po @@ -16202,7 +16202,7 @@ msgid "Print operation failed." msgstr "Falhou a operação de impressão." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/pt_BR.po b/main/po/pt_BR.po index 445c67ae8f..1fa8b4a7ef 100644 --- a/main/po/pt_BR.po +++ b/main/po/pt_BR.po @@ -15650,8 +15650,8 @@ msgstr "Operação de impresão falhou." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 #, fuzzy -msgid "Press 'F2' for focus" -msgstr "Pressione 'shift+espaço' para dar foco" +msgid "Press F2 to focus" +msgstr "Pressione F2 para dar foco" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 msgid "Clipboard ring" diff --git a/main/po/ru.po b/main/po/ru.po index 85eb0ab258..44ea829894 100644 --- a/main/po/ru.po +++ b/main/po/ru.po @@ -15958,7 +15958,7 @@ msgid "Print operation failed." msgstr "Произошёл сбой при печати." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/sl.po b/main/po/sl.po index b23b7917e3..1f20b1307e 100644 --- a/main/po/sl.po +++ b/main/po/sl.po @@ -16205,7 +16205,7 @@ msgid "Print operation failed." msgstr "Shranjevanje ni uspelo." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/sv.po b/main/po/sv.po index 6e56cccdd6..fd04cf9d6f 100644 --- a/main/po/sv.po +++ b/main/po/sv.po @@ -16035,7 +16035,7 @@ msgid "Print operation failed." msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/tr.po b/main/po/tr.po index afafdadf11..fa5f14d29d 100644 --- a/main/po/tr.po +++ b/main/po/tr.po @@ -16112,7 +16112,7 @@ msgid "Print operation failed." msgstr "Yazdırma işlemi başarısız oldu." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/uk.po b/main/po/uk.po index 1e8b27c114..73c58d2dcb 100644 --- a/main/po/uk.po +++ b/main/po/uk.po @@ -14795,7 +14795,7 @@ msgid "Print operation failed." msgstr "Трапився збій під час друку." #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "Натисніть 'F2' для фокусування" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/zh_CN.po b/main/po/zh_CN.po index c21a314a61..841cc9af26 100644 --- a/main/po/zh_CN.po +++ b/main/po/zh_CN.po @@ -16121,7 +16121,7 @@ msgid "Print operation failed." msgstr "保存操作失败。" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 -msgid "Press 'F2' for focus" +msgid "Press F2 to focus" msgstr "" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 diff --git a/main/po/zh_TW.po b/main/po/zh_TW.po index 9630e42527..00852550ba 100644 --- a/main/po/zh_TW.po +++ b/main/po/zh_TW.po @@ -15319,8 +15319,8 @@ msgstr "列印動作失敗。" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 #, fuzzy -msgid "Press 'F2' for focus" -msgstr "按下 'Shift+Space' 以取得焦點" +msgid "Press F2 to focus" +msgstr "按下 F2 以取得焦點" #: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185 msgid "Clipboard ring" diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj index cba56b95c1..b640c01f70 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj @@ -183,6 +183,7 @@ <SpecificVersion>False</SpecificVersion> </Reference> <Reference Include="System.Xml.Linq" /> + <Reference Include="Mono.Cairo" /> <Reference Include="Mono.Posix" /> <Reference Include="System.ServiceModel" /> <Reference Include="System.Runtime.Serialization" /> @@ -197,6 +198,12 @@ <EmbeddedResource Include="Templates\images\aspnet-empty-project%402x.png"> <LogicalName>aspnet-empty-project@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="Templates\images\aspnet-empty-project~dark.png"> + <LogicalName>aspnet-empty-project~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Templates\images\aspnet-empty-project~dark%402x.png"> + <LogicalName>aspnet-empty-project~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="gtk-gui\gui.stetic"> <LogicalName>gui.stetic</LogicalName> </EmbeddedResource> diff --git a/main/src/addins/AspNet/Projects/GtkAspNetProjectTemplateWizardPageWidget.cs b/main/src/addins/AspNet/Projects/GtkAspNetProjectTemplateWizardPageWidget.cs index 26eaa8c6c8..699afe4c5a 100644 --- a/main/src/addins/AspNet/Projects/GtkAspNetProjectTemplateWizardPageWidget.cs +++ b/main/src/addins/AspNet/Projects/GtkAspNetProjectTemplateWizardPageWidget.cs @@ -37,8 +37,6 @@ namespace MonoDevelop.AspNet.Projects [System.ComponentModel.ToolboxItem (true)]
partial class GtkAspNetProjectTemplateWizardPageWidget : Gtk.Bin
{
- Color backgroundColor = new Color (225, 228, 232);
-
AspNetProjectTemplateWizardPage wizardPage;
ImageView backgroundImageView;
Xwt.Drawing.Image backgroundImage;
@@ -69,7 +67,8 @@ namespace MonoDevelop.AspNet.Projects backgroundImageView.Yalign = (float)(1/scale);
backgroundLargeImageVBox.PackStart (backgroundImageView, true, true, 0);
- var separatorColor = new Color (176, 178, 181);
+ var separatorColor = Ide.Gui.Styles.NewProjectDialog.ProjectConfigurationSeparatorColor.ToGdkColor ();
+ var backgroundColor = Ide.Gui.Styles.NewProjectDialog.ProjectConfigurationLeftHandBackgroundColor.ToGdkColor ();
testingSeparator.ModifyBg (StateType.Normal, separatorColor);
leftBorderEventBox.ModifyBg (StateType.Normal, backgroundColor);
diff --git a/main/src/addins/AspNet/Templates/images/aspnet-empty-project.png b/main/src/addins/AspNet/Templates/images/aspnet-empty-project.png Binary files differindex 62548510f7..df0b78b1f9 100644 --- a/main/src/addins/AspNet/Templates/images/aspnet-empty-project.png +++ b/main/src/addins/AspNet/Templates/images/aspnet-empty-project.png diff --git a/main/src/addins/AspNet/Templates/images/aspnet-empty-project@2x.png b/main/src/addins/AspNet/Templates/images/aspnet-empty-project@2x.png Binary files differindex 68410db0e3..7b4464f373 100644 --- a/main/src/addins/AspNet/Templates/images/aspnet-empty-project@2x.png +++ b/main/src/addins/AspNet/Templates/images/aspnet-empty-project@2x.png diff --git a/main/src/addins/AspNet/Templates/images/aspnet-empty-project~dark.png b/main/src/addins/AspNet/Templates/images/aspnet-empty-project~dark.png Binary files differnew file mode 100644 index 0000000000..54123c375a --- /dev/null +++ b/main/src/addins/AspNet/Templates/images/aspnet-empty-project~dark.png diff --git a/main/src/addins/AspNet/Templates/images/aspnet-empty-project~dark@2x.png b/main/src/addins/AspNet/Templates/images/aspnet-empty-project~dark@2x.png Binary files differnew file mode 100644 index 0000000000..9e3cf6c4aa --- /dev/null +++ b/main/src/addins/AspNet/Templates/images/aspnet-empty-project~dark@2x.png diff --git a/main/src/addins/CBinding/gtk-gui/CBinding.EditPackagesDialog.cs b/main/src/addins/CBinding/gtk-gui/CBinding.EditPackagesDialog.cs index d2ac0eb869..71883f5a67 100644 --- a/main/src/addins/CBinding/gtk-gui/CBinding.EditPackagesDialog.cs +++ b/main/src/addins/CBinding/gtk-gui/CBinding.EditPackagesDialog.cs @@ -5,24 +5,45 @@ namespace CBinding public partial class EditPackagesDialog { private global::Gtk.VPaned vpaned1; + private global::Gtk.HBox hbox1; + private global::Gtk.Notebook notebook1; + private global::Gtk.ScrolledWindow scrolledwindow1; + private global::Gtk.TreeView normalPackageTreeView; + private global::Gtk.Label labelSystemPackages; + private global::Gtk.ScrolledWindow scrolledwindow3; + private global::Gtk.TreeView projectPackageTreeView; + private global::Gtk.Label labelProjectPackages; + private global::Gtk.VBox vbox3; + private global::Gtk.Fixed fixed1; + private global::Gtk.Button detailsButton; + private global::Gtk.Table table1; + private global::Gtk.Label label3; + private global::Gtk.ScrolledWindow scrolledwindow2; + private global::Gtk.TreeView selectedPackageTreeView; + private global::Gtk.VBox vbox2; + private global::Gtk.Button removeButton; + + private global::MonoDevelop.Components.ImageView iconRemove; + private global::Gtk.Button buttonCancel; + private global::Gtk.Button buttonOk; protected virtual void Build () @@ -167,11 +188,12 @@ namespace CBinding this.removeButton.Sensitive = false; this.removeButton.CanFocus = true; this.removeButton.Name = "removeButton"; - this.removeButton.UseUnderline = true; - this.removeButton.Label = ""; - global::Gtk.Image w14 = new global::Gtk.Image (); - w14.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-remove", global::Gtk.IconSize.Menu); - this.removeButton.Image = w14; + // Container child removeButton.Gtk.Container+ContainerChild + this.iconRemove = new global::MonoDevelop.Components.ImageView (); + this.iconRemove.Name = "iconRemove"; + this.iconRemove.IconId = "gtk-remove"; + this.iconRemove.IconSize = ((global::Gtk.IconSize)(1)); + this.removeButton.Add (this.iconRemove); this.vbox2.Add (this.removeButton); global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.removeButton])); w15.Position = 0; diff --git a/main/src/addins/CBinding/gtk-gui/CBinding.GeneralOptionsPanel.cs b/main/src/addins/CBinding/gtk-gui/CBinding.GeneralOptionsPanel.cs index 9bcbecfade..257314dcef 100644 --- a/main/src/addins/CBinding/gtk-gui/CBinding.GeneralOptionsPanel.cs +++ b/main/src/addins/CBinding/gtk-gui/CBinding.GeneralOptionsPanel.cs @@ -5,14 +5,29 @@ namespace CBinding public partial class GeneralOptionsPanel { private global::Gtk.Table table1; + private global::Gtk.ComboBox cCombo; + private global::Gtk.ComboBox cppCombo; + private global::Gtk.Button ctagsBrowse; + + private global::Gtk.HBox hboxBtnBrowse; + + private global::MonoDevelop.Components.ImageView ctagsBrowseIcon; + + private global::Gtk.Label ctagsBrowselabel; + private global::Gtk.Entry ctagsEntry; + private global::Gtk.Label label1; + private global::Gtk.Label label2; + private global::Gtk.Label label3; + private global::Gtk.CheckButton parseLocalVariablesCheck; + private global::Gtk.CheckButton parseSystemTagsCheck; protected virtual void Build () @@ -52,19 +67,39 @@ namespace CBinding this.ctagsBrowse = new global::Gtk.Button (); this.ctagsBrowse.CanFocus = true; this.ctagsBrowse.Name = "ctagsBrowse"; - this.ctagsBrowse.UseUnderline = true; - this.ctagsBrowse.Label = global::Mono.Unix.Catalog.GetString ("Browse"); - global::Gtk.Image w3 = new global::Gtk.Image (); - w3.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-open", global::Gtk.IconSize.Menu); - this.ctagsBrowse.Image = w3; + // Container child ctagsBrowse.Gtk.Container+ContainerChild + this.hboxBtnBrowse = new global::Gtk.HBox (); + this.hboxBtnBrowse.Name = "hboxBtnBrowse"; + this.hboxBtnBrowse.Spacing = 2; + // Container child hboxBtnBrowse.Gtk.Box+BoxChild + this.ctagsBrowseIcon = new global::MonoDevelop.Components.ImageView (); + this.ctagsBrowseIcon.Name = "ctagsBrowseIcon"; + this.ctagsBrowseIcon.IconId = "gtk-open"; + this.ctagsBrowseIcon.IconSize = ((global::Gtk.IconSize)(1)); + this.hboxBtnBrowse.Add (this.ctagsBrowseIcon); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hboxBtnBrowse [this.ctagsBrowseIcon])); + w3.Position = 0; + w3.Expand = false; + w3.Fill = false; + // Container child hboxBtnBrowse.Gtk.Box+BoxChild + this.ctagsBrowselabel = new global::Gtk.Label (); + this.ctagsBrowselabel.Name = "ctagsBrowselabel"; + this.ctagsBrowselabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Browse"); + this.ctagsBrowselabel.UseUnderline = true; + this.hboxBtnBrowse.Add (this.ctagsBrowselabel); + global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hboxBtnBrowse [this.ctagsBrowselabel])); + w4.Position = 1; + w4.Expand = false; + w4.Fill = false; + this.ctagsBrowse.Add (this.hboxBtnBrowse); this.table1.Add (this.ctagsBrowse); - global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.ctagsBrowse])); - w4.TopAttach = ((uint)(2)); - w4.BottomAttach = ((uint)(3)); - w4.LeftAttach = ((uint)(2)); - w4.RightAttach = ((uint)(3)); - w4.XOptions = ((global::Gtk.AttachOptions)(4)); - w4.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.ctagsBrowse])); + w6.TopAttach = ((uint)(2)); + w6.BottomAttach = ((uint)(3)); + w6.LeftAttach = ((uint)(2)); + w6.RightAttach = ((uint)(3)); + w6.XOptions = ((global::Gtk.AttachOptions)(4)); + w6.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.ctagsEntry = new global::Gtk.Entry (); this.ctagsEntry.CanFocus = true; @@ -72,13 +107,13 @@ namespace CBinding this.ctagsEntry.IsEditable = true; this.ctagsEntry.InvisibleChar = '●'; this.table1.Add (this.ctagsEntry); - global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.ctagsEntry])); - w5.TopAttach = ((uint)(2)); - w5.BottomAttach = ((uint)(3)); - w5.LeftAttach = ((uint)(1)); - w5.RightAttach = ((uint)(2)); - w5.XOptions = ((global::Gtk.AttachOptions)(4)); - w5.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.ctagsEntry])); + w7.TopAttach = ((uint)(2)); + w7.BottomAttach = ((uint)(3)); + w7.LeftAttach = ((uint)(1)); + w7.RightAttach = ((uint)(2)); + w7.XOptions = ((global::Gtk.AttachOptions)(4)); + w7.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.label1 = new global::Gtk.Label (); this.label1.Name = "label1"; @@ -86,9 +121,9 @@ namespace CBinding this.label1.Xalign = 1F; this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Default C Compiler:"); this.table1.Add (this.label1); - global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1])); - w6.XOptions = ((global::Gtk.AttachOptions)(4)); - w6.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1])); + w8.XOptions = ((global::Gtk.AttachOptions)(4)); + w8.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.label2 = new global::Gtk.Label (); this.label2.Name = "label2"; @@ -96,11 +131,11 @@ namespace CBinding this.label2.Xalign = 1F; this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Default C++ Compiler:"); this.table1.Add (this.label2); - global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2])); - w7.TopAttach = ((uint)(1)); - w7.BottomAttach = ((uint)(2)); - w7.XOptions = ((global::Gtk.AttachOptions)(4)); - w7.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2])); + w9.TopAttach = ((uint)(1)); + w9.BottomAttach = ((uint)(2)); + w9.XOptions = ((global::Gtk.AttachOptions)(4)); + w9.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.label3 = new global::Gtk.Label (); this.label3.Name = "label3"; @@ -109,11 +144,11 @@ namespace CBinding this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("CTags: "); this.label3.Justify = ((global::Gtk.Justification)(1)); this.table1.Add (this.label3); - global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3])); - w8.TopAttach = ((uint)(2)); - w8.BottomAttach = ((uint)(3)); - w8.XOptions = ((global::Gtk.AttachOptions)(4)); - w8.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3])); + w10.TopAttach = ((uint)(2)); + w10.BottomAttach = ((uint)(3)); + w10.XOptions = ((global::Gtk.AttachOptions)(4)); + w10.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.parseLocalVariablesCheck = new global::Gtk.CheckButton (); this.parseLocalVariablesCheck.CanFocus = true; @@ -122,12 +157,12 @@ namespace CBinding this.parseLocalVariablesCheck.DrawIndicator = true; this.parseLocalVariablesCheck.UseUnderline = true; this.table1.Add (this.parseLocalVariablesCheck); - global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1 [this.parseLocalVariablesCheck])); - w9.TopAttach = ((uint)(4)); - w9.BottomAttach = ((uint)(5)); - w9.XPadding = ((uint)(10)); - w9.XOptions = ((global::Gtk.AttachOptions)(4)); - w9.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.parseLocalVariablesCheck])); + w11.TopAttach = ((uint)(4)); + w11.BottomAttach = ((uint)(5)); + w11.XPadding = ((uint)(10)); + w11.XOptions = ((global::Gtk.AttachOptions)(4)); + w11.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.parseSystemTagsCheck = new global::Gtk.CheckButton (); this.parseSystemTagsCheck.TooltipMarkup = "Choose whether you want to parse system tags or not, if you do you will get completion for things like printf, but the tag parsing process will take considerably longer."; @@ -137,12 +172,12 @@ namespace CBinding this.parseSystemTagsCheck.DrawIndicator = true; this.parseSystemTagsCheck.UseUnderline = true; this.table1.Add (this.parseSystemTagsCheck); - global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1 [this.parseSystemTagsCheck])); - w10.TopAttach = ((uint)(3)); - w10.BottomAttach = ((uint)(4)); - w10.XPadding = ((uint)(10)); - w10.XOptions = ((global::Gtk.AttachOptions)(4)); - w10.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.parseSystemTagsCheck])); + w12.TopAttach = ((uint)(3)); + w12.BottomAttach = ((uint)(4)); + w12.XPadding = ((uint)(10)); + w12.XOptions = ((global::Gtk.AttachOptions)(4)); + w12.YOptions = ((global::Gtk.AttachOptions)(4)); this.Add (this.table1); if ((this.Child != null)) { this.Child.ShowAll (); diff --git a/main/src/addins/CBinding/gtk-gui/generated.cs b/main/src/addins/CBinding/gtk-gui/generated.cs index 0ada9fc5f0..75935e2e55 100644 --- a/main/src/addins/CBinding/gtk-gui/generated.cs +++ b/main/src/addins/CBinding/gtk-gui/generated.cs @@ -66,40 +66,6 @@ namespace Stetic } } - internal class IconLoader - { - public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size) - { - Gdk.Pixbuf res = widget.RenderIcon (name, size, null); - if ((res != null)) { - return res; - } else { - int sz; - int sy; - global::Gtk.Icon.SizeLookup (size, out sz, out sy); - try { - return Gtk.IconTheme.Default.LoadIcon (name, sz, 0); - } catch (System.Exception) { - if ((name != "gtk-missing-image")) { - return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size); - } else { - Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz); - Gdk.GC gc = new Gdk.GC (pmap); - gc.RgbFgColor = new Gdk.Color (255, 255, 255); - pmap.DrawRectangle (gc, true, 0, 0, sz, sz); - gc.RgbFgColor = new Gdk.Color (0, 0, 0); - pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1)); - gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round); - gc.RgbFgColor = new Gdk.Color (255, 0, 0); - pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4))); - pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4))); - return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz); - } - } - } - } - } - internal class ActionGroups { public static Gtk.ActionGroup GetActionGroup (System.Type type) diff --git a/main/src/addins/CBinding/gtk-gui/gui.stetic b/main/src/addins/CBinding/gtk-gui/gui.stetic index d1bef0d978..375e121512 100644 --- a/main/src/addins/CBinding/gtk-gui/gui.stetic +++ b/main/src/addins/CBinding/gtk-gui/gui.stetic @@ -1299,12 +1299,16 @@ Example: <property name="Sensitive">False</property> <property name="Tooltip">Remove selected package from the project.</property> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-remove Menu</property> - <property name="Label" /> - <property name="UseUnderline">True</property> + <property name="Type">Custom</property> <signal name="Clicked" handler="OnRemoveButtonClicked" /> <signal name="Clicked" handler="OnRemoveButtonClick" /> + <child> + <widget class="MonoDevelop.Components.ImageView" id="iconRemove"> + <property name="MemberName" /> + <property name="IconId">gtk-remove</property> + <property name="IconSize">Menu</property> + </widget> + </child> </widget> <packing> <property name="Position">0</property> @@ -1678,18 +1682,47 @@ Example: <widget class="Gtk.Button" id="ctagsBrowse"> <property name="MemberName">ctagsBrowse</property> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-open Menu</property> - <property name="Label" translatable="yes">Browse</property> - <property name="UseUnderline">True</property> + <property name="Type">Custom</property> <signal name="Clicked" handler="OnCtagsBrowseClicked" /> + <child> + <widget class="Gtk.HBox" id="hboxBtnBrowse"> + <property name="MemberName" /> + <property name="Spacing">2</property> + <child> + <widget class="MonoDevelop.Components.ImageView" id="ctagsBrowseIcon"> + <property name="MemberName" /> + <property name="IconId">gtk-open</property> + <property name="IconSize">Menu</property> + </widget> + <packing> + <property name="Position">0</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + <child> + <widget class="Gtk.Label" id="ctagsBrowselabel"> + <property name="MemberName" /> + <property name="LabelProp" translatable="yes">Browse</property> + <property name="UseUnderline">True</property> + </widget> + <packing> + <property name="Position">1</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + </widget> + </child> </widget> <packing> <property name="TopAttach">2</property> <property name="BottomAttach">3</property> <property name="LeftAttach">2</property> <property name="RightAttach">3</property> - <property name="AutoSize">True</property> + <property name="AutoSize">False</property> <property name="XOptions">Fill</property> <property name="YOptions">Fill</property> <property name="XExpand">False</property> diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs index 546be6ad18..41aabf8b45 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs @@ -167,7 +167,7 @@ namespace MonoDevelop.CSharp.ClassOutline return toolbarWidgets; var groupToggleButton = new ToggleButton { - Image = new Image (Ide.Gui.Stock.GroupByCategory, IconSize.Menu), + Image = new ImageView (Ide.Gui.Stock.GroupByCategory, IconSize.Menu), TooltipText = GettextCatalog.GetString ("Group entries by type"), Active = settings.IsGrouped, }; @@ -179,7 +179,7 @@ namespace MonoDevelop.CSharp.ClassOutline }; var sortAlphabeticallyToggleButton = new ToggleButton { - Image = new Image (Ide.Gui.Stock.SortAlphabetically, IconSize.Menu), + Image = new ImageView (Ide.Gui.Stock.SortAlphabetically, IconSize.Menu), TooltipText = GettextCatalog.GetString ("Sort entries alphabetically"), Active = settings.IsSorted, }; diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/DeclaredSymbolInfo.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/DeclaredSymbolInfo.cs index b9ead2b396..347c1e5be4 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/DeclaredSymbolInfo.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/DeclaredSymbolInfo.cs @@ -528,9 +528,9 @@ namespace MonoDevelop.CSharp } } - public override string GetMarkupText () + public override string GetMarkupText (bool selected) { - return HighlightMatch (useFullName ? type.FullyQualifiedContainerName : type.Name, match); + return HighlightMatch (useFullName ? type.FullyQualifiedContainerName : type.Name, match, selected); } public DeclaredSymbolInfoResult (string match, string matchedString, int rank, DeclaredSymbolInfo type, bool useFullName) : base (match, matchedString, rank) diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs index 7c7fa8b331..3bcfcae94c 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs @@ -77,7 +77,9 @@ namespace MonoDevelop.CSharp public SignatureMarkupCreator (DocumentContext ctx, int offset) { this.offset = offset; - this.colorStyle = SyntaxModeService.GetColorStyle (MonoDevelop.Ide.IdeApp.Preferences.ColorScheme); + this.colorStyle = SyntaxModeService.GetColorStyle (Ide.IdeApp.Preferences.ColorScheme); + if (!this.colorStyle.FitsIdeSkin (Ide.IdeApp.Preferences.UserInterfaceSkin)) + this.colorStyle = SyntaxModeService.GetDefaultColorStyle (Ide.IdeApp.Preferences.UserInterfaceSkin); this.ctx = ctx; if (ctx != null) { this.options = ctx.GetOptionSet (); diff --git a/main/src/addins/ChangeLogAddIn/gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs b/main/src/addins/ChangeLogAddIn/gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs index e88f8540d9..f71b2fb618 100644 --- a/main/src/addins/ChangeLogAddIn/gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs +++ b/main/src/addins/ChangeLogAddIn/gtk-gui/MonoDevelop.ChangeLogAddIn.AddLogEntryDialog.cs @@ -5,28 +5,49 @@ namespace MonoDevelop.ChangeLogAddIn internal partial class AddLogEntryDialog { private global::Gtk.VBox vbox1; + private global::Gtk.VPaned vpaned1; + private global::Gtk.VBox vbox2; + private global::Gtk.Label label1; + private global::Gtk.ScrolledWindow scrolledwindow2; + private global::Gtk.TreeView fileList; + private global::Gtk.VBox vbox3; + private global::Gtk.Label label3; + private global::Gtk.ScrolledWindow scrolledwindow1; + private global::Gtk.TextView textview; + private global::Gtk.HBox boxNewFile; - private global::Gtk.Image image36; + + private global::MonoDevelop.Components.ImageView image36; + private global::Gtk.Label label7; + private global::Gtk.HBox boxNoFile; - private global::Gtk.Image image37; + + private global::MonoDevelop.Components.ImageView image37; + private global::Gtk.Label label8; + private global::Gtk.HBox hbox3; + private global::Gtk.VBox vbox4; - private global::Gtk.Image image38; + + private global::MonoDevelop.Components.ImageView image38; + private global::Gtk.Label label9; + private global::Gtk.Button button7; - private global::Gtk.Button button119; + private global::Gtk.Button button119; + protected virtual void Build () { global::Stetic.Gui.Initialize (this); @@ -119,9 +140,10 @@ namespace MonoDevelop.ChangeLogAddIn this.boxNewFile.Name = "boxNewFile"; this.boxNewFile.Spacing = 6; // Container child boxNewFile.Gtk.Box+BoxChild - this.image36 = new global::Gtk.Image (); + this.image36 = new global::MonoDevelop.Components.ImageView (); this.image36.Name = "image36"; - this.image36.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", global::Gtk.IconSize.SmallToolbar); + this.image36.IconId = "gtk-new"; + this.image36.IconSize = ((global::Gtk.IconSize)(2)); this.boxNewFile.Add (this.image36); global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.boxNewFile [this.image36])); w11.Position = 0; @@ -149,9 +171,10 @@ namespace MonoDevelop.ChangeLogAddIn this.boxNoFile.Name = "boxNoFile"; this.boxNoFile.Spacing = 6; // Container child boxNoFile.Gtk.Box+BoxChild - this.image37 = new global::Gtk.Image (); + this.image37 = new global::MonoDevelop.Components.ImageView (); this.image37.Name = "image37"; - this.image37.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-warning", global::Gtk.IconSize.SmallToolbar); + this.image37.IconId = "gtk-dialog-warning"; + this.image37.IconSize = ((global::Gtk.IconSize)(2)); this.boxNoFile.Add (this.image37); global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.boxNoFile [this.image37])); w14.Position = 0; @@ -184,9 +207,10 @@ namespace MonoDevelop.ChangeLogAddIn this.vbox4.Name = "vbox4"; this.vbox4.Spacing = 6; // Container child vbox4.Gtk.Box+BoxChild - this.image38 = new global::Gtk.Image (); + this.image38 = new global::MonoDevelop.Components.ImageView (); this.image38.Name = "image38"; - this.image38.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-info", global::Gtk.IconSize.SmallToolbar); + this.image38.IconId = "gtk-dialog-info"; + this.image38.IconSize = ((global::Gtk.IconSize)(2)); this.vbox4.Add (this.image38); global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.image38])); w17.Position = 0; diff --git a/main/src/addins/ChangeLogAddIn/gtk-gui/generated.cs b/main/src/addins/ChangeLogAddIn/gtk-gui/generated.cs index 36abc51341..75935e2e55 100644 --- a/main/src/addins/ChangeLogAddIn/gtk-gui/generated.cs +++ b/main/src/addins/ChangeLogAddIn/gtk-gui/generated.cs @@ -14,40 +14,6 @@ namespace Stetic } } - internal class IconLoader - { - public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size) - { - Gdk.Pixbuf res = widget.RenderIcon (name, size, null); - if ((res != null)) { - return res; - } else { - int sz; - int sy; - global::Gtk.Icon.SizeLookup (size, out sz, out sy); - try { - return Gtk.IconTheme.Default.LoadIcon (name, sz, 0); - } catch (System.Exception) { - if ((name != "gtk-missing-image")) { - return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size); - } else { - Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz); - Gdk.GC gc = new Gdk.GC (pmap); - gc.RgbFgColor = new Gdk.Color (255, 255, 255); - pmap.DrawRectangle (gc, true, 0, 0, sz, sz); - gc.RgbFgColor = new Gdk.Color (0, 0, 0); - pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1)); - gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round); - gc.RgbFgColor = new Gdk.Color (255, 0, 0); - pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4))); - pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4))); - return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz); - } - } - } - } - } - internal class BinContainer { private Gtk.Widget child; diff --git a/main/src/addins/ChangeLogAddIn/gtk-gui/gui.stetic b/main/src/addins/ChangeLogAddIn/gtk-gui/gui.stetic index cc2a22e669..16bc54996d 100644 --- a/main/src/addins/ChangeLogAddIn/gtk-gui/gui.stetic +++ b/main/src/addins/ChangeLogAddIn/gtk-gui/gui.stetic @@ -8,6 +8,8 @@ <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" /> <widget-library name="../../../../build/AddIns/VersionControl/MonoDevelop.VersionControl.dll" /> <widget-library name="../../../../build/bin/Mono.TextEditor.dll" /> + <widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" /> + <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" /> <widget-library name="../../../../build/AddIns/ChangeLogAddIn/ChangeLogAddIn.dll" internal="true" /> </import> <widget class="Gtk.Dialog" id="MonoDevelop.ChangeLogAddIn.AddLogEntryDialog" design-size="573 510"> @@ -125,9 +127,10 @@ <property name="Visible">False</property> <property name="Spacing">6</property> <child> - <widget class="Gtk.Image" id="image36"> + <widget class="MonoDevelop.Components.ImageView" id="image36"> <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-new SmallToolbar</property> + <property name="IconId">gtk-new</property> + <property name="IconSize">SmallToolbar</property> </widget> <packing> <property name="Position">0</property> @@ -165,9 +168,10 @@ <property name="Visible">False</property> <property name="Spacing">6</property> <child> - <widget class="Gtk.Image" id="image37"> + <widget class="MonoDevelop.Components.ImageView" id="image37"> <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-dialog-warning SmallToolbar</property> + <property name="IconId">gtk-dialog-warning</property> + <property name="IconSize">SmallToolbar</property> </widget> <packing> <property name="Position">0</property> @@ -209,9 +213,10 @@ <property name="MemberName" /> <property name="Spacing">6</property> <child> - <widget class="Gtk.Image" id="image38"> + <widget class="MonoDevelop.Components.ImageView" id="image38"> <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-dialog-info SmallToolbar</property> + <property name="IconId">gtk-dialog-info</property> + <property name="IconSize">SmallToolbar</property> </widget> <packing> <property name="Position">0</property> diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs index ccef59d072..d6e22cf712 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs @@ -50,7 +50,7 @@ namespace MonoDevelop.Deployment.Targets } public override string Icon { - get { return "gtk-execute"; } + get { return MonoDevelop.Ide.Gui.Stock.RunProgramIcon; } } [ItemProperty] diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml index 0624552011..29ec2ffc16 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml @@ -4,7 +4,6 @@ <Category _name = "Deployment" id = "Deployment"> <Command id = "MonoDevelop.Deployment.Commands.CreatePackage" defaultHandler = "MonoDevelop.Deployment.CreatePackageHandler" - icon = "md-package" _label = "Create Package..." /> <Command id = "MonoDevelop.Deployment.Commands.AddPackage" defaultHandler = "MonoDevelop.Deployment.AddPackageHandler" diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj index 17b6100c69..5369de6b67 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj @@ -203,18 +203,72 @@ <EmbeddedResource Include="icons\package-16%402x.png"> <LogicalName>package-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\package-16~dark.png"> + <LogicalName>package-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-16~dark%402x.png"> + <LogicalName>package-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-16~sel.png"> + <LogicalName>package-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-16~sel%402x.png"> + <LogicalName>package-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-16~dark~sel.png"> + <LogicalName>package-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-16~dark~sel%402x.png"> + <LogicalName>package-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\package-32.png"> <LogicalName>package-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\package-32%402x.png"> <LogicalName>package-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\package-32~dark.png"> + <LogicalName>package-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-32~dark%402x.png"> + <LogicalName>package-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-32~sel.png"> + <LogicalName>package-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-32~sel%402x.png"> + <LogicalName>package-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-32~dark~sel.png"> + <LogicalName>package-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-32~dark~sel%402x.png"> + <LogicalName>package-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\package-48.png"> <LogicalName>package-48.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\package-48%402x.png"> <LogicalName>package-48@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~dark.png"> + <LogicalName>package-48~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~dark%402x.png"> + <LogicalName>package-48~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~sel.png"> + <LogicalName>package-48~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~sel%402x.png"> + <LogicalName>package-48~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~dark~sel.png"> + <LogicalName>package-48~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~dark~sel%402x.png"> + <LogicalName>package-48~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="gtk-gui\gui.stetic"> <LogicalName>gui.stetic</LogicalName> </EmbeddedResource> @@ -230,6 +284,12 @@ <EmbeddedResource Include="templates\images\packaging-project%402x.png"> <LogicalName>packaging-project@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="templates\images\packaging-project~dark.png"> + <LogicalName>packaging-project~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\packaging-project~dark%402x.png"> + <LogicalName>packaging-project~dark@2x.png</LogicalName> + </EmbeddedResource> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.FileReplaceDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.FileReplaceDialog.cs index 2ef71e78f3..4064b84ff4 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.FileReplaceDialog.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.FileReplaceDialog.cs @@ -5,44 +5,81 @@ namespace MonoDevelop.Deployment public partial class FileReplaceDialog { private global::Gtk.HBox hbox1; + private global::Gtk.Label label7; - private global::Gtk.Image image1; + + private global::MonoDevelop.Components.ImageView image1; + private global::Gtk.Label label5; + private global::Gtk.Label label6; + private global::Gtk.Label label2; + private global::Gtk.HBox hbox2; + private global::Gtk.Label label8; + private global::Gtk.VBox vbox4; + private global::Gtk.HBox hbox3; + private global::Gtk.RadioButton radioReplace; + private global::Gtk.VBox vbox5; + private global::Gtk.Label replaceLabel; + private global::Gtk.HBox hbox6; + private global::Gtk.Label label25; + private global::Gtk.Label sourceName; + private global::Gtk.HBox hbox7; + private global::Gtk.Label label26; + private global::Gtk.Label sourceModified; + private global::Gtk.HBox hbox4; + private global::Gtk.RadioButton radioKeep; + private global::Gtk.VBox vbox6; + private global::Gtk.Label keepLabel; + private global::Gtk.HBox hbox8; + private global::Gtk.Label label27; + private global::Gtk.Label targetName; + private global::Gtk.HBox hbox9; + private global::Gtk.Label label28; + private global::Gtk.Label targetModified; + private global::Gtk.HBox hbox5; + private global::Gtk.RadioButton radioNewest; + private global::Gtk.VBox vbox7; + private global::Gtk.Label newestLabel; + private global::Gtk.Label label20; + private global::Gtk.CheckButton applyAll; + private global::Gtk.Label label11; + private global::Gtk.Button cancelButton; - private global::Gtk.Button okButton; + private global::Gtk.Button okButton; + protected virtual void Build () { global::Stetic.Gui.Initialize (this); @@ -70,9 +107,10 @@ namespace MonoDevelop.Deployment global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label7])); w2.Position = 0; // Container child hbox1.Gtk.Box+BoxChild - this.image1 = new global::Gtk.Image (); + this.image1 = new global::MonoDevelop.Components.ImageView (); this.image1.Name = "image1"; - this.image1.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-warning", global::Gtk.IconSize.Dialog); + this.image1.IconId = "gtk-dialog-warning"; + this.image1.IconSize = ((global::Gtk.IconSize)(6)); this.hbox1.Add (this.image1); global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.image1])); w3.Position = 1; @@ -390,26 +428,11 @@ namespace MonoDevelop.Deployment this.cancelButton.CanFocus = true; this.cancelButton.Name = "cancelButton"; this.cancelButton.UseUnderline = true; - // Container child cancelButton.Gtk.Container+ContainerChild - global::Gtk.Alignment w39 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); - // Container child GtkAlignment.Gtk.Container+ContainerChild - global::Gtk.HBox w40 = new global::Gtk.HBox (); - w40.Spacing = 2; - // Container child GtkHBox.Gtk.Container+ContainerChild - global::Gtk.Image w41 = new global::Gtk.Image (); - w41.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-cancel", global::Gtk.IconSize.Button); - w40.Add (w41); - // Container child GtkHBox.Gtk.Container+ContainerChild - global::Gtk.Label w43 = new global::Gtk.Label (); - w43.LabelProp = global::Mono.Unix.Catalog.GetString ("_Cancel deployment"); - w43.UseUnderline = true; - w40.Add (w43); - w39.Add (w40); - this.cancelButton.Add (w39); + this.cancelButton.Label = global::Mono.Unix.Catalog.GetString ("_Cancel deployment"); this.AddActionWidget (this.cancelButton, -6); - global::Gtk.ButtonBox.ButtonBoxChild w47 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w38 [this.cancelButton])); - w47.Expand = false; - w47.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w39 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w38 [this.cancelButton])); + w39.Expand = false; + w39.Fill = false; // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild this.okButton = new global::Gtk.Button (); this.okButton.CanDefault = true; @@ -419,10 +442,10 @@ namespace MonoDevelop.Deployment this.okButton.UseUnderline = true; this.okButton.Label = "gtk-ok"; this.AddActionWidget (this.okButton, -5); - global::Gtk.ButtonBox.ButtonBoxChild w48 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w38 [this.okButton])); - w48.Position = 1; - w48.Expand = false; - w48.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w40 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w38 [this.okButton])); + w40.Position = 1; + w40.Expand = false; + w40.Fill = false; if ((this.Child != null)) { this.Child.ShowAll (); } diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs index 504f5d72d3..29affc7b0e 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/MonoDevelop.Deployment.Gui.DeployDialog.cs @@ -5,57 +5,109 @@ namespace MonoDevelop.Deployment.Gui internal partial class DeployDialog { private global::Gtk.HBox hbox1; + private global::Gtk.VBox vbox2; - private global::Gtk.Image image2; + + private global::MonoDevelop.Components.ImageView image2; + private global::Gtk.Notebook notebook; + private global::Gtk.VBox vbox3; + private global::Gtk.Label labelTitle; + private global::Gtk.HSeparator hseparator2; + private global::Gtk.Label label1; + private global::Gtk.ScrolledWindow scrolledwindow2; + private global::Gtk.TreeView targetsTree; + private global::Gtk.Label label2; + private global::Gtk.VBox pageSelectProject; + private global::Gtk.Label labelTitle1; + private global::Gtk.HSeparator hseparator4; + private global::Gtk.Label label4; + private global::MonoDevelop.Deployment.Gui.EntrySelectionTree entryTree; + private global::Gtk.Label label3; + private global::Gtk.VBox vbox4; + private global::Gtk.Label label5; + private global::Gtk.HSeparator hseparator3; + private global::Gtk.EventBox editorBox; + private global::Gtk.HSeparator saveSeparator; + private global::Gtk.HBox hbox2; + private global::Gtk.CheckButton checkSave; + private global::Gtk.Label label6; + private global::Gtk.VBox pageSave; + private global::Gtk.Label label7; + private global::Gtk.HSeparator hseparator5; + private global::Gtk.VBox vbox7; + private global::Gtk.Label label14; + private global::Gtk.HBox hbox4; + private global::Gtk.Label label13; + private global::Gtk.Entry entrySaveName; + private global::Gtk.VBox vboxSaveProject; + private global::Gtk.HSeparator hseparator6; + private global::Gtk.Label label15; + private global::Gtk.RadioButton radioCreateProject; + private global::Gtk.HBox hbox5; + private global::Gtk.Label label9; + private global::Gtk.Table tableNewProject; + private global::Gtk.ComboBox comboCreateProject; + private global::Gtk.Entry entryProjectName; + private global::Gtk.Label label11; + private global::Gtk.Label label16; + private global::Gtk.RadioButton radioAddProject; + private global::Gtk.HBox boxAddProject; + private global::Gtk.Label label10; + private global::Gtk.Label label12; + private global::Gtk.ComboBox comboSelProject; + private global::Gtk.Label label8; + private global::Gtk.Button buttonCancel; + private global::Gtk.Button buttonBack; + private global::Gtk.Button buttonNext; protected virtual void Build () @@ -80,9 +132,10 @@ namespace MonoDevelop.Deployment.Gui this.vbox2 = new global::Gtk.VBox (); this.vbox2.Name = "vbox2"; // Container child vbox2.Gtk.Box+BoxChild - this.image2 = new global::Gtk.Image (); + this.image2 = new global::MonoDevelop.Components.ImageView (); this.image2.Name = "image2"; - this.image2.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("package-48.png"); + this.image2.IconId = "md-package"; + this.image2.IconSize = ((global::Gtk.IconSize)(6)); this.vbox2.Add (this.image2); global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.image2])); w2.Position = 0; diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/generated.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/generated.cs index 5cdc11900b..3285e87c05 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/generated.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/generated.cs @@ -67,40 +67,6 @@ namespace Stetic } } - internal class IconLoader - { - public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size) - { - Gdk.Pixbuf res = widget.RenderIcon (name, size, null); - if ((res != null)) { - return res; - } else { - int sz; - int sy; - global::Gtk.Icon.SizeLookup (size, out sz, out sy); - try { - return Gtk.IconTheme.Default.LoadIcon (name, sz, 0); - } catch (System.Exception) { - if ((name != "gtk-missing-image")) { - return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size); - } else { - Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz); - Gdk.GC gc = new Gdk.GC (pmap); - gc.RgbFgColor = new Gdk.Color (255, 255, 255); - pmap.DrawRectangle (gc, true, 0, 0, sz, sz); - gc.RgbFgColor = new Gdk.Color (0, 0, 0); - pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1)); - gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round); - gc.RgbFgColor = new Gdk.Color (255, 0, 0); - pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4))); - pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4))); - return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz); - } - } - } - } - } - internal class ActionGroups { public static Gtk.ActionGroup GetActionGroup (System.Type type) diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/gui.stetic b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/gui.stetic index 7d5838219c..76b23ed078 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/gui.stetic +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/gtk-gui/gui.stetic @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <stetic-interface> <configuration> <images-root-path>..</images-root-path> @@ -237,9 +237,10 @@ <widget class="Gtk.VBox" id="vbox2"> <property name="MemberName" /> <child> - <widget class="Gtk.Image" id="image2"> + <widget class="MonoDevelop.Components.ImageView" id="image2"> <property name="MemberName" /> - <property name="Pixbuf">resource:package-48.png</property> + <property name="IconId">md-package</property> + <property name="IconSize">Dialog</property> </widget> <packing> <property name="Position">0</property> @@ -1849,9 +1850,10 @@ </packing> </child> <child> - <widget class="Gtk.Image" id="image1"> + <widget class="MonoDevelop.Components.ImageView" id="image1"> <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-dialog-warning Dialog</property> + <property name="IconId">gtk-dialog-warning</property> + <property name="IconSize">Dialog</property> </widget> <packing> <property name="Position">1</property> @@ -2274,8 +2276,7 @@ <widget class="Gtk.Button" id="cancelButton"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-cancel Button</property> + <property name="Type">TextOnly</property> <property name="Label" translatable="yes">_Cancel deployment</property> <property name="UseUnderline">True</property> <property name="ResponseId">-6</property> @@ -2467,4 +2468,4 @@ </widget> </child> </widget> -</stetic-interface> +</stetic-interface>
\ No newline at end of file diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16.png Binary files differindex be53353283..8519a6420d 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16.png +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16@2x.png Binary files differindex 6f21d7aa77..9708a1eded 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16@2x.png +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16@2x.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark.png Binary files differnew file mode 100644 index 0000000000..25d4814e13 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6b099dbfbc --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark@2x.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark~sel.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..9eeaade789 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark~sel.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark~sel@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e58ff00899 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~dark~sel@2x.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~sel.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~sel.png Binary files differnew file mode 100644 index 0000000000..9eeaade789 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~sel.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~sel@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e58ff00899 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-16~sel@2x.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32.png Binary files differindex 6f21d7aa77..9708a1eded 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32.png +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32@2x.png Binary files differindex 8b687efa3d..56b0c40ada 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32@2x.png +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32@2x.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark.png Binary files differnew file mode 100644 index 0000000000..6b099dbfbc --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..70b6d95f29 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark@2x.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark~sel.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..e58ff00899 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark~sel.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark~sel@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..ddb889f387 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~dark~sel@2x.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~sel.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~sel.png Binary files differnew file mode 100644 index 0000000000..e58ff00899 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~sel.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~sel@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..ddb889f387 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-32~sel@2x.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48.png Binary files differindex 81a5324fce..6dbcbea034 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48.png +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48@2x.png Binary files differindex 3862bac535..0484944163 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48@2x.png +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48@2x.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark.png Binary files differnew file mode 100644 index 0000000000..2fb74b25c1 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark@2x.png Binary files differnew file mode 100644 index 0000000000..07520b847c --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark@2x.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark~sel.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark~sel.png Binary files differnew file mode 100644 index 0000000000..7fec138598 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark~sel.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark~sel@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e134ffbf43 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~dark~sel@2x.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~sel.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~sel.png Binary files differnew file mode 100644 index 0000000000..7fec138598 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~sel.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~sel@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e134ffbf43 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/icons/package-48~sel@2x.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project.png Binary files differindex 976dbfb101..a8e3546967 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project.png +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project@2x.png Binary files differindex d30d817102..9750e76184 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project@2x.png +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project@2x.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project~dark.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project~dark.png Binary files differnew file mode 100644 index 0000000000..7083d65998 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project~dark.png diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project~dark@2x.png b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2205268213 --- /dev/null +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/templates/images/packaging-project~dark@2x.png diff --git a/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs index 6dae47989f..51cbec79bf 100644 --- a/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs +++ b/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs @@ -46,6 +46,7 @@ namespace MonoDevelop.MacIntegration { using (var alert = new NSAlert ()) { alert.Window.Title = data.Title ?? BrandingService.ApplicationName; + IdeTheme.ApplyTheme (alert.Window); bool stockIcon; if (data.Message.Icon == MonoDevelop.Ide.Gui.Stock.Error || data.Message.Icon == Gtk.Stock.DialogError) { @@ -61,7 +62,13 @@ namespace MonoDevelop.MacIntegration if (!stockIcon && !string.IsNullOrEmpty (data.Message.Icon)) { var img = ImageService.GetIcon (data.Message.Icon, Gtk.IconSize.Dialog); - alert.Icon = img.ToNSImage (); + // HACK: VK The icon is not rendered in dark style correctly + // Use light variant and reder it here + // as long as NSAppearance.NameVibrantDark is broken + if (IdeTheme.UserInterfaceSkin == Skin.Dark) + alert.Icon = img.WithStyles ("-dark").ToBitmap (GtkWorkarounds.GetScaleFactor ()).ToNSImage (); + else + alert.Icon = img.ToNSImage (); } else { //for some reason the NSAlert doesn't pick up the app icon by default alert.Icon = NSApplication.SharedApplication.ApplicationIconImage; @@ -149,7 +156,9 @@ namespace MonoDevelop.MacIntegration } if (!data.Message.CancellationToken.IsCancellationRequested) { + var result = (int)alert.RunModal () - (long)(int)NSAlertButtonReturn.First; + completed = true; if (result >= 0 && result < buttons.Count) { data.ResultButton = buttons [(int)result]; @@ -171,7 +180,9 @@ namespace MonoDevelop.MacIntegration if (applyToAllCheck != null && applyToAllCheck.State != 0) data.ApplyToAll = true; - + + + GtkQuartz.FocusWindow (data.TransientFor ?? MessageService.RootWindow); } diff --git a/main/src/addins/MacPlatform/Dialogs/MacExceptionDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacExceptionDialogHandler.cs index 44670fe2ed..11f655b918 100644 --- a/main/src/addins/MacPlatform/Dialogs/MacExceptionDialogHandler.cs +++ b/main/src/addins/MacPlatform/Dialogs/MacExceptionDialogHandler.cs @@ -36,6 +36,7 @@ using MonoDevelop.Core; using MonoDevelop.Ide; using MonoDevelop.Components.Extensions; using MonoDevelop.MacInterop; +using MonoDevelop.Components; namespace MonoDevelop.MacIntegration { @@ -75,6 +76,7 @@ namespace MonoDevelop.MacIntegration public bool Run (ExceptionDialogData data) { using (var alert = new NSAlert { AlertStyle = NSAlertStyle.Critical }) { + IdeTheme.ApplyTheme (alert.Window); alert.Icon = NSApplication.SharedApplication.ApplicationIconImage; alert.MessageText = data.Title ?? GettextCatalog.GetString ("Error"); diff --git a/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs index 1ca6cf5c6d..4f01020f21 100644 --- a/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs +++ b/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs @@ -34,6 +34,7 @@ using AppKit; using MonoDevelop.Components; using MonoDevelop.Core; using MonoDevelop.Ide; +using MonoDevelop.Components; using MonoDevelop.Ide.Extensions; using MonoDevelop.Ide.Gui; using MonoDevelop.MacInterop; @@ -56,7 +57,7 @@ namespace MonoDevelop.MacIntegration CanChooseFiles = (data.Action & FileChooserAction.FileFlags) != 0, }; } - + MacSelectFileDialogHandler.SetCommonPanelProperties (data, panel); SelectEncodingPopUpButton encodingSelector = null; diff --git a/main/src/addins/MacPlatform/ExtendedTitleBarDialogBackend.cs b/main/src/addins/MacPlatform/ExtendedTitleBarDialogBackend.cs index b65f0debb0..4781869e98 100644 --- a/main/src/addins/MacPlatform/ExtendedTitleBarDialogBackend.cs +++ b/main/src/addins/MacPlatform/ExtendedTitleBarDialogBackend.cs @@ -33,7 +33,7 @@ using Xwt.GtkBackend; namespace MonoDevelop.MacIntegration { - class ExtendedTitleBarDialogBackend: Xwt.GtkBackend.DialogBackend, IExtendedTitleBarDialogBackend + class ExtendedTitleBarDialogBackend: ThemedGtkDialogBackend, IExtendedTitleBarDialogBackend { CustomToolbar toolbar; @@ -44,7 +44,7 @@ namespace MonoDevelop.MacIntegration WidgetFlags |= Gtk.WidgetFlags.AppPaintable; } - public Cairo.ImageSurface Background { + public Gdk.Pixbuf Background { get; set; } @@ -67,10 +67,12 @@ namespace MonoDevelop.MacIntegration context.LineWidth = 1; if (Background != null && Background.Width > 0) { for (int x=0; x < Allocation.Width; x += Background.Width) { - Background.Show (context, x, -TitleBarHeight); + Gdk.CairoHelper.SetSourcePixbuf (context, Background, x, -TitleBarHeight); + context.Paint (); } } else { context.Rectangle (0, 0, Allocation.Width, Allocation.Height); + using (var lg = new Cairo.LinearGradient (0, 0, 0, Allocation.Height)) { lg.AddColorStop (0, Style.Light (Gtk.StateType.Normal).ToCairoColor ()); lg.AddColorStop (1, Style.Mid (Gtk.StateType.Normal).ToCairoColor ()); @@ -79,14 +81,10 @@ namespace MonoDevelop.MacIntegration context.Fill (); } - context.MoveTo (0, Allocation.Height - 0.5); - context.RelLineTo (Allocation.Width, 0); - context.SetSourceColor (MonoDevelop.Ide.Gui.Styles.ToolbarBottomBorderColor); - context.Stroke (); - context.MoveTo (0, Allocation.Height - 1.5); + context.MoveTo (0, Allocation.Height - 0.5); context.RelLineTo (Allocation.Width, 0); - context.SetSourceColor (MonoDevelop.Ide.Gui.Styles.ToolbarBottomGlowColor); + context.SetSourceColor (Ide.Gui.Styles.ToolbarBottomBorderColor.ToCairoColor ()); context.Stroke (); } @@ -102,18 +100,17 @@ namespace MonoDevelop.MacIntegration { base.Initialize (); - var resource = "maintoolbarbg.png"; + var image = Xwt.Drawing.Image.FromResource (typeof(MacPlatformService).Assembly, "maintoolbarbg.png"); Window.Realized += delegate { NSWindow w = GtkQuartz.GetWindow (Window); w.IsOpaque = false; - NSImage img = MacPlatformService.LoadImage (resource); - w.BackgroundColor = NSColor.FromPatternImage (img); + w.BackgroundColor = NSColor.FromPatternImage (image.ToBitmap().ToNSImage()); w.StyleMask |= NSWindowStyle.TexturedBackground; }; toolbar = new CustomToolbar (); - toolbar.Background = MonoDevelop.Components.CairoExtensions.LoadImage (typeof(MacPlatformService).Assembly, resource); + toolbar.Background = (Gdk.Pixbuf)Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk).GetNativeImage (image); toolbar.TitleBarHeight = MacPlatformService.GetTitleBarHeight (); MainBox.PackStart (toolbar, false, false, 0); ((Gtk.Box.BoxChild)MainBox [toolbar]).Position = 0; diff --git a/main/src/addins/MacPlatform/ExtendedTitleBarWindowBackend.cs b/main/src/addins/MacPlatform/ExtendedTitleBarWindowBackend.cs index d6dc9051d1..efa431d912 100644 --- a/main/src/addins/MacPlatform/ExtendedTitleBarWindowBackend.cs +++ b/main/src/addins/MacPlatform/ExtendedTitleBarWindowBackend.cs @@ -33,7 +33,7 @@ using Xwt.GtkBackend; namespace MonoDevelop.MacIntegration { - class ExtendedTitleBarWindowBackend: Xwt.GtkBackend.WindowBackend, IExtendedTitleBarWindowBackend + class ExtendedTitleBarWindowBackend: ThemedGtkWindowBackend, IExtendedTitleBarWindowBackend { CustomToolbar toolbar; @@ -44,7 +44,7 @@ namespace MonoDevelop.MacIntegration WidgetFlags |= Gtk.WidgetFlags.AppPaintable; } - public Cairo.ImageSurface Background { + public Gdk.Pixbuf Background { get; set; } @@ -67,10 +67,13 @@ namespace MonoDevelop.MacIntegration context.LineWidth = 1; if (Background != null && Background.Width > 0) { for (int x=0; x < Allocation.Width; x += Background.Width) { - Background.Show (context, x, -TitleBarHeight); + Gdk.CairoHelper.SetSourcePixbuf (context, Background, x, -TitleBarHeight); + context.Paint (); } } else { context.Rectangle (0, 0, Allocation.Width, Allocation.Height); + + // FIXME: VV: Remove gradient features using (var lg = new Cairo.LinearGradient (0, 0, 0, Allocation.Height)) { lg.AddColorStop (0, Style.Light (Gtk.StateType.Normal).ToCairoColor ()); lg.AddColorStop (1, Style.Mid (Gtk.StateType.Normal).ToCairoColor ()); @@ -79,14 +82,10 @@ namespace MonoDevelop.MacIntegration context.Fill (); } - context.MoveTo (0, Allocation.Height - 0.5); - context.RelLineTo (Allocation.Width, 0); - context.SetSourceColor (MonoDevelop.Ide.Gui.Styles.ToolbarBottomBorderColor); - context.Stroke (); - context.MoveTo (0, Allocation.Height - 1.5); + context.MoveTo (0, Allocation.Height - 0.5); context.RelLineTo (Allocation.Width, 0); - context.SetSourceColor (MonoDevelop.Ide.Gui.Styles.ToolbarBottomGlowColor); + context.SetSourceColor (Ide.Gui.Styles.ToolbarBottomBorderColor.ToCairoColor ()); context.Stroke (); } @@ -102,18 +101,17 @@ namespace MonoDevelop.MacIntegration { base.Initialize (); - var resource = "maintoolbarbg.png"; + var image = Xwt.Drawing.Image.FromResource (typeof(MacPlatformService).Assembly, "maintoolbarbg.png"); Window.Realized += delegate { NSWindow w = GtkQuartz.GetWindow (Window); w.IsOpaque = false; - NSImage img = MacPlatformService.LoadImage (resource); - w.BackgroundColor = NSColor.FromPatternImage (img); + w.BackgroundColor = NSColor.FromPatternImage (image.ToBitmap().ToNSImage()); w.StyleMask |= NSWindowStyle.TexturedBackground; }; toolbar = new CustomToolbar (); - toolbar.Background = MonoDevelop.Components.CairoExtensions.LoadImage (typeof(MacPlatformService).Assembly, resource); + toolbar.Background = (Gdk.Pixbuf)Xwt.Toolkit.Load (Xwt.ToolkitType.Gtk).GetNativeImage (image); toolbar.TitleBarHeight = MacPlatformService.GetTitleBarHeight (); MainBox.PackStart (toolbar, false, false, 0); ((Gtk.Box.BoxChild)MainBox [toolbar]).Position = 0; diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs index 1cf4ed3cdf..d5b8b2584d 100644 --- a/main/src/addins/MacPlatform/MacPlatform.cs +++ b/main/src/addins/MacPlatform/MacPlatform.cs @@ -278,47 +278,54 @@ namespace MonoDevelop.MacIntegration } PatchGtkTheme (); + NSNotificationCenter.DefaultCenter.AddObserver (NSCell.ControlTintChangedNotification, notif => Runtime.RunInMainThread ( + delegate { + Styles.LoadStyle(); + PatchGtkTheme(); + })); + + // FIXME: Immediate theme switching disabled, until NSAppearance issues are fixed + //IdeApp.Preferences.UserInterfaceTheme.Changed += (s,a) => PatchGtkTheme (); } + // VV/VK: Disable tint based color generation // This will dynamically generate a gtkrc for certain widgets using system control colors. void PatchGtkTheme () { - string color_hex, text_hex; - - if (MonoDevelop.Core.Platform.OSVersion >= MonoDevelop.Core.MacSystemInformation.Yosemite) { - NSControlTint tint = NSColor.CurrentControlTint; - NSColor text = NSColor.SelectedMenuItemText.UsingColorSpace (NSColorSpace.GenericRGBColorSpace); - NSColor color = tint == NSControlTint.Blue ? NSColor.SelectedMenuItem.UsingColorSpace (NSColorSpace.GenericRGBColorSpace) : NSColor.SelectedMenuItem.UsingColorSpace (NSColorSpace.DeviceWhite); - - color_hex = ConvertColorToHex (color); - text_hex = ConvertColorToHex (text); - } else { - color_hex = "#c5d4e0"; - text_hex = "#000"; - } - - string gtkrc = String.Format (@" - style ""treeview"" = ""default"" {{ - GtkTreeView::odd-row-color = ""#f5f5f5"" - - base[SELECTED] = ""{0}"" - base[ACTIVE] = ""{0}"" - text[SELECTED] = ""{1}"" - text[ACTIVE] = ""{1}"" - engine ""xamarin"" {{ - roundness = 0 - gradient_shades = {{ 1.0, 0.95, 0.95, 0.90 }} - glazestyle = 1 - }} - }} - - widget_class ""*.<GtkTreeView>*"" style ""treeview"" - ", - color_hex, - text_hex - ); - - Gtk.Rc.ParseString (gtkrc); +// string color_hex, text_hex; +// +// if (MonoDevelop.Core.Platform.OSVersion >= MonoDevelop.Core.MacSystemInformation.Yosemite) { +// NSControlTint tint = NSColor.CurrentControlTint; +// NSColor text = NSColor.SelectedMenuItemText.UsingColorSpace (NSColorSpace.GenericRGBColorSpace); +// NSColor color = tint == NSControlTint.Blue ? NSColor.SelectedMenuItem.UsingColorSpace (NSColorSpace.GenericRGBColorSpace) : NSColor.SelectedMenuItem.UsingColorSpace (NSColorSpace.DeviceWhite); +// +// color_hex = ConvertColorToHex (color); +// text_hex = ConvertColorToHex (text); +// } else { +// color_hex = "#c5d4e0"; +// text_hex = "#000"; +// } +// +// string gtkrc = String.Format (@" +// style ""treeview"" = ""default"" {{ +// base[SELECTED] = ""{0}"" +// base[ACTIVE] = ""{0}"" +// text[SELECTED] = ""{1}"" +// text[ACTIVE] = ""{1}"" +// engine ""xamarin"" {{ +// roundness = 0 +// gradient_shades = {{ 1.01, 1.01, 1.01, 1.01 }} +// glazestyle = 1 +// }} +// }} +// +// widget_class ""*.<GtkTreeView>*"" style ""treeview"" +// ", +// color_hex, +// text_hex +// ); +// +// Gtk.Rc.ParseString (gtkrc); } void GlobalSetup () @@ -729,6 +736,7 @@ namespace MonoDevelop.MacIntegration NSWindow w = GtkQuartz.GetWindow (window); w.IsOpaque = true; w.StyleMask |= NSWindowStyle.UnifiedTitleAndToolbar; + IdeTheme.ApplyTheme (w); } internal override void RemoveWindowShadow (Gtk.Window window) diff --git a/main/src/addins/MacPlatform/MacPlatform.csproj b/main/src/addins/MacPlatform/MacPlatform.csproj index ae2cad6d4f..22b3b14d1a 100644 --- a/main/src/addins/MacPlatform/MacPlatform.csproj +++ b/main/src/addins/MacPlatform/MacPlatform.csproj @@ -138,6 +138,8 @@ <Compile Include="MainToolbar\VerticallyCenteredTextFieldCell.cs" /> <Compile Include="MainToolbar\AwesomeBar.cs" /> <Compile Include="MainToolbar\ButtonBarContainer.cs" /> + <Compile Include="MainToolbar\Styles.cs" /> + <Compile Include="MainToolbar\MultiResImage.cs" /> </ItemGroup> <ItemGroup> <None Include="Makefile.am" /> @@ -156,30 +158,66 @@ <EmbeddedResource Include="icons\build%402x.png"> <LogicalName>build@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\build~dark.png"> + <LogicalName>build~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\build~dark%402x.png"> + <LogicalName>build~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\continue.png"> <LogicalName>continue.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\continue%402x.png"> <LogicalName>continue@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\continue~dark.png"> + <LogicalName>continue~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\continue~dark%402x.png"> + <LogicalName>continue~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\device.png"> <LogicalName>device.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\device%402x.png"> <LogicalName>device@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\device~dark.png"> + <LogicalName>device~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\device~dark%402x.png"> + <LogicalName>device~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\project.png"> <LogicalName>project.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\project%402x.png"> <LogicalName>project@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\project~dark.png"> + <LogicalName>project~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project~dark%402x.png"> + <LogicalName>project~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\stop.png"> <LogicalName>stop.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\stop%402x.png"> <LogicalName>stop@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\stop~dark.png"> + <LogicalName>stop~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\stop~dark%402x.png"> + <LogicalName>stop~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="maintoolbarbg~dark.png"> + <LogicalName>maintoolbarbg~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="maintoolbarbg~dark%402x.png"> + <LogicalName>maintoolbarbg~dark@2x.png</LogicalName> + </EmbeddedResource> </ItemGroup> <ItemGroup> <Folder Include="Dialogs\" /> diff --git a/main/src/addins/MacPlatform/MainToolbar/AwesomeBar.cs b/main/src/addins/MacPlatform/MainToolbar/AwesomeBar.cs index 98841d3458..ec335ae567 100644 --- a/main/src/addins/MacPlatform/MainToolbar/AwesomeBar.cs +++ b/main/src/addins/MacPlatform/MainToolbar/AwesomeBar.cs @@ -24,10 +24,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; + using AppKit; -using Foundation; using CoreGraphics; +using Foundation; +using MonoDevelop.Core; + using MonoDevelop.Core; +using MonoDevelop.Ide; namespace MonoDevelop.MacIntegration.MainToolbar { @@ -57,6 +61,8 @@ namespace MonoDevelop.MacIntegration.MainToolbar SearchBar = new SearchBar (); AddSubview (SearchBar); + + Ide.Gui.Styles.Changed += (o, e) => UpdateLayout (); } const float toolbarPadding = 8.0f; @@ -65,12 +71,16 @@ namespace MonoDevelop.MacIntegration.MainToolbar const float maxStatusBarWidth = 700.0f; const float minStatusBarWidth = 220.0f; const float runButtonWidth = 38.0f; - public const float ToolbarWidgetHeight = 25.0f; + public static float ToolbarWidgetHeight { + get { + return MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 24.0f : 22.0f; + } + } void UpdateLayout () { RunButton.Frame = new CGRect (toolbarPadding, 0, runButtonWidth, ToolbarWidgetHeight); - var statusbarWidth = Math.Max (Math.Min (Frame.Width * 0.3, maxStatusBarWidth), minStatusBarWidth); + var statusbarWidth = Math.Max (Math.Min (Math.Round ( Frame.Width * 0.3), maxStatusBarWidth), minStatusBarWidth); var searchbarWidth = maxSearchBarWidth; if (statusbarWidth < searchbarWidth) { searchbarWidth = minSearchBarWidth; @@ -79,14 +89,31 @@ namespace MonoDevelop.MacIntegration.MainToolbar // We only need to work out the width on the left side of the window because the statusbar is centred // Gap + RunButton.Width + Gap + ButtonBar.Width + Gap + Half of StatusBar.Width var spaceLeft = (Frame.Width / 2) - (toolbarPadding + runButtonWidth + toolbarPadding + ButtonBarContainer.Frame.Width + toolbarPadding + (statusbarWidth / 2)); - StatusBar.Frame = new CGRect ((Frame.Width - statusbarWidth) / 2, 0, statusbarWidth, ToolbarWidgetHeight); - SearchBar.Frame = new CGRect (Frame.Width - searchbarWidth - 10, 0, searchbarWidth, ToolbarWidgetHeight); - var selectorSize = SelectorView.SizeThatFits (new CGSize (spaceLeft, ToolbarWidgetHeight)); + StatusBar.Frame = new CGRect (Math.Round((Frame.Width - statusbarWidth) / 2), 0, statusbarWidth - 2, ToolbarWidgetHeight); + + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) { + SearchBar.Frame = new CGRect (Frame.Width - searchbarWidth - 10, 0, searchbarWidth, ToolbarWidgetHeight); + } else { + nfloat elcapYOffset = 0; + nfloat elcapHOffset = 0; + + if (MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan) { + nfloat scaleFactor = 1; + + if (Window != null && Window.Screen != null) { + scaleFactor = Window.Screen.BackingScaleFactor; + } + elcapYOffset = scaleFactor == 2 ? -0.5f : -1; + elcapHOffset = 1.0f; + } + SearchBar.Frame = new CGRect (Frame.Width - searchbarWidth - 10, 0 + elcapYOffset, searchbarWidth, ToolbarWidgetHeight + elcapHOffset); + } - SelectorView.Frame = new CGRect (toolbarPadding + runButtonWidth + toolbarPadding, 0, selectorSize.Width, ToolbarWidgetHeight); + var selectorSize = SelectorView.SizeThatFits (new CGSize (spaceLeft, ToolbarWidgetHeight)); - ButtonBarContainer.SetFrameOrigin (new CGPoint(SelectorView.Frame.GetMaxX () + toolbarPadding, 0)); + SelectorView.Frame = new CGRect (toolbarPadding + runButtonWidth + toolbarPadding, 0, Math.Round (selectorSize.Width), ToolbarWidgetHeight); + ButtonBarContainer.SetFrameOrigin (new CGPoint(SelectorView.Frame.GetMaxX () + toolbarPadding, -2)); // Finally check if the StatusBar overlaps the ButtonBarContainer (and its padding) and adjust is accordingly if (StatusBar.Frame.IntersectsWith (ButtonBarContainer.Frame.Inset (-toolbarPadding, 0))) { diff --git a/main/src/addins/MacPlatform/MainToolbar/ButtonBar.cs b/main/src/addins/MacPlatform/MainToolbar/ButtonBar.cs index 9b05f2b679..5c9766f166 100644 --- a/main/src/addins/MacPlatform/MainToolbar/ButtonBar.cs +++ b/main/src/addins/MacPlatform/MainToolbar/ButtonBar.cs @@ -27,23 +27,67 @@ using System; using System.Collections.Generic; using System.Linq; using AppKit; +using CoreGraphics; using Foundation; using MonoDevelop.Components; using MonoDevelop.Components.Commands; +using MonoDevelop.Components.Mac; using MonoDevelop.Components.MainToolbar; using MonoDevelop.Core; using MonoDevelop.Ide; -namespace MonoDevelop.MacIntegration +namespace MonoDevelop.MacIntegration.MainToolbar { [Register] class ButtonBar : NSSegmentedControl { + class DarkSkinSegmentedCell : NSSegmentedCell + { + public override void DrawWithFrame (CGRect cellFrame, NSView inView) + { + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) { + var inset = cellFrame.Inset (0.25f, 0.25f); + inset = new CGRect (inset.X, inset.Y + 2, inset.Width, inset.Height - 2); + + var path = NSBezierPath.FromRoundedRect (inset, 3, 3); + path.LineWidth = 0.5f; + Styles.DarkBorderColor.ToNSColor ().SetStroke (); + path.Stroke (); + + inset = new CGRect (inset.X + 3, inset.Y, inset.Width, inset.Height); + DrawInteriorWithFrame (inset, inView); + + path = new NSBezierPath (); + + // Draw the separators + for (int segment = 1; segment < SegmentCount; segment++) { + nfloat x = inset.X + (33 * segment); + path.MoveTo (new CGPoint (x, 0)); + path.LineTo (new CGPoint (x, inset.Y + inset.Height)); + } + path.LineWidth = 0.5f; + path.Stroke (); + } else { + base.DrawWithFrame (cellFrame, inView); + } + } + + public override void DrawSegment (nint segment, CGRect frame, NSView controlView) + { + var img = base.GetImageForSegment (segment); + var rect = new CGRect (Math.Round (frame.X + ((frame.Width / 2) - (img.Size.Width / 2))), Math.Round (frame.Y + ((frame.Height / 2) - (img.Size.Height / 2))), img.Size.Width, img.Size.Height); + + img.Draw (rect); + } + } + readonly Dictionary<IButtonBarButton, int> indexMap = new Dictionary<IButtonBarButton, int> (); readonly IReadOnlyList<IButtonBarButton> buttons; public ButtonBar (IEnumerable<IButtonBarButton> buttons) { + Cell = new DarkSkinSegmentedCell (); + this.buttons = buttons.ToList (); foreach (var button in buttons) { @@ -51,12 +95,13 @@ namespace MonoDevelop.MacIntegration button.ImageChanged += (o, e) => { if (!indexMap.ContainsKey (_button)) return; - SetImage (ImageService.GetIcon (_button.Image, Gtk.IconSize.Menu).ToNSImage (), indexMap [_button]); + LoadIcon (_button); SetNeedsDisplay (); }; button.EnabledChanged += (o, e) => { if (!indexMap.ContainsKey (_button)) return; + LoadIcon (_button); SetEnabled (_button.Enabled, indexMap [_button]); SetNeedsDisplay (); }; @@ -74,6 +119,18 @@ namespace MonoDevelop.MacIntegration Cell.TrackingMode = NSSegmentSwitchTracking.Momentary; } + void LoadIcon (IButtonBarButton button) + { + if (!indexMap.ContainsKey (button)) + return; + NSImage img; + if (button.Enabled) + img = ImageService.GetIcon (button.Image, Gtk.IconSize.Menu).ToNSImage (); + else + img = ImageService.GetIcon (button.Image, Gtk.IconSize.Menu).WithStyles ("disabled").ToNSImage (); + SetImage (img, indexMap [button]); + } + public override nint SegmentCount { get { return base.SegmentCount; } set { @@ -109,17 +166,12 @@ namespace MonoDevelop.MacIntegration void UpdateButton (IButtonBarButton button, int idx) { - var img = ImageService.GetIcon (button.Image, Gtk.IconSize.Menu); - if (img.ToNSImage () != GetImage (idx)) { - SetImage (ImageService.GetIcon (button.Image, Gtk.IconSize.Menu).ToNSImage (), idx); - SetNeedsDisplay (); - } - if (button.Enabled != IsEnabled (idx)) { + LoadIcon (button); + if (button.Enabled != IsEnabled (idx)) SetEnabled (button.Enabled, idx); - SetNeedsDisplay (); - } if (button.Tooltip != Cell.GetToolTip (idx)) Cell.SetToolTip (button.Tooltip, idx); + SetNeedsDisplay (); } public event EventHandler ResizeRequested; diff --git a/main/src/addins/MacPlatform/MainToolbar/ButtonBarContainer.cs b/main/src/addins/MacPlatform/MainToolbar/ButtonBarContainer.cs index 87eaabfd1b..c26018205f 100644 --- a/main/src/addins/MacPlatform/MainToolbar/ButtonBarContainer.cs +++ b/main/src/addins/MacPlatform/MainToolbar/ButtonBarContainer.cs @@ -27,6 +27,7 @@ using System; using System.Collections.Generic; using AppKit; using CoreGraphics; +using MonoDevelop.Ide; namespace MonoDevelop.MacIntegration.MainToolbar { @@ -60,6 +61,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar public ButtonBarContainer () { + Ide.Gui.Styles.Changed += (o, e) => LayoutButtonBars (); } const float segmentWidth = 33.0f; @@ -74,15 +76,25 @@ namespace MonoDevelop.MacIntegration.MainToolbar void LayoutButtonBars () { nfloat nextX = 0; + nfloat y = 0; + nfloat height = AwesomeBar.ToolbarWidgetHeight; + + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) { + y = 2; + height += 2; + } else { + height += 5; + y = -1; + } foreach (ButtonBar bar in buttonBars) { - var frame = new CGRect (nextX, 0, extraPadding + (bar.SegmentCount * segmentWidth), AwesomeBar.ToolbarWidgetHeight); + var frame = new CGRect (nextX, y, extraPadding + (bar.SegmentCount * segmentWidth), height); bar.Frame = frame; nextX = frame.GetMaxX () + buttonBarSpacing; } - SetFrameSize (new CGSize (nextX - buttonBarSpacing, AwesomeBar.ToolbarWidgetHeight)); + SetFrameSize (new CGSize (nextX - buttonBarSpacing, height)); if (SizeChanged != null) { SizeChanged (this, EventArgs.Empty); diff --git a/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs b/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs index 87c593a59e..aae9807ebc 100644 --- a/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs +++ b/main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs @@ -122,8 +122,8 @@ namespace MonoDevelop.MacIntegration.MainToolbar case AwesomeBarId: return new NSToolbarItem (AwesomeBarId) { View = awesomeBar, - MinSize = new CGSize (1024, 25), - MaxSize = new CGSize (1024, 25) + MinSize = new CGSize (1024, AwesomeBar.ToolbarWidgetHeight), + MaxSize = new CGSize (1024, AwesomeBar.ToolbarWidgetHeight) }; default: @@ -140,7 +140,8 @@ namespace MonoDevelop.MacIntegration.MainToolbar var item = widget.Items[0]; var abFrameInWindow = awesomeBar.ConvertRectToView (awesomeBar.Frame, null); - var size = new CGSize (win.Frame.Width - abFrameInWindow.X - 4, 25); + var awesomebarHeight = AwesomeBar.ToolbarWidgetHeight;//MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 24 : 22; + var size = new CGSize (win.Frame.Width - abFrameInWindow.X - 4, awesomebarHeight); item.MinSize = size; item.MaxSize = size; }); @@ -256,7 +257,6 @@ namespace MonoDevelop.MacIntegration.MainToolbar }; foreach (var item in value) menu.AddItem (new NSMenuItem (item.DisplayString, (o, e) => item.NotifyActivated ())); - searchEntry.SearchMenuTemplate = menu; } } diff --git a/main/src/addins/MacPlatform/MainToolbar/MultiResImage.cs b/main/src/addins/MacPlatform/MainToolbar/MultiResImage.cs new file mode 100644 index 0000000000..d4221451f7 --- /dev/null +++ b/main/src/addins/MacPlatform/MainToolbar/MultiResImage.cs @@ -0,0 +1,103 @@ +// +// MultiResImage.cs +// +// Author: +// iain holmes <iain@xamarin.com> +// +// Copyright (c) 2016 Xamarin, Inc +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using System.Reflection; +using AppKit; +using Foundation; + +using MonoDevelop.Ide; +using MonoDevelop.Core; + +namespace MonoDevelop.MacIntegration.MainToolbar +{ + public static class MultiResImage + { + public static NSImage CreateMultiResImage (string filename, string style) + { + var image = new NSImage (); + + var image1x = NSImageFromResource (MakeResName (filename, style)); + var image2x = NSImageFromResource (MakeResName (filename, style, true)); + + if (image1x != null) { + image.AddRepresentations (image1x.Representations ()); + } + + if (image2x != null) { + image.AddRepresentations (image2x.Representations ()); + } + + image.Size = new CoreGraphics.CGSize (0, 0); + return image; + } + + static string MakeResName (string filename, string style, bool retina = false) + { + bool dark = IdeApp.Preferences.UserInterfaceSkin == Skin.Dark; + + if (!string.IsNullOrEmpty (style)) { + style = "~" + style; + } + + string resname = string.Format ("{0}{1}{2}{3}.png", filename, dark ? "~dark" : "", style, retina ? "@2x" : ""); + if (Assembly.GetCallingAssembly ().GetManifestResourceInfo (resname) != null) { + return resname; + } + + resname = string.Format ("{0}{1}{2}.png", filename, dark ? "~dark" : "", retina ? "@2x" : ""); + if (Assembly.GetCallingAssembly ().GetManifestResourceInfo (resname) != null) { + return resname; + } + + resname = string.Format ("{0}{1}.png", filename, retina ? "@2x" : ""); + if (Assembly.GetCallingAssembly ().GetManifestResourceInfo (resname) != null) { + return resname; + } + + // If all those failed, try again, but without retina + if (retina) { + LoggingService.LogWarning ("{0} {1} missing @2x", filename, style); + return MakeResName (filename, style); + } + + return null; + } + + static NSImage NSImageFromResource (string res) + { + if (string.IsNullOrEmpty (res)) { + return null; + } + + var stream = Assembly.GetCallingAssembly ().GetManifestResourceStream (res); + using (stream) + using (NSData data = NSData.FromStream (stream)) { + return new NSImage (data); + } + } + } +} + diff --git a/main/src/addins/MacPlatform/MainToolbar/RunButton.cs b/main/src/addins/MacPlatform/MainToolbar/RunButton.cs index 72e474da85..aaf57a08ab 100644 --- a/main/src/addins/MacPlatform/MainToolbar/RunButton.cs +++ b/main/src/addins/MacPlatform/MainToolbar/RunButton.cs @@ -30,34 +30,78 @@ using CoreGraphics; using MonoDevelop.Components.MainToolbar; using MonoDevelop.Ide; using MonoDevelop.Components; +using Xwt.Mac; +using CoreImage; namespace MonoDevelop.MacIntegration.MainToolbar { [Register] class RunButton : NSButton { + NSImage stopIcon, continueIcon, buildIcon; + + public RunButton () { + UpdateIcons (); + + Ide.Gui.Styles.Changed += (o, e) => UpdateCell (); + + Cell = new ColoredButtonCell (); + icon = OperationIcon.Run; - Image = GetIcon (); ImagePosition = NSCellImagePosition.ImageOnly; BezelStyle = NSBezelStyle.TexturedRounded; + Enabled = false; } + void UpdateIcons (object sender = null, EventArgs e = null) + { + // HACK: NSButton does not support images with NSCustomImageRep used + // by Xwt to draw custom/themed images. We have to convert them + // to bitmaps, which has to be done after each theme/skin change, + // but does not support custom per Image styles (ToBitmap does + // not support images with different tags, only global styles are + // supported) + stopIcon = ImageService.GetIcon ("stop").ToBitmap (GtkWorkarounds.GetScaleFactor ()).ToNSImage (); + continueIcon = ImageService.GetIcon ("continue").ToBitmap (GtkWorkarounds.GetScaleFactor ()).ToNSImage (); + buildIcon = ImageService.GetIcon ("build").ToBitmap (GtkWorkarounds.GetScaleFactor ()).ToNSImage (); + + // We can use Template images supported by NSButton, thus no reloading + // on theme/skin change is required. + stopIcon.Template = continueIcon.Template = buildIcon.Template = true; + } + + void UpdateCell () + { + Appearance = NSAppearance.GetAppearance (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark ? NSAppearance.NameVibrantDark : NSAppearance.NameAqua); + NeedsDisplay = true; + } + NSImage GetIcon () { switch (icon) { case OperationIcon.Stop: - return ImageService.GetIcon ("stop").ToNSImage (); + return stopIcon; case OperationIcon.Run: - return ImageService.GetIcon ("continue").ToNSImage (); + return continueIcon; case OperationIcon.Build: - return ImageService.GetIcon ("build").ToNSImage (); + return buildIcon; } throw new InvalidOperationException (); } + public override bool Enabled { + get { + return base.Enabled; + } + set { + base.Enabled = value; + Image = GetIcon (); + } + } + OperationIcon icon; public OperationIcon Icon { get { return icon; } @@ -75,5 +119,39 @@ namespace MonoDevelop.MacIntegration.MainToolbar } } } + + class ColoredButtonCell : NSButtonCell + { + public override void DrawBezelWithFrame (CGRect frame, NSView controlView) + { + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) { + var inset = frame.Inset (0.25f, 0.25f); + + var path = NSBezierPath.FromRoundedRect (inset, 3, 3); + path.LineWidth = 0.5f; + + // The first time the view is drawn it has a filter of some sort attached so that the colours set here + // are made lighter onscreen. + // NSColor.FromRgba (0.244f, 0.247f, 0.245f, 1).SetStroke (); + // would make the initial colour actually be .56,.56,.56 + // + // However after switching theme this filter is removed and the colour set here is the actual colour + // displayed onscreen. + Styles.DarkBorderBrokenColor.ToNSColor ().SetStroke (); + path.Stroke (); + } else { + if (controlView.Window.Screen.BackingScaleFactor == 2) { + frame = new CGRect (frame.X, frame.Y + 0.5f, frame.Width, frame.Height); + } + base.DrawBezelWithFrame (frame, controlView); + } + } + + public override void DrawInteriorWithFrame (CGRect cellFrame, NSView inView) + { + cellFrame = new CGRect (cellFrame.X, cellFrame.Y + 0.5f, cellFrame.Width, cellFrame.Height); + base.DrawInteriorWithFrame (cellFrame, inView); + } + } } diff --git a/main/src/addins/MacPlatform/MainToolbar/SearchBar.cs b/main/src/addins/MacPlatform/MainToolbar/SearchBar.cs index abf49972fd..660859ba99 100644 --- a/main/src/addins/MacPlatform/MainToolbar/SearchBar.cs +++ b/main/src/addins/MacPlatform/MainToolbar/SearchBar.cs @@ -26,9 +26,10 @@ using System; using AppKit; using Foundation; +using CoreGraphics; using Gtk; using MonoDevelop.Core; -using MonoDevelop.Components.Mac; + using MonoDevelop.Ide; using Xwt.Mac; @@ -44,12 +45,145 @@ namespace MonoDevelop.MacIntegration.MainToolbar internal event EventHandler SelectionActivated; public event EventHandler GainedFocus; + // To only draw the border, NSSearchFieldCell needs to be subclassed. Unfortunately this stops the + // animation on activation working. I suspect this is implemented inside the NSSearchField rather + // than the NSSearchFieldCell which can't do animation. + class DarkSkinSearchFieldCell : NSSearchFieldCell + { + public override void DrawWithFrame (CGRect cellFrame, NSView inView) + { + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) { + var inset = cellFrame.Inset (0.25f, 0.25f); + if (!ShowsFirstResponder) { + var path = NSBezierPath.FromRoundedRect (inset, 3, 3); + path.LineWidth = 0.5f; + + Styles.DarkBorderColor.ToNSColor ().SetStroke (); + path.Stroke (); + } + + // Can't just call base.DrawInteriorWithFrame because it draws the placeholder text + // with a strange emboss effect when it the view is not first responder. + // Again, probably because the NSSearchField handles the not first responder state itself + // rather than using NSSearchFieldCell + //base.DrawInteriorWithFrame (inset, inView); + + // So instead, draw the various extra cells and text in the correct places + SearchButtonCell.DrawWithFrame (SearchButtonRectForBounds (inset), inView); + + if (!ShowsFirstResponder) { + PlaceholderAttributedString.DrawInRect (SearchTextRectForBounds (inset)); + } + + if (!string.IsNullOrEmpty (StringValue)) { + CancelButtonCell.DrawWithFrame (CancelButtonRectForBounds (inset), inView); + } + } else { + if (inView.Window.Screen.BackingScaleFactor == 2) { + nfloat yOffset = 0f; + nfloat hOffset = 0f; + + if (MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan) { + if (inView.Window.IsKeyWindow) { + yOffset = 0.5f; + hOffset = -0.5f; + } else { + yOffset = 0f; + hOffset = 1.0f; + } + } else { + yOffset = 1f; + hOffset = -1f; + } + cellFrame = new CGRect (cellFrame.X, cellFrame.Y + yOffset, cellFrame.Width, cellFrame.Height + hOffset); + } else { + nfloat yOffset = 0f; + nfloat hOffset = 0f; + + cellFrame = new CGRect (cellFrame.X, cellFrame.Y + yOffset, cellFrame.Width, cellFrame.Height + hOffset); + } + base.DrawWithFrame (cellFrame, inView); + } + } + + // This is the rect for the placeholder text, not the text field entry + public override CGRect SearchTextRectForBounds (CGRect rect) + { + if (ShowsFirstResponder) { + rect = new CGRect (rect.X + 26, 0, rect.Width - 52, 22); + } else { + nfloat y = MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 4 : 3; + rect = new CGRect (rect.X + 28, y, rect.Width - 56, 22); + } + + return rect; + } + + // The rect for the search icon + public override CGRect SearchButtonRectForBounds (CGRect rect) + { + rect = new CGRect (0, 0, 26, rect.Height); + return rect; + } + + // The rect for the cancel button + public override CGRect CancelButtonRectForBounds (CGRect rect) + { + rect = new CGRect (rect.X + rect.Width - 26.0, 0, 26, rect.Height); + + return rect; + } + + // When customising the NSCell these are the methods which determine + // where the editing and selecting text appears + public override void EditWithFrame (CGRect aRect, NSView inView, NSText editor, NSObject delegateObject, NSEvent theEvent) + { + aRect = new CGRect (aRect.X, aRect.Y + 10, aRect.Width - 66, aRect.Height); + base.EditWithFrame (aRect, inView, editor, delegateObject, theEvent); + } + + public override void SelectWithFrame (CGRect aRect, NSView inView, NSText editor, NSObject delegateObject, nint selStart, nint selLength) + { + nfloat xOffset = 0; + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) { + xOffset = -1.5f; + } + // y does not appear to affect anything. Whatever value is set here for y will always be 1px below the + // placeholder text + aRect = new CGRect (aRect.X + xOffset, aRect.Y, aRect.Width, aRect.Height); + base.SelectWithFrame (aRect, inView, editor, delegateObject, selStart, selLength); + } + } + public SearchBar () { - Cell.Scrollable = true; + Cell = new DarkSkinSearchFieldCell (); + Initialize (); var debugFilePath = System.IO.Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), ".xs-searchbar-debug"); debugSearchbar = System.IO.File.Exists (debugFilePath); + + Ide.Gui.Styles.Changed += (o, e) => UpdateLayout (); + UpdateLayout (); + } + + void UpdateLayout () + { + /* + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) { + Bezeled = true; + } else { + BezelStyle = NSTextFieldBezelStyle.Rounded; + Bezeled = true; + } +*/ + Bezeled = true; + BezelStyle = NSTextFieldBezelStyle.Rounded; + Editable = true; + Cell.Scrollable = true; + Selectable = true; + + PlaceholderAttributedString = new NSAttributedString ("Search", foregroundColor: NSColor.FromRgba (0.63f, 0.63f, 0.63f, 1.0f)); } internal void LogMessage (string message) @@ -141,7 +275,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar LogMessage ("View moved to parent window"); // Needs to be grabbed after it's parented. - gtkWidget = GtkMacInterop.NSViewToGtkWidget (this); + gtkWidget = Components.Mac.GtkMacInterop.NSViewToGtkWidget (this); } public override bool BecomeFirstResponder () diff --git a/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs b/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs index ec3dcee5ac..f89fc715ce 100644 --- a/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs +++ b/main/src/addins/MacPlatform/MainToolbar/SelectorView.cs @@ -30,6 +30,7 @@ using AppKit; using CoreGraphics; using Foundation; using MonoDevelop.Components; +using MonoDevelop.Components.Mac; using MonoDevelop.Components.MainToolbar; using MonoDevelop.Core; using MonoDevelop.Ide; @@ -63,8 +64,9 @@ namespace MonoDevelop.MacIntegration.MainToolbar public SelectorView () { - Title = ""; + Cell = new ColoredButtonCell (); BezelStyle = NSBezelStyle.TexturedRounded; + Title = ""; RealSelectorView = new PathSelectorView (new CGRect (6, 0, 1, 1)); RealSelectorView.UnregisterDraggedTypes (); @@ -75,7 +77,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar { var fitSize = RealSelectorView.SizeThatFits (size); - return new CGSize (fitSize.Width + 12.0, size.Height); + return new CGSize (Math.Round (fitSize.Width) + 12.0, size.Height); } public override void SetFrameSize (CGSize newSize) @@ -84,6 +86,29 @@ namespace MonoDevelop.MacIntegration.MainToolbar RealSelectorView.SetFrameSize (newSize); } + public override void ViewDidMoveToWindow () + { + base.ViewDidMoveToWindow (); + UpdateLayout (); + } + + void UpdateLayout () + { + // Correct the offset position for the screen + nfloat yOffset = 1f; + if (Window.Screen != null && Window.Screen.BackingScaleFactor == 2) { + yOffset = 0.5f; + } + + RealSelectorView.Frame = new CGRect (RealSelectorView.Frame.X, yOffset, RealSelectorView.Frame.Width, RealSelectorView.Frame.Height); + } + + public override void DidChangeBackingProperties () + { + base.DidChangeBackingProperties (); + UpdateLayout (); + } + internal void OnSizeChanged () { if (SizeChanged != null) { @@ -230,23 +255,21 @@ namespace MonoDevelop.MacIntegration.MainToolbar menu.AddItem (menuItem); } - public PathSelectorView (CGRect frameRect) : base (frameRect) { PathComponentCells = new [] { new NSPathComponentCell { - Image = ImageService.GetIcon ("project").ToBitmap ().ToNSImage (), + Image = MultiResImage.CreateMultiResImage ("project", "disabled"), Title = ConfigurationPlaceholder, Enabled = false, - TextColor = NSColor.FromRgba (0.34f, 0.34f, 0.34f, 1), }, new NSPathComponentCell { - Image = ImageService.GetIcon ("device").ToBitmap ().ToNSImage (), + Image = MultiResImage.CreateMultiResImage ("device", "disabled"), Title = RuntimePlaceholder, Enabled = false, - TextColor = NSColor.FromRgba (0.34f, 0.34f, 0.34f, 1), } }; + UpdateStyle (); BackgroundColor = NSColor.Clear; FocusRingType = NSFocusRingType.None; @@ -314,6 +337,32 @@ namespace MonoDevelop.MacIntegration.MainToolbar menu.PopUpMenu (null, offs, this); } }; + + Ide.Gui.Styles.Changed += UpdateStyle; + } + + public override void DidChangeBackingProperties () + { + base.DidChangeBackingProperties (); + + // Force a redraw because NSPathControl does not redraw itself when switching to a different resolution + // and the icons need redrawn + NeedsDisplay = true; + } + + void UpdateStyle (object sender = null, EventArgs e = null) + { + PathComponentCells [ConfigurationIdx].TextColor = Styles.BaseForegroundColor.ToNSColor (); + PathComponentCells [RuntimeIdx].TextColor = Styles.BaseForegroundColor.ToNSColor (); + + UpdateImages (); + } + + protected override void Dispose (bool disposing) + { + if (disposing) + Ide.Gui.Styles.Changed -= UpdateStyle; + base.Dispose (disposing); } public override void ViewDidMoveToWindow () @@ -339,10 +388,27 @@ namespace MonoDevelop.MacIntegration.MainToolbar void UpdatePathText (int idx, string text) { PathComponentCells [idx].Title = text; + UpdateImages (); + } - // These need to be set again so that the path selector lays out correctly. Not sure why at the moment. - PathComponentCells [ConfigurationIdx].Image = ImageService.GetIcon ("project").ToBitmap ().ToNSImage (); - PathComponentCells [RuntimeIdx].Image = ImageService.GetIcon ("device").ToBitmap ().ToNSImage (); + void UpdateImages () + { + string projectStyle = ""; + string deviceStyle = ""; + if (!PathComponentCells [ConfigurationIdx].Enabled) + projectStyle = "disabled"; + + if (!PathComponentCells [ConfigurationIdx].Enabled) + deviceStyle = "disabled"; + + // HACK + // For some reason NSPathControl does not like the images that ImageService provides. To use them it requires + // ToBitmap() to be called first. But a second problem is that ImageService only seems to provide a single resolution + // for its icons. It may be related to the images being initially loaded through the Gtk backend and then converted to NSImage + // at a later date. + // For whatever reason, we custom load the images here through NSImage, providing both 1x and 2x image reps. + PathComponentCells [ConfigurationIdx].Image = MultiResImage.CreateMultiResImage ("project", deviceStyle); + PathComponentCells [RuntimeIdx].Image = MultiResImage.CreateMultiResImage ("device", deviceStyle); RealignTexts (); } @@ -410,6 +476,20 @@ namespace MonoDevelop.MacIntegration.MainToolbar public event EventHandler ConfigurationChanged; public event EventHandler<HandledEventArgs> RuntimeChanged; + + public override bool Enabled { + get { + return base.Enabled; + } + set { + base.Enabled = value; + + if (value) { + PathComponentCells [RuntimeIdx].Enabled = runtimeModel.Count () > 1; + PathComponentCells [ConfigurationIdx].Enabled = configurationModel.Count () > 1; + } + } + } } #endregion } diff --git a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs index ae3ddccdc2..57e2d01464 100644 --- a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs +++ b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs @@ -1,4 +1,4 @@ - // +// // StatusBar.cs // // Author: @@ -26,6 +26,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Timers; using AppKit; using Foundation; using CoreAnimation; @@ -37,6 +38,7 @@ using MonoDevelop.Components.MainToolbar; using MonoDevelop.Ide; using MonoDevelop.Ide.Gui.Components; using MonoDevelop.Ide.Tasks; +using MonoDevelop.Components.Mac; namespace MonoDevelop.MacIntegration.MainToolbar { @@ -135,7 +137,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar } set { resultCount = value; - resultString = new NSAttributedString (value.ToString (), foregroundColor: NSColor.Text, + resultString = new NSAttributedString (value.ToString (), foregroundColor: Styles.BaseForegroundColor.ToNSColor (), font: NSFont.SystemFontOfSize (NSFont.SmallSystemFontSize - 1)); ResizeToFit (); } @@ -162,7 +164,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar return; } - iconImage.Draw (new CGRect (0, (Frame.Size.Height - iconImage.Size.Height) / 2 + 0.5, iconImage.Size.Width, iconImage.Size.Height)); + iconImage.Draw (new CGRect (0, (Frame.Size.Height - iconImage.Size.Height) / 2, iconImage.Size.Width, iconImage.Size.Height)); resultString.DrawAtPoint (new CGPoint (iconImage.Size.Width, (Frame.Size.Height - resultString.Size.Height) / 2)); } @@ -183,15 +185,162 @@ namespace MonoDevelop.MacIntegration.MainToolbar } } + // We need a separate layer backed view to put over the NSTextFields because the NSTextField draws itself differently + // if it is layer backed so we can't make it or its superview layer backed. + class ProgressView : NSView + { + const string ProgressLayerFadingId = "ProgressLayerFading"; + const string growthAnimationKey = "bounds"; + + CALayer progressLayer; + Stack<double> progressMarks = new Stack<double> (); + bool inProgress; + double oldFraction; + + const int barHeight = 2; + + public ProgressView () + { + WantsLayer = true; + Layer.CornerRadius = MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 3 : 4; + + progressLayer = new CALayer (); + Layer.AddSublayer (progressLayer); + Layer.BorderWidth = 0; + + var xamBlue = NSColor.FromRgba (52f / 255, 152f / 255, 219f / 255, 1f); + progressLayer.BackgroundColor = xamBlue.CGColor; + progressLayer.BorderWidth = 0; + progressLayer.FillMode = CAFillMode.Forwards; + progressLayer.Frame = new CGRect (0, 0, 0, barHeight); + progressLayer.AnchorPoint = new CGPoint (0, 0); + } + + public void BeginProgress () + { + oldFraction = 0.0; + progressLayer.Hidden = false; + progressLayer.Opacity = 1; + progressLayer.Frame = new CGRect (0, 0, 0, barHeight); + } + + public void SetProgressFraction (double work) + { + progressMarks.Push (work); + if (!inProgress) { + inProgress = true; + StartProgress (progressMarks.Peek ()); + } + } + + public void EndProgress () + { + progressMarks.Clear (); + if (progressLayer != null) { + progressLayer.RemoveAnimation (growthAnimationKey); + progressLayer.Hidden = true; + } + inProgress = false; + } + + CAAnimation CreateMoveAndGrowAnimation (CALayer progress, double growToFraction) + { + CAAnimationGroup grp = CAAnimationGroup.CreateAnimation (); + grp.Duration = 0.2; + grp.FillMode = CAFillMode.Forwards; + grp.RemovedOnCompletion = false; + + CABasicAnimation grow = CABasicAnimation.FromKeyPath ("bounds"); + grow.From = NSValue.FromCGRect (new CGRect (0, 0, Frame.Width * (nfloat)oldFraction, barHeight)); + grow.To = NSValue.FromCGRect (new CGRect (0, 0, Frame.Width * (nfloat)growToFraction, barHeight)); + grp.Animations = new [] { + grow, + }; + return grp; + } + + CAAnimation CreateAutoPulseAnimation () + { + CABasicAnimation move = CABasicAnimation.FromKeyPath ("position.x"); + move.From = NSNumber.FromDouble (-frameAutoPulseWidth); + move.To = NSNumber.FromDouble (Frame.Width + frameAutoPulseWidth); + move.RepeatCount = float.PositiveInfinity; + move.RemovedOnCompletion = false; + move.Duration = 4; + return move; + } + + void AttachFadeoutAnimation (CALayer progress, CAAnimation animation, Func<bool> fadeoutVerifier) + { + animation.AnimationStopped += (sender, e) => { + if (!fadeoutVerifier ()) + return; + + CABasicAnimation fadeout = CABasicAnimation.FromKeyPath ("opacity"); + fadeout.From = NSNumber.FromDouble (1); + fadeout.To = NSNumber.FromDouble (0); + fadeout.Duration = 0.5; + fadeout.FillMode = CAFillMode.Forwards; + fadeout.RemovedOnCompletion = false; + fadeout.AnimationStopped += (sender2, e2) => { + if (!e2.Finished) + return; + + inProgress = false; + progress.Opacity = 0; + progress.RemoveAllAnimations (); + }; + progress.Name = ProgressLayerFadingId; + progress.AddAnimation (fadeout, "opacity"); + }; + progress.AddAnimation (animation, growthAnimationKey); + } + + public void StartProgress (double newFraction) + { + progressMarks.Clear (); + var grp = CreateMoveAndGrowAnimation (progressLayer, newFraction); + oldFraction = newFraction; + + AttachFadeoutAnimation (progressLayer, grp, () => { + if (oldFraction < 1 && inProgress) { + if (progressMarks.Count != 0) { + StartProgress (progressMarks.Peek ()); + } else { + inProgress = false; + } + return false; + } + return true; + }); + } + + const double frameAutoPulseWidth = 100; + public void StartProgressAutoPulse () + { + var move = CreateAutoPulseAnimation (); + AttachFadeoutAnimation (progressLayer, move, () => true); + } + } + [Register] - class StatusBar : NSTextField, MonoDevelop.Ide.StatusBar + class StatusBar : NSButton, MonoDevelop.Ide.StatusBar { + public enum MessageType + { + Ready, + Information, + Warning, + Error, + } + const string ProgressLayerFadingId = "ProgressLayerFading"; const string growthAnimationKey = "bounds"; StatusBarContextHandler ctxHandler; Stack<double> progressMarks = new Stack<double> (); bool currentTextIsMarkup; string text; + MessageType messageType; NSColor textColor; NSImage image; IconId icon; @@ -201,13 +350,20 @@ namespace MonoDevelop.MacIntegration.MainToolbar NSAttributedString GetStatusString (string text, NSColor color) { + nfloat fontSize = NSFont.SystemFontSize; + if (Window != null) { + fontSize -= Window.Screen.BackingScaleFactor == 2 ? 2 : 1; + } else { + fontSize -= 1; + } + return new NSAttributedString (text, new NSStringAttributes { ForegroundColor = color, ParagraphStyle = new NSMutableParagraphStyle { HeadIndent = imageView.Frame.Width, LineBreakMode = NSLineBreakMode.TruncatingMiddle, }, - Font = NSFont.SystemFontOfSize (NSFont.SystemFontSize - 2), + Font = NSFont.SystemFontOfSize (fontSize), }); } @@ -225,33 +381,35 @@ namespace MonoDevelop.MacIntegration.MainToolbar Selectable = false, }; NSTrackingArea textFieldArea; - CALayer progressLayer; + ProgressView progressView; TaskEventHandler updateHandler; public StatusBar () { - AllowsEditingTextAttributes = Selectable = Editable = false; + Cell = new ColoredButtonCell (); + BezelStyle = NSBezelStyle.TexturedRounded; + Title = ""; + Enabled = false; + + LoadStyles (); + + // We don't need to resize the Statusbar here as a style change will trigger a complete relayout of the Awesomebar + Ide.Gui.Styles.Changed += LoadStyles; textField.Cell = new VerticallyCenteredTextFieldCell (yOffset: -0.5f); textField.Cell.StringValue = ""; - textField.Cell.PlaceholderAttributedString = GetStatusString (BrandingService.ApplicationName, NSColor.DisabledControlText); + textField.Cell.PlaceholderAttributedString = GetStatusString (BrandingService.ApplicationName, ColorForType (MessageType.Ready)); // The rect is empty because we use InVisibleRect to track the whole of the view. textFieldArea = new NSTrackingArea (CGRect.Empty, NSTrackingAreaOptions.MouseEnteredAndExited | NSTrackingAreaOptions.ActiveInKeyWindow | NSTrackingAreaOptions.InVisibleRect, this, null); textField.AddTrackingArea (textFieldArea); + imageView.Frame = new CGRect (0.5, 0, 0, 0); imageView.Image = ImageService.GetIcon (Stock.StatusSteady).ToNSImage (); buildResults = new BuildResultsView (); buildResults.Hidden = true; - AddSubview (buildResults); - // Fixes a render glitch of a whiter bg than the others. - if (MacSystemInformation.OsVersion >= MacSystemInformation.Yosemite) - BezelStyle = NSTextFieldBezelStyle.Rounded; - - WantsLayer = true; - Layer.CornerRadius = MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 6 : 4; ctxHandler = new StatusBarContextHandler (this); updateHandler = delegate { @@ -277,29 +435,54 @@ namespace MonoDevelop.MacIntegration.MainToolbar updateHandler (null, null); + NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.DidChangeBackingPropertiesNotification, + notification => Runtime.RunInMainThread (() => { + ReconstructString (); + RepositionContents (); + })); + TaskService.Errors.TasksAdded += updateHandler; TaskService.Errors.TasksRemoved += updateHandler; + AddSubview (buildResults); AddSubview (imageView); AddSubview (textField); + + progressView = new ProgressView (); + AddSubview (progressView); + } + + void LoadStyles (object sender = null, EventArgs args = null) + { + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) { + Appearance = NSAppearance.GetAppearance (NSAppearance.NameVibrantDark); + } else { + Appearance = NSAppearance.GetAppearance (NSAppearance.NameAqua); + } + + textField.Cell.PlaceholderAttributedString = GetStatusString (BrandingService.ApplicationName, ColorForType (MessageType.Ready)); + textColor = ColorForType (messageType); + ReconstructString (); } protected override void Dispose (bool disposing) { TaskService.Errors.TasksAdded -= updateHandler; TaskService.Errors.TasksRemoved -= updateHandler; + Ide.Gui.Styles.Changed -= LoadStyles; base.Dispose (disposing); } public override void DrawRect (CGRect dirtyRect) { base.DrawRect (dirtyRect); + if (statusIcons.Count == 0 || buildResults.Hidden) { return; } var x = LeftMostStatusItemX (); - var sepRect = new CGRect (x - 9, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 5 : 4, 1, 16); + var sepRect = new CGRect (x - 6.5, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 4 : 3, 1, 16); if (!sepRect.IntersectsWith (dirtyRect)) { return; } @@ -308,17 +491,23 @@ namespace MonoDevelop.MacIntegration.MainToolbar NSBezierPath.FillRect (sepRect); } + public override void ViewDidMoveToWindow () + { + base.ViewDidMoveToWindow (); + ReconstructString (); + RepositionContents (); + } + void ReconstructString () { if (string.IsNullOrEmpty (text)) { textField.AttributedStringValue = new NSAttributedString (""); + textField.Cell.PlaceholderAttributedString = GetStatusString (BrandingService.ApplicationName, ColorForType (MessageType.Ready)); imageView.Image = ImageService.GetIcon (Stock.StatusSteady).ToNSImage (); } else { textField.AttributedStringValue = GetStatusString (text, textColor); imageView.Image = image; } - - DestroyPopover (null, null); } readonly List<StatusIcon> statusIcons = new List<StatusIcon> (); @@ -355,28 +544,31 @@ namespace MonoDevelop.MacIntegration.MainToolbar } IconId buildImageId; + void PositionBuildResults (nfloat right) { right = DrawSeparatorIfNeeded (right); - right -= (6 + buildResults.Frame.Width); + right -= buildResults.Frame.Width; buildResults.SetFrameOrigin (new CGPoint (right, buildResults.Frame.Y)); } internal void RepositionStatusIcons () { - nfloat right = Frame.Width; + nfloat right = Frame.Width - 6; foreach (var item in statusIcons) { - right -= item.Bounds.Width + 6; - item.Frame = new CGRect (right, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 5 : 4, item.Bounds.Width, item.Bounds.Height); + right -= item.Bounds.Width + 1; + item.Frame = new CGRect (right, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 4 : 3, item.Bounds.Width, item.Bounds.Height); } PositionBuildResults (right); + right -= 2; + if (!buildResults.Hidden) { // We have a build result layer. - textField.SetFrameSize (new CGSize (buildResults.Frame.X - 6 - textField.Frame.Left, Frame.Height)); + textField.SetFrameSize (new CGSize (buildResults.Frame.X - 3 - textField.Frame.Left, Frame.Height)); } else - textField.SetFrameSize (new CGSize (right - 6 - textField.Frame.Left, Frame.Height)); + textField.SetFrameSize (new CGSize (right - 3 - textField.Frame.Left, Frame.Height)); } public StatusBarIcon ShowStatusIcon (Xwt.Drawing.Image pixbuf) @@ -405,7 +597,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar public void ShowReady () { - ShowMessage (null, "", false, NSColor.DisabledControlText); + ShowMessage (null, "", false, MessageType.Ready); } static Pad sourcePad; @@ -416,45 +608,46 @@ namespace MonoDevelop.MacIntegration.MainToolbar public void ShowError (string error) { - ShowMessage (Stock.StatusError, error, false, NSColor.FromDeviceRgba (228f / 255, 84f / 255, 55f / 255, 1)); + ShowMessage (Stock.StatusError, error, false, MessageType.Error); + } public void ShowWarning (string warning) { - ShowMessage (Stock.StatusWarning, warning, false, NSColor.FromDeviceRgba (235f / 255, 161f / 255, 7f / 255, 1)); + ShowMessage (Stock.StatusWarning, warning, false, MessageType.Warning); } public void ShowMessage (string message) { - ShowMessage (null, message, false, NSColor.FromRgba (0.34f, 0.34f, 0.34f, 1)); + ShowMessage (null, message, false, MessageType.Information); } public void ShowMessage (string message, bool isMarkup) { - ShowMessage (null, message, true, NSColor.FromRgba (0.34f, 0.34f, 0.34f, 1)); + ShowMessage (null, message, true, MessageType.Information); } public void ShowMessage (IconId image, string message) { - ShowMessage (image, message, false, NSColor.FromRgba (0.34f, 0.34f, 0.34f, 1)); + ShowMessage (image, message, false, MessageType.Information); } public void ShowMessage (IconId image, string message, bool isMarkup) { - ShowMessage (image, message, isMarkup, NSColor.FromRgba (0.34f, 0.34f, 0.34f, 1)); + ShowMessage (image, message, isMarkup, MessageType.Information); } - public void ShowMessage (IconId image, string message, bool isMarkup, NSColor color) + public void ShowMessage (IconId image, string message, bool isMarkup, MessageType statusType) { Runtime.AssertMainThread (); - bool changed = LoadText (message, isMarkup, color); + bool changed = LoadText (message, isMarkup, statusType); LoadPixbuf (image); if (changed) ReconstructString (); } - bool LoadText (string message, bool isMarkup, NSColor color) + bool LoadText (string message, bool isMarkup, MessageType statusType) { message = message ?? ""; message = message.Replace (Environment.NewLine, " ").Replace ("\n", " ").Trim (); @@ -464,11 +657,26 @@ namespace MonoDevelop.MacIntegration.MainToolbar text = message; currentTextIsMarkup = isMarkup; - textColor = color; + messageType = statusType; + textColor = ColorForType (statusType); return true; } + NSColor ColorForType (MessageType messageType) + { + switch (messageType) { + case MessageType.Error: + return Styles.StatusErrorTextColor.ToNSColor (); + case MessageType.Warning: + return Styles.StatusWarningTextColor.ToNSColor (); + case MessageType.Ready: + return Styles.StatusReadyTextColor.ToNSColor (); + default: + return Styles.BaseForegroundColor.ToNSColor (); + } + } + static bool iconLoaded; void LoadPixbuf (IconId iconId) { @@ -506,50 +714,29 @@ namespace MonoDevelop.MacIntegration.MainToolbar public void BeginProgress (string name) { - EndProgress (); - ShowMessage (name); - oldFraction = 0; - - if (AutoPulse) - StartProgressAutoPulse (); + BeginProgress (null, name); } public void BeginProgress (IconId image, string name) { EndProgress (); ShowMessage (image, name); - oldFraction = 0; if (AutoPulse) - StartProgressAutoPulse (); + progressView.StartProgressAutoPulse (); + else + progressView.BeginProgress (); } - bool inProgress; - double oldFraction; + public void SetProgressFraction (double work) { - if (AutoPulse) - return; - - progressMarks.Push (work); - if (!inProgress) { - inProgress = true; - StartProgress (progressMarks.Peek ()); - } + progressView.SetProgressFraction (work); } public void EndProgress () { - progressMarks.Clear (); - if (progressLayer != null) { - progressLayer.RemoveAnimation (growthAnimationKey); - if (inProgress == false) { - progressLayer.RemoveFromSuperLayer (); - progressLayer = null; - } - } - inProgress = false; - AutoPulse = false; + progressView.EndProgress (); } public void Pulse () @@ -568,114 +755,6 @@ namespace MonoDevelop.MacIntegration.MainToolbar set; } - static CGColor xamBlue = new CGColor (52f / 255, 152f / 255, 219f / 255); - static nfloat verticalOffset = 2; - CALayer CreateProgressBarLayer (double width) - { - CALayer progress = progressLayer; - if (progress == null) { - progress = CALayer.Create (); - progress.BackgroundColor = xamBlue; - progress.BorderColor = xamBlue; - progress.FillMode = CAFillMode.Forwards; - progress.Frame = new CGRect (0, Frame.Height - barHeight - verticalOffset, (nfloat)width, barHeight); - - progressLayer = progress; - Layer.AddSublayer (progress); - } - return progress; - } - - CAAnimation CreateMoveAndGrowAnimation (CALayer progress, double growToFraction) - { - CAAnimationGroup grp = CAAnimationGroup.CreateAnimation (); - grp.Duration = 0.2; - grp.FillMode = CAFillMode.Forwards; - grp.RemovedOnCompletion = false; - - CABasicAnimation move = CABasicAnimation.FromKeyPath ("position.x"); - double oldOffset = (progress.Frame.Width / 2) * oldFraction; - double newOffset = (progress.Frame.Width / 2) * growToFraction; - move.From = NSNumber.FromDouble (oldOffset); - move.To = NSNumber.FromDouble (newOffset); - - CABasicAnimation grow = CABasicAnimation.FromKeyPath ("bounds"); - grow.From = NSValue.FromCGRect (new CGRect (0, 0, progress.Frame.Width * (nfloat)oldFraction, barHeight)); - grow.To = NSValue.FromCGRect (new CGRect (0, 0, progress.Frame.Width * (nfloat)growToFraction, barHeight)); - grp.Animations = new [] { - move, - grow, - }; - return grp; - } - - CAAnimation CreateAutoPulseAnimation () - { - CABasicAnimation move = CABasicAnimation.FromKeyPath ("position.x"); - move.From = NSNumber.FromDouble (-frameAutoPulseWidth); - move.To = NSNumber.FromDouble (Layer.Frame.Width + frameAutoPulseWidth); - move.RepeatCount = float.PositiveInfinity; - move.RemovedOnCompletion = false; - move.Duration = 4; - return move; - } - - void AttachFadeoutAnimation (CALayer progress, CAAnimation animation, Func<bool> fadeoutVerifier) - { - animation.AnimationStopped += (sender, e) => { - if (!fadeoutVerifier ()) - return; - - CABasicAnimation fadeout = CABasicAnimation.FromKeyPath ("opacity"); - fadeout.From = NSNumber.FromDouble (1); - fadeout.To = NSNumber.FromDouble (0); - fadeout.Duration = 0.5; - fadeout.FillMode = CAFillMode.Forwards; - fadeout.RemovedOnCompletion = false; - fadeout.AnimationStopped += (sender2, e2) => { - if (!e2.Finished) - return; - - inProgress = false; - progress.Opacity = 0; - progress.RemoveAllAnimations (); - progress.RemoveFromSuperLayer (); - }; - progress.Name = ProgressLayerFadingId; - progress.AddAnimation (fadeout, "opacity"); - }; - progress.AddAnimation (animation, growthAnimationKey); - } - - const int barHeight = 2; - void StartProgress (double newFraction) - { - progressMarks.Clear (); - var progress = CreateProgressBarLayer (Layer.Frame.Width); - var grp = CreateMoveAndGrowAnimation (progress, newFraction); - oldFraction = newFraction; - - AttachFadeoutAnimation (progress, grp, () => { - if (oldFraction < 1 && inProgress) { - if (progressMarks.Count != 0) { - StartProgress (progressMarks.Peek ()); - } else { - inProgress = false; - } - return false; - } - return true; - }); - } - - const double frameAutoPulseWidth = 100; - void StartProgressAutoPulse () - { - var progress = CreateProgressBarLayer (frameAutoPulseWidth); - var move = CreateAutoPulseAnimation (); - AttachFadeoutAnimation (progress, move, () => true); - } - static NSAttributedString GetPopoverString (string text) { return new NSAttributedString (text, new NSStringAttributes { @@ -805,12 +884,24 @@ namespace MonoDevelop.MacIntegration.MainToolbar } set { base.Frame = value; - imageView.Frame = new CGRect (6, 0, 16, Frame.Height); - textField.Frame = new CGRect (imageView.Frame.Right, 0, Frame.Width - 16, Frame.Height); + RepositionContents (); + } + } - buildResults.Frame = new CGRect (buildResults.Frame.X, buildResults.Frame.Y, buildResults.Frame.Width, Frame.Height); - RepositionStatusIcons (); + void RepositionContents () + { + nfloat yOffset = 1; + if (Window != null && Window.Screen != null && Window.Screen.BackingScaleFactor == 1) { + yOffset = 0.5f; } + + imageView.Frame = new CGRect (6, 0, 16, Frame.Height); + textField.Frame = new CGRect (imageView.Frame.Right, yOffset, Frame.Width - 16, Frame.Height); + + buildResults.Frame = new CGRect (buildResults.Frame.X, buildResults.Frame.Y, buildResults.Frame.Width, Frame.Height); + RepositionStatusIcons (); + + progressView.Frame = new CGRect (0.5f, MacSystemInformation.OsVersion >= MacSystemInformation.ElCapitan ? 1f : 2f, Frame.Width - 2, Frame.Height - 2); } } } diff --git a/main/src/addins/MacPlatform/MainToolbar/Styles.cs b/main/src/addins/MacPlatform/MainToolbar/Styles.cs new file mode 100644 index 0000000000..0c4878aac4 --- /dev/null +++ b/main/src/addins/MacPlatform/MainToolbar/Styles.cs @@ -0,0 +1,79 @@ +// +// Styles.cs +// +// Author: +// Vsevolod Kukol <sevo@xamarin.com> +// +// Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using MonoDevelop.Ide; +using Xwt.Drawing; + +namespace MonoDevelop.MacIntegration.MainToolbar +{ + public static class Styles + { + public static Color BaseBackgroundColor { get; private set; } + public static Color BaseForegroundColor { get; private set; } + public static Color DisabledForegroundColor { get; private set; } + + public static Color StatusErrorTextColor { get; private set; } + public static Color StatusWarningTextColor { get; private set; } + public static Color StatusReadyTextColor { get; private set; } + + // Dark workaround colors + public static Color DarkBorderColor { get; private set; } + public static Color DarkBorderBrokenColor { get; private set; } + + static Styles () + { + LoadStyles (); + Ide.Gui.Styles.Changed += (o, e) => LoadStyles (); + } + + public static void LoadStyles () + { + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) { + BaseBackgroundColor = Ide.Gui.Styles.BaseBackgroundColor; + BaseForegroundColor = Ide.Gui.Styles.BaseForegroundColor; + DisabledForegroundColor = Xwt.Mac.Util.ToXwtColor (AppKit.NSColor.DisabledControlText); //Ide.Gui.Styles.DimTextColor; + StatusErrorTextColor = Color.FromName ("#fa5433"); + StatusWarningTextColor = Color.FromName ("#e8bd0d"); + StatusReadyTextColor = Color.FromName ("#7f7f7f"); + } else { + BaseBackgroundColor = Color.FromName ("#000000"); + BaseForegroundColor = Color.FromName ("#ffffff"); + DisabledForegroundColor = Color.FromName ("#e1e1e1"); + StatusErrorTextColor = Color.FromName ("#fa5433"); + StatusWarningTextColor = Color.FromName ("#e8bd0d"); + StatusReadyTextColor = Color.FromName ("#7f7f7f"); + + DarkBorderColor = Color.FromName ("#8f8f8f"); + + // With the NSAppearance.NameVibrantDark appearance the first time a NSButtonCell + // is drawn it has a filter of some sort attached so that the colours are made lighter onscreen. + // To get the DarkBorderColor we need to use a workaround. + // See comment in ColoredButtonCell.DrawBezelWithFrame (RunButton.cs) + DarkBorderBrokenColor = Color.FromName ("#3e3e3e"); + } + } + } +} + diff --git a/main/src/addins/MacPlatform/icons/build.png b/main/src/addins/MacPlatform/icons/build.png Binary files differindex 60db083214..ac14af146a 100644 --- a/main/src/addins/MacPlatform/icons/build.png +++ b/main/src/addins/MacPlatform/icons/build.png diff --git a/main/src/addins/MacPlatform/icons/build@2x.png b/main/src/addins/MacPlatform/icons/build@2x.png Binary files differindex 7dfb19221b..3508ce49e3 100644 --- a/main/src/addins/MacPlatform/icons/build@2x.png +++ b/main/src/addins/MacPlatform/icons/build@2x.png diff --git a/main/src/addins/MacPlatform/icons/build~dark.png b/main/src/addins/MacPlatform/icons/build~dark.png Binary files differnew file mode 100644 index 0000000000..1da2895e09 --- /dev/null +++ b/main/src/addins/MacPlatform/icons/build~dark.png diff --git a/main/src/addins/MacPlatform/icons/build~dark@2x.png b/main/src/addins/MacPlatform/icons/build~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e0f1da6ecf --- /dev/null +++ b/main/src/addins/MacPlatform/icons/build~dark@2x.png diff --git a/main/src/addins/MacPlatform/icons/continue.png b/main/src/addins/MacPlatform/icons/continue.png Binary files differindex 9d8db8c1cb..ce03a6208b 100644 --- a/main/src/addins/MacPlatform/icons/continue.png +++ b/main/src/addins/MacPlatform/icons/continue.png diff --git a/main/src/addins/MacPlatform/icons/continue@2x.png b/main/src/addins/MacPlatform/icons/continue@2x.png Binary files differindex 1a74564c7d..2f2e41cfc5 100644 --- a/main/src/addins/MacPlatform/icons/continue@2x.png +++ b/main/src/addins/MacPlatform/icons/continue@2x.png diff --git a/main/src/addins/MacPlatform/icons/continue~dark.png b/main/src/addins/MacPlatform/icons/continue~dark.png Binary files differnew file mode 100644 index 0000000000..42f0572c2a --- /dev/null +++ b/main/src/addins/MacPlatform/icons/continue~dark.png diff --git a/main/src/addins/MacPlatform/icons/continue~dark@2x.png b/main/src/addins/MacPlatform/icons/continue~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f4537f3453 --- /dev/null +++ b/main/src/addins/MacPlatform/icons/continue~dark@2x.png diff --git a/main/src/addins/MacPlatform/icons/device.png b/main/src/addins/MacPlatform/icons/device.png Binary files differindex 51690547be..f31a0b3395 100644 --- a/main/src/addins/MacPlatform/icons/device.png +++ b/main/src/addins/MacPlatform/icons/device.png diff --git a/main/src/addins/MacPlatform/icons/device@2x.png b/main/src/addins/MacPlatform/icons/device@2x.png Binary files differindex a045e0817c..a1996aae86 100644 --- a/main/src/addins/MacPlatform/icons/device@2x.png +++ b/main/src/addins/MacPlatform/icons/device@2x.png diff --git a/main/src/addins/MacPlatform/icons/device~dark.png b/main/src/addins/MacPlatform/icons/device~dark.png Binary files differnew file mode 100644 index 0000000000..659a8524ed --- /dev/null +++ b/main/src/addins/MacPlatform/icons/device~dark.png diff --git a/main/src/addins/MacPlatform/icons/device~dark@2x.png b/main/src/addins/MacPlatform/icons/device~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2c116ae133 --- /dev/null +++ b/main/src/addins/MacPlatform/icons/device~dark@2x.png diff --git a/main/src/addins/MacPlatform/icons/project.png b/main/src/addins/MacPlatform/icons/project.png Binary files differindex f25fdbfb2e..8bcf80e198 100644 --- a/main/src/addins/MacPlatform/icons/project.png +++ b/main/src/addins/MacPlatform/icons/project.png diff --git a/main/src/addins/MacPlatform/icons/project@2x.png b/main/src/addins/MacPlatform/icons/project@2x.png Binary files differindex e5e08d504f..c105ae6dad 100644 --- a/main/src/addins/MacPlatform/icons/project@2x.png +++ b/main/src/addins/MacPlatform/icons/project@2x.png diff --git a/main/src/addins/MacPlatform/icons/project~dark.png b/main/src/addins/MacPlatform/icons/project~dark.png Binary files differnew file mode 100644 index 0000000000..b7e415813e --- /dev/null +++ b/main/src/addins/MacPlatform/icons/project~dark.png diff --git a/main/src/addins/MacPlatform/icons/project~dark@2x.png b/main/src/addins/MacPlatform/icons/project~dark@2x.png Binary files differnew file mode 100644 index 0000000000..4ff49d2d73 --- /dev/null +++ b/main/src/addins/MacPlatform/icons/project~dark@2x.png diff --git a/main/src/addins/MacPlatform/icons/stop.png b/main/src/addins/MacPlatform/icons/stop.png Binary files differindex 62501d3cab..6af6b394c7 100644 --- a/main/src/addins/MacPlatform/icons/stop.png +++ b/main/src/addins/MacPlatform/icons/stop.png diff --git a/main/src/addins/MacPlatform/icons/stop@2x.png b/main/src/addins/MacPlatform/icons/stop@2x.png Binary files differindex 3870bc446d..a7d453d517 100644 --- a/main/src/addins/MacPlatform/icons/stop@2x.png +++ b/main/src/addins/MacPlatform/icons/stop@2x.png diff --git a/main/src/addins/MacPlatform/icons/stop~dark.png b/main/src/addins/MacPlatform/icons/stop~dark.png Binary files differnew file mode 100644 index 0000000000..c93648fc0a --- /dev/null +++ b/main/src/addins/MacPlatform/icons/stop~dark.png diff --git a/main/src/addins/MacPlatform/icons/stop~dark@2x.png b/main/src/addins/MacPlatform/icons/stop~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e6c46dad8c --- /dev/null +++ b/main/src/addins/MacPlatform/icons/stop~dark@2x.png diff --git a/main/src/addins/MacPlatform/maintoolbarbg~dark.png b/main/src/addins/MacPlatform/maintoolbarbg~dark.png Binary files differnew file mode 100644 index 0000000000..3baa390e31 --- /dev/null +++ b/main/src/addins/MacPlatform/maintoolbarbg~dark.png diff --git a/main/src/addins/MacPlatform/maintoolbarbg~dark@2x.png b/main/src/addins/MacPlatform/maintoolbarbg~dark@2x.png Binary files differnew file mode 100644 index 0000000000..edc2ef3803 --- /dev/null +++ b/main/src/addins/MacPlatform/maintoolbarbg~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs index 7988671f8a..3266afe292 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs @@ -42,7 +42,7 @@ namespace MonoDevelop.Debugger.PreviewVisualizers public override Control GetVisualizerWidget (ObjectValue val) { string value = val.Value; - Gdk.Color col = new Gdk.Color (85, 85, 85); + Gdk.Color col = Styles.PreviewVisualizerTextColor.ToGdkColor (); if (!val.IsNull && (val.TypeName == "string" || val.TypeName == "char[]")) value = '"' + GetString (val) + '"'; @@ -51,7 +51,7 @@ namespace MonoDevelop.Debugger.PreviewVisualizers var label = new Gtk.Label (); label.Text = value; - var font = label.Style.FontDescription.Copy (); + var font = label.Style.FontDescription.Copy (); // TODO: VV: Use FontService if (font.SizeIsAbsolute) { font.AbsoluteSize = font.Size - 1; diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs index a3bd79b733..b928141e25 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs @@ -44,7 +44,7 @@ namespace MonoDevelop.Debugger this.Modal = true; TransientFor = (Gtk.Window) invokingWidget.Toplevel; - Theme.SetFlatColor (new Cairo.Color (245 / 256.0, 245 / 256.0, 245 / 256.0)); + Theme.SetBackgroundColor (Styles.PreviewVisualizerBackgroundColor.ToCairoColor ()); Theme.Padding = 3; ShowArrow = true; var mainBox = new VBox (); @@ -64,8 +64,8 @@ namespace MonoDevelop.Debugger headerTable.Attach (hb, 0, 1, 0, 1); var headerTitle = new Label (); - headerTitle.ModifyFg (StateType.Normal, new Color (36, 36, 36)); - var font = headerTitle.Style.FontDescription.Copy (); + headerTitle.ModifyFg (StateType.Normal, Styles.PreviewVisualizerHeaderTextColor.ToGdkColor ()); + var font = headerTitle.Style.FontDescription.Copy (); // TODO: VV: Use FontService font.Weight = Pango.Weight.Bold; headerTitle.ModifyFont (font); headerTitle.Text = val.TypeName; diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml index 78c001deee..806bbfd00f 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml @@ -30,12 +30,12 @@ </ExtensionPoint> <Extension path = "/MonoDevelop/Ide/Pads"> <Category id="Debug" _name="Debug Windows"> - <Pad id = "MonoDevelop.Debugger.WatchPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-watch" class = "MonoDevelop.Debugger.WatchPad" _label="Watch" /> - <Pad id = "MonoDevelop.Debugger.LocalsPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-locals" class = "MonoDevelop.Debugger.LocalsPad" _label="Locals" /> <Pad id = "MonoDevelop.Debugger.BreakpointPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-breakpoints" class = "MonoDevelop.Debugger.BreakpointPad" _label="Breakpoints" /> - <Pad id = "MonoDevelop.Debugger.ThreadsPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-threads" class = "MonoDevelop.Debugger.ThreadsPad" _label="Threads" /> - <Pad id = "MonoDevelop.Debugger.StackTracePad" defaultLayout="Debug" defaultPlacement = "MonoDevelop.Debugger.WatchPad/Right Bottom" icon="md-view-debug-call-stack" class = "MonoDevelop.Debugger.StackTracePad" _label="Call Stack" /> + <Pad id = "MonoDevelop.Debugger.LocalsPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-locals" class = "MonoDevelop.Debugger.LocalsPad" _label="Locals" /> + <Pad id = "MonoDevelop.Debugger.WatchPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-watch" class = "MonoDevelop.Debugger.WatchPad" _label="Watch" /> <Pad id = "MonoDevelop.Debugger.ImmediatePad" defaultLayout="Debug" defaultPlacement = "MonoDevelop.Debugger.StackTracePad/Center Bottom" icon="md-view-debug-immediate" class = "MonoDevelop.Debugger.ImmediatePad" _label="Immediate" /> + <Pad id = "MonoDevelop.Debugger.StackTracePad" defaultLayout="Debug" defaultPlacement = "MonoDevelop.Debugger.WatchPad/Right Bottom" icon="md-view-debug-call-stack" class = "MonoDevelop.Debugger.StackTracePad" _label="Call Stack" /> + <Pad id = "MonoDevelop.Debugger.ThreadsPad" defaultLayout="Debug" defaultPlacement = "Bottom" icon="md-view-debug-threads" class = "MonoDevelop.Debugger.ThreadsPad" _label="Threads" /> </Category> </Extension> @@ -56,14 +56,14 @@ <Extension path = "/MonoDevelop/Ide/Commands/Project"> <Command id = "MonoDevelop.Debugger.DebugCommands.Debug" defaultHandler = "MonoDevelop.Debugger.DebugHandler" - icon = "md-execute-debug" + icon = "md-bug" shortcut = "F5" macShortcut = "Meta|Return" _description = "Start debugging" _label = "Start _Debugging" /> <Command id = "MonoDevelop.Debugger.DebugCommands.DebugEntry" defaultHandler = "MonoDevelop.Debugger.DebugEntryHandler" - icon = "md-execute-debug" + icon = "md-bug" _description = "Debug current project" _label = "Start D_ebugging Item" /> </Extension> @@ -124,7 +124,7 @@ <Command id = "MonoDevelop.Debugger.DebugCommands.NewCatchpoint" defaultHandler = "MonoDevelop.Debugger.NewCatchpointHandler" _label = "New Exception Catchpoint" - icon = "md-breakpoint-new" /> + icon = "md-catchpoint-new" /> <Command id = "MonoDevelop.Debugger.DebugCommands.ShowBreakpoints" defaultHandler = "MonoDevelop.Debugger.ShowBreakpointsHandler" _label = "View Breakpoints" @@ -164,6 +164,7 @@ defaultHandler = "MonoDevelop.Debugger.ExpressionEvaluatorCommand" /> <Command id = "MonoDevelop.Debugger.DebugCommands.ShowCurrentExecutionLine" _label = "Show Current Execution Line" + icon = "md-go-to-line" shortcut = "Alt|*" defaultHandler = "MonoDevelop.Debugger.ShowCurrentExecutionLineCommand" /> <Command id = "MonoDevelop.Debugger.DebugCommands.AddWatch" @@ -230,15 +231,12 @@ </Extension> <Extension path = "/MonoDevelop/Core/StockIcons"> - <StockIcon stockid = "md-execute-debug" icon = "gtk-execute|res:debug-overlay-16.png" size = "Menu"/> - <StockIcon stockid = "md-execute-debug" icon = "gtk-execute|res:debug-overlay-22.png" size = "SmallToolbar"/> - <StockIcon stockid = "md-execute-debug" icon = "gtk-execute|res:debug-overlay-24.png" size = "LargeToolbar"/> <StockIcon stockid = "md-continue-debug" resource = "continue-16.png" size = "Menu"/> <StockIcon stockid = "md-pause-debug" resource = "pause-16.png" size = "Menu"/> <StockIcon stockid = "md-step-into-debug" resource = "step-in-16.png" size = "Menu"/> <StockIcon stockid = "md-step-out-debug" resource = "step-out-16.png" size = "Menu"/> <StockIcon stockid = "md-step-over-debug" resource = "step-over-16.png" size = "Menu"/> - <StockIcon stockid = "md-view-debug-breakpoints" resource = "breakpoint-16.png" size="Menu" /> + <StockIcon stockid = "md-view-debug-breakpoints" resource = "pad-breakpoints-16.png" size="Menu" /> <StockIcon stockid = "md-view-debug-call-stack" resource = "pad-call-stack-16.png" size="Menu" /> <StockIcon stockid = "md-view-debug-locals" resource = "pad-locals-16.png" size="Menu" /> <StockIcon stockid = "md-view-debug-threads" resource = "pad-threads-16.png" size="Menu" /> diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj index e91e14eb0a..2286ac6889 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj @@ -200,6 +200,7 @@ <Compile Include="MonoDevelop.Debugger\SourceCodeLookup.cs" /> <Compile Include="gtk-gui\MonoDevelop.Debugger.DebugApplicationDialog.cs" /> <Compile Include="MonoDevelop.Debugger\DebugApplicationDialog.cs" /> + <Compile Include="MonoDevelop.Debugger\Styles.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="MonoDevelop.Debugger.addin.xml"> @@ -208,35 +209,53 @@ <EmbeddedResource Include="gtk-gui\gui.stetic"> <LogicalName>gui.stetic</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\debug-overlay-16.png"> - <LogicalName>debug-overlay-16.png</LogicalName> + <EmbeddedResource Include="icons\breakpoint-16.png"> + <LogicalName>breakpoint-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\debug-overlay-16%402x.png"> - <LogicalName>debug-overlay-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\breakpoint-16%402x.png"> + <LogicalName>breakpoint-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\debug-overlay-22.png"> - <LogicalName>debug-overlay-22.png</LogicalName> + <EmbeddedResource Include="icons\breakpoint-16~dark.png"> + <LogicalName>breakpoint-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\debug-overlay-22%402x.png"> - <LogicalName>debug-overlay-22@2x.png</LogicalName> + <EmbeddedResource Include="icons\breakpoint-16~dark%402x.png"> + <LogicalName>breakpoint-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\debug-overlay-24.png"> - <LogicalName>debug-overlay-24.png</LogicalName> + <EmbeddedResource Include="icons\breakpoint-16~disabled.png"> + <LogicalName>breakpoint-16~disabled.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\debug-overlay-24%402x.png"> - <LogicalName>debug-overlay-24@2x.png</LogicalName> + <EmbeddedResource Include="icons\breakpoint-16~disabled%402x.png"> + <LogicalName>breakpoint-16~disabled@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\debug-overlay-32.png"> - <LogicalName>debug-overlay-32.png</LogicalName> + <EmbeddedResource Include="icons\breakpoint-16~dark~disabled.png"> + <LogicalName>breakpoint-16~dark~disabled.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\debug-overlay-32%402x.png"> - <LogicalName>debug-overlay-32@2x.png</LogicalName> + <EmbeddedResource Include="icons\breakpoint-16~dark~disabled%402x.png"> + <LogicalName>breakpoint-16~dark~disabled@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\breakpoint-16.png"> - <LogicalName>breakpoint-16.png</LogicalName> + <EmbeddedResource Include="icons\pad-breakpoints-16.png"> + <LogicalName>pad-breakpoints-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\breakpoint-16%402x.png"> - <LogicalName>breakpoint-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\pad-breakpoints-16%402x.png"> + <LogicalName>pad-breakpoints-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-breakpoints-16~dark.png"> + <LogicalName>pad-breakpoints-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-breakpoints-16~dark%402x.png"> + <LogicalName>pad-breakpoints-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-breakpoints-16~sel.png"> + <LogicalName>pad-breakpoints-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-breakpoints-16~sel%402x.png"> + <LogicalName>pad-breakpoints-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-breakpoints-16~dark~sel.png"> + <LogicalName>pad-breakpoints-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-breakpoints-16~dark~sel%402x.png"> + <LogicalName>pad-breakpoints-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pad-call-stack-16.png"> <LogicalName>pad-call-stack-16.png</LogicalName> @@ -244,96 +263,276 @@ <EmbeddedResource Include="icons\pad-call-stack-16%402x.png"> <LogicalName>pad-call-stack-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pad-call-stack-16~dark.png"> + <LogicalName>pad-call-stack-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-call-stack-16~dark%402x.png"> + <LogicalName>pad-call-stack-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-call-stack-16~sel.png"> + <LogicalName>pad-call-stack-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-call-stack-16~sel%402x.png"> + <LogicalName>pad-call-stack-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-call-stack-16~dark~sel.png"> + <LogicalName>pad-call-stack-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-call-stack-16~dark~sel%402x.png"> + <LogicalName>pad-call-stack-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\pad-locals-16.png"> <LogicalName>pad-locals-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pad-locals-16%402x.png"> <LogicalName>pad-locals-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pad-locals-16~dark.png"> + <LogicalName>pad-locals-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-locals-16~dark%402x.png"> + <LogicalName>pad-locals-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-locals-16~sel.png"> + <LogicalName>pad-locals-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-locals-16~sel%402x.png"> + <LogicalName>pad-locals-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-locals-16~dark~sel.png"> + <LogicalName>pad-locals-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-locals-16~dark~sel%402x.png"> + <LogicalName>pad-locals-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\pad-threads-16.png"> <LogicalName>pad-threads-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pad-threads-16%402x.png"> <LogicalName>pad-threads-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pad-threads-16~dark.png"> + <LogicalName>pad-threads-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-threads-16~dark%402x.png"> + <LogicalName>pad-threads-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-threads-16~sel.png"> + <LogicalName>pad-threads-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-threads-16~sel%402x.png"> + <LogicalName>pad-threads-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-threads-16~dark~sel.png"> + <LogicalName>pad-threads-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-threads-16~dark~sel%402x.png"> + <LogicalName>pad-threads-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\pad-watch-16.png"> <LogicalName>pad-watch-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pad-watch-16%402x.png"> <LogicalName>pad-watch-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pad-watch-16~dark.png"> + <LogicalName>pad-watch-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-watch-16~dark%402x.png"> + <LogicalName>pad-watch-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-watch-16~sel.png"> + <LogicalName>pad-watch-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-watch-16~sel%402x.png"> + <LogicalName>pad-watch-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-watch-16~dark~sel.png"> + <LogicalName>pad-watch-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-watch-16~dark~sel%402x.png"> + <LogicalName>pad-watch-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-debugger-16.png"> <LogicalName>prefs-debugger-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-debugger-16%402x.png"> <LogicalName>prefs-debugger-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-debugger-16~dark.png"> + <LogicalName>prefs-debugger-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-debugger-16~dark%402x.png"> + <LogicalName>prefs-debugger-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-debugger-16~sel.png"> + <LogicalName>prefs-debugger-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-debugger-16~sel%402x.png"> + <LogicalName>prefs-debugger-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-debugger-16~dark~sel.png"> + <LogicalName>prefs-debugger-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-debugger-16~dark~sel%402x.png"> + <LogicalName>prefs-debugger-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\lightning-16.png"> <LogicalName>lightning-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\lightning-16%402x.png"> <LogicalName>lightning-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\lightning-16~dark.png"> + <LogicalName>lightning-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\lightning-16~dark%402x.png"> + <LogicalName>lightning-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\lightning-16~disabled.png"> + <LogicalName>lightning-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\lightning-16~disabled%402x.png"> + <LogicalName>lightning-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\lightning-16~dark~disabled.png"> + <LogicalName>lightning-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\lightning-16~dark~disabled%402x.png"> + <LogicalName>lightning-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\exception-48.png"> <LogicalName>exception-48.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\exception-48%402x.png"> <LogicalName>exception-48@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\exception-48~dark.png"> + <LogicalName>exception-48~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\exception-48~dark%402x.png"> + <LogicalName>exception-48~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\gutter-breakpoint-15.png"> <LogicalName>gutter-breakpoint-15.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\gutter-breakpoint-15%402x.png"> <LogicalName>gutter-breakpoint-15@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-breakpoint-15~dark.png"> + <LogicalName>gutter-breakpoint-15~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-breakpoint-15~dark%402x.png"> + <LogicalName>gutter-breakpoint-15~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\gutter-breakpoint-disabled-15.png"> <LogicalName>gutter-breakpoint-disabled-15.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\gutter-breakpoint-disabled-15%402x.png"> <LogicalName>gutter-breakpoint-disabled-15@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-breakpoint-disabled-15~dark.png"> + <LogicalName>gutter-breakpoint-disabled-15~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-breakpoint-disabled-15~dark%402x.png"> + <LogicalName>gutter-breakpoint-disabled-15~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\gutter-breakpoint-invalid-15.png"> <LogicalName>gutter-breakpoint-invalid-15.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\gutter-breakpoint-invalid-15%402x.png"> <LogicalName>gutter-breakpoint-invalid-15@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-breakpoint-invalid-15~dark.png"> + <LogicalName>gutter-breakpoint-invalid-15~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-breakpoint-invalid-15~dark%402x.png"> + <LogicalName>gutter-breakpoint-invalid-15~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\gutter-execution-15.png"> <LogicalName>gutter-execution-15.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\gutter-execution-15%402x.png"> <LogicalName>gutter-execution-15@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-execution-15~dark.png"> + <LogicalName>gutter-execution-15~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-execution-15~dark%402x.png"> + <LogicalName>gutter-execution-15~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\gutter-stack-15.png"> <LogicalName>gutter-stack-15.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\gutter-stack-15%402x.png"> <LogicalName>gutter-stack-15@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-stack-15~dark.png"> + <LogicalName>gutter-stack-15~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-stack-15~dark%402x.png"> + <LogicalName>gutter-stack-15~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\gutter-tracepoint-15.png"> <LogicalName>gutter-tracepoint-15.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\gutter-tracepoint-15%402x.png"> <LogicalName>gutter-tracepoint-15@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-tracepoint-15~dark.png"> + <LogicalName>gutter-tracepoint-15~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-tracepoint-15~dark%402x.png"> + <LogicalName>gutter-tracepoint-15~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\gutter-tracepoint-disabled-15.png"> <LogicalName>gutter-tracepoint-disabled-15.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\gutter-tracepoint-disabled-15%402x.png"> <LogicalName>gutter-tracepoint-disabled-15@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-tracepoint-disabled-15~dark.png"> + <LogicalName>gutter-tracepoint-disabled-15~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-tracepoint-disabled-15~dark%402x.png"> + <LogicalName>gutter-tracepoint-disabled-15~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\gutter-tracepoint-invalid-15.png"> <LogicalName>gutter-tracepoint-invalid-15.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\gutter-tracepoint-invalid-15%402x.png"> <LogicalName>gutter-tracepoint-invalid-15@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-tracepoint-invalid-15~dark.png"> + <LogicalName>gutter-tracepoint-invalid-15~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-tracepoint-invalid-15~dark%402x.png"> + <LogicalName>gutter-tracepoint-invalid-15~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\stack-pointer-16.png"> <LogicalName>stack-pointer-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\stack-pointer-16%402x.png"> <LogicalName>stack-pointer-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\stack-pointer-16~dark.png"> + <LogicalName>stack-pointer-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\stack-pointer-16~dark%402x.png"> + <LogicalName>stack-pointer-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\stack-pointer-16~disabled.png"> + <LogicalName>stack-pointer-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\stack-pointer-16~disabled%402x.png"> + <LogicalName>stack-pointer-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\stack-pointer-16~dark~disabled.png"> + <LogicalName>stack-pointer-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\stack-pointer-16~dark~disabled%402x.png"> + <LogicalName>stack-pointer-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> </ItemGroup> <ItemGroup Condition=" '$(Configuration)' != 'DebugMac' AND '$(Configuration)' != 'ReleaseMac' "> <EmbeddedResource Include="icons\pause-16.png"> @@ -368,36 +567,102 @@ </EmbeddedResource> </ItemGroup> <ItemGroup Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' "> - <EmbeddedResource Include="icons\mac\pause.png"> + <EmbeddedResource Include="icons\mac\pause-16.png"> <LogicalName>pause-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\mac\pause%402x.png"> + <EmbeddedResource Include="icons\mac\pause-16%402x.png"> <LogicalName>pause-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\mac\pause-16~dark.png"> + <LogicalName>pause-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\pause-16~dark%402x.png"> + <LogicalName>pause-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\mac\continue-16.png"> <LogicalName>continue-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\mac\continue-16%402x.png"> <LogicalName>continue-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\mac\continue-16~dark.png"> + <LogicalName>continue-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\continue-16~dark%402x.png"> + <LogicalName>continue-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\mac\step-in-16%402x.png"> <LogicalName>step-in-16@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\mac\step-in-16.png"> <LogicalName>step-in-16.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-in-16~disabled.png"> + <LogicalName>step-in-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-in-16~disabled%402x.png"> + <LogicalName>step-in-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-in-16~dark.png"> + <LogicalName>step-in-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-in-16~dark%402x.png"> + <LogicalName>step-in-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-in-16~disabled~dark.png"> + <LogicalName>step-in-16~disabled~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-in-16~disabled~dark%402x.png"> + <LogicalName>step-in-16~disabled~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\mac\step-out-16.png"> <LogicalName>step-out-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\mac\step-out-16%402x.png"> <LogicalName>step-out-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-out-16~disabled.png"> + <LogicalName>step-out-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-out-16~disabled%402x.png"> + <LogicalName>step-out-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-out-16~dark.png"> + <LogicalName>step-out-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-out-16~dark%402x.png"> + <LogicalName>step-out-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-out-16~disabled~dark.png"> + <LogicalName>step-out-16~disabled~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-out-16~disabled~dark%402x.png"> + <LogicalName>step-out-16~disabled~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\mac\step-over-16.png"> <LogicalName>step-over-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\mac\step-over-16%402x.png"> <LogicalName>step-over-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-over-16~disabled.png"> + <LogicalName>step-over-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-over-16~disabled%402x.png"> + <LogicalName>step-over-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-over-16~dark.png"> + <LogicalName>step-over-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-over-16~dark%402x.png"> + <LogicalName>step-over-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-over-16~disabled~dark.png"> + <LogicalName>step-over-16~disabled~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\mac\step-over-16~disabled~dark%402x.png"> + <LogicalName>step-over-16~disabled~dark@2x.png</LogicalName> + </EmbeddedResource> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPad.cs index 21036158c2..9c395b5889 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPad.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPad.cs @@ -75,7 +75,7 @@ namespace MonoDevelop.Debugger // Toolbar and menu definitions ActionCommand gotoCmd = new ActionCommand (LocalCommands.GoToFile, GettextCatalog.GetString ("Go to File")); - ActionCommand propertiesCmd = new ActionCommand (LocalCommands.Properties, GettextCatalog.GetString ("Properties"), Gtk.Stock.Properties); + ActionCommand propertiesCmd = new ActionCommand (LocalCommands.Properties, GettextCatalog.GetString ("Properties"), Stock.Properties); menuSet = new CommandEntrySet (); menuSet.Add (gotoCmd); diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs index 1029bd3a67..cb282f2f2b 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebugCommands.cs @@ -129,7 +129,7 @@ namespace MonoDevelop.Debugger // just run, so the label has to be changed accordingly. if (!DebuggingService.IsDebuggingSupported) { info.Text = IdeApp.ProjectOperations.CurrentRunOperation.IsCompleted ? GettextCatalog.GetString ("Start Without Debugging") : GettextCatalog.GetString ("Restart Without Debugging"); - info.Icon = "gtk-execute"; + info.Icon = Stock.RunProgramIcon; } if (IdeApp.Workspace.IsOpen) { diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs index b9c731e51c..f53884d81c 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs @@ -706,7 +706,7 @@ namespace MonoDevelop.Debugger busyEvaluator.UpdateBusyState (args); if (args.IsBusy) { if (busyStatusIcon == null) { - busyStatusIcon = IdeApp.Workbench.StatusBar.ShowStatusIcon (ImageService.GetIcon ("md-execute-debug", Gtk.IconSize.Menu)); + busyStatusIcon = IdeApp.Workbench.StatusBar.ShowStatusIcon (ImageService.GetIcon ("md-bug", Gtk.IconSize.Menu)); busyStatusIcon.SetAlertMode (100); busyStatusIcon.ToolTip = GettextCatalog.GetString ("The debugger runtime is not responding. You can wait for it to recover, or stop debugging."); busyStatusIcon.Clicked += OnBusyStatusIconClicked; diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs index 2b05939b5b..602cc05c42 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs @@ -64,6 +64,7 @@ namespace MonoDevelop.Debugger public ExceptionCaughtDialog (ExceptionInfo ex, ExceptionCaughtMessage msg) { + this.ApplyTheme (); selected = exception = ex; message = msg; @@ -114,7 +115,7 @@ namespace MonoDevelop.Debugger { ExceptionValueTreeView = new ObjectValueTreeView (); ExceptionValueTreeView.Frame = DebuggingService.CurrentFrame; - ExceptionValueTreeView.ModifyBase (StateType.Normal, new Gdk.Color (223, 228, 235)); + ExceptionValueTreeView.ModifyBase (StateType.Normal, Styles.ExceptionCaughtDialog.TreeBackgroundColor.ToGdkColor ()); ExceptionValueTreeView.AllowPopupMenu = false; ExceptionValueTreeView.AllowExpanding = true; ExceptionValueTreeView.AllowPinning = false; @@ -408,7 +409,7 @@ namespace MonoDevelop.Debugger class StackFrameCellRenderer : CellRenderer { - static readonly Pango.FontDescription LineNumberFont = FontService.MonospaceFont.CopyModified (0.9d); + static readonly Pango.FontDescription LineNumberFont = FontService.MonospaceFont.CopyModified (Ide.Gui.Styles.FontScale11); const int RoundedRectangleRadius = 2; const int RoundedRectangleHeight = 14; const int RoundedRectangleWidth = 28; @@ -439,7 +440,7 @@ namespace MonoDevelop.Debugger Pango.Rectangle ink, logical; layout.Width = (int) (MaxMarkupWidth * Pango.Scale.PangoScale); - layout.SetMarkup (GetMarkup (false)); + layout.SetMarkup (GetMarkup (false, widget)); layout.GetPixelExtents (out ink, out logical); @@ -470,18 +471,13 @@ namespace MonoDevelop.Debugger cr.Clip (); if (IsUserCode) - cr.SetSourceRGBA (0.90, 0.60, 0.87, 1.0); // 230, 152, 223 + cr.SetSourceColor (Styles.ExceptionCaughtDialog.LineNumberInUserCodeBackgroundColor.ToCairoColor ()); // 230, 152, 223 else - cr.SetSourceRGBA (0.77, 0.77, 0.77, 1.0); // 197, 197, 197 + cr.SetSourceColor (Styles.ExceptionCaughtDialog.LineNumberBackgroundColor.ToCairoColor ()); // 197, 197, 197 cr.RoundedRectangle (0.0, 0.0, RoundedRectangleWidth, RoundedRectangleHeight, RoundedRectangleRadius); cr.Fill (); - cr.SetSourceRGBA (0.0, 0.0, 0.0, 0.11); - cr.RoundedRectangle (0.0, 0.0, RoundedRectangleWidth, RoundedRectangleHeight, RoundedRectangleRadius); - cr.LineWidth = 2; - cr.Stroke (); - var lineNumber = !string.IsNullOrEmpty (Frame.File) ? Frame.Line : -1; using (var layout = PangoUtil.CreateLayout (widget, lineNumber != -1 ? lineNumber.ToString () : "???")) { @@ -494,14 +490,7 @@ namespace MonoDevelop.Debugger double y_offset = (RoundedRectangleHeight - height) / 2.0; double x_offset = (RoundedRectangleWidth - width) / 2.0; - // render the text shadow - cr.Save (); - cr.SetSourceRGBA (0.0, 0.0, 0.0, 0.34); - cr.Translate (x_offset, y_offset + 1); - cr.ShowLayout (layout); - cr.Restore (); - - cr.SetSourceRGBA (1.0, 1.0, 1.0, 1.0); + cr.SetSourceColor (Styles.ExceptionCaughtDialog.LineNumberTextColor.ToCairoColor ()); cr.Translate (x_offset, y_offset); cr.ShowLayout (layout); } @@ -509,18 +498,17 @@ namespace MonoDevelop.Debugger cr.Restore (); } - string GetMarkup (bool selected) + string GetMarkup (bool selected, Gtk.Widget parent) { - if (Markup != null) - return Markup; + string text_color = selected ? parent.Style.Text (StateType.Selected).GetHex () : parent.Style.Text (StateType.Normal).GetHex (); - var markup = string.Format ("<b>{0}</b>", GLib.Markup.EscapeText (Frame.DisplayText)); + if (Markup != null) + return "<span foreground='" + text_color + "'>" + Markup + "</span>"; - if (selected) - markup = "<span foreground='#FFFFFF'>" + markup + "</span>"; + var markup = string.Format ("<span foreground='{0}'><b>{1}</b></span>", text_color, GLib.Markup.EscapeText (Frame.DisplayText)); if (!string.IsNullOrEmpty (Frame.File)) { - markup += string.Format ("\n<span size='smaller' foreground='{0}'>{1}", selected ? "#FFFFFF" : "#777777", GLib.Markup.EscapeText (Frame.File)); + markup += string.Format ("<span size='4096'>\n\n</span><span size='small' foreground='{0}'>{1}", text_color, GLib.Markup.EscapeText (Frame.File)); if (Frame.Line > 0) { markup += ":" + Frame.Line; if (Frame.Column > 0) @@ -539,7 +527,7 @@ namespace MonoDevelop.Debugger Pango.Rectangle ink, logical; layout.Width = (int) (MaxMarkupWidth * Pango.Scale.PangoScale); - layout.SetMarkup (GetMarkup ((flags & CellRendererState.Selected) != 0)); + layout.SetMarkup (GetMarkup ((flags & CellRendererState.Selected) != 0, widget)); layout.GetPixelExtents (out ink, out logical); diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/InfoFrame.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/InfoFrame.cs index ca2cebd26b..882f54980b 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/InfoFrame.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/InfoFrame.cs @@ -1,33 +1,34 @@ -// -// InfoFrame.cs -// -// Author: -// Jeffrey Stedfast <jeff@xamarin.com> -// -// Copyright (c) 2013 Xamarin Inc. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - +//
+// InfoFrame.cs
+//
+// Author:
+// Jeffrey Stedfast <jeff@xamarin.com>
+//
+// Copyright (c) 2013 Xamarin Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
using System; using Gtk; - +using MonoDevelop.Components;
+
namespace MonoDevelop.Debugger { [System.ComponentModel.ToolboxItem (true)] @@ -49,10 +50,10 @@ namespace MonoDevelop.Debugger cr.Rectangle (Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height); cr.ClipPreserve (); - cr.SetSourceRGB (1.00, 0.98, 0.91); + cr.SetSourceColor (Styles.ExceptionCaughtDialog.InfoFrameBackgroundColor.ToCairoColor ()); cr.FillPreserve (); - cr.SetSourceRGB (0.87, 0.83, 0.74); + cr.SetSourceColor (Styles.ExceptionCaughtDialog.InfoFrameBorderColor.ToCairoColor ()); cr.LineWidth = 2; cr.Stroke (); } diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs index 1434976de3..5f27a3c01a 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs @@ -41,6 +41,7 @@ using MonoDevelop.Components.Commands; using MonoDevelop.Ide.Commands; using MonoDevelop.Ide.Editor.Extension; using System.Linq; +using MonoDevelop.Ide.Fonts; namespace MonoDevelop.Debugger { @@ -89,10 +90,6 @@ namespace MonoDevelop.Debugger readonly TreeViewColumn typeCol; readonly TreeViewColumn pinCol; - const string errorColor = "red"; - const string modifiedColor = "blue"; - const string disabledColor = "gray"; - static readonly CommandEntrySet menuSet; const int NameColumn = 0; @@ -255,9 +252,9 @@ namespace MonoDevelop.Debugger cell_area.Height - TopBottomPadding * 2 - 1, (cell_area.Height - (TopBottomPadding * 2)) / 2); cr.LineWidth = 1; - cr.SetSourceRGB (233 / 255.0, 242 / 255.0, 252 / 255.0); + cr.SetSourceColor (Styles.ObjectValueTreeValuesButtonBackground.ToCairoColor ()); cr.FillPreserve (); - cr.SetSourceRGB (82 / 255.0, 148 / 255.0, 235 / 255.0); + cr.SetSourceColor (Styles.ObjectValueTreeValuesButtonBorder.ToCairoColor ()); cr.Stroke (); int YOffset = (cell_area.Height - h) / 2; @@ -266,7 +263,7 @@ namespace MonoDevelop.Debugger window.DrawLayoutWithColors (widget.Style.TextGC (StateType.Normal), cell_area.X + (cell_area.Height - TopBottomPadding * 2 + 1) / 2 + xpad, cell_area.Y + YOffset, - layout, new Gdk.Color (82, 148, 235), new Gdk.Color (233, 242, 252)); + layout, Styles.ObjectValueTreeValuesButtonText.ToGdkColor(), Styles.ObjectValueTreeValuesButtonBackground.ToGdkColor()); } } } @@ -302,7 +299,7 @@ namespace MonoDevelop.Debugger Selection.Changed += HandleSelectionChanged; ResetColumnSizes (); - Pango.FontDescription newFont = Style.FontDescription.Copy (); + Pango.FontDescription newFont = Style.FontDescription.Copy (); // TODO: VV: Use FontService newFont.Size = (newFont.Size * 8) / 10; liveIcon = ImageService.GetIcon (Stock.Execute, IconSize.Menu); @@ -473,8 +470,6 @@ namespace MonoDevelop.Debugger } } - Dictionary<TreeIter, bool> evalSpinnersIcons = new Dictionary<TreeIter, bool>(); - void HandleSelectionChanged (object sender, EventArgs e) { if (!currentHoverIter.Equals (TreeIter.Zero) && store.IterIsValid (currentHoverIter)) { @@ -484,19 +479,6 @@ namespace MonoDevelop.Debugger SetPreviewButtonIcon (iconBeforeSelected, currentHoverIter); } } - foreach (var s in evalSpinnersIcons.ToArray()) { - if (store.IterIsValid (s.Key) && Selection.IterIsSelected (s.Key)) { - if (!s.Value) { - store.LoadIcon (s.Key, EvaluateStatusIconColumn, "md-spinner-selected-16", IconSize.Menu); - evalSpinnersIcons [s.Key] = true; - } - } else { - if (s.Value) { - store.LoadIcon (s.Key, EvaluateStatusIconColumn, "md-spinner-normal-16", IconSize.Menu); - evalSpinnersIcons [s.Key] = false; - } - } - } } Adjustment oldHadjustment; @@ -760,12 +742,11 @@ namespace MonoDevelop.Debugger compact = value; Pango.FontDescription newFont; if (compact) { - newFont = Style.FontDescription.Copy (); - newFont.Size = (newFont.Size * 8) / 10; + newFont = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); valueCol.MaxWidth = 800; crpViewer.Image = ImageService.GetIcon (Stock.Edit).WithSize (12,12); } else { - newFont = Style.FontDescription; + newFont = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale12); valueCol.MaxWidth = int.MaxValue; } typeCol.Visible = !compact; @@ -901,7 +882,7 @@ namespace MonoDevelop.Debugger ShowExpanders = true; if (AllowAdding) - store.AppendValues (createMsg, "", "", null, true, true, null, disabledColor, disabledColor); + store.AppendValues (createMsg, "", "", null, true, true, null, Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueDisabledText), Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueDisabledText)); LoadState (); } @@ -1148,7 +1129,7 @@ namespace MonoDevelop.Debugger if (val.IsUnknown) { if (frame != null) { strval = GettextCatalog.GetString ("The name '{0}' does not exist in the current context.", val.Name); - nameColor = disabledColor; + nameColor = Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueDisabledText); canEdit = false; } else { canEdit = !val.IsReadOnly; @@ -1161,27 +1142,22 @@ namespace MonoDevelop.Debugger int i = strval.IndexOf ('\n'); if (i != -1) strval = strval.Substring (0, i); - valueColor = errorColor; + valueColor = Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueErrorText); canEdit = false; } else if (val.IsNotSupported) { strval = "";//val.Value; with new "Show Value" button we don't want to display message "Implicit evaluation is disabled" - valueColor = disabledColor; + valueColor = Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueDisabledText); if (val.CanRefresh) valueButton = GettextCatalog.GetString ("Show Value"); canEdit = false; } else if (val.IsEvaluating) { strval = GettextCatalog.GetString ("Evaluating..."); - if (Selection.IterIsSelected (it)) { - evalSpinnersIcons [it] = true; - evaluateStatusIcon = "md-spinner-selected-16"; - } else { - evalSpinnersIcons [it] = false; - evaluateStatusIcon = "md-spinner-normal-16"; - } - valueColor = disabledColor; + evaluateStatusIcon = "md-spinner-16"; + + valueColor = Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueDisabledText); if (val.IsEvaluatingGroup) { - nameColor = disabledColor; + nameColor = Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueDisabledText); name = val.Name; } canEdit = false; @@ -1206,7 +1182,7 @@ namespace MonoDevelop.Debugger strval = val.DisplayValue ?? "(null)"; } if (oldValue != null && strval != oldValue) - nameColor = valueColor = modifiedColor; + nameColor = valueColor = Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueModifiedText); } strval = strval.Replace ("\r\n", " ").Replace ("\n", " "); @@ -1222,9 +1198,6 @@ namespace MonoDevelop.Debugger store.SetValue (it, IconColumn, icon); store.SetValue (it, NameColorColumn, nameColor); store.SetValue (it, ValueColorColumn, valueColor); - if (evaluateStatusIcon != "md-spinner-normal-16" && evaluateStatusIcon != "md-spinner-selected-16") { - evalSpinnersIcons.Remove (it); - } store.SetValue (it, EvaluateStatusIconVisibleColumn, evaluateStatusIcon != null); store.LoadIcon (it, EvaluateStatusIconColumn, evaluateStatusIcon, IconSize.Menu); store.SetValue (it, ValueButtonVisibleColumn, valueButton != null); @@ -1509,7 +1482,7 @@ namespace MonoDevelop.Debugger string oldValue; if (oldValues.TryGetValue (valPath, out oldValue)) { if (oldValue != val.Value) - newColor = modifiedColor; + newColor = Ide.Gui.Styles.ColorGetHex (Styles.ObjectValueTreeValueModifiedText); } store.SetValue (it, NameColorColumn, newColor); diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs index a3ecf8f8cb..3e46fd0f6d 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs @@ -84,7 +84,7 @@ namespace MonoDevelop.Debugger IPadWindow window; bool needsUpdate; - static Xwt.Drawing.Image pointerImage = Xwt.Drawing.Image.FromResource ("stack-pointer-16.png"); + static Xwt.Drawing.Image pointerImage = ImageService.GetIcon ("md-stack-pointer", IconSize.Menu); public StackTracePadWidget () { diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Styles.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Styles.cs new file mode 100644 index 0000000000..f1574640e3 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Styles.cs @@ -0,0 +1,108 @@ +// +// Styles.cs +// +// Author: +// Vsevolod Kukol <sevo@xamarin.com> +// +// Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +using MonoDevelop.Ide; +using MonoDevelop.Components; +using Xwt.Drawing; + +namespace MonoDevelop.Debugger +{ + public static class Styles + { + public static Color ObjectValueTreeValuesButtonBackground { get; internal set; } + public static Color ObjectValueTreeValuesButtonText { get; internal set; } + public static Color ObjectValueTreeValuesButtonBorder { get; internal set; } + public static Color ObjectValueTreeValueErrorText { get; internal set; } + public static Color ObjectValueTreeValueDisabledText { get; internal set; } + public static Color ObjectValueTreeValueModifiedText { get; internal set; } + public static Color PreviewVisualizerBackgroundColor { get; internal set; } + public static Color PreviewVisualizerTextColor { get; internal set; } + public static Color PreviewVisualizerHeaderTextColor { get; internal set; } + + public static ExceptionCaughtDialogStyle ExceptionCaughtDialog { get; internal set; } + + public class ExceptionCaughtDialogStyle + { + public Color TreeBackgroundColor { get; internal set; } + public Color InfoFrameBackgroundColor { get; internal set; } + public Color InfoFrameBorderColor { get; internal set; } + public Color LineNumberBackgroundColor { get; internal set; } + public Color LineNumberInUserCodeBackgroundColor { get; internal set; } + public Color LineNumberTextColor { get; internal set; } + } + + static Styles () + { + LoadStyles (); + MonoDevelop.Ide.Gui.Styles.Changed += (o, e) => LoadStyles (); + } + + public static void LoadStyles () + { + ExceptionCaughtDialog = new ExceptionCaughtDialogStyle (); + + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) { + ObjectValueTreeValuesButtonBackground = Color.FromName ("#e9f2fc"); + ObjectValueTreeValuesButtonText = Color.FromName ("#5294eb"); + ObjectValueTreeValuesButtonBorder = Color.FromName ("#5294eb"); + ObjectValueTreeValueDisabledText = Color.FromName ("#7f7f7f"); + ObjectValueTreeValueModifiedText = Color.FromName ("#85B7F3"); + + PreviewVisualizerHeaderTextColor = Color.FromName ("#242424"); + + ExceptionCaughtDialog.InfoFrameBackgroundColor = Color.FromName ("#fbefce"); + ExceptionCaughtDialog.InfoFrameBorderColor = Color.FromName ("#f0e4c2"); + ExceptionCaughtDialog.LineNumberBackgroundColor = Color.FromName ("#c4c4c4"); + ExceptionCaughtDialog.LineNumberInUserCodeBackgroundColor = Color.FromName ("#e599de"); + ExceptionCaughtDialog.LineNumberTextColor = Color.FromName ("#ffffff"); + } else { + ObjectValueTreeValuesButtonBackground = Color.FromName ("#7c8695"); + ObjectValueTreeValuesButtonText = Color.FromName ("#cbe5ff"); + ObjectValueTreeValuesButtonBorder = Color.FromName ("#a4bbd5"); + ObjectValueTreeValueDisabledText = Color.FromName ("#5a5a5a"); + ObjectValueTreeValueModifiedText = Color.FromName ("#ff00ff"); // TODO: VV: 0000ff + + PreviewVisualizerHeaderTextColor = Color.FromName ("#ff00ff"); // TODO: VV: dbdbdb + + ExceptionCaughtDialog.InfoFrameBackgroundColor = Color.FromName ("#675831"); + ExceptionCaughtDialog.InfoFrameBorderColor = Color.FromName ("#7a6a3d"); + ExceptionCaughtDialog.LineNumberBackgroundColor = Color.FromName ("#c4c4c4"); + ExceptionCaughtDialog.LineNumberInUserCodeBackgroundColor = Color.FromName ("#e599de"); + ExceptionCaughtDialog.LineNumberTextColor = Color.FromName ("#222222"); + } + + // Shared + + ObjectValueTreeValueErrorText = Ide.Gui.Styles.WarningForegroundColor; + + PreviewVisualizerBackgroundColor = MonoDevelop.Ide.Gui.Styles.PopoverWindow.DefaultBackgroundColor; + PreviewVisualizerTextColor = MonoDevelop.Ide.Gui.Styles.PopoverWindow.DefaultTextColor; + + ExceptionCaughtDialog.TreeBackgroundColor = MonoDevelop.Ide.Gui.Styles.PrimaryBackgroundColor; + } + } +} + diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16.png Binary files differindex c0c017eb32..b9a52a2203 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16@2x.png Binary files differindex 9f68a52e2f..e9c7987cef 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark.png Binary files differnew file mode 100644 index 0000000000..de38a0fb46 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..040f23e224 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..2c4c08f2d9 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark~disabled.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..a411a244df --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~dark~disabled@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~disabled.png Binary files differnew file mode 100644 index 0000000000..40138ca93c --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~disabled.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..0aa16e9590 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/breakpoint-16~disabled@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-16.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-16.png Binary files differdeleted file mode 100644 index f26e32207e..0000000000 --- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-16.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-16@2x.png Binary files differdeleted file mode 100644 index 158308d290..0000000000 --- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-16@2x.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-22.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-22.png Binary files differdeleted file mode 100644 index 610440161f..0000000000 --- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-22.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-22@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-22@2x.png Binary files differdeleted file mode 100644 index fae72407dd..0000000000 --- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-22@2x.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-24.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-24.png Binary files differdeleted file mode 100644 index 80cd6238a2..0000000000 --- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-24.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-24@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-24@2x.png Binary files differdeleted file mode 100644 index ef83576302..0000000000 --- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-24@2x.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-32.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-32.png Binary files differdeleted file mode 100644 index e17cb11f60..0000000000 --- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-32.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-32@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-32@2x.png Binary files differdeleted file mode 100644 index 07f213f055..0000000000 --- a/main/src/addins/MonoDevelop.Debugger/icons/debug-overlay-32@2x.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Debugger/icons/exception-48.png b/main/src/addins/MonoDevelop.Debugger/icons/exception-48.png Binary files differindex 6702abf19a..c4c6a89206 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/exception-48.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/exception-48.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/exception-48@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/exception-48@2x.png Binary files differindex c402042406..f0aedb903c 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/exception-48@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/exception-48@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/exception-48~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/exception-48~dark.png Binary files differnew file mode 100644 index 0000000000..f51108466b --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/exception-48~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/exception-48~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/exception-48~dark@2x.png Binary files differnew file mode 100644 index 0000000000..ad0ac47266 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/exception-48~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15.png Binary files differindex 20ecca2fc7..66e56539b2 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15@2x.png Binary files differindex 872a5ff363..f93311be73 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15~dark.png Binary files differnew file mode 100644 index 0000000000..9264ccc01e --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15~dark@2x.png Binary files differnew file mode 100644 index 0000000000..86c904bca7 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-15~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15.png Binary files differindex ada1ad3fb5..b6a2c3ed16 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15@2x.png Binary files differindex a56d3aef2d..415b83ec16 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15~dark.png Binary files differnew file mode 100644 index 0000000000..7b8522627b --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15~dark@2x.png Binary files differnew file mode 100644 index 0000000000..69a9ea9df7 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-disabled-15~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15.png Binary files differindex bfaf88cf34..e35a7fe46a 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15@2x.png Binary files differindex cbf06776a2..8516777e7b 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15~dark.png Binary files differnew file mode 100644 index 0000000000..3e17554ad6 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e69eb688e6 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-breakpoint-invalid-15~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15.png Binary files differindex d66862ca68..4aff120d7f 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15@2x.png Binary files differindex 493c4c5647..2d6626b35b 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15~dark.png Binary files differnew file mode 100644 index 0000000000..75d029e290 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d80113c471 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-execution-15~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15.png Binary files differindex 04730ee9f5..10f0020062 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15@2x.png Binary files differindex d731b20293..8db6d07582 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~dark.png Binary files differnew file mode 100644 index 0000000000..838d428b56 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b136fe4252 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-stack-15~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15.png Binary files differindex e17b374a94..b8d8dee132 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15@2x.png Binary files differindex dc4002600d..58ae8d61a5 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15~dark.png Binary files differnew file mode 100644 index 0000000000..7c3b36e74a --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b4709dcc77 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-15~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15.png Binary files differindex d06ef8747f..51093a409f 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15@2x.png Binary files differindex 66f4d95b84..e82a46c94c 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15~dark.png Binary files differnew file mode 100644 index 0000000000..e9bb5e5067 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15~dark@2x.png Binary files differnew file mode 100644 index 0000000000..df49804f20 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-disabled-15~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15.png Binary files differindex 4f126b81b3..5d1692454e 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15@2x.png Binary files differindex e100e3de2c..2337f90cb7 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15~dark.png Binary files differnew file mode 100644 index 0000000000..fa41eef150 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d7660a1ed0 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/gutter-tracepoint-invalid-15~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16.png Binary files differindex f55eaee908..4d329b86de 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16@2x.png Binary files differindex 172998cd35..6ee71a6ad6 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark.png Binary files differnew file mode 100644 index 0000000000..a30a6b829d --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..3231ab61b1 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..5fe3aea858 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark~disabled.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..e847c5bf2f --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~dark~disabled@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~disabled.png Binary files differnew file mode 100644 index 0000000000..0c142aece1 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~disabled.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..2d6e69fac9 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/lightning-16~disabled@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16.png Binary files differindex 70960c9a1d..4d3bc37de5 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16@2x.png Binary files differindex a1d9ab2387..ed0aba7675 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16~dark.png Binary files differnew file mode 100644 index 0000000000..479a5dcc25 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..058843874b --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/continue-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16.png Binary files differnew file mode 100644 index 0000000000..442624355f --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16@2x.png Binary files differnew file mode 100644 index 0000000000..c6cb9c762b --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16~dark.png Binary files differnew file mode 100644 index 0000000000..3caf33cd7e --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d559606f8f --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause.png Binary files differdeleted file mode 100644 index 6603c0d1cf..0000000000 --- a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/pause@2x.png Binary files differdeleted file mode 100644 index f1cd97e5ae..0000000000 --- a/main/src/addins/MonoDevelop.Debugger/icons/mac/pause@2x.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16.png Binary files differindex 9dcded3b92..4d4936779b 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16@2x.png Binary files differindex 5e455c726e..58797d6652 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~dark.png Binary files differnew file mode 100644 index 0000000000..265152a27f --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2fbe610a91 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled.png Binary files differnew file mode 100644 index 0000000000..9de59a516c --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..1b3044a2be --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled~dark.png Binary files differnew file mode 100644 index 0000000000..85a3ff79df --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled~dark@2x.png Binary files differnew file mode 100644 index 0000000000..fcfae41a39 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-in-16~disabled~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16.png Binary files differindex 67eed7f9da..10cff84795 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16@2x.png Binary files differindex eb9aa52862..b6fdedfe42 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~dark.png Binary files differnew file mode 100644 index 0000000000..89041ced27 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d95df3d982 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled.png Binary files differnew file mode 100644 index 0000000000..c3e39ecec0 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..06704e58d4 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled~dark.png Binary files differnew file mode 100644 index 0000000000..f451ea5798 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e5525d478b --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-out-16~disabled~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16.png Binary files differindex bcdacbb88b..8d69d17061 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16@2x.png Binary files differindex 0a7b96e9ce..7e040e8dbf 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~dark.png Binary files differnew file mode 100644 index 0000000000..f2da4e883e --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..be282f1dd1 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled.png Binary files differnew file mode 100644 index 0000000000..d10925a213 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..9168634ddc --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled~dark.png Binary files differnew file mode 100644 index 0000000000..9d1563efdb --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled~dark@2x.png Binary files differnew file mode 100644 index 0000000000..aeb917d31b --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/mac/step-over-16~disabled~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16.png Binary files differnew file mode 100644 index 0000000000..879d553aca --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16@2x.png Binary files differnew file mode 100644 index 0000000000..5778c526cc --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark.png Binary files differnew file mode 100644 index 0000000000..7ade180b2a --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d04fcbaa44 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..4805daf179 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e1cb0c72ea --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~sel.png Binary files differnew file mode 100644 index 0000000000..4805daf179 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~sel.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e1cb0c72ea --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-breakpoints-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16.png Binary files differindex ee336018f8..a3441895de 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16@2x.png Binary files differindex 04577e051a..06e6ec4268 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark.png Binary files differnew file mode 100644 index 0000000000..910478d160 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..89082d5735 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..50bf3900bf --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..139f3cc034 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~sel.png Binary files differnew file mode 100644 index 0000000000..50bf3900bf --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~sel.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..139f3cc034 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-call-stack-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16.png Binary files differindex bd7976085e..cd3124c76c 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16@2x.png Binary files differindex b88716e4b9..7e6f661afe 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark.png Binary files differnew file mode 100644 index 0000000000..4eedc51b5a --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0ba8d38c46 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..829a25877b --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..9182a875cb --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~sel.png Binary files differnew file mode 100644 index 0000000000..829a25877b --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~sel.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..9182a875cb --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-locals-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16.png Binary files differindex 7a77d14929..7256ded2cf 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16@2x.png Binary files differindex dfd9e9f12e..71d19442d5 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark.png Binary files differnew file mode 100644 index 0000000000..efeff10ce7 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b2c40af2a5 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..9bdc6e66f1 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..fb0259fb85 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~sel.png Binary files differnew file mode 100644 index 0000000000..9bdc6e66f1 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~sel.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..fb0259fb85 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-threads-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16.png Binary files differindex bfb4cd5e3b..a69ea1fc49 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16@2x.png Binary files differindex 63120d12ce..8ae68592ed 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark.png Binary files differnew file mode 100644 index 0000000000..6f0b38f989 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6c9424c687 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..fa35a1ecd9 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2d5c8dbc0d --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~sel.png Binary files differnew file mode 100644 index 0000000000..fa35a1ecd9 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~sel.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2d5c8dbc0d --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/pad-watch-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16.png Binary files differindex f26e32207e..c00254dd9f 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16@2x.png Binary files differindex b8681ba963..4c1654ebfd 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark.png Binary files differnew file mode 100644 index 0000000000..dbd2c9da8f --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d03a48d630 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..9f98c3062b --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..0b660d7edc --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~sel.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~sel.png Binary files differnew file mode 100644 index 0000000000..9f98c3062b --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~sel.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~sel@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..0b660d7edc --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/prefs-debugger-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16.png Binary files differindex a9c99d7ea1..3c0b36c9c6 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16@2x.png Binary files differindex 2379b82339..6a0e1eb227 100644 --- a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16@2x.png +++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark.png Binary files differnew file mode 100644 index 0000000000..d94d819df0 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0e16ba3d8a --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..388ec23b6c --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark~disabled.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..9fd925bd50 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~dark~disabled@2x.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~disabled.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~disabled.png Binary files differnew file mode 100644 index 0000000000..b90f6cfd67 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~disabled.png diff --git a/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~disabled@2x.png b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..74fd0875d0 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger/icons/stack-pointer-16~disabled@2x.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs index 153d62b0dd..2d32c17973 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs @@ -60,7 +60,8 @@ namespace MonoDevelop.DesignerSupport.Toolbox using (ProgressMonitor monitor = new MessageDialogProgressMonitor (true, true, false, true)) { index = DesignerSupport.Service.ToolboxService.GetComponentIndex (monitor); } - + + this.ApplyTheme (); this.Build(); store = new TreeStore (typeof(bool), typeof(string), typeof(string), typeof(string), typeof(string), typeof(Xwt.Drawing.Image), typeof(ItemToolboxNode), typeof(bool), typeof(int)); diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs index c26769d0bc..bda69169b5 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/Toolbox.cs @@ -78,7 +78,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox toolbar.Add (filterEntry, true); catToggleButton = new ToggleButton (); - catToggleButton.Image = new Image (Ide.Gui.Stock.GroupByCategory, IconSize.Menu); + catToggleButton.Image = new ImageView (Ide.Gui.Stock.GroupByCategory, IconSize.Menu); catToggleButton.Toggled += new EventHandler (toggleCategorisation); catToggleButton.TooltipText = GettextCatalog.GetString ("Show categories"); toolbar.Add (catToggleButton); @@ -89,7 +89,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox compactModeToggleButton.TooltipText = GettextCatalog.GetString ("Use compact display"); toolbar.Add (compactModeToggleButton); - toolboxAddButton = new Button (new Gtk.Image (Ide.Gui.Stock.Add, IconSize.Menu)); + toolboxAddButton = new Button (new ImageView (Ide.Gui.Stock.Add, IconSize.Menu)); toolbar.Add (toolboxAddButton); toolboxAddButton.TooltipText = GettextCatalog.GetString ("Add toolbox items"); toolboxAddButton.Clicked += new EventHandler (toolboxAddButton_Clicked); diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs index 493ffc6913..8c1f52522a 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs @@ -204,11 +204,6 @@ namespace MonoDevelop.DesignerSupport.Toolbox const int ItemIconTextItemSpacing = 4; const int IconModePadding = 2; - static readonly Cairo.Color CategoryBackgroundGradientStartColor = new Cairo.Color (248d/255d, 248d/255d, 248d/255d); - static readonly Cairo.Color CategoryBackgroundGradientEndColor = new Cairo.Color (240d/255d, 240d/255d, 240d/255d); - static readonly Cairo.Color CategoryBorderColor = new Cairo.Color (217d/255d, 217d/255d, 217d/255d); - static readonly Cairo.Color CategoryLabelColor = new Cairo.Color (128d/255d, 128d/255d, 128d/255d); - protected override bool OnExposeEvent (Gdk.EventExpose e) { Cairo.Context cr = Gdk.CairoHelper.Create (e.Window); @@ -252,24 +247,21 @@ namespace MonoDevelop.DesignerSupport.Toolbox if (!area.IntersectsWith (new Gdk.Rectangle (new Gdk.Point (xpos, ypos), itemDimension))) return true; cr.Rectangle (xpos, ypos, itemDimension.Width, itemDimension.Height); - using (var pat = new Cairo.LinearGradient (xpos, ypos, xpos, ypos + itemDimension.Height)) { - pat.AddColorStop (0, CategoryBackgroundGradientStartColor); - pat.AddColorStop (1, CategoryBackgroundGradientEndColor); - cr.SetSource (pat); - cr.Fill (); - } + cr.SetSourceColor (Ide.Gui.Styles.PadCategoryBackgroundColor.ToCairoColor ()); + cr.Fill (); + if (lastCategory == null || lastCategory.IsExpanded || lastCategory.AnimatingExpand) { cr.MoveTo (xpos, ypos + 0.5); cr.LineTo (itemDimension.Width, ypos + 0.5); } cr.MoveTo (0, ypos + itemDimension.Height - 0.5); cr.LineTo (xpos + Allocation.Width, ypos + itemDimension.Height - 0.5); - cr.SetSourceColor (CategoryBorderColor); + cr.SetSourceColor (MonoDevelop.Ide.Gui.Styles.PadCategoryBorderColor.ToCairoColor ()); cr.Stroke (); headerLayout.SetMarkup (category.Text); int width, height; - cr.SetSourceColor (CategoryLabelColor); + cr.SetSourceColor (MonoDevelop.Ide.Gui.Styles.PadCategoryLabelColor.ToCairoColor ()); layout.GetPixelSize (out width, out height); cr.MoveTo (xpos + CategoryLeftPadding, ypos + (double)(Math.Round ((double)(itemDimension.Height - height) / 2))); Pango.CairoHelper.ShowLayout (cr, headerLayout); @@ -317,7 +309,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox // Closing line when animating the last group of the toolbox cr.MoveTo (area.X, ypos + 0.5); cr.RelLineTo (area.Width, 0); - cr.SetSourceColor (CategoryBorderColor); + cr.SetSourceColor (MonoDevelop.Ide.Gui.Styles.PadCategoryBorderColor.ToCairoColor ()); cr.Stroke (); } diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj index 50ae0814fb..330da725d4 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj @@ -172,24 +172,84 @@ <EmbeddedResource Include="icons\compact-display-16%402x.png"> <LogicalName>compact-display-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\compact-display-16~dark.png"> + <LogicalName>compact-display-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\compact-display-16~dark%402x.png"> + <LogicalName>compact-display-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\pad-properties-16.png"> <LogicalName>pad-properties-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pad-properties-16%402x.png"> <LogicalName>pad-properties-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pad-properties-16~dark.png"> + <LogicalName>pad-properties-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-properties-16~dark%402x.png"> + <LogicalName>pad-properties-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-properties-16~sel.png"> + <LogicalName>pad-properties-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-properties-16~sel%402x.png"> + <LogicalName>pad-properties-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-properties-16~dark~sel.png"> + <LogicalName>pad-properties-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-properties-16~dark~sel%402x.png"> + <LogicalName>pad-properties-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\pad-toolbox-16.png"> <LogicalName>pad-toolbox-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pad-toolbox-16%402x.png"> <LogicalName>pad-toolbox-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pad-toolbox-16~dark.png"> + <LogicalName>pad-toolbox-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-toolbox-16~dark%402x.png"> + <LogicalName>pad-toolbox-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-toolbox-16~sel.png"> + <LogicalName>pad-toolbox-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-toolbox-16~sel%402x.png"> + <LogicalName>pad-toolbox-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-toolbox-16~dark~sel.png"> + <LogicalName>pad-toolbox-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-toolbox-16~dark~sel%402x.png"> + <LogicalName>pad-toolbox-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\pad-document-outline-16.png"> <LogicalName>pad-document-outline-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pad-document-outline-16%402x.png"> <LogicalName>pad-document-outline-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pad-document-outline-16~dark.png"> + <LogicalName>pad-document-outline-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-document-outline-16~dark%402x.png"> + <LogicalName>pad-document-outline-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-document-outline-16~sel.png"> + <LogicalName>pad-document-outline-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-document-outline-16~sel%402x.png"> + <LogicalName>pad-document-outline-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-document-outline-16~dark~sel.png"> + <LogicalName>pad-document-outline-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-document-outline-16~dark~sel%402x.png"> + <LogicalName>pad-document-outline-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> </ItemGroup> <ItemGroup> <None Include="Makefile.am" /> diff --git a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs index ad3979a16d..2aa3075445 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs +++ b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.cs @@ -5,17 +5,33 @@ namespace MonoDevelop.DesignerSupport.Toolbox internal partial class ComponentSelectorDialog { private global::Gtk.VBox vbox2; + private global::Gtk.HBox hbox1; + private global::Gtk.Label label1; + private global::Gtk.ComboBox comboType; + private global::Gtk.VSeparator vseparator1; + private global::Gtk.Button button24; + + private global::Gtk.HBox hbox2; + + private global::MonoDevelop.Components.ImageView imageview1; + + private global::Gtk.Label label2; + private global::Gtk.ScrolledWindow scrolledwindow1; + private global::Gtk.TreeView listView; + private global::Gtk.CheckButton checkGroupByCat; + private global::Gtk.Button buttonCancel; - private global::Gtk.Button buttonOk; + private global::Gtk.Button buttonOk; + protected virtual void Build () { global::Stetic.Gui.Initialize (this); @@ -64,33 +80,40 @@ namespace MonoDevelop.DesignerSupport.Toolbox this.button24 = new global::Gtk.Button (); this.button24.CanFocus = true; this.button24.Name = "button24"; - this.button24.UseUnderline = true; // Container child button24.Gtk.Container+ContainerChild - global::Gtk.Alignment w5 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); - // Container child GtkAlignment.Gtk.Container+ContainerChild - global::Gtk.HBox w6 = new global::Gtk.HBox (); - w6.Spacing = 2; - // Container child GtkHBox.Gtk.Container+ContainerChild - global::Gtk.Image w7 = new global::Gtk.Image (); - w7.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-add", global::Gtk.IconSize.Menu); - w6.Add (w7); - // Container child GtkHBox.Gtk.Container+ContainerChild - global::Gtk.Label w9 = new global::Gtk.Label (); - w9.LabelProp = global::Mono.Unix.Catalog.GetString ("Add Assembly..."); - w9.UseUnderline = true; - w6.Add (w9); - w5.Add (w6); - this.button24.Add (w5); + this.hbox2 = new global::Gtk.HBox (); + this.hbox2.Name = "hbox2"; + this.hbox2.Spacing = 2; + // Container child hbox2.Gtk.Box+BoxChild + this.imageview1 = new global::MonoDevelop.Components.ImageView (); + this.imageview1.Name = "imageview1"; + this.imageview1.IconId = "gtk-add"; + this.imageview1.IconSize = ((global::Gtk.IconSize)(1)); + this.hbox2.Add (this.imageview1); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.imageview1])); + w5.Position = 0; + w5.Expand = false; + w5.Fill = false; + // Container child hbox2.Gtk.Box+BoxChild + this.label2 = new global::Gtk.Label (); + this.label2.Name = "label2"; + this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Add Assembly..."); + this.label2.UseUnderline = true; + this.hbox2.Add (this.label2); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label2])); + w6.Position = 1; + w6.Expand = false; + w6.Fill = false; + this.button24.Add (this.hbox2); this.hbox1.Add (this.button24); - global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.button24])); - w13.Position = 3; - w13.Expand = false; - w13.Fill = false; + global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.button24])); + w8.Position = 3; + w8.Expand = false; this.vbox2.Add (this.hbox1); - global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1])); - w14.Position = 0; - w14.Expand = false; - w14.Fill = false; + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1])); + w9.Position = 0; + w9.Expand = false; + w9.Fill = false; // Container child vbox2.Gtk.Box+BoxChild this.scrolledwindow1 = new global::Gtk.ScrolledWindow (); this.scrolledwindow1.CanFocus = true; @@ -102,8 +125,8 @@ namespace MonoDevelop.DesignerSupport.Toolbox this.listView.Name = "listView"; this.scrolledwindow1.Add (this.listView); this.vbox2.Add (this.scrolledwindow1); - global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.scrolledwindow1])); - w16.Position = 1; + global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.scrolledwindow1])); + w11.Position = 1; // Container child vbox2.Gtk.Box+BoxChild this.checkGroupByCat = new global::Gtk.CheckButton (); this.checkGroupByCat.CanFocus = true; @@ -112,19 +135,19 @@ namespace MonoDevelop.DesignerSupport.Toolbox this.checkGroupByCat.DrawIndicator = true; this.checkGroupByCat.UseUnderline = true; this.vbox2.Add (this.checkGroupByCat); - global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.checkGroupByCat])); - w17.Position = 2; - w17.Expand = false; - w17.Fill = false; + global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.checkGroupByCat])); + w12.Position = 2; + w12.Expand = false; + w12.Fill = false; w1.Add (this.vbox2); - global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2])); - w18.Position = 0; + global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2])); + w13.Position = 0; // Internal child MonoDevelop.DesignerSupport.Toolbox.ComponentSelectorDialog.ActionArea - global::Gtk.HButtonBox w19 = this.ActionArea; - w19.Name = "dialog1_ActionArea"; - w19.Spacing = 10; - w19.BorderWidth = ((uint)(5)); - w19.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); + global::Gtk.HButtonBox w14 = this.ActionArea; + w14.Name = "dialog1_ActionArea"; + w14.Spacing = 10; + w14.BorderWidth = ((uint)(5)); + w14.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild this.buttonCancel = new global::Gtk.Button (); this.buttonCancel.CanDefault = true; @@ -134,9 +157,9 @@ namespace MonoDevelop.DesignerSupport.Toolbox this.buttonCancel.UseUnderline = true; this.buttonCancel.Label = "gtk-cancel"; this.AddActionWidget (this.buttonCancel, -6); - global::Gtk.ButtonBox.ButtonBoxChild w20 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w19 [this.buttonCancel])); - w20.Expand = false; - w20.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w15 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w14 [this.buttonCancel])); + w15.Expand = false; + w15.Fill = false; // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild this.buttonOk = new global::Gtk.Button (); this.buttonOk.CanDefault = true; @@ -145,11 +168,11 @@ namespace MonoDevelop.DesignerSupport.Toolbox this.buttonOk.UseStock = true; this.buttonOk.UseUnderline = true; this.buttonOk.Label = "gtk-ok"; - w19.Add (this.buttonOk); - global::Gtk.ButtonBox.ButtonBoxChild w21 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w19 [this.buttonOk])); - w21.Position = 1; - w21.Expand = false; - w21.Fill = false; + w14.Add (this.buttonOk); + global::Gtk.ButtonBox.ButtonBoxChild w16 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w14 [this.buttonOk])); + w16.Position = 1; + w16.Expand = false; + w16.Fill = false; if ((this.Child != null)) { this.Child.ShowAll (); } diff --git a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/generated.cs index d608548128..9ef3363981 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/generated.cs +++ b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/generated.cs @@ -14,40 +14,6 @@ namespace Stetic } } - internal class IconLoader - { - public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size) - { - Gdk.Pixbuf res = widget.RenderIcon (name, size, null); - if ((res != null)) { - return res; - } else { - int sz; - int sy; - global::Gtk.Icon.SizeLookup (size, out sz, out sy); - try { - return Gtk.IconTheme.Default.LoadIcon (name, sz, 0); - } catch (System.Exception) { - if ((name != "gtk-missing-image")) { - return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size); - } else { - Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz); - Gdk.GC gc = new Gdk.GC (pmap); - gc.RgbFgColor = new Gdk.Color (255, 255, 255); - pmap.DrawRectangle (gc, true, 0, 0, sz, sz); - gc.RgbFgColor = new Gdk.Color (0, 0, 0); - pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1)); - gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round); - gc.RgbFgColor = new Gdk.Color (255, 0, 0); - pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4))); - pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4))); - return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz); - } - } - } - } - } - internal class ActionGroups { public static Gtk.ActionGroup GetActionGroup (System.Type type) diff --git a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic index a83bfa2211..be5dc01e5f 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic +++ b/main/src/addins/MonoDevelop.DesignerSupport/gtk-gui/gui.stetic @@ -70,17 +70,48 @@ <widget class="Gtk.Button" id="button24"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-add Menu</property> - <property name="Label" translatable="yes">Add Assembly...</property> - <property name="UseUnderline">True</property> + <property name="Type">Custom</property> <signal name="Clicked" handler="OnButton24Clicked" /> + <child> + <widget class="Gtk.HBox" id="hbox2"> + <property name="MemberName" /> + <property name="Spacing">2</property> + <child> + <widget class="MonoDevelop.Components.ImageView" id="imageview1"> + <property name="MemberName" /> + <property name="IconId">gtk-add</property> + <property name="IconSize">Menu</property> + </widget> + <packing> + <property name="Position">0</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + <child> + <widget class="Gtk.Label" id="label2"> + <property name="MemberName" /> + <property name="LabelProp" translatable="yes">Add Assembly...</property> + <property name="UseUnderline">True</property> + </widget> + <packing> + <property name="Position">1</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + <child> + <placeholder /> + </child> + </widget> + </child> </widget> <packing> <property name="Position">3</property> - <property name="AutoSize">True</property> + <property name="AutoSize">False</property> <property name="Expand">False</property> - <property name="Fill">False</property> </packing> </child> </widget> diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16.png Binary files differindex c29fc8585c..38a0e09dca 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16.png +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16@2x.png Binary files differindex 13bbf3cf71..4406a7a500 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16@2x.png +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16@2x.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16~dark.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16~dark.png Binary files differnew file mode 100644 index 0000000000..d125fbd522 --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16~dark.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16~dark@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..c41db4ed17 --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/compact-display-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16.png Binary files differindex 49172a9f53..d8d188576e 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16.png +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16@2x.png Binary files differindex 5b677d5c08..23b95dcd43 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16@2x.png +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16@2x.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark.png Binary files differnew file mode 100644 index 0000000000..e3911c83ba --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..ebf9d91493 --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark~sel.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..2a6db9b28a --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e2f82cc6ee --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~sel.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~sel.png Binary files differnew file mode 100644 index 0000000000..2a6db9b28a --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~sel.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~sel@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e2f82cc6ee --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-document-outline-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16.png Binary files differindex bff9c389c1..a455c12131 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16.png +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16@2x.png Binary files differindex e061e98cae..7a52394201 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16@2x.png +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16@2x.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark.png Binary files differnew file mode 100644 index 0000000000..a4a3d47159 --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..9fae72d0d1 --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark~sel.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..d6b7b2652d --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..128cc11f7b --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~sel.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~sel.png Binary files differnew file mode 100644 index 0000000000..d6b7b2652d --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~sel.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~sel@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..128cc11f7b --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-properties-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16.png Binary files differindex feb26140d4..499a330b7e 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16.png +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16@2x.png Binary files differindex 743318a76e..2c71672555 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16@2x.png +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16@2x.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark.png Binary files differnew file mode 100644 index 0000000000..fa5dd18620 --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..829495f647 --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark~sel.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..90190f2cee --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f5281dbc84 --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~sel.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~sel.png Binary files differnew file mode 100644 index 0000000000..90190f2cee --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~sel.png diff --git a/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~sel@2x.png b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f5281dbc84 --- /dev/null +++ b/main/src/addins/MonoDevelop.DesignerSupport/icons/pad-toolbox-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs index 40930f4b0d..0d6a78a702 100644 --- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs @@ -250,6 +250,15 @@ namespace MonoDevelop.Gettext this.texteditorPlural.Options = DefaultSourceEditorOptions.PlainEditor; this.texteditorOriginal.IsReadOnly = true; this.texteditorPlural.IsReadOnly = true; + toolbarPages.ModifyBg (StateType.Normal, Styles.POEditor.TabBarBackgroundColor); + + MonoDevelop.Ide.Gui.Styles.Changed += HandleStylesChanged; + } + + void HandleStylesChanged (object sender, EventArgs e) + { + UpdateFromCatalog (); + toolbarPages.ModifyBg (StateType.Normal, Styles.POEditor.TabBarBackgroundColor); } void HandleCellRendFuzzyToggled (object sender, ToggledArgs args) @@ -316,25 +325,25 @@ namespace MonoDevelop.Gettext searchIn = PropertyService.Get ("GettetAddin.Search.SearchIn", SearchIn.Both); } - static bool IsCaseSensitive {
- get {
- return isCaseSensitive;
+ static bool IsCaseSensitive { + get { + return isCaseSensitive; } set { PropertyService.Set ("GettetAddin.Search.IsCaseSensitive", value); isCaseSensitive = value; - }
+ } } - static bool IsWholeWordOnly {
- get {
- return isWholeWordOnly;
- }
+ static bool IsWholeWordOnly { + get { + return isWholeWordOnly; + } set { PropertyService.Set ("GettetAddin.Search.IsWholeWordOnly", value); isWholeWordOnly = value; - }
- }
+ } + } static bool RegexSearch { get { @@ -687,26 +696,21 @@ namespace MonoDevelop.Gettext return entry.IsFuzzy ? iconFuzzy : entry.IsTranslated ? iconValid : iconMissing; } - static string iconFuzzy = "error-16.png";// "md-translation-fuzzy"; - static string iconValid = "done-16.png";//"md-translation-valid"; - static string iconMissing = "warning-16.png";//"md-translation-missing"; - -// static Color translated = new Color (255, 255, 255); - static Color untranslated = new Color (234, 232, 227); - static Color fuzzy = new Color (237, 226, 187); - static Color missing = new Color (237, 167, 167); + static string iconFuzzy = "md-error";// "md-translation-fuzzy"; + static string iconValid = "md-done";//"md-translation-valid"; + static string iconMissing = "md-warning";//"md-translation-missing"; Color GetRowColorForEntry (CatalogEntry entry) { if (entry.References.Length == 0) - return missing; - return entry.IsFuzzy ? fuzzy : entry.IsTranslated ? Style.Base (StateType.Normal) : untranslated; + return Styles.POEditor.EntryMissingBackgroundColor; + return entry.IsFuzzy ? Styles.POEditor.EntryFuzzyBackgroundColor : entry.IsTranslated ? Style.Base (StateType.Normal) : Styles.POEditor.EntryUntranslatedBackgroundColor; } Color GetForeColorForEntry (CatalogEntry entry) { if (entry.References.Length == 0) - return missing; + return Styles.POEditor.EntryMissingBackgroundColor; return entry.IsFuzzy ? Style.Black : entry.IsTranslated ? Style.Text (StateType.Normal) : Style.Black; } @@ -810,10 +814,12 @@ namespace MonoDevelop.Gettext } catch (Exception e) { IdeApp.Workbench.StatusBar.ShowError (e.Message); this.searchEntryFilter.Entry.ModifyBase (StateType.Normal, errorColor); + this.searchEntryFilter.QueueDraw (); return; } } this.searchEntryFilter.Entry.ModifyBase (StateType.Normal, Style.Base (StateType.Normal)); + this.searchEntryFilter.QueueDraw (); int found = 0; ListStore newStore = new ListStore (typeof(CatalogEntry)); @@ -942,6 +948,7 @@ namespace MonoDevelop.Gettext protected override void OnDestroyed () { + MonoDevelop.Ide.Gui.Styles.Changed -= HandleStylesChanged; StopTaskWorkerThread (); if (store != null) { diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/Styles.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/Styles.cs new file mode 100644 index 0000000000..60d41c71b3 --- /dev/null +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/Styles.cs @@ -0,0 +1,66 @@ +// +// Styles.cs +// +// Author: +// Vsevolod Kukol <sevo@xamarin.com> +// +// Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using MonoDevelop.Ide; +using Xwt.Drawing; + +namespace MonoDevelop.Gettext +{ + public static class Styles + { + public static POEditorStyle POEditor { get; internal set; } + + public class POEditorStyle + { + public Gdk.Color EntryUntranslatedBackgroundColor { get; internal set; } + public Gdk.Color EntryMissingBackgroundColor { get; internal set; } + public Gdk.Color EntryFuzzyBackgroundColor { get; internal set; } + public Gdk.Color TabBarBackgroundColor { get; internal set; } + } + + static Styles () + { + LoadStyles (); + MonoDevelop.Ide.Gui.Styles.Changed += (o, e) => LoadStyles (); + } + + public static void LoadStyles () + { + POEditor = new POEditorStyle (); + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) { + POEditor.EntryUntranslatedBackgroundColor = new Gdk.Color (234, 232, 227); + POEditor.EntryMissingBackgroundColor = new Gdk.Color (237, 226, 187); + POEditor.EntryFuzzyBackgroundColor = new Gdk.Color (255, 199, 186); + POEditor.TabBarBackgroundColor = new Gdk.Color (241, 241, 241); + } else { + POEditor.EntryUntranslatedBackgroundColor = new Gdk.Color (255, 238, 194); + POEditor.EntryMissingBackgroundColor = new Gdk.Color (255, 0, 255); // TODO: VV + POEditor.EntryFuzzyBackgroundColor = new Gdk.Color (255, 195, 183); + POEditor.TabBarBackgroundColor = new Gdk.Color (51, 51, 51); + } + } + } +} + diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.addin.xml b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.addin.xml index 31414dfbe0..12bb32d124 100644 --- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.addin.xml +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.addin.xml @@ -44,15 +44,12 @@ <StockIcon stockid = "md-gettext-locale" resource = "locale_16x16.png" size = "Menu" /> <StockIcon stockid = "md-gettext-locale" resource = "locale_22x22.png" size = "Button" /> <StockIcon stockid = "md-gettext-locale" resource = "locale_32x32.png" size = "Dnd" /> - <StockIcon stockid = "md-gettext-project" icon = "md-project|res:gettext-overlay-16.png" size = "Menu" /> - <StockIcon stockid = "md-gettext-project" icon = "md-project|res:gettext-overlay-32.png" size = "Dnd"/> + <StockIcon stockid = "md-gettext-project" icon = "md-project" size = "Menu" /> + <StockIcon stockid = "md-gettext-project" icon = "md-project" size = "Dnd"/> <StockIcon stockid = "md-po-file" resource = "locale_22x22.png" /> <StockIcon stockid = "md-po-file" resource = "locale_16x16.png" size = "Menu" /> <StockIcon stockid = "md-po-file" resource = "locale_22x22.png" size = "Button" /> <StockIcon stockid = "md-po-file" resource = "locale_32x32.png" size = "Dnd" /> - <StockIcon stockid = "silk_accept" resource = "done-16.png" size = "Menu"/> - <StockIcon stockid = "silk_error" resource = "error-16.png" size = "Menu"/> - <StockIcon stockid = "silk_exclamation" resource = "warning-16.png" size = "Menu"/> </Extension> <Extension path = "/MonoDevelop/Core/MimeTypes"> diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj index 647efe4478..bbf4871d37 100644 --- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj @@ -151,6 +151,7 @@ <Compile Include="MonoDevelop.Gettext\TranslationCollection.cs" /> <Compile Include="MonoDevelop.Gettext.NodeBuilders\ProjectFileNodeBuilderExtension.cs" /> <Compile Include="AddinInfo.cs" /> + <Compile Include="MonoDevelop.Gettext.Editor\Styles.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="gtk-gui\gui.stetic"> @@ -177,35 +178,29 @@ <EmbeddedResource Include="templates\Makefile.am.template"> <LogicalName>Makefile.am.template</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\gettext-overlay-16.png"> - <LogicalName>gettext-overlay-16.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\gettext-overlay-32.png"> - <LogicalName>gettext-overlay-32.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\done-16.png"> - <LogicalName>done-16.png</LogicalName> + <EmbeddedResource Include="icons\prefs-language-16.png"> + <LogicalName>prefs-language-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\done-16%402x.png"> - <LogicalName>done-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\prefs-language-16%402x.png"> + <LogicalName>prefs-language-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\error-16.png"> - <LogicalName>error-16.png</LogicalName> + <EmbeddedResource Include="icons\prefs-language-16~dark.png"> + <LogicalName>prefs-language-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\error-16%402x.png"> - <LogicalName>error-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\prefs-language-16~dark%402x.png"> + <LogicalName>prefs-language-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\warning-16.png"> - <LogicalName>warning-16.png</LogicalName> + <EmbeddedResource Include="icons\prefs-language-16~dark~sel.png"> + <LogicalName>prefs-language-16~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\warning-16%402x.png"> - <LogicalName>warning-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\prefs-language-16~dark~sel%402x.png"> + <LogicalName>prefs-language-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\prefs-language-16.png"> - <LogicalName>prefs-language-16.png</LogicalName> + <EmbeddedResource Include="icons\prefs-language-16~sel.png"> + <LogicalName>prefs-language-16~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\prefs-language-16%402x.png"> - <LogicalName>prefs-language-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\prefs-language-16~sel%402x.png"> + <LogicalName>prefs-language-16~sel@2x.png</LogicalName> </EmbeddedResource> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/MonoDevelop.Gettext/gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs b/main/src/addins/MonoDevelop.Gettext/gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs index c91ffde2da..3d99d3fd00 100644 --- a/main/src/addins/MonoDevelop.Gettext/gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs +++ b/main/src/addins/MonoDevelop.Gettext/gtk-gui/MonoDevelop.Gettext.POEditorWidget.cs @@ -5,42 +5,97 @@ namespace MonoDevelop.Gettext internal partial class POEditorWidget { private global::Gtk.UIManager UIManager; + private global::Gtk.VBox vbox2; + private global::Gtk.Notebook notebookPages; + private global::Gtk.VBox vbox7; + private global::Gtk.HBox hbox2; + private global::Gtk.Label label2; + private global::MonoDevelop.Components.SearchEntry searchEntryFilter; + private global::Gtk.ToggleButton togglebuttonOk; + + private global::Gtk.HBox togglebuttonOkHbox; + + private global::MonoDevelop.Components.ImageView togglebuttonOkIcon; + + private global::Gtk.Label togglebuttonOkLabel; + private global::Gtk.ToggleButton togglebuttonMissing; + + private global::Gtk.HBox togglebuttonMissingHbox; + + private global::MonoDevelop.Components.ImageView togglebuttonMissingIcon; + + private global::Gtk.Label togglebuttonMissingLabel; + private global::Gtk.ToggleButton togglebuttonFuzzy; + + private global::Gtk.HBox togglebuttonFuzzyHbox; + + private global::MonoDevelop.Components.ImageView togglebuttonFuzzyIcon; + + private global::Gtk.Label togglebuttonFuzzyLabel; + private global::Gtk.VPaned vpaned2; + private global::Gtk.ScrolledWindow scrolledwindow1; + private global::Gtk.TreeView treeviewEntries; + private global::Gtk.Table table1; + private global::Gtk.VBox vbox3; + private global::Gtk.Label label6; + private global::Gtk.ScrolledWindow scrolledwindow3; + private global::Gtk.TextView textviewComments; + private global::Gtk.VBox vbox4; + private global::Gtk.Label label7; + private global::Gtk.Notebook notebookTranslated; + private global::Gtk.Label label1; + private global::Gtk.VBox vbox5; + private global::Gtk.HBox hbox3; + private global::Gtk.Label label8; + private global::Gtk.CheckButton checkbuttonWhiteSpaces; + private global::Gtk.ScrolledWindow scrolledwindowOriginal; + private global::Gtk.VBox vbox8; + private global::Gtk.Label label9; + private global::Gtk.ScrolledWindow scrolledwindowPlural; + private global::Gtk.VBox vbox6; + private global::Gtk.Label label4; + private global::Gtk.ScrolledWindow scrolledwindow2; + private global::Gtk.TreeView treeviewFoundIn; + private global::Gtk.Label label5; + private global::Gtk.HBox hbox1; + private global::Gtk.Toolbar toolbarPages; + private global::Gtk.ProgressBar progressbar1; protected virtual void Build () @@ -98,49 +153,109 @@ namespace MonoDevelop.Gettext this.togglebuttonOk = new global::Gtk.ToggleButton (); this.togglebuttonOk.CanFocus = true; this.togglebuttonOk.Name = "togglebuttonOk"; - this.togglebuttonOk.UseUnderline = true; - this.togglebuttonOk.Label = global::Mono.Unix.Catalog.GetString ("Valid"); - global::Gtk.Image w5 = new global::Gtk.Image (); - w5.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("done-16.png"); - this.togglebuttonOk.Image = w5; - this.hbox2.Add (this.togglebuttonOk); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.togglebuttonOk])); - w6.Position = 2; + // Container child togglebuttonOk.Gtk.Container+ContainerChild + this.togglebuttonOkHbox = new global::Gtk.HBox (); + this.togglebuttonOkHbox.Name = "togglebuttonOkHbox"; + this.togglebuttonOkHbox.Spacing = 2; + // Container child togglebuttonOkHbox.Gtk.Box+BoxChild + this.togglebuttonOkIcon = new global::MonoDevelop.Components.ImageView (); + this.togglebuttonOkIcon.Name = "togglebuttonOkIcon"; + this.togglebuttonOkIcon.IconId = "md-done"; + this.togglebuttonOkIcon.IconSize = ((global::Gtk.IconSize)(1)); + this.togglebuttonOkHbox.Add (this.togglebuttonOkIcon); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.togglebuttonOkHbox [this.togglebuttonOkIcon])); + w5.Position = 0; + w5.Expand = false; + w5.Fill = false; + // Container child togglebuttonOkHbox.Gtk.Box+BoxChild + this.togglebuttonOkLabel = new global::Gtk.Label (); + this.togglebuttonOkLabel.Name = "togglebuttonOkLabel"; + this.togglebuttonOkLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Valid"); + this.togglebuttonOkLabel.UseUnderline = true; + this.togglebuttonOkHbox.Add (this.togglebuttonOkLabel); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.togglebuttonOkHbox [this.togglebuttonOkLabel])); + w6.Position = 1; w6.Expand = false; w6.Fill = false; + this.togglebuttonOk.Add (this.togglebuttonOkHbox); + this.hbox2.Add (this.togglebuttonOk); + global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.togglebuttonOk])); + w8.Position = 2; + w8.Expand = false; + w8.Fill = false; // Container child hbox2.Gtk.Box+BoxChild this.togglebuttonMissing = new global::Gtk.ToggleButton (); this.togglebuttonMissing.CanFocus = true; this.togglebuttonMissing.Name = "togglebuttonMissing"; - this.togglebuttonMissing.UseUnderline = true; - this.togglebuttonMissing.Label = global::Mono.Unix.Catalog.GetString ("Missing"); - global::Gtk.Image w7 = new global::Gtk.Image (); - w7.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("warning-16.png"); - this.togglebuttonMissing.Image = w7; + // Container child togglebuttonMissing.Gtk.Container+ContainerChild + this.togglebuttonMissingHbox = new global::Gtk.HBox (); + this.togglebuttonMissingHbox.Name = "togglebuttonMissingHbox"; + this.togglebuttonMissingHbox.Spacing = 2; + // Container child togglebuttonMissingHbox.Gtk.Box+BoxChild + this.togglebuttonMissingIcon = new global::MonoDevelop.Components.ImageView (); + this.togglebuttonMissingIcon.Name = "togglebuttonMissingIcon"; + this.togglebuttonMissingIcon.IconId = "md-warning"; + this.togglebuttonMissingIcon.IconSize = ((global::Gtk.IconSize)(1)); + this.togglebuttonMissingHbox.Add (this.togglebuttonMissingIcon); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.togglebuttonMissingHbox [this.togglebuttonMissingIcon])); + w9.Position = 0; + w9.Expand = false; + w9.Fill = false; + // Container child togglebuttonMissingHbox.Gtk.Box+BoxChild + this.togglebuttonMissingLabel = new global::Gtk.Label (); + this.togglebuttonMissingLabel.Name = "togglebuttonMissingLabel"; + this.togglebuttonMissingLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Missing"); + this.togglebuttonMissingLabel.UseUnderline = true; + this.togglebuttonMissingHbox.Add (this.togglebuttonMissingLabel); + global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.togglebuttonMissingHbox [this.togglebuttonMissingLabel])); + w10.Position = 1; + w10.Expand = false; + w10.Fill = false; + this.togglebuttonMissing.Add (this.togglebuttonMissingHbox); this.hbox2.Add (this.togglebuttonMissing); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.togglebuttonMissing])); - w8.Position = 3; - w8.Expand = false; - w8.Fill = false; + global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.togglebuttonMissing])); + w12.Position = 3; + w12.Expand = false; + w12.Fill = false; // Container child hbox2.Gtk.Box+BoxChild this.togglebuttonFuzzy = new global::Gtk.ToggleButton (); this.togglebuttonFuzzy.CanFocus = true; this.togglebuttonFuzzy.Name = "togglebuttonFuzzy"; - this.togglebuttonFuzzy.UseUnderline = true; - this.togglebuttonFuzzy.Label = global::Mono.Unix.Catalog.GetString ("Fuzzy"); - global::Gtk.Image w9 = new global::Gtk.Image (); - w9.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("error-16.png"); - this.togglebuttonFuzzy.Image = w9; + // Container child togglebuttonFuzzy.Gtk.Container+ContainerChild + this.togglebuttonFuzzyHbox = new global::Gtk.HBox (); + this.togglebuttonFuzzyHbox.Name = "togglebuttonFuzzyHbox"; + this.togglebuttonFuzzyHbox.Spacing = 2; + // Container child togglebuttonFuzzyHbox.Gtk.Box+BoxChild + this.togglebuttonFuzzyIcon = new global::MonoDevelop.Components.ImageView (); + this.togglebuttonFuzzyIcon.Name = "togglebuttonFuzzyIcon"; + this.togglebuttonFuzzyIcon.IconId = "md-error"; + this.togglebuttonFuzzyIcon.IconSize = ((global::Gtk.IconSize)(1)); + this.togglebuttonFuzzyHbox.Add (this.togglebuttonFuzzyIcon); + global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.togglebuttonFuzzyHbox [this.togglebuttonFuzzyIcon])); + w13.Position = 0; + w13.Expand = false; + w13.Fill = false; + // Container child togglebuttonFuzzyHbox.Gtk.Box+BoxChild + this.togglebuttonFuzzyLabel = new global::Gtk.Label (); + this.togglebuttonFuzzyLabel.Name = "togglebuttonFuzzyLabel"; + this.togglebuttonFuzzyLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Fuzzy"); + this.togglebuttonFuzzyLabel.UseUnderline = true; + this.togglebuttonFuzzyHbox.Add (this.togglebuttonFuzzyLabel); + global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.togglebuttonFuzzyHbox [this.togglebuttonFuzzyLabel])); + w14.Position = 1; + w14.Expand = false; + w14.Fill = false; + this.togglebuttonFuzzy.Add (this.togglebuttonFuzzyHbox); this.hbox2.Add (this.togglebuttonFuzzy); - global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.togglebuttonFuzzy])); - w10.Position = 4; - w10.Expand = false; - w10.Fill = false; + global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.togglebuttonFuzzy])); + w16.Position = 4; + w16.Expand = false; + w16.Fill = false; this.vbox7.Add (this.hbox2); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox7 [this.hbox2])); - w11.Position = 0; - w11.Expand = false; - w11.Fill = false; + global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox7 [this.hbox2])); + w17.Position = 0; + w17.Expand = false; + w17.Fill = false; // Container child vbox7.Gtk.Box+BoxChild this.vpaned2 = new global::Gtk.VPaned (); this.vpaned2.CanFocus = true; @@ -157,8 +272,8 @@ namespace MonoDevelop.Gettext this.treeviewEntries.Name = "treeviewEntries"; this.scrolledwindow1.Add (this.treeviewEntries); this.vpaned2.Add (this.scrolledwindow1); - global::Gtk.Paned.PanedChild w13 = ((global::Gtk.Paned.PanedChild)(this.vpaned2 [this.scrolledwindow1])); - w13.Resize = false; + global::Gtk.Paned.PanedChild w19 = ((global::Gtk.Paned.PanedChild)(this.vpaned2 [this.scrolledwindow1])); + w19.Resize = false; // Container child vpaned2.Gtk.Paned+PanedChild this.table1 = new global::Gtk.Table (((uint)(2)), ((uint)(2)), true); this.table1.Name = "table1"; @@ -175,10 +290,10 @@ namespace MonoDevelop.Gettext this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("_Comments:"); this.label6.UseUnderline = true; this.vbox3.Add (this.label6); - global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.label6])); - w14.Position = 0; - w14.Expand = false; - w14.Fill = false; + global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.label6])); + w20.Position = 0; + w20.Expand = false; + w20.Fill = false; // Container child vbox3.Gtk.Box+BoxChild this.scrolledwindow3 = new global::Gtk.ScrolledWindow (); this.scrolledwindow3.CanFocus = true; @@ -191,15 +306,15 @@ namespace MonoDevelop.Gettext this.textviewComments.AcceptsTab = false; this.scrolledwindow3.Add (this.textviewComments); this.vbox3.Add (this.scrolledwindow3); - global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.scrolledwindow3])); - w16.Position = 1; + global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.scrolledwindow3])); + w22.Position = 1; this.table1.Add (this.vbox3); - global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox3])); - w17.TopAttach = ((uint)(1)); - w17.BottomAttach = ((uint)(2)); - w17.LeftAttach = ((uint)(1)); - w17.RightAttach = ((uint)(2)); - w17.XOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox3])); + w23.TopAttach = ((uint)(1)); + w23.BottomAttach = ((uint)(2)); + w23.LeftAttach = ((uint)(1)); + w23.RightAttach = ((uint)(2)); + w23.XOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.vbox4 = new global::Gtk.VBox (); this.vbox4.Name = "vbox4"; @@ -211,33 +326,33 @@ namespace MonoDevelop.Gettext this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("_Translated (msgstr):"); this.label7.UseUnderline = true; this.vbox4.Add (this.label7); - global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.label7])); - w18.Position = 0; - w18.Expand = false; - w18.Fill = false; + global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.label7])); + w24.Position = 0; + w24.Expand = false; + w24.Fill = false; // Container child vbox4.Gtk.Box+BoxChild this.notebookTranslated = new global::Gtk.Notebook (); this.notebookTranslated.CanFocus = true; this.notebookTranslated.Name = "notebookTranslated"; this.notebookTranslated.CurrentPage = 0; // Notebook tab - global::Gtk.Label w19 = new global::Gtk.Label (); - w19.Visible = true; - this.notebookTranslated.Add (w19); + global::Gtk.Label w25 = new global::Gtk.Label (); + w25.Visible = true; + this.notebookTranslated.Add (w25); this.label1 = new global::Gtk.Label (); this.label1.Name = "label1"; this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("page1"); - this.notebookTranslated.SetTabLabel (w19, this.label1); + this.notebookTranslated.SetTabLabel (w25, this.label1); this.label1.ShowAll (); this.vbox4.Add (this.notebookTranslated); - global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.notebookTranslated])); - w20.Position = 1; + global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.notebookTranslated])); + w26.Position = 1; this.table1.Add (this.vbox4); - global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox4])); - w21.TopAttach = ((uint)(1)); - w21.BottomAttach = ((uint)(2)); - w21.XOptions = ((global::Gtk.AttachOptions)(4)); - w21.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w27 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox4])); + w27.TopAttach = ((uint)(1)); + w27.BottomAttach = ((uint)(2)); + w27.XOptions = ((global::Gtk.AttachOptions)(4)); + w27.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild this.vbox5 = new global::Gtk.VBox (); this.vbox5.Name = "vbox5"; @@ -252,8 +367,8 @@ namespace MonoDevelop.Gettext this.label8.Xalign = 0F; this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Original (msgid):"); this.hbox3.Add (this.label8); - global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label8])); - w22.Position = 0; + global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label8])); + w28.Position = 0; // Container child hbox3.Gtk.Box+BoxChild this.checkbuttonWhiteSpaces = new global::Gtk.CheckButton (); this.checkbuttonWhiteSpaces.CanFocus = true; @@ -262,22 +377,22 @@ namespace MonoDevelop.Gettext this.checkbuttonWhiteSpaces.DrawIndicator = true; this.checkbuttonWhiteSpaces.UseUnderline = true; this.hbox3.Add (this.checkbuttonWhiteSpaces); - global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.checkbuttonWhiteSpaces])); - w23.Position = 1; - w23.Expand = false; + global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.checkbuttonWhiteSpaces])); + w29.Position = 1; + w29.Expand = false; this.vbox5.Add (this.hbox3); - global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox3])); - w24.Position = 0; - w24.Expand = false; - w24.Fill = false; + global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hbox3])); + w30.Position = 0; + w30.Expand = false; + w30.Fill = false; // Container child vbox5.Gtk.Box+BoxChild this.scrolledwindowOriginal = new global::Gtk.ScrolledWindow (); this.scrolledwindowOriginal.CanFocus = true; this.scrolledwindowOriginal.Name = "scrolledwindowOriginal"; this.scrolledwindowOriginal.ShadowType = ((global::Gtk.ShadowType)(1)); this.vbox5.Add (this.scrolledwindowOriginal); - global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.scrolledwindowOriginal])); - w25.Position = 1; + global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.scrolledwindowOriginal])); + w31.Position = 1; // Container child vbox5.Gtk.Box+BoxChild this.vbox8 = new global::Gtk.VBox (); this.vbox8.Name = "vbox8"; @@ -288,21 +403,21 @@ namespace MonoDevelop.Gettext this.label9.Xalign = 0F; this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("Original plural (msgid_plural):"); this.vbox8.Add (this.label9); - global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox8 [this.label9])); - w26.Position = 0; - w26.Expand = false; - w26.Fill = false; + global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.vbox8 [this.label9])); + w32.Position = 0; + w32.Expand = false; + w32.Fill = false; // Container child vbox8.Gtk.Box+BoxChild this.scrolledwindowPlural = new global::Gtk.ScrolledWindow (); this.scrolledwindowPlural.CanFocus = true; this.scrolledwindowPlural.Name = "scrolledwindowPlural"; this.scrolledwindowPlural.ShadowType = ((global::Gtk.ShadowType)(1)); this.vbox8.Add (this.scrolledwindowPlural); - global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox8 [this.scrolledwindowPlural])); - w27.Position = 1; + global::Gtk.Box.BoxChild w33 = ((global::Gtk.Box.BoxChild)(this.vbox8 [this.scrolledwindowPlural])); + w33.Position = 1; this.vbox5.Add (this.vbox8); - global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.vbox8])); - w28.Position = 2; + global::Gtk.Box.BoxChild w34 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.vbox8])); + w34.Position = 2; this.table1.Add (this.vbox5); // Container child table1.Gtk.Table+TableChild this.vbox6 = new global::Gtk.VBox (); @@ -315,10 +430,10 @@ namespace MonoDevelop.Gettext this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("F_ound in:"); this.label4.UseUnderline = true; this.vbox6.Add (this.label4); - global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.label4])); - w30.Position = 0; - w30.Expand = false; - w30.Fill = false; + global::Gtk.Box.BoxChild w36 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.label4])); + w36.Position = 0; + w36.Expand = false; + w36.Fill = false; // Container child vbox6.Gtk.Box+BoxChild this.scrolledwindow2 = new global::Gtk.ScrolledWindow (); this.scrolledwindow2.CanFocus = true; @@ -330,20 +445,20 @@ namespace MonoDevelop.Gettext this.treeviewFoundIn.Name = "treeviewFoundIn"; this.scrolledwindow2.Add (this.treeviewFoundIn); this.vbox6.Add (this.scrolledwindow2); - global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.scrolledwindow2])); - w32.Position = 1; + global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.scrolledwindow2])); + w38.Position = 1; this.table1.Add (this.vbox6); - global::Gtk.Table.TableChild w33 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox6])); - w33.LeftAttach = ((uint)(1)); - w33.RightAttach = ((uint)(2)); - w33.XOptions = ((global::Gtk.AttachOptions)(4)); - w33.YOptions = ((global::Gtk.AttachOptions)(4)); + global::Gtk.Table.TableChild w39 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox6])); + w39.LeftAttach = ((uint)(1)); + w39.RightAttach = ((uint)(2)); + w39.XOptions = ((global::Gtk.AttachOptions)(4)); + w39.YOptions = ((global::Gtk.AttachOptions)(4)); this.vpaned2.Add (this.table1); - global::Gtk.Paned.PanedChild w34 = ((global::Gtk.Paned.PanedChild)(this.vpaned2 [this.table1])); - w34.Resize = false; + global::Gtk.Paned.PanedChild w40 = ((global::Gtk.Paned.PanedChild)(this.vpaned2 [this.table1])); + w40.Resize = false; this.vbox7.Add (this.vpaned2); - global::Gtk.Box.BoxChild w35 = ((global::Gtk.Box.BoxChild)(this.vbox7 [this.vpaned2])); - w35.Position = 1; + global::Gtk.Box.BoxChild w41 = ((global::Gtk.Box.BoxChild)(this.vbox7 [this.vpaned2])); + w41.Position = 1; this.notebookPages.Add (this.vbox7); // Notebook tab this.label5 = new global::Gtk.Label (); @@ -352,8 +467,8 @@ namespace MonoDevelop.Gettext this.notebookPages.SetTabLabel (this.vbox7, this.label5); this.label5.ShowAll (); this.vbox2.Add (this.notebookPages); - global::Gtk.Box.BoxChild w37 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.notebookPages])); - w37.Position = 0; + global::Gtk.Box.BoxChild w43 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.notebookPages])); + w43.Position = 0; // Container child vbox2.Gtk.Box+BoxChild this.hbox1 = new global::Gtk.HBox (); this.hbox1.Name = "hbox1"; @@ -366,19 +481,19 @@ namespace MonoDevelop.Gettext this.toolbarPages.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0)); this.toolbarPages.IconSize = ((global::Gtk.IconSize)(3)); this.hbox1.Add (this.toolbarPages); - global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.toolbarPages])); - w38.Position = 0; + global::Gtk.Box.BoxChild w44 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.toolbarPages])); + w44.Position = 0; // Container child hbox1.Gtk.Box+BoxChild this.progressbar1 = new global::Gtk.ProgressBar (); this.progressbar1.Name = "progressbar1"; this.hbox1.Add (this.progressbar1); - global::Gtk.Box.BoxChild w39 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.progressbar1])); - w39.Position = 1; + global::Gtk.Box.BoxChild w45 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.progressbar1])); + w45.Position = 1; this.vbox2.Add (this.hbox1); - global::Gtk.Box.BoxChild w40 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1])); - w40.Position = 1; - w40.Expand = false; - w40.Fill = false; + global::Gtk.Box.BoxChild w46 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1])); + w46.Position = 1; + w46.Expand = false; + w46.Fill = false; this.Add (this.vbox2); if ((this.Child != null)) { this.Child.ShowAll (); diff --git a/main/src/addins/MonoDevelop.Gettext/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.Gettext/gtk-gui/generated.cs index 75935e2e55..886fd2e124 100644 --- a/main/src/addins/MonoDevelop.Gettext/gtk-gui/generated.cs +++ b/main/src/addins/MonoDevelop.Gettext/gtk-gui/generated.cs @@ -17,6 +17,7 @@ namespace Stetic internal class BinContainer { private Gtk.Widget child; + private Gtk.UIManager uimanager; public static BinContainer Attach (Gtk.Bin bin) @@ -58,7 +59,8 @@ namespace Stetic if ((this.uimanager != null)) { Gtk.Widget w; w = this.child.Toplevel; - if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) { + if (((w != null) + && typeof(Gtk.Window).IsInstanceOfType (w))) { ((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup); this.uimanager = null; } diff --git a/main/src/addins/MonoDevelop.Gettext/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Gettext/gtk-gui/gui.stetic index b9c986485f..3836680c83 100644 --- a/main/src/addins/MonoDevelop.Gettext/gtk-gui/gui.stetic +++ b/main/src/addins/MonoDevelop.Gettext/gtk-gui/gui.stetic @@ -1320,10 +1320,39 @@ <widget class="Gtk.ToggleButton" id="togglebuttonOk"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">resource:silk_accept.png</property> - <property name="Label" translatable="yes">Valid</property> - <property name="UseUnderline">True</property> + <property name="Type">Custom</property> + <child> + <widget class="Gtk.HBox" id="togglebuttonOkHbox"> + <property name="MemberName" /> + <property name="Spacing">2</property> + <child> + <widget class="MonoDevelop.Components.ImageView" id="togglebuttonOkIcon"> + <property name="MemberName" /> + <property name="IconId">md-done</property> + <property name="IconSize">Menu</property> + </widget> + <packing> + <property name="Position">0</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + <child> + <widget class="Gtk.Label" id="togglebuttonOkLabel"> + <property name="MemberName" /> + <property name="LabelProp" translatable="yes">Valid</property> + <property name="UseUnderline">True</property> + </widget> + <packing> + <property name="Position">1</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + </widget> + </child> </widget> <packing> <property name="Position">2</property> @@ -1336,10 +1365,39 @@ <widget class="Gtk.ToggleButton" id="togglebuttonMissing"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">resource:silk_exclamation.png</property> - <property name="Label" translatable="yes">Missing</property> - <property name="UseUnderline">True</property> + <property name="Type">Custom</property> + <child> + <widget class="Gtk.HBox" id="togglebuttonMissingHbox"> + <property name="MemberName" /> + <property name="Spacing">2</property> + <child> + <widget class="MonoDevelop.Components.ImageView" id="togglebuttonMissingIcon"> + <property name="MemberName" /> + <property name="IconId">md-warning</property> + <property name="IconSize">Menu</property> + </widget> + <packing> + <property name="Position">0</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + <child> + <widget class="Gtk.Label" id="togglebuttonMissingLabel"> + <property name="MemberName" /> + <property name="LabelProp" translatable="yes">Missing</property> + <property name="UseUnderline">True</property> + </widget> + <packing> + <property name="Position">1</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + </widget> + </child> </widget> <packing> <property name="Position">3</property> @@ -1352,10 +1410,39 @@ <widget class="Gtk.ToggleButton" id="togglebuttonFuzzy"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">resource:silk_error.png</property> - <property name="Label" translatable="yes">Fuzzy</property> - <property name="UseUnderline">True</property> + <property name="Type">Custom</property> + <child> + <widget class="Gtk.HBox" id="togglebuttonFuzzyHbox"> + <property name="MemberName" /> + <property name="Spacing">2</property> + <child> + <widget class="MonoDevelop.Components.ImageView" id="togglebuttonFuzzyIcon"> + <property name="MemberName" /> + <property name="IconId">md-error</property> + <property name="IconSize">Menu</property> + </widget> + <packing> + <property name="Position">0</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + <child> + <widget class="Gtk.Label" id="togglebuttonFuzzyLabel"> + <property name="MemberName" /> + <property name="LabelProp" translatable="yes">Fuzzy</property> + <property name="UseUnderline">True</property> + </widget> + <packing> + <property name="Position">1</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + </widget> + </child> </widget> <packing> <property name="Position">4</property> diff --git a/main/src/addins/MonoDevelop.Gettext/icons/done-16.png b/main/src/addins/MonoDevelop.Gettext/icons/done-16.png Binary files differdeleted file mode 100644 index 7799066c43..0000000000 --- a/main/src/addins/MonoDevelop.Gettext/icons/done-16.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Gettext/icons/done-16@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/done-16@2x.png Binary files differdeleted file mode 100644 index c63d3974d1..0000000000 --- a/main/src/addins/MonoDevelop.Gettext/icons/done-16@2x.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Gettext/icons/error-16.png b/main/src/addins/MonoDevelop.Gettext/icons/error-16.png Binary files differdeleted file mode 100644 index 30b5da6e9b..0000000000 --- a/main/src/addins/MonoDevelop.Gettext/icons/error-16.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Gettext/icons/error-16@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/error-16@2x.png Binary files differdeleted file mode 100644 index adfd2b7b19..0000000000 --- a/main/src/addins/MonoDevelop.Gettext/icons/error-16@2x.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Gettext/icons/gettext-overlay-16.png b/main/src/addins/MonoDevelop.Gettext/icons/gettext-overlay-16.png Binary files differdeleted file mode 100644 index 728c2a3e96..0000000000 --- a/main/src/addins/MonoDevelop.Gettext/icons/gettext-overlay-16.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Gettext/icons/gettext-overlay-32.png b/main/src/addins/MonoDevelop.Gettext/icons/gettext-overlay-32.png Binary files differdeleted file mode 100644 index 9fc3638ad5..0000000000 --- a/main/src/addins/MonoDevelop.Gettext/icons/gettext-overlay-32.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16.png Binary files differindex 19f2663360..87f2953c12 100644 --- a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16.png +++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16.png diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16@2x.png Binary files differindex 1e4d00deb6..d5e0271f66 100644 --- a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16@2x.png +++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16@2x.png diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark.png Binary files differnew file mode 100644 index 0000000000..778eac0789 --- /dev/null +++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark.png diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7ac3c2cd5a --- /dev/null +++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark~sel.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..6038f48200 --- /dev/null +++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b2fb37ecd9 --- /dev/null +++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~sel.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~sel.png Binary files differnew file mode 100644 index 0000000000..6038f48200 --- /dev/null +++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~sel.png diff --git a/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~sel@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b2fb37ecd9 --- /dev/null +++ b/main/src/addins/MonoDevelop.Gettext/icons/prefs-language-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Gettext/icons/warning-16.png b/main/src/addins/MonoDevelop.Gettext/icons/warning-16.png Binary files differdeleted file mode 100644 index 36e3484d08..0000000000 --- a/main/src/addins/MonoDevelop.Gettext/icons/warning-16.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Gettext/icons/warning-16@2x.png b/main/src/addins/MonoDevelop.Gettext/icons/warning-16@2x.png Binary files differdeleted file mode 100644 index c457998b0a..0000000000 --- a/main/src/addins/MonoDevelop.Gettext/icons/warning-16@2x.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/Placeholder.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/Placeholder.cs index c1aced580b..b0dbb9f292 100644 --- a/main/src/addins/MonoDevelop.GtkCore/libstetic/Placeholder.cs +++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/Placeholder.cs @@ -103,6 +103,8 @@ namespace Stetic { cr.RelLineTo (-rect.Width, 0); cr.RelLineTo (0, -rect.Height); cr.ClosePath (); + + // FIXME: VV: Remove gradient features using (var pat = new Cairo.LinearGradient (rect.X + rect.Width*fx, rect.Y + rect.Height*fy, rect.X + rect.Width*fw, rect.Y + rect.Height*fh)) { pat.AddColorStop (0, c1); pat.AddColorStop (1, c2); diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorItem.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorItem.cs index 9c5980ce04..9cf09eb96e 100644 --- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorItem.cs +++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorItem.cs @@ -187,7 +187,7 @@ namespace Stetic.Editor bool calcSize = (testx == -1); Pango.Layout layout = new Pango.Layout (this.PangoContext); - Pango.FontDescription des = this.Style.FontDescription.Copy(); + Pango.FontDescription des = this.Style.FontDescription.Copy(); // TODO: VV: Use FontService des.Size = 10 * (int) Pango.Scale.PangoScale; layout.FontDescription = des; layout.SetMarkup (title); diff --git a/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml b/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml index d86f60ec76..68333ec2a5 100644 --- a/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml +++ b/main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml @@ -175,7 +175,7 @@ </Extension> <Extension path = "/MonoDevelop/Core/MimeTypes"> - <MimeType id="text/x-gtkx" _description="Gtk# designer file" icon="gtk-page-setup" isText="true"> + <MimeType id="text/x-gtkx" _description="Gtk# designer file" isText="true"> <File pattern="*.gtkx" /> </MimeType> </Extension> diff --git a/main/src/addins/MonoDevelop.GtkCore2/changes.patch b/main/src/addins/MonoDevelop.GtkCore2/changes.patch index 9fbc84e921..9857ba3bd7 100644 --- a/main/src/addins/MonoDevelop.GtkCore2/changes.patch +++ b/main/src/addins/MonoDevelop.GtkCore2/changes.patch @@ -4034,7 +4034,7 @@ Index: MonoDevelop.GtkCore.addin.xml </Extension> + <Extension path = "/MonoDevelop/Core/MimeTypes"> -+ <MimeType id="text/x-gtkx" _description="Gtk# designer file" icon="gtk-page-setup" isText="true"> ++ <MimeType id="text/x-gtkx" _description="Gtk# designer file" isText="true"> + <File pattern="*.gtkx" /> + </MimeType> + </Extension> diff --git a/main/src/addins/MonoDevelop.GtkCore2/libstetic/Placeholder.cs b/main/src/addins/MonoDevelop.GtkCore2/libstetic/Placeholder.cs index d5a6b69bec..1a55e0258e 100644 --- a/main/src/addins/MonoDevelop.GtkCore2/libstetic/Placeholder.cs +++ b/main/src/addins/MonoDevelop.GtkCore2/libstetic/Placeholder.cs @@ -103,6 +103,8 @@ namespace Stetic { cr.RelLineTo (-rect.Width, 0); cr.RelLineTo (0, -rect.Height); cr.ClosePath (); + + // FIXME: VV: Remove gradient features Cairo.LinearGradient pat = new Cairo.LinearGradient (rect.X + rect.Width*fx, rect.Y + rect.Height*fy, rect.X + rect.Width*fw, rect.Y + rect.Height*fh); pat.AddColorStop (0, c1); pat.AddColorStop (1, c2); diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialog.UI.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialog.UI.cs index 7fe0956497..9e248963d6 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialog.UI.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/AddPackagesDialog.UI.cs @@ -28,7 +28,6 @@ using System; using ExtendedTitleBarDialog = MonoDevelop.Components.ExtendedTitleBarDialog;
using Mono.Unix;
using MonoDevelop.Ide;
-using MonoDevelop.Ide.Gui;
using Xwt;
using Xwt.Drawing;
@@ -60,8 +59,6 @@ namespace MonoDevelop.PackageManagement Label errorMessageLabel;
Label loadingSpinnerLabel;
FrameBox noPackagesFoundFrame;
- Color lineBorderColor = Color.FromBytes (163, 166, 171);
- Color packageInfoBackgroundColor = Color.FromBytes (227, 231, 237);
void Build ()
{
@@ -95,7 +92,7 @@ namespace MonoDevelop.PackageManagement var middleFrame = new FrameBox ();
middleFrame.Content = middleHBox;
middleFrame.BorderWidth = new WidgetSpacing (0, 0, 0, 1);
- middleFrame.BorderColor = lineBorderColor;
+ middleFrame.BorderColor = Styles.LineBorderColor;
mainVBox.PackStart (middleFrame, true, true);
// Error information.
@@ -103,15 +100,15 @@ namespace MonoDevelop.PackageManagement packagesListVBox.Spacing = 0;
errorMessageHBox = new HBox ();
errorMessageHBox.Margin = new WidgetSpacing ();
- errorMessageHBox.BackgroundColor = Colors.Orange;
+ errorMessageHBox.BackgroundColor = Styles.ErrorBackgroundColor;
errorMessageHBox.Visible = false;
var errorImage = new ImageView ();
errorImage.Margin = new WidgetSpacing (10, 0, 0, 0);
- errorImage.Image = ImageService.GetIcon (Stock.Warning, Gtk.IconSize.Menu);
+ errorImage.Image = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.Warning, Gtk.IconSize.Menu);
errorImage.HorizontalPlacement = WidgetPlacement.End;
errorMessageHBox.PackStart (errorImage);
errorMessageLabel = new Label ();
- errorMessageLabel.TextColor = Colors.White;
+ errorMessageLabel.TextColor = Styles.ErrorForegroundColor;
errorMessageLabel.Margin = new WidgetSpacing (5, 5, 5, 5);
errorMessageLabel.Wrap = WrapMode.Word;
errorMessageHBox.PackStart (errorMessageLabel, true);
@@ -138,7 +135,7 @@ namespace MonoDevelop.PackageManagement loadingSpinnerFrame = new FrameBox ();
loadingSpinnerFrame.Visible = false;
- loadingSpinnerFrame.BackgroundColor = Colors.White;
+ loadingSpinnerFrame.BackgroundColor = Styles.BackgroundColor;
loadingSpinnerFrame.Content = loadingSpinnerHBox;
loadingSpinnerFrame.BorderWidth = new WidgetSpacing ();
packagesListVBox.PackStart (loadingSpinnerFrame, true, true);
@@ -153,7 +150,7 @@ namespace MonoDevelop.PackageManagement noPackagesFoundFrame = new FrameBox ();
noPackagesFoundFrame.Visible = false;
- noPackagesFoundFrame.BackgroundColor = Colors.White;
+ noPackagesFoundFrame.BackgroundColor = Styles.BackgroundColor;
noPackagesFoundFrame.Content = noPackagesFoundHBox;
noPackagesFoundFrame.BorderWidth = new WidgetSpacing ();
packagesListVBox.PackStart (noPackagesFoundFrame, true, true);
@@ -161,7 +158,7 @@ namespace MonoDevelop.PackageManagement // Package information
packageInfoVBox = new VBox ();
var packageInfoFrame = new FrameBox ();
- packageInfoFrame.BackgroundColor = packageInfoBackgroundColor;
+ packageInfoFrame.BackgroundColor = Styles.PackageInfoBackgroundColor;
packageInfoFrame.BorderWidth = new WidgetSpacing ();
packageInfoFrame.Content = packageInfoVBox;
packageInfoVBox.Margin = new WidgetSpacing (15, 12, 15, 12);
@@ -173,11 +170,11 @@ namespace MonoDevelop.PackageManagement packageInfoScrollView.BorderVisible = false;
packageInfoScrollView.HorizontalScrollPolicy = ScrollPolicy.Never;
packageInfoScrollView.Content = packageInfoContainerVBox;
- packageInfoScrollView.BackgroundColor = packageInfoBackgroundColor;
+ packageInfoScrollView.BackgroundColor = Styles.PackageInfoBackgroundColor;
var packageInfoScrollViewFrame = new FrameBox ();
- packageInfoScrollViewFrame.BackgroundColor = packageInfoBackgroundColor;
+ packageInfoScrollViewFrame.BackgroundColor = Styles.PackageInfoBackgroundColor;
packageInfoScrollViewFrame.BorderWidth = new WidgetSpacing (1, 0, 0, 0);
- packageInfoScrollViewFrame.BorderColor = lineBorderColor;
+ packageInfoScrollViewFrame.BorderColor = Styles.LineBorderColor;
packageInfoScrollViewFrame.Content = packageInfoScrollView;
middleHBox.PackEnd (packageInfoScrollViewFrame);
@@ -187,7 +184,7 @@ namespace MonoDevelop.PackageManagement packageNameLabel = new Label ();
packageNameLabel.Ellipsize = EllipsizeMode.End;
- Font packageInfoSmallFont = packageNameLabel.Font.WithScaledSize (0.8);
+ Font packageInfoSmallFont = packageNameLabel.Font.WithSize (11);
packageNameHBox.PackStart (packageNameLabel, true);
packageVersionLabel = new Label ();
@@ -197,8 +194,8 @@ namespace MonoDevelop.PackageManagement // Package description.
packageDescription = new Label ();
packageDescription.Wrap = WrapMode.Word;
- packageDescription.Font = packageNameLabel.Font.WithScaledSize (0.9);
- packageDescription.BackgroundColor = packageInfoBackgroundColor;
+ packageDescription.Font = packageNameLabel.Font.WithSize (11);
+ packageDescription.BackgroundColor = Styles.PackageInfoBackgroundColor;
packageInfoVBox.PackStart (packageDescription);
// Package id.
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellView.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellView.cs index fcaf0551ff..48c36118d5 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellView.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageCellView.cs @@ -37,9 +37,9 @@ namespace MonoDevelop.PackageManagement {
CellWidth = 260;
- BackgroundColor = Color.FromBytes (243, 246, 250);
- StrongSelectionColor = Color.FromBytes (49, 119, 216);
- SelectionColor = Color.FromBytes (204, 204, 204);
+ BackgroundColor = Styles.CellBackgroundColor;
+ StrongSelectionColor = Styles.CellStrongSelectionColor;
+ SelectionColor = Styles.CellSelectionColor;
UseStrongSelectionColor = true;
}
@@ -88,6 +88,7 @@ namespace MonoDevelop.PackageManagement // Package Id.
var packageIdTextLayout = new TextLayout ();
+ packageIdTextLayout.Font = packageIdTextLayout.Font.WithSize (12);
packageIdTextLayout.Markup = packageViewModel.GetNameMarkup ();
packageIdTextLayout.Trimming = TextTrimming.WordElipsis;
Size packageIdTextSize = packageIdTextLayout.GetSize ();
@@ -99,7 +100,7 @@ namespace MonoDevelop.PackageManagement // Package description.
var descriptionTextLayout = new TextLayout ();
- descriptionTextLayout.Font = descriptionTextLayout.Font.WithScaledSize (0.9);
+ descriptionTextLayout.Font = descriptionTextLayout.Font.WithSize (11);
descriptionTextLayout.Width = cellArea.Width - packageDescriptionPadding.HorizontalSpacing - packageDescriptionLeftOffset;
descriptionTextLayout.Height = cellArea.Height - packageIdTextSize.Height - packageDescriptionPadding.VerticalSpacing;
descriptionTextLayout.Text = packageViewModel.Summary;
@@ -114,9 +115,9 @@ namespace MonoDevelop.PackageManagement void UpdateTextColor (Context ctx)
{
if (UseStrongSelectionColor && Selected) {
- ctx.SetColor (Colors.White);
+ ctx.SetColor (Styles.CellTextSelectionColor);
} else {
- ctx.SetColor (Colors.Black);
+ ctx.SetColor (Styles.CellTextColor);
}
}
@@ -230,6 +231,9 @@ namespace MonoDevelop.PackageManagement image = defaultPackageImage;
}
+ if (Selected)
+ image = image.WithStyles ("sel");
+
if (PackageImageNeedsResizing (image)) {
Point imageLocation = GetPackageImageLocation (maxPackageImageSize, cellArea);
ctx.DrawImage (
@@ -263,7 +267,7 @@ namespace MonoDevelop.PackageManagement {
var layout = new TextLayout ();
layout.Text = "W";
- layout.Font = layout.Font.WithScaledSize (0.9);
+ layout.Font = layout.Font.WithSize (11);
Size size = layout.GetSize ();
return new Size (CellWidth, size.Height * linesDisplayedCount + packageDescriptionPaddingHeight + packageDescriptionPadding.VerticalSpacing);
}
@@ -317,7 +321,7 @@ namespace MonoDevelop.PackageManagement Image checkedCheckBoxWithBackgroundColorImage;
Image uncheckedCheckBoxWithBackgroundColorImage;
- static readonly Image defaultPackageImage = Image.FromResource (typeof(PackageCellView), "reference-48.png");
+ static readonly Image defaultPackageImage = Image.FromResource (typeof(PackageCellView), "package-48.png");
}
}
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourceCellRenderer.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourceCellRenderer.cs index dee8dc00f5..f10766e580 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourceCellRenderer.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/PackageSourceCellRenderer.cs @@ -56,7 +56,7 @@ namespace MonoDevelop.PackageManagement int packageSourceNameWidth = GetLayoutWidth (layout);
StateType state = GetState (widget, flags);
- layout.SetMarkup (GetPackageSourceDescriptionMarkup ());
+ layout.SetMarkup (GetPackageSourceDescriptionMarkup (flags));
window.DrawLayout (widget.Style.TextGC (state), cell_area.X + textSpacing, cell_area.Y + textTopSpacing, layout);
@@ -65,7 +65,7 @@ namespace MonoDevelop.PackageManagement ctx.DrawImage (widget, warningImage, cell_area.X + textSpacing + packageSourceNameWidth + imageSpacing, cell_area.Y + textTopSpacing);
}
- layout.SetMarkup (GetPackageSourceErrorMarkup ());
+ layout.SetMarkup (GetPackageSourceErrorMarkup (flags));
int packageSourceErrorTextX = cell_area.X + textSpacing + packageSourceNameWidth + (int)warningImage.Width + (2 * imageSpacing);
window.DrawLayout (widget.Style.TextGC (state), packageSourceErrorTextX, cell_area.Y + textTopSpacing, layout);
}
@@ -104,18 +104,20 @@ namespace MonoDevelop.PackageManagement return new Size (width, height);
}
- string GetPackageSourceDescriptionMarkup ()
+ string GetPackageSourceDescriptionMarkup (CellRendererState flags = CellRendererState.Focused)
{
return MarkupString.Format (
- "<b>{0}</b>\n<span foreground='#747474'>{1}</span>",
+ "<b>{0}</b>\n<span foreground='{2}'>{1}</span>",
PackageSourceViewModel.Name,
- PackageSourceViewModel.SourceUrl);
+ PackageSourceViewModel.SourceUrl,
+ Ide.Gui.Styles.ColorGetHex (flags.HasFlag (CellRendererState.Selected) ? Styles.PackageSourceUrlSelectedTextColor : Styles.PackageSourceUrlTextColor));
}
- string GetPackageSourceErrorMarkup ()
+ string GetPackageSourceErrorMarkup (CellRendererState flags = CellRendererState.Focused)
{
return MarkupString.Format (
- "<span foreground='#656565'>{0}</span>",
+ "<span foreground='{0}'>{1}</span>",
+ Ide.Gui.Styles.ColorGetHex (flags.HasFlag (CellRendererState.Selected) ? Styles.PackageSourceErrorSelectedTextColor : Styles.PackageSourceErrorTextColor),
PackageSourceViewModel.ValidationFailureMessage);
}
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/Styles.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/Styles.cs new file mode 100644 index 0000000000..09ffb4293c --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/Styles.cs @@ -0,0 +1,83 @@ +// +// Styles.cs +// +// Author: +// Vsevolod Kukol <sevo@xamarin.com> +// +// Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using MonoDevelop.Ide; + +namespace MonoDevelop.PackageManagement +{ + public static class Styles + { + public static Xwt.Drawing.Color LineBorderColor { get; internal set; } + public static Xwt.Drawing.Color BackgroundColor { get; internal set; } + public static Xwt.Drawing.Color PackageInfoBackgroundColor { get; internal set; } + public static Xwt.Drawing.Color CellBackgroundColor { get; internal set; } + public static Xwt.Drawing.Color CellSelectionColor { get; internal set; } + public static Xwt.Drawing.Color CellStrongSelectionColor { get; internal set; } + public static Xwt.Drawing.Color CellTextColor { get; internal set; } + public static Xwt.Drawing.Color CellTextSelectionColor { get; internal set; } + public static Xwt.Drawing.Color PackageSourceUrlTextColor { get; internal set; } + public static Xwt.Drawing.Color PackageSourceUrlSelectedTextColor { get; internal set; } + public static Xwt.Drawing.Color PackageSourceErrorTextColor { get; internal set; } + public static Xwt.Drawing.Color PackageSourceErrorSelectedTextColor { get; internal set; } + public static Xwt.Drawing.Color ErrorBackgroundColor { get; internal set; } + public static Xwt.Drawing.Color ErrorForegroundColor { get; internal set; } + + static Styles () + { + LoadStyles (); + Ide.Gui.Styles.Changed += (o, e) => LoadStyles (); + } + + public static void LoadStyles () + { + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) { + CellBackgroundColor = Ide.Gui.Styles.PadBackground; + } else { + CellBackgroundColor = Xwt.Drawing.Color.FromName ("#3c3c3c"); + } + + // Shared + + BackgroundColor = Ide.Gui.Styles.PrimaryBackgroundColor; + + CellTextColor = Ide.Gui.Styles.BaseForegroundColor; + CellStrongSelectionColor = Ide.Gui.Styles.BaseSelectionBackgroundColor; + CellSelectionColor = Ide.Gui.Styles.BaseSelectionBackgroundColor; + CellTextSelectionColor = Ide.Gui.Styles.BaseSelectionTextColor; + + PackageSourceUrlSelectedTextColor = PackageSourceUrlTextColor; + PackageSourceErrorSelectedTextColor = PackageSourceErrorTextColor; + PackageInfoBackgroundColor = Ide.Gui.Styles.SecondaryBackgroundLighterColor; + PackageSourceErrorTextColor = Ide.Gui.Styles.ErrorForegroundColor; + PackageSourceUrlTextColor = Ide.Gui.Styles.DimTextColor; + + LineBorderColor = Ide.Gui.Styles.SeparatorColor; + + ErrorBackgroundColor = Ide.Gui.Styles.StatusWarningBackgroundColor; + ErrorForegroundColor = Ide.Gui.Styles.StatusWarningTextColor; + } + } +} + diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml index 827f55afe7..caa93c4622 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml @@ -99,7 +99,7 @@ </Extension>
<Extension path="/MonoDevelop/Core/StockIcons">
- <StockIcon stockid="md-nuget-package" resource="reference-48.png" />
+ <StockIcon stockid="md-nuget-package" resource="package-48.png" />
<StockIcon stockid="md-nuget-package-source" resource="package-source-32.png" size="Dnd" />
<StockIcon stockid="md-prefs-package" resource="prefs-package-16.png" size="Menu" />
<StockIcon stockid="md-prefs-package-source" resource="prefs-package-source-16.png" size="Menu" />
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj index 107006899e..d967daea09 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj @@ -288,6 +288,7 @@ </Compile> <Compile Include="MonoDevelop.PackageManagement.Gui\DialogExtensions.cs" /> <Compile Include="MonoDevelop.PackageManagement.Gui\PackageCellViewEventArgs.cs" /> + <Compile Include="MonoDevelop.PackageManagement.Gui\Styles.cs" /> <Compile Include="MonoDevelop.PackageManagement\ImageLoader.cs" /> <Compile Include="MonoDevelop.PackageManagement\ImageLoadedEventArgs.cs" /> <Compile Include="MonoDevelop.PackageManagement\PackageSourceViewModelChecker.cs" /> @@ -387,25 +388,97 @@ <EmbeddedResource Include="icons\package-source-32%402x.png"> <LogicalName>package-source-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\package-source-32~dark.png"> + <LogicalName>package-source-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-source-32~dark%402x.png"> + <LogicalName>package-source-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-source-32~sel.png"> + <LogicalName>package-source-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-source-32~sel%402x.png"> + <LogicalName>package-source-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-source-32~dark~sel.png"> + <LogicalName>package-source-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-source-32~dark~sel%402x.png"> + <LogicalName>package-source-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-package-16.png"> <LogicalName>prefs-package-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-package-16%402x.png"> <LogicalName>prefs-package-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-package-16~dark.png"> + <LogicalName>prefs-package-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-package-16~dark%402x.png"> + <LogicalName>prefs-package-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-package-16~sel.png"> + <LogicalName>prefs-package-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-package-16~sel%402x.png"> + <LogicalName>prefs-package-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-package-16~dark~sel.png"> + <LogicalName>prefs-package-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-package-16~dark~sel%402x.png"> + <LogicalName>prefs-package-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-package-source-16.png"> <LogicalName>prefs-package-source-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-package-source-16%402x.png"> <LogicalName>prefs-package-source-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-package-source-16~dark.png"> + <LogicalName>prefs-package-source-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-package-source-16~dark%402x.png"> + <LogicalName>prefs-package-source-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-package-source-16~sel.png"> + <LogicalName>prefs-package-source-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-package-source-16~sel%402x.png"> + <LogicalName>prefs-package-source-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-package-source-16~dark~sel.png"> + <LogicalName>prefs-package-source-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-package-source-16~dark~sel%402x.png"> + <LogicalName>prefs-package-source-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> </ItemGroup> <ItemGroup> - <EmbeddedResource Include="icons\reference-48.png"> - <LogicalName>reference-48.png</LogicalName> + <EmbeddedResource Include="icons\package-48.png"> + <LogicalName>package-48.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48%402x.png"> + <LogicalName>package-48@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~dark.png"> + <LogicalName>package-48~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~dark%402x.png"> + <LogicalName>package-48~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~sel.png"> + <LogicalName>package-48~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~sel%402x.png"> + <LogicalName>package-48~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~dark~sel.png"> + <LogicalName>package-48~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\reference-48%402x.png"> - <LogicalName>reference-48@2x.png</LogicalName> + <EmbeddedResource Include="icons\package-48~dark~sel%402x.png"> + <LogicalName>package-48~dark~sel@2x.png</LogicalName> </EmbeddedResource> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesSearchCategory.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesSearchCategory.cs index a46706c6e1..960b4212d2 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesSearchCategory.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/SearchPackagesSearchCategory.cs @@ -72,7 +72,7 @@ namespace MonoDevelop.PackageManagement runner.Run (pattern.UnparsedPattern);
}
- public override string GetMarkupText () + public override string GetMarkupText (bool selected) { return GettextCatalog.GetString ("Search Packages...");
} diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackagesWidget.cs b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackagesWidget.cs index c2142af5cd..b1fe584246 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackagesWidget.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PackagesWidget.cs @@ -5,55 +5,107 @@ namespace MonoDevelop.PackageManagement public partial class PackagesWidget
{
private global::Gtk.HPaned mainPane;
+
private global::Gtk.VBox packagesListVBox;
+
private global::Gtk.ScrolledWindow packagesTreeScrolledWindow;
+
private global::Gtk.TreeView packagesTreeView;
+
private global::Gtk.HBox pagedResultsHBox;
+
private global::Gtk.Label pagedResultsLeftLabel;
+
private global::MonoDevelop.PackageManagement.PagedResultsWidget pagedResultsWidget;
+
private global::Gtk.Label pagedResultsRightLabel;
+
private global::Gtk.VBox packageInfoVBox;
+
private global::Gtk.ComboBox packageSourceComboBox;
+
private global::Gtk.HBox packageSearchHBox;
+
private global::Gtk.Entry packageSearchEntry;
+
private global::Gtk.Button packageSearchButton;
+
+ private global::MonoDevelop.Components.ImageView imageSearch;
+
private global::Gtk.CheckButton includePrereleaseCheckButton;
+
private global::Gtk.HButtonBox updateAllPackagesButtonBox;
+
private global::Gtk.Button updateAllPackagesButton;
+
private global::Gtk.Frame packageInfoFrame;
+
private global::Gtk.Alignment packageInfoFrameAlignment;
+
private global::Gtk.ScrolledWindow GtkScrolledWindow;
+
private global::Gtk.VBox packageInfoFrameVBox;
+
private global::Gtk.HBox packageCreatedByHBox;
+
private global::Gtk.Label packageCreatedByLabel;
+
private global::Gtk.Label packageCreatedByTextBox;
+
private global::Gtk.HBox packageIdHBox;
+
private global::Gtk.Label packageIdLabel;
+
private global::MonoDevelop.PackageManagement.HyperlinkWidget packageIdButton;
+
private global::Gtk.Label packageIdTextBox;
+
private global::Gtk.HBox packageVersionHBox;
+
private global::Gtk.Label packageVersionLabel;
+
private global::Gtk.Label packageVersionTextBox;
+
private global::Gtk.HBox packageLastUpdatedHBox;
+
private global::Gtk.Label packageLastUpdatedLabel;
+
private global::Gtk.Label packageLastUpdatedTextBox;
+
private global::Gtk.HBox packageDownloadsHBox;
+
private global::Gtk.Label packageDownloadsLabel;
+
private global::Gtk.Label packageDownloadsTextBox;
+
private global::Gtk.HBox viewLicenseTermsHBox;
+
private global::MonoDevelop.PackageManagement.HyperlinkWidget viewLicenseTermsButton;
+
private global::Gtk.HBox moreInformationHBox;
+
private global::MonoDevelop.PackageManagement.HyperlinkWidget moreInformationButton;
+
private global::Gtk.TextView packageDescriptionTextView;
+
private global::Gtk.HBox packageDependenciesHBox;
+
private global::Gtk.Label packageDependenciesLabel;
+
private global::Gtk.Label packageDependenciesNoneLabel;
+
private global::Gtk.HBox packageDependenciesListHBox;
+
private global::Gtk.Label packageDependenciesListLabel;
+
private global::Gtk.Label packageDependenciesListFillerLabel;
+
private global::Gtk.HButtonBox managePackageButtonBox;
+
private global::Gtk.Button addPackageButton;
+
private global::Gtk.Button removePackageButton;
+
private global::Gtk.Button managePackageButton;
protected virtual void Build ()
@@ -145,10 +197,12 @@ namespace MonoDevelop.PackageManagement this.packageSearchButton = new global::Gtk.Button ();
this.packageSearchButton.CanFocus = true;
this.packageSearchButton.Name = "packageSearchButton";
- this.packageSearchButton.UseUnderline = true;
- global::Gtk.Image w10 = new global::Gtk.Image ();
- w10.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-find", global::Gtk.IconSize.Menu);
- this.packageSearchButton.Image = w10;
+ // Container child packageSearchButton.Gtk.Container+ContainerChild
+ this.imageSearch = new global::MonoDevelop.Components.ImageView ();
+ this.imageSearch.Name = "imageSearch";
+ this.imageSearch.IconId = "gtk-find";
+ this.imageSearch.IconSize = ((global::Gtk.IconSize)(1));
+ this.packageSearchButton.Add (this.imageSearch);
this.packageSearchHBox.Add (this.packageSearchButton);
global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.packageSearchHBox [this.packageSearchButton]));
w11.Position = 1;
@@ -216,7 +270,7 @@ namespace MonoDevelop.PackageManagement // Container child packageCreatedByHBox.Gtk.Box+BoxChild
this.packageCreatedByLabel = new global::Gtk.Label ();
this.packageCreatedByLabel.Name = "packageCreatedByLabel";
- this.packageCreatedByLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight=\'bold\'>Created by:</span>");
+ this.packageCreatedByLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight='bold'>Created by:</span>");
this.packageCreatedByLabel.UseMarkup = true;
this.packageCreatedByHBox.Add (this.packageCreatedByLabel);
global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.packageCreatedByHBox [this.packageCreatedByLabel]));
@@ -244,7 +298,7 @@ namespace MonoDevelop.PackageManagement // Container child packageIdHBox.Gtk.Box+BoxChild
this.packageIdLabel = new global::Gtk.Label ();
this.packageIdLabel.Name = "packageIdLabel";
- this.packageIdLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight=\'bold\'>Id:</span>");
+ this.packageIdLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight='bold'>Id:</span>");
this.packageIdLabel.UseMarkup = true;
this.packageIdHBox.Add (this.packageIdLabel);
global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.packageIdHBox [this.packageIdLabel]));
@@ -277,7 +331,7 @@ namespace MonoDevelop.PackageManagement // Container child packageVersionHBox.Gtk.Box+BoxChild
this.packageVersionLabel = new global::Gtk.Label ();
this.packageVersionLabel.Name = "packageVersionLabel";
- this.packageVersionLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight=\'bold\'>Version:</span>");
+ this.packageVersionLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight='bold'>Version:</span>");
this.packageVersionLabel.UseMarkup = true;
this.packageVersionHBox.Add (this.packageVersionLabel);
global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.packageVersionHBox [this.packageVersionLabel]));
@@ -305,7 +359,7 @@ namespace MonoDevelop.PackageManagement // Container child packageLastUpdatedHBox.Gtk.Box+BoxChild
this.packageLastUpdatedLabel = new global::Gtk.Label ();
this.packageLastUpdatedLabel.Name = "packageLastUpdatedLabel";
- this.packageLastUpdatedLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight=\'bold\'>Last Updated:</span>");
+ this.packageLastUpdatedLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight='bold'>Last Updated:</span>");
this.packageLastUpdatedLabel.UseMarkup = true;
this.packageLastUpdatedHBox.Add (this.packageLastUpdatedLabel);
global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.packageLastUpdatedHBox [this.packageLastUpdatedLabel]));
@@ -333,7 +387,7 @@ namespace MonoDevelop.PackageManagement // Container child packageDownloadsHBox.Gtk.Box+BoxChild
this.packageDownloadsLabel = new global::Gtk.Label ();
this.packageDownloadsLabel.Name = "packageDownloadsLabel";
- this.packageDownloadsLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight=\'bold\'>Downloads:</span>");
+ this.packageDownloadsLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight='bold'>Downloads:</span>");
this.packageDownloadsLabel.UseMarkup = true;
this.packageDownloadsHBox.Add (this.packageDownloadsLabel);
global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.packageDownloadsHBox [this.packageDownloadsLabel]));
@@ -397,7 +451,7 @@ namespace MonoDevelop.PackageManagement // Container child packageDependenciesHBox.Gtk.Box+BoxChild
this.packageDependenciesLabel = new global::Gtk.Label ();
this.packageDependenciesLabel.Name = "packageDependenciesLabel";
- this.packageDependenciesLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight=\'bold\'>Dependencies:</span>");
+ this.packageDependenciesLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight='bold'>Dependencies:</span>");
this.packageDependenciesLabel.UseMarkup = true;
this.packageDependenciesHBox.Add (this.packageDependenciesLabel);
global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.packageDependenciesHBox [this.packageDependenciesLabel]));
diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PagedResultsWidget.cs b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PagedResultsWidget.cs index 6b92bee148..34f80a08a9 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PagedResultsWidget.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/MonoDevelop.PackageManagement.PagedResultsWidget.cs @@ -5,13 +5,24 @@ namespace MonoDevelop.PackageManagement public partial class PagedResultsWidget
{
private global::Gtk.HBox mainHBox;
+
private global::Gtk.Button backButton;
+
+ private global::MonoDevelop.Components.ImageView imageBack;
+
private global::Gtk.Button firstButton;
+
private global::Gtk.Button secondButton;
+
private global::Gtk.Button thirdButton;
+
private global::Gtk.Button fourthButton;
+
private global::Gtk.Button fifthButton;
+
private global::Gtk.Button forwardButton;
+
+ private global::MonoDevelop.Components.ImageView imageForward;
protected virtual void Build ()
{
@@ -28,9 +39,12 @@ namespace MonoDevelop.PackageManagement this.backButton.Name = "backButton";
this.backButton.FocusOnClick = false;
this.backButton.Relief = ((global::Gtk.ReliefStyle)(2));
- global::Gtk.Image w1 = new global::Gtk.Image ();
- w1.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-back", global::Gtk.IconSize.Menu);
- this.backButton.Image = w1;
+ // Container child backButton.Gtk.Container+ContainerChild
+ this.imageBack = new global::MonoDevelop.Components.ImageView ();
+ this.imageBack.Name = "imageBack";
+ this.imageBack.IconId = "gtk-go-back";
+ this.imageBack.IconSize = ((global::Gtk.IconSize)(1));
+ this.backButton.Add (this.imageBack);
this.mainHBox.Add (this.backButton);
global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.mainHBox [this.backButton]));
w2.Position = 0;
@@ -103,9 +117,12 @@ namespace MonoDevelop.PackageManagement this.forwardButton.Name = "forwardButton";
this.forwardButton.FocusOnClick = false;
this.forwardButton.Relief = ((global::Gtk.ReliefStyle)(2));
- global::Gtk.Image w8 = new global::Gtk.Image ();
- w8.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-forward", global::Gtk.IconSize.Menu);
- this.forwardButton.Image = w8;
+ // Container child forwardButton.Gtk.Container+ContainerChild
+ this.imageForward = new global::MonoDevelop.Components.ImageView ();
+ this.imageForward.Name = "imageForward";
+ this.imageForward.IconId = "gtk-go-forward";
+ this.imageForward.IconSize = ((global::Gtk.IconSize)(1));
+ this.forwardButton.Add (this.imageForward);
this.mainHBox.Add (this.forwardButton);
global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.mainHBox [this.forwardButton]));
w9.Position = 6;
diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/generated.cs index df4abc38da..97249fd82d 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/generated.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/generated.cs @@ -68,44 +68,6 @@ namespace Stetic }
}
- internal class IconLoader
- {
- public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
- {
- Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
- if ((res != null)) {
- return res;
- } else {
- int sz;
- int sy;
- global::Gtk.Icon.SizeLookup (size, out sz, out sy);
- try {
- return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
- } catch (System.Exception) {
- if ((name != "gtk-missing-image")) {
- return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
- } else {
- Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
- Gdk.GC gc = new Gdk.GC (pmap);
- gc.RgbFgColor = new Gdk.Color (255, 255, 255);
- pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
- gc.RgbFgColor = new Gdk.Color (0, 0, 0);
- pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
- gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
- gc.RgbFgColor = new Gdk.Color (255, 0, 0);
- pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1)
- - (sz / 4)), ((sz - 1)
- - (sz / 4)));
- pmap.DrawLine (gc, ((sz - 1)
- - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1)
- - (sz / 4)));
- return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
- }
- }
- }
- }
- }
-
internal class ActionGroups
{
public static Gtk.ActionGroup GetActionGroup (System.Type type)
diff --git a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/gui.stetic index f92e7e0b54..a33e8dd19b 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/gui.stetic +++ b/main/src/addins/MonoDevelop.PackageManagement/gtk-gui/gui.stetic @@ -284,11 +284,15 @@ <widget class="Gtk.Button" id="packageSearchButton"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-find Menu</property> - <property name="Label" translatable="yes" /> - <property name="UseUnderline">True</property> + <property name="Type">Custom</property> <signal name="Clicked" handler="SearchButtonClicked" /> + <child> + <widget class="MonoDevelop.Components.ImageView" id="imageSearch"> + <property name="MemberName" /> + <property name="IconId">gtk-find</property> + <property name="IconSize">Menu</property> + </widget> + </child> </widget> <packing> <property name="Position">1</property> @@ -1366,12 +1370,17 @@ If you do not agree to the license terms click "Cancel".</property> <widget class="Gtk.Button" id="backButton"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-go-back Menu</property> - <property name="Label" translatable="yes" /> + <property name="Type">Custom</property> <property name="FocusOnClick">False</property> <property name="Relief">None</property> <signal name="Clicked" handler="BackButtonClicked" /> + <child> + <widget class="MonoDevelop.Components.ImageView" id="imageBack"> + <property name="MemberName" /> + <property name="IconId">gtk-go-back</property> + <property name="IconSize">Menu</property> + </widget> + </child> </widget> <packing> <property name="Position">0</property> @@ -1470,12 +1479,17 @@ If you do not agree to the license terms click "Cancel".</property> <widget class="Gtk.Button" id="forwardButton"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-go-forward Menu</property> - <property name="Label" translatable="yes" /> + <property name="Type">Custom</property> <property name="FocusOnClick">False</property> <property name="Relief">None</property> <signal name="Clicked" handler="ForwardButtonClicked" /> + <child> + <widget class="MonoDevelop.Components.ImageView" id="imageForward"> + <property name="MemberName" /> + <property name="IconId">gtk-go-forward</property> + <property name="IconSize">Menu</property> + </widget> + </child> </widget> <packing> <property name="Position">6</property> diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48.png Binary files differnew file mode 100644 index 0000000000..6dbcbea034 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48@2x.png Binary files differnew file mode 100644 index 0000000000..0484944163 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark.png Binary files differnew file mode 100644 index 0000000000..2fb74b25c1 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark@2x.png Binary files differnew file mode 100644 index 0000000000..07520b847c --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark~sel.png Binary files differnew file mode 100644 index 0000000000..7fec138598 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark~sel.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e134ffbf43 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~sel.png Binary files differnew file mode 100644 index 0000000000..7fec138598 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~sel.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e134ffbf43 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-48~sel@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32.png Binary files differindex 7e19f0f3b1..7aef0ee9bd 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32.png +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32@2x.png Binary files differindex 3894330a48..794f6171dd 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32@2x.png +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark.png Binary files differnew file mode 100644 index 0000000000..e94c8ac213 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..152e07daf7 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..28260cb4c2 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark~sel.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f2110151b7 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~sel.png Binary files differnew file mode 100644 index 0000000000..28260cb4c2 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~sel.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f2110151b7 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/package-source-32~sel@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16.png Binary files differindex b441192270..7db9d7157e 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16.png +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16@2x.png Binary files differindex a59c599aca..43064c4e34 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16@2x.png +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark.png Binary files differnew file mode 100644 index 0000000000..eed666c26f --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..a09bb7df42 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..d61c5c8698 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..638b4a730a --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~sel.png Binary files differnew file mode 100644 index 0000000000..d61c5c8698 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~sel.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..638b4a730a --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16.png Binary files differindex c01c3f5eb0..9850050463 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16.png +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16@2x.png Binary files differindex 7e19f0f3b1..7aef0ee9bd 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16@2x.png +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark.png Binary files differnew file mode 100644 index 0000000000..593d3a8b96 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..501ead7b45 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..e3aee767a7 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..6b8d55dfed --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~sel.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~sel.png Binary files differnew file mode 100644 index 0000000000..e3aee767a7 --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~sel.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~sel@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..6b8d55dfed --- /dev/null +++ b/main/src/addins/MonoDevelop.PackageManagement/icons/prefs-package-source-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/reference-48.png b/main/src/addins/MonoDevelop.PackageManagement/icons/reference-48.png Binary files differdeleted file mode 100644 index 7301fbb0fe..0000000000 --- a/main/src/addins/MonoDevelop.PackageManagement/icons/reference-48.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.PackageManagement/icons/reference-48@2x.png b/main/src/addins/MonoDevelop.PackageManagement/icons/reference-48@2x.png Binary files differdeleted file mode 100644 index e66a2f6dbc..0000000000 --- a/main/src/addins/MonoDevelop.PackageManagement/icons/reference-48@2x.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs index 4cf8446adc..2a42b3f721 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePanelWidget.cs @@ -211,8 +211,11 @@ namespace MonoDevelop.CodeIssues { int w = 10; var newCellArea = new Gdk.Rectangle (cell_area.X + w, cell_area.Y, cell_area.Width - w, cell_area.Height); + var icon = Icon; + if ((flags & Gtk.CellRendererState.Selected) != 0) + icon = icon.WithStyles ("sel"); using (var ctx = CairoHelper.Create (window)) { - ctx.DrawImage (widget, Icon, cell_area.X - 4, cell_area.Y + Math.Round ((cell_area.Height - Icon.Height) / 2)); + ctx.DrawImage (widget, icon, cell_area.X - 4, cell_area.Y + Math.Round ((cell_area.Height - Icon.Height) / 2)); } base.Render (window, widget, background_area, newCellArea, expose_area, flags); diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml index 27e1aeae9c..eb941dccf9 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml @@ -122,7 +122,7 @@ <Extension path = "/MonoDevelop/Ide/GlobalOptionsDialog/TextEditor"> <Section id="Analysis" _label="Source Analysis" fill="true" class="MonoDevelop.AnalysisCore.Gui.AnalysisOptionsPanel" icon="md-prefs-code-analysis" > - <Section id="C#" _label="C#" icon="md-prefs-csharp"> + <Section id="C#" _label="C#" icon="md-prefs-source"> <Panel id="CodeIssuePanel" _label="Code Rules" fill="true" class="MonoDevelop.CodeIssues.CodeIssuePanel" grouping="Tab" icon="md-prefs-code-rules" /> <Panel id="CodeActions" _label="Code Actions" fill="true" class="MonoDevelop.CodeActions.CodeActionPanel" grouping="Tab" icon="md-prefs-code-actions" /> </Section> diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj index 993059df04..3509cbcedd 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj @@ -197,18 +197,72 @@ <EmbeddedResource Include="icons\prefs-code-actions-16%402x.png"> <LogicalName>prefs-code-actions-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-actions-16~dark.png"> + <LogicalName>prefs-code-actions-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-actions-16~dark%402x.png"> + <LogicalName>prefs-code-actions-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-actions-16~sel.png"> + <LogicalName>prefs-code-actions-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-actions-16~sel%402x.png"> + <LogicalName>prefs-code-actions-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-actions-16~dark~sel.png"> + <LogicalName>prefs-code-actions-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-actions-16~dark~sel%402x.png"> + <LogicalName>prefs-code-actions-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-code-rules-16.png"> <LogicalName>prefs-code-rules-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-code-rules-16%402x.png"> <LogicalName>prefs-code-rules-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-rules-16~dark.png"> + <LogicalName>prefs-code-rules-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-rules-16~dark%402x.png"> + <LogicalName>prefs-code-rules-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-rules-16~sel.png"> + <LogicalName>prefs-code-rules-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-rules-16~sel%402x.png"> + <LogicalName>prefs-code-rules-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-rules-16~dark~sel.png"> + <LogicalName>prefs-code-rules-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-rules-16~dark~sel%402x.png"> + <LogicalName>prefs-code-rules-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-code-analysis-16.png"> <LogicalName>prefs-code-analysis-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-code-analysis-16%402x.png"> <LogicalName>prefs-code-analysis-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-analysis-16~dark.png"> + <LogicalName>prefs-code-analysis-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-analysis-16~dark%402x.png"> + <LogicalName>prefs-code-analysis-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-analysis-16~sel.png"> + <LogicalName>prefs-code-analysis-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-analysis-16~sel%402x.png"> + <LogicalName>prefs-code-analysis-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-analysis-16~dark~sel.png"> + <LogicalName>prefs-code-analysis-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-analysis-16~dark~sel%402x.png"> + <LogicalName>prefs-code-analysis-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj"> diff --git a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.EncapsulateFieldDialog.cs b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.EncapsulateFieldDialog.cs index 2364f13514..49fef05e69 100644 --- a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.EncapsulateFieldDialog.cs +++ b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.EncapsulateFieldDialog.cs @@ -32,7 +32,7 @@ namespace MonoDevelop.Refactoring private global::Gtk.HBox hbox2; - private global::Gtk.Image imageError; + private global::MonoDevelop.Components.ImageView imageError; private global::Gtk.Label labelError; @@ -176,8 +176,10 @@ namespace MonoDevelop.Refactoring this.hbox2.Name = "hbox2"; this.hbox2.Spacing = 6; // Container child hbox2.Gtk.Box+BoxChild - this.imageError = new global::Gtk.Image (); + this.imageError = new global::MonoDevelop.Components.ImageView (); this.imageError.Name = "imageError"; + this.imageError.IconId = "md-error"; + this.imageError.IconSize = ((global::Gtk.IconSize)(1)); this.hbox2.Add (this.imageError); global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.imageError])); w14.Position = 0; diff --git a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.Rename.RenameItemDialog.cs b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.Rename.RenameItemDialog.cs index 37013c6e31..ae107ee523 100644 --- a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.Rename.RenameItemDialog.cs +++ b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/MonoDevelop.Refactoring.Rename.RenameItemDialog.cs @@ -18,7 +18,7 @@ namespace MonoDevelop.Refactoring.Rename private global::Gtk.HBox hbox1; - private global::Gtk.Image imageWarning; + private global::MonoDevelop.Components.ImageView imageWarning; private global::Gtk.Label labelWarning; @@ -104,9 +104,10 @@ namespace MonoDevelop.Refactoring.Rename this.hbox1.Name = "hbox1"; this.hbox1.Spacing = 6; // Container child hbox1.Gtk.Box+BoxChild - this.imageWarning = new global::Gtk.Image (); + this.imageWarning = new global::MonoDevelop.Components.ImageView (); this.imageWarning.Name = "imageWarning"; - this.imageWarning.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-apply", global::Gtk.IconSize.Button); + this.imageWarning.IconId = "md-warning"; + this.imageWarning.IconSize = ((global::Gtk.IconSize)(4)); this.hbox1.Add (this.imageWarning); global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.imageWarning])); w7.Position = 0; diff --git a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/generated.cs index 03fa31124a..3285e87c05 100644 --- a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/generated.cs +++ b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/generated.cs @@ -14,40 +14,6 @@ namespace Stetic } } - internal class IconLoader - { - public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size) - { - Gdk.Pixbuf res = widget.RenderIcon (name, size, null); - if ((res != null)) { - return res; - } else { - int sz; - int sy; - global::Gtk.Icon.SizeLookup (size, out sz, out sy); - try { - return Gtk.IconTheme.Default.LoadIcon (name, sz, 0); - } catch (System.Exception) { - if ((name != "gtk-missing-image")) { - return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size); - } else { - Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz); - Gdk.GC gc = new Gdk.GC (pmap); - gc.RgbFgColor = new Gdk.Color (255, 255, 255); - pmap.DrawRectangle (gc, true, 0, 0, sz, sz); - gc.RgbFgColor = new Gdk.Color (0, 0, 0); - pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1)); - gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round); - gc.RgbFgColor = new Gdk.Color (255, 0, 0); - pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4))); - pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4))); - return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz); - } - } - } - } - } - internal class BinContainer { private Gtk.Widget child; diff --git a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic index f5db2e12b6..a86aee9313 100644 --- a/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic +++ b/main/src/addins/MonoDevelop.Refactoring/gtk-gui/gui.stetic @@ -203,10 +203,11 @@ <property name="MemberName" /> <property name="Spacing">6</property> <child> - <widget class="Gtk.Image" id="imageWarning"> - <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-apply Button</property> - </widget> + <widget class="MonoDevelop.Components.ImageView" id="imageWarning"> + <property name="MemberName" /> + <property name="IconSize">Button</property> + <property name="IconId">md-warning</property> + </widget> <packing> <property name="Position">0</property> <property name="AutoSize">True</property> @@ -481,9 +482,11 @@ <property name="MemberName" /> <property name="Spacing">6</property> <child> - <widget class="Gtk.Image" id="imageError"> - <property name="MemberName" /> - </widget> + <widget class="MonoDevelop.Components.ImageView" id="imageError"> + <property name="MemberName" /> + <property name="IconSize">Menu</property> + <property name="IconId">md-error</property> + </widget> <packing> <property name="Position">0</property> <property name="AutoSize">True</property> diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16.png Binary files differindex 3bfcaaa4a0..d97495cb13 100644 --- a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16.png +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16@2x.png Binary files differindex d3843fa488..55ef68a9c6 100644 --- a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16@2x.png +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16@2x.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark.png Binary files differnew file mode 100644 index 0000000000..b9d01a9dc2 --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..5ef17f66c0 --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark~sel.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..92487c7153 --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..9ffc6a0967 --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~sel.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~sel.png Binary files differnew file mode 100644 index 0000000000..6557f93395 --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~sel.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~sel@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..5698b2a9bd --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-actions-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16.png Binary files differindex d332c8658f..07f2ebe88b 100644 --- a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16.png +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16@2x.png Binary files differindex ae2a84b99b..f5f9e8e084 100644 --- a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16@2x.png +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16@2x.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark.png Binary files differnew file mode 100644 index 0000000000..0b45e6e9cf --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6f3c4357f6 --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark~sel.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..e2771512bf --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..9593c410ba --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~sel.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~sel.png Binary files differnew file mode 100644 index 0000000000..e2771512bf --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~sel.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~sel@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..9593c410ba --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-analysis-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16.png Binary files differindex 7bd0114b4f..ef893c57bb 100644 --- a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16.png +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16@2x.png Binary files differindex 7e0f57994c..1d986f2fa1 100644 --- a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16@2x.png +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16@2x.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark.png Binary files differnew file mode 100644 index 0000000000..d689e9361f --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..90282fec96 --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark~sel.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..b0f3ea7cfe --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..fa6a41cc8e --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~sel.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~sel.png Binary files differnew file mode 100644 index 0000000000..b0f3ea7cfe --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~sel.png diff --git a/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~sel@2x.png b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..fa6a41cc8e --- /dev/null +++ b/main/src/addins/MonoDevelop.Refactoring/icons/prefs-code-rules-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs index c9e7b682f5..fc0e540066 100644 --- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs +++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/ElementHelpWidget.cs @@ -36,7 +36,7 @@ using MonoDevelop.Components; namespace MonoDevelop.RegexToolkit { [System.ComponentModel.ToolboxItem(true)] - partial class ElementHelpWidget : Gtk.Bin + internal partial class ElementHelpWidget : Gtk.Bin { TreeStore elementsStore; // IWorkbenchWindow workbenchWindow; diff --git a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/RegexToolkitWidget.cs b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/RegexToolkitWidget.cs index 475f81888b..2cf57d534b 100644 --- a/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/RegexToolkitWidget.cs +++ b/main/src/addins/MonoDevelop.RegexToolkit/MonoDevelop.RegexToolkit/RegexToolkitWidget.cs @@ -66,7 +66,7 @@ namespace MonoDevelop.RegexToolkit if (regexThread != null && regexThread.IsAlive) { regexThread.Abort (); regexThread.Join (); - SetButtonStart (GettextCatalog.GetString ("Start Regular E_xpression"), "gtk-media-play"); + SetButtonStart (GettextCatalog.GetString ("Start Regular E_xpression"), "gtk-execute"); regexThread = null; return; } @@ -178,16 +178,16 @@ namespace MonoDevelop.RegexToolkit } finally { regexThread = null; Application.Invoke (delegate { - SetButtonStart (GettextCatalog.GetString ("Start Regular E_xpression"), "gtk-media-play"); + SetButtonStart (GettextCatalog.GetString ("Start Regular E_xpression"), "gtk-execute"); }); } } void SetButtonStart (string text, string icon) { - ((Gtk.Label)((Gtk.HBox)((Gtk.Alignment)this.buttonStart.Child).Child).Children [1]).Text = text; - ((Gtk.Label)((Gtk.HBox)((Gtk.Alignment)this.buttonStart.Child).Child).Children [1]).UseUnderline = true; - ((Gtk.Image)((Gtk.HBox)((Gtk.Alignment)this.buttonStart.Child).Child).Children [0]).Pixbuf = global::Stetic.IconLoader.LoadIcon (this, icon, global::Gtk.IconSize.Menu); + buttonStartLabel.Text = text; + buttonStartLabel.UseUnderline = true; + buttonStartIcon.SetIcon (icon, IconSize.Menu); } diff --git a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.ElementHelpWidget.cs b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.ElementHelpWidget.cs index 0caf4e91ee..c49c20c8c0 100644 --- a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.ElementHelpWidget.cs +++ b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.ElementHelpWidget.cs @@ -2,11 +2,14 @@ // This file has been generated by the GUI designer. Do not modify. namespace MonoDevelop.RegexToolkit { - partial class ElementHelpWidget + internal partial class ElementHelpWidget { private global::Gtk.VBox vbox4; + private global::Gtk.Label label11; + private global::Gtk.ScrolledWindow elementsscrolledwindow; + private global::Gtk.TreeView elementsTreeview; protected virtual void Build () diff --git a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWidget.cs b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWidget.cs index ececd80c33..8145fc8684 100644 --- a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWidget.cs +++ b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWidget.cs @@ -5,34 +5,69 @@ namespace MonoDevelop.RegexToolkit internal partial class RegexToolkitWidget { private global::Gtk.VBox vbox2; + private global::Gtk.VPaned vpaned1; + private global::Gtk.VBox vbox1; + private global::Gtk.HBox hbox1; + private global::Gtk.VBox vbox6; + private global::Gtk.Label label8; + private global::Gtk.Entry entryRegEx; + private global::Gtk.VBox vbox3; + private global::Gtk.CheckButton checkbuttonReplace; + private global::Gtk.Entry entryReplace; + private global::Gtk.HBox hbox7; + private global::Gtk.Button buttonStart; + + private global::Gtk.HBox buttonStartHbox; + + private global::MonoDevelop.Components.ImageView buttonStartIcon; + + private global::Gtk.Label buttonStartLabel; + private global::Gtk.CheckButton expandMatches; + private global::Gtk.VBox vbox4; + private global::Gtk.Label label10; + private global::Gtk.ScrolledWindow scrolledwindow5; + private global::Gtk.TreeView optionsTreeview; + private global::Gtk.VBox HelpWidget; + private global::Gtk.Label label9; + private global::Gtk.HBox hbox5; + private global::Gtk.ScrolledWindow scrolledwindow1; + private global::Gtk.TextView inputTextview; + private global::Gtk.HBox hbox4; + private global::Gtk.Notebook notebook2; + private global::Gtk.ScrolledWindow scrolledwindow2; + private global::Gtk.TreeView resultsTreeview; + private global::Gtk.Label label3; + private global::Gtk.ScrolledWindow scrolledwindow4; + private global::Gtk.TextView replaceResultTextview; + private global::Gtk.Label label4; protected virtual void Build () @@ -123,17 +158,37 @@ namespace MonoDevelop.RegexToolkit this.buttonStart.CanDefault = true; this.buttonStart.CanFocus = true; this.buttonStart.Name = "buttonStart"; - this.buttonStart.UseUnderline = true; - this.buttonStart.Label = global::Mono.Unix.Catalog.GetString ("Start Regular E_xpression"); - global::Gtk.Image w5 = new global::Gtk.Image (); - w5.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-media-play", global::Gtk.IconSize.Menu); - this.buttonStart.Image = w5; - this.hbox7.Add (this.buttonStart); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox7 [this.buttonStart])); - w6.PackType = ((global::Gtk.PackType)(1)); - w6.Position = 0; + // Container child buttonStart.Gtk.Container+ContainerChild + this.buttonStartHbox = new global::Gtk.HBox (); + this.buttonStartHbox.Name = "buttonStartHbox"; + this.buttonStartHbox.Spacing = 2; + // Container child buttonStartHbox.Gtk.Box+BoxChild + this.buttonStartIcon = new global::MonoDevelop.Components.ImageView (); + this.buttonStartIcon.Name = "buttonStartIcon"; + this.buttonStartIcon.IconId = "gtk-execute"; + this.buttonStartIcon.IconSize = ((global::Gtk.IconSize)(1)); + this.buttonStartHbox.Add (this.buttonStartIcon); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.buttonStartHbox [this.buttonStartIcon])); + w5.Position = 0; + w5.Expand = false; + w5.Fill = false; + // Container child buttonStartHbox.Gtk.Box+BoxChild + this.buttonStartLabel = new global::Gtk.Label (); + this.buttonStartLabel.Name = "buttonStartLabel"; + this.buttonStartLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Start Regular E_xpression"); + this.buttonStartLabel.UseUnderline = true; + this.buttonStartHbox.Add (this.buttonStartLabel); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.buttonStartHbox [this.buttonStartLabel])); + w6.Position = 1; w6.Expand = false; w6.Fill = false; + this.buttonStart.Add (this.buttonStartHbox); + this.hbox7.Add (this.buttonStart); + global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox7 [this.buttonStart])); + w8.PackType = ((global::Gtk.PackType)(1)); + w8.Position = 0; + w8.Expand = false; + w8.Fill = false; // Container child hbox7.Gtk.Box+BoxChild this.expandMatches = new global::Gtk.CheckButton (); this.expandMatches.CanFocus = true; @@ -144,23 +199,23 @@ namespace MonoDevelop.RegexToolkit this.expandMatches.UseUnderline = true; this.expandMatches.BorderWidth = ((uint)(3)); this.hbox7.Add (this.expandMatches); - global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox7 [this.expandMatches])); - w7.Position = 1; - w7.Expand = false; + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox7 [this.expandMatches])); + w9.Position = 1; + w9.Expand = false; this.vbox3.Add (this.hbox7); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox7])); - w8.PackType = ((global::Gtk.PackType)(1)); - w8.Position = 2; - w8.Expand = false; - w8.Fill = false; + global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox7])); + w10.PackType = ((global::Gtk.PackType)(1)); + w10.Position = 2; + w10.Expand = false; + w10.Fill = false; this.vbox6.Add (this.vbox3); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.vbox3])); - w9.Position = 2; - w9.Expand = false; - w9.Fill = false; + global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.vbox3])); + w11.Position = 2; + w11.Expand = false; + w11.Fill = false; this.hbox1.Add (this.vbox6); - global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox6])); - w10.Position = 0; + global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox6])); + w12.Position = 0; // Container child hbox1.Gtk.Box+BoxChild this.vbox4 = new global::Gtk.VBox (); this.vbox4.Name = "vbox4"; @@ -173,10 +228,10 @@ namespace MonoDevelop.RegexToolkit this.label10.UseMarkup = true; this.label10.UseUnderline = true; this.vbox4.Add (this.label10); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.label10])); - w11.Position = 0; - w11.Expand = false; - w11.Fill = false; + global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.label10])); + w13.Position = 0; + w13.Expand = false; + w13.Fill = false; // Container child vbox4.Gtk.Box+BoxChild this.scrolledwindow5 = new global::Gtk.ScrolledWindow (); this.scrolledwindow5.CanFocus = true; @@ -188,18 +243,18 @@ namespace MonoDevelop.RegexToolkit this.optionsTreeview.Name = "optionsTreeview"; this.scrolledwindow5.Add (this.optionsTreeview); this.vbox4.Add (this.scrolledwindow5); - global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.scrolledwindow5])); - w13.Position = 1; + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.scrolledwindow5])); + w15.Position = 1; this.hbox1.Add (this.vbox4); - global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox4])); - w14.Position = 1; - w14.Expand = false; - w14.Fill = false; + global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox4])); + w16.Position = 1; + w16.Expand = false; + w16.Fill = false; this.vbox1.Add (this.hbox1); - global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1])); - w15.Position = 0; - w15.Expand = false; - w15.Fill = false; + global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1])); + w17.Position = 0; + w17.Expand = false; + w17.Fill = false; // Container child vbox1.Gtk.Box+BoxChild this.HelpWidget = new global::Gtk.VBox (); this.HelpWidget.Name = "HelpWidget"; @@ -213,10 +268,10 @@ namespace MonoDevelop.RegexToolkit this.label9.UseMarkup = true; this.label9.UseUnderline = true; this.HelpWidget.Add (this.label9); - global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.HelpWidget [this.label9])); - w16.Position = 0; - w16.Expand = false; - w16.Fill = false; + global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.HelpWidget [this.label9])); + w18.Position = 0; + w18.Expand = false; + w18.Fill = false; // Container child HelpWidget.Gtk.Box+BoxChild this.hbox5 = new global::Gtk.HBox (); this.hbox5.Name = "hbox5"; @@ -232,21 +287,21 @@ namespace MonoDevelop.RegexToolkit this.inputTextview.Name = "inputTextview"; this.scrolledwindow1.Add (this.inputTextview); this.hbox5.Add (this.scrolledwindow1); - global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.scrolledwindow1])); - w18.Position = 0; + global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.scrolledwindow1])); + w20.Position = 0; this.HelpWidget.Add (this.hbox5); - global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.HelpWidget [this.hbox5])); - w19.Position = 1; + global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.HelpWidget [this.hbox5])); + w21.Position = 1; this.vbox1.Add (this.HelpWidget); - global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.HelpWidget])); - w20.Position = 1; + global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.HelpWidget])); + w22.Position = 1; this.vpaned1.Add (this.vbox1); - global::Gtk.Paned.PanedChild w21 = ((global::Gtk.Paned.PanedChild)(this.vpaned1 [this.vbox1])); - w21.Resize = false; + global::Gtk.Paned.PanedChild w23 = ((global::Gtk.Paned.PanedChild)(this.vpaned1 [this.vbox1])); + w23.Resize = false; // Container child vpaned1.Gtk.Paned+PanedChild this.hbox4 = new global::Gtk.HBox (); this.hbox4.Name = "hbox4"; - this.hbox4.Spacing = 6;
+ this.hbox4.Spacing = 6; this.hbox4.BorderWidth = ((uint)(6)); // Container child hbox4.Gtk.Box+BoxChild this.notebook2 = new global::Gtk.Notebook (); @@ -283,8 +338,8 @@ namespace MonoDevelop.RegexToolkit this.replaceResultTextview.CursorVisible = false; this.scrolledwindow4.Add (this.replaceResultTextview); this.notebook2.Add (this.scrolledwindow4); - global::Gtk.Notebook.NotebookChild w25 = ((global::Gtk.Notebook.NotebookChild)(this.notebook2 [this.scrolledwindow4])); - w25.Position = 1; + global::Gtk.Notebook.NotebookChild w27 = ((global::Gtk.Notebook.NotebookChild)(this.notebook2 [this.scrolledwindow4])); + w27.Position = 1; // Notebook tab this.label4 = new global::Gtk.Label (); this.label4.Name = "label4"; @@ -292,12 +347,12 @@ namespace MonoDevelop.RegexToolkit this.notebook2.SetTabLabel (this.scrolledwindow4, this.label4); this.label4.ShowAll (); this.hbox4.Add (this.notebook2); - global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.notebook2])); - w26.Position = 0; + global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.notebook2])); + w28.Position = 0; this.vpaned1.Add (this.hbox4); this.vbox2.Add (this.vpaned1); - global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.vpaned1])); - w28.Position = 0; + global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.vpaned1])); + w30.Position = 0; this.Add (this.vbox2); if ((this.Child != null)) { this.Child.ShowAll (); diff --git a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/generated.cs index 0ada9fc5f0..75935e2e55 100644 --- a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/generated.cs +++ b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/generated.cs @@ -66,40 +66,6 @@ namespace Stetic } } - internal class IconLoader - { - public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size) - { - Gdk.Pixbuf res = widget.RenderIcon (name, size, null); - if ((res != null)) { - return res; - } else { - int sz; - int sy; - global::Gtk.Icon.SizeLookup (size, out sz, out sy); - try { - return Gtk.IconTheme.Default.LoadIcon (name, sz, 0); - } catch (System.Exception) { - if ((name != "gtk-missing-image")) { - return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size); - } else { - Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz); - Gdk.GC gc = new Gdk.GC (pmap); - gc.RgbFgColor = new Gdk.Color (255, 255, 255); - pmap.DrawRectangle (gc, true, 0, 0, sz, sz); - gc.RgbFgColor = new Gdk.Color (0, 0, 0); - pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1)); - gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round); - gc.RgbFgColor = new Gdk.Color (255, 0, 0); - pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4))); - pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4))); - return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz); - } - } - } - } - } - internal class ActionGroups { public static Gtk.ActionGroup GetActionGroup (System.Type type) diff --git a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/gui.stetic index 426ce9fe4f..e34438ae6d 100644 --- a/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/gui.stetic +++ b/main/src/addins/MonoDevelop.RegexToolkit/gtk-gui/gui.stetic @@ -110,10 +110,39 @@ <property name="MemberName" /> <property name="CanDefault">True</property> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-media-play Menu</property> - <property name="Label" translatable="yes">Start Regular E_xpression</property> - <property name="UseUnderline">True</property> + <property name="Type">Custom</property> + <child> + <widget class="Gtk.HBox" id="buttonStartHbox"> + <property name="MemberName" /> + <property name="Spacing">2</property> + <child> + <widget class="MonoDevelop.Components.ImageView" id="buttonStartIcon"> + <property name="MemberName" /> + <property name="IconId">gtk-execute</property> + <property name="IconSize">Menu</property> + </widget> + <packing> + <property name="Position">0</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + <child> + <widget class="Gtk.Label" id="buttonStartLabel"> + <property name="MemberName" /> + <property name="LabelProp" translatable="yes">Start Regular E_xpression</property> + <property name="UseUnderline">True</property> + </widget> + <packing> + <property name="Position">1</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + </widget> + </child> </widget> <packing> <property name="PackType">End</property> @@ -356,6 +385,7 @@ <widget class="Gtk.Bin" id="MonoDevelop.RegexToolkit.ElementHelpWidget" design-size="300 300"> <property name="MemberName" /> <property name="Visible">False</property> + <property name="GeneratePublic">False</property> <child> <widget class="Gtk.VBox" id="vbox4"> <property name="MemberName" /> diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs index 9af86d52c1..9308a6cd92 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs @@ -60,6 +60,12 @@ namespace MonoDevelop.SourceEditor.OptionPanels styleTreeview.AppendColumn (col); styleTreeview.Model = styleStore; schemeName = DefaultSourceEditorOptions.Instance.ColorScheme; + MonoDevelop.Ide.Gui.Styles.Changed += HandleSkinChanged; + } + + void HandleSkinChanged (object sender, EventArgs e) + { + ShowStyles (); } protected override void OnDestroyed () @@ -70,6 +76,8 @@ namespace MonoDevelop.SourceEditor.OptionPanels styleStore.Dispose (); styleStore = null; } + + MonoDevelop.Ide.Gui.Styles.Changed -= HandleSkinChanged; base.OnDestroyed (); } @@ -178,7 +186,8 @@ namespace MonoDevelop.SourceEditor.OptionPanels if (style.Name == DefaultSourceEditorOptions.Instance.ColorScheme) selectedIter = iter; } - styleTreeview.Selection.SelectIter (selectedIter); + if (styleTreeview.Selection != null) + styleTreeview.Selection.SelectIter (selectedIter); } void RemoveColorScheme (object sender, EventArgs args) diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs index 25dd4e1e45..46503f09a5 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs @@ -73,13 +73,26 @@ namespace MonoDevelop.SourceEditor.QuickTasks get { return okImage; } - } + }
+
+ Cairo.Color win81Slider;
+ Cairo.Color win81SliderPrelight; + int win81ScrollbarWidth; - //TODO: find a way to look these up from the theme - static readonly Cairo.Color win81Background = new Cairo.Color (240 / 255d, 240 / 255d, 240 / 255d); - static readonly Cairo.Color win81Slider = new Cairo.Color (205 / 255d, 205 / 255d, 205 / 255d); - static readonly Cairo.Color win81SliderPrelight = new Cairo.Color (166 / 255d, 166 / 255d, 166 / 255d); - //static readonly Cairo.Color win81SliderActive = new Cairo.Color (96 / 255d, 96 / 255d, 96 / 255d); + protected override void OnStyleSet (Style previous_style)
+ {
+ base.OnStyleSet (previous_style); + if (Core.Platform.IsWindows) {
+ using (var scrollstyle = Rc.GetStyleByPaths (Settings, null, null, VScrollbar.GType)) { + var scrl = new VScrollbar (null); + scrl.Style = scrollstyle;
+ win81Slider = scrollstyle.Background (StateType.Normal).ToCairoColor ();
+ win81SliderPrelight = scrollstyle.Background (StateType.Prelight).ToCairoColor (); + win81ScrollbarWidth = (int)scrl.StyleGetProperty ("slider-width");
+ scrl.Dispose (); + } + }
+ } readonly int barPadding = MonoDevelop.Core.Platform.IsWindows ? 1 : 3; @@ -644,7 +657,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks protected override void OnSizeRequested (ref Requisition requisition) { base.OnSizeRequested (ref requisition); - requisition.Width = MonoDevelop.Core.Platform.IsWindows ? 17 : 15; + requisition.Width = MonoDevelop.Core.Platform.IsWindows ? win81ScrollbarWidth : 15; } double LineToY (int logicalLine) @@ -721,7 +734,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks if (!lineCache[1].Contains (y)) { lineCache[1].Add (y); cr.SetSourceColor (GetBarColor (task.Severity)); - cr.Rectangle (0, y - 1, Allocation.Width, 2); + cr.Rectangle (1, y - 1, Allocation.Width - 1, 2); cr.Fill (); } if (task.Severity == DiagnosticSeverity.Error) @@ -740,7 +753,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks if (TextEditor.ColorStyle != null) { var col = TextEditor.ColorStyle.PlainText.Background.ToXwtColor (); if (!MonoDevelop.Core.Platform.IsWindows) { - col.Light *= 0.88; + col.Light *= 0.95; } cr.SetSourceColor (col.ToCairoColor ()); } @@ -792,7 +805,7 @@ namespace MonoDevelop.SourceEditor.QuickTasks if (MonoDevelop.Core.Platform.IsWindows) { c = prelight ? win81SliderPrelight : win81Slider; //compute new color such that it will produce same color when blended with bg - c = AddAlpha (win81Background, c, 0.5d); + c = AddAlpha (TextEditor.ColorStyle.PlainText.Background, c, 0.5d); } else { var brightness = HslColor.Brightness (TextEditor.ColorStyle.PlainText.Background); c = new Cairo.Color (1 - brightness, 1 - brightness, 1 - brightness, barColorValue * (barAlphaMax - barAlphaMin) + barAlphaMin); @@ -1032,20 +1045,13 @@ namespace MonoDevelop.SourceEditor.QuickTasks if (TextEditor.ColorStyle != null) { if (MonoDevelop.Core.Platform.IsWindows) { - using (var pattern = new Cairo.SolidPattern (win81Background)) { + using (var pattern = new Cairo.SolidPattern (TextEditor.ColorStyle.PlainText.Background)) { cr.SetSource (pattern); cr.Fill (); } } else { - var col = TextEditor.ColorStyle.PlainText.Background.ToXwtColor (); - col.Light *= 0.948; - using (var grad = new Cairo.LinearGradient (0, 0, allocation.Width, 0)) { - grad.AddColorStop (0, col.ToCairoColor ()); - grad.AddColorStop (0.7, TextEditor.ColorStyle.PlainText.Background); - grad.AddColorStop (1, col.ToCairoColor ()); - cr.SetSource (grad); - cr.Fill (); - } + cr.SetSourceColor (TextEditor.ColorStyle.PlainText.Background); + cr.Fill (); } } DrawLeftBorder (cr); diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml index 05d7938303..69c7a553ae 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml @@ -142,10 +142,10 @@ <Section id="General" insertbefore="Formatting" _label="General" fill="true" class="MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel" icon="md-prefs-text-editor-general" /> <Section id="Markers" _label="Markers and Rulers" class="MonoDevelop.SourceEditor.OptionPanels.MarkerPanel" icon="md-prefs-markers-rulers" /> <Section id="Behavior" _label="Behavior" class="MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel" icon="md-prefs-text-editor-behavior" /> - <Section id="CodeCompletion" _label="Code Completion" icon="md-prefs-completion-behavior"> - <Panel id="CompletionBehavior" _label="Behavior" class="MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel" icon="md-prefs-completion-behavior" /> + <Section id="CodeCompletion" _label="Code Completion" icon="md-prefs-completion"> + <Panel id="CompletionBehavior" _label="Behavior" class="MonoDevelop.SourceEditor.OptionPanels.CompletionOptionsPanel" icon="md-prefs-completion" /> <!-- <Section id="CompletionCharacters" _label="Completion Characters" class="MonoDevelop.SourceEditor.OptionPanels.CompletionCharactersPanel" /> --> - <Panel id="CompletionAppearance" _label="Appearance" class="MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel" icon="md-prefs-completion-appearance" /> + <Panel id="CompletionAppearance" _label="Appearance" class="MonoDevelop.SourceEditor.OptionPanels.CompletionAppearancePanel" icon="md-prefs-completion" /> </Section> <Section id="SyntaxHighlighting" _label="Syntax Highlighting" fill="true" class="MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel" icon="md-prefs-syntax-highlighting" /> </Extension> @@ -175,8 +175,7 @@ <StockIcon stockid="md-prefs-syntax-highlighting" resource="prefs-syntax-highlighting-16.png" size="Menu" /> <StockIcon stockid="md-prefs-text-editor-general" resource="prefs-text-editor-general-16.png" size="Menu" /> <StockIcon stockid="md-prefs-text-editor-behavior" resource="prefs-text-editor-behavior-16.png" size="Menu" /> - <StockIcon stockid="md-prefs-completion-appearance" resource="prefs-completion-appearance-16.png" size="Menu" /> - <StockIcon stockid="md-prefs-completion-behavior" resource="prefs-completion-behavior-16.png" size="Menu" /> + <StockIcon stockid="md-prefs-completion" resource="prefs-completion-16.png" size="Menu" /> </Extension> </ExtensionModel> diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj index 8d6c1b54a7..eea6d68a71 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj @@ -225,45 +225,90 @@ <EmbeddedResource Include="MonoDevelop.SourceEditor.addin.xml"> <LogicalName>MonoDevelop.SourceEditor.addin.xml</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="MonoDevelop.SourceEditor\searchoptions.png"> - <LogicalName>searchoptions.png</LogicalName> - </EmbeddedResource> <EmbeddedResource Include="icons\issues-busy-16.png"> <LogicalName>issues-busy-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\issues-busy-16%402x.png"> <LogicalName>issues-busy-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\issues-busy-16~dark.png"> + <LogicalName>issues-busy-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\issues-busy-16~dark%402x.png"> + <LogicalName>issues-busy-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\issues-error-16.png"> <LogicalName>issues-error-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\issues-error-16%402x.png"> <LogicalName>issues-error-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\issues-error-16~dark.png"> + <LogicalName>issues-error-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\issues-error-16~dark%402x.png"> + <LogicalName>issues-error-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\issues-ok-16.png"> <LogicalName>issues-ok-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\issues-ok-16%402x.png"> <LogicalName>issues-ok-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\issues-ok-16~dark.png"> + <LogicalName>issues-ok-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\issues-ok-16~dark%402x.png"> + <LogicalName>issues-ok-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\issues-suggestion-16.png"> <LogicalName>issues-suggestion-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\issues-suggestion-16%402x.png"> <LogicalName>issues-suggestion-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\issues-suggestion-16~dark.png"> + <LogicalName>issues-suggestion-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\issues-suggestion-16~dark%402x.png"> + <LogicalName>issues-suggestion-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\issues-warning-16.png"> <LogicalName>issues-warning-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\issues-warning-16%402x.png"> <LogicalName>issues-warning-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\issues-warning-16~dark.png"> + <LogicalName>issues-warning-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\issues-warning-16~dark%402x.png"> + <LogicalName>issues-warning-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-options-22x32.png"> + <LogicalName>find-options-22x32.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-options-22x32%402x.png"> + <LogicalName>find-options-22x32@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-options-22x32~dark.png"> + <LogicalName>find-options-22x32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-options-22x32~dark%402x.png"> + <LogicalName>find-options-22x32~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\gutter-bookmark-15.png"> <LogicalName>gutter-bookmark-15.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\gutter-bookmark-15%402x.png"> <LogicalName>gutter-bookmark-15@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-bookmark-15~dark.png"> + <LogicalName>gutter-bookmark-15~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-bookmark-15~dark%402x.png"> + <LogicalName>gutter-bookmark-15~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\gutter-error-15.png"> <LogicalName>gutter-error-15.png</LogicalName> </EmbeddedResource> @@ -282,35 +327,119 @@ <EmbeddedResource Include="icons\prefs-markers-rulers-16%402x.png"> <LogicalName>prefs-markers-rulers-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-markers-rulers-16~dark.png"> + <LogicalName>prefs-markers-rulers-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-markers-rulers-16~dark%402x.png"> + <LogicalName>prefs-markers-rulers-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-markers-rulers-16~sel.png"> + <LogicalName>prefs-markers-rulers-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-markers-rulers-16~sel%402x.png"> + <LogicalName>prefs-markers-rulers-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-markers-rulers-16~dark~sel.png"> + <LogicalName>prefs-markers-rulers-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-markers-rulers-16~dark~sel%402x.png"> + <LogicalName>prefs-markers-rulers-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-syntax-highlighting-16.png"> <LogicalName>prefs-syntax-highlighting-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-syntax-highlighting-16%402x.png"> <LogicalName>prefs-syntax-highlighting-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-syntax-highlighting-16~dark.png"> + <LogicalName>prefs-syntax-highlighting-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-syntax-highlighting-16~dark%402x.png"> + <LogicalName>prefs-syntax-highlighting-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-syntax-highlighting-16~sel.png"> + <LogicalName>prefs-syntax-highlighting-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-syntax-highlighting-16~sel%402x.png"> + <LogicalName>prefs-syntax-highlighting-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-syntax-highlighting-16~dark~sel.png"> + <LogicalName>prefs-syntax-highlighting-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-syntax-highlighting-16~dark~sel%402x.png"> + <LogicalName>prefs-syntax-highlighting-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-text-editor-general-16.png"> <LogicalName>prefs-text-editor-general-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-text-editor-general-16%402x.png"> <LogicalName>prefs-text-editor-general-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-text-editor-general-16~dark.png"> + <LogicalName>prefs-text-editor-general-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-text-editor-general-16~dark%402x.png"> + <LogicalName>prefs-text-editor-general-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-text-editor-general-16~sel.png"> + <LogicalName>prefs-text-editor-general-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-text-editor-general-16~sel%402x.png"> + <LogicalName>prefs-text-editor-general-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-text-editor-general-16~dark~sel.png"> + <LogicalName>prefs-text-editor-general-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-text-editor-general-16~dark~sel%402x.png"> + <LogicalName>prefs-text-editor-general-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-text-editor-behavior-16.png"> <LogicalName>prefs-text-editor-behavior-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-text-editor-behavior-16%402x.png"> <LogicalName>prefs-text-editor-behavior-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\prefs-completion-appearance-16.png"> - <LogicalName>prefs-completion-appearance-16.png</LogicalName> + <EmbeddedResource Include="icons\prefs-text-editor-behavior-16~dark.png"> + <LogicalName>prefs-text-editor-behavior-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-text-editor-behavior-16~dark%402x.png"> + <LogicalName>prefs-text-editor-behavior-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-text-editor-behavior-16~sel.png"> + <LogicalName>prefs-text-editor-behavior-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-text-editor-behavior-16~sel%402x.png"> + <LogicalName>prefs-text-editor-behavior-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-text-editor-behavior-16~dark~sel.png"> + <LogicalName>prefs-text-editor-behavior-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-text-editor-behavior-16~dark~sel%402x.png"> + <LogicalName>prefs-text-editor-behavior-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-completion-16.png"> + <LogicalName>prefs-completion-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-completion-16%402x.png"> + <LogicalName>prefs-completion-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-completion-16~dark.png"> + <LogicalName>prefs-completion-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-completion-16~dark%402x.png"> + <LogicalName>prefs-completion-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-completion-16~sel.png"> + <LogicalName>prefs-completion-16~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\prefs-completion-appearance-16%402x.png"> - <LogicalName>prefs-completion-appearance-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\prefs-completion-16~sel%402x.png"> + <LogicalName>prefs-completion-16~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\prefs-completion-behavior-16.png"> - <LogicalName>prefs-completion-behavior-16.png</LogicalName> + <EmbeddedResource Include="icons\prefs-completion-16~dark~sel.png"> + <LogicalName>prefs-completion-16~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\prefs-completion-behavior-16%402x.png"> - <LogicalName>prefs-completion-behavior-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\prefs-completion-16~dark~sel%402x.png"> + <LogicalName>prefs-completion-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs index 2eb68774ed..45ec1def05 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs @@ -312,7 +312,7 @@ namespace MonoDevelop.SourceEditor lg.AddColorStop (0, colorStyle.Color); lg.AddColorStop (1, colorStyle.SecondColor); cr.SetSource (lg); - cr.RoundedRectangle (@from + 0.5, y + 1.5, to - @from - 1, editor.LineHeight - 2, editor.LineHeight / 4); + cr.RoundedRectangle (@from - 0.5, y + 0.5, to - @from + 1, editor.LineHeight - 1, 2); cr.FillPreserve (); } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs index 2f355b2f6a..27c2595dfe 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs @@ -70,6 +70,38 @@ namespace MonoDevelop.SourceEditor ObjectValueTreeView tree; ScrolledWindow sw; + static readonly string innerTreeName = "MonoDevelop.SourceEditor.DebugValueWindow.ObjectValueTreeView"; + static string currentBgColor; + + static DebugValueWindow () + { + UpdateTreeStyle (Ide.Gui.Styles.PopoverWindow.DefaultBackgroundColor.ToCairoColor ()); + Ide.Gui.Styles.Changed += (sender, e) => UpdateTreeStyle (Ide.Gui.Styles.PopoverWindow.DefaultBackgroundColor.ToCairoColor ()); + } + + static void UpdateTreeStyle (Cairo.Color newBgColor) + { + string oddRowColor, bgColor; + + bgColor = CairoExtensions.ColorGetHex (newBgColor); + if (bgColor == currentBgColor) + return; + + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) + oddRowColor = CairoExtensions.ColorGetHex (newBgColor.AddLight (-0.02)); + else + oddRowColor = CairoExtensions.ColorGetHex (newBgColor.AddLight (-0.02)); + + string rc = "style \"" + innerTreeName + "\" = \"treeview\" {\n"; + rc += string.Format ("GtkTreeView::odd-row-color = \"{0}\"\n", oddRowColor); + rc += string.Format ("base[NORMAL] = \"{0}\"\n", bgColor); + rc += "\n}\n"; + rc += string.Format ("widget \"*.{0}\" style \"{0}\" ", innerTreeName); + + Rc.ParseString (rc); + currentBgColor = bgColor; + } + public DebugValueWindow (TextEditor editor, int offset, StackFrame frame, ObjectValue value, PinnedWatch watch) : base (Gtk.WindowType.Toplevel) { this.TypeHint = WindowTypeHint.PopupMenu; @@ -85,7 +117,10 @@ namespace MonoDevelop.SourceEditor sw.HscrollbarPolicy = PolicyType.Never; sw.VscrollbarPolicy = PolicyType.Never; + UpdateTreeStyle (Theme.BackgroundColor); tree = new ObjectValueTreeView (); + tree.Name = innerTreeName; + sw.Add (tree); ContentBox.Add (sw); diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs index 3f68195f7c..e45462670f 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs @@ -243,6 +243,14 @@ namespace MonoDevelop.SourceEditor UpdateEditMode (); base.OptionsChanged (sender, args); } + + protected override string GetIdeColorStyleName () + { + var scheme = Ide.Editor.Highlighting.SyntaxModeService.GetColorStyle (IdeApp.Preferences.ColorScheme); + if (!scheme.FitsIdeSkin (IdeApp.Preferences.UserInterfaceSkin)) + scheme = Ide.Editor.Highlighting.SyntaxModeService.GetDefaultColorStyle (IdeApp.Preferences.UserInterfaceSkin); + return scheme.Name; + } bool isInKeyStroke = false; protected override bool OnKeyPressEvent (Gdk.EventKey evnt) diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs index a8ad10acd7..ecdf017ea7 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/GotoLineNumberWidget.cs @@ -30,6 +30,7 @@ using System; using Gtk; using Mono.TextEditor; +using MonoDevelop.Components; namespace MonoDevelop.SourceEditor { @@ -66,14 +67,7 @@ namespace MonoDevelop.SourceEditor StoreWidgetState (); textEditor.Parent.SizeAllocated += HandleViewTextEditorhandleSizeAllocated; - - //HACK: GTK rendering issue on Mac, images don't repaint unless we put them in visible eventboxes - if (MonoDevelop.Core.Platform.IsMac) { - foreach (var eb in new [] { eventbox1, eventbox2 }) { - eb.VisibleWindow = true; - eb.ModifyBg (StateType.Normal, new Gdk.Color (230, 230, 230)); - } - } + this.closeButton.Clicked += delegate { RestoreWidgetState (); CloseWidget (); @@ -175,17 +169,15 @@ namespace MonoDevelop.SourceEditor if (col > 0) textEditor.Caret.Column = col; textEditor.CenterToCaret (); - } catch (System.Exception) { + } catch (System.Exception) { } } - - internal static readonly Gdk.Color warningColor = new Gdk.Color (210, 210, 32); - internal static readonly Gdk.Color errorColor = new Gdk.Color (255, 102, 102); - + void PreviewLine () { if (String.IsNullOrEmpty (entryLineNumber.Text) || entryLineNumber.Text == "+" || entryLineNumber.Text == "-") { this.entryLineNumber.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Normal)); + this.entryLineNumber.ModifyText (Gtk.StateType.Normal, Style.Foreground (Gtk.StateType.Normal)); RestoreWidgetState (); return; } @@ -196,11 +188,12 @@ namespace MonoDevelop.SourceEditor } else { this.entryLineNumber.ModifyBase (Gtk.StateType.Normal, Style.Base (Gtk.StateType.Normal)); + this.entryLineNumber.ModifyText (Gtk.StateType.Normal, Style.Foreground (Gtk.StateType.Normal)); } textEditor.Caret.Line = targetLine; textEditor.CenterToCaret (); - } catch (System.Exception) { - this.entryLineNumber.ModifyBase (Gtk.StateType.Normal, errorColor); + } catch (System.Exception) { + this.entryLineNumber.ModifyText (Gtk.StateType.Normal, Ide.Gui.Styles.Editor.SearchErrorForegroundColor.ToGdkColor ()); } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs index e63b93c8d3..74da4193b8 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HoverCloseButton.cs @@ -140,6 +140,7 @@ namespace MonoDevelop.SourceEditor context.Fill (); // Inset shadow + // FIXME: VV: Remove gradient features using (var lg = new Cairo.LinearGradient (0, center.Y - 5, 0, center.Y)) { context.Arc (center.X, center.Y + 1, radius, 0, Math.PI * 2); lg.AddColorStop (0, new Cairo.Color (0, 0, 0, 0.2 * opacity)); diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs index 5ace0ccd36..14ecc77bad 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs @@ -132,7 +132,7 @@ namespace MonoDevelop.SourceEditor w += (int)cache.warningPixbuf.Width + iconTextSpacing; requisition.Width = Math.Max (w + textBorder * 2, requisition.Width); - y += h + verticalTextSpace; + y += h + verticalTextSpace - 3; } } @@ -147,7 +147,6 @@ namespace MonoDevelop.SourceEditor protected override void OnDrawContent (Gdk.EventExpose evnt, Cairo.Context g) { - Theme.BorderColor = marker.TooltipColor.Color; g.Rectangle (0, 0, Allocation.Width, Allocation.Height); g.SetSourceColor (marker.TooltipColor.Color); g.Fill (); diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs index f1104e6771..ea20ea46d3 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleTextMarker.cs @@ -457,6 +457,7 @@ namespace MonoDevelop.SourceEditor editor.LineHeight / 2 - 2 ); + // FIXME: VV: Remove gradient features using (var lg = new Cairo.LinearGradient (errorCounterX, errorCounterY, errorCounterX, errorCounterY + errorCounterHeight)) { lg.AddColorStop (0, CounterColor.Color); lg.AddColorStop (1, CounterColor.Color.AddLight (-0.1)); diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs index e375ed6847..0007142983 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SearchAndReplaceWidget.cs @@ -35,6 +35,7 @@ using MonoDevelop.Core; using MonoDevelop.Ide; using MonoDevelop.Ide.Commands; using MonoDevelop.Components.Commands; +using MonoDevelop.Components; namespace MonoDevelop.SourceEditor { @@ -179,13 +180,6 @@ namespace MonoDevelop.SourceEditor }; FilterHistory (seachHistoryProperty); FilterHistory (replaceHistoryProperty); - //HACK: GTK rendering issue on Mac, images don't repaint unless we put them in visible eventboxes - if (Platform.IsMac) { - foreach (var eb in new [] { eventbox2, eventbox3, eventbox4, eventbox5, eventbox6 }) { - eb.VisibleWindow = true; - eb.ModifyBg (StateType.Normal, new Gdk.Color (245, 245, 245)); - } - } if (String.IsNullOrEmpty (textEditor.SearchPattern)) { textEditor.SearchPattern = SearchAndReplaceOptions.SearchPattern; @@ -312,7 +306,7 @@ namespace MonoDevelop.SourceEditor resultInformLabelEventBox.BorderWidth = 2; resultInformLabel.Xpad = 2; resultInformLabel.Show (); - searchEntry.FilterButtonPixbuf = Xwt.Drawing.Image.FromResource ("searchoptions.png"); + searchEntry.FilterButtonPixbuf = Xwt.Drawing.Image.FromResource ("find-options-22x32.png"); if (textEditor.IsSomethingSelected) { if (textEditor.MainSelection.MinLine == textEditor.MainSelection.MaxLine || ClipboardContainsSelection()) { @@ -810,8 +804,7 @@ But I leave it in in the case I've missed something. Mike if (!valid || textEditor.TextViewMargin.SearchResultMatchCount == 0) { //resultInformLabel.Markup = "<span foreground=\"#000000\" background=\"" + MonoDevelop.Components.PangoCairoHelper.GetColorString (GotoLineNumberWidget.errorColor) + "\">" + GettextCatalog.GetString ("Not found") + "</span>"; resultInformLabel.Text = GettextCatalog.GetString ("Not found"); - resultInformLabelEventBox.ModifyBg (StateType.Normal, GotoLineNumberWidget.errorColor); - resultInformLabel.ModifyFg (StateType.Normal, searchEntry.Entry.Style.Foreground (StateType.Normal)); + resultInformLabel.ModifyFg (StateType.Normal, Ide.Gui.Styles.Editor.SearchErrorForegroundColor.ToGdkColor ()); } else { int resultIndex = 0; int foundIndex = -1; diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs index 92207e8f8f..99f044b508 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs @@ -2051,7 +2051,7 @@ namespace MonoDevelop.SourceEditor static SourceEditorView () { - CodeSegmentPreviewWindow.CodeSegmentPreviewInformString = GettextCatalog.GetString ("Press 'F2' for focus"); + CodeSegmentPreviewWindow.CodeSegmentPreviewInformString = GettextCatalog.GetString ("Press F2 to focus"); ClipboardActions.CopyOperation.Copy += delegate (string text) { if (String.IsNullOrEmpty (text)) return; @@ -2966,9 +2966,9 @@ namespace MonoDevelop.SourceEditor } } - string ITextEditorImpl.GetPangoMarkup (int offset, int length) + string ITextEditorImpl.GetPangoMarkup (int offset, int length, bool fitIdeStyle) { - return TextEditor.GetTextEditorData ().GetMarkup (offset, length, false, replaceTabs:false); + return TextEditor.GetTextEditorData ().GetMarkup (offset, length, false, replaceTabs:false, fitIdeStyle:fitIdeStyle); } void ITextEditorImpl.SetUsageTaskProviders (IEnumerable<UsageProviderEditorExtension> providers) diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs index a581c014b2..9dfe1d2b70 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs @@ -64,6 +64,10 @@ namespace MonoDevelop.SourceEditor TextEditorData textEditorData; const uint CHILD_PADDING = 0; + + // VV: I removed the animation since it was very slow especially on @2x + // TODO: Maybe the AddAnimationWidget () shouldn't be used at all + const uint ANIMATION_DURATION = 0; // 300 // bool shouldShowclassBrowser; // bool canShowClassBrowser; @@ -201,6 +205,7 @@ namespace MonoDevelop.SourceEditor { SourceEditorWidget parent; ScrolledWindow scrolledWindow; + EventBox scrolledBackground; QuickTaskStrip strip; @@ -227,9 +232,11 @@ namespace MonoDevelop.SourceEditor this.parent = parent; this.strip = new QuickTaskStrip (); + scrolledBackground = new EventBox (); scrolledWindow = new CompactScrolledWindow (); scrolledWindow.ButtonPressEvent += PrepareEvent; - PackStart (scrolledWindow, true, true, 0); + scrolledBackground.Add (scrolledWindow); + PackStart (scrolledBackground, true, true, 0); strip.VAdjustment = scrolledWindow.Vadjustment; PackEnd (strip, false, true, 0); @@ -341,7 +348,7 @@ namespace MonoDevelop.SourceEditor { scrolledWindow.Child = container; this.strip.TextEditor = container; -// container.TextEditorWidget.EditorOptionsChanged += OptionsChanged; + container.EditorOptionsChanged += OptionsChanged; container.Caret.ModeChanged += parent.UpdateLineColOnEventHandler; container.Caret.PositionChanged += parent.CaretPositionChanged; container.SelectionChanged += parent.UpdateLineColOnEventHandler; @@ -349,8 +356,8 @@ namespace MonoDevelop.SourceEditor void OptionsChanged (object sender, EventArgs e) { - var editor = (Mono.TextEditor.MonoTextEditor)sender; - scrolledWindow.ModifyBg (StateType.Normal, (HslColor)editor.ColorStyle.PlainText.Background); + var editor = (Mono.TextEditor.MonoTextEditor)scrolledWindow.Child; + scrolledBackground.ModifyBg (StateType.Normal, (HslColor)editor.ColorStyle.PlainText.Background); } void RemoveEvents () @@ -361,7 +368,7 @@ namespace MonoDevelop.SourceEditor LoggingService.LogError ("can't remove events from text editor container."); return; } -// container.TextEditorWidget.EditorOptionsChanged -= OptionsChanged; + container.EditorOptionsChanged -= OptionsChanged; container.Caret.ModeChanged -= parent.UpdateLineColOnEventHandler; container.Caret.PositionChanged -= parent.CaretPositionChanged; container.SelectionChanged -= parent.UpdateLineColOnEventHandler; @@ -714,7 +721,7 @@ namespace MonoDevelop.SourceEditor EllipsizeMiddle (Document.FileName, 50), BrandingService.ApplicationName)); var b1 = new Button (GettextCatalog.GetString ("_Reload from disk")); - b1.Image = ImageService.GetImage (Gtk.Stock.Refresh, IconSize.Button); + b1.Image = new ImageView (Gtk.Stock.Refresh, IconSize.Button); b1.Clicked += delegate { Reload (); view.TextEditor.GrabFocus (); @@ -722,7 +729,7 @@ namespace MonoDevelop.SourceEditor messageBar.ActionArea.Add (b1); var b2 = new Button (GettextCatalog.GetString ("_Keep changes")); - b2.Image = ImageService.GetImage (Gtk.Stock.Cancel, IconSize.Button); + b2.Image = new ImageView (Gtk.Stock.Cancel, IconSize.Button); b2.Clicked += delegate { RemoveMessageBar (); view.LastSaveTimeUtc = System.IO.File.GetLastWriteTimeUtc (view.ContentName); @@ -732,14 +739,14 @@ namespace MonoDevelop.SourceEditor if (multiple) { var b3 = new Button (GettextCatalog.GetString ("_Reload all")); - b3.Image = ImageService.GetImage (Gtk.Stock.Cancel, IconSize.Button); + b3.Image = new ImageView (Gtk.Stock.Cancel, IconSize.Button); b3.Clicked += delegate { FileRegistry.ReloadAllChangedFiles (); }; messageBar.ActionArea.Add (b3); var b4 = new Button (GettextCatalog.GetString ("_Ignore all")); - b4.Image = ImageService.GetImage (Gtk.Stock.Cancel, IconSize.Button); + b4.Image = new ImageView (Gtk.Stock.Cancel, IconSize.Button); b4.Clicked += delegate { FileRegistry.IgnoreAllChangedFiles (); }; @@ -967,7 +974,7 @@ namespace MonoDevelop.SourceEditor "Do you want to use the original file, or load from the autosave file?"))); Button b1 = new Button (GettextCatalog.GetString("_Use original file")); - b1.Image = ImageService.GetImage (Gtk.Stock.Refresh, IconSize.Button); + b1.Image = new ImageView (Gtk.Stock.Refresh, IconSize.Button); b1.Clicked += delegate { try { AutoSave.RemoveAutoSaveFile (fileName); @@ -983,7 +990,7 @@ namespace MonoDevelop.SourceEditor messageBar.ActionArea.Add (b1); Button b2 = new Button (GettextCatalog.GetString("_Load from autosave")); - b2.Image = ImageService.GetImage (Gtk.Stock.RevertToSaved, IconSize.Button); + b2.Image = new ImageView (Gtk.Stock.RevertToSaved, IconSize.Button); b2.Clicked += delegate { try { var content = AutoSave.LoadAndRemoveAutoSave (fileName); @@ -1188,7 +1195,7 @@ namespace MonoDevelop.SourceEditor searchAndReplaceWidgetFrame.Child = searchAndReplaceWidget = new SearchAndReplaceWidget (TextEditor, searchAndReplaceWidgetFrame); searchAndReplaceWidget.Destroyed += (sender, e) => RemoveSearchWidget (); searchAndReplaceWidgetFrame.ShowAll (); - this.TextEditor.AddAnimatedWidget (searchAndReplaceWidgetFrame, 300, Mono.TextEditor.Theatrics.Easing.ExponentialInOut, Blocking.Downstage, TextEditor.Allocation.Width - 400, -searchAndReplaceWidget.Allocation.Height); + this.TextEditor.AddAnimatedWidget (searchAndReplaceWidgetFrame, ANIMATION_DURATION, Mono.TextEditor.Theatrics.Easing.ExponentialInOut, Blocking.Downstage, TextEditor.Allocation.Width - 400, -searchAndReplaceWidget.Allocation.Height); // this.PackEnd (searchAndReplaceWidget); // this.SetChildPacking (searchAndReplaceWidget, false, false, CHILD_PADDING, PackType.End); // searchAndReplaceWidget.ShowAll (); @@ -1229,7 +1236,7 @@ namespace MonoDevelop.SourceEditor gotoLineNumberWidgetFrame.Child = gotoLineNumberWidget = new GotoLineNumberWidget (textEditor, gotoLineNumberWidgetFrame); gotoLineNumberWidget.Destroyed += (sender, e) => RemoveSearchWidget (); gotoLineNumberWidgetFrame.ShowAll (); - TextEditor.AddAnimatedWidget (gotoLineNumberWidgetFrame, 300, Mono.TextEditor.Theatrics.Easing.ExponentialInOut, Mono.TextEditor.Theatrics.Blocking.Downstage, this.TextEditor.Allocation.Width - 400, -gotoLineNumberWidget.Allocation.Height); + TextEditor.AddAnimatedWidget (gotoLineNumberWidgetFrame, ANIMATION_DURATION, Mono.TextEditor.Theatrics.Easing.ExponentialInOut, Mono.TextEditor.Theatrics.Blocking.Downstage, this.TextEditor.Allocation.Width - 400, -gotoLineNumberWidget.Allocation.Height); ResetFocusChain (); } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/DebugTextMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/DebugTextMarker.cs index 46191f1f03..7f82fe371f 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/DebugTextMarker.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/DebugTextMarker.cs @@ -119,7 +119,7 @@ namespace MonoDevelop.SourceEditor to = Math.Max (to, editor.TextViewMargin.XOffset); if (@from < to) { cr.SetSourceColor (background(editor).Color); - cr.RoundedRectangle (@from + 0.5, y + 1.5, to - @from - 1, editor.LineHeight - 2, editor.LineHeight / 4); + cr.RoundedRectangle (@from + 2.5, y + 0.5, to - @from, editor.LineHeight - 1, 2); // 2.5 to make space for the column guideline cr.FillPreserve (); if (background(editor).HasBorderColor) { diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarker.cs index 101804f211..50312e0f0f 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarker.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/SmartTagMarker.cs @@ -50,14 +50,9 @@ namespace MonoDevelop.SourceEditor return; var x = editor.ColumnToX (line, loc.Column) - editor.HAdjustment.Value + editor.TextViewMargin.XOffset + editor.TextViewMargin.TextStartPosition; - cr.Rectangle (Math.Floor (x) + 0.5, Math.Floor (metrics.LineYRenderStartPosition) + 0.5 + (line == editor.GetLineByOffset (startOffset) ? editor.LineHeight - tagMarkerHeight - 1 : 0), tagMarkerWidth * cr.LineWidth, tagMarkerHeight * cr.LineWidth); - - if (HslColor.Brightness (editor.ColorStyle.PlainText.Background) < 0.5) { - cr.SetSourceRGBA (0.8, 0.8, 1, 0.9); - } else { - cr.SetSourceRGBA (0.2, 0.2, 1, 0.9); - } - cr.Stroke (); + cr.Rectangle (Math.Floor (x), Math.Floor (metrics.LineYRenderStartPosition) + (line == editor.GetLineByOffset (startOffset) ? -tagMarkerHeight : 0), tagMarkerWidth, tagMarkerHeight); + cr.SetSourceColor ((HslColor.Brightness (editor.ColorStyle.PlainText.Background) < 0.5 ? Ide.Gui.Styles.Editor.SmartTagMarkerColorDark : Ide.Gui.Styles.Editor.SmartTagMarkerColorLight).ToCairoColor ()); + cr.Fill (); } #region IActionTextLineMarker implementation diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UsageSegmentMarker.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UsageSegmentMarker.cs index bdd4c7c59d..407ebee368 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UsageSegmentMarker.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/TextMarker/UsageSegmentMarker.cs @@ -90,7 +90,7 @@ namespace MonoDevelop.SourceEditor lg.AddColorStop (0, colorStyle.Color); lg.AddColorStop (1, colorStyle.SecondColor); cr.SetSource (lg); - cr.RoundedRectangle (@from + 0.5, y + 1.5, to - @from - 1, editor.LineHeight - 2, editor.LineHeight / 4); + cr.RoundedRectangle (@from - 0.5, y + 0.5, to - @from + 1, editor.LineHeight - 1, 2); cr.FillPreserve (); } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/searchoptions.png b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/searchoptions.png Binary files differdeleted file mode 100644 index 0be6338cb3..0000000000 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/searchoptions.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/searchoptions.svg b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/searchoptions.svg deleted file mode 100644 index 209df7dfd1..0000000000 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/searchoptions.svg +++ /dev/null @@ -1,151 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Sodipodi ("http://www.sodipodi.com/") --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.0" - x="0" - y="0" - width="60" - height="60" - id="svg1" - sodipodi:version="0.32" - inkscape:version="0.47pre4 r22446" - sodipodi:docname="stock_search.svg" - inkscape:export-filename="/home/mkrueger/Desktop/search.png" - inkscape:export-xdpi="30.584652" - inkscape:export-ydpi="30.584652"> - <metadata - id="metadata22"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="11.020833" - inkscape:cx="30.556057" - inkscape:cy="28.957974" - inkscape:window-width="1920" - inkscape:window-height="1150" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:current-layer="svg1" - showgrid="false" - inkscape:window-maximized="1" /> - <defs - id="defs3"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 30 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="60 : 30 : 1" - inkscape:persp3d-origin="30 : 20 : 1" - id="perspective27" /> - <linearGradient - id="linearGradient900"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop901" /> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="1" - id="stop902" /> - </linearGradient> - <linearGradient - id="linearGradient903" - xlink:href="#linearGradient900" /> - <linearGradient - id="linearGradient904" - xlink:href="#linearGradient900" /> - <linearGradient - id="linearGradient905" - xlink:href="#linearGradient900" /> - <linearGradient - id="linearGradient906" - xlink:href="#linearGradient900" /> - <linearGradient - id="linearGradient907" - xlink:href="#linearGradient900" /> - <linearGradient - id="linearGradient1163" - xlink:href="#linearGradient1160" /> - <linearGradient - id="linearGradient1160"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop1161" /> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="1" - id="stop1162" /> - </linearGradient> - <inkscape:perspective - id="perspective2825" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /> - </defs> - <path - id="path1187" - style="font-size:12px;fill:#ececec;fill-rule:evenodd;stroke:#666666;stroke-width:2.69768906000000008;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - d="M 22.02672,24.498927 C 33.829117,39.594897 40.992998,49.676163 41.774708,46.334461 44.926753,45.774828 36.273157,36.703552 24.541555,22.750956 L 22.02672,24.498927 z" - sodipodi:nodetypes="cccc" /> - <ellipse - d="m 47.865601,28.05961 c 0,11.379166 -9.224637,20.603802 -20.603802,20.603802 -11.379166,0 -20.6038019,-9.224636 -20.6038019,-20.603802 0,-11.379165 9.2246359,-20.6038014 20.6038019,-20.6038014 11.379165,0 20.603802,9.2246364 20.603802,20.6038014 z" - sodipodi:ry="20.603802" - sodipodi:rx="20.603802" - sodipodi:cy="28.05961" - sodipodi:cx="27.261799" - id="path1174" - style="font-size:12px;fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:#666666;stroke-width:3.12500000000000000;stroke-opacity:1" - transform="matrix(0.80118022,0,0,0.74680016,-3.6563689,-3.1173228)" - ry="20.603802" - rx="20.603802" - cy="28.05961" - cx="27.261799" /> - <ellipse - d="m 47.865601,28.05961 c 0,11.379166 -9.224637,20.603802 -20.603802,20.603802 -11.379166,0 -20.6038019,-9.224636 -20.6038019,-20.603802 0,-11.379165 9.2246359,-20.6038014 20.6038019,-20.6038014 11.379165,0 20.603802,9.2246364 20.603802,20.6038014 z" - sodipodi:ry="20.603802" - sodipodi:rx="20.603802" - sodipodi:cy="28.05961" - sodipodi:cx="27.261799" - id="path1175" - style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#666666;stroke-width:3.70790005000000011;stroke-opacity:1" - transform="matrix(0.65257038,0,0,0.59740916,0.42439363,1.1215815)" - ry="20.603802" - rx="20.603802" - cy="28.05961" - cx="27.261799" - inkscape:export-xdpi="32" - inkscape:export-ydpi="32" /> - <path - sodipodi:nodetypes="cccccccc" - id="rect812" - d="m 59.124514,25.370475 c -0.01119,0.592816 -0.21095,1.16795 -0.618473,1.612191 l -9.044962,9.876788 c -0.815044,0.888485 -2.089709,0.845211 -2.870461,-0.08329 l -8.2694,-9.787908 c -0.736904,-0.876357 -0.696351,-2.231158 -0.01059,-3.127324 l 20.3094,-0.06794 c 0.354504,0.454282 0.515189,1.012071 0.504518,1.577474 z" - style="font-size:12px;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none" - inkscape:export-xdpi="32" - inkscape:export-ydpi="32" /> -</svg> diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs index 1047bb7150..40e716faff 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.GotoLineNumberWidget.cs @@ -5,89 +5,72 @@ namespace MonoDevelop.SourceEditor public partial class GotoLineNumberWidget { private global::Gtk.HBox hbox1; - private global::Gtk.Entry entryLineNumber; - private global::Gtk.Button buttonGoToLine; - - private global::Gtk.EventBox eventbox2; - - private global::Gtk.Image image2; - + + private global::MonoDevelop.Components.ImageView image2; + private global::Gtk.Button closeButton; + + private global::MonoDevelop.Components.ImageView image1; - private global::Gtk.EventBox eventbox1; - - private global::Gtk.Image image1; - - protected virtual void Build() + protected virtual void Build () { - global::Stetic.Gui.Initialize(this); + global::Stetic.Gui.Initialize (this); // Widget MonoDevelop.SourceEditor.GotoLineNumberWidget - global::Stetic.BinContainer.Attach(this); + global::Stetic.BinContainer.Attach (this); this.Name = "MonoDevelop.SourceEditor.GotoLineNumberWidget"; // Container child MonoDevelop.SourceEditor.GotoLineNumberWidget.Gtk.Container+ContainerChild - this.hbox1 = new global::Gtk.HBox(); + this.hbox1 = new global::Gtk.HBox (); this.hbox1.Name = "hbox1"; // Container child hbox1.Gtk.Box+BoxChild - this.entryLineNumber = new global::Gtk.Entry(); + this.entryLineNumber = new global::Gtk.Entry (); this.entryLineNumber.CanFocus = true; this.entryLineNumber.Name = "entryLineNumber"; this.entryLineNumber.IsEditable = true; this.entryLineNumber.InvisibleChar = '●'; - this.hbox1.Add(this.entryLineNumber); - global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.entryLineNumber])); + this.hbox1.Add (this.entryLineNumber); + global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.entryLineNumber])); w1.Position = 0; w1.Expand = false; // Container child hbox1.Gtk.Box+BoxChild - this.buttonGoToLine = new global::Gtk.Button(); + this.buttonGoToLine = new global::Gtk.Button (); this.buttonGoToLine.CanDefault = true; this.buttonGoToLine.CanFocus = true; this.buttonGoToLine.Name = "buttonGoToLine"; this.buttonGoToLine.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child buttonGoToLine.Gtk.Container+ContainerChild - this.eventbox2 = new global::Gtk.EventBox(); - this.eventbox2.Name = "eventbox2"; - this.eventbox2.AboveChild = true; - this.eventbox2.VisibleWindow = false; - // Container child eventbox2.Gtk.Container+ContainerChild - this.image2 = new global::Gtk.Image(); + this.image2 = new global::MonoDevelop.Components.ImageView (); this.image2.Name = "image2"; - this.image2.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-jump-to", global::Gtk.IconSize.Menu); - this.eventbox2.Add(this.image2); - this.buttonGoToLine.Add(this.eventbox2); - this.hbox1.Add(this.buttonGoToLine); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.buttonGoToLine])); - w4.Position = 1; - w4.Expand = false; - w4.Fill = false; + this.image2.IconId = "gtk-jump-to"; + this.image2.IconSize = ((global::Gtk.IconSize)(1)); + this.buttonGoToLine.Add (this.image2); + this.hbox1.Add (this.buttonGoToLine); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonGoToLine])); + w3.Position = 1; + w3.Expand = false; + w3.Fill = false; // Container child hbox1.Gtk.Box+BoxChild - this.closeButton = new global::Gtk.Button(); + this.closeButton = new global::Gtk.Button (); this.closeButton.CanFocus = true; this.closeButton.Name = "closeButton"; this.closeButton.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child closeButton.Gtk.Container+ContainerChild - this.eventbox1 = new global::Gtk.EventBox(); - this.eventbox1.Name = "eventbox1"; - this.eventbox1.AboveChild = true; - this.eventbox1.VisibleWindow = false; - // Container child eventbox1.Gtk.Container+ContainerChild - this.image1 = new global::Gtk.Image(); + this.image1 = new global::MonoDevelop.Components.ImageView (); this.image1.Name = "image1"; - this.image1.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-close", global::Gtk.IconSize.Menu); - this.eventbox1.Add(this.image1); - this.closeButton.Add(this.eventbox1); - this.hbox1.Add(this.closeButton); - global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.closeButton])); - w7.Position = 2; - w7.Expand = false; - w7.Fill = false; - this.Add(this.hbox1); - if ((this.Child != null)) - { - this.Child.ShowAll(); + this.image1.IconId = "gtk-close"; + this.image1.IconSize = ((global::Gtk.IconSize)(1)); + this.closeButton.Add (this.image1); + this.hbox1.Add (this.closeButton); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.closeButton])); + w5.Position = 2; + w5.Expand = false; + w5.Fill = false; + this.Add (this.hbox1); + if ((this.Child != null)) { + this.Child.ShowAll (); } - this.Show(); + this.Show (); } } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs index 95a85dd82a..747ee9c089 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SearchAndReplaceWidget.cs @@ -5,80 +5,70 @@ namespace MonoDevelop.SourceEditor public partial class SearchAndReplaceWidget { private global::Gtk.Table table; - + private global::Gtk.Button buttonSearchMode; - + private global::Gtk.Arrow searchButtonModeArrow; - + private global::Gtk.HBox hbox1; - + private global::MonoDevelop.Components.SearchEntry searchEntry; - + private global::Gtk.Button buttonSearchBackward; - - private global::Gtk.EventBox eventbox2; - - private global::Gtk.Image image2; - + + private global::MonoDevelop.Components.ImageView image2; + private global::Gtk.Button buttonSearchForward; - - private global::Gtk.EventBox eventbox3; - - private global::Gtk.Image image3; - + + private global::MonoDevelop.Components.ImageView image3; + private global::Gtk.Button closeButton; - - private global::Gtk.EventBox eventbox4; - - private global::Gtk.Image image4; - + + private global::MonoDevelop.Components.ImageView image4; + private global::Gtk.HBox hbox2; - + private global::Gtk.Entry entryReplace; - + private global::Gtk.Button buttonReplace; - - private global::Gtk.EventBox eventbox5; - - private global::Gtk.Image image5; - + + private global::MonoDevelop.Components.ImageView image5; + private global::Gtk.Button buttonReplaceAll; - + private global::Gtk.HBox hbox3; - - private global::Gtk.EventBox eventbox6; - - private global::Gtk.Image image6; - + + private global::MonoDevelop.Components.ImageView image6; + private global::Gtk.Label label1; - protected virtual void Build() + protected virtual void Build () { - global::Stetic.Gui.Initialize(this); + global::Stetic.Gui.Initialize (this); // Widget MonoDevelop.SourceEditor.SearchAndReplaceWidget - global::Stetic.BinContainer.Attach(this); + global::Stetic.BinContainer.Attach (this); this.Name = "MonoDevelop.SourceEditor.SearchAndReplaceWidget"; // Container child MonoDevelop.SourceEditor.SearchAndReplaceWidget.Gtk.Container+ContainerChild - this.table = new global::Gtk.Table(((uint)(2)), ((uint)(2)), false); + this.table = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false); this.table.Name = "table"; this.table.BorderWidth = ((uint)(4)); // Container child table.Gtk.Table+TableChild - this.buttonSearchMode = new global::Gtk.Button(); + this.buttonSearchMode = new global::Gtk.Button (); this.buttonSearchMode.CanFocus = true; this.buttonSearchMode.Name = "buttonSearchMode"; // Container child buttonSearchMode.Gtk.Container+ContainerChild - this.searchButtonModeArrow = new global::Gtk.Arrow(((global::Gtk.ArrowType)(0)), ((global::Gtk.ShadowType)(0))); + this.searchButtonModeArrow = new global::Gtk.Arrow (((global::Gtk.ArrowType)(0)), ((global::Gtk.ShadowType)(0))); this.searchButtonModeArrow.Name = "searchButtonModeArrow"; - this.buttonSearchMode.Add(this.searchButtonModeArrow); - this.table.Add(this.buttonSearchMode); - global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table[this.buttonSearchMode])); + this.buttonSearchMode.Add (this.searchButtonModeArrow); + this.table.Add (this.buttonSearchMode); + global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table [this.buttonSearchMode])); w2.XOptions = ((global::Gtk.AttachOptions)(4)); w2.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table.Gtk.Table+TableChild - this.hbox1 = new global::Gtk.HBox(); + this.hbox1 = new global::Gtk.HBox (); this.hbox1.Name = "hbox1"; // Container child hbox1.Gtk.Box+BoxChild - this.searchEntry = new global::MonoDevelop.Components.SearchEntry(); + this.searchEntry = new global::MonoDevelop.Components.SearchEntry (); this.searchEntry.Name = "searchEntry"; this.searchEntry.ForceFilterButtonVisible = false; this.searchEntry.HasFrame = true; @@ -87,162 +77,136 @@ namespace MonoDevelop.SourceEditor this.searchEntry.ActiveFilterID = 0; this.searchEntry.Ready = false; this.searchEntry.HasFocus = false; - this.hbox1.Add(this.searchEntry); - global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.searchEntry])); + this.hbox1.Add (this.searchEntry); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.searchEntry])); w3.Position = 0; // Container child hbox1.Gtk.Box+BoxChild - this.buttonSearchBackward = new global::Gtk.Button(); + this.buttonSearchBackward = new global::Gtk.Button (); this.buttonSearchBackward.CanFocus = true; this.buttonSearchBackward.Name = "buttonSearchBackward"; this.buttonSearchBackward.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child buttonSearchBackward.Gtk.Container+ContainerChild - this.eventbox2 = new global::Gtk.EventBox(); - this.eventbox2.Name = "eventbox2"; - this.eventbox2.AboveChild = true; - this.eventbox2.VisibleWindow = false; - // Container child eventbox2.Gtk.Container+ContainerChild - this.image2 = new global::Gtk.Image(); + this.image2 = new global::MonoDevelop.Components.ImageView (); this.image2.Name = "image2"; - this.image2.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-go-up", global::Gtk.IconSize.Menu); - this.eventbox2.Add(this.image2); - this.buttonSearchBackward.Add(this.eventbox2); - this.hbox1.Add(this.buttonSearchBackward); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.buttonSearchBackward])); - w6.Position = 1; - w6.Expand = false; - w6.Fill = false; + this.image2.IconId = "gtk-go-up"; + this.image2.IconSize = ((global::Gtk.IconSize)(1)); + this.buttonSearchBackward.Add (this.image2); + this.hbox1.Add (this.buttonSearchBackward); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonSearchBackward])); + w5.Position = 1; + w5.Expand = false; + w5.Fill = false; // Container child hbox1.Gtk.Box+BoxChild - this.buttonSearchForward = new global::Gtk.Button(); + this.buttonSearchForward = new global::Gtk.Button (); this.buttonSearchForward.CanFocus = true; this.buttonSearchForward.Name = "buttonSearchForward"; this.buttonSearchForward.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child buttonSearchForward.Gtk.Container+ContainerChild - this.eventbox3 = new global::Gtk.EventBox(); - this.eventbox3.Name = "eventbox3"; - this.eventbox3.AboveChild = true; - this.eventbox3.VisibleWindow = false; - // Container child eventbox3.Gtk.Container+ContainerChild - this.image3 = new global::Gtk.Image(); + this.image3 = new global::MonoDevelop.Components.ImageView (); this.image3.Name = "image3"; - this.image3.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-go-down", global::Gtk.IconSize.Menu); - this.eventbox3.Add(this.image3); - this.buttonSearchForward.Add(this.eventbox3); - this.hbox1.Add(this.buttonSearchForward); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.buttonSearchForward])); - w9.Position = 2; - w9.Expand = false; - w9.Fill = false; + this.image3.IconId = "gtk-go-down"; + this.image3.IconSize = ((global::Gtk.IconSize)(1)); + this.buttonSearchForward.Add (this.image3); + this.hbox1.Add (this.buttonSearchForward); + global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.buttonSearchForward])); + w7.Position = 2; + w7.Expand = false; + w7.Fill = false; // Container child hbox1.Gtk.Box+BoxChild - this.closeButton = new global::Gtk.Button(); + this.closeButton = new global::Gtk.Button (); this.closeButton.CanFocus = true; this.closeButton.Name = "closeButton"; this.closeButton.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child closeButton.Gtk.Container+ContainerChild - this.eventbox4 = new global::Gtk.EventBox(); - this.eventbox4.Name = "eventbox4"; - this.eventbox4.AboveChild = true; - this.eventbox4.VisibleWindow = false; - // Container child eventbox4.Gtk.Container+ContainerChild - this.image4 = new global::Gtk.Image(); + this.image4 = new global::MonoDevelop.Components.ImageView (); this.image4.Name = "image4"; - this.image4.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-close", global::Gtk.IconSize.Menu); - this.eventbox4.Add(this.image4); - this.closeButton.Add(this.eventbox4); - this.hbox1.Add(this.closeButton); - global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.closeButton])); - w12.Position = 3; - w12.Expand = false; - w12.Fill = false; - this.table.Add(this.hbox1); - global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table[this.hbox1])); - w13.LeftAttach = ((uint)(1)); - w13.RightAttach = ((uint)(2)); - w13.YOptions = ((global::Gtk.AttachOptions)(4)); + this.image4.IconId = "gtk-close"; + this.image4.IconSize = ((global::Gtk.IconSize)(1)); + this.closeButton.Add (this.image4); + this.hbox1.Add (this.closeButton); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.closeButton])); + w9.Position = 3; + w9.Expand = false; + w9.Fill = false; + this.table.Add (this.hbox1); + global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table [this.hbox1])); + w10.LeftAttach = ((uint)(1)); + w10.RightAttach = ((uint)(2)); + w10.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table.Gtk.Table+TableChild - this.hbox2 = new global::Gtk.HBox(); + this.hbox2 = new global::Gtk.HBox (); this.hbox2.Name = "hbox2"; // Container child hbox2.Gtk.Box+BoxChild - this.entryReplace = new global::Gtk.Entry(); + this.entryReplace = new global::Gtk.Entry (); this.entryReplace.CanFocus = true; this.entryReplace.Name = "entryReplace"; this.entryReplace.IsEditable = true; this.entryReplace.InvisibleChar = '●'; - this.hbox2.Add(this.entryReplace); - global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.entryReplace])); - w14.Position = 0; + this.hbox2.Add (this.entryReplace); + global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.entryReplace])); + w11.Position = 0; // Container child hbox2.Gtk.Box+BoxChild - this.buttonReplace = new global::Gtk.Button(); + this.buttonReplace = new global::Gtk.Button (); this.buttonReplace.CanFocus = true; this.buttonReplace.Name = "buttonReplace"; this.buttonReplace.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child buttonReplace.Gtk.Container+ContainerChild - this.eventbox5 = new global::Gtk.EventBox(); - this.eventbox5.Name = "eventbox5"; - this.eventbox5.AboveChild = true; - this.eventbox5.VisibleWindow = false; - // Container child eventbox5.Gtk.Container+ContainerChild - this.image5 = new global::Gtk.Image(); + this.image5 = new global::MonoDevelop.Components.ImageView (); this.image5.Name = "image5"; - this.image5.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-find-and-replace", global::Gtk.IconSize.Menu); - this.eventbox5.Add(this.image5); - this.buttonReplace.Add(this.eventbox5); - this.hbox2.Add(this.buttonReplace); - global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.buttonReplace])); - w17.Position = 1; - w17.Expand = false; - w17.Fill = false; + this.image5.IconId = "gtk-find-and-replace"; + this.image5.IconSize = ((global::Gtk.IconSize)(1)); + this.buttonReplace.Add (this.image5); + this.hbox2.Add (this.buttonReplace); + global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonReplace])); + w13.Position = 1; + w13.Expand = false; + w13.Fill = false; // Container child hbox2.Gtk.Box+BoxChild - this.buttonReplaceAll = new global::Gtk.Button(); + this.buttonReplaceAll = new global::Gtk.Button (); this.buttonReplaceAll.CanFocus = true; this.buttonReplaceAll.Name = "buttonReplaceAll"; this.buttonReplaceAll.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child buttonReplaceAll.Gtk.Container+ContainerChild - this.hbox3 = new global::Gtk.HBox(); + this.hbox3 = new global::Gtk.HBox (); this.hbox3.Name = "hbox3"; this.hbox3.Spacing = 6; // Container child hbox3.Gtk.Box+BoxChild - this.eventbox6 = new global::Gtk.EventBox(); - this.eventbox6.Name = "eventbox6"; - this.eventbox6.AboveChild = true; - this.eventbox6.VisibleWindow = false; - // Container child eventbox6.Gtk.Container+ContainerChild - this.image6 = new global::Gtk.Image(); + this.image6 = new global::MonoDevelop.Components.ImageView (); this.image6.Name = "image6"; - this.image6.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-find-and-replace", global::Gtk.IconSize.Menu); - this.eventbox6.Add(this.image6); - this.hbox3.Add(this.eventbox6); - global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.eventbox6])); - w19.Position = 0; - w19.Expand = false; - w19.Fill = false; + this.image6.IconId = "gtk-find-and-replace"; + this.image6.IconSize = ((global::Gtk.IconSize)(1)); + this.hbox3.Add (this.image6); + global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.image6])); + w14.Position = 0; + w14.Expand = false; + w14.Fill = false; // Container child hbox3.Gtk.Box+BoxChild - this.label1 = new global::Gtk.Label(); + this.label1 = new global::Gtk.Label (); this.label1.Name = "label1"; - this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("All"); - this.hbox3.Add(this.label1); - global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox3[this.label1])); - w20.Position = 1; - w20.Expand = false; - w20.Fill = false; - this.buttonReplaceAll.Add(this.hbox3); - this.hbox2.Add(this.buttonReplaceAll); - global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.buttonReplaceAll])); - w22.Position = 2; - w22.Expand = false; - w22.Fill = false; - this.table.Add(this.hbox2); - global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table[this.hbox2])); - w23.TopAttach = ((uint)(1)); - w23.BottomAttach = ((uint)(2)); - w23.LeftAttach = ((uint)(1)); - w23.RightAttach = ((uint)(2)); - w23.YOptions = ((global::Gtk.AttachOptions)(4)); - this.Add(this.table); - if ((this.Child != null)) - { - this.Child.ShowAll(); + this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("All"); + this.hbox3.Add (this.label1); + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label1])); + w15.Position = 1; + w15.Expand = false; + w15.Fill = false; + this.buttonReplaceAll.Add (this.hbox3); + this.hbox2.Add (this.buttonReplaceAll); + global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonReplaceAll])); + w17.Position = 2; + w17.Expand = false; + w17.Fill = false; + this.table.Add (this.hbox2); + global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table [this.hbox2])); + w18.TopAttach = ((uint)(1)); + w18.BottomAttach = ((uint)(2)); + w18.LeftAttach = ((uint)(1)); + w18.RightAttach = ((uint)(2)); + w18.YOptions = ((global::Gtk.AttachOptions)(4)); + this.Add (this.table); + if ((this.Child != null)) { + this.Child.ShowAll (); } - this.Show(); + this.Show (); } } } diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs index f8063885f3..453751b36a 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/generated.cs @@ -73,51 +73,6 @@ namespace Stetic } } - internal class IconLoader - { - public static Gdk.Pixbuf LoadIcon(Gtk.Widget widget, string name, Gtk.IconSize size) - { - Gdk.Pixbuf res = widget.RenderIcon(name, size, null); - if ((res != null)) - { - return res; - } - else { - int sz; - int sy; - global::Gtk.Icon.SizeLookup(size, out sz, out sy); - try - { - return Gtk.IconTheme.Default.LoadIcon(name, sz, 0); - } - catch (System.Exception) - { - if ((name != "gtk-missing-image")) - { - return Stetic.IconLoader.LoadIcon(widget, "gtk-missing-image", size); - } - else { - Gdk.Pixmap pmap = new Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz); - Gdk.GC gc = new Gdk.GC(pmap); - gc.RgbFgColor = new Gdk.Color(255, 255, 255); - pmap.DrawRectangle(gc, true, 0, 0, sz, sz); - gc.RgbFgColor = new Gdk.Color(0, 0, 0); - pmap.DrawRectangle(gc, false, 0, 0, (sz - 1), (sz - 1)); - gc.SetLineAttributes(3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round); - gc.RgbFgColor = new Gdk.Color(255, 0, 0); - pmap.DrawLine(gc, (sz / 4), (sz / 4), ((sz - 1) - - (sz / 4)), ((sz - 1) - - (sz / 4))); - pmap.DrawLine(gc, ((sz - 1) - - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - - (sz / 4))); - return Gdk.Pixbuf.FromDrawable(pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz); - } - } - } - } - } - internal class ActionGroups { public static Gtk.ActionGroup GetActionGroup(System.Type type) diff --git a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic index 9958606006..19f98120aa 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic +++ b/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic @@ -1171,16 +1171,10 @@ <property name="Type">Custom</property> <property name="Relief">None</property> <child> - <widget class="Gtk.EventBox" id="eventbox2"> + <widget class="MonoDevelop.Components.ImageView" id="image2"> <property name="MemberName" /> - <property name="AboveChild">True</property> - <property name="VisibleWindow">False</property> - <child> - <widget class="Gtk.Image" id="image2"> - <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-go-up Menu</property> - </widget> - </child> + <property name="IconId">gtk-go-up</property> + <property name="IconSize">Menu</property> </widget> </child> </widget> @@ -1198,16 +1192,10 @@ <property name="Type">Custom</property> <property name="Relief">None</property> <child> - <widget class="Gtk.EventBox" id="eventbox3"> + <widget class="MonoDevelop.Components.ImageView" id="image3"> <property name="MemberName" /> - <property name="AboveChild">True</property> - <property name="VisibleWindow">False</property> - <child> - <widget class="Gtk.Image" id="image3"> - <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-go-down Menu</property> - </widget> - </child> + <property name="IconId">gtk-go-down</property> + <property name="IconSize">Menu</property> </widget> </child> </widget> @@ -1225,16 +1213,10 @@ <property name="Type">Custom</property> <property name="Relief">None</property> <child> - <widget class="Gtk.EventBox" id="eventbox4"> + <widget class="MonoDevelop.Components.ImageView" id="image4"> <property name="MemberName" /> - <property name="AboveChild">True</property> - <property name="VisibleWindow">False</property> - <child> - <widget class="Gtk.Image" id="image4"> - <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-close Menu</property> - </widget> - </child> + <property name="IconId">gtk-close</property> + <property name="IconSize">Menu</property> </widget> </child> </widget> @@ -1281,16 +1263,10 @@ <property name="Type">Custom</property> <property name="Relief">None</property> <child> - <widget class="Gtk.EventBox" id="eventbox5"> + <widget class="MonoDevelop.Components.ImageView" id="image5"> <property name="MemberName" /> - <property name="AboveChild">True</property> - <property name="VisibleWindow">False</property> - <child> - <widget class="Gtk.Image" id="image5"> - <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-find-and-replace Menu</property> - </widget> - </child> + <property name="IconId">gtk-find-and-replace</property> + <property name="IconSize">Menu</property> </widget> </child> </widget> @@ -1312,16 +1288,10 @@ <property name="MemberName" /> <property name="Spacing">6</property> <child> - <widget class="Gtk.EventBox" id="eventbox6"> + <widget class="MonoDevelop.Components.ImageView" id="image6"> <property name="MemberName" /> - <property name="AboveChild">True</property> - <property name="VisibleWindow">False</property> - <child> - <widget class="Gtk.Image" id="image6"> - <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-find-and-replace Menu</property> - </widget> - </child> + <property name="IconId">gtk-find-and-replace</property> + <property name="IconSize">Menu</property> </widget> <packing> <property name="Position">0</property> @@ -1397,16 +1367,10 @@ <property name="Type">Custom</property> <property name="Relief">None</property> <child> - <widget class="Gtk.EventBox" id="eventbox2"> + <widget class="MonoDevelop.Components.ImageView" id="image2"> <property name="MemberName" /> - <property name="AboveChild">True</property> - <property name="VisibleWindow">False</property> - <child> - <widget class="Gtk.Image" id="image2"> - <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-jump-to Menu</property> - </widget> - </child> + <property name="IconId">gtk-jump-to</property> + <property name="IconSize">Menu</property> </widget> </child> </widget> @@ -1424,16 +1388,10 @@ <property name="Type">Custom</property> <property name="Relief">None</property> <child> - <widget class="Gtk.EventBox" id="eventbox1"> + <widget class="MonoDevelop.Components.ImageView" id="image1"> <property name="MemberName" /> - <property name="AboveChild">True</property> - <property name="VisibleWindow">False</property> - <child> - <widget class="Gtk.Image" id="image1"> - <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-close Menu</property> - </widget> - </child> + <property name="IconId">gtk-close</property> + <property name="IconSize">Menu</property> </widget> </child> </widget> diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32.png Binary files differnew file mode 100644 index 0000000000..242c7f399d --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32@2x.png Binary files differnew file mode 100644 index 0000000000..2ac79e1dea --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32~dark.png Binary files differnew file mode 100644 index 0000000000..a34279810d --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32~dark.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f9dafa0b2f --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/find-options-22x32~dark@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15.png Binary files differindex 50b75050d0..9d85bdc169 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15@2x.png Binary files differindex 6e2df33c1b..a392c6d782 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15@2x.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15~dark.png Binary files differnew file mode 100644 index 0000000000..1d9477df8d --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15~dark.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e60e88b61b --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-bookmark-15~dark@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15.png Binary files differindex 7cfe2604d9..dafe2f346f 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15@2x.png Binary files differindex b30b504b07..83afe23e8d 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15@2x.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-error-15@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15.png Binary files differindex 9539699270..f7e2edb3ca 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15@2x.png Binary files differindex f72f42331c..0eef55b3d9 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15@2x.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/gutter-warning-15@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16.png Binary files differindex c350248a23..1dd9519c21 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16@2x.png Binary files differindex 6e7b4a077d..222c272b13 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16@2x.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16~dark.png Binary files differnew file mode 100644 index 0000000000..021435da5a --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16~dark.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..cdcf00008a --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-busy-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16.png Binary files differindex 06185a2a51..b4e3e10680 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16@2x.png Binary files differindex 7a466198a2..5bd225090f 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16@2x.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16~dark.png Binary files differnew file mode 100644 index 0000000000..aa5754907f --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16~dark.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f39161e6cb --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-error-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16.png Binary files differindex d5824843a9..b220283313 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16@2x.png Binary files differindex 8674aebbf8..83d47c0537 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16@2x.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~dark.png Binary files differnew file mode 100644 index 0000000000..a9292b0b4a --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~dark.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..06d984df89 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-ok-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16.png Binary files differindex 7bd0114b4f..1fdf2bf0e6 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16@2x.png Binary files differindex 7e0f57994c..fa0ca940ac 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16@2x.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16~dark.png Binary files differnew file mode 100644 index 0000000000..4417225d40 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16~dark.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..85f875ab31 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-suggestion-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16.png Binary files differindex d332c8658f..7314d71c29 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16@2x.png Binary files differindex ae2a84b99b..bdffb6d700 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16@2x.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16~dark.png Binary files differnew file mode 100644 index 0000000000..0ed4f689ac --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16~dark.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..4bc5bec07f --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/issues-warning-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16.png Binary files differnew file mode 100644 index 0000000000..8cc3c5844a --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16@2x.png Binary files differnew file mode 100644 index 0000000000..7415b28288 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark.png Binary files differnew file mode 100644 index 0000000000..8915de07e5 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f82447e0dc --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..2fc1948ac2 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..045e2802c4 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~sel.png Binary files differnew file mode 100644 index 0000000000..2fc1948ac2 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~sel.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..045e2802c4 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-appearance-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-appearance-16.png Binary files differdeleted file mode 100644 index 536c7bdb27..0000000000 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-appearance-16.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-appearance-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-appearance-16@2x.png Binary files differdeleted file mode 100644 index 8883b8b5ec..0000000000 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-appearance-16@2x.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-behavior-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-behavior-16.png Binary files differdeleted file mode 100644 index 536c7bdb27..0000000000 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-behavior-16.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-behavior-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-behavior-16@2x.png Binary files differdeleted file mode 100644 index 8883b8b5ec..0000000000 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-completion-behavior-16@2x.png +++ /dev/null diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16.png Binary files differindex 2272d20f00..bcc63b30ec 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16@2x.png Binary files differindex be480ee9b7..9c9c38748c 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16@2x.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark.png Binary files differnew file mode 100644 index 0000000000..31eccd3bbe --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..239afa7929 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..e66be7813b --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..af9ca1824e --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~sel.png Binary files differnew file mode 100644 index 0000000000..e66be7813b --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~sel.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..af9ca1824e --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-markers-rulers-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16.png Binary files differindex 878fd038b1..58c4976e67 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16@2x.png Binary files differindex f5e72e78dc..0d30b0bf95 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16@2x.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark.png Binary files differnew file mode 100644 index 0000000000..b4c872be39 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..38eb036705 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..f42642f5b2 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..7562d51fe9 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~sel.png Binary files differnew file mode 100644 index 0000000000..f42642f5b2 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~sel.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..7562d51fe9 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-syntax-highlighting-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16.png Binary files differindex bf175ec49a..9df636c7fd 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16@2x.png Binary files differindex e4a86d4fd8..592c731b19 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16@2x.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark.png Binary files differnew file mode 100644 index 0000000000..1ea6159ced --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..1e7cac36f4 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..27e58ecddb --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..734609deb7 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~sel.png Binary files differnew file mode 100644 index 0000000000..27e58ecddb --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~sel.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..734609deb7 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-behavior-16~sel@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16.png Binary files differindex 3dee46575c..9e06aadb07 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16@2x.png Binary files differindex e0e6d11f70..fb30076fd1 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16@2x.png +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark.png Binary files differnew file mode 100644 index 0000000000..6dd4e516ed --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6ec43f0b00 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..f275acd398 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark~sel.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..ba68c2b249 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~dark~sel@2x.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~sel.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~sel.png Binary files differnew file mode 100644 index 0000000000..f275acd398 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~sel.png diff --git a/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~sel@2x.png b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..ba68c2b249 --- /dev/null +++ b/main/src/addins/MonoDevelop.SourceEditor2/icons/prefs-text-editor-general-16~sel@2x.png diff --git a/main/src/addins/NUnit/Gui/TestPad.cs b/main/src/addins/NUnit/Gui/TestPad.cs index 99643f5e34..3681279f08 100644 --- a/main/src/addins/NUnit/Gui/TestPad.cs +++ b/main/src/addins/NUnit/Gui/TestPad.cs @@ -93,7 +93,7 @@ namespace MonoDevelop.NUnit DockItemToolbar topToolbar = Window.GetToolbar (DockPositionType.Top); var hbox = new HBox { Spacing = 6 }; - hbox.PackStart (new ImageView (ImageService.GetIcon ("nunit-run", IconSize.Menu)), false, false, 0); + hbox.PackStart (new ImageView (ImageService.GetIcon ("md-execute-all", IconSize.Menu)), false, false, 0); hbox.PackStart (new Label (GettextCatalog.GetString ("Run All")), false, false, 0); buttonRunAll = new Button (hbox); buttonRunAll.Clicked += new EventHandler (OnRunAllClicked); @@ -101,7 +101,7 @@ namespace MonoDevelop.NUnit buttonRunAll.TooltipText = GettextCatalog.GetString ("Run all tests"); topToolbar.Add (buttonRunAll); - buttonStop = new Button (new Gtk.Image (Ide.Gui.Stock.Stop, IconSize.Menu)); + buttonStop = new Button (new ImageView (Ide.Gui.Stock.Stop, IconSize.Menu)); buttonStop.Clicked += new EventHandler (OnStopClicked); buttonStop.Sensitive = false; buttonStop.TooltipText = GettextCatalog.GetString ("Cancel running test"); @@ -122,12 +122,12 @@ namespace MonoDevelop.NUnit detailLabel = new HeaderLabel (); detailLabel.Padding = 6; - Button hb = new Button (new Gtk.Image ("gtk-close", IconSize.SmallToolbar)); + Button hb = new Button (new ImageView ("gtk-close", IconSize.SmallToolbar)); hb.Relief = ReliefStyle.None; hb.Clicked += new EventHandler (OnCloseDetails); header.PackEnd (hb, false, false, 0); - hb = new Button (new Gtk.Image ("gtk-go-back", IconSize.SmallToolbar)); + hb = new Button (new ImageView ("gtk-go-back", IconSize.SmallToolbar)); hb.Relief = ReliefStyle.None; hb.Clicked += new EventHandler (OnGoBackTest); header.PackEnd (hb, false, false, 0); diff --git a/main/src/addins/NUnit/Gui/TestResultsPad.cs b/main/src/addins/NUnit/Gui/TestResultsPad.cs index 5b5ede5252..ea2d7325d4 100644 --- a/main/src/addins/NUnit/Gui/TestResultsPad.cs +++ b/main/src/addins/NUnit/Gui/TestResultsPad.cs @@ -204,7 +204,7 @@ namespace MonoDevelop.NUnit buttonOutput = new ToggleButton (); buttonOutput.Label = GettextCatalog.GetString ("Output"); buttonOutput.Active = false; - buttonOutput.Image = ImageService.GetImage (MonoDevelop.Ide.Gui.Stock.OutputIcon, IconSize.Menu); + buttonOutput.Image = new ImageView (MonoDevelop.Ide.Gui.Stock.OutputIcon, IconSize.Menu); buttonOutput.Image.Show (); buttonOutput.Toggled += new EventHandler (OnShowOutputToggled); buttonOutput.TooltipText = GettextCatalog.GetString ("Show Output"); @@ -214,12 +214,12 @@ namespace MonoDevelop.NUnit buttonRun = new Button (); buttonRun.Label = GettextCatalog.GetString ("Rerun Tests"); - buttonRun.Image = new ImageView (ImageService.GetIcon ("nunit-run", IconSize.Menu)); + buttonRun.Image = new ImageView ("md-execute-all", IconSize.Menu); buttonRun.Image.Show (); buttonRun.Sensitive = false; toolbar.Add (buttonRun); - buttonStop = new Button (new Gtk.Image (Ide.Gui.Stock.Stop, Gtk.IconSize.Menu)); + buttonStop = new Button (new ImageView (Ide.Gui.Stock.Stop, Gtk.IconSize.Menu)); toolbar.Add (buttonStop); toolbar.ShowAll (); diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16.png Binary files differindex 1c0ac5a7c5..08156925bf 100644 --- a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16.png +++ b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16.png diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16@2x.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16@2x.png Binary files differindex 973f82c591..a626c128b9 100644 --- a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16@2x.png +++ b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark.png Binary files differnew file mode 100644 index 0000000000..c73c3e92fd --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark@2x.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..392713f95a --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark~sel.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..390f9d1e34 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark~sel.png diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark~sel@2x.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..0724d75161 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~dark~sel@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~sel.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~sel.png Binary files differnew file mode 100644 index 0000000000..390f9d1e34 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~sel.png diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~sel@2x.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..0724d75161 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/pad-unit-test-16~sel@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16.png Binary files differdeleted file mode 100644 index 4be65aa981..0000000000 --- a/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16.png +++ /dev/null diff --git a/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16@2x.png b/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16@2x.png Binary files differdeleted file mode 100644 index a4aa276ed3..0000000000 --- a/main/src/addins/NUnit/Gui/icons/pad-unit-test-results-16@2x.png +++ /dev/null diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32.png b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32.png Binary files differindex daa6d0d2a5..94cd21390d 100644 --- a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32.png +++ b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32.png diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32@2x.png b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32@2x.png Binary files differindex 664f413a7a..05e84865e9 100644 --- a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32@2x.png +++ b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark.png b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark.png Binary files differnew file mode 100644 index 0000000000..b67ac9d2e7 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark@2x.png b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0a0c74b70b --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark~sel.png b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..5de67db489 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark~sel.png diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark~sel@2x.png b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e5dde885d9 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~dark~sel@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~sel.png b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~sel.png Binary files differnew file mode 100644 index 0000000000..5de67db489 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~sel.png diff --git a/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~sel@2x.png b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e5dde885d9 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/project-nunit-overlay-32~sel@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-failed-16.png b/main/src/addins/NUnit/Gui/icons/unit-failed-16.png Binary files differindex ab1367642d..0b434fcc3a 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-failed-16.png +++ b/main/src/addins/NUnit/Gui/icons/unit-failed-16.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-failed-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-failed-16@2x.png Binary files differindex fc9fa4445b..652cf7c6dd 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-failed-16@2x.png +++ b/main/src/addins/NUnit/Gui/icons/unit-failed-16@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-failed-16~dark.png b/main/src/addins/NUnit/Gui/icons/unit-failed-16~dark.png Binary files differnew file mode 100644 index 0000000000..bfe3e1c59a --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-failed-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-failed-16~dark@2x.png b/main/src/addins/NUnit/Gui/icons/unit-failed-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..8c66142ce0 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-failed-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16.png b/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16.png Binary files differindex 0b58080a9b..e1767bea57 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16.png +++ b/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16@2x.png Binary files differindex 970c207555..7bfee6e8ef 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16@2x.png +++ b/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16~dark.png b/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16~dark.png Binary files differnew file mode 100644 index 0000000000..683d1ae1d7 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16~dark@2x.png b/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2dac729015 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-inconclusive-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-loading-16.png b/main/src/addins/NUnit/Gui/icons/unit-loading-16.png Binary files differindex 7863245aba..80adae4315 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-loading-16.png +++ b/main/src/addins/NUnit/Gui/icons/unit-loading-16.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-loading-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-loading-16@2x.png Binary files differindex 5c7b89a6b2..de27f28d8a 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-loading-16@2x.png +++ b/main/src/addins/NUnit/Gui/icons/unit-loading-16@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-loading-16~dark.png b/main/src/addins/NUnit/Gui/icons/unit-loading-16~dark.png Binary files differnew file mode 100644 index 0000000000..7506a641b1 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-loading-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-loading-16~dark@2x.png b/main/src/addins/NUnit/Gui/icons/unit-loading-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d4fb6f3aae --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-loading-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16.png b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16.png Binary files differindex ef419bb561..5d5d0b99f4 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16.png +++ b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16@2x.png Binary files differindex 03afb04a77..1a3a7be90e 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16@2x.png +++ b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16~dark.png b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16~dark.png Binary files differnew file mode 100644 index 0000000000..ea24dc5244 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16~dark@2x.png b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..19908b7a58 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-mixed-results-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16.png b/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16.png Binary files differindex 6c3109b84c..0918265bd5 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16.png +++ b/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16@2x.png Binary files differindex e9c6f0085d..f690bc4ca6 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16@2x.png +++ b/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16~dark.png b/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16~dark.png Binary files differnew file mode 100644 index 0000000000..9567eba24d --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16~dark@2x.png b/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7a72559000 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-not-yet-run-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-run-16.png b/main/src/addins/NUnit/Gui/icons/unit-run-16.png Binary files differdeleted file mode 100644 index 6f911a1600..0000000000 --- a/main/src/addins/NUnit/Gui/icons/unit-run-16.png +++ /dev/null diff --git a/main/src/addins/NUnit/Gui/icons/unit-run-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-run-16@2x.png Binary files differdeleted file mode 100644 index 59ea4fa20a..0000000000 --- a/main/src/addins/NUnit/Gui/icons/unit-run-16@2x.png +++ /dev/null diff --git a/main/src/addins/NUnit/Gui/icons/unit-running-16.png b/main/src/addins/NUnit/Gui/icons/unit-running-16.png Binary files differindex 587de48d85..3f26d8a8de 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-running-16.png +++ b/main/src/addins/NUnit/Gui/icons/unit-running-16.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-running-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-running-16@2x.png Binary files differindex e61f579a0c..483d39776f 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-running-16@2x.png +++ b/main/src/addins/NUnit/Gui/icons/unit-running-16@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-running-16~dark.png b/main/src/addins/NUnit/Gui/icons/unit-running-16~dark.png Binary files differnew file mode 100644 index 0000000000..4cf4973b3c --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-running-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-running-16~dark@2x.png b/main/src/addins/NUnit/Gui/icons/unit-running-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..507066be18 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-running-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-skipped-16.png b/main/src/addins/NUnit/Gui/icons/unit-skipped-16.png Binary files differindex 7b245ca9ee..486f84499f 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-skipped-16.png +++ b/main/src/addins/NUnit/Gui/icons/unit-skipped-16.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-skipped-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-skipped-16@2x.png Binary files differindex 12500e3c5c..7769944638 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-skipped-16@2x.png +++ b/main/src/addins/NUnit/Gui/icons/unit-skipped-16@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-skipped-16~dark.png b/main/src/addins/NUnit/Gui/icons/unit-skipped-16~dark.png Binary files differnew file mode 100644 index 0000000000..fad4fdf159 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-skipped-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-skipped-16~dark@2x.png b/main/src/addins/NUnit/Gui/icons/unit-skipped-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f0fcadf3fc --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-skipped-16~dark@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-success-16.png b/main/src/addins/NUnit/Gui/icons/unit-success-16.png Binary files differindex b167c97951..67dec0fab1 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-success-16.png +++ b/main/src/addins/NUnit/Gui/icons/unit-success-16.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-success-16@2x.png b/main/src/addins/NUnit/Gui/icons/unit-success-16@2x.png Binary files differindex 7abbc8ec46..fc3ce92d32 100644 --- a/main/src/addins/NUnit/Gui/icons/unit-success-16@2x.png +++ b/main/src/addins/NUnit/Gui/icons/unit-success-16@2x.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-success-16~dark.png b/main/src/addins/NUnit/Gui/icons/unit-success-16~dark.png Binary files differnew file mode 100644 index 0000000000..d8f17aaa61 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-success-16~dark.png diff --git a/main/src/addins/NUnit/Gui/icons/unit-success-16~dark@2x.png b/main/src/addins/NUnit/Gui/icons/unit-success-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..07673c4707 --- /dev/null +++ b/main/src/addins/NUnit/Gui/icons/unit-success-16~dark@2x.png diff --git a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj b/main/src/addins/NUnit/MonoDevelop.NUnit.csproj index 23f007f032..bb2c3bfeb2 100644 --- a/main/src/addins/NUnit/MonoDevelop.NUnit.csproj +++ b/main/src/addins/NUnit/MonoDevelop.NUnit.csproj @@ -130,33 +130,72 @@ <EmbeddedResource Include="Gui\icons\unit-running-16%402x.png"> <LogicalName>unit-running-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\unit-running-16~dark.png"> + <LogicalName>unit-running-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\unit-running-16~dark%402x.png"> + <LogicalName>unit-running-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="Gui\icons\unit-failed-16.png"> <LogicalName>unit-failed-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="Gui\icons\unit-failed-16%402x.png"> <LogicalName>unit-failed-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\unit-failed-16~dark.png"> + <LogicalName>unit-failed-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\unit-failed-16~dark%402x.png"> + <LogicalName>unit-failed-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="Gui\icons\unit-mixed-results-16.png"> <LogicalName>unit-mixed-results-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="Gui\icons\unit-mixed-results-16%402x.png"> <LogicalName>unit-mixed-results-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\unit-mixed-results-16~dark.png"> + <LogicalName>unit-mixed-results-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\unit-mixed-results-16~dark%402x.png"> + <LogicalName>unit-mixed-results-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="Gui\icons\unit-not-yet-run-16.png"> <LogicalName>unit-not-yet-run-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="Gui\icons\unit-not-yet-run-16%402x.png"> <LogicalName>unit-not-yet-run-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\unit-not-yet-run-16~dark.png"> + <LogicalName>unit-not-yet-run-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\unit-not-yet-run-16~dark%402x.png"> + <LogicalName>unit-not-yet-run-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="Gui\icons\unit-skipped-16.png"> <LogicalName>unit-skipped-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="Gui\icons\unit-skipped-16%402x.png"> <LogicalName>unit-skipped-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\unit-skipped-16~dark.png"> + <LogicalName>unit-skipped-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\unit-skipped-16~dark%402x.png"> + <LogicalName>unit-skipped-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="Gui\icons\unit-loading-16.png"> <LogicalName>unit-loading-16.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\unit-loading-16%402x.png"> + <LogicalName>unit-loading-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\unit-loading-16~dark.png"> + <LogicalName>unit-loading-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\unit-loading-16~dark%402x.png"> + <LogicalName>unit-loading-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="Gui\icons\unit-success-16.png"> <LogicalName>unit-success-16.png</LogicalName> </EmbeddedResource> @@ -178,6 +217,24 @@ <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32%402x.png"> <LogicalName>project-nunit-overlay-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32~dark.png"> + <LogicalName>project-nunit-overlay-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32~dark%402x.png"> + <LogicalName>project-nunit-overlay-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32~sel.png"> + <LogicalName>project-nunit-overlay-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32~sel%402x.png"> + <LogicalName>project-nunit-overlay-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32~dark~sel.png"> + <LogicalName>project-nunit-overlay-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\project-nunit-overlay-32~dark~sel%402x.png"> + <LogicalName>project-nunit-overlay-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="gtk-gui\gui.stetic"> <LogicalName>gui.stetic</LogicalName> </EmbeddedResource> @@ -187,11 +244,23 @@ <EmbeddedResource Include="Gui\icons\pad-unit-test-16%402x.png"> <LogicalName>pad-unit-test-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="Gui\icons\pad-unit-test-results-16.png"> - <LogicalName>pad-unit-test-results-16.png</LogicalName> + <EmbeddedResource Include="Gui\icons\pad-unit-test-16~dark.png"> + <LogicalName>pad-unit-test-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="Gui\icons\pad-unit-test-results-16%402x.png"> - <LogicalName>pad-unit-test-results-16@2x.png</LogicalName> + <EmbeddedResource Include="Gui\icons\pad-unit-test-16~dark%402x.png"> + <LogicalName>pad-unit-test-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\pad-unit-test-16~sel.png"> + <LogicalName>pad-unit-test-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\pad-unit-test-16~sel%402x.png"> + <LogicalName>pad-unit-test-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\pad-unit-test-16~dark~sel.png"> + <LogicalName>pad-unit-test-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Gui\icons\pad-unit-test-16~dark~sel%402x.png"> + <LogicalName>pad-unit-test-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="Gui\icons\unit-inconclusive-16.png"> <LogicalName>unit-inconclusive-16.png</LogicalName> @@ -199,11 +268,11 @@ <EmbeddedResource Include="Gui\icons\unit-inconclusive-16%402x.png"> <LogicalName>unit-inconclusive-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="Gui\icons\unit-run-16.png"> - <LogicalName>unit-run-16.png</LogicalName> + <EmbeddedResource Include="Gui\icons\unit-inconclusive-16~dark.png"> + <LogicalName>unit-inconclusive-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="Gui\icons\unit-run-16%402x.png"> - <LogicalName>unit-run-16@2x.png</LogicalName> + <EmbeddedResource Include="Gui\icons\unit-inconclusive-16~dark%402x.png"> + <LogicalName>unit-inconclusive-16~dark@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="templates\NUnitProjectVBNet.xpt.xml"> <LogicalName>NUnitProjectVBNet.xpt.xml</LogicalName> @@ -214,6 +283,12 @@ <EmbeddedResource Include="templates\images\nunit-library-project%402x.png"> <LogicalName>nunit-library-project@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="templates\images\nunit-library-project~dark.png"> + <LogicalName>nunit-library-project~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\nunit-library-project~dark%402x.png"> + <LogicalName>nunit-library-project~dark@2x.png</LogicalName> + </EmbeddedResource> </ItemGroup> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> diff --git a/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml b/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml index 4159bcd526..4419c66c67 100644 --- a/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml +++ b/main/src/addins/NUnit/MonoDevelopNUnit.addin.xml @@ -51,7 +51,7 @@ <PadOption id = "ShowTestCounters" _label = "Show Test Counters" defaultValue = "False" /> <NodeBuilder id = "TestNode" class = "MonoDevelop.NUnit.TestNodeBuilder"/> </SolutionPad> - <Pad id="MonoDevelop.NUnit.TestResultsPad" _label="Test Results" icon="nunit-results-pad-icon" class="MonoDevelop.NUnit.TestResultsPad" defaultPlacement = "Bottom" defaultLayout="UnitTesting" defaultStatus="AutoHide"/> + <Pad id="MonoDevelop.NUnit.TestResultsPad" _label="Test Results" icon="nunit-pad-icon" class="MonoDevelop.NUnit.TestResultsPad" defaultPlacement = "Bottom" defaultLayout="UnitTesting" defaultStatus="AutoHide"/> </Extension> <Extension path="/MonoDevelop/Ide/WorkbenchLayouts"> @@ -71,6 +71,7 @@ <Category _name = "NUnit" id = "NUnit"> <Command id = "MonoDevelop.NUnit.Commands.TestCommands.RunAllTests" _label = "Run Unit Tests" + icon = "md-run-unit-tests" _description="Runs all tests of the current selected project." shortcut="Control|T" defaultHandler="MonoDevelop.NUnit.Commands.RunAllTestsHandler"/> @@ -163,8 +164,6 @@ <Extension path = "/MonoDevelop/Core/StockIcons"> <StockIcon stockid = "nunit-pad-icon" resource = "pad-unit-test-16.png" size="Menu" /> - <StockIcon stockid = "nunit-results-pad-icon" resource = "pad-unit-test-results-16.png" size="Menu" /> - <StockIcon stockid = "nunit-run" resource = "unit-run-16.png" size="Menu" /> </Extension> <Extension path = "/MonoDevelop/ProjectModel/ProjectModelExtensions"> diff --git a/main/src/addins/NUnit/templates/images/nunit-library-project.png b/main/src/addins/NUnit/templates/images/nunit-library-project.png Binary files differindex 99f50eb029..c0e3797eaf 100644 --- a/main/src/addins/NUnit/templates/images/nunit-library-project.png +++ b/main/src/addins/NUnit/templates/images/nunit-library-project.png diff --git a/main/src/addins/NUnit/templates/images/nunit-library-project@2x.png b/main/src/addins/NUnit/templates/images/nunit-library-project@2x.png Binary files differindex 86fcbe0866..c995eb9128 100644 --- a/main/src/addins/NUnit/templates/images/nunit-library-project@2x.png +++ b/main/src/addins/NUnit/templates/images/nunit-library-project@2x.png diff --git a/main/src/addins/NUnit/templates/images/nunit-library-project~dark.png b/main/src/addins/NUnit/templates/images/nunit-library-project~dark.png Binary files differnew file mode 100644 index 0000000000..ed1a8d0d5a --- /dev/null +++ b/main/src/addins/NUnit/templates/images/nunit-library-project~dark.png diff --git a/main/src/addins/NUnit/templates/images/nunit-library-project~dark@2x.png b/main/src/addins/NUnit/templates/images/nunit-library-project~dark@2x.png Binary files differnew file mode 100644 index 0000000000..62ef7ff47e --- /dev/null +++ b/main/src/addins/NUnit/templates/images/nunit-library-project~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs index 1929c1fbad..80fb850069 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs @@ -124,7 +124,7 @@ namespace MonoDevelop.VersionControl.Git labelError.Show (); buttonOk.Sensitive = false; } else if (!Reference.IsValidName ("refs/" + entryName.Text)) { - labelError.Markup = "<span color='red'>" + GettextCatalog.GetString (@"A branch name can not: + labelError.Markup = "<span color='" + Ide.Gui.Styles.ErrorForegroundColor.ToHexString (false) + "'>" + GettextCatalog.GetString (@"A branch name can not: Start with '.' or end with '/' or '.lock' Contain a ' ', '..', '~', '^', ':', '\', '?', '['") + "</span>"; labelError.Show (); diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs index e058292500..2b34860e27 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs @@ -162,7 +162,7 @@ namespace MonoDevelop.VersionControl.Git { this.textView = textView; overflowTextTag = new Gtk.TextTag ("overflow"); - overflowTextTag.Foreground = "red"; + overflowTextTag.Foreground = Ide.Gui.Styles.ErrorForegroundColor.ToHexString (false); overflowTextTag.ForegroundSet = true; textView.Buffer.TagTable.Add (overflowTextTag); textView.Buffer.Changed += OnTextChanged; diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs index 2b340b8d09..67bfa64504 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs @@ -5,33 +5,59 @@ namespace MonoDevelop.VersionControl.Subversion.Gui internal partial class SslServerTrustDialog { private global::Gtk.HBox hbox1; + private global::Gtk.VBox vbox2; - private global::Gtk.Image image1; + + private global::MonoDevelop.Components.ImageView image1; + private global::Gtk.VBox vbox3; + private global::Gtk.Label label2; + private global::Gtk.Label labelReason; + private global::Gtk.HSeparator hseparator2; + private global::Gtk.Table table1; + private global::Gtk.Label label3; + private global::Gtk.Label label4; + private global::Gtk.Label label5; + private global::Gtk.Label label6; + private global::Gtk.Label label7; + private global::Gtk.Label label8; + private global::Gtk.Label labelFprint; + private global::Gtk.Label labelFrom; + private global::Gtk.Label labelHost; + private global::Gtk.Label labelIssuer; + private global::Gtk.Label labelRealm; + private global::Gtk.Label labelUntil; + private global::Gtk.HSeparator hseparator1; + private global::Gtk.Label label15; + private global::Gtk.RadioButton radioAccept; + private global::Gtk.RadioButton radioAcceptSession; + private global::Gtk.RadioButton radioNotAccept; + private global::Gtk.Button button98; - private global::Gtk.Button button104; + private global::Gtk.Button button104; + protected virtual void Build () { global::Stetic.Gui.Initialize (this); @@ -54,9 +80,10 @@ namespace MonoDevelop.VersionControl.Subversion.Gui this.vbox2 = new global::Gtk.VBox (); this.vbox2.Name = "vbox2"; // Container child vbox2.Gtk.Box+BoxChild - this.image1 = new global::Gtk.Image (); + this.image1 = new global::MonoDevelop.Components.ImageView (); this.image1.Name = "image1"; - this.image1.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-warning", global::Gtk.IconSize.Dialog); + this.image1.IconId = "gtk-dialog-warning"; + this.image1.IconSize = ((global::Gtk.IconSize)(6)); this.vbox2.Add (this.image1); global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.image1])); w2.Position = 0; diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs index 75697d1663..b453919401 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs @@ -14,44 +14,6 @@ namespace Stetic }
}
- internal class IconLoader
- {
- public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
- {
- Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
- if ((res != null)) {
- return res;
- } else {
- int sz;
- int sy;
- global::Gtk.Icon.SizeLookup (size, out sz, out sy);
- try {
- return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
- } catch (System.Exception) {
- if ((name != "gtk-missing-image")) {
- return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
- } else {
- Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
- Gdk.GC gc = new Gdk.GC (pmap);
- gc.RgbFgColor = new Gdk.Color (255, 255, 255);
- pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
- gc.RgbFgColor = new Gdk.Color (0, 0, 0);
- pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
- gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
- gc.RgbFgColor = new Gdk.Color (255, 0, 0);
- pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1)
- - (sz / 4)), ((sz - 1)
- - (sz / 4)));
- pmap.DrawLine (gc, ((sz - 1)
- - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1)
- - (sz / 4)));
- return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
- }
- }
- }
- }
- }
-
internal class ActionGroups
{
public static Gtk.ActionGroup GetActionGroup (System.Type type)
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic index ae41c2e8f3..8d0ac6267e 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic @@ -244,9 +244,10 @@ <widget class="Gtk.VBox" id="vbox2"> <property name="MemberName" /> <child> - <widget class="Gtk.Image" id="image1"> + <widget class="MonoDevelop.Components.ImageView" id="image1"> <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-dialog-warning Dialog</property> + <property name="IconId">gtk-dialog-warning</property> + <property name="IconSize">Dialog</property> </widget> <packing> <property name="Position">0</property> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs index 4d4e886c36..a34f3e7fd7 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs @@ -33,8 +33,10 @@ using Mono.TextEditor; using MonoDevelop.Ide; using System.Threading; using MonoDevelop.Core; +using MonoDevelop.Components; using MonoDevelop.Components.Commands; using MonoDevelop.Components; +using MonoDevelop.Ide.Fonts; namespace MonoDevelop.VersionControl.Views { @@ -290,7 +292,6 @@ namespace MonoDevelop.VersionControl.Views double startY = Editor.LineToY (startLine); double curY = startY - Editor.VAdjustment.Value; int line = startLine; - var color = Style.Dark (State); while (curY < editor.Allocation.Bottom && line <= editor.LineCount) { Annotation ann = line <= overview.annotations.Count ? overview.annotations[line - 1] : null; @@ -305,10 +306,7 @@ namespace MonoDevelop.VersionControl.Views if (ann != null && overview.highlightAnnotation.Revision == ann.Revision && curStart <= overview.highlightPositon && overview.highlightPositon < curY) { } else { cr.Rectangle (Editor.TextViewMargin.XOffset, curStart + cr.LineWidth, Editor.Allocation.Width - Editor.TextViewMargin.XOffset, curY - curStart - cr.LineWidth); - cr.SetSourceRGBA (color.Red / (double)ushort.MaxValue, - color.Green / (double)ushort.MaxValue, - color.Blue / (double)ushort.MaxValue, - 0.1); + cr.SetSourceColor (Styles.BlameView.RangeHazeColor.ToCairoColor ()); cr.Fill (); } @@ -317,10 +315,7 @@ namespace MonoDevelop.VersionControl.Views cr.MoveTo (Editor.TextViewMargin.XOffset, curY + 0.5); cr.LineTo (Editor.Allocation.Width, curY + 0.5); - cr.SetSourceRGBA (color.Red / (double)ushort.MaxValue, - color.Green / (double)ushort.MaxValue, - color.Blue / (double)ushort.MaxValue, - 0.2); + cr.SetSourceColor (Styles.BlameView.RangeSplitterColor.ToCairoColor ()); cr.Stroke (); } } @@ -382,8 +377,7 @@ namespace MonoDevelop.VersionControl.Views public void OptionsChanged () { - var description = Pango.FontDescription.FromString ("Tahoma " + (int)(10 * widget.Editor.Options.Zoom)); - layout.FontDescription = description; + layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); UpdateWidth (); } @@ -677,7 +671,7 @@ namespace MonoDevelop.VersionControl.Views cr.LineWidth = Math.Max (1.0, widget.Editor.Options.Zoom); cr.Rectangle (leftSpacer, 0, Allocation.Width, Allocation.Height); - cr.SetSourceRGB (0.95, 0.95, 0.95); + cr.SetSourceColor (Styles.BlameView.AnnotationBackgroundColor.ToCairoColor ()); cr.Fill (); int startLine = widget.Editor.YToLine ((int)widget.Editor.VAdjustment.Value); @@ -703,7 +697,7 @@ namespace MonoDevelop.VersionControl.Views double nextY = widget.editor.LineToY (line) - widget.editor.VAdjustment.Value; if (highlightAnnotation != null && highlightAnnotation.Revision == ann.Revision && curStart <= highlightPositon && highlightPositon < nextY) { cr.Rectangle (leftSpacer, curStart + cr.LineWidth, Allocation.Width - leftSpacer, nextY - curStart - cr.LineWidth); - cr.SetSourceRGB (1, 1, 1); + cr.SetSourceColor (Styles.BlameView.AnnotationHighlightColor.ToCairoColor ()); cr.Fill (); } @@ -711,21 +705,26 @@ namespace MonoDevelop.VersionControl.Views layout.SetText ("88888888"); layout.GetPixelSize (out revisionWidth, out h); layout.SetText (TruncRevision (ann.Text)); - e.Window.DrawLayout (Style.BlackGC, Allocation.Width - revisionWidth - margin, (int)(curY + (widget.Editor.LineHeight - h) / 2), layout); const int dateRevisionSpacing = 16; - if (ann.HasDate) { - string dateTime = ann.Date.ToShortDateString (); - // use a fixed size date to get a approx. date width - layout.SetText (new DateTime (1999, 10, 10).ToShortDateString ()); - layout.GetPixelSize (out dateWidth, out h); - layout.SetText (dateTime); - e.Window.DrawLayout (Style.BlackGC, Allocation.Width - revisionWidth - margin - revisionWidth - dateRevisionSpacing, (int)(curY + (widget.Editor.LineHeight - h) / 2), layout); + + using (var gc = new Gdk.GC (e.Window)) { + gc.RgbFgColor = Styles.BlameView.AnnotationTextColor.ToGdkColor (); + e.Window.DrawLayout (gc, Allocation.Width - revisionWidth - margin, (int)(curY + (widget.Editor.LineHeight - h) / 2), layout); + + if (ann.HasDate) { + string dateTime = ann.Date.ToShortDateString (); + // use a fixed size date to get a approx. date width + layout.SetText (new DateTime (1999, 10, 10).ToShortDateString ()); + layout.GetPixelSize (out dateWidth, out h); + layout.SetText (dateTime); + + e.Window.DrawLayout (gc, Allocation.Width - revisionWidth - margin - revisionWidth - dateRevisionSpacing, (int)(curY + (widget.Editor.LineHeight - h) / 2), layout); + } } using (var authorLayout = MonoDevelop.Components.PangoUtil.CreateLayout (this)) { - var description = Pango.FontDescription.FromString ("Tahoma " + (int)(10 * widget.Editor.Options.Zoom)); - authorLayout.FontDescription = description; + authorLayout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); authorLayout.SetText (ann.Author); authorLayout.GetPixelSize (out authorWidth, out h); @@ -741,7 +740,7 @@ namespace MonoDevelop.VersionControl.Views cr.Rectangle (0, 0, maxWidth, Allocation.Height); cr.Clip (); cr.Translate (leftSpacer + margin, (int)(curY + (widget.Editor.LineHeight - h) / 2)); - cr.SetSourceRGB (0, 0, 0); + cr.SetSourceColor (Styles.BlameView.AnnotationTextColor.ToCairoColor ()); cr.ShowLayout (authorLayout); cr.ResetClip (); cr.Restore (); @@ -762,7 +761,7 @@ namespace MonoDevelop.VersionControl.Views layout.SetText (msg); layout.Width = (int)(Allocation.Width * Pango.Scale.PangoScale); using (var gc = new Gdk.GC (e.Window)) { - gc.RgbFgColor = Style.Dark (State); + gc.RgbFgColor = Styles.BlameView.AnnotationSummaryTextColor.ToGdkColor (); gc.ClipRectangle = new Rectangle (0, (int)curStart, Allocation.Width, (int)(curY - curStart)); e.Window.DrawLayout (gc, (int)(leftSpacer + margin), (int)(curStart + h), layout); } @@ -779,19 +778,19 @@ namespace MonoDevelop.VersionControl.Views } else { a = 1; } - HslColor color = new Cairo.Color (0.90, 0.90, 1); - color.L = 0.4 + a / 2; - color.S = 1 - a / 2; - cr.SetSourceColor (color); + var color = Styles.BlameView.AnnotationMarkColor; + color.Light = 0.4 + a / 2; + color.Saturation = 1 - a / 2; + cr.SetSourceColor (color.ToCairoColor ()); } else { - cr.SetSourceColor (ann != null ? new Cairo.Color (1, 1, 0) : new Cairo.Color (0.95, 0.95, 0.95)); + cr.SetSourceColor ((ann != null ? Styles.BlameView.AnnotationMarkModifiedColor : Styles.BlameView.AnnotationBackgroundColor).ToCairoColor ()); } cr.Fill (); if (ann != null) { cr.MoveTo (0, curY + 0.5); cr.LineTo (Allocation.Width, curY + 0.5); - cr.SetSourceRGB (0.6, 0.6, 0.6); + cr.SetSourceColor (Styles.BlameView.AnnotationSplitterColor.ToCairoColor ()); cr.Stroke (); } } diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs index 94eb7a2fab..188d7864aa 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs @@ -22,11 +22,6 @@ namespace MonoDevelop.VersionControl.Views TreePath path; int RightPadding = 4; -// Gdk.Color baseAddColor = new Gdk.Color (133, 168, 133); -// Gdk.Color baseRemoveColor = new Gdk.Color (178, 140, 140); - Gdk.Color baseAddColor = new Gdk.Color (123, 200, 123).AddLight (0.1); - Gdk.Color baseRemoveColor = new Gdk.Color (200, 140, 140).AddLight (0.1); - int RoundedSectionRadius = 4; int LeftPaddingBlock = 19; @@ -143,10 +138,10 @@ namespace MonoDevelop.VersionControl.Views Gdk.GC normalGC = widget.Style.TextGC (StateType.Normal); Gdk.GC removedGC = new Gdk.GC (window); removedGC.Copy (normalGC); - removedGC.RgbFgColor = baseRemoveColor.AddLight (-0.3); + removedGC.RgbFgColor = Styles.LogView.DiffRemoveBackgroundColor.AddLight (-0.3).ToGdkColor (); Gdk.GC addedGC = new Gdk.GC (window); addedGC.Copy (normalGC); - addedGC.RgbFgColor = baseAddColor.AddLight (-0.3); + addedGC.RgbFgColor = Styles.LogView.DiffAddBackgroundColor.AddLight (-0.3).ToGdkColor (); Gdk.GC infoGC = new Gdk.GC (window); infoGC.Copy (normalGC); infoGC.RgbFgColor = widget.Style.Text (StateType.Normal).AddLight (0.2); @@ -266,11 +261,11 @@ namespace MonoDevelop.VersionControl.Views double xrow = cell_area.X + LeftPaddingBlock; int wrow = cell_area.Width - 1 - LeftPaddingBlock; if (block.Type == BlockType.Added) - ctx.SetSourceColor (baseAddColor.AddLight (0.1).ToCairoColor ()); + ctx.SetSourceColor (Styles.LogView.DiffAddBackgroundColor.AddLight (0.1).ToCairoColor ()); else if (block.Type == BlockType.Removed) - ctx.SetSourceColor (baseRemoveColor.AddLight (0.1).ToCairoColor ()); + ctx.SetSourceColor (Styles.LogView.DiffRemoveBackgroundColor.AddLight (0.1).ToCairoColor ()); else { - ctx.SetSourceColor (widget.Style.Base (Gtk.StateType.Prelight).AddLight (0.1).ToCairoColor ()); + ctx.SetSourceColor (Styles.LogView.DiffHighlightColor.ToCairoColor ()); xrow -= LeftPaddingBlock; wrow += LeftPaddingBlock; } @@ -298,7 +293,7 @@ namespace MonoDevelop.VersionControl.Views // Finally draw the change symbol at the left margin - DrawChangeSymbol (ctx, cell_area.X + 1, cell_area.Width - 2, block); + DrawChangeSymbol (ctx, widget, cell_area.X + 1, cell_area.Width - 2, block); } // Finish the drawing of the code segment @@ -353,16 +348,16 @@ namespace MonoDevelop.VersionControl.Views int bottomSpacing = (lineHeight - spacing) / 2; ctx.Rectangle (x + shadowSize + 0.5, firstBlock.YStart + bottomSpacing + spacing - shadowSize + 0.5, width - shadowSize*2, shadowSize); - ctx.SetSourceRGB (0.9, 0.9, 0.9); + ctx.SetSourceColor (Styles.LogView.DiffBoxSplitterColor.ToCairoColor ()); ctx.LineWidth = 1; ctx.Fill (); ctx.Rectangle (x + shadowSize + 0.5, lastBlock.YEnd + bottomSpacing + 0.5, width - shadowSize*2, shadowSize); - ctx.SetSourceRGB (0.9, 0.9, 0.9); + ctx.SetSourceColor (Styles.LogView.DiffBoxSplitterColor.ToCairoColor ()); ctx.Fill (); ctx.Rectangle (x + 0.5, firstBlock.YStart + bottomSpacing + spacing + 0.5, width, lastBlock.YEnd - firstBlock.YStart - spacing); - ctx.SetSourceRGB (0.7,0.7,0.7); + ctx.SetSourceColor (Styles.LogView.DiffBoxBorderColor.ToCairoColor ()); ctx.Stroke (); string text = lines[firstBlock.FirstLine].Replace ("@","").Replace ("-",""); @@ -380,7 +375,7 @@ namespace MonoDevelop.VersionControl.Views ctx.LineWidth = 1; ctx.SetSourceColor (widget.Style.Base (StateType.Normal).ToCairoColor ()); ctx.FillPreserve (); - ctx.SetSourceRGB (0.7, 0.7, 0.7); + ctx.SetSourceColor (Styles.LogView.DiffBoxBorderColor.ToCairoColor ()); ctx.Stroke (); window.DrawLayout (gc, (int)(x + 2 + LeftPaddingBlock), firstBlock.YStart + dy, layout); @@ -400,7 +395,7 @@ namespace MonoDevelop.VersionControl.Views ctx.LineWidth = 1; ctx.SetSourceColor (widget.Style.Base (Gtk.StateType.Normal).ToCairoColor ()); ctx.FillPreserve (); - ctx.SetSourceRGB (0.7, 0.7, 0.7); + ctx.SetSourceColor (Styles.LogView.DiffBoxBorderColor.ToCairoColor ()); ctx.Stroke (); window.DrawLayout (gc, right - tw - 1, top + dy, layout); @@ -411,7 +406,7 @@ namespace MonoDevelop.VersionControl.Views if (!IsChangeBlock (block.Type)) return; - Gdk.Color color = block.Type == BlockType.Added ? baseAddColor : baseRemoveColor; + var color = block.Type == BlockType.Added ? Styles.LogView.DiffAddBackgroundColor : Styles.LogView.DiffRemoveBackgroundColor; double y = block.YStart; int height = block.YEnd - block.YStart; @@ -441,6 +436,8 @@ namespace MonoDevelop.VersionControl.Views ctx.Fill (); ctx.Rectangle (markerx, y, width - markerx, height); + + // FIXME: VV: Remove gradient features using (Cairo.Gradient pat = new Cairo.LinearGradient (x, y, x + width, y)) { pat.AddColorStop (0, color.AddLight (0.21).ToCairoColor ()); pat.AddColorStop (1, color.AddLight (0.3).ToCairoColor ()); @@ -448,55 +445,24 @@ namespace MonoDevelop.VersionControl.Views ctx.Fill (); } } + + static Xwt.Drawing.Image gutterAdded = Xwt.Drawing.Image.FromResource ("gutter-added-15.png"); + static Xwt.Drawing.Image gutterRemoved = Xwt.Drawing.Image.FromResource ("gutter-removed-15.png"); - void DrawChangeSymbol (Cairo.Context ctx, double x, int width, BlockInfo block) + void DrawChangeSymbol (Cairo.Context ctx, Widget widget, double x, int width, BlockInfo block) { if (!IsChangeBlock (block.Type)) return; - - Gdk.Color color = block.Type == BlockType.Added ? baseAddColor : baseRemoveColor; - - int ssize = 8; - int barSize = 3; - - if (ssize - 2 > lineHeight) - ssize = lineHeight - 2; - if (ssize <= 0) - return; - double inSize = (ssize / 2) - (barSize / 2); - double py = block.YStart + ((block.YEnd - block.YStart) / 2 - ssize / 2) + 0.5; - double px = x + (LeftPaddingBlock/2) - (ssize / 2) + 0.5; - if (block.Type == BlockType.Added) { - ctx.MoveTo (px + inSize, py); - ctx.RelLineTo (barSize, 0); - ctx.RelLineTo (0, inSize); - ctx.RelLineTo (inSize, 0); - ctx.RelLineTo (0, barSize); - ctx.RelLineTo (-inSize, 0); - ctx.RelLineTo (0, inSize); - ctx.RelLineTo (-barSize, 0); - ctx.RelLineTo (0, -inSize); - ctx.RelLineTo (-inSize, 0); - ctx.RelLineTo (0, -barSize); - ctx.RelLineTo (inSize, 0); - ctx.RelLineTo (0, -inSize); - ctx.ClosePath (); + var ix = x + (LeftPaddingBlock/2) - (gutterAdded.Width / 2); + var iy = block.YStart + ((block.YEnd - block.YStart) / 2 - gutterAdded.Height / 2); + ctx.DrawImage (widget, gutterAdded, ix, iy); } else { - ctx.MoveTo (px, py + inSize); - ctx.RelLineTo (ssize, 0); - ctx.RelLineTo (0, barSize); - ctx.RelLineTo (-ssize, 0); - ctx.RelLineTo (0, -barSize); - ctx.ClosePath (); + var ix = x + (LeftPaddingBlock/2) - (gutterRemoved.Width / 2); + var iy = block.YStart + ((block.YEnd - block.YStart) / 2 - gutterRemoved.Height / 2); + ctx.DrawImage (widget, gutterRemoved, ix, iy); } - - ctx.SetSourceColor (color.ToCairoColor ()); - ctx.FillPreserve (); - ctx.SetSourceColor (color.AddLight (-0.2).ToCairoColor ()); - ctx.LineWidth = 1; - ctx.Stroke (); } public override void GetSize (Widget widget, ref Rectangle cell_area, out int x_offset, out int y_offset, out int c_width, out int c_height) diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs index d519772c24..2b79bee464 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs @@ -29,7 +29,6 @@ using System.Collections.Generic; using MonoDevelop.Components; using MonoDevelop.Core; using MonoDevelop.Ide.Gui.Content; -using MonoDevelop.Components; namespace MonoDevelop.VersionControl.Views { 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 02f7428ab0..61de8f1d70 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 @@ -34,6 +34,7 @@ using Mono.TextEditor; using Mono.TextEditor.Utils; using MonoDevelop.Ide; using MonoDevelop.Core; +using MonoDevelop.Components; using MonoDevelop.Components.Commands; using MonoDevelop.Projects.Text; using MonoDevelop.Components; @@ -76,15 +77,6 @@ namespace MonoDevelop.VersionControl.Views OnDiffChanged (EventArgs.Empty); } } - - static readonly Cairo.Color lightRed = new Cairo.Color (255 / 255.0, 200 / 255.0, 200 / 255.0); - static readonly Cairo.Color darkRed = new Cairo.Color (178 / 255.0, 140 / 255.0, 140 / 255.0); - - static readonly Cairo.Color lightGreen = new Cairo.Color (190 / 255.0, 240 / 255.0, 190 / 255.0); - static readonly Cairo.Color darkGreen = new Cairo.Color (133 / 255.0, 168 / 255.0, 133 / 255.0); - - static readonly Cairo.Color lightBlue = new Cairo.Color (190 / 255.0, 190 / 255.0, 240 / 255.0); - static readonly Cairo.Color darkBlue = new Cairo.Color (133 / 255.0, 133 / 255.0, 168 / 255.0); protected internal abstract MonoTextEditor MainEditor { get; @@ -528,26 +520,26 @@ namespace MonoDevelop.VersionControl.Views children.ForEach (child => child.Child.SizeRequest ()); } - public static Cairo.Color GetColor (Hunk hunk, bool removeSide, bool dark, double alpha) + public static Cairo.Color GetColor (Hunk hunk, bool removeSide, bool border, double alpha) { - Cairo.Color result; + Xwt.Drawing.Color result; if (hunk.Removed > 0 && hunk.Inserted > 0) { - result = dark ? darkBlue : lightBlue; + result = border ? Styles.DiffView.MergeBackgroundColor : Styles.DiffView.MergeBorderColor; } else if (removeSide) { if (hunk.Removed > 0) { - result = dark ? darkRed : lightRed; + result = border ? Styles.DiffView.RemoveBackgroundColor : Styles.DiffView.RemoveBorderColor; } else { - result = dark ? darkGreen : lightGreen; + result = border ? Styles.DiffView.AddBackgroundColor : Styles.DiffView.AddBorderColor; } } else { if (hunk.Inserted > 0) { - result = dark ? darkGreen : lightGreen; + result = border ? Styles.DiffView.AddBackgroundColor : Styles.DiffView.AddBorderColor; } else { - result = dark ? darkRed : lightRed; + result = border ? Styles.DiffView.RemoveBackgroundColor : Styles.DiffView.RemoveBorderColor; } } - result.A = alpha; - return result; + result.Alpha = alpha; + return result.ToCairoColor (); } void PaintEditorOverlay (TextArea editor, PaintEventArgs args, List<Hunk> diff, bool paintRemoveSide) @@ -910,7 +902,7 @@ namespace MonoDevelop.VersionControl.Views cr.SetSourceColor ((MonoDevelop.Components.HslColor)Style.Dark (StateType.Normal)); cr.Stroke (); cr.LineWidth = 1; - cr.SetSourceRGB (0, 0, 0); + cr.SetSourceColor (MonoDevelop.Ide.Gui.Styles.BaseForegroundColor.ToCairoColor ()); if (drawArrow) { DrawArrow (cr, x + w / 1.5, y + h / 2); DrawArrow (cr, x + w / 2.5, y + h / 2); @@ -1054,6 +1046,8 @@ namespace MonoDevelop.VersionControl.Views void FillGradient (Cairo.Context cr, double y, double h) { cr.Rectangle (0.5, y, Allocation.Width, h); + + // FIXME: VV: Remove gradient features using (var grad = new Cairo.LinearGradient (0, y, Allocation.Width, y)) { var col = (HslColor)Style.Base (StateType.Normal); col.L *= 0.95; @@ -1077,11 +1071,9 @@ namespace MonoDevelop.VersionControl.Views h, barWidth / 2); - var color = (HslColor)Style.Mid (StateType.Normal); - color.L = 0.5; - var c = (Cairo.Color)color; - c.A = 0.6; - cr.SetSourceColor (c); + var color = Ide.Gui.Styles.BaseBackgroundColor; + color.Light = 0.5; + cr.SetSourceColor (color.WithAlpha (0.6).ToCairoColor ()); cr.Fill (); } diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs index 1098b971f6..4155eaf924 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs @@ -32,6 +32,7 @@ using MonoDevelop.Ide; using System.Text; using System.Threading; using MonoDevelop.Components; +using Mono.TextEditor; namespace MonoDevelop.VersionControl.Views { @@ -91,7 +92,21 @@ namespace MonoDevelop.VersionControl.Views double center_x = cell_area.X + Math.Round ((double) (cell_area.Width / 2d)); double center_y = cell_area.Y + Math.Round ((double) (cell_area.Height / 2d)); cr.Arc (center_x, center_y, 5, 0, 2 * Math.PI); - cr.SetSourceRGBA (0, 0, 0, 1); + var state = StateType.Normal; + if (!base.Sensitive) + state = StateType.Insensitive; + else if (flags.HasFlag (CellRendererState.Selected)) { + if (widget.HasFocus) + state = StateType.Selected; + else + state = StateType.Active; + } + else if (flags.HasFlag (CellRendererState.Prelit)) + state = StateType.Prelight; + else if (widget.State == StateType.Insensitive) + state = StateType.Insensitive; + + cr.SetSourceColor (widget.Style.Text (state).ToCairoColor ()); cr.Stroke (); if (!FirstNode) { cr.MoveTo (center_x, cell_area.Y - 2); @@ -237,16 +252,29 @@ namespace MonoDevelop.VersionControl.Views tb.UseChildBackgroundColor = true; tb.Add (scrolledwindow1); vbox2.PackStart (tb, true, true, 0); + + UpdateStyle (); + Ide.Gui.Styles.Changed += HandleStylesChanged; } protected override void OnRealized () { base.OnRealized (); + UpdateStyle (); + } + + void HandleStylesChanged (object sender, EventArgs e) + { + UpdateStyle (); + } + + void UpdateStyle () + { var c = Style.Base (StateType.Normal).ToXwtColor (); c.Light *= 0.8; commitBox.ModifyBg (StateType.Normal, c.ToGdkColor ()); - var tcol = new Gdk.Color (255, 251, 242); + var tcol = Styles.LogView.CommitDescBackgroundColor.ToGdkColor (); textviewDetails.ModifyBase (StateType.Normal, tcol); scrolledwindow1.ModifyBase (StateType.Normal, tcol); } @@ -462,6 +490,7 @@ namespace MonoDevelop.VersionControl.Views revertButton.Clicked -= RevertRevisionClicked; revertToButton.Clicked -= RevertToRevisionClicked; refreshButton.Clicked -= RefreshClicked; + Ide.Gui.Styles.Changed -= HandleStylesChanged; logstore.Dispose (); changedpathstore.Dispose (); diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Styles.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Styles.cs new file mode 100644 index 0000000000..96f143d152 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/Styles.cs @@ -0,0 +1,141 @@ +// +// Styles.cs +// +// Author: +// Vsevolod Kukol <sevo@xamarin.com> +// +// Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using MonoDevelop.Ide; +using MonoDevelop.Components; +using Xwt.Drawing; + +namespace MonoDevelop.VersionControl +{ + public static class Styles + { + public static BlameViewStyle BlameView { get; internal set; } + public static LogViewStyle LogView { get; internal set; } + public static DiffViewStyle DiffView { get; internal set; } + + public class BlameViewStyle + { + public Color AnnotationBackgroundColor { get; internal set; } + public Color AnnotationHighlightColor { get; internal set; } + public Color AnnotationTextColor { get; internal set; } + public Color AnnotationSummaryTextColor { get; internal set; } + public Color AnnotationSplitterColor { get; internal set; } + public Color AnnotationMarkColor { get; internal set; } + public Color AnnotationMarkModifiedColor { get; internal set; } + public Color RangeSplitterColor { get; internal set; } + public Color RangeHazeColor { get; internal set; } + } + + public class LogViewStyle + { + public Color CommitDescBackgroundColor { get; internal set; } + public Color DiffAddBackgroundColor { get; internal set; } + public Color DiffRemoveBackgroundColor { get; internal set; } + public Color DiffHighlightColor { get; internal set; } + public Color DiffBoxBorderColor { get; internal set; } + public Color DiffBoxSplitterColor { get; internal set; } + } + + public class DiffViewStyle + { + public Color AddBorderColor { get; internal set; } + public Color AddBackgroundColor { get; internal set; } + public Color RemoveBorderColor { get; internal set; } + public Color RemoveBackgroundColor { get; internal set; } + public Color MergeBorderColor { get; internal set; } + public Color MergeBackgroundColor { get; internal set; } + } + + static Styles () + { + LoadStyles (); + MonoDevelop.Ide.Gui.Styles.Changed += (o, e) => LoadStyles (); + } + + public static void LoadStyles () + { + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) { + BlameView = new BlameViewStyle { + AnnotationMarkColor = Color.FromName ("#e5f1ff"), + AnnotationMarkModifiedColor = Color.FromName ("#ffff00"), + RangeHazeColor = Color.FromName ("#ababab").WithAlpha (.1), + RangeSplitterColor = Color.FromName ("#ababab").WithAlpha (.2), + }; + + LogView = new LogViewStyle { + DiffAddBackgroundColor = Color.FromName ("#7bc87b").AddLight (0.1), + DiffRemoveBackgroundColor = Color.FromName ("#c88c8c").AddLight (0.1), + DiffHighlightColor = Color.FromName ("#000000").WithAlpha (0.05), + DiffBoxBorderColor = Color.FromName ("#eaeaea"), + }; + + DiffView = new DiffViewStyle { + AddBackgroundColor = Color.FromName ("#85a885"), + AddBorderColor = Color.FromName ("#85a885"), + RemoveBackgroundColor = Color.FromName ("#b28c8c"), + RemoveBorderColor = Color.FromName ("#b28c8c"), + MergeBackgroundColor = Color.FromName ("#8585a8"), + MergeBorderColor = Color.FromName ("#8585a8"), + }; + } else { + BlameView = new BlameViewStyle { + AnnotationMarkColor = Color.FromName ("#e5f1ff"), + AnnotationMarkModifiedColor = Color.FromName ("#ffff00"), + RangeHazeColor = Color.FromName ("#111111").WithAlpha (.4), + RangeSplitterColor = Color.FromName ("#5b5f68").WithAlpha (.6), + }; + + LogView = new LogViewStyle () { + DiffAddBackgroundColor = Color.FromName ("#7bc87b").AddLight (-0.1), + DiffRemoveBackgroundColor = Color.FromName ("#c88c8c").AddLight (-0.1), + DiffHighlightColor = MonoDevelop.Ide.Gui.Styles.BackgroundColor.AddLight (0.1), + DiffBoxBorderColor = Color.FromName ("#4c4c4c"), + }; + + DiffView = new DiffViewStyle { + AddBackgroundColor = Color.FromName ("#85a885"), + AddBorderColor = Color.FromName ("#bef0be"), + RemoveBackgroundColor = Color.FromName ("#b28c8c"), + RemoveBorderColor = Color.FromName ("#ffffc8"), + MergeBackgroundColor = Color.FromName ("#8585a8"), + MergeBorderColor = Color.FromName ("#bebef0"), + }; + } + + // Shared + + BlameView.AnnotationTextColor = MonoDevelop.Ide.Gui.Styles.BaseForegroundColor; + BlameView.AnnotationHighlightColor = MonoDevelop.Ide.Gui.Styles.SecondaryBackgroundLighterColor; + BlameView.AnnotationBackgroundColor = MonoDevelop.Ide.Gui.Styles.SecondaryBackgroundDarkerColor; + BlameView.AnnotationSplitterColor = MonoDevelop.Ide.Gui.Styles.SeparatorColor; + BlameView.AnnotationSummaryTextColor = MonoDevelop.Ide.Gui.Styles.DimTextColor; + + LogView.CommitDescBackgroundColor = MonoDevelop.Ide.Gui.Styles.SecondaryBackgroundDarkerColor; + LogView.DiffBoxSplitterColor = MonoDevelop.Ide.Gui.Styles.PrimaryBackgroundColor; + } + } +} + diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj index 4078f84dca..b05cbdaa07 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj @@ -132,24 +132,48 @@ <EmbeddedResource Include="icons\added-overlay-16%402x.png"> <LogicalName>added-overlay-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\added-overlay-16~dark.png"> + <LogicalName>added-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\added-overlay-16~dark%402x.png"> + <LogicalName>added-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\modified-overlay-16.png"> <LogicalName>modified-overlay-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\modified-overlay-16%402x.png"> <LogicalName>modified-overlay-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\modified-overlay-16~dark.png"> + <LogicalName>modified-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\modified-overlay-16~dark%402x.png"> + <LogicalName>modified-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\conflict-overlay-16.png"> <LogicalName>conflict-overlay-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\conflict-overlay-16%402x.png"> <LogicalName>conflict-overlay-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\conflict-overlay-16~dark.png"> + <LogicalName>conflict-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\conflict-overlay-16~dark%402x.png"> + <LogicalName>conflict-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\locked-overlay-16.png"> <LogicalName>locked-overlay-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\locked-overlay-16%402x.png"> <LogicalName>locked-overlay-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\locked-overlay-16~dark.png"> + <LogicalName>locked-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\locked-overlay-16~dark%402x.png"> + <LogicalName>locked-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="VersionControl.addin.xml"> <LogicalName>VersionControl.addin.xml</LogicalName> </EmbeddedResource> @@ -159,48 +183,96 @@ <EmbeddedResource Include="icons\removed-overlay-16%402x.png"> <LogicalName>removed-overlay-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\removed-overlay-16~dark.png"> + <LogicalName>removed-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\removed-overlay-16~dark%402x.png"> + <LogicalName>removed-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\renamed-overlay-16.png"> <LogicalName>renamed-overlay-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\renamed-overlay-16%402x.png"> <LogicalName>renamed-overlay-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\renamed-overlay-16~dark.png"> + <LogicalName>renamed-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\renamed-overlay-16~dark%402x.png"> + <LogicalName>renamed-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\ignored-overlay-16.png"> <LogicalName>ignored-overlay-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\ignored-overlay-16%402x.png"> <LogicalName>ignored-overlay-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\ignored-overlay-16~dark.png"> + <LogicalName>ignored-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\ignored-overlay-16~dark%402x.png"> + <LogicalName>ignored-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\repository-16.png"> <LogicalName>repository-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\repository-16%402x.png"> <LogicalName>repository-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\repository-16~dark.png"> + <LogicalName>repository-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\repository-16~dark%402x.png"> + <LogicalName>repository-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\versioned-overlay-16.png"> <LogicalName>versioned-overlay-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\versioned-overlay-16%402x.png"> <LogicalName>versioned-overlay-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\versioned-overlay-16~dark.png"> + <LogicalName>versioned-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\versioned-overlay-16~dark%402x.png"> + <LogicalName>versioned-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\unversioned-overlay-16.png"> <LogicalName>unversioned-overlay-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\unversioned-overlay-16%402x.png"> <LogicalName>unversioned-overlay-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\unversioned-overlay-16~dark.png"> + <LogicalName>unversioned-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\unversioned-overlay-16~dark%402x.png"> + <LogicalName>unversioned-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\lock-required-overlay-16.png"> <LogicalName>lock-required-overlay-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\lock-required-overlay-16%402x.png"> <LogicalName>lock-required-overlay-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\lock-required-overlay-16~dark.png"> + <LogicalName>lock-required-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\lock-required-overlay-16~dark%402x.png"> + <LogicalName>lock-required-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\unlocked-overlay-16.png"> <LogicalName>unlocked-overlay-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\unlocked-overlay-16%402x.png"> <LogicalName>unlocked-overlay-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\unlocked-overlay-16~dark.png"> + <LogicalName>unlocked-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\unlocked-overlay-16~dark%402x.png"> + <LogicalName>unlocked-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="Policies.xml"> <LogicalName>Policies.xml</LogicalName> </EmbeddedResource> @@ -213,125 +285,479 @@ <EmbeddedResource Include="icons\version-control-16%402x.png"> <LogicalName>version-control-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\version-control-16~dark.png"> + <LogicalName>version-control-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\version-control-16~dark%402x.png"> + <LogicalName>version-control-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\log-16.png"> <LogicalName>log-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\log-16%402x.png"> <LogicalName>log-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\log-16~dark.png"> + <LogicalName>log-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\log-16~dark%402x.png"> + <LogicalName>log-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\diff-16.png"> <LogicalName>diff-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\diff-16%402x.png"> <LogicalName>diff-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\diff-16~dark.png"> + <LogicalName>diff-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\diff-16~dark%402x.png"> + <LogicalName>diff-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\diff-16~disabled.png"> + <LogicalName>diff-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\diff-16~disabled%402x.png"> + <LogicalName>diff-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\diff-16~dark~disabled.png"> + <LogicalName>diff-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\diff-16~dark~disabled%402x.png"> + <LogicalName>diff-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-added-15.png"> + <LogicalName>gutter-added-15.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-added-15%402x.png"> + <LogicalName>gutter-added-15@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-removed-15.png"> + <LogicalName>gutter-removed-15.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\gutter-removed-15%402x.png"> + <LogicalName>gutter-removed-15@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\pull-16.png"> <LogicalName>pull-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pull-16%402x.png"> <LogicalName>pull-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pull-16~dark.png"> + <LogicalName>pull-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pull-16~dark%402x.png"> + <LogicalName>pull-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pull-16~disabled.png"> + <LogicalName>pull-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pull-16~disabled%402x.png"> + <LogicalName>pull-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pull-16~dark~disabled.png"> + <LogicalName>pull-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pull-16~dark~disabled%402x.png"> + <LogicalName>pull-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\push-16.png"> <LogicalName>push-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\push-16%402x.png"> <LogicalName>push-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\push-16~dark.png"> + <LogicalName>push-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\push-16~dark%402x.png"> + <LogicalName>push-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\push-16~disabled.png"> + <LogicalName>push-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\push-16~disabled%402x.png"> + <LogicalName>push-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\push-16~dark~disabled.png"> + <LogicalName>push-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\push-16~dark~disabled%402x.png"> + <LogicalName>push-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\refresh-16.png"> <LogicalName>refresh-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\refresh-16%402x.png"> <LogicalName>refresh-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\refresh-16~dark.png"> + <LogicalName>refresh-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\refresh-16~dark%402x.png"> + <LogicalName>refresh-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\refresh-16~disabled.png"> + <LogicalName>refresh-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\refresh-16~disabled%402x.png"> + <LogicalName>refresh-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\refresh-16~dark~disabled.png"> + <LogicalName>refresh-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\refresh-16~dark~disabled%402x.png"> + <LogicalName>refresh-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\local-status-16.png"> <LogicalName>local-status-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\local-status-16%402x.png"> <LogicalName>local-status-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\local-status-16~dark.png"> + <LogicalName>local-status-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\local-status-16~dark%402x.png"> + <LogicalName>local-status-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\commit-16.png"> <LogicalName>commit-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\commit-16%402x.png"> <LogicalName>commit-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\commit-16~dark.png"> + <LogicalName>commit-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\commit-16~dark%402x.png"> + <LogicalName>commit-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\commit-16~disabled.png"> + <LogicalName>commit-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\commit-16~disabled%402x.png"> + <LogicalName>commit-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\commit-16~dark~disabled.png"> + <LogicalName>commit-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\commit-16~dark~disabled%402x.png"> + <LogicalName>commit-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\remote-status-16.png"> <LogicalName>remote-status-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\remote-status-16%402x.png"> <LogicalName>remote-status-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\remote-status-16~dark.png"> + <LogicalName>remote-status-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\remote-status-16~dark%402x.png"> + <LogicalName>remote-status-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\remote-status-16~disabled.png"> + <LogicalName>remote-status-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\remote-status-16~disabled%402x.png"> + <LogicalName>remote-status-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\remote-status-16~dark~disabled.png"> + <LogicalName>remote-status-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\remote-status-16~dark~disabled%402x.png"> + <LogicalName>remote-status-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\vcs-added-16.png"> <LogicalName>vcs-added-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\vcs-added-16%402x.png"> <LogicalName>vcs-added-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-added-16~dark.png"> + <LogicalName>vcs-added-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-added-16~dark%402x.png"> + <LogicalName>vcs-added-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-added-16~disabled.png"> + <LogicalName>vcs-added-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-added-16~disabled%402x.png"> + <LogicalName>vcs-added-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-added-16~dark~disabled.png"> + <LogicalName>vcs-added-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-added-16~dark~disabled%402x.png"> + <LogicalName>vcs-added-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\vcs-removed-16.png"> <LogicalName>vcs-removed-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\vcs-removed-16%402x.png"> <LogicalName>vcs-removed-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-removed-16~dark.png"> + <LogicalName>vcs-removed-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-removed-16~dark%402x.png"> + <LogicalName>vcs-removed-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-removed-16~disabled.png"> + <LogicalName>vcs-removed-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-removed-16~disabled%402x.png"> + <LogicalName>vcs-removed-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-removed-16~dark~disabled.png"> + <LogicalName>vcs-removed-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-removed-16~dark~disabled%402x.png"> + <LogicalName>vcs-removed-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\vcs-renamed-16.png"> <LogicalName>vcs-renamed-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\vcs-renamed-16%402x.png"> <LogicalName>vcs-renamed-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-renamed-16~dark.png"> + <LogicalName>vcs-renamed-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-renamed-16~dark%402x.png"> + <LogicalName>vcs-renamed-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-renamed-16~disabled.png"> + <LogicalName>vcs-renamed-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-renamed-16~disabled%402x.png"> + <LogicalName>vcs-renamed-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-renamed-16~dark~disabled.png"> + <LogicalName>vcs-renamed-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-renamed-16~dark~disabled%402x.png"> + <LogicalName>vcs-renamed-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\vcs-conflicted-16.png"> <LogicalName>vcs-conflicted-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\vcs-conflicted-16%402x.png"> <LogicalName>vcs-conflicted-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-conflicted-16~dark.png"> + <LogicalName>vcs-conflicted-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-conflicted-16~dark%402x.png"> + <LogicalName>vcs-conflicted-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-conflicted-16~disabled.png"> + <LogicalName>vcs-conflicted-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-conflicted-16~disabled%402x.png"> + <LogicalName>vcs-conflicted-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-conflicted-16~dark~disabled.png"> + <LogicalName>vcs-conflicted-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-conflicted-16~dark~disabled%402x.png"> + <LogicalName>vcs-conflicted-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\vcs-modified-16.png"> <LogicalName>vcs-modified-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\vcs-modified-16%402x.png"> <LogicalName>vcs-modified-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-modified-16~dark.png"> + <LogicalName>vcs-modified-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-modified-16~dark%402x.png"> + <LogicalName>vcs-modified-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-modified-16~disabled.png"> + <LogicalName>vcs-modified-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-modified-16~disabled%402x.png"> + <LogicalName>vcs-modified-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-modified-16~dark~disabled.png"> + <LogicalName>vcs-modified-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\vcs-modified-16~dark~disabled%402x.png"> + <LogicalName>vcs-modified-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\comment-16.png"> <LogicalName>comment-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\comment-16%402x.png"> <LogicalName>comment-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\comment-16~dark.png"> + <LogicalName>comment-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\comment-16~dark%402x.png"> + <LogicalName>comment-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\comment-16~disabled.png"> + <LogicalName>comment-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\comment-16~disabled%402x.png"> + <LogicalName>comment-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\comment-16~dark~disabled.png"> + <LogicalName>comment-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\comment-16~dark~disabled%402x.png"> + <LogicalName>comment-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\revert-16.png"> <LogicalName>revert-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\revert-16%402x.png"> <LogicalName>revert-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\revert-16~dark.png"> + <LogicalName>revert-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\revert-16~dark%402x.png"> + <LogicalName>revert-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\revert-16~disabled.png"> + <LogicalName>revert-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\revert-16~disabled%402x.png"> + <LogicalName>revert-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\revert-16~dark~disabled.png"> + <LogicalName>revert-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\revert-16~dark~disabled%402x.png"> + <LogicalName>revert-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\branch-16.png"> <LogicalName>branch-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\branch-16%402x.png"> <LogicalName>branch-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\branch-16~dark.png"> + <LogicalName>branch-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\branch-16~dark%402x.png"> + <LogicalName>branch-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\branch-16~disabled.png"> + <LogicalName>branch-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\branch-16~disabled%402x.png"> + <LogicalName>branch-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\branch-16~dark~disabled.png"> + <LogicalName>branch-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\branch-16~dark~disabled%402x.png"> + <LogicalName>branch-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\tag-16.png"> <LogicalName>tag-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\tag-16%402x.png"> <LogicalName>tag-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\tag-16~dark.png"> + <LogicalName>tag-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tag-16~dark%402x.png"> + <LogicalName>tag-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tag-16~disabled.png"> + <LogicalName>tag-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tag-16~disabled%402x.png"> + <LogicalName>tag-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tag-16~dark~disabled.png"> + <LogicalName>tag-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tag-16~dark~disabled%402x.png"> + <LogicalName>tag-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-git-16.png"> <LogicalName>prefs-git-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-git-16%402x.png"> <LogicalName>prefs-git-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-git-16~dark.png"> + <LogicalName>prefs-git-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-git-16~dark%402x.png"> + <LogicalName>prefs-git-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-git-16~sel.png"> + <LogicalName>prefs-git-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-git-16~sel%402x.png"> + <LogicalName>prefs-git-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-git-16~dark~sel.png"> + <LogicalName>prefs-git-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-git-16~dark~sel%402x.png"> + <LogicalName>prefs-git-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-commit-message-style-16.png"> <LogicalName>prefs-commit-message-style-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-commit-message-style-16%402x.png"> <LogicalName>prefs-commit-message-style-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\prefs-version-control-general-16.png"> - <LogicalName>prefs-version-control-general-16.png</LogicalName> + <EmbeddedResource Include="icons\prefs-commit-message-style-16~dark.png"> + <LogicalName>prefs-commit-message-style-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-commit-message-style-16~dark%402x.png"> + <LogicalName>prefs-commit-message-style-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-commit-message-style-16~sel.png"> + <LogicalName>prefs-commit-message-style-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-commit-message-style-16~sel%402x.png"> + <LogicalName>prefs-commit-message-style-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-commit-message-style-16~dark~sel.png"> + <LogicalName>prefs-commit-message-style-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-commit-message-style-16~dark~sel%402x.png"> + <LogicalName>prefs-commit-message-style-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-version-control-16.png"> + <LogicalName>prefs-version-control-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-version-control-16%402x.png"> + <LogicalName>prefs-version-control-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-version-control-16~dark.png"> + <LogicalName>prefs-version-control-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-version-control-16~dark%402x.png"> + <LogicalName>prefs-version-control-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-version-control-16~sel.png"> + <LogicalName>prefs-version-control-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-version-control-16~sel%402x.png"> + <LogicalName>prefs-version-control-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-version-control-16~dark~sel.png"> + <LogicalName>prefs-version-control-16~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\prefs-version-control-general-16%402x.png"> - <LogicalName>prefs-version-control-general-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\prefs-version-control-16~dark~sel%402x.png"> + <LogicalName>prefs-version-control-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> </ItemGroup> <ItemGroup> @@ -421,6 +847,7 @@ <Compile Include="MonoDevelop.VersionControl\VersionControlTask.cs" /> <Compile Include="MonoDevelop.VersionControl.Views\CommonTextEditorOptions.cs" /> <Compile Include="MonoDevelop.VersionControl.Views\BaseView.cs" /> + <Compile Include="MonoDevelop.VersionControl.Views\Styles.cs" /> </ItemGroup> <ItemGroup> <None Include="Makefile.am" /> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml index 9b0309099b..f366187d73 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml @@ -101,7 +101,7 @@ <StockIcon stockid = "vc-branch" resource = "branch-16.png" size="Menu" /> <StockIcon stockid = "md-prefs-git" resource="prefs-git-16.png" size="Menu" /> <StockIcon stockid = "md-prefs-commit-message-style" resource="prefs-commit-message-style-16.png" size="Menu" /> - <StockIcon stockid = "md-prefs-version-control-general" resource="prefs-version-control-general-16.png" size="Menu" /> + <StockIcon stockid = "md-prefs-version-control" resource="prefs-version-control-16.png" size="Menu" /> </Extension> <Extension path = "/MonoDevelop/Ide/Commands"> @@ -142,15 +142,16 @@ description = "Shows the status of files in the solution."/> <Command id = "MonoDevelop.VersionControl.Commands.Update" _label = "_Update" - icon = "vc-update" + icon = "gtk-refresh" description = "Updates the local copy with remote changes."/> <Command id = "MonoDevelop.VersionControl.Commands.UpdateSolution" _label = "_Update Solution" - icon = "vc-update" + icon = "gtk-refresh" defaultHandler="MonoDevelop.VersionControl.UpdateCommandHandler" description = "Updates the local copy with remote changes."/> <Command id = "MonoDevelop.VersionControl.Commands.Publish" _label = "_Publish in Version Control..." + icon = "vc-push" description = "Publish actual project into repository."/> <Command id = "MonoDevelop.VersionControl.Commands.Checkout" defaultHandler = "MonoDevelop.VersionControl.CheckoutCommand" @@ -285,9 +286,9 @@ </Extension> --> <Extension path = "/MonoDevelop/ProjectModel/Gui/ItemOptionPanels"> - <Section id="VersionControl" _label="Version Control" icon="md-prefs-version-control-general"> + <Section id="VersionControl" _label="Version Control" icon="md-prefs-version-control"> <Condition id="ItemType" value="Solution"> - <Section id="VersionControlGeneral" _label="General" fill="true" class="MonoDevelop.VersionControl.VersionControlSolutionOptionsPanel" icon="md-prefs-version-control-general" /> + <Section id="VersionControlGeneral" _label="General" fill="true" class="MonoDevelop.VersionControl.VersionControlSolutionOptionsPanel" icon="md-prefs-version-control" /> </Condition> <ComplexCondition> <Or> @@ -304,7 +305,7 @@ </Extension> <Extension path = "/MonoDevelop/Ide/GlobalOptionsDialog/VersionControl"> - <Section id = "VersionControlGeneral" _label = "General" fill="true" class="MonoDevelop.VersionControl.VersionControlGeneralOptionsPanel" icon="md-prefs-version-control-general" /> + <Section id = "VersionControlGeneral" _label = "General" fill="true" class="MonoDevelop.VersionControl.VersionControlGeneralOptionsPanel" icon="md-prefs-version-control" /> <Section id = "VersionControlGeneral" _label = "Commit Message Style" fill="true" class="MonoDevelop.VersionControl.VersionControlPolicyPanel" icon="md-prefs-commit-message-style" /> </Extension> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16.png Binary files differindex ee84ca2bff..b0282a5116 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16@2x.png Binary files differindex 00e84c79e4..3b1a6168c0 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..39898d7c8b --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..36be421550 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/added-overlay-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16.png Binary files differindex a6a5b24cfe..e4f03a7d94 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16@2x.png Binary files differindex a2bff92231..8112684192 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark.png Binary files differnew file mode 100644 index 0000000000..3b09162c07 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f858d0b065 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..28cc3be949 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..c07a5322af --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~disabled.png Binary files differnew file mode 100644 index 0000000000..c0abf4d3b4 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..47c75de529 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/branch-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16.png Binary files differindex 7c9ad146d5..a712539cae 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16@2x.png Binary files differindex 0bf30e0162..8796e746ad 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark.png Binary files differnew file mode 100644 index 0000000000..8159d32c75 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0c86f23baf --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..70b522bc66 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..bf07f8869a --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~disabled.png Binary files differnew file mode 100644 index 0000000000..f7fe199170 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..1b90a2488f --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/comment-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16.png Binary files differindex ea93ecbbf3..6c791cdeb1 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16@2x.png Binary files differindex 596dc19eb9..2b988ffddb 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark.png Binary files differnew file mode 100644 index 0000000000..038ebeec71 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..692770349b --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..f37d0466e1 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..71b549aa00 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~disabled.png Binary files differnew file mode 100644 index 0000000000..193ad8ba5e --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..4c15660c39 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/commit-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16.png Binary files differindex 811e2a0807..ee06fb0f96 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16@2x.png Binary files differindex 1313d23118..f58311a7d3 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..e8fdd3ea4b --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..c558765b24 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/conflict-overlay-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16.png Binary files differindex 153e4a59e3..93106a163c 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16@2x.png Binary files differindex 73900ae4b8..712754bbc6 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark.png Binary files differnew file mode 100644 index 0000000000..d927501998 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0ebb29b2b0 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..a836939b3a --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..2b771279c6 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~disabled.png Binary files differnew file mode 100644 index 0000000000..a9bb381c56 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..37187c79b4 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/diff-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15.png Binary files differnew file mode 100644 index 0000000000..5ac5d87af3 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15@2x.png Binary files differnew file mode 100644 index 0000000000..39f3e7d2d6 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-added-15@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-removed-15.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-removed-15.png Binary files differnew file mode 100644 index 0000000000..2279ed2693 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-removed-15.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-removed-15@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-removed-15@2x.png Binary files differnew file mode 100644 index 0000000000..28e7c8fea9 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/gutter-removed-15@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16.png Binary files differindex 678286ba01..db1352c363 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16@2x.png Binary files differindex 45c41e3955..b296629431 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..429e96550d --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..bf73671e49 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/ignored-overlay-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16.png Binary files differindex b50e6fc982..c67564b1e9 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16@2x.png Binary files differindex bf9dd78174..0fe0d64f2b 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16~dark.png Binary files differnew file mode 100644 index 0000000000..0646c5d95d --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e9b3047748 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/local-status-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16.png Binary files differindex d02df13681..1639184a97 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16@2x.png Binary files differindex 0220289f5a..c000b5a601 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..eb74218112 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..a2904102ab --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/lock-required-overlay-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16.png Binary files differindex 50bb6b6b5a..77d809bb6e 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16@2x.png Binary files differindex 2e1c3f6684..1b1d1a8e81 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..9086e1e394 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..a99bbd3d96 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/locked-overlay-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16.png Binary files differindex 72d172e2ab..6430bfc5cc 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16@2x.png Binary files differindex aaa76142ef..d410cd0186 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16~dark.png Binary files differnew file mode 100644 index 0000000000..a57fdb3b34 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..8c9e358815 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/log-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16.png Binary files differindex 2b9cef04ab..0b882c75bd 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16@2x.png Binary files differindex 7a10f5edd7..1f5971063a 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..13b4ff7023 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..300f40d574 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/modified-overlay-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16.png Binary files differindex ea93ecbbf3..be975275fe 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16@2x.png Binary files differindex 596dc19eb9..3cc519561c 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark.png Binary files differnew file mode 100644 index 0000000000..7f80ff7816 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6e309b1b99 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..a2d66f5373 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark~sel.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f6794fd248 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~dark~sel@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~sel.png Binary files differnew file mode 100644 index 0000000000..a2d66f5373 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~sel.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f6794fd248 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-commit-message-style-16~sel@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16.png Binary files differindex ac46bb38b3..983b855fa5 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16@2x.png Binary files differindex d09e54f010..c3edbd18bd 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark.png Binary files differnew file mode 100644 index 0000000000..420c104055 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..380bb5acad --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..ffdbe46f50 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark~sel.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..ad0f58cfcd --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~dark~sel@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~sel.png Binary files differnew file mode 100644 index 0000000000..ffdbe46f50 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~sel.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..ad0f58cfcd --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-git-16~sel@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16.png Binary files differnew file mode 100644 index 0000000000..b60fcb3b6c --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16@2x.png Binary files differnew file mode 100644 index 0000000000..d0d7949bf5 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark.png Binary files differnew file mode 100644 index 0000000000..686e1d5a5d --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b6dc465573 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..c38408f189 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark~sel.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..73a1032f31 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~dark~sel@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~sel.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~sel.png Binary files differnew file mode 100644 index 0000000000..c38408f189 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~sel.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~sel@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..73a1032f31 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-16~sel@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-general-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-general-16.png Binary files differdeleted file mode 100644 index f50af22deb..0000000000 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-general-16.png +++ /dev/null diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-general-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-general-16@2x.png Binary files differdeleted file mode 100644 index 230d65e12d..0000000000 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/prefs-version-control-general-16@2x.png +++ /dev/null diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16.png Binary files differindex 7024886a2a..4852ab9415 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16@2x.png Binary files differindex ad50947884..2de4dc0ea7 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark.png Binary files differnew file mode 100644 index 0000000000..d3e8fd7192 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7edbe04680 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..fa8b5a2de8 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..3e10d25314 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~disabled.png Binary files differnew file mode 100644 index 0000000000..304c16ebb3 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..5237a1aa9c --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/pull-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16.png Binary files differindex ac46bb38b3..8f960c125c 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16@2x.png Binary files differindex d09e54f010..3588d7b302 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark.png Binary files differnew file mode 100644 index 0000000000..19afa14ba5 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..cb0e3b4312 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..3a4a660d09 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..b7b53642f9 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~disabled.png Binary files differnew file mode 100644 index 0000000000..671e179f79 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..09a8f84eea --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/push-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16.png Binary files differindex d63fa2fad8..d96792ba71 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16@2x.png Binary files differindex 848a94e174..ae40f00576 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark.png Binary files differnew file mode 100644 index 0000000000..9d8cd6f608 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..916b709792 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..481804372b --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..5fc8f1c032 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~disabled.png Binary files differnew file mode 100644 index 0000000000..bb031de2a4 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..17612ee4d0 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/refresh-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16.png Binary files differindex e362102a8c..b594ed2036 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16@2x.png Binary files differindex c270cd23a5..0bda079f14 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark.png Binary files differnew file mode 100644 index 0000000000..e2d93b2726 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e3ab8ba0f4 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..0646c5d95d --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..e9b3047748 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~disabled.png Binary files differnew file mode 100644 index 0000000000..c67564b1e9 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..0fe0d64f2b --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/remote-status-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16.png Binary files differindex 8f41659d22..722b025a04 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16@2x.png Binary files differindex 953e8105a4..5219842fbb 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..1d3b633832 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..92da963c3e --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/removed-overlay-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16.png Binary files differindex bc94eec59b..add30910df 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16@2x.png Binary files differindex 140a16ffbd..6affd6dc2a 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..e49f5331ae --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..686d859782 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/renamed-overlay-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16.png Binary files differindex f50af22deb..ab6673922c 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16@2x.png Binary files differindex 230d65e12d..2d38ea01e9 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16~dark.png Binary files differnew file mode 100644 index 0000000000..5aa99bf942 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..4b50c0b458 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/repository-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16.png Binary files differindex e08803d985..a67e18840a 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16@2x.png Binary files differindex d9155f2685..7faee37ac9 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark.png Binary files differnew file mode 100644 index 0000000000..e990f97de7 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..fbaadddd44 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..c453434fcc --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..ef172c44f8 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~disabled.png Binary files differnew file mode 100644 index 0000000000..261a85670d --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..af3cffa5b8 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/revert-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16.png Binary files differindex 5ed5e35bfb..73f83946d1 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16@2x.png Binary files differindex 4de708587a..ebddd28d29 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark.png Binary files differnew file mode 100644 index 0000000000..f54b303abe --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0501df6f37 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..470e3b93f6 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..242f33a64e --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~disabled.png Binary files differnew file mode 100644 index 0000000000..c722a41deb --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..b7922e78c3 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/tag-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16.png Binary files differindex 3d2ff49956..a4080a07ee 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16@2x.png Binary files differindex 14fb4b8bc1..1375a972dd 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..58fb9c2aa2 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..a1a51e3873 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unlocked-overlay-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16.png Binary files differindex aff6b9a6e9..0ee5ec8d45 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16@2x.png Binary files differindex 909a0fb128..61e207f732 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..de5c44e2e6 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..30725a7fdf --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/unversioned-overlay-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16.png Binary files differindex 1a0db8de4b..d871330d2a 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16@2x.png Binary files differindex 67682b1ed1..cd7d92c9d7 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark.png Binary files differnew file mode 100644 index 0000000000..66f4acf693 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..a13fc89a90 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..960f061f3a --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..517c9ccf8b --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~disabled.png Binary files differnew file mode 100644 index 0000000000..3b52fc0336 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..8bf165d341 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-added-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16.png Binary files differindex d92f477577..dd8b51440a 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16@2x.png Binary files differindex a8ddfe5c84..56d1e330b6 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark.png Binary files differnew file mode 100644 index 0000000000..1fa4e5f56b --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b1365ca79d --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..9a05d84334 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..e5c1018897 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~disabled.png Binary files differnew file mode 100644 index 0000000000..1b44deecd3 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..2a52a64f36 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-conflicted-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16.png Binary files differindex 06271b21e1..81fae65eba 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16@2x.png Binary files differindex 3f38ee7639..09e1bb2559 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark.png Binary files differnew file mode 100644 index 0000000000..afc6cf1484 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..085685f4de --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..badde350c3 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..1e13a3819b --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~disabled.png Binary files differnew file mode 100644 index 0000000000..ef7a5f8e77 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..18ffb68fc0 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-modified-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16.png Binary files differindex d33e4da129..0e24d32859 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16@2x.png Binary files differindex e29f3370cd..448750e2bd 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark.png Binary files differnew file mode 100644 index 0000000000..f7dd8c449a --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0f7ec817d3 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..338b1cbb6b --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..5669ace2df --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~disabled.png Binary files differnew file mode 100644 index 0000000000..47ebff636e --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..1b977c1f0c --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-removed-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16.png Binary files differindex 21c19491cc..26024d2577 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16@2x.png Binary files differindex f39392b154..a814eac25d 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark.png Binary files differnew file mode 100644 index 0000000000..7d50904383 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d7dd1ac722 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..5f499cc257 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..69d3b00c69 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~dark~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~disabled.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~disabled.png Binary files differnew file mode 100644 index 0000000000..36e9c036e7 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~disabled.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~disabled@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..310ea81248 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/vcs-renamed-16~disabled@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16.png Binary files differindex b084d922fb..b60fcb3b6c 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16@2x.png Binary files differindex 2b5ba106e6..d0d7949bf5 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16~dark.png Binary files differnew file mode 100644 index 0000000000..686e1d5a5d --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b6dc465573 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/version-control-16~dark@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16.png Binary files differindex eccbc51b8a..2cd0be132a 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16@2x.png Binary files differindex ff97459f65..9c5c7b2723 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16@2x.png +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16@2x.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..947968e2f4 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark.png diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark@2x.png b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0b2c310fd0 --- /dev/null +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/icons/versioned-overlay-16~dark@2x.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/ImageBox.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/ImageBox.cs new file mode 100644 index 0000000000..187da9178d --- /dev/null +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/ImageBox.cs @@ -0,0 +1,158 @@ +//
+// ImageBox.cs
+//
+// Author:
+// Vsevolod Kukol <sevo@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Windows;
+using Xwt.Drawing;
+using System.Windows.Media;
+using System.Windows.Controls;
+
+namespace WindowsPlatform
+{
+ public class ImageBox : UserControl
+ {
+ public static readonly DependencyProperty ImageProperty =
+ DependencyProperty.Register ("Image", typeof (Xwt.Drawing.Image), typeof (ImageBox), new FrameworkPropertyMetadata () { AffectsMeasure = true, AffectsRender = true });
+
+ public static readonly DependencyProperty StretchProperty =
+ Viewbox.StretchProperty.AddOwner(typeof(ImageBox));
+
+ public static readonly DependencyProperty StretchDirectionProperty =
+ Viewbox.StretchDirectionProperty.AddOwner(typeof(ImageBox));
+
+ public ImageBox ()
+ {
+ Image = null;
+ Loaded += (sender, e) => MonoDevelop.Ide.Gui.Styles.Changed += HandleStylesChanged;
+ Unloaded += (sender, e) => MonoDevelop.Ide.Gui.Styles.Changed -= HandleStylesChanged;
+ }
+
+ public ImageBox (Xwt.Drawing.Image image) : this ()
+ {
+ Image = image;
+ }
+
+ public ImageBox (string iconId, Gtk.IconSize size) : this ()
+ {
+ Image = MonoDevelop.Ide.ImageService.GetIcon (iconId, size);
+ }
+
+ void HandleStylesChanged (object sender, EventArgs e)
+ {
+ InvalidateVisual ();
+ }
+
+ protected override void OnRender (DrawingContext dc)
+ {
+ var image = Image;
+ if (image != null) {
+ image = image.WithBoxSize (RenderSize.Width, RenderSize.Height);
+ var x = (RenderSize.Width - image.Size.Width) / 2;
+ var y = (RenderSize.Height - image.Size.Height) / 2;
+ MonoDevelop.Platform.WindowsPlatform.WPFToolkit.RenderImage (this, dc, image, x, y);
+ }
+ }
+
+ public Xwt.Drawing.Image Image
+ {
+ get { return (Xwt.Drawing.Image)GetValue (ImageProperty); }
+ set { SetValue (ImageProperty, value); }
+ }
+
+ public Stretch Stretch
+ {
+ get { return (Stretch) GetValue(StretchProperty); }
+ set { SetValue(StretchProperty, value); }
+ }
+
+ public StretchDirection StretchDirection
+ {
+ get { return (StretchDirection)GetValue(StretchDirectionProperty); }
+ set { SetValue(StretchDirectionProperty, value); }
+ }
+
+ protected override Size MeasureOverride (Size constraint)
+ {
+ return CalcSizeForBounds (constraint);
+ }
+
+ protected override Size ArrangeOverride (Size arrangeBounds)
+ {
+ return CalcSizeForBounds (arrangeBounds);
+ }
+
+ Size CalcSizeForBounds (Size availableSize)
+ {
+ if (Image == null)
+ return new Size (0, 0);
+
+ double scaleX = 1.0;
+ double scaleY = 1.0;
+
+ bool isConstrainedWidth = !Double.IsPositiveInfinity(availableSize.Width);
+ bool isConstrainedHeight = !Double.IsPositiveInfinity(availableSize.Height);
+
+ if ((Stretch == Stretch.Uniform || Stretch == Stretch.UniformToFill || Stretch == Stretch.Fill)
+ && (isConstrainedWidth || isConstrainedHeight) )
+ {
+ scaleX = availableSize.Width / Image.Size.Width;
+ scaleY = availableSize.Height / Image.Size.Height;
+
+ if (!isConstrainedWidth)
+ scaleX = scaleY;
+ else if (!isConstrainedHeight)
+ scaleY = scaleX;
+ else switch (Stretch)
+ {
+ case Stretch.Uniform:
+ double minscale = scaleX < scaleY ? scaleX : scaleY;
+ scaleX = scaleY = minscale;
+ break;
+
+ case Stretch.UniformToFill:
+ double maxscale = scaleX > scaleY ? scaleX : scaleY;
+ scaleX = scaleY = maxscale;
+ break;
+ }
+
+ switch(StretchDirection)
+ {
+ case StretchDirection.UpOnly:
+ if (scaleX < 1.0) scaleX = 1.0;
+ if (scaleY < 1.0) scaleY = 1.0;
+ break;
+
+ case StretchDirection.DownOnly:
+ if (scaleX > 1.0) scaleX = 1.0;
+ if (scaleY > 1.0) scaleY = 1.0;
+ break;
+ }
+ }
+
+ return new Size(Image.Size.Width * scaleX, Image.Size.Height * scaleY);
+ }
+ }
+}
+
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/ImageHelper.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/ImageHelper.cs index d050385a7a..7ef98b6236 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/ImageHelper.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/ImageHelper.cs @@ -37,7 +37,7 @@ namespace WindowsPlatform {
static Dictionary<string, Image> cachedIcons = new Dictionary<string, Image> ();
- static Image GetStockIcon (this IconId stockId)
+ public static Image GetStockIcon (this IconId stockId)
{
if (stockId.IsNull)
return null;
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/IconButton.xaml b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/IconButton.xaml index 2624f86ffa..eb42b07ebd 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/IconButton.xaml +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/IconButton.xaml @@ -19,7 +19,7 @@ </Border>
</ControlTemplate>
</Button.Template>
- <Image x:Name="RunIcon" Source="{Binding CurrentImage}" UseLayoutRounding="True"
+ <platform:ImageBox x:Name="RunIcon" UseLayoutRounding="True"
MouseLeftButtonDown="OnMouseLeftButtonDown" Width="24" Height="24" Margin="-1" />
</Button>
</UserControl>
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/IconButton.xaml.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/IconButton.xaml.cs index 1b6fe7ad04..d507bccac3 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/IconButton.xaml.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/IconButton.xaml.cs @@ -26,81 +26,17 @@ namespace WindowsPlatform.MainToolbar public partial class IconButtonControl : UserControl, INotifyPropertyChanged
{
public static DependencyProperty ImageProperty = DependencyProperty.Register (
- "Image", typeof (ImageSource), typeof (IconButtonControl));
-
- ImageSource imageHovered, imagePressed, imageDisabled;
+ "Image", typeof (Xwt.Drawing.Image), typeof (IconButtonControl));
- ImageSource currentImage;
- public ImageSource CurrentImage
+ public Xwt.Drawing.Image Image
{
- get { return currentImage; }
- private set { currentImage = value; RaisePropertyChanged (); }
- }
-
- public ImageSource Image
- {
- get { return (ImageSource)GetValue(ImageProperty); }
+ get { return (Xwt.Drawing.Image)GetValue(ImageProperty); }
set { SetValue (ImageProperty, value); }
}
- public ImageSource ImageHovered
- {
- get { return imageHovered; }
- set { imageHovered = value; RaisePropertyChanged (); }
- }
-
- public ImageSource ImagePressed
- {
- get { return imagePressed; }
- set { imagePressed = value; RaisePropertyChanged (); }
- }
-
- public ImageSource ImageDisabled
- {
- get { return imageDisabled; }
- set { imageDisabled = value; RaisePropertyChanged (); }
- }
-
- public IconButtonControl (string imageResource) : this ()
- {
- SetImageFromResource (imageResource);
- }
-
- public void SetImageFromResource (string imageResource) {
- if (!String.IsNullOrEmpty (imageResource)) {
- var extension = System.IO.Path.GetExtension (imageResource);
- var name = System.IO.Path.GetFileNameWithoutExtension (imageResource);
- Image = CurrentImage = Xwt.Drawing.Image.FromResource (typeof(RunButtonControl), imageResource).WithSize (Xwt.IconSize.Medium).GetImageSource ();
- try {
- ImageHovered = Xwt.Drawing.Image.FromResource (typeof(RunButtonControl), name + "~hover" + extension).WithSize (Xwt.IconSize.Medium).GetImageSource ();
- } catch {
- ImageHovered = null;
- }
- try {
- ImagePressed = Xwt.Drawing.Image.FromResource (typeof(RunButtonControl), name + "~pressed" + extension).WithSize (Xwt.IconSize.Medium).GetImageSource ();
- } catch {
- ImagePressed = null;
- }
- try {
- ImageDisabled = Xwt.Drawing.Image.FromResource (typeof(RunButtonControl), name + "~disabled" + extension).WithSize (Xwt.IconSize.Medium).GetImageSource ();
- } catch {
- ImageDisabled = null;
- }
- CurrentImage = Image;
- } else {
- Image = CurrentImage = null;
- ImageHovered = null;
- ImagePressed = null;
- ImageDisabled = null;
- }
- }
-
- public IconButtonControl (ImageSource image, ImageSource imageHovered, ImageSource imagePressed, ImageSource imageDisabled) : this ()
+ public IconButtonControl (Xwt.Drawing.Image image) : this ()
{
Image = image;
- ImageHovered = imageHovered;
- ImagePressed = imagePressed;
- ImageDisabled = imageDisabled;
}
public IconButtonControl ()
@@ -120,13 +56,15 @@ namespace WindowsPlatform.MainToolbar protected override void OnPropertyChanged (DependencyPropertyChangedEventArgs e)
{
base.OnPropertyChanged (e);
-
- if (e.Property == IsEnabledProperty && ImageDisabled != null)
- CurrentImage = IsEnabled ? Image : ImageDisabled;
- else if (e.Property == IsMouseOverProperty && IsEnabled && ImageHovered != null)
- CurrentImage = IsMouseOver ? ImageHovered : Image;
- else if (e.Property == ImageProperty)
- CurrentImage = Image;
+ if (e.Property == ImageProperty)
+ RunIcon.Image = Image;
+ if (Image == null)
+ return;
+ if (e.Property == IsEnabledProperty)
+ RunIcon.Image = IsEnabled ? Image : Image.WithStyles ("disabled");
+ if (e.Property == IsMouseOverProperty && IsEnabled)
+ RunIcon.Image = IsMouseOver ? Image.WithStyles ("hover") : Image;
+
InvalidateMeasure ();
}
@@ -137,9 +75,8 @@ namespace WindowsPlatform.MainToolbar protected override void OnMouseLeftButtonDown (MouseButtonEventArgs e)
{
- if (IsEnabled) {
- if (ImagePressed != null)
- CurrentImage = ImagePressed;
+ if (IsEnabled && Image != null) {
+ RunIcon.Image = Image.WithStyles ("pressed");
Background = Styles.MainToolbarButtonPressedBackgroundBrush;
BorderBrush = Styles.MainToolbarButtonPressedBorderBrush;
}
@@ -148,11 +85,13 @@ namespace WindowsPlatform.MainToolbar protected override void OnMouseLeftButtonUp (MouseButtonEventArgs e)
{
- if (ImageHovered != null) {
- if (CurrentImage != ImageHovered)
- CurrentImage = ImageHovered;
- } else if (CurrentImage != Image)
- CurrentImage = Image;
+ if (Image != null) {
+ if (IsMouseOver)
+ RunIcon.Image = Image.WithStyles ("hover");
+ else
+ RunIcon.Image = Image;
+ }
+
Background = Brushes.Transparent;
BorderBrush = Brushes.Transparent;
base.OnMouseLeftButtonUp (e);
@@ -160,8 +99,6 @@ namespace WindowsPlatform.MainToolbar protected override void OnMouseLeave (MouseEventArgs e)
{
- if (CurrentImage != Image)
- CurrentImage = Image;
Background = Brushes.Transparent;
BorderBrush = Brushes.Transparent;
base.OnMouseLeave (e);
@@ -175,8 +112,8 @@ namespace WindowsPlatform.MainToolbar protected override Size MeasureOverride (Size constraint)
{
- if (CurrentImage != null)
- return new Size (CurrentImage.Width, CurrentImage.Width);
+ if (Image != null)
+ return new Size (Image.Width, Image.Width);
return base.MeasureOverride (constraint);
}
@@ -186,7 +123,7 @@ namespace WindowsPlatform.MainToolbar public class RunButtonControl : IconButtonControl
{
- RunButtonControl (OperationIcon icon) : base(GetIconResource(icon))
+ RunButtonControl (OperationIcon icon) : base(GetIcon(icon))
{
this.icon = icon;
ToolTip = GetTooltip(icon);
@@ -205,7 +142,7 @@ namespace WindowsPlatform.MainToolbar return;
icon = value;
ToolTip = GetTooltip (icon);
- SetImageFromResource (GetIconResource (icon));
+ Image = GetIcon (icon);
}
}
@@ -224,18 +161,24 @@ namespace WindowsPlatform.MainToolbar }
}
- static string GetIconResource (OperationIcon icon)
+ static Xwt.Drawing.Image GetIcon (OperationIcon icon)
{
+ string img;
switch (icon) {
case OperationIcon.Stop:
- return "stop.png";
+ img = "stop.png";
+ break;
case OperationIcon.Run:
- return "execute.png";
+ img = "execute.png";
+ break;
case OperationIcon.Build:
- return "build.png";
+ img = "build.png";
+ break;
default:
throw new InvalidOperationException ();
}
+
+ return Xwt.Drawing.Image.FromResource (typeof (RunButtonControl), img).WithSize (Xwt.IconSize.Medium);
}
}
@@ -243,15 +186,9 @@ namespace WindowsPlatform.MainToolbar {
IButtonBarButton button;
public ButtonBarButton (IButtonBarButton button)
+ : base (button.Image.IsNull ? null : button.Image.GetStockIcon().WithSize(Xwt.IconSize.Medium))
{
this.button = button;
- if (!button.Image.IsNull) {
- try {
- SetImageFromResource (button.Image + ".png");
- } catch {
- Image = button.Image.GetImageSource (Xwt.IconSize.Medium);
- }
- }
VerticalContentAlignment = VerticalAlignment.Center;
ToolTip = button.Tooltip;
@@ -292,13 +229,7 @@ namespace WindowsPlatform.MainToolbar void OnButtonImageChanged (object sender, EventArgs args)
{
- if (!button.Image.IsNull) {
- try {
- SetImageFromResource (button.Image + ".png");
- } catch {
- Image = button.Image.GetImageSource (Xwt.IconSize.Medium);
- }
- }
+ Image = button.Image.GetStockIcon ().WithSize (Xwt.IconSize.Medium);
}
void OnButtonClicked (object sender, RoutedEventArgs args)
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SearchBar.xaml b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SearchBar.xaml index 1ff2bd6765..c28941bd0c 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SearchBar.xaml +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SearchBar.xaml @@ -11,7 +11,7 @@ BorderBrush="{Binding Path=(platform:Styles.SearchBarBorderBrush), Mode=OneWay}">
<Border BorderThickness="0" UseLayoutRounding="True"> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Height="26" UseLayoutRounding="True"> - <TextBox x:Name="SearchBar" Text="{Binding Path=SearchText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" MinWidth="180" Margin="5,0,0,0" Background="Transparent" Foreground="{Binding Foreground}" BorderThickness="0" UseLayoutRounding="True" /> + <TextBox x:Name="SearchBar" Text="{Binding Path=SearchText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" MinWidth="180" Margin="5,0,0,0" Background="Transparent" Foreground="{Binding Foreground}" CaretBrush="{Binding Foreground}" BorderThickness="0" UseLayoutRounding="True" /> <local:IconButtonControl x:Name="SearchIcon" Width="24" Height="24" Margin="0,0,1,0" Click="OnIconClicked" UseLayoutRounding="True" VerticalContentAlignment="Center" VerticalAlignment="Center" > <local:IconButtonControl.ContextMenu> <ContextMenu UseLayoutRounding="True" /> diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SearchBar.xaml.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SearchBar.xaml.cs index 9425b3dc14..53a909d4a5 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SearchBar.xaml.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/SearchBar.xaml.cs @@ -26,8 +26,7 @@ namespace WindowsPlatform.MainToolbar /// </summary>
public partial class SearchBarControl : UserControl, INotifyPropertyChanged
{
- readonly ImageSource searchIcon, searchIconHovered, searchIconPressed;
- readonly ImageSource clearIcon, clearIconHovered, clearIconPressed;
+ readonly Xwt.Drawing.Image searchIcon, clearIcon;
public SearchBarControl ()
{
@@ -46,15 +45,9 @@ namespace WindowsPlatform.MainToolbar }
};
- searchIcon = Stock.SearchboxSearch.GetImageSource (Xwt.IconSize.Small);
- searchIconHovered = Xwt.Drawing.Image.FromResource (typeof(IdeApp), "searchbox-search-win-24~hover.png").WithSize (Xwt.IconSize.Small).GetImageSource ();
- searchIconPressed = Xwt.Drawing.Image.FromResource (typeof(IdeApp), "searchbox-search-win-24~pressed.png").WithSize (Xwt.IconSize.Small).GetImageSource ();
- clearIcon = ((MonoDevelop.Core.IconId)"md-searchbox-clear").GetImageSource (Xwt.IconSize.Small);
- clearIconHovered = Xwt.Drawing.Image.FromResource (typeof(IdeApp),"searchbox-clear-win-24~hover.png").WithSize (Xwt.IconSize.Small).GetImageSource ();
- clearIconPressed = Xwt.Drawing.Image.FromResource (typeof(IdeApp), "searchbox-clear-win-24~pressed.png").WithSize (Xwt.IconSize.Small).GetImageSource ();
+ searchIcon = Stock.SearchboxSearch.GetStockIcon ().WithSize (Xwt.IconSize.Small);
+ clearIcon = ((MonoDevelop.Core.IconId)"md-searchbox-clear").GetStockIcon ().WithSize (Xwt.IconSize.Small);
SearchIcon.Image = searchIcon;
- SearchIcon.ImageHovered = searchIconHovered;
- SearchIcon.ImagePressed = searchIconPressed;
SearchIcon.Focusable = false;
}
@@ -89,14 +82,10 @@ namespace WindowsPlatform.MainToolbar if (string.IsNullOrEmpty (searchText) || searchText == PlaceholderText) {
if (isClearShown) {
SearchIcon.Image = searchIcon;
- SearchIcon.ImageHovered = searchIconHovered;
- SearchIcon.ImagePressed = searchIconPressed;
isClearShown = false;
}
} else if (!isClearShown) {
SearchIcon.Image = clearIcon;
- SearchIcon.ImageHovered = clearIconHovered;
- SearchIcon.ImagePressed = clearIconPressed;
isClearShown = true;
}
}
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml index 7e103e69ba..94f09ba30a 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml @@ -36,12 +36,12 @@ <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
- <Image Grid.Column="0"
+ <platform:ImageBox Grid.Column="0"
x:Name="StatusImageControl"
MaxWidth="16"
Margin="9,5,0,5"
MaxHeight="16"
- Source="{Binding StatusImage}"
+ Image="{Binding StatusImage}"
UseLayoutRounding="True"
MouseLeftButtonUp="OnShowPad" />
<TextBlock x:Name="StatusText"
@@ -60,7 +60,7 @@ Orientation="Horizontal"
UseLayoutRounding="True"
MouseLeftButtonUp="OnShowError">
- <Image Source="{Binding BuildResultIcon}" Margin="0,0,0,0" MaxWidth="16" MaxHeight="16" UseLayoutRounding="True" />
+ <platform:ImageBox Image="{Binding BuildResultIcon}" Margin="0,0,0,0" MaxWidth="16" MaxHeight="16" UseLayoutRounding="True" />
<TextBlock
Text="{Binding BuildResultCount}"
VerticalAlignment="Center"
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs index bba5020214..37de00c61b 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs @@ -63,11 +63,11 @@ namespace WindowsPlatform.MainToolbar if (ec > 0) {
BuildResultPanelVisibility = Visibility.Visible;
BuildResultCount = ec;
- BuildResultIcon = Stock.Error.GetImageSource (Xwt.IconSize.Small);
+ BuildResultIcon = Stock.Error.GetStockIcon ().WithSize (Xwt.IconSize.Small);
} else if (wc > 0) {
BuildResultPanelVisibility = Visibility.Visible;
BuildResultCount = wc;
- BuildResultIcon = Stock.Warning.GetImageSource (Xwt.IconSize.Small);
+ BuildResultIcon = Stock.Warning.GetStockIcon ().WithSize (Xwt.IconSize.Small);
} else
BuildResultPanelVisibility = Visibility.Collapsed;
});
@@ -212,12 +212,12 @@ namespace WindowsPlatform.MainToolbar if (ImageService.IsAnimation (currentIcon, Gtk.IconSize.Menu)) {
animatedIcon = ImageService.GetAnimatedIcon (currentIcon, Gtk.IconSize.Menu);
- StatusImage = animatedIcon.FirstFrame.GetImageSource ();
+ StatusImage = animatedIcon.FirstFrame;
xwtAnimation = animatedIcon.StartAnimation (p => {
- StatusImage = p.GetImageSource ();
+ StatusImage = p;
});
} else
- StatusImage = currentIcon.GetImageSource (Xwt.IconSize.Small);
+ StatusImage = currentIcon.GetStockIcon ().WithSize (Xwt.IconSize.Small);
}
public void ShowReady ()
@@ -270,8 +270,8 @@ namespace WindowsPlatform.MainToolbar set { SetValue (StatusTextBrushProperty, value); }
}
- ImageSource statusImage;
- public ImageSource StatusImage
+ Xwt.Drawing.Image statusImage;
+ public Xwt.Drawing.Image StatusImage
{
get { return statusImage; }
set { statusImage = value; RaisePropertyChanged (); }
@@ -284,8 +284,8 @@ namespace WindowsPlatform.MainToolbar set { buildResultCount = value; RaisePropertyChanged (); }
}
- ImageSource buildResultIcon;
- public ImageSource BuildResultIcon
+ Xwt.Drawing.Image buildResultIcon;
+ public Xwt.Drawing.Image BuildResultIcon
{
get { return buildResultIcon; }
set { buildResultIcon = value; RaisePropertyChanged (); }
@@ -307,7 +307,7 @@ namespace WindowsPlatform.MainToolbar public event PropertyChangedEventHandler PropertyChanged;
}
- class StatusIcon : System.Windows.Controls.Image, StatusBarIcon
+ class StatusIcon : ImageBox, StatusBarIcon
{
StatusBar bar;
@@ -363,17 +363,6 @@ namespace WindowsPlatform.MainToolbar });
}
- Xwt.Drawing.Image image;
- public Xwt.Drawing.Image Image
- {
- get { return image; }
- set
- {
- image = value;
- Source = value.WithSize (Xwt.IconSize.Small).GetImageSource ();
- }
- }
-
public event EventHandler<StatusBarIconClickedEventArgs> Clicked;
}
}
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs index b2053eaea7..c579ab60f3 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs @@ -63,8 +63,12 @@ namespace WindowsPlatform.MainToolbar if (actionCommand.KeyBinding != null)
InputGestureText = actionCommand.KeyBinding.ToString ();
- if (!actionCommand.Icon.IsNull)
- Icon = new Image { Source = actionCommand.Icon.GetImageSource (Xwt.IconSize.Small) };
+ try {
+ if (!actionCommand.Icon.IsNull)
+ Icon = new ImageBox (actionCommand.Icon.GetStockIcon ().WithSize (Xwt.IconSize.Small));
+ } catch (Exception ex) {
+ MonoDevelop.Core.LoggingService.LogError ("Failed loading menu icon: " + actionCommand.Icon, ex);
+ }
Click += OnMenuClicked;
}
@@ -149,7 +153,12 @@ namespace WindowsPlatform.MainToolbar {
hasCommand = true;
Header = info.Text;
- Icon = new Image { Source = info.Icon.GetImageSource (Xwt.IconSize.Small) };
+ try {
+ if (!info.Icon.IsNull)
+ Icon = new ImageBox (info.Icon.GetStockIcon ().WithSize (Xwt.IconSize.Small));
+ } catch (Exception ex) {
+ MonoDevelop.Core.LoggingService.LogError ("Failed loading menu icon: " + info.Icon, ex);
+ }
IsEnabled = info.Enabled;
Visibility = info.Visible && (menuEntry.DisabledVisible || IsEnabled) ?
Visibility.Visible : Visibility.Collapsed;
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.cs index f983b07de6..4b98df0125 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.cs +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.cs @@ -24,78 +24,313 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System;
-using System.Windows.Media;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
using System.Windows;
+using System.Windows.Media;
+using MonoDevelop.Ide;
namespace WindowsPlatform
{
public static class Styles
{
- public static Brush MainToolbarBackgroundBrush { get; private set; }
- public static Brush MainToolbarForegroundBrush { get; private set; }
- public static Brush MainToolbarDisabledForegroundBrush { get; private set; }
- public static Brush MainToolbarShadowBrush { get; private set; }
- public static Brush MainToolbarSeparatorBrush { get; private set; }
- public static Brush MainToolbarButtonPressedBackgroundBrush { get; private set; }
- public static Brush MainToolbarButtonPressedBorderBrush { get; private set; }
-
- public static Brush MenuBarBackgroundBrush { get; private set; }
- public static Brush MenuBarForegroundBrush { get; private set; }
- public static Brush MenuBarBorderBrush { get; private set; }
- public static Brush MenuBackgroundBrush { get; private set; }
- public static Brush MenuForegroundBrush { get; private set; }
- public static Brush MenuBorderBrush { get; private set; }
- public static Brush MenuHighlightBackgroundBrush { get; private set; }
- public static Brush MenuHighlightBorderBrush { get; private set; }
- public static Brush MenuSelectedBackgroundBrush { get; private set; }
- public static Brush MenuSelectedBorderBrush { get; private set; }
- public static Brush MenuDisabledForegroundBrush { get; private set; }
- public static Brush MenuSeparatorBrush { get; private set; }
-
- public static Brush StatusBarBackgroundBrush { get; private set; }
- public static Brush StatusBarTextBrush { get; private set; }
- public static Brush StatusBarErrorTextBrush { get; private set; }
- public static Brush StatusBarWarningTextBrush { get; private set; }
- public static Brush StatusBarReadyTextBrush { get; private set; }
- public static Brush StatusBarProgressBorderBrush { get; private set; }
- public static Brush StatusBarProgressBackgroundBrush { get; private set; }
- public static Brush SearchBarBorderBrush { get; private set; }
- public static Brush SearchBarBackgroundBrush { get; private set; }
- public static Brush SearchBarTextBrush { get; private set; }
+ static Brush mainToolbarBackgroundBrush;
+ static Brush mainToolbarForegroundBrush;
+ static Brush mainToolbarDisabledForegroundBrush;
+ static Brush mainToolbarShadowBrush;
+ static Brush mainToolbarSeparatorBrush;
+ static Brush mainToolbarButtonPressedBackgroundBrush;
+ static Brush mainToolbarButtonPressedBorderBrush;
+ static Brush menuBarBackgroundBrush;
+ static Brush menuBarForegroundBrush;
+ static Brush menuBarBorderBrush;
+ static Brush menuBarHighlightBackgroundBrush;
+ static Brush menuBarHighlightBorderBrush;
+
+ static Brush menuBackgroundBrush;
+ static Brush menuForegroundBrush;
+ static Brush menuBorderBrush;
+ static Brush menuHighlightBackgroundBrush;
+ static Brush menuHighlightBorderBrush;
+ static Brush menuSelectedBackgroundBrush;
+ static Brush menuSelectedBorderBrush;
+ static Brush menuDisabledForegroundBrush;
+ static Brush menuSeparatorBrush;
+
+ static Brush statusBarBackgroundBrush;
+ static Brush statusBarTextBrush;
+ static Brush statusBarErrorTextBrush;
+ static Brush statusBarWarningTextBrush;
+ static Brush statusBarReadyTextBrush;
+ static Brush statusBarProgressBorderBrush;
+ static Brush statusBarProgressBackgroundBrush;
+ static Brush searchBarBorderBrush;
+ static Brush searchBarBackgroundBrush;
+ static Brush searchBarTextBrush;
+
+ public static Brush MainToolbarBackgroundBrush {
+ get { return mainToolbarBackgroundBrush; }
+ private set { mainToolbarBackgroundBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MainToolbarForegroundBrush {
+ get { return mainToolbarForegroundBrush; }
+ private set { mainToolbarForegroundBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MainToolbarDisabledForegroundBrush {
+ get { return mainToolbarDisabledForegroundBrush; }
+ private set { mainToolbarDisabledForegroundBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MainToolbarShadowBrush {
+ get { return mainToolbarShadowBrush; }
+ private set { mainToolbarShadowBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MainToolbarSeparatorBrush {
+ get { return mainToolbarSeparatorBrush; }
+ private set { mainToolbarSeparatorBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MainToolbarButtonPressedBackgroundBrush {
+ get { return mainToolbarButtonPressedBackgroundBrush; }
+ set { mainToolbarButtonPressedBackgroundBrush = value; RaisePropertyChanged (); }
+ }
+
+
+ public static Brush MainToolbarButtonPressedBorderBrush {
+ get { return mainToolbarButtonPressedBorderBrush; }
+ set { mainToolbarButtonPressedBorderBrush = value; RaisePropertyChanged (); }
+ }
+ public static Brush MenuBarBackgroundBrush {
+ get { return menuBarBackgroundBrush; }
+ private set { menuBarBackgroundBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MenuBarForegroundBrush {
+ get { return menuBarForegroundBrush; }
+ private set { menuBarForegroundBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MenuBarBorderBrush {
+ get { return menuBarBorderBrush; }
+ private set { menuBarBorderBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MenuBarHighlightBackgroundBrush {
+ get { return menuBarHighlightBackgroundBrush; }
+ private set { menuBarHighlightBackgroundBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MenuBarHighlightBorderBrush {
+ get { return menuBarHighlightBorderBrush; }
+ private set { menuBarHighlightBorderBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MenuBackgroundBrush {
+ get { return menuBackgroundBrush; }
+ private set { menuBackgroundBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MenuForegroundBrush {
+ get { return menuForegroundBrush; }
+ private set { menuForegroundBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MenuBorderBrush {
+ get { return menuBorderBrush; }
+ private set { menuBorderBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MenuHighlightBackgroundBrush {
+ get { return menuHighlightBackgroundBrush; }
+ private set { menuHighlightBackgroundBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MenuHighlightBorderBrush {
+ get { return menuHighlightBorderBrush; }
+ private set { menuHighlightBorderBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MenuSelectedBackgroundBrush {
+ get { return menuSelectedBackgroundBrush; }
+ private set { menuSelectedBackgroundBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MenuSelectedBorderBrush {
+ get { return menuSelectedBorderBrush; }
+ private set { menuSelectedBorderBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MenuDisabledForegroundBrush {
+ get { return menuDisabledForegroundBrush; }
+ private set { menuDisabledForegroundBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush MenuSeparatorBrush {
+ get { return menuSeparatorBrush; }
+ set { menuSeparatorBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush StatusBarBackgroundBrush {
+ get { return statusBarBackgroundBrush; }
+ private set { statusBarBackgroundBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush StatusBarTextBrush {
+ get { return statusBarTextBrush; }
+ private set { statusBarTextBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush StatusBarErrorTextBrush {
+ get { return statusBarErrorTextBrush; }
+ private set { statusBarErrorTextBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush StatusBarWarningTextBrush {
+ get { return statusBarWarningTextBrush; }
+ private set { statusBarWarningTextBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush StatusBarReadyTextBrush {
+ get { return statusBarReadyTextBrush; }
+ private set { statusBarReadyTextBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush StatusBarProgressBorderBrush {
+ get { return statusBarProgressBorderBrush; }
+ private set { statusBarProgressBorderBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush StatusBarProgressBackgroundBrush {
+ get { return statusBarProgressBackgroundBrush; }
+ private set { statusBarProgressBackgroundBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush SearchBarBorderBrush {
+ get { return searchBarBorderBrush; }
+ private set { searchBarBorderBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush SearchBarBackgroundBrush {
+ get { return searchBarBackgroundBrush; }
+ private set { searchBarBackgroundBrush = value; RaisePropertyChanged (); }
+ }
+
+ public static Brush SearchBarTextBrush {
+ get { return searchBarTextBrush; }
+ private set { searchBarTextBrush = value; RaisePropertyChanged (); }
+ }
+
static Styles ()
{
- MainToolbarBackgroundBrush = Brushes.Transparent;
- MainToolbarForegroundBrush = new SolidColorBrush (new Color { A = 0xFF, R = 0x22, G = 0x22, B = 0x22 });
- MainToolbarDisabledForegroundBrush = Brushes.Gray;
- MainToolbarShadowBrush = Brushes.Gray;
- MainToolbarSeparatorBrush = new SolidColorBrush (new Color { A = 0xFF, R = 0x7d, G = 0x7d, B = 0x7d });
- MainToolbarButtonPressedBackgroundBrush = new SolidColorBrush (new Color { A = 0x66, R = 0x00, G = 0x8B, B = 0xFF });
- MainToolbarButtonPressedBorderBrush = new SolidColorBrush (new Color { A = 0x66, R = 0x00, G = 0x8B, B = 0xFF });
-
- MenuBarBackgroundBrush = SystemColors.MenuBarBrush;
- MenuBarForegroundBrush = SystemColors.MenuTextBrush;
- MenuBarBorderBrush = new SolidColorBrush (new Color { A = 0xFF, R = 0x99, G = 0x99, B = 0x99 });
- MenuBackgroundBrush = Brushes.White;
- MenuForegroundBrush = SystemColors.MenuTextBrush;
- MenuBorderBrush = new SolidColorBrush (new Color { A = 0xFF, R = 0x99, G = 0x99, B = 0x99 });
- MenuSeparatorBrush = new SolidColorBrush (new Color { A = 0xFF, R = 0xD7, G = 0xD7, B = 0xD7 });
- MenuHighlightBackgroundBrush = new SolidColorBrush (new Color { A = 0x66, R = 0x00, G = 0x8B, B = 0xFF });
- MenuHighlightBorderBrush = new SolidColorBrush (new Color { A = 0x66, R = 0x00, G = 0x8B, B = 0xFF });
- MenuSelectedBackgroundBrush = new SolidColorBrush (new Color { A = 0x66, R = 0x00, G = 0x8B, B = 0xFF });
- MenuSelectedBorderBrush = new SolidColorBrush (new Color { A = 0x66, R = 0x00, G = 0x8B, B = 0xFF });
- MenuDisabledForegroundBrush = new SolidColorBrush (new Color { A = 0xFF, R = 0x70, G = 0x70, B = 0x70 });
-
- StatusBarBackgroundBrush = new SolidColorBrush (new Color { A = 0xFF, R = 0xE5, G = 0xE5, B = 0xE5 });
- StatusBarTextBrush = MainToolbarForegroundBrush;
- StatusBarErrorTextBrush = StatusBarTextBrush;
- StatusBarWarningTextBrush = StatusBarTextBrush;
- StatusBarReadyTextBrush = Brushes.Gray;
- StatusBarProgressBorderBrush = new SolidColorBrush (new Color { A = 0xFF, R = 0xD9, G = 0xDC, B = 0xE1 });
- StatusBarProgressBackgroundBrush = new SolidColorBrush (new Color { A = 0xFF, R = 0xB3, G = 0xE7, B = 0x70 });
- SearchBarBorderBrush = Brushes.LightGray;
- SearchBarBackgroundBrush = Brushes.White;
- SearchBarTextBrush = MainToolbarForegroundBrush;
+ Xwt.Drawing.Context.RegisterStyles ("hover", "pressed", "disabled");
+ LoadStyles ();
+ MonoDevelop.Ide.Gui.Styles.Changed += (o, e) => LoadStyles ();
+ }
+
+ public static Color ColorFromHex (string s, double alpha = 1.0)
+ {
+ if (s.StartsWith ("#", StringComparison.Ordinal))
+ s = s.Substring (1);
+ if (s.Length == 3)
+ s = "" + s[0]+s[0]+s[1]+s[1]+s[2]+s[2];
+ byte r = byte.Parse (s.Substring (0,2), System.Globalization.NumberStyles.HexNumber);
+ byte g = byte.Parse (s.Substring (2,2), System.Globalization.NumberStyles.HexNumber);
+ byte b = byte.Parse (s.Substring (4,2), System.Globalization.NumberStyles.HexNumber);
+ byte a = (byte)(alpha * 255d);
+ return new Color { R = r, G = g, B = b, A = a };
+ }
+
+ public static Color WithAlpha (this Color color, double alpha)
+ {
+ color.A = (byte)(alpha * 255d);
+ return color;
+ }
+
+ public static void LoadStyles ()
+ {
+ if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) {
+ MainToolbarBackgroundBrush = new SolidColorBrush (ColorFromHex("FFFFFF", 0));
+ MainToolbarForegroundBrush = new SolidColorBrush (ColorFromHex("222222"));
+ MainToolbarDisabledForegroundBrush = new SolidColorBrush (ColorFromHex("808080"));
+ MainToolbarShadowBrush = new SolidColorBrush (ColorFromHex("808080"));
+ MainToolbarSeparatorBrush = new SolidColorBrush (ColorFromHex("7D7D7D"));
+ MainToolbarButtonPressedBackgroundBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.4));
+ MainToolbarButtonPressedBorderBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.4));
+
+ MenuBarBackgroundBrush = SystemColors.MenuBarBrush;
+ MenuBarForegroundBrush = SystemColors.MenuTextBrush;
+ MenuBarBorderBrush = new SolidColorBrush (ColorFromHex("999999"));
+ MenuBarHighlightBackgroundBrush = new SolidColorBrush (ColorFromHex("C3E3FE"));
+ MenuBarHighlightBorderBrush = new SolidColorBrush (ColorFromHex("C3E3FE"));
+
+ MenuBackgroundBrush = new SolidColorBrush (ColorFromHex("FFFFFF"));
+ MenuForegroundBrush = new SolidColorBrush (ColorFromHex("000000"));
+ MenuBorderBrush = new SolidColorBrush (ColorFromHex("999999"));
+ MenuSeparatorBrush = new SolidColorBrush (ColorFromHex("EAEAEA"));
+ MenuHighlightBackgroundBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.2));
+ MenuHighlightBorderBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.2));
+ MenuSelectedBackgroundBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.2));
+ MenuSelectedBorderBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.2));
+ MenuDisabledForegroundBrush = new SolidColorBrush (ColorFromHex("A0A0A0"));
+
+ StatusBarBackgroundBrush = new SolidColorBrush (ColorFromHex("E5E5E5"));
+ StatusBarTextBrush = MainToolbarForegroundBrush;
+ StatusBarErrorTextBrush = StatusBarTextBrush;
+ StatusBarWarningTextBrush = StatusBarTextBrush;
+ StatusBarReadyTextBrush = new SolidColorBrush (ColorFromHex("808080"));
+ StatusBarProgressBorderBrush = new SolidColorBrush (ColorFromHex("D9DCE1"));
+ StatusBarProgressBackgroundBrush = new SolidColorBrush (ColorFromHex("B3E770"));
+ SearchBarBorderBrush = new SolidColorBrush (ColorFromHex("D3D3D3"));
+ SearchBarBackgroundBrush = new SolidColorBrush (ColorFromHex("FFFFFF"));
+ SearchBarTextBrush = MainToolbarForegroundBrush;
+ } else {
+ MainToolbarBackgroundBrush = new SolidColorBrush (ColorFromHex("303030"));
+ MainToolbarForegroundBrush = new SolidColorBrush (ColorFromHex("bfbfbf"));
+ MainToolbarDisabledForegroundBrush = new SolidColorBrush (ColorFromHex("808080"));
+ MainToolbarShadowBrush = new SolidColorBrush (ColorFromHex("747474"));
+ MainToolbarSeparatorBrush = new SolidColorBrush (ColorFromHex("7D7D7D"));
+ MainToolbarButtonPressedBackgroundBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.4));
+ MainToolbarButtonPressedBorderBrush = new SolidColorBrush (ColorFromHex("008BFF", 0.4));
+
+ MenuBarBackgroundBrush = MainToolbarBackgroundBrush;
+ MenuBarForegroundBrush = MainToolbarForegroundBrush;
+ MenuBarBorderBrush = new SolidColorBrush (ColorFromHex("5D5D5D"));
+ MenuBarHighlightBackgroundBrush = new SolidColorBrush (ColorFromHex("8ECAFF", 0.3));
+ MenuBarHighlightBorderBrush = new SolidColorBrush (ColorFromHex("8ECAFF", 0.3));
+
+ MenuBackgroundBrush = MainToolbarBackgroundBrush;
+ MenuForegroundBrush = MainToolbarForegroundBrush;
+ MenuBorderBrush = new SolidColorBrush (ColorFromHex("5D5D5D"));
+ MenuSeparatorBrush = new SolidColorBrush (ColorFromHex("444444"));
+ MenuHighlightBackgroundBrush = new SolidColorBrush (ColorFromHex("8ECAFF", 0.3));
+ MenuHighlightBorderBrush = new SolidColorBrush (ColorFromHex("8ECAFF", 0.3));
+ MenuSelectedBackgroundBrush = MenuHighlightBackgroundBrush;
+ MenuSelectedBorderBrush = MenuHighlightBorderBrush;
+ MenuDisabledForegroundBrush = new SolidColorBrush (ColorFromHex("707070"));
+
+ StatusBarBackgroundBrush = new SolidColorBrush (ColorFromHex("3D3D3D"));
+ StatusBarTextBrush = MainToolbarForegroundBrush;
+ StatusBarErrorTextBrush = StatusBarTextBrush;
+ StatusBarWarningTextBrush = StatusBarTextBrush;
+ StatusBarReadyTextBrush = new SolidColorBrush (ColorFromHex("D3D3D3"));
+ StatusBarProgressBorderBrush = new SolidColorBrush (ColorFromHex("444444"));
+ StatusBarProgressBackgroundBrush = new SolidColorBrush (ColorFromHex("516833"));
+ SearchBarBorderBrush = new SolidColorBrush (ColorFromHex("1A1A1A"));
+ SearchBarBackgroundBrush = new SolidColorBrush (ColorFromHex("222222"));
+ SearchBarTextBrush = MainToolbarForegroundBrush;
+ }
+ }
+
+ public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
+
+ static void RaisePropertyChanged ([CallerMemberName] string propName = null)
+ {
+ if (StaticPropertyChanged != null)
+ StaticPropertyChanged (null, new PropertyChangedEventArgs (propName));
}
}
}
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.xaml b/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.xaml index e6c7fa9141..1adbeed427 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.xaml +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Styles.xaml @@ -41,7 +41,7 @@ BorderThickness="{TemplateBinding BorderThickness}"
Padding="{TemplateBinding Padding}"
SnapsToDevicePixels="true"
- TextElement.Foreground="{Binding Path=(platform:Styles.MenuBarForegroundBrush), Mode=OneWay}">
+ TextElement.Foreground="{Binding Path=(platform:Styles.MenuBarForegroundBrush), Mode=OneWay}">
<ItemsPresenter
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
@@ -287,8 +287,8 @@ <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
</Trigger>
<Trigger Property="IsHighlighted" Value="True">
- <Setter TargetName="templateRoot" Property="Background" Value="{Binding Path=(platform:Styles.MenuHighlightBackgroundBrush), Mode=OneWay}" />
- <Setter TargetName="templateRoot" Property="BorderBrush" Value="{Binding Path=(platform:Styles.MenuHighlightBorderBrush), Mode=OneWay}" />
+ <Setter TargetName="templateRoot" Property="Background" Value="{Binding Path=(platform:Styles.MenuBarHighlightBackgroundBrush), Mode=OneWay}" />
+ <Setter TargetName="templateRoot" Property="BorderBrush" Value="{Binding Path=(platform:Styles.MenuBarHighlightBorderBrush), Mode=OneWay}" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{Binding Path=(platform:Styles.MenuDisabledForegroundBrush), Mode=OneWay}" />
@@ -355,7 +355,7 @@ <TextBlock x:Name="menuGestureText"
Grid.Column="4"
Text="{TemplateBinding InputGestureText}"
- Margin="0,0,0,1"
+ Margin="{TemplateBinding MenuItem.Padding}"
VerticalAlignment="Center"
Opacity="0.7" />
</Grid>
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj index 058242c7a4..db96b196af 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj @@ -134,6 +134,7 @@ <Compile Include="CustomDialogs\CustomCommonSaveFileDialog.cs" /> <Compile Include="Dialogs\CommonFileDialogExtensions.cs" /> <Compile Include="ImageHelper.cs" /> + <Compile Include="ImageBox.cs" /> <Compile Include="Styles.cs" /> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~hover.png Binary files differindex 1cc59c2c9a..0addc45bb6 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~hover.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~hover.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~hover~dark.png Binary files differindex 06c95af544..b8cb68fda5 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~hover~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~hover~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~pressed.png Binary files differindex 379d37b81d..4480cde1ef 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~pressed.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~pressed.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~pressed~dark.png Binary files differindex e192dc9a1c..1aa2f118e7 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~pressed~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/build~pressed~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~hover.png Binary files differindex ce4191bb1e..aaa5f9f32d 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~hover.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~hover.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~hover~dark.png Binary files differindex ef0fb77fcd..4aa55e23e7 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~hover~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~hover~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~pressed.png Binary files differindex fd3303407f..773a31bfe1 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~pressed.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~pressed.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~pressed~dark.png Binary files differindex f0dc09138f..e86b14d4c1 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~pressed~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/execute~pressed~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~hover.png Binary files differindex 5778cc6386..f7e0b0695d 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~hover.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~hover.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~hover~dark.png Binary files differindex d862f751d5..7533422956 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~hover~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~hover~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~pressed.png Binary files differindex 8d9c2914df..68176aaee4 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~pressed.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~pressed.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~pressed~dark.png Binary files differindex 71f7babc72..0ac1d047b4 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~pressed~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-continue-debug~pressed~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~hover.png Binary files differindex 0055dba9f9..d83476b18b 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~hover.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~hover.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~hover~dark.png Binary files differindex f93aec598a..392ce0d026 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~hover~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~hover~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~pressed.png Binary files differindex b70c9e8e09..e4d9d7f7da 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~pressed.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~pressed.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~pressed~dark.png Binary files differindex 3796861ee8..9781213f5e 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~pressed~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-pause-debug~pressed~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~hover.png Binary files differindex b19ac045e5..54fcdd2d19 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~hover.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~hover.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~hover~dark.png Binary files differindex 9d7bad973c..04cacda22c 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~hover~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~hover~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~pressed.png Binary files differindex c625e49d66..45096396b3 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~pressed.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~pressed.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~pressed~dark.png Binary files differindex 1e5fec2e00..2d7425f9b8 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~pressed~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-into-debug~pressed~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~hover.png Binary files differindex ab672f92e5..dedda1fe2d 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~hover.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~hover.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~hover~dark.png Binary files differindex 95c81a97f1..92177a1afe 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~hover~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~hover~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~pressed.png Binary files differindex 5b0e71c236..29b22c51ea 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~pressed.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~pressed.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~pressed~dark.png Binary files differindex d27bdf95b0..c1d754c159 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~pressed~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-out-debug~pressed~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~hover.png Binary files differindex 1416c54713..5e3c9a91f9 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~hover.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~hover.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~hover~dark.png Binary files differindex 6edbf24151..6a7b525517 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~hover~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~hover~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~pressed.png Binary files differindex d26f1ba3f2..d307dbac64 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~pressed.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~pressed.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~pressed~dark.png Binary files differindex c5acc3c918..25e17dfd7f 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~pressed~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/md-step-over-debug~pressed~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~hover.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~hover.png Binary files differindex 2128df2d3f..e7ab64e381 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~hover.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~hover.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~hover~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~hover~dark.png Binary files differindex 2b2fadeace..4d45bb423a 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~hover~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~hover~dark.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~pressed.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~pressed.png Binary files differindex c377c03b04..f009fae10b 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~pressed.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~pressed.png diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~pressed~dark.png b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~pressed~dark.png Binary files differindex b2d8c7bf21..784b0c22d1 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~pressed~dark.png +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/icons/stop~pressed~dark.png diff --git a/main/src/addins/Xml/Formatting/XmlFormattingPolicyPanelWidget.cs b/main/src/addins/Xml/Formatting/XmlFormattingPolicyPanelWidget.cs index b637b0d3d2..d97e0858eb 100644 --- a/main/src/addins/Xml/Formatting/XmlFormattingPolicyPanelWidget.cs +++ b/main/src/addins/Xml/Formatting/XmlFormattingPolicyPanelWidget.cs @@ -26,6 +26,7 @@ using System; using Gtk; +using MonoDevelop.Components; using MonoDevelop.Core; using MonoDevelop.Ide; @@ -227,7 +228,7 @@ namespace MonoDevelop.Xml.Formatting }; uint c = 2; if (currentFormat.ScopeXPath.Count != 1) { - var butRem = new Button (ImageService.GetImage (Stock.Remove, IconSize.Menu)); + var butRem = new Button (new ImageView (Stock.Remove, IconSize.Menu)); tableScopes.Attach (butRem, 2, 3, n, n + 1, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0); butRem.Clicked += delegate { currentFormat.ScopeXPath.RemoveAt (capn); @@ -237,7 +238,7 @@ namespace MonoDevelop.Xml.Formatting c++; } if (n == currentFormat.ScopeXPath.Count - 1) { - var butAdd = new Button (ImageService.GetImage (Stock.Add, IconSize.Menu)); + var butAdd = new Button (new ImageView (Stock.Add, IconSize.Menu)); tableScopes.Attach (butAdd, c, c + 1, n, n + 1, AttachOptions.Shrink, AttachOptions.Shrink, 0, 0); butAdd.Clicked += delegate { currentFormat.ScopeXPath.Add (""); diff --git a/main/src/addins/Xml/MonoDevelop.Xml.csproj b/main/src/addins/Xml/MonoDevelop.Xml.csproj index bb286f104c..ecd57e0813 100644 --- a/main/src/addins/Xml/MonoDevelop.Xml.csproj +++ b/main/src/addins/Xml/MonoDevelop.Xml.csproj @@ -119,11 +119,23 @@ <EmbeddedResource Include="icons\prefs-xml-16%402x.png"> <LogicalName>prefs-xml-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\prefs-xml-schemas-16.png"> - <LogicalName>prefs-xml-schemas-16.png</LogicalName> + <EmbeddedResource Include="icons\prefs-xml-16~dark.png"> + <LogicalName>prefs-xml-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\prefs-xml-schemas-16%402x.png"> - <LogicalName>prefs-xml-schemas-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\prefs-xml-16~dark%402x.png"> + <LogicalName>prefs-xml-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-xml-16~sel.png"> + <LogicalName>prefs-xml-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-xml-16~sel%402x.png"> + <LogicalName>prefs-xml-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-xml-16~dark~sel.png"> + <LogicalName>prefs-xml-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-xml-16~dark~sel%402x.png"> + <LogicalName>prefs-xml-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="Formatting\MonoXmlPolicy.xml"> <LogicalName>MonoXmlPolicy.xml</LogicalName> diff --git a/main/src/addins/Xml/Properties/MonoDevelop.XmlEditor.addin.xml b/main/src/addins/Xml/Properties/MonoDevelop.XmlEditor.addin.xml index c9e4c3556b..106cc52ce7 100644 --- a/main/src/addins/Xml/Properties/MonoDevelop.XmlEditor.addin.xml +++ b/main/src/addins/Xml/Properties/MonoDevelop.XmlEditor.addin.xml @@ -86,7 +86,7 @@ <Section id="XmlFormattingOptions" insertbefore="Formatting" _label="XML" fill="true" class="MonoDevelop.Xml.Editor.XmlEditorOptionsPanel" icon="md-prefs-xml" />
</Extension>
<Extension path = "/MonoDevelop/Ide/GlobalOptionsDialog/TextEditor">
- <Section id="XmlSchemas" _label="XML Schemas" fill="true" class="MonoDevelop.Xml.Editor.XmlSchemasPanel" icon="md-prefs-xml-schemas" />
+ <Section id="XmlSchemas" _label="XML Schemas" fill="true" class="MonoDevelop.Xml.Editor.XmlSchemasPanel" icon="md-prefs-xml" />
</Extension>
<Extension path = "/MonoDevelop/TypeSystem/Parser">
@@ -120,6 +120,5 @@ <Extension path="/MonoDevelop/Core/StockIcons">
<StockIcon stockid="md-prefs-xml" resource="prefs-xml-16.png" size="Menu" />
- <StockIcon stockid="md-prefs-xml-schemas" resource="prefs-xml-schemas-16.png" size="Menu" />
</Extension>
</ExtensionModel>
diff --git a/main/src/addins/Xml/icons/prefs-xml-16.png b/main/src/addins/Xml/icons/prefs-xml-16.png Binary files differindex fc6082d1cb..658a3e0e60 100644 --- a/main/src/addins/Xml/icons/prefs-xml-16.png +++ b/main/src/addins/Xml/icons/prefs-xml-16.png diff --git a/main/src/addins/Xml/icons/prefs-xml-16@2x.png b/main/src/addins/Xml/icons/prefs-xml-16@2x.png Binary files differindex 0aef2fef5d..7b4a3e5602 100644 --- a/main/src/addins/Xml/icons/prefs-xml-16@2x.png +++ b/main/src/addins/Xml/icons/prefs-xml-16@2x.png diff --git a/main/src/addins/Xml/icons/prefs-xml-16~dark.png b/main/src/addins/Xml/icons/prefs-xml-16~dark.png Binary files differnew file mode 100644 index 0000000000..8a8ba1294c --- /dev/null +++ b/main/src/addins/Xml/icons/prefs-xml-16~dark.png diff --git a/main/src/addins/Xml/icons/prefs-xml-16~dark@2x.png b/main/src/addins/Xml/icons/prefs-xml-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..37267d365b --- /dev/null +++ b/main/src/addins/Xml/icons/prefs-xml-16~dark@2x.png diff --git a/main/src/addins/Xml/icons/prefs-xml-16~dark~sel.png b/main/src/addins/Xml/icons/prefs-xml-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..712f58462a --- /dev/null +++ b/main/src/addins/Xml/icons/prefs-xml-16~dark~sel.png diff --git a/main/src/addins/Xml/icons/prefs-xml-16~dark~sel@2x.png b/main/src/addins/Xml/icons/prefs-xml-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2b56aa7bb5 --- /dev/null +++ b/main/src/addins/Xml/icons/prefs-xml-16~dark~sel@2x.png diff --git a/main/src/addins/Xml/icons/prefs-xml-16~sel.png b/main/src/addins/Xml/icons/prefs-xml-16~sel.png Binary files differnew file mode 100644 index 0000000000..c1fd928313 --- /dev/null +++ b/main/src/addins/Xml/icons/prefs-xml-16~sel.png diff --git a/main/src/addins/Xml/icons/prefs-xml-16~sel@2x.png b/main/src/addins/Xml/icons/prefs-xml-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..9b9f7fbae7 --- /dev/null +++ b/main/src/addins/Xml/icons/prefs-xml-16~sel@2x.png diff --git a/main/src/addins/Xml/icons/prefs-xml-schemas-16.png b/main/src/addins/Xml/icons/prefs-xml-schemas-16.png Binary files differdeleted file mode 100644 index fc6082d1cb..0000000000 --- a/main/src/addins/Xml/icons/prefs-xml-schemas-16.png +++ /dev/null diff --git a/main/src/addins/Xml/icons/prefs-xml-schemas-16@2x.png b/main/src/addins/Xml/icons/prefs-xml-schemas-16@2x.png Binary files differdeleted file mode 100644 index 0aef2fef5d..0000000000 --- a/main/src/addins/Xml/icons/prefs-xml-schemas-16@2x.png +++ /dev/null diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs index 68c09b48de..9b702806ac 100644 --- a/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs +++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs @@ -71,14 +71,8 @@ namespace Mono.TextEditor.Highlighting [ColorDescription("Indicator Margin(Separator)", VSSetting="color=Indicator Margin/Background")] public AmbientColor IndicatorMarginSeparator { get; private set; } - [ColorDescription("Tooltip Border")] - public AmbientColor TooltipBorder { get; private set; } - [ColorDescription("Tooltip Pager Top")] - public AmbientColor TooltipPagerTop { get; private set; } - - [ColorDescription("Tooltip Pager Bottom")] - public AmbientColor TooltipPagerBottom { get; private set; } + public AmbientColor TooltipPager { get; private set; } [ColorDescription("Tooltip Pager Triangle")] public AmbientColor TooltipPagerTriangle { get; private set; } @@ -1058,18 +1052,12 @@ namespace Mono.TextEditor.Highlighting h.L += 0.01; result.TooltipText.Background = h; - result.TooltipPagerTop = new AmbientColor (); - result.TooltipPagerTop.Colors.Add (Tuple.Create ("color", result.TooltipText.Background)); + result.TooltipPager = new AmbientColor (); + result.TooltipPager.Colors.Add (Tuple.Create ("color", result.TooltipText.Background)); - result.TooltipPagerBottom = new AmbientColor (); - result.TooltipPagerBottom.Colors.Add (Tuple.Create ("color", result.TooltipText.Background)); - result.TooltipPagerTriangle = new AmbientColor (); result.TooltipPagerTriangle.Colors.Add (Tuple.Create ("color", AlphaBlend (result.PlainText.Foreground, result.PlainText.Background, 0.8))); - result.TooltipBorder = new AmbientColor (); - result.TooltipBorder.Colors.Add (Tuple.Create ("color", AlphaBlend (result.PlainText.Foreground, result.PlainText.Background, 0.5))); - var defaultStyle = SyntaxModeService.GetColorStyle (HslColor.Brightness (result.PlainText.Background) < 0.5 ? "Monokai" : TextEditorOptions.DefaultColorStyle); foreach (var color in textColors.Values) { diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.PopupWindow/ModeHelpWindow.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor.PopupWindow/ModeHelpWindow.cs index 2c780a2924..7ddff355b3 100644 --- a/main/src/core/Mono.Texteditor/Mono.TextEditor.PopupWindow/ModeHelpWindow.cs +++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.PopupWindow/ModeHelpWindow.cs @@ -128,14 +128,7 @@ namespace Mono.TextEditor.PopupWindow const int yBorder = 2; protected override bool OnExposeEvent (Gdk.EventExpose args) - { - Cairo.Color bgColor = new Cairo.Color (1, 1, 1); - Cairo.Color titleBgColor = new Cairo.Color (0.88, 0.88, 0.98); - Cairo.Color categoryBgColor = new Cairo.Color (0.58, 0.58, 0.98); - Cairo.Color borderColor = new Cairo.Color (0.4, 0.4, 0.6); - Cairo.Color textColor = new Cairo.Color (0.3, 0.3, 1); - Cairo.Color gridColor = new Cairo.Color (0.8, 0.8, 0.8); - + { using (var g = Gdk.CairoHelper.Create (args.Window)) { g.Translate (Allocation.X, Allocation.Y); g.LineWidth = 1; @@ -146,26 +139,26 @@ namespace Mono.TextEditor.PopupWindow layout.GetPixelSize (out width, out height); width += xBorder * 2; FoldingScreenbackgroundRenderer.DrawRoundRectangle (g, true, false, 0.5, 0.5, height + yBorder * 2 + 1.5, width, height + yBorder * 2); - g.SetSourceColor (titleBgColor); + g.SetSourceColor (Styles.TableLayoutModeTitleBackgroundColor.ToCairoColor ()); g.FillPreserve (); - g.SetSourceColor (borderColor); + g.SetSourceColor (Styles.TableLayoutModeBorderColor.ToCairoColor ()); g.Stroke (); g.Save (); - g.SetSourceColor (textColor); + g.SetSourceColor (Styles.TableLayoutModeTextColor.ToCairoColor ()); g.Translate (xBorder, yBorder); g.ShowLayout (layout); g.Restore (); FoldingScreenbackgroundRenderer.DrawRoundRectangle (g, false, true, 0.5, height * 2 + yBorder * 2 + 0.5, height, Allocation.Width - 1, Allocation.Height - height * 2 - yBorder * 2 - 1); - g.SetSourceColor (bgColor); + g.SetSourceColor (Styles.TableLayoutModeBackgroundColor.ToCairoColor ()); g.FillPreserve (); - g.SetSourceColor (borderColor); + g.SetSourceColor (Styles.TableLayoutModeBorderColor.ToCairoColor ()); g.Stroke (); g.MoveTo (xSpacer + 0.5, height * 2 + yBorder * 2); g.LineTo (xSpacer + 0.5, Allocation.Height - 1); - g.SetSourceColor (gridColor); + g.SetSourceColor (Styles.TableLayoutModeGridColor.ToCairoColor ()); g.Stroke (); int y = height + yBorder * 2; @@ -178,26 +171,26 @@ namespace Mono.TextEditor.PopupWindow if (i == 0) { FoldingScreenbackgroundRenderer.DrawRoundRectangle (g, false, true, false, false, 0, y + 0.5, height + 1.5, Allocation.Width, height); - g.SetSourceColor (categoryBgColor); + g.SetSourceColor (Styles.TableLayoutModeCategoryBackgroundColor.ToCairoColor ()); g.FillPreserve (); - g.SetSourceColor (borderColor); + g.SetSourceColor (Styles.TableLayoutModeBorderColor.ToCairoColor ()); g.Stroke (); g.MoveTo (xSpacer + 0.5, height + yBorder * 2 + 1); g.LineTo (xSpacer + 0.5, height * 2 + yBorder * 2 + 1); - g.SetSourceColor (gridColor); + g.SetSourceColor (Styles.TableLayoutModeGridColor.ToCairoColor ()); g.Stroke (); } - gc.RgbFgColor = (HslColor)(i == 0 ? bgColor : textColor); + gc.RgbFgColor = (HslColor)(i == 0 ? Styles.TableLayoutModeBackgroundColor : Styles.TableLayoutModeTextColor).ToCairoColor (); g.Save (); - g.SetSourceColor (textColor); + g.SetSourceColor (Styles.TableLayoutModeTextColor.ToCairoColor ()); g.Translate (xBorder, y); g.ShowLayout (layout); g.Restore (); g.Save (); - g.SetSourceColor (textColor); + g.SetSourceColor (Styles.TableLayoutModeTextColor.ToCairoColor ()); g.Translate (xSpacer + xBorder, y); layout.SetMarkup (pair.Value); g.ShowLayout (layout); @@ -207,7 +200,7 @@ namespace Mono.TextEditor.PopupWindow if (i > 0) { g.MoveTo (1, y + 0.5); g.LineTo (Allocation.Width - 1, y + 0.5); - g.SetSourceColor (gridColor); + g.SetSourceColor (Styles.TableLayoutModeGridColor.ToCairoColor ()); g.Stroke (); } y += height; @@ -231,8 +224,6 @@ namespace Mono.TextEditor.PopupWindow const int outlinedFontSize = 8; const int outlinePadding = 1; const int textInnerPadding = 1; - static readonly Cairo.Color outlineColor = HslColor.Parse ("#666666"); - static readonly Cairo.Color textColor = HslColor.Parse ("#555555"); Pango.Layout layout; SymbolTokenType Symbol; @@ -293,7 +284,7 @@ namespace Mono.TextEditor.PopupWindow cr.MoveTo (x, y); cr.LineWidth = 1; - cr.SetSourceColor (outlineColor); + cr.SetSourceColor (Styles.ModeHelpWindowTokenOutlineColor.ToCairoColor()); if (Symbol == SymbolTokenType.None) inner_padding = textInnerPadding; @@ -316,7 +307,7 @@ namespace Mono.TextEditor.PopupWindow } } else { cr.MoveTo (x, y); - cr.SetSourceColor (textColor); + cr.SetSourceColor (Styles.ModeHelpWindowTokenTextColor.ToCairoColor()); cr.ShowLayout (layout); } } @@ -432,7 +423,7 @@ namespace Mono.TextEditor.PopupWindow int h2 = descTexts.Sum (x => x.Height + x.Spacing); int w2 = descTexts.Max (x => x.Width + x.Spacing * 2); - totalHeight += h2; + totalHeight += h2 + 4; xSpacer = System.Math.Max (width, w2); xSpacer += xDescriptionBorder * 2 + 1; @@ -459,10 +450,6 @@ namespace Mono.TextEditor.PopupWindow const int xDescriptionBorder = 12; const int yDescriptionBorder = 8; const int yTitleBorder = 8; - static readonly Cairo.Color bgColor = HslColor.Parse ("#f2f2f2"); - static readonly Cairo.Color titleTextColor = HslColor.Parse ("#242424"); - static readonly Cairo.Color borderColor = HslColor.Parse ("#d5d5d5"); - static readonly Cairo.Color textColor = HslColor.Parse ("#4c4c4c"); protected override bool OnExposeEvent (Gdk.EventExpose args) { @@ -481,14 +468,14 @@ namespace Mono.TextEditor.PopupWindow } else { g.Rectangle (0, 0, Allocation.Width, height + yTitleBorder * 2); } - g.SetSourceColor (bgColor); + g.SetSourceColor (Styles.InsertionCursorBackgroundColor.ToCairoColor ()); g.FillPreserve (); - g.SetSourceColor (borderColor); + g.SetSourceColor (Styles.InsertionCursorBorderColor.ToCairoColor ()); g.Stroke (); g.MoveTo (tw + xDescriptionBorder, yTitleBorder); - g.SetSourceColor (titleTextColor); + g.SetSourceColor (Styles.InsertionCursorTitleTextColor.ToCairoColor ()); g.ShowLayout (titleLayout); if (SupportsAlpha) { @@ -498,19 +485,19 @@ namespace Mono.TextEditor.PopupWindow g.LineTo (tw + 5, Allocation.Height / 2 + th / 2); g.LineTo (tw + 5, Allocation.Height / 2 - th / 2); g.ClosePath (); - g.SetSourceColor (bgColor); + g.SetSourceColor (Styles.InsertionCursorBackgroundColor.ToCairoColor ()); g.Fill (); g.MoveTo (tw, Allocation.Height / 2 - th / 2); g.LineTo (0, Allocation.Height / 2); g.LineTo (tw, Allocation.Height / 2 + th / 2); - g.SetSourceColor (borderColor); + g.SetSourceColor (Styles.InsertionCursorBorderColor.ToCairoColor ()); g.Stroke (); } int y = height + yTitleBorder + yDescriptionBorder; int x = tw + xDescriptionBorder; - g.SetSourceColor (textColor); + g.SetSourceColor (Styles.InsertionCursorTextColor.ToCairoColor ()); foreach (var desc in descTexts) { desc.Render (g, x, y + 4); diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor.csproj b/main/src/core/Mono.Texteditor/Mono.TextEditor.csproj index 396513b767..49e7688724 100644 --- a/main/src/core/Mono.Texteditor/Mono.TextEditor.csproj +++ b/main/src/core/Mono.Texteditor/Mono.TextEditor.csproj @@ -223,6 +223,7 @@ <Compile Include="Mono.TextEditor\Document\LazyLineSplitter.cs" /> <Compile Include="Mono.TextEditor.Utils\ImmutableText.cs" /> <Compile Include="Mono.TextEditor.Utils\ImmutableTextTextReader.cs" /> + <Compile Include="Mono.TextEditor\Styles.cs" /> </ItemGroup> <ItemGroup> <None Include="Mono.TextEditor.dll.config"> diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/BookmarkMarker.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/BookmarkMarker.cs index 63e525d6d5..6b6c3b41e2 100644 --- a/main/src/core/Mono.Texteditor/Mono.TextEditor/BookmarkMarker.cs +++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/BookmarkMarker.cs @@ -63,13 +63,16 @@ namespace Mono.TextEditor var color2 = editor.ColorStyle.Bookmarks.SecondColor; DrawRoundRectangle (cr, x + 1, y + 1, 8, width - 4, height - 4); + + // FIXME: VV: Remove gradient features using (var pat = new Cairo.LinearGradient (x + width / 4, y, x + width / 2, y + height - 4)) { pat.AddColorStop (0, color1); pat.AddColorStop (1, color2); cr.SetSource (pat); cr.FillPreserve (); } - + + // FIXME: VV: Remove gradient features using (var pat = new Cairo.LinearGradient (x, y + height, x + width, y)) { pat.AddColorStop (0, color2); //pat.AddColorStop (1, color1); diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/CodeSegmentPreviewWindow.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/CodeSegmentPreviewWindow.cs index 2e92eeb63a..8124b6b71a 100644 --- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/CodeSegmentPreviewWindow.cs +++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/CodeSegmentPreviewWindow.cs @@ -39,7 +39,7 @@ namespace Mono.TextEditor const int DefaultPreviewWindowWidth = 320; const int DefaultPreviewWindowHeight = 200; MonoTextEditor editor; - Pango.FontDescription fontDescription; + Pango.FontDescription fontDescription, fontInform; Pango.Layout layout; Pango.Layout informLayout; @@ -78,6 +78,9 @@ namespace Mono.TextEditor this.TypeHint = WindowTypeHint.Menu; layout = PangoUtil.CreateLayout (this); informLayout = PangoUtil.CreateLayout (this); + fontInform = Pango.FontDescription.FromString (editor.Options.FontName); + fontInform.Size = (int)(fontInform.Size * 0.7f); + informLayout.FontDescription = fontInform; informLayout.SetText (CodeSegmentPreviewInformString); fontDescription = Pango.FontDescription.FromString (editor.Options.FontName); @@ -122,8 +125,8 @@ namespace Mono.TextEditor h += h2; } Gdk.Rectangle geometry = Screen.GetUsableMonitorGeometry (Screen.GetMonitorAtWindow (editor.GdkWindow)); - this.SetSizeRequest (System.Math.Max (1, System.Math.Min (w + 3, geometry.Width * 2 / 5)), - System.Math.Max (1, System.Math.Min (h + 3, geometry.Height * 2 / 5))); + this.SetSizeRequest (System.Math.Max (1, System.Math.Min (w + 3, geometry.Width * 2 / 5) + 5), + System.Math.Max (1, System.Math.Min (h + 3, geometry.Height * 2 / 5)) + 5); } protected override void OnDestroyed () @@ -131,6 +134,7 @@ namespace Mono.TextEditor layout = layout.Kill (); informLayout = informLayout.Kill (); fontDescription = fontDescription.Kill (); + fontInform = fontInform.Kill (); if (textGC != null) { textGC.Dispose (); textBgGC.Dispose (); @@ -160,7 +164,7 @@ namespace Mono.TextEditor } ev.Window.DrawRectangle (textBgGC, true, ev.Area); - ev.Window.DrawLayout (textGC, 1, 1, layout); + ev.Window.DrawLayout (textGC, 5, 4, layout); ev.Window.DrawRectangle (textBgGC, false, 1, 1, this.Allocation.Width - 3, this.Allocation.Height - 3); ev.Window.DrawRectangle (foldGC, false, 0, 0, this.Allocation.Width - 1, this.Allocation.Height - 1); @@ -170,7 +174,7 @@ namespace Mono.TextEditor informLayout.GetPixelSize (out w, out h); PreviewInformStringHeight = h; ev.Window.DrawRectangle (foldBgGC, true, Allocation.Width - w - 3, Allocation.Height - h, w + 2, h - 1); - ev.Window.DrawLayout (foldGC, Allocation.Width - w - 3, Allocation.Height - h, informLayout); + ev.Window.DrawLayout (foldGC, Allocation.Width - w - 4, Allocation.Height - h - 3, informLayout); } return true; } diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/MonoTextEditor.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/MonoTextEditor.cs index 4cbc27f5d6..45e4e0c482 100644 --- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/MonoTextEditor.cs +++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/MonoTextEditor.cs @@ -173,6 +173,11 @@ namespace Mono.TextEditor containerChildren.ForEach (c => c.Child.SizeRequest ()); } + internal protected virtual string GetIdeColorStyleName () + { + return TextEditorOptions.DefaultColorStyle; + } + #region Container public override ContainerChild this [Widget w] { get { diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs index b85fe83256..c17308e1bf 100644 --- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs +++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs @@ -757,7 +757,11 @@ namespace Mono.TextEditor if (parent != null) { parent.ModifyBg (StateType.Normal, (HslColor)this.textEditorData.ColorStyle.PlainText.Background); } - + + // set additionally the real parent background for gtk themes that use the content background + // to draw the scrollbar slider trough. + this.Parent.ModifyBg (StateType.Normal, (HslColor)this.textEditorData.ColorStyle.PlainText.Background); + this.ModifyBg (StateType.Normal, (HslColor)this.textEditorData.ColorStyle.PlainText.Background); settingWidgetBg = false; } @@ -2668,6 +2672,8 @@ namespace Mono.TextEditor //draw the highlight rectangle FoldingScreenbackgroundRenderer.DrawRoundRectangle (cr, true, true, 0, 0, corner, width, height); + + // FIXME: VV: Remove gradient features using (var gradient = new Cairo.LinearGradient (0, 0, 0, height)) { color = ColorLerp ( TextViewMargin.DimColor (Editor.ColorStyle.SearchResultMain.Color, 1.1), diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs index 415ce3f9a1..2ff8c661a8 100644 --- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs +++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs @@ -1316,7 +1316,7 @@ namespace Mono.TextEditor public event LineDecorator DecorateLineBg; - const double whitespaceMarkerAlpha = 0.3; + const double whitespaceMarkerAlpha = 0.12; void InnerDecorateTabsAndSpaces (Cairo.Context ctx, LayoutWrapper layout, int offset, double x, double y, int selectionStart, int selectionEnd, char spaceOrTab) { @@ -1818,7 +1818,7 @@ namespace Mono.TextEditor } } - cr.SetSourceRGBA (col.R, col.G, col.B, whitespaceMarkerAlpha); + cr.SetSourceRGBA (col.R, col.G, col.B, whitespaceMarkerAlpha * 1.4); // needs to more opaque due to font rendering cr.ShowLayout (layout); cr.Restore (); } diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/InsertionCursorEditMode.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/InsertionCursorEditMode.cs index 404a468c79..b9a4c73edc 100644 --- a/main/src/core/Mono.Texteditor/Mono.TextEditor/InsertionCursorEditMode.cs +++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/InsertionCursorEditMode.cs @@ -143,8 +143,10 @@ namespace Mono.TextEditor editor.SizeAllocated -= MoveHelpWindow; editor.VScroll -= HandleVScroll; editor.Destroyed -= HandleEditorDestroy; + HelpWindow.Hide (); HelpWindow.Destroy (); HelpWindow = null; + editor.QueueDraw (); } void HandleEditorDestroy (object sender, EventArgs e) @@ -294,7 +296,6 @@ namespace Mono.TextEditor class CursorDrawer : MarginDrawer { InsertionCursorEditMode mode; - static readonly Cairo.Color LineColor = HslColor.Parse ("#666666"); public CursorDrawer (InsertionCursorEditMode mode) @@ -359,12 +360,12 @@ namespace Mono.TextEditor MonoTextEditor editor = mode.editor; double y = editor.LineToY (mode.CurrentInsertionPoint.Line) - editor.VAdjustment.Value; - double x = GetLineIndentationStart (); - double x2 = editor.Allocation.Width - mode.HelpWindow.Allocation.Width - InsertionCursorEditMode.HelpWindowMargin * 2; + double x = GetLineIndentationStart () - 3; + double x2 = editor.Allocation.Width - mode.HelpWindow.Allocation.Width - InsertionCursorEditMode.HelpWindowMargin * 2 + 4; cr.MoveTo (x, y); cr.LineTo (x2, y); - cr.SetSourceColor (LineColor); + cr.SetSourceColor (Styles.InsertionCursorLineColor.ToCairoColor ()); cr.Stroke (); // DrawArrow (cr, x - 4, y); diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Styles.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Styles.cs new file mode 100644 index 0000000000..3a650d5b75 --- /dev/null +++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Styles.cs @@ -0,0 +1,83 @@ +// +// Styles.cs +// +// Author: +// Vsevolod Kukol <sevo@xamarin.com> +// +// Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using Xwt.Drawing; + +namespace Mono.TextEditor.PopupWindow +{ + public static class Styles + { + public static Color ModeHelpWindowTokenOutlineColor { get; internal set; } + public static Color ModeHelpWindowTokenTextColor { get; internal set; } + + public static Color InsertionCursorBackgroundColor { get; internal set; } + public static Color InsertionCursorTitleTextColor { get; internal set; } + public static Color InsertionCursorBorderColor { get; internal set; } + public static Color InsertionCursorTextColor { get; internal set; } + public static Color InsertionCursorLineColor { get; internal set; } + + public static Color TableLayoutModeBackgroundColor { get; internal set; } + public static Color TableLayoutModeTitleBackgroundColor { get; internal set; } + public static Color TableLayoutModeCategoryBackgroundColor { get; internal set; } + public static Color TableLayoutModeBorderColor { get; internal set; } + public static Color TableLayoutModeTextColor { get; internal set; } + public static Color TableLayoutModeGridColor { get; internal set; } + + static Styles () + { + LoadStyles (); + Context.GlobalStylesChanged += (o, e) => LoadStyles (); + } + + public static void LoadStyles () + { + var bgColor = Platform.IsMac ? Color.FromName ("#5189ed") : Color.FromName ("#cce8ff"); + var fgColor = Platform.IsMac ? Color.FromName ("#ffffff") : Color.FromName ("#000000"); + + ModeHelpWindowTokenOutlineColor = fgColor; + ModeHelpWindowTokenTextColor = fgColor; + + InsertionCursorBackgroundColor = bgColor; + InsertionCursorBorderColor = InsertionCursorBackgroundColor; + InsertionCursorTitleTextColor = fgColor; + InsertionCursorTextColor = InsertionCursorTitleTextColor; + InsertionCursorLineColor = bgColor; + + TableLayoutModeBackgroundColor = new Color (1, 1, 1); + TableLayoutModeTitleBackgroundColor = new Color (0.88, 0.88, 0.98); + TableLayoutModeCategoryBackgroundColor = new Color (0.58, 0.58, 0.98); + TableLayoutModeBorderColor = new Color (0.4, 0.4, 0.6); + TableLayoutModeTextColor = new Color (0.3, 0.3, 1); + TableLayoutModeGridColor = new Color (0.8, 0.8, 0.8); + } + + public static Cairo.Color ToCairoColor (this Xwt.Drawing.Color color) + { + return new Cairo.Color (color.Red, color.Green, color.Blue, color.Alpha); + } + } +} + diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs index 6a11d44cae..dadb2af845 100644 --- a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs +++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs @@ -368,10 +368,10 @@ namespace Mono.TextEditor return result.ToString (); } - public string GetMarkup (int offset, int length, bool removeIndent, bool useColors = true, bool replaceTabs = true) + public string GetMarkup (int offset, int length, bool removeIndent, bool useColors = true, bool replaceTabs = true, bool fitIdeStyle = false) { ISyntaxMode mode = Document.SyntaxMode; - var style = ColorStyle; + var style = fitIdeStyle ? SyntaxModeService.GetColorStyle(Parent.GetIdeColorStyleName()) : ColorStyle; if (style == null) { var str = Document.GetTextAt (offset, length); diff --git a/main/src/core/Mono.Texteditor/Styles/DefaultStyle.json b/main/src/core/Mono.Texteditor/Styles/DefaultStyle.json index 26650892e5..2230e6cca5 100644 --- a/main/src/core/Mono.Texteditor/Styles/DefaultStyle.json +++ b/main/src/core/Mono.Texteditor/Styles/DefaultStyle.json @@ -1,10 +1,12 @@ { "name":"Default", - "version":"1.3.1", + "version":"1.3.9", "description":"Bright and friendly, just like Xamarin.", "originator":"Xamarin Inc. (http://xamarin.com)", "palette":[ + { "name":"text-black", "value":"#222222" }, + { "name":"comment-gray", "value":"#b0b0b0" }, { "name":"butter2", "value":"#edd400" }, { "name":"chameleon1", "value":"#8ae234" }, { "name":"chameleon2", "value":"#73d216" }, @@ -22,8 +24,6 @@ { "name":"aluminium4", "value":"#888a85" }, { "name":"aluminium5", "value":"#555753" }, { "name":"aluminium6", "value":"#2e3436" }, - { "name":"text-black", "value":"#333" }, - { "name":"comment-gray", "value":"#888" }, { "name":"literal-orange", "value":"#F57E00" }, { "name":"literal-escape", "value":"#A53E00" }, { "name":"keyword-teal", "value":"#009695" }, @@ -39,26 +39,24 @@ { "name":"Search result background", "color":"#fffeb7" }, { "name":"Search result background (highlighted)", "color":"#fffc38" }, - { "name":"Column Ruler", "color":"aluminium3" }, + { "name":"Column Ruler", "color":"#eeeeee" }, - { "name":"Fold Square", "color":"aluminium4", "secondcolor":"white" }, - { "name":"Fold Cross", "color":"aluminium4", "secondcolor":"white" }, + { "name":"Fold Square", "color":"#cdcecc", "secondcolor":"white" }, + { "name":"Fold Cross", "color":"#b1b2b0", "secondcolor":"white" }, - { "name":"Indentation Guide", "color":"aluminium2" }, + { "name":"Indentation Guide", "color":"#e5e5e5" }, - { "name":"Indicator Margin", "color":"aluminium1" }, - { "name":"Indicator Margin(Separator)", "color":"aluminium3" }, + { "name":"Indicator Margin", "color":"#f6f6f6" }, + { "name":"Indicator Margin(Separator)", "color":"#f6f6f6" }, - { "name":"Tooltip Border", "color":"#b2b2b2" }, { "name":"Tooltip Pager Top", "color":"#ffffff" }, - { "name":"Tooltip Pager Bottom", "color":"#f5f5f5" }, { "name":"Tooltip Pager Triangle", "color":"#737373" }, { "name":"Tooltip Pager Text", "color":"#828282" }, { "name":"Notification Border", "color":"#D2B457" }, { "name":"Completion Window", "color":"#F0F6F8", "bordercolor":"#b2b2b2" }, - { "name":"Completion Tooltip Window", "color":"#fafae2", "bordercolor":"#b2b2b2" }, + { "name":"Completion Tooltip Window", "color":"#fafae2", "bordercolor":"#b2b2b2" }, { "name":"Completion Selection Bar Border", "color":"#C9C9C9" }, { "name":"Completion Selection Bar Border(Inactive)", "color":"#666666" }, { "name":"Completion Selection Bar Background", "color":"#f8fcfc", "secondcolor":"#dff4f0" }, @@ -74,19 +72,19 @@ { "name":"Quick Diff(Dirty)", "color":"orangesicle-light" }, { "name":"Quick Diff(Changed)", "color":"orangesicle" }, - { "name":"Brace Matching(Rectangle)", "color":"orangesicle", "secondcolor":"orangesicle-light" }, + { "name":"Brace Matching(Rectangle)", "color":"#fde5d6", "secondcolor":"#fde5d6" }, { "name":"Usages(Rectangle)", "color":"#B1DFF9", "secondcolor":"#B1DFF9", "bordercolor":"#B1DFF9" }, { "name":"Changing usages(Rectangle)", "color":"#FFD6DD", "secondcolor":"#FFD6DD", "bordercolor":"#FFD6DD" }, - { "name":"Breakpoint Marker", "color":"#f9dbda", "bordercolor":"#ebcccb" }, - { "name":"Breakpoint Marker(Disabled)", "color":"#e9e9e9", "bordercolor":"#dbdbdb" }, - { "name":"Breakpoint Marker(Invalid)", "color":"#f1e3e3", "bordercolor":"#e3d5d5" }, + { "name":"Breakpoint Marker", "color":"#f9dbda", "bordercolor":"#f9dbda" }, + { "name":"Breakpoint Marker(Disabled)", "color":"#e9e9e9", "bordercolor":"#e9e9e9" }, + { "name":"Breakpoint Marker(Invalid)", "color":"#f1e3e3", "bordercolor":"#f1e3e3" }, - { "name":"Current Line Marker", "color":"aluminium1", "secondcolor":"aluminium2" }, - { "name":"Current Line Marker(Inactive)", "color":"aluminium2", "secondcolor":"aluminium3" }, + { "name":"Current Line Marker", "color":"#f7f7f7", "secondcolor":"#f7f7f7" }, + { "name":"Current Line Marker(Inactive)", "color":"#f7f7f7", "secondcolor":"#f7f7f7" }, - { "name":"Debugger Current Line Marker", "color":"#f8f4a1", "bordercolor":"#ede993" }, - { "name":"Debugger Stack Line Marker", "color":"#ccfca6", "bordercolor":"#bff197" }, + { "name":"Debugger Current Line Marker", "color":"#f8f4a1", "bordercolor":"#f8f4a1" }, + { "name":"Debugger Stack Line Marker", "color":"#d0efa9", "bordercolor":"#d0efa9" }, { "name":"Primary Link", "color":"chameleon3", "secondcolor":"chameleon2" }, { "name":"Primary Link(Highlighted)", "color":"chameleon3", "secondcolor":"chameleon1" }, @@ -96,20 +94,19 @@ { "name":"Message Bubble Error Marker", "color":"#df6962" }, { "name":"Message Bubble Error Tag", "color":"#d83f3f", "secondcolor":"white" }, { "name":"Message Bubble Error Counter", "color":"white", "secondcolor":"#d83f3f" }, - { "name":"Message Bubble Error IconMargin", "color":"#d83f3f", "bordercolor":"#b12a2a" }, + { "name":"Message Bubble Error IconMargin", "color":"#d83f3f", "bordercolor":"#d83f3f" }, { "name":"Message Bubble Error Line", "color":"#fbe4e6" }, { "name":"Message Bubble Error Tooltip", "color":"#D10B0B" }, { "name":"Message Bubble Warning Marker", "color":"#b28d37" }, { "name":"Message Bubble Warning Tag", "color":"#e68100", "secondcolor":"white" }, { "name":"Message Bubble Warning Counter", "color":"white", "secondcolor":"#e68100" }, - { "name":"Message Bubble Warning IconMargin", "color":"#e68100", "bordercolor":"#c76f00" }, + { "name":"Message Bubble Warning IconMargin", "color":"#e68100", "bordercolor":"#e68100" }, { "name":"Message Bubble Warning Line", "color":"#fff1da" }, { "name":"Message Bubble Warning Tooltip", "color":"#D1590B" }, - { "name":"Link Color", "color":"#0645ad" }, - { "name":"Link Color(Active)", "color":"#faa700" } - + { "name":"Link Color", "color":"#0645ad" }, + { "name":"Link Color(Active)", "color":"#faa700" } ], "text":[ @@ -126,9 +123,10 @@ { "name":"Comment(Line)", "fore":"comment-gray", "style":"italic" }, { "name":"Comment(Block)", "fore":"comment-gray", "style":"italic" }, - { "name":"Comment(Doc)", "fore":"comment-gray", "style":"italic" }, - { "name":"Comment(DocTag)", "fore":"comment-gray", "style":"italic" }, - { "name":"Comment Tag", "fore":"comment-gray", "weight":"bold" }, + { "name":"Comment(Doc)", "fore":"#97b488", "style":"italic" }, + { "name":"Comment(DocTag)", "fore":"#c8b97c", "style":"italic" }, + { "name":"Comment Tag", "fore":"#ff00ff", "weight":"bold" }, + { "name":"Excluded Code", "fore":"comment-gray" }, { "name":"String", "fore":"literal-orange" }, @@ -164,12 +162,12 @@ { "name":"Html Tag Delimiter", "fore":"skyblue2" }, { "name":"Razor Code", "fore":"text-black", "back":"#fdfaed" }, - { "name":"Tooltip Text", "fore":"text-black", "back":"#feffe9" }, + { "name":"Tooltip Text", "fore":"text-black", "back":"#fafae3" }, { "name":"Notification Text", "fore":"text-black", "back":"#feffe9" }, { "name":"Completion Text", "fore":"#434343" }, { "name":"Completion Matching Substring", "fore":"#BA3373" }, - + { "name":"Completion Selected Text", "fore":"#434343" }, { "name":"Completion Selected Matching Substring", "fore":"#BA3373" }, @@ -200,10 +198,10 @@ { "name":"User Types(Delegates)", "fore":"skyblue2" }, { "name":"User Types(Value types)", "fore":"skyblue2" }, { "name":"User Types(Type parameters)", "fore":"skyblue2" }, - { "name":"User Types(Mutable)", "fore":"aluminium1", "back":"invalid-red" }, + { "name":"User Types(Mutable)", "fore":"aluminium1", "back":"invalid-red" }, - { "name":"User Field Usage", "fore":"text-black" }, - { "name":"User Field Declaration", "fore":"text-black" }, + { "name":"User Field Usage", "fore":"text-black", "style":"italic" }, + { "name":"User Field Declaration", "fore":"text-black", "style":"italic" }, { "name":"User Property Usage", "fore":"text-black" }, { "name":"User Property Declaration", "fore":"text-black" }, @@ -214,8 +212,8 @@ { "name":"User Method Usage", "fore":"text-black" }, { "name":"User Method Declaration", "fore":"text-black" }, - { "name":"User Parameter Usage", "fore":"text-black" }, - { "name":"User Parameter Declaration", "fore":"text-black" }, + { "name":"User Parameter Usage", "fore":"text-black", "style":"italic" }, + { "name":"User Parameter Declaration", "fore":"text-black", "style":"italic" }, { "name":"User Variable Usage", "fore":"text-black" }, { "name":"User Variable Declaration", "fore":"text-black" }, @@ -229,21 +227,21 @@ { "name":"Debugger Current Statement", "fore":"text-black", "back":"#f8f4a1" }, { "name":"Debugger Stack Line", "fore":"text-black", "back":"#ccfca6" }, - { "name":"Diff Line(Added)", "fore":"skyblue2" }, - { "name":"Diff Line(Removed)", "fore":"scarletred1" }, - { "name":"Diff Line(Changed)", "fore":"plum2" }, - { "name":"Diff Header", "fore":"chameleon3" }, - { "name":"Diff Header(Separator)", "fore":"chameleon3", "weight":"bold" }, - { "name":"Diff Header(Old)", "fore":"scarletred1", "weight":"bold" }, - { "name":"Diff Header(New)", "fore":"skyblue2", "weight":"bold" }, - { "name":"Diff Location", "fore":"plum2", "weight":"bold" }, - - { "name":"Css Comment", "fore":"comment-gray", "weight":"bold" }, - { "name":"Css Property Name", "fore":"black", "weight":"bold" }, - { "name":"Css Property Value", "fore":"literal-orange", "weight":"bold" }, - { "name":"Css Selector", "fore":"comment-gray", "weight":"bold" }, - { "name":"Css String Value", "fore":"literal-orange", "weight":"bold" }, - { "name":"Css Keyword", "fore":"keyword-teal", "weight":"bold" }, + { "name":"Diff Line(Added)", "fore":"skyblue2" }, + { "name":"Diff Line(Removed)", "fore":"scarletred1" }, + { "name":"Diff Line(Changed)", "fore":"plum2" }, + { "name":"Diff Header", "fore":"chameleon3", "weight":"bold" }, + { "name":"Diff Header(Separator)", "fore":"chameleon3" }, + { "name":"Diff Header(Old)", "fore":"scarletred1", "weight":"bold" }, + { "name":"Diff Header(New)", "fore":"skyblue2", "weight":"bold" }, + { "name":"Diff Location", "fore":"plum2", "weight":"bold" }, + + { "name":"Css Comment", "fore":"comment-gray", "weight":"bold" }, + { "name":"Css Property Name", "fore":"text-black", "weight":"bold" }, + { "name":"Css Property Value", "fore":"literal-orange", "weight":"bold" }, + { "name":"Css Selector", "fore":"comment-gray", "weight":"bold" }, + { "name":"Css String Value", "fore":"literal-orange", "weight":"bold" }, + { "name":"Css Keyword", "fore":"keyword-teal", "weight":"bold" }, { "name":"Script Comment", "fore":"comment-gray" }, { "name":"Script Identifier" }, diff --git a/main/src/core/Mono.Texteditor/Styles/MonokaiStyle.json b/main/src/core/Mono.Texteditor/Styles/MonokaiStyle.json index 03a2f7c8d5..3e8e486f52 100644 --- a/main/src/core/Mono.Texteditor/Styles/MonokaiStyle.json +++ b/main/src/core/Mono.Texteditor/Styles/MonokaiStyle.json @@ -1,6 +1,6 @@ { "name":"Monokai", - "version":"1.1", + "version":"1.2.5", "description":"A smooth, dusky scheme.", "originator":"Xamarin Inc. (http://xamarin.com)", @@ -32,23 +32,21 @@ { "name":"Column Ruler", "color":"#575852" }, { "name":"Fold Square", "color":"monokai-comment", "secondcolor":"monokai-background" }, - { "name":"Fold Cross", "color":"white", "secondcolor":"monokai-background" }, + { "name":"Fold Cross", "color":"#8f8c7e", "secondcolor":"monokai-background" }, { "name":"Indentation Guide", "color":"monokai-comment" }, { "name":"Indicator Margin", "color":"#3B3A32" }, { "name":"Indicator Margin(Separator)", "color":"#3B3A32" }, - { "name":"Tooltip Border", "color":"#989892" }, - { "name":"Tooltip Pager Top", "color":"#292A25" }, - { "name":"Tooltip Pager Bottom", "color":"#292A25" }, - { "name":"Tooltip Pager Triangle", "color":"#C8C8C2" }, - { "name":"Tooltip Pager Text", "color":"#C8C8C2" }, + { "name":"Tooltip Pager Top", "color":"#757575" }, + { "name":"Tooltip Pager Triangle", "color":"#ffffff" }, + { "name":"Tooltip Pager Text", "color":"#ffffff" }, { "name":"Notification Border", "color":"#989892" }, - { "name":"Completion Window", "color":"monokai-background", "bordercolor":"#989892"}, - { "name":"Completion Tooltip Window", "color":"#272725", "bordercolor":"#989892" }, + { "name":"Completion Window", "color":"monokai-background", "bordercolor":"#989892" }, + { "name":"Completion Tooltip Window", "color":"#272725", "bordercolor":"#989892" }, { "name":"Completion Selection Bar Border", "color":"monokai-selection" }, { "name":"Completion Selection Bar Border(Inactive)", "color":"#383830" }, { "name":"Completion Selection Bar Background", "color":"monokai-selection", "secondcolor":"monokai-selection" }, @@ -64,38 +62,38 @@ { "name":"Quick Diff(Dirty)", "color":"monokai-string" }, { "name":"Quick Diff(Changed)", "color":"#A4E22E" }, - { "name":"Brace Matching(Rectangle)", "color":"#6699CC", "secondcolor":"#AACCEE" }, + { "name":"Brace Matching(Rectangle)", "color":"#517297", "secondcolor":"#517297" }, { "name":"Usages(Rectangle)", "color":"#527F99", "secondcolor":"#527F99", "bordercolor":"#527F99" }, { "name":"Changing usages(Rectangle)", "color":"#996E75", "secondcolor":"#996E75", "bordercolor":"#996E75" }, - { "name":"Breakpoint Marker", "color":"#6f3535", "bordercolor":"#7a3a3a" }, - { "name":"Breakpoint Marker(Disabled)", "color":"#707070", "bordercolor":"#7b7b7b" }, - { "name":"Breakpoint Marker(Invalid)", "color":"#604343", "bordercolor":"#6a4a4a" }, - - { "name":"Current Line Marker", "color":"#323229"}, - { "name":"Current Line Marker(Inactive)", "color":"#2F2F28"}, - - { "name":"Debugger Current Line Marker", "color":"#69684c", "bordercolor":"#747354" }, - { "name":"Debugger Stack Line Marker", "color":"#5c6b4d", "bordercolor":"#657655"}, - - { "name":"Primary Link", "color":"monokai-white", "secondcolor":"#7f4a81"}, - { "name":"Primary Link(Highlighted)", "color":"monokai-white", "secondcolor":"#b167b3"}, - { "name":"Secondary Link", "color":"monokai-white", "secondcolor":"#262228"}, - { "name":"Secondary Link(Highlighted)", "color":"monokai-white", "secondcolor":"#4e4552"}, - - { "name":"Message Bubble Error Marker", "color":"#b28d37"}, - { "name":"Message Bubble Error Tag", "color":"#e3a6a1", "secondcolor":"black"}, - { "name":"Message Bubble Error Counter", "color":"black", "secondcolor":"#e3a6a1"}, - { "name":"Message Bubble Error IconMargin", "color":"#735c54", "bordercolor":"#805b4d"}, - { "name":"Message Bubble Error Line", "color":"#7b645c"}, - { "name":"Message Bubble Error Tooltip", "color":"#e3a6a1"}, - - { "name":"Message Bubble Warning Marker", "color":"#b28d37"}, - { "name":"Message Bubble Warning Tag", "color":"#efe89d", "secondcolor":"black"}, - { "name":"Message Bubble Warning Counter", "color":"black", "secondcolor":"#efe89d"}, - { "name":"Message Bubble Warning IconMargin", "color":"#777553", "bordercolor":"#948e51"}, - { "name":"Message Bubble Warning Line", "color":"#807e5c"}, - { "name":"Message Bubble Warning Tooltip", "color":"#efe89d"} + { "name":"Breakpoint Marker", "color":"#6f3535", "bordercolor":"#6f3535" }, + { "name":"Breakpoint Marker(Disabled)", "color":"#4d4d4d", "bordercolor":"#4d4d4d" }, + { "name":"Breakpoint Marker(Invalid)", "color":"#604343", "bordercolor":"#604343" }, + + { "name":"Current Line Marker", "color":"#393933", "secondcolor":"#393933" }, + { "name":"Current Line Marker(Inactive)", "color":"#393933", "secondcolor":"#393933" }, + + { "name":"Debugger Current Line Marker", "color":"#69684c", "bordercolor":"#69684c" }, + { "name":"Debugger Stack Line Marker", "color":"#618336", "bordercolor":"#618336" }, + + { "name":"Primary Link", "color":"monokai-white", "secondcolor":"#7f4a81" }, + { "name":"Primary Link(Highlighted)", "color":"monokai-white", "secondcolor":"#b167b3" }, + { "name":"Secondary Link", "color":"monokai-white", "secondcolor":"#262228" }, + { "name":"Secondary Link(Highlighted)", "color":"monokai-white", "secondcolor":"#4e4552" }, + + { "name":"Message Bubble Error Marker", "color":"#b28d37" }, + { "name":"Message Bubble Error Tag", "color":"#e3a6a1", "secondcolor":"black" }, + { "name":"Message Bubble Error Counter", "color":"black", "secondcolor":"#e3a6a1" }, + { "name":"Message Bubble Error IconMargin", "color":"#735c54", "bordercolor":"#805b4d" }, + { "name":"Message Bubble Error Line", "color":"#7b645c" }, + { "name":"Message Bubble Error Tooltip", "color":"#e3a6a1" }, + + { "name":"Message Bubble Warning Marker", "color":"#b28d37" }, + { "name":"Message Bubble Warning Tag", "color":"#efe89d", "secondcolor":"black" }, + { "name":"Message Bubble Warning Counter", "color":"black", "secondcolor":"#efe89d" }, + { "name":"Message Bubble Warning IconMargin", "color":"#777553", "bordercolor":"#948e51" }, + { "name":"Message Bubble Warning Line", "color":"#807e5c" }, + { "name":"Message Bubble Warning Tooltip", "color":"#efe89d" } ], "text":[ @@ -105,23 +103,24 @@ { "name":"Collapsed Text", "fore":"monokai-comment", "back":"monokai-background" }, - { "name":"Line Numbers", "fore":"#BCBCBC", "back":"monokai-background"}, + { "name":"Line Numbers", "fore":"#BCBCBC", "back":"monokai-background" }, { "name":"Punctuation", "fore":"monokai-white" }, { "name":"Punctuation(Brackets)", "fore":"monokai-white" }, - { "name":"Comment(Line)", "fore":"monokai-comment" }, - { "name":"Comment(Block)", "fore":"monokai-comment" }, - { "name":"Comment(Doc)", "fore":"monokai-comment" }, - { "name":"Comment(DocTag)", "fore":"monokai-comment" }, - { "name":"Comment Tag", "fore":"monokai-comment", "weight":"bold" }, + { "name":"Comment(Line)", "fore":"monokai-comment", "style":"italic" }, + { "name":"Comment(Block)", "fore":"monokai-comment", "style":"italic" }, + { "name":"Comment(Doc)", "fore":"monokai-comment", "style":"italic" }, + { "name":"Comment(DocTag)", "fore":"monokai-comment", "style":"italic" }, + { "name":"Comment Tag", "fore":"#ff00ff", "weight":"bold" }, + { "name":"Excluded Code", "fore":"monokai-comment" }, - { "name":"String", "fore":"monokai-string"}, - { "name":"String(Escape)", "fore":"#A6AB34"}, - { "name":"String(C# @ Verbatim)", "fore":"monokai-string"}, + { "name":"String", "fore":"monokai-string" }, + { "name":"String(Escape)", "fore":"#A6AB34" }, + { "name":"String(C# @ Verbatim)", "fore":"monokai-string" }, - { "name":"Number", "fore":"monokai-constant"}, + { "name":"Number", "fore":"monokai-constant" }, { "name":"Preprocessor", "fore":"monokai-classname" }, { "name":"Preprocessor(Region Name)", "fore":"monokai-classname" }, @@ -145,12 +144,12 @@ { "name":"Html Tag Delimiter", "fore":"monokai-white" }, { "name":"Razor Code", "fore":"monokai-white", "back":"#373832" }, - { "name":"Tooltip Text", "fore":"monokai-white", "back":"#272725" }, + { "name":"Tooltip Text", "fore":"#d1d1cd", "back":"#525759" }, { "name":"Notification Text", "fore":"monokai-white", "back":"#272725" }, { "name":"Completion Text", "fore":"monokai-white" }, { "name":"Completion Matching Substring", "fore":"monokai-keyword" }, - + { "name":"Completion Selected Text", "fore":"monokai-white" }, { "name":"Completion Selected Matching Substring", "fore":"monokai-keyword" }, @@ -182,8 +181,8 @@ { "name":"User Types(Value types)", "fore":"monokai-type" }, { "name":"User Types(Type parameters)", "fore":"monokai-type" }, - { "name":"User Field Usage", "fore":"#2EE2A6" }, - { "name":"User Field Declaration", "fore":"#2EE2A6" }, + { "name":"User Field Usage", "fore":"#2EE2A6", "style":"italic" }, + { "name":"User Field Declaration", "fore":"#2EE2A6", "style":"italic" }, { "name":"User Property Usage", "fore":"#2EE2A6" }, { "name":"User Property Declaration", "fore":"#2EE2A6" }, @@ -194,8 +193,8 @@ { "name":"User Method Usage", "fore":"monokai-functionargument" }, { "name":"User Method Declaration", "fore":"monokai-functionargument" }, - { "name":"User Parameter Usage", "fore":"monokai-white" }, - { "name":"User Parameter Declaration", "fore":"monokai-white" }, + { "name":"User Parameter Usage", "fore":"monokai-white", "style":"italic" }, + { "name":"User Parameter Declaration", "fore":"monokai-white", "style":"italic" }, { "name":"User Variable Usage", "fore":"monokai-white" }, { "name":"User Variable Declaration", "fore":"monokai-white" }, @@ -209,21 +208,21 @@ { "name":"Debugger Current Statement", "fore":"white", "back":"#69684c" }, { "name":"Debugger Stack Line", "fore":"white", "back":"#5c6b4d" }, - { "name":"Diff Line(Added)", "fore":"#008A8B" }, - { "name":"Diff Line(Removed)", "fore":"line-removed" }, - { "name":"Diff Line(Changed)", "fore":"line-changed" }, - { "name":"Diff Header", "fore":"#008000" }, - { "name":"Diff Header(Separator)", "fore":"#0000FF", "weight":"bold" }, - { "name":"Diff Header(Old)", "fore":"#008000", "weight":"bold" }, - { "name":"Diff Header(New)", "fore":"#008000", "weight":"bold" }, - { "name":"Diff Location", "fore":"#FB8B00", "weight":"bold" }, - - { "name":"Css Comment", "fore":"monokai-comment", "weight":"bold" }, - { "name":"Css Property Name", "fore":"black", "weight":"bold" }, - { "name":"Css Property Value", "fore":"monokai-string", "weight":"bold" }, - { "name":"Css Selector", "fore":"monokai-comment", "weight":"bold" }, - { "name":"Css String Value", "fore":"literal-orange", "weight":"bold" }, - { "name":"Css Keyword", "fore":"monokai-keyword", "weight":"bold" }, + { "name":"Diff Line(Added)", "fore":"#008A8B" }, + { "name":"Diff Line(Removed)", "fore":"line-removed" }, + { "name":"Diff Line(Changed)", "fore":"line-changed" }, + { "name":"Diff Header", "fore":"#008000", "weight":"bold" }, + { "name":"Diff Header(Separator)", "fore":"#0000FF" }, + { "name":"Diff Header(Old)", "fore":"#008000", "weight":"bold" }, + { "name":"Diff Header(New)", "fore":"#008000", "weight":"bold" }, + { "name":"Diff Location", "fore":"#FB8B00", "weight":"bold" }, + + { "name":"Css Comment", "fore":"monokai-comment", "weight":"bold" }, + { "name":"Css Property Name", "fore":"black", "weight":"bold" }, + { "name":"Css Property Value", "fore":"monokai-string", "weight":"bold" }, + { "name":"Css Selector", "fore":"monokai-comment", "weight":"bold" }, + { "name":"Css String Value", "fore":"literal-orange", "weight":"bold" }, + { "name":"Css Keyword", "fore":"monokai-keyword", "weight":"bold" }, { "name":"Script Comment", "fore":"monokai-comment" }, { "name":"Script Identifier" }, diff --git a/main/src/core/Mono.Texteditor/Styles/NightshadeStyle.json b/main/src/core/Mono.Texteditor/Styles/NightshadeStyle.json index 4334cb13c8..9832ed9eef 100644 --- a/main/src/core/Mono.Texteditor/Styles/NightshadeStyle.json +++ b/main/src/core/Mono.Texteditor/Styles/NightshadeStyle.json @@ -1,6 +1,6 @@ { "name":"Nightshade", - "version":"1.1", + "version":"1.1.5", "description":"An inky scheme with vibrant highlights.", "originator":"Anirudh Sanjeev <anirudh@anirudhsanjeev.org>", @@ -67,24 +67,22 @@ { "name":"Column Ruler", "color":"aluminium5" }, - { "name":"Fold Square", "color":"white", "secondcolor":"BlackVim" }, - { "name":"Fold Cross", "color":"white", "secondcolor":"BlackVim" }, + { "name":"Fold Square", "color":"#3d3d3b", "secondcolor":"BlackVim" }, + { "name":"Fold Cross", "color":"#6f706c", "secondcolor":"BlackVim" }, { "name":"Indentation Guide", "color":"aluminium5" }, { "name":"Indicator Margin", "color":"aluminium7" }, { "name":"Indicator Margin(Separator)", "color":"aluminium6" }, - { "name":"Tooltip Border", "color":"#989892" }, { "name":"Tooltip Pager Top", "color":"BlackVim" }, - { "name":"Tooltip Pager Bottom", "color":"BlackVim" }, { "name":"Tooltip Pager Triangle", "color":"NormalVim" }, { "name":"Tooltip Pager Text", "color":"NormalVim" }, { "name":"Notification Border", "color":"#989892" }, { "name":"Completion Window", "color":"BlackVim", "bordercolor":"#989892" }, - { "name":"Completion Tooltip Window", "color":"#0a0a0a", "bordercolor":"#989892" }, + { "name":"Completion Tooltip Window", "color":"#0a0a0a", "bordercolor":"#989892" }, { "name":"Completion Selection Bar Border", "color":"#2647DD" }, { "name":"Completion Selection Bar Border(Inactive)", "color":"aluminium4" }, { "name":"Completion Selection Bar Background", "color":"#2647DD", "secondcolor":"#2647DD" }, @@ -100,38 +98,38 @@ { "name":"Quick Diff(Dirty)", "color":"butter2" }, { "name":"Quick Diff(Changed)", "color":"StringVim" }, - { "name":"Brace Matching(Rectangle)", "color":"aluminium4", "secondcolor":"aluminium5" }, - { "name":"Usages(Rectangle)", "color":"aluminium4", "secondcolor":"aluminium5", "bordercolor":"aluminium5" }, - { "name":"Changing usages(Rectangle)", "color":"aluminium4", "secondcolor":"aluminium5", "bordercolor":"aluminium5" }, - - { "name":"Breakpoint Marker", "color":"#6f3535", "bordercolor":"#7a3a3a" }, - { "name":"Breakpoint Marker(Disabled)", "color":"#707070", "bordercolor":"#7b7b7b" }, - { "name":"Breakpoint Marker(Invalid)", "color":"#604343", "bordercolor":"#6a4a4a" }, - - { "name":"Current Line Marker", "color":"CursorLineBGVim"}, - { "name":"Current Line Marker(Inactive)", "color":"CursorLineBGVim"}, - - { "name":"Debugger Current Line Marker", "color":"#69684c", "bordercolor":"#747354" }, - { "name":"Debugger Stack Line Marker", "color":"#5c6b4d", "bordercolor":"#657655"}, - - { "name":"Primary Link", "color":"chocolate1", "secondcolor":"chocolate3"}, - { "name":"Primary Link(Highlighted)", "color":"chocolate1", "secondcolor":"chocolate2"}, - { "name":"Secondary Link", "color":"white", "secondcolor":"aluminium6"}, - { "name":"Secondary Link(Highlighted)", "color":"aluminium1", "secondcolor":"aluminium5"}, - - { "name":"Message Bubble Error Marker", "color":"#b28d37"}, - { "name":"Message Bubble Error Tag", "color":"#e3a6a1", "secondcolor":"black"}, - { "name":"Message Bubble Error Counter", "color":"black", "secondcolor":"#e3a6a1"}, - { "name":"Message Bubble Error IconMargin", "color":"#735c54", "bordercolor":"#805b4d"}, - { "name":"Message Bubble Error Line", "color":"#7b645c"}, - { "name":"Message Bubble Error Tooltip", "color":"#e3a6a1"}, - - { "name":"Message Bubble Warning Marker", "color":"#b28d37"}, - { "name":"Message Bubble Warning Tag", "color":"#efe89d", "secondcolor":"black"}, - { "name":"Message Bubble Warning Counter", "color":"black", "secondcolor":"#efe89d"}, - { "name":"Message Bubble Warning IconMargin", "color":"#777553", "bordercolor":"#948e51"}, - { "name":"Message Bubble Warning Line", "color":"#807e5c"}, - { "name":"Message Bubble Warning Tooltip", "color":"#efe89d"} + { "name":"Brace Matching(Rectangle)", "color":"#517297", "secondcolor":"#517297" }, + { "name":"Usages(Rectangle)", "color":"#527F99", "secondcolor":"#527F99", "bordercolor":"#527F99" }, + { "name":"Changing usages(Rectangle)", "color":"#996E75", "secondcolor":"#996E75", "bordercolor":"#996E75" }, + + { "name":"Breakpoint Marker", "color":"#6f3535", "bordercolor":"#6f3535" }, + { "name":"Breakpoint Marker(Disabled)", "color":"#4d4d4d", "bordercolor":"#4d4d4d" }, + { "name":"Breakpoint Marker(Invalid)", "color":"#604343", "bordercolor":"#604343" }, + + { "name":"Current Line Marker", "color":"#2a2a2a", "secondcolor":"#2a2a2a" }, + { "name":"Current Line Marker(Inactive)", "color":"#2a2a2a", "secondcolor":"#2a2a2a" }, + + { "name":"Debugger Current Line Marker", "color":"#69684c", "bordercolor":"#69684c" }, + { "name":"Debugger Stack Line Marker", "color":"#4a6429", "bordercolor":"#4a6429" }, + + { "name":"Primary Link", "color":"chocolate1", "secondcolor":"chocolate3" }, + { "name":"Primary Link(Highlighted)", "color":"chocolate1", "secondcolor":"chocolate2" }, + { "name":"Secondary Link", "color":"white", "secondcolor":"aluminium6" }, + { "name":"Secondary Link(Highlighted)", "color":"aluminium1", "secondcolor":"aluminium5" }, + + { "name":"Message Bubble Error Marker", "color":"#b28d37" }, + { "name":"Message Bubble Error Tag", "color":"#e3a6a1", "secondcolor":"black" }, + { "name":"Message Bubble Error Counter", "color":"black", "secondcolor":"#e3a6a1" }, + { "name":"Message Bubble Error IconMargin", "color":"#735c54", "bordercolor":"#805b4d" }, + { "name":"Message Bubble Error Line", "color":"#7b645c" }, + { "name":"Message Bubble Error Tooltip", "color":"#e3a6a1" }, + + { "name":"Message Bubble Warning Marker", "color":"#b28d37" }, + { "name":"Message Bubble Warning Tag", "color":"#efe89d", "secondcolor":"black" }, + { "name":"Message Bubble Warning Counter", "color":"black", "secondcolor":"#efe89d" }, + { "name":"Message Bubble Warning IconMargin", "color":"#777553", "bordercolor":"#948e51" }, + { "name":"Message Bubble Warning Line", "color":"#807e5c" }, + { "name":"Message Bubble Warning Tooltip", "color":"#efe89d" } ], "text":[ @@ -141,23 +139,24 @@ { "name":"Collapsed Text", "fore":"aluminium3", "back":"BlackVim" }, - { "name":"Line Numbers", "fore":"LineNrVim", "back":"BlackVim"}, + { "name":"Line Numbers", "fore":"LineNrVim", "back":"BlackVim" }, { "name":"Punctuation", "fore":"StringVim" }, { "name":"Punctuation(Brackets)", "fore":"StringVim" }, - { "name":"Comment(Line)", "fore":"CommentVim" }, - { "name":"Comment(Block)", "fore":"CommentVim" }, - { "name":"Comment(Doc)", "fore":"CommentVim" }, - { "name":"Comment(DocTag)", "fore":"CommentVim"}, - { "name":"Comment Tag", "fore":"TodoVim", "weight":"bold" }, + { "name":"Comment(Line)", "fore":"CommentVim", "style":"italic" }, + { "name":"Comment(Block)", "fore":"CommentVim", "style":"italic" }, + { "name":"Comment(Doc)", "fore":"CommentVim", "style":"italic" }, + { "name":"Comment(DocTag)", "fore":"CommentVim", "style":"italic" }, + { "name":"Comment Tag", "fore":"#ff00ff", "weight":"bold" }, + { "name":"Excluded Code", "fore":"CommentVim" }, - { "name":"String", "fore":"StringVim"}, - { "name":"String(Escape)", "fore":"StringVim"}, - { "name":"String(C# @ Verbatim)", "fore":"StringVim"}, + { "name":"String", "fore":"StringVim" }, + { "name":"String(Escape)", "fore":"StringVim" }, + { "name":"String(C# @ Verbatim)", "fore":"StringVim" }, - { "name":"Number", "fore":"NumberVim"}, + { "name":"Number", "fore":"NumberVim" }, { "name":"Preprocessor", "fore":"PreProcVim" }, { "name":"Preprocessor(Region Name)", "fore":"PreProcVim" }, @@ -181,12 +180,12 @@ { "name":"Html Tag Delimiter", "fore":"PreProcVim" }, { "name":"Razor Code", "fore":"NormalVim", "back":"aluminium6" }, - { "name":"Tooltip Text", "fore":"NormalVim", "back":"#0a0a0a" }, + { "name":"Tooltip Text", "fore":"#d1d1cd", "back":"#525759" }, { "name":"Notification Text", "fore":"NormalVim", "back":"#0a0a0a" }, { "name":"Completion Text", "fore":"NormalVim" }, { "name":"Completion Matching Substring", "fore":"StatementVim" }, - + { "name":"Completion Selected Text", "fore":"NormalVim" }, { "name":"Completion Selected Matching Substring", "fore":"StatementVim" }, @@ -204,11 +203,11 @@ { "name":"Keyword(Modifiers)", "fore":"TypeVim" }, { "name":"Keyword(Constants)", "fore":"SpecialVim" }, { "name":"Keyword(Void)", "fore":"SpecialVim" }, - { "name":"Keyword(Namespace)", "fore":"TypeVim", "weight":"Bold" }, + { "name":"Keyword(Namespace)", "fore":"TypeVim" }, { "name":"Keyword(Property)", "fore":"TypeVim" }, - { "name":"Keyword(Declaration)", "fore":"TypeVim", "weight":"Bold" }, + { "name":"Keyword(Declaration)", "fore":"TypeVim" }, { "name":"Keyword(Parameter)", "fore":"TypeVim" }, - { "name":"Keyword(Operator Declaration)", "fore":"TypeVim", "weight":"Bold" }, + { "name":"Keyword(Operator Declaration)", "fore":"TypeVim" }, { "name":"Keyword(Other)", "fore":"SpecialVim" }, { "name":"User Types", "fore":"IdentifierVim" }, @@ -218,8 +217,8 @@ { "name":"User Types(Value types)", "fore":"IdentifierVim" }, { "name":"User Types(Type parameters)", "fore":"IdentifierVim" }, - { "name":"User Field Usage", "fore":"NormalVim" }, - { "name":"User Field Declaration", "fore":"NormalVim" }, + { "name":"User Field Usage", "fore":"NormalVim", "style":"italic" }, + { "name":"User Field Declaration", "fore":"NormalVim", "style":"italic" }, { "name":"User Property Usage", "fore":"NormalVim" }, { "name":"User Property Declaration", "fore":"NormalVim" }, @@ -230,8 +229,8 @@ { "name":"User Method Usage", "fore":"NormalVim" }, { "name":"User Method Declaration", "fore":"NormalVim" }, - { "name":"User Parameter Usage", "fore":"NormalVim" }, - { "name":"User Parameter Declaration", "fore":"NormalVim" }, + { "name":"User Parameter Usage", "fore":"NormalVim", "style":"italic" }, + { "name":"User Parameter Declaration", "fore":"NormalVim", "style":"italic" }, { "name":"User Variable Usage", "fore":"NormalVim" }, { "name":"User Variable Declaration", "fore":"NormalVim" }, @@ -245,21 +244,21 @@ { "name":"Debugger Current Statement", "fore":"white", "back":"#69684c" }, { "name":"Debugger Stack Line", "fore":"white", "back":"#5c6b4d" }, - { "name":"Diff Line(Added)", "fore":"butter2" }, - { "name":"Diff Line(Removed)", "fore":"skyblue1" }, - { "name":"Diff Line(Changed)", "fore":"plum1" }, + { "name":"Diff Line(Added)", "fore":"butter2" }, + { "name":"Diff Line(Removed)", "fore":"skyblue1" }, + { "name":"Diff Line(Changed)", "fore":"plum1" }, { "name":"Diff Header", "fore":"chameleon1", "weight":"bold" }, { "name":"Diff Header(Separator)", "fore":"aluminium4" }, - { "name":"Diff Header(Old)", "fore":"chameleon1", "weight":"bold" }, - { "name":"Diff Header(New)", "fore":"chameleon1", "weight":"bold" }, - { "name":"Diff Location", "fore":"chameleon1", "weight":"bold" }, - - { "name":"Css Comment", "fore":"CommentVim" }, - { "name":"Css Property Name", "fore":"NormalVim" }, - { "name":"Css Property Value", "fore":"StringVim" }, - { "name":"Css Selector", "fore":"CommentVim" }, - { "name":"Css String Value", "fore":"StringVim" }, - { "name":"Css Keyword", "fore":"StatementVim" }, + { "name":"Diff Header(Old)", "fore":"chameleon1", "weight":"bold" }, + { "name":"Diff Header(New)", "fore":"chameleon1", "weight":"bold" }, + { "name":"Diff Location", "fore":"chameleon1", "weight":"bold" }, + + { "name":"Css Comment", "fore":"CommentVim", "weight":"bold" }, + { "name":"Css Property Name", "fore":"NormalVim", "weight":"bold" }, + { "name":"Css Property Value", "fore":"StringVim", "weight":"bold" }, + { "name":"Css Selector", "fore":"CommentVim", "weight":"bold" }, + { "name":"Css String Value", "fore":"StringVim", "weight":"bold" }, + { "name":"Css Keyword", "fore":"StatementVim", "weight":"bold" }, { "name":"Script Comment", "fore":"CommentVim" }, { "name":"Script Identifier" }, diff --git a/main/src/core/Mono.Texteditor/Styles/OblivionStyle.json b/main/src/core/Mono.Texteditor/Styles/OblivionStyle.json index d8cffb4494..d4105c030c 100644 --- a/main/src/core/Mono.Texteditor/Styles/OblivionStyle.json +++ b/main/src/core/Mono.Texteditor/Styles/OblivionStyle.json @@ -1,7 +1,7 @@ { "name":"Oblivion", - "version":"1.1", - "description":"'...where the soul at last is lost in utter peace'", + "version":"1.1.7", + "description":"‘...where the soul at last is lost in utter peace’", "originator":"Xamarin Inc. (http://xamarin.com)", "palette":[ @@ -41,26 +41,24 @@ { "name":"Search result background", "color":"#006060" }, { "name":"Search result background (highlighted)", "color":"#008080" }, - { "name":"Column Ruler", "color":"aluminium5" }, + { "name":"Column Ruler", "color":"#444a4d" }, - { "name":"Fold Square", "color":"white", "secondcolor":"aluminium7" }, - { "name":"Fold Cross", "color":"white", "secondcolor":"aluminium7" }, + { "name":"Fold Square", "color":"#555653", "secondcolor":"aluminium6" }, + { "name":"Fold Cross", "color":"#686e5c", "secondcolor":"aluminium6" }, - { "name":"Indentation Guide", "color":"aluminium5" }, + { "name":"Indentation Guide", "color":"#444a4d" }, - { "name":"Indicator Margin", "color":"aluminium7" }, - { "name":"Indicator Margin(Separator)", "color":"aluminium6" }, + { "name":"Indicator Margin", "color":"#2c2f30" }, + { "name":"Indicator Margin(Separator)", "color":"#2c2f30" }, - { "name":"Tooltip Border", "color":"aluminium1" }, { "name":"Tooltip Pager Top", "color":"aluminium5" }, - { "name":"Tooltip Pager Bottom", "color":"aluminium5" }, { "name":"Tooltip Pager Triangle", "color":"aluminium2" }, { "name":"Tooltip Pager Text", "color":"aluminium2" }, { "name":"Notification Border", "color":"aluminium1" }, { "name":"Completion Window", "color":"aluminium6", "bordercolor":"aluminium1" }, - { "name":"Completion Tooltip Window", "color":"aluminium5", "bordercolor":"aluminium1" }, + { "name":"Completion Tooltip Window", "color":"aluminium5", "bordercolor":"aluminium1" }, { "name":"Completion Selection Bar Border", "color":"aluminium5" }, { "name":"Completion Selection Bar Border(Inactive)", "color":"aluminium7" }, { "name":"Completion Selection Bar Background", "color":"aluminium5", "secondcolor":"aluminium5" }, @@ -76,67 +74,68 @@ { "name":"Quick Diff(Dirty)", "color":"butter2" }, { "name":"Quick Diff(Changed)", "color":"chameleon2" }, - { "name":"Brace Matching(Rectangle)", "color":"aluminium4", "secondcolor":"aluminium5" }, + { "name":"Brace Matching(Rectangle)", "color":"#517297", "secondcolor":"#517297" }, { "name":"Usages(Rectangle)", "color":"#527F99", "secondcolor":"#527F99", "bordercolor":"#527F99" }, { "name":"Changing usages(Rectangle)", "color":"#996E75", "secondcolor":"#996E75", "bordercolor":"#996E75" }, - { "name":"Breakpoint Marker", "color":"#6f3535", "bordercolor":"#7a3a3a" }, - { "name":"Breakpoint Marker(Disabled)", "color":"#707070", "bordercolor":"#7b7b7b" }, - { "name":"Breakpoint Marker(Invalid)", "color":"#604343", "bordercolor":"#6a4a4a" }, - - { "name":"Current Line Marker", "color":"aluminium7"}, - { "name":"Current Line Marker(Inactive)", "color":"aluminium7"}, - - { "name":"Debugger Current Line Marker", "color":"#69684c", "bordercolor":"#747354" }, - { "name":"Debugger Stack Line Marker", "color":"#5c6b4d", "bordercolor":"#657655"}, - - { "name":"Primary Link", "color":"chocolate1", "secondcolor":"chocolate3"}, - { "name":"Primary Link(Highlighted)", "color":"chocolate1", "secondcolor":"chocolate2"}, - { "name":"Secondary Link", "color":"white", "secondcolor":"aluminium6"}, - { "name":"Secondary Link(Highlighted)", "color":"aluminium1", "secondcolor":"aluminium5"}, - - { "name":"Message Bubble Error Marker", "color":"#b28d37"}, - { "name":"Message Bubble Error Tag", "color":"#e3a6a1", "secondcolor":"black"}, - { "name":"Message Bubble Error Counter", "color":"black", "secondcolor":"#e3a6a1"}, - { "name":"Message Bubble Error IconMargin", "color":"#735c54", "bordercolor":"#805b4d"}, - { "name":"Message Bubble Error Line", "color":"#7b645c"}, - { "name":"Message Bubble Error Tooltip", "color":"#e3a6a1"}, - - { "name":"Message Bubble Warning Marker", "color":"#b28d37"}, - { "name":"Message Bubble Warning Tag", "color":"#efe89d", "secondcolor":"black"}, - { "name":"Message Bubble Warning Counter", "color":"black", "secondcolor":"#efe89d"}, - { "name":"Message Bubble Warning IconMargin", "color":"#777553", "bordercolor":"#948e51"}, - { "name":"Message Bubble Warning Line", "color":"#807e5c"}, - { "name":"Message Bubble Warning Tooltip", "color":"#efe89d"} + { "name":"Breakpoint Marker", "color":"#6f3535", "bordercolor":"#6f3535" }, + { "name":"Breakpoint Marker(Disabled)", "color":"#4d4d4d", "bordercolor":"#4d4d4d" }, + { "name":"Breakpoint Marker(Invalid)", "color":"#604343", "bordercolor":"#604343" }, + + { "name":"Current Line Marker", "color":"#3a3f42", "secondcolor":"#3a3f42" }, + { "name":"Current Line Marker(Inactive)", "color":"#3a3f42", "secondcolor":"#3a3f42" }, + + { "name":"Debugger Current Line Marker", "color":"#69684c", "bordercolor":"#69684c" }, + { "name":"Debugger Stack Line Marker", "color":"#5f7247", "bordercolor":"#5f7247" }, + + { "name":"Primary Link", "color":"chocolate1", "secondcolor":"chocolate3" }, + { "name":"Primary Link(Highlighted)", "color":"chocolate1", "secondcolor":"chocolate2" }, + { "name":"Secondary Link", "color":"white", "secondcolor":"aluminium6" }, + { "name":"Secondary Link(Highlighted)", "color":"aluminium1", "secondcolor":"aluminium5" }, + + { "name":"Message Bubble Error Marker", "color":"#b28d37" }, + { "name":"Message Bubble Error Tag", "color":"#e3a6a1", "secondcolor":"black" }, + { "name":"Message Bubble Error Counter", "color":"black", "secondcolor":"#e3a6a1" }, + { "name":"Message Bubble Error IconMargin", "color":"#735c54", "bordercolor":"#805b4d" }, + { "name":"Message Bubble Error Line", "color":"#7b645c" }, + { "name":"Message Bubble Error Tooltip", "color":"#e3a6a1" }, + + { "name":"Message Bubble Warning Marker", "color":"#b28d37" }, + { "name":"Message Bubble Warning Tag", "color":"#efe89d", "secondcolor":"black" }, + { "name":"Message Bubble Warning Counter", "color":"black", "secondcolor":"#efe89d" }, + { "name":"Message Bubble Warning IconMargin", "color":"#777553", "bordercolor":"#948e51" }, + { "name":"Message Bubble Warning Line", "color":"#807e5c" }, + { "name":"Message Bubble Warning Tooltip", "color":"#efe89d" } ], "text":[ { "name":"Plain Text", "fore":"aluminium2", "back":"aluminium6" }, - { "name":"Selected Text", "back":"aluminium5" }, - { "name":"Selected Text(Inactive)", "back":"aluminium7" }, + { "name":"Selected Text", "back":"#61677e" }, + { "name":"Selected Text(Inactive)", "back":"#6f6f6f" }, { "name":"Collapsed Text", "fore":"aluminium3", "back":"aluminium6" }, - { "name":"Line Numbers", "fore":"aluminium5", "back":"black"}, + { "name":"Line Numbers", "fore":"aluminium5", "back":"aluminium6" }, { "name":"Punctuation", "fore":"aluminium2" }, { "name":"Punctuation(Brackets)", "fore":"aluminium2" }, - { "name":"Comment(Line)", "fore":"aluminium4" }, - { "name":"Comment(Block)", "fore":"aluminium4" }, - { "name":"Comment(Doc)", "fore":"aluminium4" }, - { "name":"Comment(DocTag)", "fore":"aluminium4" }, - { "name":"Comment Tag", "fore":"aluminium4", "back":"butter1", "weight":"bold" }, + { "name":"Comment(Line)", "fore":"aluminium4", "style":"italic" }, + { "name":"Comment(Block)", "fore":"aluminium4", "style":"italic" }, + { "name":"Comment(Doc)", "fore":"#7ab8c8", "style":"italic" }, + { "name":"Comment(DocTag)", "fore":"#79809e", "style":"italic" }, + { "name":"Comment Tag", "fore":"#ff00ff", "weight":"bold" }, + { "name":"Excluded Code", "fore":"aluminium4" }, - { "name":"String", "fore":"butter2"}, - { "name":"String(Escape)", "fore":"butter3"}, - { "name":"String(C# @ Verbatim)", "fore":"butter2"}, + { "name":"String", "fore":"butter2" }, + { "name":"String(Escape)", "fore":"butter3" }, + { "name":"String(C# @ Verbatim)", "fore":"butter2" }, - { "name":"Number", "fore":"butter2"}, + { "name":"Number", "fore":"butter2" }, - { "name":"Preprocessor", "fore":"skyblue1", "style":"italic" }, - { "name":"Preprocessor(Region Name)", "fore":"skyblue1", "style":"italic" }, + { "name":"Preprocessor", "fore":"skyblue1" }, + { "name":"Preprocessor(Region Name)", "fore":"skyblue1" }, { "name":"Xml Text", "fore":"aluminium2" }, { "name":"Xml Delimiter", "fore":"aluminium2" }, @@ -157,35 +156,35 @@ { "name":"Html Tag Delimiter", "fore":"aluminium2" }, { "name":"Razor Code", "fore":"aluminium2", "back":"aluminium7" }, - { "name":"Tooltip Text", "fore":"aluminium2", "back":"aluminium5" }, + { "name":"Tooltip Text", "fore":"#d1d1cd", "back":"#525759" }, { "name":"Notification Text", "fore":"aluminium2", "back":"aluminium5" }, { "name":"Completion Text", "fore":"aluminium2" }, { "name":"Completion Matching Substring", "fore":"plum1" }, - + { "name":"Completion Selected Text", "fore":"aluminium2" }, { "name":"Completion Selected Matching Substring", "fore":"plum1" }, { "name":"Completion Selected Text(Inactive)", "fore":"aluminium2" }, { "name":"Completion Selected Matching Substring(Inactive)", "fore":"plum1" }, - { "name":"Keyword(Access)", "fore":"plum1", "weight":"bold" }, - { "name":"Keyword(Type)", "fore":"plum1", "weight":"bold" }, - { "name":"Keyword(Operator)", "fore":"plum1", "weight":"bold" }, - { "name":"Keyword(Selection)", "fore":"white", "weight":"bold" }, - { "name":"Keyword(Iteration)", "fore":"plum1", "weight":"bold" }, - { "name":"Keyword(Jump)", "fore":"plum1", "weight":"bold" }, - { "name":"Keyword(Context)", "fore":"white", "weight":"bold" }, - { "name":"Keyword(Exception)", "fore":"white", "weight":"bold" }, - { "name":"Keyword(Modifiers)", "fore":"plum1", "weight":"bold" }, - { "name":"Keyword(Constants)", "fore":"orange3", "weight":"bold" }, - { "name":"Keyword(Void)", "fore":"plum1", "weight":"bold" }, - { "name":"Keyword(Namespace)", "fore":"plum1", "weight":"bold" }, - { "name":"Keyword(Property)", "fore":"plum1", "weight":"bold" }, - { "name":"Keyword(Declaration)", "fore":"plum1", "weight":"bold" }, - { "name":"Keyword(Parameter)", "fore":"white", "weight":"bold" }, - { "name":"Keyword(Operator Declaration)", "fore":"plum1", "weight":"bold" }, - { "name":"Keyword(Other)", "fore":"white", "weight":"bold" }, + { "name":"Keyword(Access)", "fore":"plum1" }, + { "name":"Keyword(Type)", "fore":"plum1" }, + { "name":"Keyword(Operator)", "fore":"plum1" }, + { "name":"Keyword(Selection)", "fore":"white" }, + { "name":"Keyword(Iteration)", "fore":"plum1" }, + { "name":"Keyword(Jump)", "fore":"plum1" }, + { "name":"Keyword(Context)", "fore":"white" }, + { "name":"Keyword(Exception)", "fore":"white" }, + { "name":"Keyword(Modifiers)", "fore":"plum1" }, + { "name":"Keyword(Constants)", "fore":"orange3" }, + { "name":"Keyword(Void)", "fore":"plum1" }, + { "name":"Keyword(Namespace)", "fore":"plum1" }, + { "name":"Keyword(Property)", "fore":"plum1" }, + { "name":"Keyword(Declaration)", "fore":"plum1" }, + { "name":"Keyword(Parameter)", "fore":"white" }, + { "name":"Keyword(Operator Declaration)", "fore":"plum1" }, + { "name":"Keyword(Other)", "fore":"white" }, { "name":"User Types", "fore":"chameleon1" }, { "name":"User Types(Enums)", "fore":"chameleon1" }, @@ -197,17 +196,17 @@ { "name":"User Field Usage", "fore":"aluminium2", "style":"italic" }, { "name":"User Field Declaration", "fore":"aluminium2", "style":"italic" }, - { "name":"User Property Usage", "fore":"aluminium2", "style":"italic" }, - { "name":"User Property Declaration", "fore":"aluminium2", "style":"italic" }, + { "name":"User Property Usage", "fore":"aluminium2" }, + { "name":"User Property Declaration", "fore":"aluminium2" }, - { "name":"User Event Usage", "fore":"aluminium2", "style":"italic" }, - { "name":"User Event Declaration", "fore":"aluminium2", "style":"italic" }, + { "name":"User Event Usage", "fore":"aluminium2" }, + { "name":"User Event Declaration", "fore":"aluminium2" }, - { "name":"User Method Usage", "fore":"aluminium2", "style":"italic" }, - { "name":"User Method Declaration", "fore":"aluminium2", "style":"italic" }, + { "name":"User Method Usage", "fore":"aluminium2" }, + { "name":"User Method Declaration", "fore":"aluminium2" }, - { "name":"User Parameter Usage", "fore":"aluminium2" }, - { "name":"User Parameter Declaration", "fore":"aluminium2" }, + { "name":"User Parameter Usage", "fore":"aluminium2", "style":"italic" }, + { "name":"User Parameter Declaration", "fore":"aluminium2", "style":"italic" }, { "name":"User Variable Usage", "fore":"aluminium2" }, { "name":"User Variable Declaration", "fore":"aluminium2" }, @@ -221,21 +220,21 @@ { "name":"Debugger Current Statement", "fore":"white", "back":"#69684c" }, { "name":"Debugger Stack Line", "fore":"white", "back":"#5c6b4d" }, - { "name":"Diff Line(Added)", "fore":"butter2" }, - { "name":"Diff Line(Removed)", "fore":"skyblue1" }, - { "name":"Diff Line(Changed)", "fore":"plum1" }, - { "name":"Diff Header", "fore":"chameleon1", "weight":"bold" }, - { "name":"Diff Header(Separator)", "fore":"aluminium4" }, - { "name":"Diff Header(Old)", "fore":"chameleon1", "weight":"bold" }, - { "name":"Diff Header(New)", "fore":"chameleon1", "weight":"bold" }, - { "name":"Diff Location", "fore":"chameleon1", "weight":"bold" }, - - { "name":"Css Comment", "fore":"aluminium4", "weight":"bold" }, - { "name":"Css Property Name", "fore":"aluminium2", "weight":"bold" }, - { "name":"Css Property Value", "fore":"butter2", "weight":"bold" }, - { "name":"Css Selector", "fore":"aluminium2", "weight":"bold" }, - { "name":"Css String Value", "fore":"butter2", "weight":"bold" }, - { "name":"Css Keyword", "fore":"plum1", "weight":"bold" }, + { "name":"Diff Line(Added)", "fore":"butter2" }, + { "name":"Diff Line(Removed)", "fore":"skyblue1" }, + { "name":"Diff Line(Changed)", "fore":"plum1" }, + { "name":"Diff Header", "fore":"chameleon1", "weight":"bold" }, + { "name":"Diff Header(Separator)", "fore":"aluminium4" }, + { "name":"Diff Header(Old)", "fore":"chameleon1", "weight":"bold" }, + { "name":"Diff Header(New)", "fore":"chameleon1", "weight":"bold" }, + { "name":"Diff Location", "fore":"chameleon1", "weight":"bold" }, + + { "name":"Css Comment", "fore":"aluminium4", "weight":"bold" }, + { "name":"Css Property Name", "fore":"aluminium2", "weight":"bold" }, + { "name":"Css Property Value", "fore":"butter2", "weight":"bold" }, + { "name":"Css Selector", "fore":"aluminium2", "weight":"bold" }, + { "name":"Css String Value", "fore":"butter2", "weight":"bold" }, + { "name":"Css Keyword", "fore":"plum1", "weight":"bold" }, { "name":"Script Comment", "fore":"aluminium4" }, { "name":"Script Identifier" }, diff --git a/main/src/core/Mono.Texteditor/Styles/SolarizedDarkStyle.json b/main/src/core/Mono.Texteditor/Styles/SolarizedDarkStyle.json index ddaeccb8db..23bb1c1d98 100644 --- a/main/src/core/Mono.Texteditor/Styles/SolarizedDarkStyle.json +++ b/main/src/core/Mono.Texteditor/Styles/SolarizedDarkStyle.json @@ -1,6 +1,6 @@ { "name":"Solarized Dark", - "version":"1.1", + "version":"1.1.5", "description":"An artful, dark scheme that's easy on the eyes.", "originator":"Xamarin Inc. (http://xamarin.com)", @@ -21,7 +21,7 @@ { "name":"blue", "value":"#268bd2" }, { "name":"cyan", "value":"#2aa198" }, { "name":"green", "value":"#859900" }, - { "name":"invalid-red", "value":"#ff0000"} + { "name":"invalid-red", "value":"#ff0000" } ], "colors":[ @@ -40,16 +40,14 @@ { "name":"Indicator Margin", "color":"base03" }, { "name":"Indicator Margin(Separator)", "color":"base02" }, - { "name":"Tooltip Border", "color":"base1" }, { "name":"Tooltip Pager Top", "color":"base2" }, - { "name":"Tooltip Pager Bottom", "color":"base2" }, { "name":"Tooltip Pager Triangle", "color":"base00" }, { "name":"Tooltip Pager Text", "color":"base00" }, { "name":"Notification Border", "color":"base1" }, { "name":"Completion Window", "color":"base03", "bordercolor":"base1" }, - { "name":"Completion Tooltip Window", "color":"#feffe9", "bordercolor":"base1" }, + { "name":"Completion Tooltip Window", "color":"#feffe9", "bordercolor":"base1" }, { "name":"Completion Selection Bar Border", "color":"base02" }, { "name":"Completion Selection Bar Border(Inactive)", "color":"base3" }, { "name":"Completion Selection Bar Background", "color":"base02", "secondcolor":"base02" }, @@ -65,38 +63,38 @@ { "name":"Quick Diff(Dirty)", "color":"yellow" }, { "name":"Quick Diff(Changed)", "color":"green" }, - { "name":"Brace Matching(Rectangle)", "color":"base1", "secondcolor":"base02" }, - { "name":"Usages(Rectangle)", "color":"base02", "secondcolor":"base02", "bordercolor":"base02" }, - { "name":"Changing usages(Rectangle)", "color":"base02", "secondcolor":"base02", "bordercolor":"base02" }, - - { "name":"Breakpoint Marker", "color":"#6f3535", "bordercolor":"#7a3a3a" }, - { "name":"Breakpoint Marker(Disabled)", "color":"#707070", "bordercolor":"#7b7b7b" }, - { "name":"Breakpoint Marker(Invalid)", "color":"#604343", "bordercolor":"#6a4a4a" }, - - { "name":"Current Line Marker", "color":"base02"}, - { "name":"Current Line Marker(Inactive)", "color":"base02"}, - - { "name":"Debugger Current Line Marker", "color":"#69684c", "bordercolor":"#747354" }, - { "name":"Debugger Stack Line Marker", "color":"#5c6b4d", "bordercolor":"#657655"}, - - { "name":"Primary Link", "color":"chameleon3", "secondcolor":"chameleon2"}, - { "name":"Primary Link(Highlighted)", "color":"chameleon3", "secondcolor":"chameleon1"}, - { "name":"Secondary Link", "color":"aluminium2", "secondcolor":"white"}, - { "name":"Secondary Link(Highlighted)", "color":"aluminium3", "secondcolor":"aluminium1"}, - - { "name":"Message Bubble Error Marker", "color":"#b28d37"}, - { "name":"Message Bubble Error Tag", "color":"#e3a6a1", "secondcolor":"black"}, - { "name":"Message Bubble Error Counter", "color":"black", "secondcolor":"#e3a6a1"}, - { "name":"Message Bubble Error IconMargin", "color":"#735c54", "bordercolor":"#805b4d"}, - { "name":"Message Bubble Error Line", "color":"#7b645c"}, - { "name":"Message Bubble Error Tooltip", "color":"#e3a6a1"}, - - { "name":"Message Bubble Warning Marker", "color":"#b28d37"}, - { "name":"Message Bubble Warning Tag", "color":"#efe89d", "secondcolor":"black"}, - { "name":"Message Bubble Warning Counter", "color":"black", "secondcolor":"#efe89d"}, - { "name":"Message Bubble Warning IconMargin", "color":"#777553", "bordercolor":"#948e51"}, - { "name":"Message Bubble Warning Line", "color":"#807e5c"}, - { "name":"Message Bubble Warning Tooltip", "color":"#efe89d"} + { "name":"Brace Matching(Rectangle)", "color":"#0e5465", "secondcolor":"#0e5465" }, + { "name":"Usages(Rectangle)", "color":"#527F99", "secondcolor":"#527F99", "bordercolor":"#527F99" }, + { "name":"Changing usages(Rectangle)", "color":"#996E75", "secondcolor":"#996E75", "bordercolor":"#996E75" }, + + { "name":"Breakpoint Marker", "color":"#6f3535", "bordercolor":"#6f3535" }, + { "name":"Breakpoint Marker(Disabled)", "color":"#4d4d4d", "bordercolor":"#4d4d4d" }, + { "name":"Breakpoint Marker(Invalid)", "color":"#604343", "bordercolor":"#604343" }, + + { "name":"Current Line Marker", "color":"#183842", "secondcolor":"#183842" }, + { "name":"Current Line Marker(Inactive)", "color":"#183842", "secondcolor":"#183842" }, + + { "name":"Debugger Current Line Marker", "color":"#69684c", "bordercolor":"#69684c" }, + { "name":"Debugger Stack Line Marker", "color":"#54653f", "bordercolor":"#54653f" }, + + { "name":"Primary Link", "color":"chameleon3", "secondcolor":"chameleon2" }, + { "name":"Primary Link(Highlighted)", "color":"chameleon3", "secondcolor":"chameleon1" }, + { "name":"Secondary Link", "color":"aluminium2", "secondcolor":"white" }, + { "name":"Secondary Link(Highlighted)", "color":"aluminium3", "secondcolor":"aluminium1" }, + + { "name":"Message Bubble Error Marker", "color":"#b28d37" }, + { "name":"Message Bubble Error Tag", "color":"#e3a6a1", "secondcolor":"black" }, + { "name":"Message Bubble Error Counter", "color":"black", "secondcolor":"#e3a6a1" }, + { "name":"Message Bubble Error IconMargin", "color":"#735c54", "bordercolor":"#805b4d" }, + { "name":"Message Bubble Error Line", "color":"#7b645c" }, + { "name":"Message Bubble Error Tooltip", "color":"#e3a6a1" }, + + { "name":"Message Bubble Warning Marker", "color":"#b28d37" }, + { "name":"Message Bubble Warning Tag", "color":"#efe89d", "secondcolor":"black" }, + { "name":"Message Bubble Warning Counter", "color":"black", "secondcolor":"#efe89d" }, + { "name":"Message Bubble Warning IconMargin", "color":"#777553", "bordercolor":"#948e51" }, + { "name":"Message Bubble Warning Line", "color":"#807e5c" }, + { "name":"Message Bubble Warning Tooltip", "color":"#efe89d" } ], "text":[ @@ -106,23 +104,24 @@ { "name":"Collapsed Text", "fore":"base01", "back":"base03" }, - { "name":"Line Numbers", "fore":"base00", "back":"base02"}, + { "name":"Line Numbers", "fore":"base00", "back":"base02" }, { "name":"Punctuation", "fore":"base00" }, { "name":"Punctuation(Brackets)", "fore":"base00" }, - { "name":"Comment(Line)", "fore":"base01" }, - { "name":"Comment(Block)", "fore":"base01" }, - { "name":"Comment(Doc)", "fore":"base01" }, - { "name":"Comment(DocTag)", "fore":"base01" }, - { "name":"Comment Tag", "fore":"base01", "style":"italic" }, + { "name":"Comment(Line)", "fore":"base01", "style":"italic" }, + { "name":"Comment(Block)", "fore":"base01", "style":"italic" }, + { "name":"Comment(Doc)", "fore":"base01", "style":"italic" }, + { "name":"Comment(DocTag)", "fore":"base01", "style":"italic" }, + { "name":"Comment Tag", "fore":"#ff00ff", "weight":"bold" }, + { "name":"Excluded Code", "fore":"base01" }, - { "name":"String", "fore":"cyan"}, - { "name":"String(Escape)", "fore":"lightcyan"}, - { "name":"String(C# @ Verbatim)", "fore":"cyan"}, + { "name":"String", "fore":"cyan" }, + { "name":"String(Escape)", "fore":"lightcyan" }, + { "name":"String(C# @ Verbatim)", "fore":"cyan" }, - { "name":"Number", "fore":"violet"}, + { "name":"Number", "fore":"violet" }, { "name":"Preprocessor", "fore":"orange" }, { "name":"Preprocessor(Region Name)", "fore":"orange" }, @@ -151,7 +150,7 @@ { "name":"Completion Text", "fore":"base00" }, { "name":"Completion Matching Substring", "fore":"green" }, - + { "name":"Completion Selected Text", "fore":"base00" }, { "name":"Completion Selected Matching Substring", "fore":"green" }, @@ -183,8 +182,8 @@ { "name":"User Types(Value types)", "fore":"yellow" }, { "name":"User Types(Type parameters)", "fore":"yellow" }, - { "name":"User Field Usage", "fore":"blue" }, - { "name":"User Field Declaration", "fore":"blue" }, + { "name":"User Field Usage", "fore":"blue", "style":"italic" }, + { "name":"User Field Declaration", "fore":"blue", "style":"italic" }, { "name":"User Property Usage", "fore":"blue" }, { "name":"User Property Declaration", "fore":"blue" }, @@ -195,8 +194,8 @@ { "name":"User Method Usage", "fore":"blue" }, { "name":"User Method Declaration", "fore":"blue" }, - { "name":"User Parameter Usage", "fore":"base00" }, - { "name":"User Parameter Declaration", "fore":"base00" }, + { "name":"User Parameter Usage", "fore":"base00", "style":"italic" }, + { "name":"User Parameter Declaration", "fore":"base00", "style":"italic" }, { "name":"User Variable Usage", "fore":"base00" }, { "name":"User Variable Declaration", "fore":"base00" }, @@ -210,21 +209,21 @@ { "name":"Debugger Current Statement", "fore":"white", "back":"#69684c" }, { "name":"Debugger Stack Line", "fore":"white", "back":"#5c6b4d" }, - { "name":"Diff Line(Added)", "fore":"Blue" }, - { "name":"Diff Line(Removed)", "fore":"Red" }, - { "name":"Diff Line(Changed)", "fore":"Green" }, - { "name":"Diff Header", "fore":"Magenta" }, - { "name":"Diff Header(Separator)", "fore":"Magenta", "weight":"bold" }, - { "name":"Diff Header(Old)", "fore":"Red", "weight":"bold" }, - { "name":"Diff Header(New)", "fore":"Blue", "weight":"bold" }, - { "name":"Diff Location", "fore":"Magenta", "weight":"bold" }, - - { "name":"Css Comment", "fore":"base01", "weight":"bold" }, - { "name":"Css Property Name", "fore":"black", "weight":"bold" }, - { "name":"Css Property Value", "fore":"cyan", "weight":"bold" }, - { "name":"Css Selector", "fore":"base01", "weight":"bold" }, - { "name":"Css String Value", "fore":"cyan", "weight":"bold" }, - { "name":"Css Keyword", "fore":"keyword-teal", "weight":"bold" }, + { "name":"Diff Line(Added)", "fore":"Blue" }, + { "name":"Diff Line(Removed)", "fore":"Red" }, + { "name":"Diff Line(Changed)", "fore":"Green" }, + { "name":"Diff Header", "fore":"Magenta", "weight":"bold" }, + { "name":"Diff Header(Separator)", "fore":"Magenta" }, + { "name":"Diff Header(Old)", "fore":"Red", "weight":"bold" }, + { "name":"Diff Header(New)", "fore":"Blue", "weight":"bold" }, + { "name":"Diff Location", "fore":"Magenta", "weight":"bold" }, + + { "name":"Css Comment", "fore":"base01", "weight":"bold" }, + { "name":"Css Property Name", "fore":"black", "weight":"bold" }, + { "name":"Css Property Value", "fore":"cyan", "weight":"bold" }, + { "name":"Css Selector", "fore":"base01", "weight":"bold" }, + { "name":"Css String Value", "fore":"cyan", "weight":"bold" }, + { "name":"Css Keyword", "fore":"keyword-teal", "weight":"bold" }, { "name":"Script Comment", "fore":"base01" }, { "name":"Script Identifier" }, diff --git a/main/src/core/Mono.Texteditor/Styles/SolarizedLightStyle.json b/main/src/core/Mono.Texteditor/Styles/SolarizedLightStyle.json index 8733979790..37ef604075 100644 --- a/main/src/core/Mono.Texteditor/Styles/SolarizedLightStyle.json +++ b/main/src/core/Mono.Texteditor/Styles/SolarizedLightStyle.json @@ -1,6 +1,6 @@ { "name":"Solarized Light", - "version":"1.1", + "version":"1.1.6", "description":"An artful, light scheme that's easy on the eyes.", "originator":"Xamarin Inc. (http://xamarin.com)", @@ -21,28 +21,26 @@ { "name":"blue", "value":"#268bd2" }, { "name":"cyan", "value":"#2aa198" }, { "name":"green", "value":"#859900" }, - { "name":"invalid-red", "value":"#ff0000"} + { "name":"invalid-red", "value":"#ff0000" } ], "colors":[ { "name":"Background(Read Only)", "color":"base02" }, - { "name":"Search Result Background", "color":"base3" }, - { "name":"Search Result Background (highlighted)", "color":"base3" }, + { "name":"Search result background", "color":"base3" }, + { "name":"Search result background (highlighted)", "color":"base3" }, - { "name":"Column Ruler", "color":"base1" }, + { "name":"Column Ruler", "color":"#eae4d3" }, - { "name":"Fold Square", "color":"base01", "secondcolor":"base3" }, - { "name":"Fold Cross", "color":"base01", "secondcolor":"base3" }, + { "name":"Fold Square", "color":"#dcd8c6", "secondcolor":"base3" }, + { "name":"Fold Cross", "color":"#a3afb3", "secondcolor":"base3" }, - { "name":"Indentation Guide", "color":"#354243" }, + { "name":"Indentation Guide", "color":"#e2dccc" }, { "name":"Indicator Margin", "color":"base2" }, { "name":"Indicator Margin(Separator)", "color":"base3" }, - { "name":"Tooltip Border", "color":"base1" }, { "name":"Tooltip Pager Top", "color":"base2" }, - { "name":"Tooltip Pager Bottom", "color":"base2" }, { "name":"Tooltip Pager Triangle", "color":"base00" }, { "name":"Tooltip Pager Text", "color":"base00" }, @@ -65,38 +63,38 @@ { "name":"Quick Diff(Dirty)", "color":"yellow" }, { "name":"Quick Diff(Changed)", "color":"green" }, - { "name":"Brace Matching(Rectangle)", "color":"base1", "secondcolor":"base3" }, - { "name":"Usages(Rectangle)", "color":"base3", "secondcolor":"base3", "bordercolor":"base3" }, - { "name":"Changing usages(Rectangle)", "color":"base3", "secondcolor":"base3", "bordercolor":"base3" }, - - { "name":"Breakpoint Marker", "color":"#f9dbda", "bordercolor":"#ebcccb" }, - { "name":"Breakpoint Marker(Disabled)", "color":"#e9e9e9", "bordercolor":"#dbdbdb" }, - { "name":"Breakpoint Marker(Invalid)", "color":"#f1e3e3", "bordercolor":"#e3d5d5" }, - - { "name":"Current Line Marker", "color":"base3"}, - { "name":"Current Line Marker(Inactive)", "color":"base3"}, - - { "name":"Debugger Current Line Marker", "color":"#f8f4a1", "bordercolor":"#ede993" }, - { "name":"Debugger Stack Line Marker", "color":"#ccfca6", "bordercolor":"#bff197" }, - - { "name":"Primary Link", "color":"chameleon3", "secondcolor":"chameleon2"}, - { "name":"Primary Link(Highlighted)", "color":"chameleon3", "secondcolor":"chameleon1"}, - { "name":"Secondary Link", "color":"aluminium2", "secondcolor":"white"}, - { "name":"Secondary Link(Highlighted)", "color":"aluminium3", "secondcolor":"aluminium1"}, - - { "name":"Message Bubble Error Marker", "color":"#b28d37"}, - { "name":"Message Bubble Error Tag", "color":"#e3a6a1", "secondcolor":"black"}, - { "name":"Message Bubble Error Counter", "color":"black", "secondcolor":"#e3a6a1"}, - { "name":"Message Bubble Error IconMargin", "color":"#735c54", "bordercolor":"#805b4d"}, - { "name":"Message Bubble Error Line", "color":"#7b645c"}, - { "name":"Message Bubble Error Tooltip", "color":"#e3a6a1"}, - - { "name":"Message Bubble Warning Marker", "color":"#b28d37"}, - { "name":"Message Bubble Warning Tag", "color":"#efe89d", "secondcolor":"black"}, - { "name":"Message Bubble Warning Counter", "color":"black", "secondcolor":"#efe89d"}, - { "name":"Message Bubble Warning IconMargin", "color":"#777553", "bordercolor":"#948e51"}, - { "name":"Message Bubble Warning Line", "color":"#807e5c"}, - { "name":"Message Bubble Warning Tooltip", "color":"#efe89d"} + { "name":"Brace Matching(Rectangle)", "color":"#fde5d6", "secondcolor":"#fde5d6" }, + { "name":"Usages(Rectangle)", "color":"#B1DFF9", "secondcolor":"#B1DFF9", "bordercolor":"#B1DFF9" }, + { "name":"Changing usages(Rectangle)", "color":"#FFD6DD", "secondcolor":"#FFD6DD", "bordercolor":"#FFD6DD" }, + + { "name":"Breakpoint Marker", "color":"#f9dbda", "bordercolor":"#f9dbda" }, + { "name":"Breakpoint Marker(Disabled)", "color":"#e9e9e9", "bordercolor":"#e9e9e9" }, + { "name":"Breakpoint Marker(Invalid)", "color":"#f1e3e3", "bordercolor":"#f1e3e3" }, + + { "name":"Current Line Marker", "color":"#f5eedd", "secondcolor":"#f5eedd" }, + { "name":"Current Line Marker(Inactive)", "color":"#f5eedd", "secondcolor":"#f5eedd" }, + + { "name":"Debugger Current Line Marker", "color":"#f8f4a1", "bordercolor":"#f8f4a1" }, + { "name":"Debugger Stack Line Marker", "color":"#c9e1a9", "bordercolor":"#c9e1a9" }, + + { "name":"Primary Link", "color":"chameleon3", "secondcolor":"chameleon2" }, + { "name":"Primary Link(Highlighted)", "color":"chameleon3", "secondcolor":"chameleon1" }, + { "name":"Secondary Link", "color":"aluminium2", "secondcolor":"white" }, + { "name":"Secondary Link(Highlighted)", "color":"aluminium3", "secondcolor":"aluminium1" }, + + { "name":"Message Bubble Error Marker", "color":"#b28d37" }, + { "name":"Message Bubble Error Tag", "color":"#e3a6a1", "secondcolor":"black" }, + { "name":"Message Bubble Error Counter", "color":"black", "secondcolor":"#e3a6a1" }, + { "name":"Message Bubble Error IconMargin", "color":"#d83f3f", "bordercolor":"#d83f3f" }, + { "name":"Message Bubble Error Line", "color":"#7b645c" }, + { "name":"Message Bubble Error Tooltip", "color":"#e3a6a1" }, + + { "name":"Message Bubble Warning Marker", "color":"#b28d37" }, + { "name":"Message Bubble Warning Tag", "color":"#efe89d", "secondcolor":"black" }, + { "name":"Message Bubble Warning Counter", "color":"black", "secondcolor":"#efe89d" }, + { "name":"Message Bubble Warning IconMargin", "color":"#e68100", "bordercolor":"#e68100" }, + { "name":"Message Bubble Warning Line", "color":"#807e5c" }, + { "name":"Message Bubble Warning Tooltip", "color":"#efe89d" } ], "text":[ @@ -106,23 +104,24 @@ { "name":"Collapsed Text", "fore":"base01", "back":"base3" }, - { "name":"Line Numbers", "fore":"base00", "back":"base2"}, + { "name":"Line Numbers", "fore":"base00", "back":"base2" }, { "name":"Punctuation", "fore":"base00" }, { "name":"Punctuation(Brackets)", "fore":"base00" }, - { "name":"Comment(Line)", "fore":"base01" }, - { "name":"Comment(Block)", "fore":"base01" }, - { "name":"Comment(Doc)", "fore":"base01" }, - { "name":"Comment(DocTag)", "fore":"base01" }, - { "name":"Comment Tag", "fore":"base01", "style":"italic" }, + { "name":"Comment(Line)", "fore":"base01", "style":"italic" }, + { "name":"Comment(Block)", "fore":"base01", "style":"italic" }, + { "name":"Comment(Doc)", "fore":"base01", "style":"italic" }, + { "name":"Comment(DocTag)", "fore":"base01", "style":"italic" }, + { "name":"Comment Tag", "fore":"#ff00ff", "weight":"bold" }, + { "name":"Excluded Code", "fore":"base01" }, - { "name":"String", "fore":"cyan"}, - { "name":"String(Escape)", "fore":"lightcyan"}, - { "name":"String(C# @ Verbatim)", "fore":"cyan"}, + { "name":"String", "fore":"cyan" }, + { "name":"String(Escape)", "fore":"lightcyan" }, + { "name":"String(C# @ Verbatim)", "fore":"cyan" }, - { "name":"Number", "fore":"violet"}, + { "name":"Number", "fore":"violet" }, { "name":"Preprocessor", "fore":"orange" }, { "name":"Preprocessor(Region Name)", "fore":"orange" }, @@ -146,12 +145,12 @@ { "name":"Html Tag Delimiter", "fore":"base00" }, { "name":"Razor Code", "fore":"black", "back":"base2" }, - { "name":"Tooltip Text", "fore":"black", "back":"#feffe9" }, + { "name":"Tooltip Text", "fore":"#222", "back":"#fff" }, { "name":"Notification Text", "fore":"black", "back":"#feffe9" }, { "name":"Completion Text", "fore":"base00" }, { "name":"Completion Matching Substring", "fore":"green" }, - + { "name":"Completion Selected Text", "fore":"base00" }, { "name":"Completion Selected Matching Substring", "fore":"green" }, @@ -183,8 +182,8 @@ { "name":"User Types(Value types)", "fore":"yellow" }, { "name":"User Types(Type parameters)", "fore":"yellow" }, - { "name":"User Field Usage", "fore":"blue" }, - { "name":"User Field Declaration", "fore":"blue" }, + { "name":"User Field Usage", "fore":"blue", "style":"italic" }, + { "name":"User Field Declaration", "fore":"blue", "style":"italic" }, { "name":"User Property Usage", "fore":"blue" }, { "name":"User Property Declaration", "fore":"blue" }, @@ -195,8 +194,8 @@ { "name":"User Method Usage", "fore":"blue" }, { "name":"User Method Declaration", "fore":"blue" }, - { "name":"User Parameter Usage", "fore":"base00" }, - { "name":"User Parameter Declaration", "fore":"base00" }, + { "name":"User Parameter Usage", "fore":"base00", "style":"italic" }, + { "name":"User Parameter Declaration", "fore":"base00", "style":"italic" }, { "name":"User Variable Usage", "fore":"base00" }, { "name":"User Variable Declaration", "fore":"base00" }, @@ -210,21 +209,21 @@ { "name":"Debugger Current Statement", "fore":"text-black", "back":"#f8f4a1" }, { "name":"Debugger Stack Line", "fore":"text-black", "back":"#ccfca6" }, - { "name":"Diff Line(Added)", "fore":"Blue" }, - { "name":"Diff Line(Removed)", "fore":"Red" }, - { "name":"Diff Line(Changed)", "fore":"Green" }, - { "name":"Diff Header", "fore":"Magenta" }, - { "name":"Diff Header(Separator)", "fore":"Magenta", "weight":"bold" }, - { "name":"Diff Header(Old)", "fore":"Red", "weight":"bold" }, - { "name":"Diff Header(New)", "fore":"Blue", "weight":"bold" }, - { "name":"Diff Location", "fore":"Magenta", "weight":"bold" }, - - { "name":"Css Comment", "fore":"base01", "weight":"bold" }, - { "name":"Css Property Name", "fore":"black", "weight":"bold" }, - { "name":"Css Property Value", "fore":"cyan", "weight":"bold" }, - { "name":"Css Selector", "fore":"base01", "weight":"bold" }, - { "name":"Css String Value", "fore":"cyan", "weight":"bold" }, - { "name":"Css Keyword", "fore":"keyword-teal", "weight":"bold" }, + { "name":"Diff Line(Added)", "fore":"Blue" }, + { "name":"Diff Line(Removed)", "fore":"Red" }, + { "name":"Diff Line(Changed)", "fore":"Green" }, + { "name":"Diff Header", "fore":"Magenta", "weight":"bold" }, + { "name":"Diff Header(Separator)", "fore":"Magenta" }, + { "name":"Diff Header(Old)", "fore":"Red", "weight":"bold" }, + { "name":"Diff Header(New)", "fore":"Blue", "weight":"bold" }, + { "name":"Diff Location", "fore":"Magenta", "weight":"bold" }, + + { "name":"Css Comment", "fore":"base01", "weight":"bold" }, + { "name":"Css Property Name", "fore":"black", "weight":"bold" }, + { "name":"Css Property Value", "fore":"cyan", "weight":"bold" }, + { "name":"Css Selector", "fore":"base01", "weight":"bold" }, + { "name":"Css String Value", "fore":"cyan", "weight":"bold" }, + { "name":"Css Keyword", "fore":"keyword-teal", "weight":"bold" }, { "name":"Script Comment", "fore":"base01" }, { "name":"Script Identifier" }, diff --git a/main/src/core/Mono.Texteditor/Styles/TangoStyle.json b/main/src/core/Mono.Texteditor/Styles/TangoStyle.json index e1e4c5eac6..87c619fa89 100644 --- a/main/src/core/Mono.Texteditor/Styles/TangoStyle.json +++ b/main/src/core/Mono.Texteditor/Styles/TangoStyle.json @@ -1,10 +1,12 @@ { "name":"Tango", - "version":"1.1", + "version":"1.1.8", "description":"A light scheme using colors from the Tango Project.", "originator":"Xamarin Inc. (http://xamarin.com)", "palette":[ + { "name":"text-black", "value":"#222222" }, + { "name":"comment-gray", "value":"#b0b0b0" }, { "name":"butter1", "value":"#fce94f" }, { "name":"butter2", "value":"#edd400" }, { "name":"butter3", "value":"#c4a000" }, @@ -41,19 +43,17 @@ { "name":"Search result background", "color":"#F6B94D" }, { "name":"Search result background (highlighted)", "color":"#E5992F" }, - { "name":"Column Ruler", "color":"aluminium3" }, + { "name":"Column Ruler", "color":"#eeeeee" }, - { "name":"Fold Square", "color":"aluminium4", "secondcolor":"white" }, - { "name":"Fold Cross", "color":"aluminium4", "secondcolor":"white" }, + { "name":"Fold Square", "color":"#cdcecc", "secondcolor":"white" }, + { "name":"Fold Cross", "color":"#b1b2b0", "secondcolor":"white" }, - { "name":"Indentation Guide", "color":"aluminium2" }, + { "name":"Indentation Guide", "color":"#e5e5e5" }, - { "name":"Indicator Margin", "color":"aluminium1" }, - { "name":"Indicator Margin(Separator)", "color":"aluminium3" }, + { "name":"Indicator Margin", "color":"#f6f6f6" }, + { "name":"Indicator Margin(Separator)", "color":"#f6f6f6" }, - { "name":"Tooltip Border", "color":"#b2b2b2" }, { "name":"Tooltip Pager Top", "color":"#ffffff" }, - { "name":"Tooltip Pager Bottom", "color":"#f5f5f5" }, { "name":"Tooltip Pager Triangle", "color":"#737373" }, { "name":"Tooltip Pager Text", "color":"#828282" }, @@ -69,70 +69,71 @@ { "name":"Quick Diff(Dirty)", "color":"butter2" }, { "name":"Quick Diff(Changed)", "color":"chameleon2" }, - { "name":"Brace Matching(Rectangle)", "color":"aluminium1", "secondcolor":"aluminium2" }, + { "name":"Brace Matching(Rectangle)", "color":"#fde5d6", "secondcolor":"#fde5d6" }, { "name":"Usages(Rectangle)", "color":"#B1DFF9", "secondcolor":"#B1DFF9", "bordercolor":"#B1DFF9" }, { "name":"Changing usages(Rectangle)", "color":"#FFD6DD", "secondcolor":"#FFD6DD", "bordercolor":"#FFD6DD" }, - { "name":"Breakpoint Marker", "color":"#f9dbda", "bordercolor":"#ebcccb" }, - { "name":"Breakpoint Marker(Disabled)", "color":"#e9e9e9", "bordercolor":"#dbdbdb" }, - { "name":"Breakpoint Marker(Invalid)", "color":"#f1e3e3", "bordercolor":"#e3d5d5" }, + { "name":"Breakpoint Marker", "color":"#f9dbda", "bordercolor":"#f9dbda" }, + { "name":"Breakpoint Marker(Disabled)", "color":"#e9e9e9", "bordercolor":"#e9e9e9" }, + { "name":"Breakpoint Marker(Invalid)", "color":"#f1e3e3", "bordercolor":"#f1e3e3" }, - { "name":"Current Line Marker", "color":"aluminium1", "secondcolor":"aluminium2" }, - { "name":"Current Line Marker(Inactive)", "color":"aluminium2", "secondcolor":"aluminium3" }, + { "name":"Current Line Marker", "color":"#f7f7f7", "secondcolor":"#f7f7f7" }, + { "name":"Current Line Marker(Inactive)", "color":"#f7f7f7", "secondcolor":"#f7f7f7" }, - { "name":"Debugger Current Line Marker", "color":"#f8f4a1", "bordercolor":"#ede993" }, - { "name":"Debugger Stack Line Marker", "color":"#ccfca6", "bordercolor":"#bff197" }, + { "name":"Debugger Current Line Marker", "color":"#f8f4a1", "bordercolor":"#f8f4a1" }, + { "name":"Debugger Stack Line Marker", "color":"#d0efa9", "bordercolor":"#d0efa9" }, - { "name":"Primary Link", "color":"chameleon3", "secondcolor":"chameleon2"}, - { "name":"Primary Link(Highlighted)", "color":"chameleon3", "secondcolor":"chameleon1"}, - { "name":"Secondary Link", "color":"aluminium2", "secondcolor":"white"}, - { "name":"Secondary Link(Highlighted)", "color":"aluminium3", "secondcolor":"aluminium1"}, + { "name":"Primary Link", "color":"chameleon3", "secondcolor":"chameleon2" }, + { "name":"Primary Link(Highlighted)", "color":"chameleon3", "secondcolor":"chameleon1" }, + { "name":"Secondary Link", "color":"aluminium2", "secondcolor":"white" }, + { "name":"Secondary Link(Highlighted)", "color":"aluminium3", "secondcolor":"aluminium1" }, { "name":"Message Bubble Error Marker", "color":"#df6962" }, { "name":"Message Bubble Error Tag", "color":"#d83f3f", "secondcolor":"white" }, { "name":"Message Bubble Error Counter", "color":"white", "secondcolor":"#d83f3f" }, - { "name":"Message Bubble Error IconMargin", "color":"#d83f3f", "bordercolor":"#b12a2a" }, + { "name":"Message Bubble Error IconMargin", "color":"#d83f3f", "bordercolor":"#d83f3f" }, { "name":"Message Bubble Error Line", "color":"#fbe4e6" }, { "name":"Message Bubble Error Tooltip", "color":"#D10B0B" }, { "name":"Message Bubble Warning Marker", "color":"#b28d37" }, { "name":"Message Bubble Warning Tag", "color":"#e68100", "secondcolor":"white" }, { "name":"Message Bubble Warning Counter", "color":"white", "secondcolor":"#e68100" }, - { "name":"Message Bubble Warning IconMargin", "color":"#e68100", "bordercolor":"#c76f00" }, + { "name":"Message Bubble Warning IconMargin", "color":"#e68100", "bordercolor":"#e68100" }, { "name":"Message Bubble Warning Line", "color":"#fff1da" }, { "name":"Message Bubble Warning Tooltip", "color":"#D1590B" } ], "text":[ - { "name":"Plain Text", "fore":"black", "back":"white" }, + { "name":"Plain Text", "fore":"text-black", "back":"white" }, { "name":"Selected Text", "back":"skyblue0" }, { "name":"Selected Text(Inactive)", "back":"aluminium3" }, { "name":"Collapsed Text", "fore":"aluminium4", "back":"white" }, - { "name":"Line Numbers", "fore":"aluminium4", "back":"white"}, + { "name":"Line Numbers", "fore":"aluminium4", "back":"white" }, - { "name":"Punctuation", "fore":"black" }, - { "name":"Punctuation(Brackets)", "fore":"black" }, + { "name":"Punctuation", "fore":"text-black" }, + { "name":"Punctuation(Brackets)", "fore":"text-black" }, - { "name":"Comment(Line)", "fore":"aluminium4" }, - { "name":"Comment(Block)", "fore":"aluminium4" }, - { "name":"Comment(Doc)", "fore":"aluminium4" }, - { "name":"Comment(DocTag)", "fore":"aluminium3" }, - { "name":"Comment Tag", "fore":"aluminium4" }, - { "name":"Excluded Code", "fore":"aluminium4" }, + { "name":"Comment(Line)", "fore":"comment-gray", "style":"italic" }, + { "name":"Comment(Block)", "fore":"comment-gray", "style":"italic" }, + { "name":"Comment(Doc)", "fore":"#97b488", "style":"italic" }, + { "name":"Comment(DocTag)", "fore":"#c8b97c", "style":"italic" }, + { "name":"Comment Tag", "fore":"#ff00ff", "weight":"bold" }, - { "name":"String", "fore":"scarletred3"}, - { "name":"String(Escape)", "fore":"scarletred3", "weight":"bold"}, - { "name":"String(C# @ Verbatim)", "fore":"scarletred3"}, + { "name":"Excluded Code", "fore":"comment-gray" }, - { "name":"Number", "fore":"scarletred3"}, + { "name":"String", "fore":"scarletred3" }, + { "name":"String(Escape)", "fore":"scarletred3" }, + { "name":"String(C# @ Verbatim)", "fore":"scarletred3" }, + + { "name":"Number", "fore":"scarletred3" }, { "name":"Preprocessor", "fore":"butter3" }, - { "name":"Preprocessor(Region Name)", "fore":"black" }, + { "name":"Preprocessor(Region Name)", "fore":"text-black" }, - { "name":"Xml Text", "fore":"black" }, - { "name":"Xml Delimiter", "fore":"black" }, + { "name":"Xml Text", "fore":"text-black" }, + { "name":"Xml Delimiter", "fore":"text-black" }, { "name":"Xml Name", "fore":"skyblue3" }, { "name":"Xml Attribute", "fore":"orange2" }, { "name":"Xml Attribute Quotes", "fore":"scarletred3" }, @@ -146,12 +147,12 @@ { "name":"Html Element Name", "fore":"skyblue3" }, { "name":"Html Entity", "fore":"#c12dad" }, { "name":"Html Operator", "fore":"skyblue3" }, - { "name":"Html Server-Side Script", "fore":"black", "back":"#fdf0bd" }, + { "name":"Html Server-Side Script", "fore":"text-black", "back":"#fdf0bd" }, { "name":"Html Tag Delimiter", "fore":"skyblue2" }, - { "name":"Razor Code", "fore":"black", "back":"#fdfaed" }, + { "name":"Razor Code", "fore":"text-black", "back":"#fdfaed" }, - { "name":"Tooltip Text", "fore":"black", "back":"#feffe9" }, - { "name":"Notification Text", "fore":"black", "back":"#feffe9" }, + { "name":"Tooltip Text", "fore":"text-black", "back":"#fafae3" }, + { "name":"Notification Text", "fore":"text-black", "back":"#feffe9" }, { "name":"Keyword(Access)", "fore":"skyblue2" }, { "name":"Keyword(Type)", "fore":"skyblue2" }, @@ -178,23 +179,23 @@ { "name":"User Types(Value types)", "fore":"plum2" }, { "name":"User Types(Type parameters)", "fore":"plum2" }, - { "name":"User Field Usage", "fore":"black", "style":"oblique" }, - { "name":"User Field Declaration", "fore":"black", "style":"oblique" }, + { "name":"User Field Usage", "fore":"text-black", "style":"italic" }, + { "name":"User Field Declaration", "fore":"text-black", "style":"italic" }, - { "name":"User Property Usage", "fore":"black" }, - { "name":"User Property Declaration", "fore":"black" }, + { "name":"User Property Usage", "fore":"text-black" }, + { "name":"User Property Declaration", "fore":"text-black" }, - { "name":"User Event Usage", "fore":"orange3", "style":"oblique" }, - { "name":"User Event Declaration", "fore":"orange3", "style":"oblique" }, + { "name":"User Event Usage", "fore":"orange3" }, + { "name":"User Event Declaration", "fore":"orange3" }, - { "name":"User Method Usage", "fore":"black" }, - { "name":"User Method Declaration", "fore":"black" }, + { "name":"User Method Usage", "fore":"text-black" }, + { "name":"User Method Declaration", "fore":"text-black" }, - { "name":"User Parameter Usage", "fore":"black" }, - { "name":"User Parameter Declaration", "fore":"black" }, + { "name":"User Parameter Usage", "fore":"text-black", "style":"italic" }, + { "name":"User Parameter Declaration", "fore":"text-black", "style":"italic" }, - { "name":"User Variable Usage", "fore":"black" }, - { "name":"User Variable Declaration", "fore":"black" }, + { "name":"User Variable Usage", "fore":"text-black" }, + { "name":"User Variable Declaration", "fore":"text-black" }, { "name":"Syntax Error", "fore":"scarletred1" }, @@ -205,21 +206,21 @@ { "name":"Debugger Current Statement", "fore":"text-black", "back":"#f8f4a1" }, { "name":"Debugger Stack Line", "fore":"text-black", "back":"#ccfca6" }, - { "name":"Diff Line(Added)", "fore":"skyblue2" }, - { "name":"Diff Line(Removed)", "fore":"scarletred1" }, - { "name":"Diff Line(Changed)", "fore":"plum2" }, - { "name":"Diff Header", "fore":"chameleon3" }, - { "name":"Diff Header(Separator)", "fore":"chameleon3", "weight":"bold" }, - { "name":"Diff Header(Old)", "fore":"scarletred1", "weight":"bold" }, - { "name":"Diff Header(New)", "fore":"skyblue2", "weight":"bold" }, - { "name":"Diff Location", "fore":"plum2", "weight":"bold" }, - - { "name":"Css Comment", "fore":"chameleon3", "weight":"bold" }, - { "name":"Css Property Name", "fore":"black", "weight":"bold" }, - { "name":"Css Property Value", "fore":"literal-orange", "weight":"bold" }, - { "name":"Css Selector", "fore":"chameleon3", "weight":"bold" }, - { "name":"Css String Value", "fore":"literal-orange", "weight":"bold" }, - { "name":"Css Keyword", "fore":"keyword-teal", "weight":"bold" }, + { "name":"Diff Line(Added)", "fore":"skyblue2" }, + { "name":"Diff Line(Removed)", "fore":"scarletred1" }, + { "name":"Diff Line(Changed)", "fore":"plum2" }, + { "name":"Diff Header", "fore":"chameleon3", "weight":"bold" }, + { "name":"Diff Header(Separator)", "fore":"chameleon3" }, + { "name":"Diff Header(Old)", "fore":"scarletred1", "weight":"bold" }, + { "name":"Diff Header(New)", "fore":"skyblue2", "weight":"bold" }, + { "name":"Diff Location", "fore":"plum2", "weight":"bold" }, + + { "name":"Css Comment", "fore":"chameleon3", "weight":"bold" }, + { "name":"Css Property Name", "fore":"text-black", "weight":"bold" }, + { "name":"Css Property Value", "fore":"literal-orange", "weight":"bold" }, + { "name":"Css Selector", "fore":"chameleon3", "weight":"bold" }, + { "name":"Css String Value", "fore":"literal-orange", "weight":"bold" }, + { "name":"Css Keyword", "fore":"keyword-teal", "weight":"bold" }, { "name":"Script Comment", "fore":"chameleon3" }, { "name":"Script Identifier" }, diff --git a/main/src/core/Mono.Texteditor/Styles/VisualStudioStyle.json b/main/src/core/Mono.Texteditor/Styles/VisualStudioStyle.json index 24c60691e3..ca585eddae 100644 --- a/main/src/core/Mono.Texteditor/Styles/VisualStudioStyle.json +++ b/main/src/core/Mono.Texteditor/Styles/VisualStudioStyle.json @@ -1,10 +1,11 @@ { "name":"Visual Studio", - "version":"1.1", + "version":"1.1.8", "description":"Reminiscent of Microsoft Visual Studio's default colors.", "originator":"Jeffrey Stedfast <fejj@novell.com>", "palette":[ + { "name":"text-black", "value":"#222222" }, { "name":"comment-green", "value":"#008000" }, { "name":"keyword-blue", "value":"#0000ff" }, { "name":"semantic-type", "value":"#2B90AF" }, @@ -14,10 +15,12 @@ "colors":[ { "name":"Background(Read Only)", "color":"#FFFFFF" }, - { "name":"Fold Square", "color":"#A5A5A5" }, - { "name":"Fold Cross", "color":"#555555", "secondcolor":"#E2E2E2" }, + { "name":"Column Ruler", "color":"#eeeeee" }, - { "name":"Indentation Guide", "color":"aluminium2" }, + { "name":"Fold Square", "color":"#cdcecc", "secondcolor":"white" }, + { "name":"Fold Cross", "color":"#b1b2b0", "secondcolor":"white" }, + + { "name":"Indentation Guide", "color":"#e5e5e5" }, { "name":"Underline(Error)", "color":"#FF0000" }, { "name":"Underline(Warning)", "color":"comment-green" }, @@ -25,19 +28,30 @@ { "name":"Quick Diff(Dirty)", "color":"yellow" }, { "name":"Quick Diff(Changed)", "color":"green" }, - { "name":"Brace Matching(Rectangle)", "color":"#DBE0CC", "secondcolor":"#00000000" }, + { "name":"Brace Matching(Rectangle)", "color":"#fde5d6", "secondcolor":"#fde5d6" }, { "name":"Usages(Rectangle)", "color":"#B1DFF9", "secondcolor":"#B1DFF9", "bordercolor":"#B1DFF9" }, { "name":"Changing usages(Rectangle)", "color":"#FFD6DD", "secondcolor":"#FFD6DD", "bordercolor":"#FFD6DD" }, - { "name":"Current Line Marker", "color":"white", "secondcolor":"gray"}, - { "name":"Current Line Marker(Inactive)", "color":"white", "secondcolor":"gray"}, + { "name":"Breakpoint Marker", "color":"#f9dbda", "bordercolor":"#f9dbda" }, + { "name":"Breakpoint Marker(Disabled)", "color":"#e9e9e9", "bordercolor":"#e9e9e9" }, + { "name":"Breakpoint Marker(Invalid)", "color":"#f1e3e3", "bordercolor":"#f1e3e3" }, + + { "name":"Current Line Marker", "color":"#f7f7f7", "secondcolor":"#f7f7f7" }, + { "name":"Current Line Marker(Inactive)", "color":"#f7f7f7", "secondcolor":"#f7f7f7" }, + + { "name":"Debugger Current Line Marker", "color":"#f8f4a1", "bordercolor":"#f8f4a1" }, + { "name":"Debugger Stack Line Marker", "color":"#d0efa9", "bordercolor":"#d0efa9" }, + + { "name":"Indicator Margin", "color":"#f6f6f6" }, + { "name":"Indicator Margin(Separator)", "color":"#f6f6f6" }, - { "name":"Indicator Margin", "color":"#F0F0F0" }, - { "name":"Indicator Margin(Separator)", "color":"#F0F0F0" } + { "name":"Message Bubble Error IconMargin", "color":"#d83f3f", "bordercolor":"#d83f3f" }, + + { "name":"Message Bubble Warning IconMargin", "color":"#e68100", "bordercolor":"#e68100" } ], "text":[ - { "name":"Plain Text", "fore":"#000000", "back":"#FFFFFF" }, + { "name":"Plain Text", "fore":"text-black", "back":"#FFFFFF" }, { "name":"Selected Text", "fore":"white", "back":"#3298FF" }, { "name":"Selected Text(Inactive)", "fore":"white", "back":"#BFCDDB" }, @@ -48,11 +62,12 @@ { "name":"Punctuation" }, { "name":"Punctuation(Brackets)", "fore":"#000000", "back":"#FFFFFF" }, - { "name":"Comment(Line)", "fore":"comment-green" }, - { "name":"Comment(Block)", "fore":"comment-green" }, - { "name":"Comment(Doc)", "fore":"comment-green" }, - { "name":"Comment(DocTag)", "fore":"#808080" }, - { "name":"Comment Tag", "fore":"comment-green" }, + { "name":"Comment(Line)", "fore":"comment-green", "style":"italic" }, + { "name":"Comment(Block)", "fore":"comment-green", "style":"italic" }, + { "name":"Comment(Doc)", "fore":"#97b488", "style":"italic" }, + { "name":"Comment(DocTag)", "fore":"#c8b97c", "style":"italic" }, + { "name":"Comment Tag", "fore":"#ff00ff", "weight":"bold" }, + { "name":"Excluded Code", "fore":"comment-green" }, { "name":"String", "fore":"#A31515" }, @@ -107,8 +122,8 @@ { "name":"User Types(Delegates)", "fore":"semantic-type" }, { "name":"User Types(Value types)", "fore":"semantic-type" }, - { "name":"User Field Usage" }, - { "name":"User Field Declaration" }, + { "name":"User Field Usage", "style":"italic" }, + { "name":"User Field Declaration", "style":"italic" }, { "name":"User Property Usage" }, { "name":"User Property Declaration" }, @@ -119,8 +134,8 @@ { "name":"User Method Usage" }, { "name":"User Method Declaration" }, - { "name":"User Parameter Usage" }, - { "name":"User Parameter Declaration" }, + { "name":"User Parameter Usage", "style":"italic" }, + { "name":"User Parameter Declaration", "style":"italic" }, { "name":"User Variable Usage" }, { "name":"User Variable Declaration" }, @@ -131,18 +146,20 @@ { "name":"Debugger Current Statement", "fore":"#000000", "back":"#FFEE61" }, - { "name":"Css Comment", "fore":"#006400" }, - { "name":"Css Property Name", "fore":"#FF0000" }, - { "name":"Css Property Value", "fore":"keyword-blue" }, - { "name":"Css Selector", "fore":"#800000" }, - { "name":"Css String Value", "fore":"keyword-blue" }, - { "name":"Css Keyword", "fore":"keyword-blue" }, + { "name":"Css Comment", "fore":"#006400", "weight":"bold" }, + { "name":"Css Property Name", "fore":"#FF0000", "weight":"bold" }, + { "name":"Css Property Value", "fore":"keyword-blue", "weight":"bold" }, + { "name":"Css Selector", "fore":"#800000", "weight":"bold" }, + { "name":"Css String Value", "fore":"keyword-blue", "weight":"bold" }, + { "name":"Css Keyword", "fore":"keyword-blue", "weight":"bold" }, { "name":"Script Comment", "fore":"comment-green" }, { "name":"Script Identifier" }, { "name":"Script Keyword", "fore":"keyword-blue" }, { "name":"Script Number" }, { "name":"Script Operator" }, - { "name":"Script String" } + { "name":"Script String" }, + + { "name":"Tooltip Text", "fore":"text-black", "back":"#fafae3" } ] }
\ No newline at end of file diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/BrandingService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/BrandingService.cs index 4803909107..6426fe5aa5 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/BrandingService.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/BrandingService.cs @@ -46,6 +46,7 @@ namespace MonoDevelop.Core public static readonly string SuiteName; public static readonly string ProfileDirectoryName; public static readonly string StatusSteadyIconId; + public static readonly string HelpAboutIconId; static BrandingService () { @@ -79,6 +80,7 @@ namespace MonoDevelop.Core SuiteName = GetString ("SuiteName"); ProfileDirectoryName = GetString ("ProfileDirectoryName"); StatusSteadyIconId = GetString ("StatusAreaSteadyIcon"); + HelpAboutIconId = GetString ("HelpAboutIcon"); } catch (Exception ex) { LoggingService.LogError ("Could not read branding document", ex); } @@ -94,6 +96,9 @@ namespace MonoDevelop.Core if (string.IsNullOrEmpty (StatusSteadyIconId)) StatusSteadyIconId = "md-status-steady"; + + if (string.IsNullOrEmpty (HelpAboutIconId)) + HelpAboutIconId = "md-about"; } public static string GetString (params string[] keyPath) diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml index a2b558bdb2..201f663303 100644 --- a/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml +++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/Commands.addin.xml @@ -190,7 +190,8 @@ icon = "md-new-project" /> <Command id = "MonoDevelop.Ide.Commands.ProjectCommands.AddNewWorkspace" _label = "_Add New Workspace..." - _description = "Add a new child workspace to the selected workspace" /> + _description = "Add a new child workspace to the selected workspace" + icon = "md-new-workspace" /> <Command id = "MonoDevelop.Ide.Commands.ProjectCommands.AddNewSolution" _label = "_Add New Solution..." _description = "Add a new child solution to the selected workspace" @@ -215,15 +216,18 @@ _description = "Show options window" /> <Command id = "MonoDevelop.Ide.Commands.ProjectCommands.SolutionOptions" defaultHandler = "MonoDevelop.Ide.Commands.SolutionOptionsHandler" + icon = "gtk-preferences" _label = "_Solution Options" _description = "Show solution options window" /> <Command id = "MonoDevelop.Ide.Commands.ProjectCommands.ProjectOptions" defaultHandler = "MonoDevelop.Ide.Commands.ProjectOptionsHandler" + icon = "gtk-preferences" _label = "Project _Options" _description = "Show project options window" /> <Command id = "MonoDevelop.Ide.Commands.ProjectCommands.AddReference" _description = "Add and remove project references" + icon = "md-reference" _label = "_Edit References..." defaultHandler = "MonoDevelop.Ide.Commands.EditReferencesHandler" /> <Command id = "MonoDevelop.Ide.Commands.ProjectCommands.AddNewFiles" @@ -243,7 +247,7 @@ <Command id = "MonoDevelop.Ide.Commands.ProjectCommands.NewFolder" _label = "New _Folder" _description = "Create a new folder" - icon = "md-new-folder-icon" /> + icon = "md-new-folder" /> <Command id = "MonoDevelop.Ide.Commands.ProjectCommands.IncludeToProject" _description = "Add existing file to the project" _label = "_Include in Project" /> @@ -377,7 +381,7 @@ shortcut = "Control|N" macShortcut = "Meta|N" _description = "Create a new file" - icon = "gtk-new" /> + icon = "md-regular-file" /> <Command id = "MonoDevelop.Ide.Commands.FileCommands.Save" icon = "gtk-save" shortcut = "Control|S" @@ -401,7 +405,8 @@ <Command id = "MonoDevelop.Ide.Commands.FileCommands.NewWorkspace" defaultHandler = "MonoDevelop.Ide.Commands.NewWorkspaceHandler" _label = "_Workspace..." - _description = "Create a new workspace"/> + _description = "Create a new workspace" + icon = "md-new-workspace" /> <Command id = "MonoDevelop.Ide.Commands.FileCommands.CloseFile" defaultHandler = "MonoDevelop.Ide.Commands.CloseFileHandler" _label = "_Close File" @@ -432,11 +437,9 @@ <Command id = "MonoDevelop.Ide.Commands.FileCommands.ReloadFile" _label = "_Revert" _description = "Revert to a saved version of the file" - macShortcut = "Meta|U" - icon = "gtk-revert-to-saved" /> + macShortcut = "Meta|U" /> <Command id = "MonoDevelop.Ide.Commands.FileCommands.SaveAs" _label = "Save _As..." - icon = "gtk-save-as" _description = "Save the current file with a different name" /> <Command id = "MonoDevelop.Ide.Commands.FileCommands.PrintDocument" defaultHandler = "MonoDevelop.Ide.Commands.PrintHandler" @@ -449,13 +452,11 @@ defaultHandler = "MonoDevelop.Ide.Commands.PrintPreviewHandler" _label = "Print Previe_w" _description = "Show print preview" - icon = "gtk-print-preview" shortcut = "Shift|Control|P" /> <Command id = "MonoDevelop.Ide.Commands.FileCommands.PrintPageSetup" defaultHandler = "MonoDevelop.Ide.Commands.PrintPageSetupHandler" _label = "Page Set_up" - _description = "Show page setup" - icon = "gtk-page-setup" /> + _description = "Show page setup" /> <Command id = "MonoDevelop.Ide.Commands.FileCommands.RecentFileList" defaultHandler = "MonoDevelop.Ide.Commands.RecentFileListHandler" type="array" @@ -477,7 +478,6 @@ <Command id = "MonoDevelop.Ide.Commands.FileCommands.Exit" defaultHandler = "MonoDevelop.Ide.Commands.ExitHandler" _label = "_Quit" - icon = "gtk-quit" _description = "Quit MonoDevelop" macShortcut = "Meta|Q" shortcut = "Control|Q" /> @@ -501,7 +501,7 @@ type="radio|array" _label = "Build action" /> <Command id = "MonoDevelop.Ide.Commands.FileCommands.ShowProperties" - icon="gtk-properties" + icon="gtk-preferences" _label = "_Properties" /> <Command id = "MonoDevelop.Ide.Commands.FileCommands.CopyToOutputDirectory" type = "check" @@ -639,12 +639,14 @@ defaultHandler = "MonoDevelop.Ide.Commands.SideBySideModeHandler" _label = "2 Columns" shortcut = "Control|Shift|2" - macShortcut = "Alt|Meta|2"/> + macShortcut = "Alt|Meta|2" + icon = "md-columns-two" /> <Command id = "MonoDevelop.Ide.Commands.ViewCommands.SingleMode" defaultHandler = "MonoDevelop.Ide.Commands.SingleModeHandler" _label = "1 Column" shortcut = "Control|Shift|1" - macShortcut = "Alt|Meta|1"/> + macShortcut = "Alt|Meta|1" + icon = "md-columns-one" /> <Command id = "MonoDevelop.Ide.Commands.ViewCommands.NextNotebook" defaultHandler = "MonoDevelop.Ide.Commands.NextNotebookHandler" _label = "Move to Next Notebook" @@ -671,7 +673,7 @@ <Command id = "MonoDevelop.Ide.Commands.ToolCommands.AddinManager" defaultHandler = "MonoDevelop.Ide.Commands.AddinManagerHandler" - icon = "md-updates" + icon = "gtk-plugin" _description = "Manage add-ins" _label = "_Add-in Manager" /> <Command id = "MonoDevelop.Ide.Commands.ToolCommands.ToolList" @@ -760,21 +762,21 @@ <Command id = "MonoDevelop.Ide.Commands.HelpCommands.TipOfTheDay" defaultHandler = "MonoDevelop.Ide.Commands.TipOfTheDayHandler" _label = "_Tip of the Day" - icon = "gtk-dialog-info" _description = "Show tip of the day" /> <Command id = "MonoDevelop.Ide.Commands.HelpCommands.OpenLogDirectory" defaultHandler = "MonoDevelop.Ide.Commands.OpenLogDirectoryHandler" _label = "Open Log Directory" - icon = "gtk-dialog-info" + icon = "md-open-folder" _description = "Opens the directory where the diagnostic logs are stored" /> <Command id = "MonoDevelop.Ide.Commands.HelpCommands.About" defaultHandler = "MonoDevelop.Ide.Commands.AboutHandler" _label = "_About" - icon = "gtk-about" + icon = "md-about" _description = "Show about dialog" /> <Command id = "MonoDevelop.Ide.Updater.UpdateCommands.CheckForUpdates" defaultHandler = "MonoDevelop.Ide.Updater.CheckForUpdatesHandler" _label = "_Check for Updates..." + icon = "md-updates" _description = "Check for updates to MonoDevelop and packages it requires" /> <Command id = "MonoDevelop.Ide.Commands.HelpCommands.SendFeedback" defaultHandler = "MonoDevelop.Ide.Commands.SendFeedbackHandler" @@ -801,22 +803,24 @@ <Command id = "MonoDevelop.Ide.Commands.SearchCommands.FindNext" _label = "Find _Next" - icon = "md-find-next-icon" + icon = "md-find-next" _description = "Search forwards for the same text" shortcut = "Control|G" macShortcut = "Meta|G" /> <Command id = "MonoDevelop.Ide.Commands.SearchCommands.FindPrevious" _label = "Find _Previous" + icon = "md-find-prev" _description = "Search backwards for the same text" shortcut = "Control|Shift|G" macShortcut = "Meta|Shift|G" /> <Command id = "MonoDevelop.Ide.Commands.SearchCommands.EmacsFindNext" _label = "Find _Next (Emacs behavior)" - icon = "md-find-next-icon" + icon = "md-find-next" _description = "Search forwards for the same text with emacs behavior"/> <Command id = "MonoDevelop.Ide.Commands.SearchCommands.EmacsFindPrevious" _label = "Find _Previous (Emacs behavior)" + icon = "md-find-prev" _description = "Search backwards for the same text with emacs behavior"/> <Command id = "MonoDevelop.Ide.Commands.SearchCommands.FindNextSelection" @@ -832,14 +836,12 @@ <Command id = "MonoDevelop.Ide.Commands.SearchCommands.FindInFiles" defaultHandler = "MonoDevelop.Ide.FindInFiles.FindInFilesHandler" _label = "F_ind in Files..." - icon = "md-find-in-files" shortcut = "Control|Shift|F" macShortcut = "Meta|Shift|F" _description = "Search for text in all files of a directory" /> <Command id = "MonoDevelop.Ide.Commands.SearchCommands.ReplaceInFiles" defaultHandler = "MonoDevelop.Ide.FindInFiles.ReplaceInFilesHandler" _label = "R_eplace in Files..." - icon = "md-replace-in-files" shortcut = "Control|Shift|H" macShortcut = "Alt|Meta|Shift|F" _description = "Search for and replace text in all files of a directory" /> @@ -855,41 +857,39 @@ _label = "Go to File..." shortcut = "Alt|Shift|O" macShortcut = "Meta|Shift|D" - _description = "Jump to a file in the current workspace" - icon = "gtk-open" /> + _description = "Jump to a file in the current workspace" /> <Command id = "MonoDevelop.Components.MainToolbar.Commands.NavigateTo" defaultHandler = "MonoDevelop.Components.MainToolbar.NavigateToHandler" _label = "Navigate To..." _description = "Jump to a item in the current workspace" shortcut = "Control|," - macShortcut = "Meta|." - icon = "gtk-open" /> + macShortcut = "Meta|." /> <Command id = "MonoDevelop.Ide.Commands.SearchCommands.ToggleBookmark" - icon = "md-toggle-bookmark" + icon = "md-bookmark-toggle" shortcut = "Control|F2" _description = "Toggle bookmark" _label = "_Toggle Bookmark" /> <Command id = "MonoDevelop.Ide.Commands.SearchCommands.PrevBookmark" - icon = "md-goto-prevbookmark" + icon = "md-bookmark-prev" shortcut = "Shift|F2" _description = "Go to previous bookmark" _label = "Pre_vious Bookmark" /> <Command id = "MonoDevelop.Ide.Commands.SearchCommands.NextBookmark" - icon = "md-goto-nextbookmark" + icon = "md-bookmark-next" shortcut = "F2" _description = "Go to next bookmark" _label = "Ne_xt Bookmark" /> <Command id = "MonoDevelop.Ide.Commands.SearchCommands.ClearBookmarks" - icon = "md-clear-all-bookmarks" + icon = "md-bookmark-clear-all" _description = "Clear bookmarks" _label = "_Clear Bookmarks" /> <Command id = "MonoDevelop.Ide.Commands.SearchCommands.GotoLineNumber" _label = "_Go to Line..." + icon = "md-go-to-line" _description = "Go to a specific line" shortcut = "Control|I" - macShortcut = "Meta|L" - icon = "gtk-jump-to" /> + macShortcut = "Meta|L" /> <Command id = "MonoDevelop.Ide.Commands.SearchCommands.UseSelectionForFind" _label = "Use Selection for Find" _description = "Uses the current selection as find string"/> @@ -970,6 +970,7 @@ shortcut = "Control|Shift|space" /> <Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.GotoMatchingBrace" _label = "Go to Matching _Brace" + icon = "md-go-to-matching-brace" description = "Go to Matching Brace" shortcut = "Control|B" /> <Command id = "MonoDevelop.Ide.Commands.TextEditorCommands.SelectionMoveLeft" diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/DefaultPolicyPanels.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/DefaultPolicyPanels.addin.xml index 87421f4d48..6f1cfbf553 100644 --- a/main/src/core/MonoDevelop.Ide/ExtensionModel/DefaultPolicyPanels.addin.xml +++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/DefaultPolicyPanels.addin.xml @@ -18,7 +18,7 @@ <Panel id = "NamespaceSynchronisationPanel" class = "MonoDevelop.Ide.Projects.OptionPanels.NamespaceSynchronisationPanel" /> </Section> <Section id="CodeFormattingPolicies" _label="Code Formatting" fill="true" class="MonoDevelop.Ide.Projects.OptionPanels.CodeFormattingPanel" icon="md-prefs-code-formatting" /> - <Section id="DefaultStandardHeader" _label="Standard Header" fill="true" class="MonoDevelop.Ide.StandardHeader.StandardHeaderPolicyPanel" icon="md-prefs-standard-header" /> + <Section id="DefaultStandardHeader" _label="Standard Header" fill="true" class="MonoDevelop.Ide.StandardHeader.StandardHeaderPolicyPanel" icon="md-prefs-header" /> </Section> <Section id="VersionControl" _label="Version Control" /> </Extension> diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml index b84b6ecaf3..1f6a88d7bf 100644 --- a/main/src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml +++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml @@ -7,10 +7,8 @@ <Extension path = "/MonoDevelop/Ide/GlobalOptionsDialog"> <Section id = "Preferences" _label = "Environment"> + <Section id = "Style" _label = "Visual Style" fill="true" class = "MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanel" /> <Section id = "GeneralAuthorInfo" _label = "Author Information" fill="true" class = "MonoDevelop.Ide.Gui.OptionPanels.GlobalAuthorInformationPanel" icon="md-prefs-author-information" /> - <Section id = "Language" _label = "Language" class = "MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanel" icon="md-prefs-language"> - <!-- <Panel _label = "Welcome Page" class = "MonoDevelop.Ide.WelcomePage.WelcomePageOptionPanel" />--> - </Section> <Section id = "KeyBindings" _label = "Key Bindings" fill="true" class = "MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel" icon="md-prefs-key-bindings" /> <Section id = "Fonts" _label = "Fonts" fill="true" class = "MonoDevelop.Ide.Fonts.FontChooserPanel" icon = "md-prefs-fonts" /> <Section id = "Updates" _label = "Updates" class = "MonoDevelop.Ide.Gui.OptionPanels.AddInsOptionsPanel" icon="md-prefs-updates" /> @@ -38,7 +36,7 @@ <Panel id = "NamespaceSynchronisationPanel" class = "MonoDevelop.Ide.Projects.OptionPanels.NamespaceSynchronisationPanel" /> </Section> <Section id="CodeFormattingPolicies" _label="Code Formatting" fill="true" class="MonoDevelop.Ide.Projects.OptionPanels.CodeFormattingPanel" icon="md-prefs-code-formatting" /> - <Section id="DefaultStandardHeader" _label="Standard Header" fill="true" class="MonoDevelop.Ide.StandardHeader.StandardHeaderPolicyPanel" icon="md-prefs-standard-header" /> + <Section id="DefaultStandardHeader" _label="Standard Header" fill="true" class="MonoDevelop.Ide.StandardHeader.StandardHeaderPolicyPanel" icon="md-prefs-header" /> </Section> <Section id = "VersionControl" _label = "Version Control" /> diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/ItemOptionPanels.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/ItemOptionPanels.addin.xml index c393436ece..79e05c3eb6 100644 --- a/main/src/core/MonoDevelop.Ide/ExtensionModel/ItemOptionPanels.addin.xml +++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/ItemOptionPanels.addin.xml @@ -101,11 +101,11 @@ </Section> <Condition id="ItemType" value="Solution"> <Section id="CodeFormattingPolicies" _label="Code Formatting" fill="true" class="MonoDevelop.Ide.Projects.OptionPanels.CodeFormattingPanel" icon="md-prefs-code-formatting" /> - <Section id="DefaultStandardHeader" _label="Standard Header" fill="true" class= "MonoDevelop.Ide.StandardHeader.StandardHeaderPolicyPanel" icon="md-prefs-standard-header" /> + <Section id="DefaultStandardHeader" _label="Standard Header" fill="true" class= "MonoDevelop.Ide.StandardHeader.StandardHeaderPolicyPanel" icon="md-prefs-header" /> </Condition> <Condition id="ItemType" value="SolutionFolderItem"> <Section id="CodeFormattingPolicies" _label="Code Formatting" fill="true" class="MonoDevelop.Ide.Projects.OptionPanels.CodeFormattingPanel" icon="md-prefs-code-formatting" /> - <Section id="DefaultStandardHeader" _label="Standard Header" fill="true" class="MonoDevelop.Ide.StandardHeader.StandardHeaderPolicyPanel" icon="md-prefs-standard-header" /> + <Section id="DefaultStandardHeader" _label="Standard Header" fill="true" class="MonoDevelop.Ide.StandardHeader.StandardHeaderPolicyPanel" icon="md-prefs-header" /> </Condition> </Section> </Extension> diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/Pads.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/Pads.addin.xml index f03351a835..294d0dd946 100644 --- a/main/src/core/MonoDevelop.Ide/ExtensionModel/Pads.addin.xml +++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/Pads.addin.xml @@ -40,10 +40,10 @@ <Pad id = "MonoDevelop.Ide.Gui.Pads.HelpTree" defaultPlacement = "Left" _label = "Help" - icon="gtk-help" + icon="md-help-pad" class = "MonoDevelop.Ide.Gui.Pads.HelpTree"/> - <SolutionPad id = "ProjectPad" _label = "Solution" icon = "md-solution" class = "MonoDevelop.Ide.Gui.Pads.ProjectPad.ProjectSolutionPad" defaultLayout="*" defaultPlacement = "Left"> + <SolutionPad id = "ProjectPad" _label = "Solution" icon = "md-solution-pad" class = "MonoDevelop.Ide.Gui.Pads.ProjectPad.ProjectSolutionPad" defaultLayout="*" defaultPlacement = "Left"> <ContextMenu path="/MonoDevelop/Ide/ContextMenu/ProjectPad" /> <PadOption id = "ShowAllFiles" _label = "Show All Files" defaultValue = "False" /> <NodeBuilder class = "MonoDevelop.Ide.Gui.Pads.ProjectPad.WorkspaceNodeBuilder"/> @@ -63,7 +63,7 @@ <NodeBuilder class = "MonoDevelop.Ide.Gui.Pads.ProjectPad.ImplicitFrameworkAssemblyReferenceNodeBuilder"/> </SolutionPad> - <SolutionPad id = "ClassPad" _label = "Classes" icon = "md-class" class = "MonoDevelop.Ide.Gui.Pads.ClassBrowser.ClassBrowserPad" defaultPlacement = "Left" defaultStatus="AutoHide"> + <SolutionPad id = "ClassPad" _label = "Classes" icon = "md-classes-pad" class = "MonoDevelop.Ide.Gui.Pads.ClassBrowser.ClassBrowserPad" defaultPlacement = "Left" defaultStatus="AutoHide"> <PadOption id = "NestedNamespaces" _label = "Nested namespaces" defaultValue = "True" /> <PadOption id = "ShowProjects" _label = "Show project structure" defaultValue = "True" /> <PadOption id = "GroupByAccess" _label = "Group members by access" defaultValue = "False" /> diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml index 0f10cd938f..b7c2e6bf7b 100644 --- a/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml +++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml @@ -7,48 +7,20 @@ <Extension path="/MonoDevelop/Core/StockIcons"> <Condition id="Platform" value="!windows"> - <StockIcon stockid="md-folder-assets" resource="folder-assets-mac-16.png" size="Menu" /> - - <StockIcon stockid="md-closed-folder" resource="folder-generic-mac-16.png" size="Menu" /> - <StockIcon stockid="md-closed-reference-folder" resource="folder-special-mac-16.png" size="Menu" /> - <StockIcon stockid="md-closed-resource-folder" resource="folder-special-mac-16.png" size="Menu" /> - <StockIcon stockid="md-solution-folder-closed" resource="folder-special-mac-16.png" size="Menu" /> - <StockIcon stockid="md-component-folder-closed" resource="folder-special-mac-16.png" size="Menu" /> - - <StockIcon stockid="md-open-folder" resource="folder-generic-mac-16.png" size="Menu" /> - <StockIcon stockid="md-open-reference-folder" resource="folder-special-mac-16.png" size="Menu" /> - <StockIcon stockid="md-open-resource-folder" resource="folder-special-mac-16.png" size="Menu" /> - <StockIcon stockid="md-solution-folder-open" resource="folder-special-mac-16.png" size="Menu" /> - <StockIcon stockid="md-component-folder-open" resource="folder-special-mac-16.png" size="Menu" /> - <StockIcon stockid="md-searchbox-search" resource="searchbox-search-mac-16.png" size="Menu" /> <StockIcon stockid="md-searchbox-clear" resource="searchbox-clear-mac-16.png" size="Menu" /> </Condition> - + <Condition id="Platform" value="windows"> - <StockIcon stockid="md-folder-assets" resource="folder-assets-win-16.png" size="Menu" /> - - <StockIcon stockid="md-closed-folder" resource="folder-generic-win-16.png" size="Menu" /> - <StockIcon stockid="md-closed-reference-folder" resource="folder-special-win-16.png" size="Menu" /> - <StockIcon stockid="md-closed-resource-folder" resource="folder-special-win-16.png" size="Menu" /> - <StockIcon stockid="md-solution-folder-closed" resource="folder-special-win-16.png" size="Menu" /> - <StockIcon stockid="md-component-folder-closed" resource="folder-special-win-16.png" size="Menu" /> - - <StockIcon stockid="md-open-folder" resource="folder-generic-win-16.png" size="Menu" /> - <StockIcon stockid="md-open-reference-folder" resource="folder-special-win-16.png" size="Menu" /> - <StockIcon stockid="md-open-resource-folder" resource="folder-special-win-16.png" size="Menu" /> - <StockIcon stockid="md-solution-folder-open" resource="folder-special-win-16.png" size="Menu" /> - <StockIcon stockid="md-component-folder-open" resource="folder-special-win-16.png" size="Menu" /> - <StockIcon stockid="md-searchbox-search" resource="searchbox-search-win-24.png" size="Menu" /> <StockIcon stockid="md-searchbox-clear" resource="searchbox-clear-win-24.png" size="Menu" /> </Condition> - <!-- GTK icons redefined --> - <StockIcon stockid="gtk-about" resource="about-16.png" size="Menu" /> + <!-- GTK icons redefined --> + <StockIcon stockid="gtk-about" resource="about-md-16.png" size="Menu" /> <StockIcon stockid="gtk-add" resource="add-16.png" size="Menu" /> <StockIcon stockid="gtk-apply" resource="done-16.png" size="Menu" /> - <StockIcon stockid="gtk-cancel" resource="remove-16.png" size="Menu" /> + <StockIcon stockid="gtk-cancel" resource="error-16.png" size="Menu" /> <StockIcon stockid="gtk-clear" resource="clear-16.png" size="Menu" /> <StockIcon stockid="gtk-close" resource="remove-16.png" size="Menu" /> <StockIcon stockid="gtk-copy" resource="copy-16.png" size="Menu" /> @@ -67,47 +39,58 @@ <StockIcon stockid="gtk-home" resource="home-16.png" size="Menu" /> <StockIcon stockid="gtk-indent" resource="indent-16.png" size="Menu" /> <StockIcon stockid="gtk-jump-to" resource="jump-to-16.png" size="Menu" /> - <StockIcon stockid="gtk-media-play" resource="media-play-16.png" size="Menu" /> + <StockIcon stockid="gtk-info" resource="information-16.png" size="Menu" /> <StockIcon stockid="gtk-missing-image" resource="missing-image-16.png" size="Menu" /> + <StockIcon stockid="gtk-missing-image" resource="missing-image-32.png" size="Dnd" /> + <StockIcon stockid="gtk-missing-image" resource="missing-image-48.png" size="Dialog" /> <StockIcon stockid="gtk-new" resource="add-16.png" size="Menu" /> <StockIcon stockid="gtk-ok" resource="done-16.png" size="Menu" /> <StockIcon stockid="gtk-open" resource="open-16.png" size="Menu" /> - <StockIcon stockid="gtk-page-setup" resource="page-setup-16.png" size="Menu" /> <StockIcon stockid="gtk-paste" resource="paste-16.png" size="Menu" /> + <StockIcon stockid="gtk-plugin" resource="plugin-menu-16.png" size="Menu" /> <StockIcon stockid="gtk-preferences" resource="preferences-16.png" size="Menu" /> <StockIcon stockid="gtk-print" resource="print-16.png" size="Menu" /> - <StockIcon stockid="gtk-print-preview" resource="print-preview-16.png" size="Menu" /> - <StockIcon stockid="gtk-properties" resource="properties-16.png" size="Menu" /> - <StockIcon stockid="gtk-quit" resource="quit-16.png" size="Menu" /> <StockIcon stockid="gtk-redo" resource="redo-16.png" size="Menu" /> <StockIcon stockid="gtk-refresh" resource="refresh-16.png" size="Menu" /> <StockIcon stockid="gtk-remove" resource="remove-16.png" size="Menu" /> - <StockIcon stockid="gtk-revert-to-saved" resource="revert-to-saved-16.png" size="Menu" /> <StockIcon stockid="gtk-save" resource="save-16.png" size="Menu" /> <StockIcon stockid="gtk-save-as" resource="save-16.png" size="Menu" /> <StockIcon stockid="gtk-stop" resource="stop-16.png" size="Menu" /> <StockIcon stockid="gtk-undo" resource="undo-16.png" size="Menu" /> <StockIcon stockid="gtk-unindent" resource="unindent-16.png" size="Menu" /> - <StockIcon stockid="gtk-zoom-100" resource="zoom-100-16.png" size="Menu" /> + <StockIcon stockid="gtk-zoom-100" resource="zoom-actual-16.png" size="Menu" /> <StockIcon stockid="gtk-zoom-in" resource="zoom-in-16.png" size="Menu" /> <StockIcon stockid="gtk-zoom-out" resource="zoom-out-16.png" size="Menu" /> - <!-- MD icons --> + <!-- MD icons --> + <StockIcon stockid="md-about" resource="about-md-16.png" size="Menu" /> <StockIcon stockid="md-add" resource="add-16.png" size="Menu" /> - <StockIcon stockid="md-assembly-project" resource="assembly-project-16.png" size="Menu" /> - <StockIcon stockid="md-breadcrumb-next" resource="breadcrumb-next-normal-16.png" size="Menu" /> - <StockIcon stockid="md-breadcrumb-prev" resource="breadcrumb-previous-normal-16.png" size="Menu" /> + <StockIcon stockid="md-add-namespace" resource="new-namespace-16.png" /> + <StockIcon stockid="md-assembly-project" resource="project-assembly-16.png" size="Menu" /> + <StockIcon stockid="md-bookmark-clear-all" resource="bookmark-clear-all-16.png" size="Menu" /> + <StockIcon stockid="md-bookmark-next" resource="bookmark-next-16.png" size="Menu" /> + <StockIcon stockid="md-bookmark-prev" resource="bookmark-prev-16.png" size="Menu" /> + <StockIcon stockid="md-bookmark-toggle" resource="bookmark-toggle-16.png" size="Menu" /> + <StockIcon stockid="md-breadcrumb-next" resource="breadcrumb-next-16.png" size="Menu" /> + <StockIcon stockid="md-breadcrumb-prev" resource="breadcrumb-prev-16.png" size="Menu" /> <StockIcon stockid="md-breakpoint" resource="breakpoint-16.png" size="Menu" /> <StockIcon stockid="md-breakpoint-disable-all" resource="breakpoint-disable-all-16.png" size="Menu" /> <StockIcon stockid="md-breakpoint-disabled" resource="breakpoint-disabled-16.png" size="Menu" /> <StockIcon stockid="md-breakpoint-invalid" resource="breakpoint-invalid-16.png" size="Menu" /> <StockIcon stockid="md-breakpoint-new" resource="breakpoint-new-16.png" size="Menu" /> <StockIcon stockid="md-breakpoint-on-off" resource="breakpoint-on-off-16.png" size="Menu" /> + <StockIcon stockid="md-bug" resource="bug-16.png" size="Menu" /> <StockIcon stockid="md-catchpoint" resource="catchpoint-16.png" size="Menu" /> + <StockIcon stockid="md-catchpoint-new" resource="catchpoint-new-16.png" size="Menu" /> <StockIcon stockid="md-catchpoint-disabled" resource="catchpoint-disabled-16.png" size="Menu" /> <StockIcon stockid="md-class" resource="element-class-16.png" size="Menu" /> + <StockIcon stockid="md-classes-pad" resource="pad-classes-16.png" size="Menu" /> <StockIcon stockid="md-class-file" resource="file-class-32.png" size="Dnd" /> <StockIcon stockid="md-clear" resource="clear-16.png" size="Menu" /> + <StockIcon stockid="md-close-all-documents" resource="close-all-documents-16.png" size="Menu" /> + <StockIcon stockid="md-close-combine-icon" resource="close-solution-16.png" size="Menu" /> + <StockIcon stockid="md-columns-one" resource="columns-one-16.png" size="Menu" /> + <StockIcon stockid="md-columns-two" resource="columns-two-16.png" size="Menu" /> <StockIcon stockid="md-command" resource="command-16.png" size="Menu" /> <StockIcon stockid="md-comment" resource="comment-16.png" size="Menu" /> <StockIcon stockid="md-console" resource="pad-application-output-16.png" size="Menu" /> @@ -116,14 +99,16 @@ <StockIcon stockid="md-disclose-arrow-down" resource="disclose-arrow-down-16.png" size="Menu" /> <StockIcon stockid="md-disclose-arrow-up" resource="disclose-arrow-up-16.png" size="Menu" /> <StockIcon stockid="md-done" resource="done-16.png" size="Menu" /> + <StockIcon stockid="md-empty" resource="empty-16.png" size="Menu" /> <StockIcon stockid="md-empty-file-icon" resource="file-generic-16.png" size="Menu" /> - <StockIcon stockid="md-enum" resource="element-enumeration-16.png" size="Menu" /> - <StockIcon stockid="md-enum-file" resource="file-enumeration-32.png" size="Dnd" /> + <StockIcon stockid="md-enum" resource="element-enum-16.png" size="Menu" /> + <StockIcon stockid="md-enum-file" resource="file-enum-32.png" size="Dnd" /> <StockIcon stockid="md-errors-list" resource="pad-error-list-16.png" size="Menu" /> <StockIcon stockid="md-errors-list-has-errors" resource="pad-error-list-errors-16.png" size="Menu" /> <StockIcon stockid="md-errors-list-has-warnings" resource="pad-error-list-warnings-16.png" size="Menu" /> <StockIcon stockid="md-event" resource="element-event-16.png" size="Menu" /> <StockIcon stockid="md-exception" resource="element-exception-16.png" size="Menu" /> + <StockIcon stockid="md-execute-all" resource="execute-all-16.png" size="Menu" /> <StockIcon stockid="md-extensionmethod" resource="element-extensionmethod-16.png" size="Menu" /> <StockIcon stockid="md-feedback" resource="feedback-16.png" size="Menu" /> <StockIcon stockid="md-field" resource="element-field-16.png" size="Menu" /> @@ -132,12 +117,18 @@ <StockIcon stockid="md-file-source" resource="file-source-16.png" size="Menu" /> <StockIcon stockid="md-file-source" resource="file-source-32.png" size="Dnd" /> <StockIcon stockid="md-file-unit-test" resource="file-unit-test-32.png" size="Dnd" /> - <StockIcon stockid="md-folder-overlay" resource="assembly-reference-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-find-next" resource="find-next-16.png" size="Menu" /> + <StockIcon stockid="md-find-prev" resource="find-prev-16.png" size="Menu" /> + <StockIcon stockid="md-folder-assets" resource="folder-assets-16.png" size="Menu" /> + <StockIcon stockid="md-reference-assembly" resource="reference-assembly-16.png" size="Menu" /> + <StockIcon stockid="md-reference-folder" resource="reference-assembly-16.png" size="Menu" /> <StockIcon stockid="md-fs-field" resource="element-fs-field-16.png" size="Menu" /> - <StockIcon stockid="md-generic-pad" resource="pad-generic-pad-16.png" size="Menu" /> + <StockIcon stockid="md-generic-pad" resource="pad-generic-16.png" size="Menu" /> + <StockIcon stockid="md-go-to-line" resource="go-to-line-16.png" size="Menu" /> + <StockIcon stockid="md-go-to-matching-brace" resource="go-to-matching-brace-16.png" size="Menu" /> <StockIcon stockid="md-group-by-category" resource="group-by-category-16.png" size="Menu" /> <StockIcon stockid="md-gui-file" resource="file-gtk-32.png" size="Dnd" /> - <StockIcon stockid="md-help" resource="pad-help-16.png" size="Menu" /> + <StockIcon stockid="md-help-pad" resource="pad-help-16.png" size="Menu" /> <StockIcon stockid="md-html-file-icon" resource="file-web-16.png" size="Menu" /> <StockIcon stockid="md-html-file-icon" resource="file-web-32.png" size="Dnd" /> <StockIcon stockid="md-interface" resource="element-interface-16.png" size="Menu" /> @@ -146,26 +137,38 @@ <StockIcon stockid="md-library-overlay" resource="project-library-overlay-32.png" size="Dnd" /> <StockIcon stockid="md-link-overlay" resource="link-overlay-16.png" size="Menu" /> <StockIcon stockid="md-literal" resource="element-constant-16.png" size="Menu" /> - <StockIcon stockid="md-magnify" resource="pad-search-results-16.png" size="Menu" /> + <StockIcon stockid="md-magnify" resource="pad-search-16.png" size="Menu" /> <StockIcon stockid="md-message-log" resource="pad-application-output-16.png" size="Menu" /> <StockIcon stockid="md-method" resource="element-method-16.png" size="Menu" /> <StockIcon stockid="md-misc-files" resource="file-generic-16.png" size="Menu" /> <StockIcon stockid="md-module" resource="element-module-16.png" size="Menu" /> + <StockIcon stockid="md-monodevelop" resource="monodevelop-16.png" size="Menu" /> + <StockIcon stockid="md-monodevelop" resource="monodevelop-22.png" /> + <StockIcon stockid="md-monodevelop" resource="monodevelop-22.png" size="Button" /> + <StockIcon stockid="md-monodevelop" resource="monodevelop-32.png" size="Dnd" /> + <StockIcon stockid="md-monodevelop" resource="monodevelop-48.png" size="Dialog" /> <StockIcon stockid="md-name-space" resource="element-namespace-16.png" size="Menu" /> + <StockIcon stockid="md-navigate-back" resource="breadcrumb-prev-16.png" size="Menu" /> + <StockIcon stockid="md-navigate-forward" resource="breadcrumb-next-16.png" size="Menu" /> <StockIcon stockid="md-newmethod" resource="element-method-new-16.png" size="Menu" /> + <StockIcon stockid="md-new-folder" resource="new-folder-16.png" size="Menu" /> + <StockIcon stockid="md-new-project" resource="new-project-16.png" size="Menu" /> + <StockIcon stockid="md-new-solution" resource="new-solution-16.png" size="Menu" /> + <StockIcon stockid="md-new-solution-folder" resource="new-solution-folder-16.png" size="Menu" /> + <StockIcon stockid="md-new-workspace" resource="new-workspace-16.png" size="Menu" /> <StockIcon stockid="md-nunit-overlay" resource="project-nunit-overlay-32.png" size="Dnd" /> <StockIcon stockid="md-other-declaration" resource="element-other-declaration-16.png" size="Menu" /> <StockIcon stockid="md-output-icon" resource="pad-application-output-16.png" size="Menu" /> <StockIcon stockid="md-package-source" resource="package-source-16.png" size="Menu" /> <StockIcon stockid="md-pin-down" resource="pin-down-16.png" size="Menu" /> <StockIcon stockid="md-pin-up" resource="pin-up-16.png" size="Menu" /> - <StockIcon stockid="md-platform-android" resource="platform-android-light-16.png" size="Menu" /> - <StockIcon stockid="md-platform-cross-platform" resource="platform-cross-platform-light-16.png" size="Menu" /> - <StockIcon stockid="md-platform-ios" resource="platform-ios-light-16.png" size="Menu" /> - <StockIcon stockid="md-platform-tvos" resource="platform-tvos-light-16.png" size="Menu" /> - <StockIcon stockid="md-platform-mac" resource="platform-mac-light-16.png" size="Menu" /> - <StockIcon stockid="md-platform-watchos" resource="platform-watchos-light-16.png" size="Menu" /> - <StockIcon stockid="md-platform-other" resource="platform-other-light-16.png" size="Menu" /> + <StockIcon stockid="md-platform-android" resource="platform-android-16.png" size="Menu" /> + <StockIcon stockid="md-platform-crossplatform" resource="platform-crossplatform-16.png" size="Menu" /> + <StockIcon stockid="md-platform-ios" resource="platform-ios-16.png" size="Menu" /> + <StockIcon stockid="md-platform-tvos" resource="platform-tvos-16.png" size="Menu" /> + <StockIcon stockid="md-platform-mac" resource="platform-mac-16.png" size="Menu" /> + <StockIcon stockid="md-platform-watchos" resource="platform-watchos-16.png" size="Menu" /> + <StockIcon stockid="md-platform-other" resource="platform-other-16.png" size="Menu" /> <StockIcon stockid="md-popup-close" resource="popup-close-16.png" size="Menu" /> <StockIcon stockid="md-popup-close-hover" resource="popup-close-hover-16.png" size="Menu" /> <StockIcon stockid="md-preferences" resource="preferences-16.png" size="Menu" /> @@ -173,7 +176,7 @@ <StockIcon stockid="md-prefs-build" resource="prefs-build-16.png" size="Menu" /> <StockIcon stockid="md-prefs-code-formatting" resource="prefs-code-formatting-16.png" size="Menu" /> <StockIcon stockid="md-prefs-code-templates" resource="prefs-code-templates-16.png" size="Menu" /> - <StockIcon stockid="md-prefs-csharp" resource="prefs-csharp-16.png" size="Menu" /> + <StockIcon stockid="md-prefs-source" resource="prefs-source-16.png" size="Menu" /> <StockIcon stockid="md-prefs-dotnet-naming-policies" resource="prefs-dotnet-naming-policies-16.png" size="Menu" /> <StockIcon stockid="md-prefs-external-tools" resource="prefs-external-tools-16.png" size="Menu" /> <StockIcon stockid="md-prefs-fonts" resource="prefs-fonts-16.png" size="Menu" /> @@ -184,33 +187,36 @@ <StockIcon stockid="md-prefs-name-conventions" resource="prefs-name-conventions-16.png" size="Menu" /> <StockIcon stockid="md-prefs-play" resource="prefs-play-16.png" size="Menu" /> <StockIcon stockid="md-prefs-sdk-locations" resource="prefs-sdk-locations-16.png" size="Menu" /> - <StockIcon stockid="md-prefs-standard-header" resource="prefs-standard-header-16.png" size="Menu" /> + <StockIcon stockid="md-prefs-header" resource="prefs-header-16.png" size="Menu" /> <StockIcon stockid="md-prefs-task-list" resource="prefs-task-list-16.png" size="Menu" /> <StockIcon stockid="md-prefs-updates" resource="prefs-updates-16.png" size="Menu" /> <StockIcon stockid="md-preview-active" resource="preview-active-16.png" size="Menu" /> <StockIcon stockid="md-preview-hover" resource="preview-hover-16.png" size="Menu" /> - <StockIcon stockid="md-preview-normal" resource="preview-normal-16.png" size="Menu" /> - <StockIcon stockid="md-preview-selected" resource="preview-selected-16.png" size="Menu" /> + <StockIcon stockid="md-preview-normal" resource="preview-16.png" size="Menu" /> + <StockIcon stockid="md-preview-selected" resource="preview-16~sel.png" size="Menu" /> <StockIcon stockid="md-project" resource="project-16.png" size="Menu" /> <StockIcon stockid="md-project" resource="project-32.png" size="Dnd" /> - <StockIcon stockid="md-project-status-information" resource="project-status-information-16.png" size="Menu" /> - <StockIcon stockid="md-project-status-warning" resource="project-status-warning-16.png" size="Menu" /> - <StockIcon stockid="md-project-status-error" resource="project-status-error-16.png" size="Menu" /> - <StockIcon stockid="md-project-overlay" resource="project-reference-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-properties" resource="properties-16.png" size="Menu" /> + <StockIcon stockid="md-project-web" resource="project-web-32.png" size="Dnd" /> + <StockIcon stockid="md-reference-project" resource="reference-project-16.png" size="Menu" /> + <StockIcon stockid="md-reference-invalid" resource="reference-invalid-16.png" size="Menu" /> + <StockIcon stockid="md-reference-warning" resource="reference-invalid-16.png" size="Menu" /> <StockIcon stockid="md-property" resource="element-property-16.png" size="Menu" /> <StockIcon stockid="md-reference" resource="reference-16.png" size="Menu" /> + <StockIcon stockid="md-reference-package" resource="reference-16.png" size="Menu" /> <StockIcon stockid="md-regular-file" resource="file-generic-16.png" size="Menu" /> <StockIcon stockid="md-resource-file-icon" resource="file-resource-16.png" size="Menu" /> <StockIcon stockid="md-resource-file-icon" resource="file-resource-32.png" size="Dnd" /> + <StockIcon stockid="md-run-unit-tests" resource="run-unit-tests-16.png" size="Menu" /> <StockIcon stockid="md-save-all" resource="save-all-16.png" size="Menu" /> <StockIcon stockid="md-script-file-icon" resource="file-script-16.png" size="Menu" /> <StockIcon stockid="md-script-file-icon" resource="file-script-32.png" size="Dnd" /> + <StockIcon stockid="md-select-all" resource="select-all-16.png" size="Menu" /> <StockIcon stockid="md-solution" resource="solution-16.png" size="Menu" /> <StockIcon stockid="md-solution" resource="solution-32.png" size="Dnd" /> + <StockIcon stockid="md-solution-pad" resource="pad-solution-16.png" size="Menu" /> <StockIcon stockid="md-sort-alphabetically" resource="sort-alphabetically-16.png" size="Menu" /> <StockIcon stockid="md-stop" resource="stop-16.png" size="Menu" /> - <StockIcon stockid="md-struct" resource="element-structure-16.png" size="Menu" /> + <StockIcon stockid="md-struct" resource="element-struct-16.png" size="Menu" /> <StockIcon stockid="md-struct-file" resource="file-struct-32.png" size="Dnd" /> <StockIcon stockid="md-task-list" resource="pad-task-list-16.png" size="Menu" /> <StockIcon stockid="md-template" resource="element-template-16.png" size="Menu" /> @@ -219,12 +225,22 @@ <StockIcon stockid="md-text-file-icon" resource="file-text-32.png" size="Dnd" /> <StockIcon stockid="md-type" resource="element-type-16.png" size="Menu" /> <StockIcon stockid="md-variable" resource="element-variable-16.png" size="Menu" /> - <StockIcon stockid="md-warning-overlay" resource="invalid-reference-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-web-overlay" resource="project-web-overlay-32.png" size="Dnd" /> + <StockIcon stockid="md-warning-overlay" resource="reference-invalid-16.png" size="Menu" /> <StockIcon stockid="md-workspace" resource="workspace-16.png" size="Menu" /> <StockIcon stockid="md-workspace" resource="workspace-32.png" size="Dnd" /> <StockIcon stockid="md-xml-file-icon" resource="file-xml-16.png" size="Menu" /> <StockIcon stockid="md-xml-file-icon" resource="file-xml-32.png" size="Dnd" /> + <StockIcon stockid="md-closed-folder" resource="folder-generic-16.png" size="Menu" /> + <StockIcon stockid="md-closed-reference-folder" resource="folder-component-16.png" size="Menu" /> + <StockIcon stockid="md-closed-resource-folder" resource="folder-resource-16.png" size="Menu" /> + <StockIcon stockid="md-solution-folder-closed" resource="folder-solution-16.png" size="Menu" /> + <StockIcon stockid="md-component-folder-closed" resource="folder-component-16.png" size="Menu" /> + <StockIcon stockid="md-open-folder" resource="folder-generic-16.png" size="Menu" /> + <StockIcon stockid="md-open-reference-folder" resource="folder-component-16.png" size="Menu" /> + <StockIcon stockid="md-open-resource-folder" resource="folder-resource-16.png" size="Menu" /> + <StockIcon stockid="md-solution-folder-open" resource="folder-solution-16.png" size="Menu" /> + <StockIcon stockid="md-component-folder-open" resource="folder-component-16.png" size="Menu" /> + <StockIcon stockid="md-web-search" resource="web-search-16.png" size="Menu" /> <!-- All sizes icons --> <StockIcon stockid="gtk-dialog-error" resource="error-16.png" /> @@ -284,32 +300,8 @@ <StockIcon stockid="md-warning" resource="warning-48.png" size="Dialog" /> <!-- Unprocessed icons --> - <StockIcon stockid="md-add-namespace" resource="add-namespace-16.png" /> <StockIcon stockid="md-build-combine" resource="build-solution-16.png" size="Menu" /> <StockIcon stockid="md-build-current-selected-project" resource="build-project-16.png" size="Menu" /> - <StockIcon stockid="md-clear-all-bookmarks" resource="clear-all-bookmarks-16.png" size="Menu" /> - <StockIcon stockid="md-close-all-documents" resource="close-all-documents-16.png" size="Menu" /> - <StockIcon stockid="md-close-combine-icon" resource="close-solution-16.png" size="Menu" /> - <StockIcon stockid="md-empty" resource="empty-16.png" size="Menu" /> - <StockIcon stockid="md-find-in-files" resource="find-in-files-16.png" size="Menu" /> - <StockIcon stockid="md-find-next-icon" resource="edit-find-next-16.png" size="Menu" /> - <StockIcon stockid="md-goto-nextbookmark" resource="goto-next-bookmark-16.png" size="Menu" /> - <StockIcon stockid="md-goto-prevbookmark" resource="goto-prev-bookmark-16.png" size="Menu" /> - <StockIcon stockid="md-monodevelop" resource="monodevelop-16.png" size="Menu" /> - <StockIcon stockid="md-monodevelop" resource="monodevelop-22.png" /> - <StockIcon stockid="md-monodevelop" resource="monodevelop-22.png" size="Button" /> - <StockIcon stockid="md-monodevelop" resource="monodevelop-32.png" size="Dnd" /> - <StockIcon stockid="md-monodevelop" resource="monodevelop-48.png" size="Dialog" /> - <StockIcon stockid="md-navigate-back" resource="navigate-previous-16.png" size="Menu" /> - <StockIcon stockid="md-navigate-forward" resource="navigate-next-16.png" size="Menu" /> - <StockIcon stockid="md-new-folder-icon" resource="folder-new-16.png" size="Menu" /> - <StockIcon stockid="md-new-project" resource="project-new-16.png" size="Menu" /> - <StockIcon stockid="md-new-solution" resource="solution-new-16.png" size="Menu" /> - <StockIcon stockid="md-new-solution-folder" resource="solution-folder-new-16.png" size="Menu" /> - <StockIcon stockid="md-replace-in-files" resource="replace-in-files-16.png" size="Menu" /> - <StockIcon stockid="md-select-all" resource="edit-select-all-16.png" size="Menu" /> - <StockIcon stockid="md-toggle-bookmark" resource="toggle-bookmark-16.png" size="Menu" /> - <StockIcon stockid="md-web-search-icon" resource="web-search-16.png" size="Menu" /> <!-- Status icons --> <StockIcon stockid="md-status-build" animation="res:status-building-1-16.png;res:status-building-2-16.png;res:status-building-3-16.png;res:status-building-4-16.png;res:status-building-5-16.png" size="Menu" /> @@ -329,103 +321,98 @@ <StockIcon stockid="md-status-error-count" resource="status-error-count-16.png" size="Menu" /> <StockIcon stockid="md-updates" resource="status-updates-ready-16.png" size="Menu" /> <StockIcon stockid="md-parser" resource="status-parsing-16.png" size="Menu" /> + <StockIcon stockid="md-status-instrumentation" resource="status-instrumentation-16.png" size="Menu" /> <!-- Spinners --> <StockIcon stockid="md-spinner-14" animation="res:spinner-14-1.png;60;res:spinner-14-2.png;60;res:spinner-14-3.png;60;res:spinner-14-4.png;60;res:spinner-14-5.png;60" size="Menu" /> - <StockIcon stockid="md-spinner-normal-16" animation="res:spinner-normal-1-16.png;60;res:spinner-normal-2-16.png;60;res:spinner-normal-3-16.png;60;res:spinner-normal-4-16.png;60;res:spinner-normal-5-16.png;60" size="Menu" /> - <StockIcon stockid="md-spinner-selected-16" animation="res:spinner-selected-1-16.png;60;res:spinner-selected-2-16.png;60;res:spinner-selected-3-16.png;60;res:spinner-selected-4-16.png;60;res:spinner-selected-5-16.png;60" size="Menu" /> + <StockIcon stockid="md-spinner-16" animation="res:spinner-16-1.png;60;res:spinner-16-2.png;60;res:spinner-16-3.png;60;res:spinner-16-4.png;60;res:spinner-16-5.png;60" size="Menu" /> <StockIcon stockid="md-spinner-18" animation="res:spinner-18-1.png;60;res:spinner-18-2.png;60;res:spinner-18-3.png;60;res:spinner-18-4.png;60;res:spinner-18-5.png;60" size="Button" /> <!-- Overlays --> - <StockIcon stockid="md-internal-class" icon="res:element-class-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-internal-delegate" icon="res:element-delegate-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-internal-enum" icon="res:element-enumeration-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-internal-event" icon="res:element-event-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-internal-extensionmethod" icon="res:element-extensionmethod-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-internal-field" icon="res:element-field-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-internal-interface" icon="res:element-interface-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-internal-method" icon="res:element-method-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-internal-property" icon="res:element-property-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-internal-static-event" icon="res:element-event-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-internal-static-field" icon="res:element-field-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-internal-static-method" icon="res:element-method-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-internal-static-property" icon="res:element-property-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-internal-struct" icon="res:element-structure-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-internal-literal" icon="res:element-constant-16.png|res:element-visibility-internal-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-class" icon="res:element-class-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-delegate" icon="res:element-delegate-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-enum" icon="res:element-enumeration-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-event" icon="res:element-event-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-extensionmethod" icon="res:element-extensionmethod-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-field" icon="res:element-field-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-interface" icon="res:element-interface-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-method" icon="res:element-method-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-property" icon="res:element-property-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-static-event" icon="res:element-event-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-static-field" icon="res:element-field-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-static-method" icon="res:element-method-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-static-property" icon="res:element-property-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-struct" icon="res:element-structure-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-InternalAndProtected-literal" icon="res:element-constant-16.png|res:element-visibility-internal-an-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-class" icon="res:element-class-16.png|res:element-visibility-private-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-delegate" icon="res:element-delegate-16.png|res:element-visibility-private-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-enum" icon="res:element-enumeration-16.png|res:element-visibility-private-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-event" icon="res:element-event-16.png|res:element-visibility-private-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-extensionmethod" icon="res:element-extensionmethod-16.png|res:element-visibility-private-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-field" icon="res:element-field-16.png|res:element-visibility-private-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-interface" icon="res:element-interface-16.png|res:element-visibility-private-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-method" icon="res:element-method-16.png|res:element-visibility-private-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-property" icon="res:element-property-16.png|res:element-visibility-private-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-static-event" icon="res:element-event-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-private-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-static-field" icon="res:element-field-16.png|res:element-visibility-private-overlay-16.png|res:element-visibility-static-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-static-method" icon="res:element-method-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-private-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-static-property" icon="res:element-property-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-private-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-struct" icon="res:element-structure-16.png|res:element-visibility-private-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-private-literal" icon="res:element-constant-16.png|res:element-visibility-private-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-class" icon="res:element-class-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-delegate" icon="res:element-delegate-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-enum" icon="res:element-enum-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-event" icon="res:element-event-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-extensionmethod" icon="res:element-extensionmethod-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-field" icon="res:element-field-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-interface" icon="res:element-interface-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-method" icon="res:element-method-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-property" icon="res:element-property-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-static-event" icon="res:element-event-16.png|res:element-visibility-internal-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-static-field" icon="res:element-field-16.png|res:element-visibility-internal-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-static-method" icon="res:element-method-16.png|res:element-visibility-internal-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-static-property" icon="res:element-property-16.png|res:element-visibility-internal-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-struct" icon="res:element-struct-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-internal-literal" icon="res:element-constant-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-class" icon="res:element-class-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-delegate" icon="res:element-delegate-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-enum" icon="res:element-enum-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-event" icon="res:element-event-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-extensionmethod" icon="res:element-extensionmethod-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-field" icon="res:element-field-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-interface" icon="res:element-interface-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-method" icon="res:element-method-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-property" icon="res:element-property-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-static-event" icon="res:element-event-16.png|res:element-visibility-internal-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-static-field" icon="res:element-field-16.png|res:element-visibility-internal-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-static-method" icon="res:element-method-16.png|res:element-visibility-internal-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-static-property" icon="res:element-property-16.png|res:element-visibility-internal-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-struct" icon="res:element-struct-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-InternalAndProtected-literal" icon="res:element-constant-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-class" icon="res:element-class-16.png|res:element-visibility-private-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-delegate" icon="res:element-delegate-16.png|res:element-visibility-private-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-enum" icon="res:element-enum-16.png|res:element-visibility-private-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-event" icon="res:element-event-16.png|res:element-visibility-private-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-extensionmethod" icon="res:element-extensionmethod-16.png|res:element-visibility-private-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-field" icon="res:element-field-16.png|res:element-visibility-private-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-interface" icon="res:element-interface-16.png|res:element-visibility-private-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-method" icon="res:element-method-16.png|res:element-visibility-private-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-property" icon="res:element-property-16.png|res:element-visibility-private-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-static-event" icon="res:element-event-16.png|res:element-visibility-private-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-static-field" icon="res:element-field-16.png|res:element-visibility-private-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-static-method" icon="res:element-method-16.png|res:element-visibility-private-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-static-property" icon="res:element-property-16.png|res:element-visibility-private-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-struct" icon="res:element-struct-16.png|res:element-visibility-private-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-private-literal" icon="res:element-constant-16.png|res:element-visibility-private-square-overlay-16.png" size="Menu" /> <StockIcon stockid="md-project-console" icon="md-project|res:project-console-overlay-32.png" size="Dnd" /> <StockIcon stockid="md-project-gui" icon="md-project|res:project-gui-overlay-32.png" size="Dnd" /> <StockIcon stockid="md-project-library" icon="md-project|md-library-overlay" size="Dnd" /> <StockIcon stockid="md-project-package" icon="md-project|res:project-package-overlay-32.png" size="Dnd" /> <StockIcon stockid="md-project-shared-assets" icon="md-project|res:project-shared-assets-overlay-32.png" size="Dnd" /> - <StockIcon stockid="md-project-web" icon="md-project|md-web-overlay" size="Dnd" /> - <StockIcon stockid="md-protected-class" icon="res:element-class-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-protected-delegate" icon="res:element-delegate-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-protected-enum" icon="res:element-enumeration-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-protected-event" icon="res:element-event-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-protected-extensionmethod" icon="res:element-extensionmethod-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-protected-field" icon="res:element-field-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-protected-interface" icon="res:element-interface-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-protected-method" icon="res:element-method-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-protected-property" icon="res:element-property-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-protected-static-event" icon="res:element-event-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-protected-static-field" icon="res:element-field-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-protected-static-method" icon="res:element-method-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-protected-static-property" icon="res:element-property-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-protected-struct" icon="res:element-structure-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-protected-literal" icon="res:element-constant-16.png|res:element-visibility-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-class" icon="res:element-class-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-delegate" icon="res:element-delegate-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-enum" icon="res:element-enumeration-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-event" icon="res:element-event-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-extensionmethod" icon="res:element-extensionmethod-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-field" icon="res:element-field-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-interface" icon="res:element-interface-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-method" icon="res:element-method-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-property" icon="res:element-property-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-static-event" icon="res:element-event-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-static-field" icon="res:element-field-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-static-method" icon="res:element-method-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-static-property" icon="res:element-property-16.png|res:element-visibility-static-overlay-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-struct" icon="res:element-structure-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-ProtectedOrInternal-literal" icon="res:element-constant-16.png|res:element-visibility-internal-or-protected-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-reference-folder" icon="md-reference|md-folder-overlay" size="Menu" /> - <StockIcon stockid="md-reference-package" icon="md-reference" size="Menu" /> - <StockIcon stockid="md-reference-project" icon="md-reference|md-project-overlay" size="Menu" /> - <StockIcon stockid="md-reference-warning" icon="md-reference|res:invalid-reference-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-static-event" icon="res:element-event-16.png|res:element-visibility-static-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-static-field" icon="res:element-field-16.png|res:element-visibility-static-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-static-method" icon="res:element-method-16.png|res:element-visibility-static-overlay-16.png" size="Menu" /> - <StockIcon stockid="md-static-property" icon="res:element-property-16.png|res:element-visibility-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-class" icon="res:element-class-16.png|res:element-visibility-protected-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-delegate" icon="res:element-delegate-16.png|res:element-visibility-protected-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-enum" icon="res:element-enum-16.png|res:element-visibility-protected-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-event" icon="res:element-event-16.png|res:element-visibility-protected-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-extensionmethod" icon="res:element-extensionmethod-16.png|res:element-visibility-protected-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-field" icon="res:element-field-16.png|res:element-visibility-protected-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-interface" icon="res:element-interface-16.png|res:element-visibility-protected-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-method" icon="res:element-method-16.png|res:element-visibility-protected-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-property" icon="res:element-property-16.png|res:element-visibility-protected-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-static-event" icon="res:element-event-16.png|res:element-visibility-protected-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-static-field" icon="res:element-field-16.png|res:element-visibility-protected-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-static-method" icon="res:element-method-16.png|res:element-visibility-protected-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-static-property" icon="res:element-property-16.png|res:element-visibility-protected-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-struct" icon="res:element-struct-16.png|res:element-visibility-protected-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-protected-literal" icon="res:element-constant-16.png|res:element-visibility-protected-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-class" icon="res:element-class-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-delegate" icon="res:element-delegate-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-enum" icon="res:element-enum-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-event" icon="res:element-event-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-extensionmethod" icon="res:element-extensionmethod-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-field" icon="res:element-field-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-interface" icon="res:element-interface-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-method" icon="res:element-method-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-property" icon="res:element-property-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-static-event" icon="res:element-event-16.png|res:element-visibility-internal-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-static-field" icon="res:element-field-16.png|res:element-visibility-internal-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-static-method" icon="res:element-method-16.png|res:element-visibility-internal-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-static-property" icon="res:element-property-16.png|res:element-visibility-internal-square-overlay-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-struct" icon="res:element-struct-16.png|res:element-visibility-internal-diamond-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-ProtectedOrInternal-literal" icon="res:element-constant-16.png|res:element-visibility-internal-square-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-static-event" icon="res:element-event-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-static-field" icon="res:element-field-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-static-method" icon="res:element-method-16.png|res:element-static-overlay-16.png" size="Menu" /> + <StockIcon stockid="md-static-property" icon="res:element-property-16.png|res:element-static-overlay-16.png" size="Menu" /> </Extension> </ExtensionModel> diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/Templates.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/Templates.addin.xml index 8108cccd00..fa6c2893f8 100644 --- a/main/src/core/MonoDevelop.Ide/ExtensionModel/Templates.addin.xml +++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/Templates.addin.xml @@ -99,7 +99,7 @@ </Extension> <Extension path="/MonoDevelop/Ide/ProjectTemplateCategories"> - <Category id="multiplat" name="Multiplatform" icon="md-platform-cross-platform"> + <Category id="multiplat" name="Multiplatform" icon="md-platform-crossplatform"> <Category id="library" name="Library"> <Category id="general" name="General" mappedCategories="crossplat/library/general" /> </Category> @@ -124,8 +124,8 @@ </Extension> <Extension path="/MonoDevelop/Ide/TemplateImages"> - <Image id="md-generic-project" resource="generic-project.png" /> - <Image id="md-blank-solution" resource="blank-solution.png" /> + <Image id="md-generic-project" resource="project.png" /> + <Image id="md-blank-solution" resource="solution.png" /> <Image id="md-console-project" resource="console-project.png" /> <Image id="md-library-project" resource="library-project.png" /> <Image id="md-pcl-project" resource="pcl-project.png" /> diff --git a/main/src/core/MonoDevelop.Ide/Makefile.am b/main/src/core/MonoDevelop.Ide/Makefile.am index 4fa387040f..76417ba6d3 100644 --- a/main/src/core/MonoDevelop.Ide/Makefile.am +++ b/main/src/core/MonoDevelop.Ide/Makefile.am @@ -3,6 +3,6 @@ include $(top_srcdir)/xbuild.include EXTRA_DIST += \ gtkrc \ gtkrc.mac \ - gtkrc.mac-yosemite \ + gtkrc.mac-dark \ gtkrc.win32 \ - gtkrc.win32-vista + gtkrc.win32-dark diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Chart/BasicChart.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Chart/BasicChart.cs index 91fa2d4b2d..f7caa76582 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Chart/BasicChart.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Chart/BasicChart.cs @@ -30,6 +30,7 @@ using System; using System.Collections; using Gtk; using Gdk; +using MonoDevelop.Ide.Fonts; namespace MonoDevelop.Components.Chart { @@ -530,6 +531,8 @@ namespace MonoDevelop.Components.Chart if (backgroundDisplay == BackgroundDisplay.Gradient) { ctx.Rectangle (left - 1, top - 1, width + 2, height + 2); + + // FIXME: VV: Remove gradient features using (var pat = new Cairo.LinearGradient (left - 1, top - 1, left - 1, height + 2)) { pat.AddColorStop (0, backroundColor); Cairo.Color endc = new Cairo.Color (1,1,1); @@ -627,7 +630,7 @@ namespace MonoDevelop.Components.Chart if (showLabels) { layout = new Pango.Layout (this.PangoContext); - layout.FontDescription = Pango.FontDescription.FromString ("Tahoma 8"); + layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); } bool isX = pos == AxisPosition.Top || pos == AxisPosition.Bottom; @@ -763,7 +766,7 @@ namespace MonoDevelop.Components.Chart { int max = 0; Pango.Layout layout = new Pango.Layout (this.PangoContext); - layout.FontDescription = Pango.FontDescription.FromString ("Tahoma 8"); + layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); double start = GetStart (ad); double end = GetEnd (ad); @@ -874,7 +877,7 @@ namespace MonoDevelop.Components.Chart if (text != null && text.Length > 0) { Pango.Layout layout = new Pango.Layout (this.PangoContext); - layout.FontDescription = Pango.FontDescription.FromString ("Tahoma 8"); + layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11); layout.SetMarkup (text); int tw, th; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands.ExtensionNodes/LinkItemCodon.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands.ExtensionNodes/LinkItemCodon.cs index c4b35fde16..9f6e479a98 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands.ExtensionNodes/LinkItemCodon.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands.ExtensionNodes/LinkItemCodon.cs @@ -53,7 +53,7 @@ namespace MonoDevelop.Components.Commands.ExtensionNodes public override object CreateInstance () { // FIXME: Use internal resource - return new LinkCommandEntry (label, link, "md-web-search-icon"); + return new LinkCommandEntry (label, link, "md-web-search"); } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs index 17acc8d30a..040c278780 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenuItem.cs @@ -229,7 +229,7 @@ namespace MonoDevelop.Components.Commands this.Visible = cmdInfo.Visible && (disabledVisible || cmdInfo.Enabled); if (!cmdInfo.Icon.IsNull && cmdInfo.Icon != lastIcon) { - Image = new Gtk.Image (cmdInfo.Icon, Gtk.IconSize.Menu); + Image = new ImageView (cmdInfo.Icon, Gtk.IconSize.Menu); lastIcon = cmdInfo.Icon; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandToggleToolButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandToggleToolButton.cs index 26cab71ae6..eb7d7d60ee 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandToggleToolButton.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandToggleToolButton.cs @@ -74,6 +74,7 @@ namespace MonoDevelop.Components.Commands } IconId stockId = null; + ImageView iconWidget; void Update (CommandInfo cmdInfo) { @@ -99,8 +100,10 @@ namespace MonoDevelop.Components.Commands Label = cmdInfo.Text; if (cmdInfo.Icon != stockId) { stockId = cmdInfo.Icon; - this.IconWidget = new Gtk.Image (cmdInfo.Icon, Gtk.IconSize.Menu); + this.IconWidget = iconWidget = new ImageView (cmdInfo.Icon, Gtk.IconSize.Menu); } + if (IconWidget != null && cmdInfo.Enabled != Sensitive) + iconWidget.Image = iconWidget.Image.WithStyles (cmdInfo.Enabled ? "" : "disabled").WithAlpha (cmdInfo.Enabled ? 1.0 : 0.4); if (cmdInfo.Enabled != Sensitive) Sensitive = cmdInfo.Enabled; if (cmdInfo.Visible != Visible) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandToolButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandToolButton.cs index 4be6a173ed..26e3d98df1 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandToolButton.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandToolButton.cs @@ -73,6 +73,7 @@ namespace MonoDevelop.Components.Commands } IconId stockId = null; + ImageView iconWidget; void Update (CommandInfo cmdInfo) { @@ -91,8 +92,10 @@ namespace MonoDevelop.Components.Commands Label = cmdInfo.Text; if (cmdInfo.Icon != stockId) { stockId = cmdInfo.Icon; - this.IconWidget = new Gtk.Image (cmdInfo.Icon, Gtk.IconSize.Menu); + this.IconWidget = iconWidget = new ImageView (cmdInfo.Icon, Gtk.IconSize.Menu); } + if (IconWidget != null && cmdInfo.Enabled != Sensitive) + iconWidget.Image = iconWidget.Image.WithStyles (cmdInfo.Enabled ? "" : "disabled").WithAlpha (cmdInfo.Enabled ? 1.0 : 0.4); if (cmdInfo.Enabled != Sensitive) Sensitive = cmdInfo.Enabled; if (cmdInfo.Visible != Visible) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/LinkCommandEntry.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/LinkCommandEntry.cs index 0e75a13fed..81b363675e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/LinkCommandEntry.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/LinkCommandEntry.cs @@ -76,7 +76,7 @@ namespace MonoDevelop.Components.Commands internal override Gtk.MenuItem CreateMenuItem (CommandManager manager) { Gtk.ImageMenuItem item = new Gtk.ImageMenuItem (text != null ? text : url); - item.Image = new Gtk.Image (icon, Gtk.IconSize.Menu); + item.Image = new ImageView (icon, Gtk.IconSize.Menu); item.Activated += new EventHandler (HandleActivation); item.Selected += delegate { CommandInfo ci = new CommandInfo (Text); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockNotebookTab.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockNotebookTab.cs index acb889234c..0fb5f62cab 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockNotebookTab.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockNotebookTab.cs @@ -40,7 +40,7 @@ namespace MonoDevelop.Components.DockNotebook Widget content; internal Gdk.Rectangle Allocation; - internal Gdk.Rectangle CloseButtonAllocation; + internal Cairo.Rectangle CloseButtonActiveArea; public DockNotebook Notebook { get { return notebook; } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockWindow.cs index e74496696c..a7a1b158d7 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/DockWindow.cs @@ -35,7 +35,7 @@ using System.Linq; namespace MonoDevelop.Components.DockNotebook { - class DockWindow : Gtk.Window + class DockWindow : IdeWindow { static List<DockWindow> allWindows = new List<DockWindow> (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs index 72d7254f64..32e445e744 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.DockNotebook/TabStrip.cs @@ -42,6 +42,11 @@ namespace MonoDevelop.Components.DockNotebook { static Xwt.Drawing.Image tabbarPrevImage = Xwt.Drawing.Image.FromResource ("tabbar-prev-12.png"); static Xwt.Drawing.Image tabbarNextImage = Xwt.Drawing.Image.FromResource ("tabbar-next-12.png"); + static Xwt.Drawing.Image tabActiveBackImage = Xwt.Drawing.Image.FromResource ("tabbar-active.9.png"); + static Xwt.Drawing.Image tabBackImage = Xwt.Drawing.Image.FromResource ("tabbar-inactive.9.png"); + static Xwt.Drawing.Image tabbarBackImage = Xwt.Drawing.Image.FromResource ("tabbar-back.9.png"); + static Xwt.Drawing.Image tabCloseImage = Xwt.Drawing.Image.FromResource ("tab-close-9.png"); + static Xwt.Drawing.Image tabDirtyImage = Xwt.Drawing.Image.FromResource ("tab-dirty-9.png"); List<Widget> children = new List<Widget> (); readonly DockNotebook notebook; @@ -69,23 +74,20 @@ namespace MonoDevelop.Components.DockNotebook public MenuButton DropDownButton; static readonly double PixelScale = GtkWorkarounds.GetPixelScale (); - static readonly int TopBarPadding = (int)(3 * PixelScale); - static readonly int BottomBarPadding = (int)(3 * PixelScale); - static readonly int LeftRightPadding = (int)(10 * PixelScale); - static readonly int TopPadding = (int)(8 * PixelScale); - static readonly int BottomPadding = (int)(8 * PixelScale); - static readonly int LeftBarPadding = (int)(58 * PixelScale); + static readonly int TotalHeight = (int)(32 * PixelScale); + static readonly Xwt.WidgetSpacing TabPadding; + static readonly Xwt.WidgetSpacing TabActivePadding; + static readonly int LeftBarPadding = (int)(44 * PixelScale); + static readonly int RightBarPadding = (int)(22 * PixelScale); static readonly int VerticalTextSize = (int)(11 * PixelScale); - const int TabSpacing = -1; - const int Radius = 2; - const int LeanWidth = 18; - const int CloseButtonSize = 14; + static readonly int ButtonSize = (int)(16 * PixelScale); + const int TabSpacing = 0; + const int LeanWidth = 12; + const double CloseButtonMarginRight = 0; + const double CloseButtonMarginBottom = -1.0; const int TextOffset = 1; - // Vertically aligns the close image(s) with the tab label. - const int CloseImageTopOffset = 3; - int TabWidth { get; set; } int LastTabWidthAdjustment { get; set; } @@ -125,6 +127,26 @@ namespace MonoDevelop.Components.DockNotebook } } + static TabStrip () + { + Xwt.Drawing.NinePatchImage tabBackImage9; + if (tabBackImage is Xwt.Drawing.ThemedImage) { + var img = ((Xwt.Drawing.ThemedImage)tabBackImage).GetImage (Xwt.Drawing.Context.GlobalStyles); + tabBackImage9 = img as Xwt.Drawing.NinePatchImage; + } else + tabBackImage9 = tabBackImage as Xwt.Drawing.NinePatchImage; + TabPadding = tabBackImage9.Padding; + + + Xwt.Drawing.NinePatchImage tabActiveBackImage9; + if (tabActiveBackImage is Xwt.Drawing.ThemedImage) { + var img = ((Xwt.Drawing.ThemedImage)tabActiveBackImage).GetImage (Xwt.Drawing.Context.GlobalStyles); + tabActiveBackImage9 = img as Xwt.Drawing.NinePatchImage; + } else + tabActiveBackImage9 = tabBackImage as Xwt.Drawing.NinePatchImage; + TabActivePadding = tabActiveBackImage9.Padding; + } + public TabStrip (DockNotebook notebook) { if (notebook == null) @@ -141,7 +163,7 @@ namespace MonoDevelop.Components.DockNotebook var arr = new Xwt.ImageView (tabbarPrevImage); arr.HeightRequest = arr.WidthRequest = 10; - var alignment = new Alignment (0.5f, 0.5f, 0.0f, 0.0f); + var alignment = new Alignment (0.5f, 1, 0.0f, 0.0f); alignment.Add (arr.ToGtkWidget ()); PreviousButton = new Button (alignment); PreviousButton.Relief = ReliefStyle.None; @@ -150,7 +172,7 @@ namespace MonoDevelop.Components.DockNotebook arr = new Xwt.ImageView (tabbarNextImage); arr.HeightRequest = arr.WidthRequest = 10; - alignment = new Alignment (0.5f, 0.5f, 0.0f, 0.0f); + alignment = new Alignment (0.5f, 1, 0.0f, 0.0f); alignment.Add (arr.ToGtkWidget ()); NextButton = new Button (alignment); NextButton.Relief = ReliefStyle.None; @@ -249,10 +271,8 @@ namespace MonoDevelop.Components.DockNotebook } else { tabStartX = LeanWidth / 2; } - tabEndX = allocation.Width - DropDownButton.SizeRequest ().Width; - var height = allocation.Height - BottomBarPadding; - if (height < 0) - height = 0; + tabEndX = allocation.Width - RightBarPadding; + var height = allocation.Height; PreviousButton.SizeAllocate (new Gdk.Rectangle ( 0, // allocation.X, @@ -292,28 +312,20 @@ namespace MonoDevelop.Components.DockNotebook Update (); } - int totalHeight; - protected override void OnSizeRequested (ref Requisition requisition) { base.OnSizeRequested (ref requisition); - requisition.Height = totalHeight; + requisition.Height = TotalHeight; requisition.Width = 0; } internal void InitSize () { - Pango.Layout la = CreateSizedLayout (); - la.SetText ("H"); - int w, h; - la.GetPixelSize (out w, out h); - - totalHeight = h + TopPadding + BottomPadding; - la.Dispose (); + return; } public int BarHeight { - get { return totalHeight - BottomBarPadding + 1; } + get { return TotalHeight; } } int lastDragX; @@ -465,7 +477,7 @@ namespace MonoDevelop.Components.DockNotebook dragX = (int)evnt.X - dragOffset; QueueDraw (); - var t = FindTab ((int)evnt.X, TopPadding + 3); + var t = FindTab ((int)evnt.X, (int)TabPadding.Top + 3); if (t == null) { var last = (DockNotebookTab)notebook.Tabs.Last (); if (dragX > last.Allocation.Right) @@ -583,30 +595,26 @@ namespace MonoDevelop.Components.DockNotebook DockNotebookTab FindTab (int x, int y) { - // we will not actually draw anything, just do bounds checking - using (var context = CairoHelper.Create (GdkWindow)) { - var current = notebook.CurrentTab as DockNotebookTab; - if (current != null) { - LayoutTabBorder (context, Allocation, current.Allocation.Width, current.Allocation.X, 0, false); - if (context.InFill (x, y)) - return current; - } + var current = notebook.CurrentTab as DockNotebookTab; + if (current != null) { + var allocWithLean = current.Allocation; + allocWithLean.X -= LeanWidth / 2; + allocWithLean.Width += LeanWidth; + if (allocWithLean.Contains (x, y)) + return current; + } - context.NewPath (); - for (int n = 0; n < notebook.Tabs.Count; n++) { - var tab = (DockNotebookTab)notebook.Tabs [n]; - LayoutTabBorder (context, Allocation, tab.Allocation.Width, tab.Allocation.X, 0, false); - if (context.InFill (x, y)) - return tab; - context.NewPath (); - } + for (int n = 0; n < notebook.Tabs.Count; n++) { + var tab = (DockNotebookTab)notebook.Tabs [n]; + if (tab.Allocation.Contains (x, y)) + return tab; } return null; } static bool IsOverCloseButton (DockNotebookTab tab, int x, int y) { - return tab != null && tab.CloseButtonAllocation.Contains (x, y); + return tab != null && tab.CloseButtonActiveArea.Contains (x, y); } public void Update () @@ -640,29 +648,6 @@ namespace MonoDevelop.Components.DockNotebook return Math.Max (min, Math.Min (max, val)); } - void DrawBackground (Context ctx, Gdk.Rectangle region) - { - var h = region.Height; - ctx.Rectangle (0, 0, region.Width, h); - using (var gr = new LinearGradient (0, 0, 0, h)) { - if (isActiveNotebook) { - gr.AddColorStop (0, Styles.TabBarActiveGradientStartColor); - gr.AddColorStop (1, Styles.TabBarActiveGradientEndColor); - } else { - gr.AddColorStop (0, Styles.TabBarGradientStartColor); - gr.AddColorStop (1, Styles.TabBarGradientEndColor); - } - ctx.SetSource (gr); - ctx.Fill (); - } - - ctx.MoveTo (region.X, 0.5); - ctx.LineTo (region.Right + 1, 0.5); - ctx.LineWidth = 1; - ctx.SetSourceColor (Styles.TabBarGradientShadowColor); - ctx.Stroke (); - } - int GetRenderOffset () { int tabArea = tabEndX - tabStartX; @@ -733,7 +718,7 @@ namespace MonoDevelop.Components.DockNotebook if (active) { int tmp = x; - drawActive = c => DrawTab (c, tab, Allocation, new Gdk.Rectangle (tmp, y, width, Allocation.Height), true, true, draggingTab, CreateTabLayout (tab)); + drawActive = c => DrawTab (c, tab, Allocation, new Gdk.Rectangle (tmp, y, width, Allocation.Height), true, true, draggingTab, CreateTabLayout (tab, true)); tab.Allocation = new Gdk.Rectangle (tmp, Allocation.Y, width, Allocation.Height); } else { int tmp = x; @@ -755,14 +740,14 @@ namespace MonoDevelop.Components.DockNotebook drawCommands.Add (DrawClosingTab (n, new Gdk.Rectangle (x, y, 0, allocation.Height), out tabWidth)); drawCommands.Reverse (); - DrawBackground (ctx, allocation); + ctx.DrawImage (this, tabbarBackImage.WithSize (allocation.Width, allocation.Height), 0, 0); // Draw breadcrumb bar header - if (notebook.Tabs.Count > 0) { - ctx.Rectangle (0, allocation.Height - BottomBarPadding, allocation.Width, BottomBarPadding); - ctx.SetSourceColor (Styles.BreadcrumbBackgroundColor); - ctx.Fill (); - } +// if (notebook.Tabs.Count > 0) { +// ctx.Rectangle (0, allocation.Height - BottomBarPadding, allocation.Width, BottomBarPadding); +// ctx.SetSourceColor (Styles.BreadcrumbBackgroundColor); +// ctx.Fill (); +// } ctx.Rectangle (tabStartX - LeanWidth / 2, allocation.Y, tabArea + LeanWidth, allocation.Height); ctx.Clip (); @@ -784,70 +769,6 @@ namespace MonoDevelop.Components.DockNotebook return base.OnExposeEvent (evnt); } - static void DrawCloseButton (Context context, Gdk.Point center, bool hovered, double opacity, double animationProgress) - { - if (hovered) { - const double radius = 6; - context.Arc (center.X, center.Y, radius, 0, Math.PI * 2); - context.SetSourceRGBA (.6, .6, .6, opacity); - context.Fill (); - - context.SetSourceRGBA (0.95, 0.95, 0.95, opacity); - context.LineWidth = 2; - - context.MoveTo (center.X - 3, center.Y - 3); - context.LineTo (center.X + 3, center.Y + 3); - context.MoveTo (center.X - 3, center.Y + 3); - context.LineTo (center.X + 3, center.Y - 3); - context.Stroke (); - } else { - double lineColor = .63 - .1 * animationProgress; - const double fillColor = .74; - - double heightMod = Math.Max (0, 1.0 - animationProgress * 2); - context.MoveTo (center.X - 3, center.Y - 3 * heightMod); - context.LineTo (center.X + 3, center.Y + 3 * heightMod); - context.MoveTo (center.X - 3, center.Y + 3 * heightMod); - context.LineTo (center.X + 3, center.Y - 3 * heightMod); - - context.LineWidth = 2; - context.SetSourceRGBA (lineColor, lineColor, lineColor, opacity); - context.Stroke (); - - if (animationProgress > 0.5) { - double partialProg = (animationProgress - 0.5) * 2; - context.MoveTo (center.X - 3, center.Y); - context.LineTo (center.X + 3, center.Y); - - context.LineWidth = 2 - partialProg; - context.SetSourceRGBA (lineColor, lineColor, lineColor, opacity); - context.Stroke (); - - double radius = partialProg * 3.5; - - // Background - context.Arc (center.X, center.Y, radius, 0, Math.PI * 2); - context.SetSourceRGBA (fillColor, fillColor, fillColor, opacity); - context.Fill (); - - // Inset shadow - using (var lg = new LinearGradient (0, center.Y - 5, 0, center.Y)) { - context.Arc (center.X, center.Y + 1, radius, 0, Math.PI * 2); - lg.AddColorStop (0, new Cairo.Color (0, 0, 0, 0.2 * opacity)); - lg.AddColorStop (1, new Cairo.Color (0, 0, 0, 0)); - context.SetSource (lg); - context.Stroke (); - } - - // Outline - context.Arc (center.X, center.Y, radius, 0, Math.PI * 2); - context.SetSourceRGBA (lineColor, lineColor, lineColor, opacity); - context.Stroke (); - - } - } - } - void DrawTab (Context ctx, DockNotebookTab tab, Gdk.Rectangle allocation, Gdk.Rectangle tabBounds, bool highlight, bool active, bool dragging, Pango.Layout la) { // This logic is stupid to have here, should be in the caller! @@ -855,141 +776,100 @@ namespace MonoDevelop.Components.DockNotebook tabBounds.X = (int)(tabBounds.X + (dragX - tabBounds.X) * dragXProgress); tabBounds.X = Clamp (tabBounds.X, tabStartX, tabEndX - tabBounds.Width); } - int padding = LeftRightPadding; - padding = (int)(padding * Math.Min (1.0, Math.Max (0.5, (tabBounds.Width - 30) / 70.0))); + double rightPadding = (active ? TabActivePadding.Right : TabPadding.Right) - (LeanWidth / 2); + rightPadding = (rightPadding * Math.Min (1.0, Math.Max (0.5, (tabBounds.Width - 30) / 70.0))); + double leftPadding = (active ? TabActivePadding.Left : TabPadding.Left) - (LeanWidth / 2); + leftPadding = (leftPadding * Math.Min (1.0, Math.Max (0.5, (tabBounds.Width - 30) / 70.0))); + double bottomPadding = active ? TabActivePadding.Bottom : TabPadding.Bottom; - ctx.LineWidth = 1; - LayoutTabBorder (ctx, allocation, tabBounds.Width, tabBounds.X, 0, active); - ctx.ClosePath (); - using (var gr = new LinearGradient (tabBounds.X, TopBarPadding, tabBounds.X, allocation.Bottom)) { - if (active) { - gr.AddColorStop (0, Styles.BreadcrumbGradientStartColor.MultiplyAlpha (tab.Opacity)); - gr.AddColorStop (1, Styles.BreadcrumbBackgroundColor.MultiplyAlpha (tab.Opacity)); - } else { - gr.AddColorStop (0, CairoExtensions.ParseColor ("f4f4f4").MultiplyAlpha (tab.Opacity)); - gr.AddColorStop (1, CairoExtensions.ParseColor ("cecece").MultiplyAlpha (tab.Opacity)); - } - ctx.SetSource (gr); - } - ctx.Fill (); - - ctx.SetSourceColor (new Cairo.Color (1, 1, 1, .5).MultiplyAlpha (tab.Opacity)); - LayoutTabBorder (ctx, allocation, tabBounds.Width, tabBounds.X, 1, active); - ctx.Stroke (); + DrawTabBackground (this, ctx, allocation, tabBounds.Width, tabBounds.X, active); - ctx.SetSourceColor (Styles.BreadcrumbBorderColor.MultiplyAlpha (tab.Opacity)); - LayoutTabBorder (ctx, allocation, tabBounds.Width, tabBounds.X, 0, active); - ctx.StrokePreserve (); + ctx.LineWidth = 1; + ctx.NewPath (); - if (tab.GlowStrength > 0) { - Gdk.Point mouse = tracker.MousePosition; - using (var rg = new RadialGradient (mouse.X, tabBounds.Bottom, 0, mouse.X, tabBounds.Bottom, 100)) { - rg.AddColorStop (0, new Cairo.Color (1, 1, 1, 0.4 * tab.Opacity * tab.GlowStrength)); - rg.AddColorStop (1, new Cairo.Color (1, 1, 1, 0)); + // Render Close Button (do this first so we can tell how much text to render) - ctx.SetSource (rg); - ctx.Fill (); - } - } else { - ctx.NewPath (); - } + var closeButtonAlloation = new Cairo.Rectangle (tabBounds.Right - rightPadding - (tabCloseImage.Width / 2) - CloseButtonMarginRight, + tabBounds.Height - bottomPadding - tabCloseImage.Height - CloseButtonMarginBottom, + tabCloseImage.Width, tabCloseImage.Height); + + tab.CloseButtonActiveArea = closeButtonAlloation.Inflate (2, 2); - // Render Close Button (do this first so we can tell how much text to render) + bool closeButtonHovered = tracker.Hovered && tab.CloseButtonActiveArea.Contains (tracker.MousePosition); + bool tabHovered = tracker.Hovered && tab.Allocation.Contains (tracker.MousePosition); + bool drawCloseButton = active || tabHovered; - var ch = allocation.Height - TopBarPadding - BottomBarPadding + CloseImageTopOffset; - var crect = new Gdk.Rectangle (tabBounds.Right - padding - CloseButtonSize + 3, - tabBounds.Y + TopBarPadding + (ch - CloseButtonSize) / 2, - CloseButtonSize, CloseButtonSize); - tab.CloseButtonAllocation = crect; - tab.CloseButtonAllocation.Inflate (2, 2); - - bool closeButtonHovered = tracker.Hovered && tab.CloseButtonAllocation.Contains (tracker.MousePosition) && tab.WidthModifier >= 1.0f; - bool drawCloseButton = tabBounds.Width > 60 || highlight || closeButtonHovered; - if (drawCloseButton) { - DrawCloseButton (ctx, new Gdk.Point (crect.X + crect.Width / 2, crect.Y + crect.Height / 2), closeButtonHovered, tab.Opacity, tab.DirtyStrength); + if (!closeButtonHovered && tab.DirtyStrength > 0.5) { + ctx.DrawImage (this, tabDirtyImage, closeButtonAlloation.X, closeButtonAlloation.Y); + drawCloseButton = false; } + if (drawCloseButton) + ctx.DrawImage (this, tabCloseImage.WithAlpha ((closeButtonHovered ? 1.0 : 0.5) * tab.Opacity), closeButtonAlloation.X, closeButtonAlloation.Y); + // Render Text - int w = tabBounds.Width - (padding * 2 + CloseButtonSize); - if (!drawCloseButton) - w += CloseButtonSize; + double tw = tabBounds.Width - (leftPadding + rightPadding); + if (drawCloseButton || tab.DirtyStrength > 0.5) + tw -= closeButtonAlloation.Width / 2; - int textStart = tabBounds.X + padding; + double tx = tabBounds.X + leftPadding; + var baseline = la.GetLine (0).Layout.GetPixelBaseline (); + double ty = tabBounds.Height - bottomPadding - baseline; - ctx.MoveTo (textStart, tabBounds.Y + TopPadding + TextOffset + VerticalTextSize); + ctx.MoveTo (tx, ty); if (!MonoDevelop.Core.Platform.IsMac && !MonoDevelop.Core.Platform.IsWindows) { // This is a work around for a linux specific problem. // A bug in the proprietary ATI driver caused TAB text not to draw. // If that bug get's fixed remove this HACK asap. la.Ellipsize = Pango.EllipsizeMode.End; - la.Width = (int)(w * Pango.Scale.PangoScale); - ctx.SetSourceColor (tab.Notify ? new Cairo.Color (0, 0, 1) : Styles.TabBarActiveTextColor); - Pango.CairoHelper.ShowLayoutLine (ctx, la.GetLine (0)); + la.Width = (int)(tw * Pango.Scale.PangoScale); + ctx.SetSourceColor ((tab.Notify ? Styles.TabBarNotifyTextColor : (active ? Styles.TabBarActiveTextColor : Styles.TabBarInactiveTextColor)).ToCairoColor ()); + Pango.CairoHelper.ShowLayout (ctx, la.GetLine (0).Layout); } else { // ellipses are for space wasting ..., we cant afford that - using (var lg = new LinearGradient (textStart + w - 5, 0, textStart + w + 3, 0)) { - var color = tab.Notify ? new Cairo.Color (0, 0, 1) : Styles.TabBarActiveTextColor; + using (var lg = new LinearGradient (tx + tw - 10, 0, tx + tw, 0)) { + var color = (tab.Notify ? Styles.TabBarNotifyTextColor : (active ? Styles.TabBarActiveTextColor : Styles.TabBarInactiveTextColor)).ToCairoColor (); color = color.MultiplyAlpha (tab.Opacity); lg.AddColorStop (0, color); color.A = 0; lg.AddColorStop (1, color); ctx.SetSource (lg); - Pango.CairoHelper.ShowLayoutLine (ctx, la.GetLine (0)); + Pango.CairoHelper.ShowLayout (ctx, la.GetLine (0).Layout); } } la.Dispose (); } - static void LayoutTabBorder (Context ctx, Gdk.Rectangle allocation, int contentWidth, int px, int margin, bool active = true) + static void DrawTabBackground (Widget widget, Context ctx, Gdk.Rectangle allocation, int contentWidth, int px, bool active = true) { - double x = 0.5 + (double)px; - double y = (double)allocation.Height + 0.5 - BottomBarPadding + margin; - double height = allocation.Height - TopBarPadding - BottomBarPadding; + int lean = Math.Min (LeanWidth, contentWidth / 2); + int halfLean = lean / 2; - x += TabSpacing + margin; - contentWidth -= (TabSpacing + margin) * 2; + double x = px + TabSpacing - halfLean; + double y = 0; + double height = allocation.Height; + double width = contentWidth - (TabSpacing * 2) + lean; - double rightx = x + contentWidth; + var image = active ? tabActiveBackImage : tabBackImage; + image = image.WithSize (width, height); - int lean = Math.Min (LeanWidth, contentWidth / 2); - int halfLean = lean / 2; - const int smoothing = 2; - if (active) { - ctx.MoveTo (0, y + 0.5); - ctx.LineTo (0, y); - ctx.LineTo (x - halfLean, y); - } else { - ctx.MoveTo (x - halfLean, y + 0.5); - ctx.LineTo (x - halfLean, y); - } - ctx.CurveTo (new PointD (x + smoothing, y), - new PointD (x - smoothing, y - height), - new PointD (x + halfLean, y - height)); - ctx.LineTo (rightx - halfLean, y - height); - ctx.CurveTo (new PointD (rightx + smoothing, y - height), - new PointD (rightx - smoothing, y), - new PointD (rightx + halfLean, y)); - - if (active) { - ctx.LineTo (allocation.Width, y); - ctx.LineTo (allocation.Width, y + 0.5); - } else { - ctx.LineTo (rightx + halfLean, y + 0.5); - } + ctx.DrawImage (widget, image, x, y); } - Pango.Layout CreateSizedLayout () + Pango.Layout CreateSizedLayout (bool active) { var la = new Pango.Layout (PangoContext); - la.FontDescription = Pango.FontDescription.FromString ("normal"); + la.FontDescription = Ide.Fonts.FontService.SansFont.Copy (); + if (!Core.Platform.IsWindows) + la.FontDescription.Weight = Pango.Weight.Bold; la.FontDescription.AbsoluteSize = Pango.Units.FromPixels (VerticalTextSize); return la; } - Pango.Layout CreateTabLayout (DockNotebookTab tab) + Pango.Layout CreateTabLayout (DockNotebookTab tab, bool active = false) { - Pango.Layout la = CreateSizedLayout (); + Pango.Layout la = CreateSizedLayout (active); if (!string.IsNullOrEmpty (tab.Markup)) la.SetMarkup (tab.Markup); else if (!string.IsNullOrEmpty (tab.Text)) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBar.cs index c8d8f825ad..d269d7b6f1 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBar.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBar.cs @@ -213,29 +213,8 @@ namespace MonoDevelop.Components.Docking var alloc = Allocation; using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) { ctx.Rectangle (alloc.X, alloc.Y, alloc.X + alloc.Width, alloc.Y + alloc.Height); - Cairo.LinearGradient gr; - if (Orientation == Gtk.Orientation.Vertical) - gr = new Cairo.LinearGradient (alloc.X, alloc.Y, alloc.X + alloc.Width, alloc.Y); - else - gr = new Cairo.LinearGradient (alloc.X, alloc.Y, alloc.X, alloc.Y + alloc.Height); - using (gr) { - gr.AddColorStop (0, Styles.DockBarBackground1); - gr.AddColorStop (1, Styles.DockBarBackground2); - ctx.SetSource (gr); - } + ctx.SetSourceColor (Styles.DockBarBackground.ToCairoColor ()); ctx.Fill (); - - // Light shadow - double offs = ShowBorder ? 1.5 : 0.5; - switch (Position) { - case PositionType.Left:ctx.MoveTo (alloc.X + alloc.Width - offs, alloc.Y); ctx.RelLineTo (0, Allocation.Height); break; - case PositionType.Right: ctx.MoveTo (alloc.X + offs, alloc.Y); ctx.RelLineTo (0, Allocation.Height); break; - case PositionType.Top: ctx.MoveTo (alloc.X, alloc.Y + alloc.Height - offs); ctx.RelLineTo (Allocation.Width, 0); break; - case PositionType.Bottom: ctx.MoveTo (alloc.X, alloc.Y + offs); ctx.RelLineTo (Allocation.Width, 0); break; - } - ctx.LineWidth = 1; - ctx.SetSourceColor (Styles.DockBarSeparatorColorLight); - ctx.Stroke (); } if (Child != null) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs index d03a901adb..b4cb07dfd6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs @@ -35,6 +35,8 @@ using MonoDevelop.Ide.Gui; using MonoDevelop.Components; using Xwt.Motion; using Animations = Xwt.Motion.AnimationExtensions; +using MonoDevelop.Core; +using MonoDevelop.Ide.Fonts; namespace MonoDevelop.Components.Docking { @@ -148,6 +150,8 @@ namespace MonoDevelop.Components.Docking else crossfade.ShowPrimary (); }; + + Styles.Changed += UpdateStyle; } void IAnimatable.BatchBegin () { } @@ -178,6 +182,7 @@ namespace MonoDevelop.Components.Docking { base.OnDestroyed (); bar.Frame.SizeAllocated -= HandleBarFrameSizeAllocated; + Ide.Gui.Styles.Changed -= UpdateStyle; } @@ -207,16 +212,16 @@ namespace MonoDevelop.Components.Docking if (bar.Orientation == Gtk.Orientation.Horizontal) { box = new HBox (); if (bar.AlignToEnd) - mainBox.SetPadding (3, 3, 11, 9); + mainBox.SetPadding (5, 5, 11, 9); else - mainBox.SetPadding (3, 3, 9, 11); + mainBox.SetPadding (5, 5, 9, 11); } else { box = new VBox (); if (bar.AlignToEnd) - mainBox.SetPadding (11, 9, 3, 3); + mainBox.SetPadding (11, 9, 5, 5); else - mainBox.SetPadding (9, 11, 3, 3); + mainBox.SetPadding (9, 11, 5, 5); } if (it.Icon != null) { @@ -227,10 +232,25 @@ namespace MonoDevelop.Components.Docking } if (!string.IsNullOrEmpty (it.Label)) { - label = new Gtk.Label (it.Label); + label = new Label (it.Label); label.UseMarkup = true; - if (bar.Orientation == Gtk.Orientation.Vertical) + label.ModifyFont (FontService.SansFont.CopyModified (Styles.FontScale11)); + + if (bar.Orientation == Orientation.Vertical) label.Angle = 270; + + // fine-tune label alignment issues + if (Platform.IsMac) { + if (bar.Orientation == Orientation.Horizontal) + label.SetAlignment (0, 0.5f); + else + label.SetAlignment (0.6f, 0); + } else { + if (bar.Orientation == Orientation.Vertical) + label.SetAlignment (1, 0); + } + // TODO: VV: Test Linux + box.PackStart (label, true, true, 0); } else label = null; @@ -239,8 +259,15 @@ namespace MonoDevelop.Components.Docking mainBox.Add (box); mainBox.ShowAll (); Add (mainBox); + UpdateStyle (this, null); QueueDraw (); } + + void UpdateStyle (object sender, EventArgs e) + { + if (label != null) + label.ModifyFg (StateType.Normal, Styles.DockBarLabelColor.ToGdkColor ()); + } public MonoDevelop.Components.Docking.DockItem DockItem { get { @@ -440,6 +467,8 @@ namespace MonoDevelop.Components.Docking using (var context = Gdk.CairoHelper.Create (evnt.Window)) { var alloc = Allocation; + // TODO: VV: Remove preflight gradient features and replace with a flat color + Cairo.LinearGradient lg; if (bar.Orientation == Orientation.Horizontal) { @@ -449,7 +478,7 @@ namespace MonoDevelop.Components.Docking } using (lg) { - Cairo.Color primaryColor = Styles.DockBarPrelightColor; + Cairo.Color primaryColor = Styles.DockBarPrelightColor.ToCairoColor (); primaryColor.A = hoverProgress; Cairo.Color transparent = primaryColor; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs index aa58869f97..02d677b87b 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs @@ -224,6 +224,13 @@ namespace MonoDevelop.Components.Docking needsRelayout = true; QueueResize (); } + + public void ReloadStyles () + { + foreach (var item in Items) + item.SetRegionStyle (frame.GetRegionStyleForItem (item)); + RelayoutWidgets (); + } void LayoutWidgets () { @@ -363,7 +370,7 @@ namespace MonoDevelop.Components.Docking //GdkWindow.SetBackPixmap (null, true); - ModifyBase (StateType.Normal, Styles.DockFrameBackground); + ModifyBase (StateType.Normal, Styles.DockFrameBackground.ToGdkColor ()); } protected override void OnUnrealized () diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs index a8023eb287..69fd7e7b03 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockFrame.cs @@ -690,6 +690,11 @@ namespace MonoDevelop.Components.Docking dockBarRight.UpdateTitle (item); } + internal void UpdateStyles () + { + container.ReloadStyles (); + } + internal void UpdateStyle (DockItem item) { DockGroupItem gitem = container.FindDockGroupItem (item.Id); @@ -861,7 +866,7 @@ namespace MonoDevelop.Components.Docking w.Y = y; if (UseWindowsForTopLevelFrames) { - var win = new Gtk.Window (Gtk.WindowType.Toplevel); + var win = new IdeWindow (Gtk.WindowType.Toplevel); win.SkipTaskbarHint = true; win.Decorated = false; win.TypeHint = Gdk.WindowTypeHint.Toolbar; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockGroup.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockGroup.cs index 51b415811c..3ca1620724 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockGroup.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockGroup.cs @@ -872,7 +872,7 @@ namespace MonoDevelop.Components.Docking if (areasList == null && oper == DrawSeparatorOperation.Draw) { hgc = new Gdk.GC (Frame.Container.GdkWindow); - hgc.RgbFgColor = Styles.DockFrameBackground; + hgc.RgbFgColor = Styles.DockFrameBackground.ToGdkColor (); } for (int n=0; n<VisibleObjects.Count; n++) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemContainer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemContainer.cs index 2da0fa2a6f..933d1bcf6f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemContainer.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemContainer.cs @@ -123,6 +123,11 @@ namespace MonoDevelop.Components.Docking item.GetToolbar (DockPositionType.Left).SetStyle (VisualStyle); item.GetToolbar (DockPositionType.Right).SetStyle (VisualStyle); item.GetToolbar (DockPositionType.Bottom).SetStyle (VisualStyle); + + if (VisualStyle.TabStyle == DockTabStyle.Normal) + ModifyBg (StateType.Normal, VisualStyle.PadBackgroundColor.Value.ToGdkColor ()); + else + ModifyBg (StateType.Normal, Style.Background(StateType.Normal)); } } @@ -181,7 +186,8 @@ namespace MonoDevelop.Components.Docking int rightPadding; Gdk.Color backgroundColor; - bool backgroundColorSet; + Gdk.Color borderColor; + bool backgroundColorSet, borderColorSet; public CustomFrame () { @@ -191,6 +197,13 @@ namespace MonoDevelop.Components.Docking { SetMargins (topMargin, bottomMargin, leftMargin, rightMargin); } + + protected override void OnStyleSet (Style previous_style) + { + base.OnStyleSet (previous_style); + if (!borderColorSet) + borderColor = Style.Dark (Gtk.StateType.Normal); + } public void SetMargins (int topMargin, int bottomMargin, int leftMargin, int rightMargin) { @@ -214,6 +227,11 @@ namespace MonoDevelop.Components.Docking get { return backgroundColor; } set { backgroundColor = value; backgroundColorSet = true; } } + + public Gdk.Color BorderColor { + get { return borderColor; } + set { borderColor = value; borderColorSet = true; } + } protected override void OnAdded (Widget widget)
{
@@ -272,6 +290,8 @@ namespace MonoDevelop.Components.Docking cr.RelLineTo (-rect.Width, 0); cr.RelLineTo (0, -rect.Height); cr.ClosePath (); + + // FIXME: VV: Remove gradient features using (Cairo.Gradient pat = new Cairo.LinearGradient (rect.X, rect.Y, rect.X, bottom)) { pat.AddColorStop (0, bcolor.ToCairoColor ()); Xwt.Drawing.Color gcol = bcolor.ToXwtColor (); @@ -295,7 +315,7 @@ namespace MonoDevelop.Components.Docking base.OnExposeEvent (evnt); using (Cairo.Context cr = Gdk.CairoHelper.Create (evnt.Window)) { - cr.SetSourceColor (Style.Dark (Gtk.StateType.Normal).ToCairoColor ()); + cr.SetSourceColor (BorderColor.ToCairoColor ()); double y = rect.Y + topMargin / 2d; cr.LineWidth = topMargin; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs index 61bf7e6e9a..44613491e5 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemTitleTab.cs @@ -33,18 +33,22 @@ using System.Linq; using MonoDevelop.Core; using MonoDevelop.Ide; using MonoDevelop.Components; +using MonoDevelop.Ide.Fonts; namespace MonoDevelop.Components.Docking { class DockItemTitleTab: Gtk.EventBox { + static Xwt.Drawing.Image dockTabActiveBackImage = Xwt.Drawing.Image.FromResource ("padbar-active.9.png"); + static Xwt.Drawing.Image dockTabBackImage = Xwt.Drawing.Image.FromResource ("padbar-inactive.9.png"); + bool active; Gtk.Widget page; ExtendedLabel labelWidget; int labelWidth; DockVisualStyle visualStyle; - Gtk.Widget tabIcon; + ImageView tabIcon; DockFrame frame; string label; ImageButton btnDock; @@ -63,18 +67,31 @@ namespace MonoDevelop.Components.Docking static double PixelScale = GtkWorkarounds.GetPixelScale (); - const int TopPadding = 5; - const int BottomPadding = 7; - const int TopPaddingActive = 5; - const int BottomPaddingActive = 7; - const int LeftPadding = 11; - const int RightPadding = 9; + static readonly Xwt.WidgetSpacing TabPadding; + static readonly Xwt.WidgetSpacing TabActivePadding; static DockItemTitleTab () { pixClose = Xwt.Drawing.Image.FromResource ("pad-close-9.png"); pixAutoHide = Xwt.Drawing.Image.FromResource ("pad-minimize-9.png"); pixDock = Xwt.Drawing.Image.FromResource ("pad-dock-9.png"); + + Xwt.Drawing.NinePatchImage tabBackImage9; + if (dockTabBackImage is Xwt.Drawing.ThemedImage) { + var img = ((Xwt.Drawing.ThemedImage)dockTabBackImage).GetImage (Xwt.Drawing.Context.GlobalStyles); + tabBackImage9 = img as Xwt.Drawing.NinePatchImage; + } else + tabBackImage9 = dockTabBackImage as Xwt.Drawing.NinePatchImage; + TabPadding = tabBackImage9.Padding; + + + Xwt.Drawing.NinePatchImage tabActiveBackImage9; + if (dockTabActiveBackImage is Xwt.Drawing.ThemedImage) { + var img = ((Xwt.Drawing.ThemedImage)dockTabActiveBackImage).GetImage (Xwt.Drawing.Context.GlobalStyles); + tabActiveBackImage9 = img as Xwt.Drawing.NinePatchImage; + } else + tabActiveBackImage9 = dockTabActiveBackImage as Xwt.Drawing.NinePatchImage; + TabActivePadding = tabActiveBackImage9.Padding; } public DockItemTitleTab (DockItem item, DockFrame frame) @@ -110,6 +127,13 @@ namespace MonoDevelop.Components.Docking void UpdateVisualStyle () { + double inactiveIconAlpha; + + if (IdeApp.Preferences == null || IdeApp.Preferences.UserInterfaceSkin == Skin.Light) + inactiveIconAlpha = 0.8; + else + inactiveIconAlpha = 0.6; + if (labelWidget != null && label != null) { if (visualStyle.UppercaseTitles.Value) labelWidget.Text = label.ToUpper (); @@ -123,12 +147,16 @@ namespace MonoDevelop.Components.Docking labelWidget.Xalign = 0; } - if (tabIcon != null) + if (tabIcon != null) { + tabIcon.Image = tabIcon.Image.WithAlpha (active ? 1.0 : inactiveIconAlpha); tabIcon.Visible = visualStyle.ShowPadTitleIcon.Value; - if (IsRealized) { - if (labelWidget != null) - labelWidget.ModifyFg (StateType.Normal, visualStyle.PadTitleLabelColor.Value.ToGdkColor ()); } + if (IsRealized && labelWidget != null) { + var font = FontService.SansFont.CopyModified (Styles.FontScale11, Pango.Weight.Bold); + labelWidget.ModifyFont (font); + labelWidget.ModifyText (StateType.Normal, (active ? visualStyle.PadTitleLabelColor.Value : visualStyle.InactivePadTitleLabelColor.Value).ToGdkColor ()); + } + var r = WidthRequest; WidthRequest = -1; labelWidth = SizeRequest ().Width + 1; @@ -149,20 +177,24 @@ namespace MonoDevelop.Components.Docking } Gtk.HBox box = new HBox (); - box.Spacing = 2; + box.Spacing = -2; - if (icon != null) { - tabIcon = new Xwt.ImageView (icon).ToGtkWidget (); - tabIcon.Show (); - box.PackStart (tabIcon, false, false, 0); - } else - tabIcon = null; + if (icon == null) + icon = ImageService.GetIcon ("md-empty"); + + tabIcon = new ImageView (icon); + tabIcon.Show (); + box.PackStart (tabIcon, false, false, 3); if (!string.IsNullOrEmpty (label)) { labelWidget = new ExtendedLabel (label); - labelWidget.DropShadowVisible = true; labelWidget.UseMarkup = true; - box.PackStart (labelWidget, true, true, 0); + labelWidget.Yalign = 0.85f; + var alignLabel = new Alignment (0.0f, 1.0f, 1, 1); + alignLabel.BottomPadding = 0; + alignLabel.RightPadding = 15; + alignLabel.Add (labelWidget); + box.PackStart (alignLabel, true, true, 0); } else { labelWidget = null; } @@ -187,14 +219,12 @@ namespace MonoDevelop.Components.Docking }; btnClose.ButtonPressEvent += (o, args) => args.RetVal = true; - Gtk.Alignment al = new Alignment (0, 0, 1, 1); - HBox btnBox = new HBox (false, 3); - btnBox.PackStart (btnDock, false, false, 0); - btnBox.PackStart (btnClose, false, false, 0); + Gtk.Alignment al = new Alignment (0, 0.5f, 1, 1); + HBox btnBox = new HBox (false, 0); + btnBox.PackStart (btnDock, false, false, 3); + btnBox.PackStart (btnClose, false, false, 1); al.Add (btnBox); - al.LeftPadding = 3; - al.TopPadding = 1; - box.PackEnd (al, false, false, 0); + box.PackEnd (al, false, false, 3); Add (box); @@ -226,7 +256,8 @@ namespace MonoDevelop.Components.Docking set { if (active != value) { active = value; - this.QueueResize (); + UpdateVisualStyle (); + QueueResize (); QueueDraw (); UpdateBehavior (); } @@ -367,11 +398,11 @@ namespace MonoDevelop.Components.Docking { if (Child != null) { req = Child.SizeRequest (); - req.Width += LeftPadding + RightPadding; + req.Width += (int)(TabPadding.Left + TabPadding.Right); if (active) - req.Height += TopPaddingActive + BottomPaddingActive; + req.Height += (int)(TabActivePadding.Top + TabActivePadding.Bottom); else - req.Height += TopPadding + BottomPadding; + req.Height += (int)(TabPadding.Top + TabPadding.Bottom); } } @@ -379,8 +410,8 @@ namespace MonoDevelop.Components.Docking { base.OnSizeAllocated (rect); - int leftPadding = LeftPadding; - int rightPadding = RightPadding; + int leftPadding = (int)TabPadding.Left; + int rightPadding = (int)TabPadding.Right; if (rect.Width < labelWidth) { int red = (labelWidth - rect.Width) / 2; leftPadding -= red; @@ -393,14 +424,12 @@ namespace MonoDevelop.Components.Docking rect.Width -= leftPadding + rightPadding; if (Child != null) { - if (active) { - rect.Y += TopPaddingActive; - rect.Height = Child.SizeRequest ().Height; - } - else { - rect.Y += TopPadding; - rect.Height = Child.SizeRequest ().Height; - } + var bottomPadding = active ? (int)TabActivePadding.Bottom : (int)TabPadding.Bottom; + var topPadding = active ? (int)TabActivePadding.Top : (int)TabPadding.Top; + int centerY = topPadding + ((rect.Height - bottomPadding - topPadding) / 2); + var height = Child.SizeRequest ().Height; + rect.Y += centerY - (height / 2); + rect.Height = height; Child.SizeAllocate (rect); } } @@ -416,12 +445,6 @@ namespace MonoDevelop.Components.Docking void DrawAsBrowser (Gdk.EventExpose evnt) { - var alloc = Allocation; - - Gdk.GC bgc = new Gdk.GC (GdkWindow); - var c = VisualStyle.PadBackgroundColor.Value; - c.Light *= 0.7; - bgc.RgbFgColor = c.ToGdkColor (); bool first = true; bool last = true; TabStrip tabStrip = null; @@ -433,24 +456,18 @@ namespace MonoDevelop.Components.Docking tabStrip = tsb.TabStrip; } - if (Active || (first && last)) { - Gdk.GC gc = new Gdk.GC (GdkWindow); - gc.RgbFgColor = VisualStyle.PadBackgroundColor.Value.ToGdkColor (); - evnt.Window.DrawRectangle (gc, true, alloc); - if (!first) - evnt.Window.DrawLine (bgc, alloc.X, alloc.Y, alloc.X, alloc.Y + alloc.Height - 1); - if (!(last && first) && !(tabStrip != null && tabStrip.VisualStyle.ExpandedTabs.Value && last)) - evnt.Window.DrawLine (bgc, alloc.X + alloc.Width - 1, alloc.Y, alloc.X + alloc.Width - 1, alloc.Y + alloc.Height - 1); - gc.Dispose (); + using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) { + if (first && last) { + ctx.Rectangle (Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height); + ctx.SetSourceColor (VisualStyle.PadBackgroundColor.Value.ToCairoColor ()); + ctx.Fill (); + } else { + var image = Active ? dockTabActiveBackImage : dockTabBackImage; + image = image.WithSize (Allocation.Width, Allocation.Height); - } else { - Gdk.GC gc = new Gdk.GC (GdkWindow); - gc.RgbFgColor = tabStrip != null ? tabStrip.VisualStyle.InactivePadBackgroundColor.Value.ToGdkColor () : frame.DefaultVisualStyle.InactivePadBackgroundColor.Value.ToGdkColor (); - evnt.Window.DrawRectangle (gc, true, alloc); - gc.Dispose (); - evnt.Window.DrawLine (bgc, alloc.X, alloc.Y + alloc.Height - 1, alloc.X + alloc.Width - 1, alloc.Y + alloc.Height - 1); + ctx.DrawImage (this, image, Allocation.X, Allocation.Y); + } } - bgc.Dispose (); } void DrawNormal (Gdk.EventExpose evnt) @@ -460,30 +477,12 @@ namespace MonoDevelop.Components.Docking var y = Allocation.Y; ctx.Rectangle (x, y + 1, Allocation.Width, Allocation.Height - 1); - using (var g = new Cairo.LinearGradient (x, y + 1, x, y + Allocation.Height - 1)) { - g.AddColorStop (0, Styles.DockTabBarGradientStart); - g.AddColorStop (1, Styles.DockTabBarGradientEnd); - ctx.SetSource (g); - ctx.Fill (); - } - - ctx.MoveTo (x + 0.5, y + 0.5); - ctx.LineTo (x + Allocation.Width - 0.5d, y + 0.5); - ctx.SetSourceColor (Styles.DockTabBarGradientTop); - ctx.Stroke (); + ctx.SetSourceColor (Styles.DockBarBackground.ToCairoColor ()); + ctx.Fill (); + /* if (active) { - - ctx.Rectangle (x, y + 1, Allocation.Width, Allocation.Height - 1); - using (var g = new Cairo.LinearGradient (x, y + 1, x, y + Allocation.Height - 1)) { - g.AddColorStop (0, new Cairo.Color (0, 0, 0, 0.01)); - g.AddColorStop (0.5, new Cairo.Color (0, 0, 0, 0.08)); - g.AddColorStop (1, new Cairo.Color (0, 0, 0, 0.01)); - ctx.SetSource (g); - ctx.Fill (); - } - -/* double offset = Allocation.Height * 0.25; + double offset = Allocation.Height * 0.25; var rect = new Cairo.Rectangle (x - Allocation.Height + offset, y, Allocation.Height, Allocation.Height); var cg = new Cairo.RadialGradient (rect.X + rect.Width / 2, rect.Y + rect.Height / 2, 0, rect.X, rect.Y + rect.Height / 2, rect.Height / 2); cg.AddColorStop (0, Styles.DockTabBarShadowGradientStart); @@ -498,8 +497,9 @@ namespace MonoDevelop.Components.Docking cg.AddColorStop (1, Styles.DockTabBarShadowGradientEnd); ctx.Pattern = cg; ctx.Rectangle (rect); - ctx.Fill ();*/ + ctx.Fill (); } + */ } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemToolbar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemToolbar.cs index e5babfbcc0..5908aa86e0 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemToolbar.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItemToolbar.cs @@ -179,8 +179,8 @@ namespace MonoDevelop.Components.Docking public class DockToolButton : Control { - public DockToolButtonImage Image { - get { return (Gtk.Image)button.Image; } + public ImageView Image { + get { return (ImageView)button.Image; } set { button.Image = value; } } @@ -204,8 +204,9 @@ namespace MonoDevelop.Components.Docking { button = new Button (); Label = label; - Image = new Gtk.Image (stockId, IconSize.Menu); - button.Image.Show (); + + Image = new ImageView (stockId, IconSize.Menu); + Image.Show (); } protected override object CreateNativeWidget<T> () @@ -224,8 +225,8 @@ namespace MonoDevelop.Components.Docking public class DockToolButtonImage : Control { - Gtk.Image image; - internal DockToolButtonImage (Gtk.Image image) + ImageView image; + internal DockToolButtonImage (ImageView image) { this.image = image; } @@ -240,7 +241,7 @@ namespace MonoDevelop.Components.Docking return d.GetNativeWidget<Gtk.Widget> (); } - public static implicit operator DockToolButtonImage (Gtk.Image d) + public static implicit operator DockToolButtonImage (ImageView d) { return new DockToolButtonImage (d); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockVisualStyle.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockVisualStyle.cs index 79bece8eb1..d69bef84d7 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockVisualStyle.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockVisualStyle.cs @@ -31,6 +31,7 @@ namespace MonoDevelop.Components.Docking { public Xwt.Drawing.Color? PadBackgroundColor { get; set; } public Xwt.Drawing.Color? PadTitleLabelColor { get; set; } + public Xwt.Drawing.Color? InactivePadTitleLabelColor { get; set; } public DockTabStyle? TabStyle { get; set; } public Xwt.Drawing.Color? TreeBackgroundColor { get; set; } public bool? ShowPadTitleIcon { get; set; } @@ -60,6 +61,8 @@ namespace MonoDevelop.Components.Docking PadBackgroundColor = style.PadBackgroundColor; if (style.PadTitleLabelColor != null) PadTitleLabelColor = style.PadTitleLabelColor; + if (style.InactivePadTitleLabelColor != null) + InactivePadTitleLabelColor = style.InactivePadTitleLabelColor; if (style.TabStyle != null) TabStyle = style.TabStyle; if (style.TreeBackgroundColor != null) @@ -85,6 +88,7 @@ namespace MonoDevelop.Components.Docking DockVisualStyle s = new DockVisualStyle (); s.PadBackgroundColor = new Xwt.Drawing.Color (0,0,0); s.PadTitleLabelColor = new Xwt.Drawing.Color (0,0,0); + s.InactivePadTitleLabelColor = new Xwt.Drawing.Color (0,0,0); s.TabStyle = DockTabStyle.Normal; s.TreeBackgroundColor = null; s.ShowPadTitleIcon = true; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs index 3609358c4d..e2d758f363 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs @@ -139,6 +139,14 @@ namespace MonoDevelop.Components.Docking } } } + + internal DockItemTitleTab CurrentTitleTab { + get { + if (currentTab != -1) + return (DockItemTitleTab)box.Children [currentTab]; + return null; + } + } new public Gtk.Widget CurrentPage { get { @@ -269,22 +277,14 @@ namespace MonoDevelop.Components.Docking internal class TabStripBox: HBox { public TabStrip TabStrip; + static Xwt.Drawing.Image tabbarBackImage = Xwt.Drawing.Image.FromResource ("tabbar-back.9.png"); protected override bool OnExposeEvent (Gdk.EventExpose evnt) { if (TabStrip.VisualStyle.TabStyle == DockTabStyle.Normal) { - var alloc = Allocation; - Gdk.GC gc = new Gdk.GC (GdkWindow); - gc.RgbFgColor = TabStrip.VisualStyle.InactivePadBackgroundColor.Value.ToGdkColor (); - evnt.Window.DrawRectangle (gc, true, alloc); - gc.Dispose (); - - Gdk.GC bgc = new Gdk.GC (GdkWindow); - var c = TabStrip.VisualStyle.PadBackgroundColor.Value; - c.Light *= 0.7; - bgc.RgbFgColor = c.ToGdkColor (); - evnt.Window.DrawLine (bgc, alloc.X, alloc.Y + alloc.Height - 1, alloc.X + alloc.Width - 1, alloc.Y + alloc.Height - 1); - bgc.Dispose (); + using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) { + ctx.DrawImage (this, tabbarBackImage.WithSize (Allocation.Width, Allocation.Height), 0, 0); + } } return base.OnExposeEvent (evnt); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-close-9.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-close-9.png Binary files differindex 9714a9af82..13e13896ae 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-close-9.png +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-close-9.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-close-9@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-close-9@2x.png Binary files differindex ecb78f9522..b33f4ca909 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-close-9@2x.png +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-close-9@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-close-9~dark.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-close-9~dark.png Binary files differnew file mode 100644 index 0000000000..f3fadb1ad9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-close-9~dark.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-close-9~dark@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-close-9~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d27ac42628 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-close-9~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-dock-9.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-dock-9.png Binary files differindex 56aece42f4..b2b9338e08 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-dock-9.png +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-dock-9.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-dock-9@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-dock-9@2x.png Binary files differindex 88706d902d..094949add8 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-dock-9@2x.png +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-dock-9@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-dock-9~dark.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-dock-9~dark.png Binary files differnew file mode 100644 index 0000000000..100ce40fd6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-dock-9~dark.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-dock-9~dark@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-dock-9~dark@2x.png Binary files differnew file mode 100644 index 0000000000..4f31e73a26 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-dock-9~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-minimize-9.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-minimize-9.png Binary files differindex fbbef55ef7..b3fcafdabf 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-minimize-9.png +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-minimize-9.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-minimize-9@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-minimize-9@2x.png Binary files differindex 99dc4978e6..e1a710cc5e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-minimize-9@2x.png +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-minimize-9@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-minimize-9~dark.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-minimize-9~dark.png Binary files differnew file mode 100644 index 0000000000..618f04a433 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-minimize-9~dark.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-minimize-9~dark@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-minimize-9~dark@2x.png Binary files differnew file mode 100644 index 0000000000..4bc9ff7701 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/icons/pad-minimize-9~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/IExtendedTitleBarDialogBackend.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/IExtendedTitleBarDialogBackend.cs index 8818409edd..7fdb8a317f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/IExtendedTitleBarDialogBackend.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/IExtendedTitleBarDialogBackend.cs @@ -34,7 +34,7 @@ namespace MonoDevelop.Components.Extensions void SetHeaderContent (IWidgetBackend backend); } - class GtkExtendedTitleBarDialogBackend: DialogBackend, IExtendedTitleBarDialogBackend + class GtkExtendedTitleBarDialogBackend: ThemedGtkDialogBackend, IExtendedTitleBarDialogBackend { HeaderBox toolbar; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/IExtendedTitleBarWindowBackend.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/IExtendedTitleBarWindowBackend.cs index 316b133285..dda0af1d64 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/IExtendedTitleBarWindowBackend.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/IExtendedTitleBarWindowBackend.cs @@ -34,7 +34,7 @@ namespace MonoDevelop.Components.Extensions void SetHeaderContent (IWidgetBackend backend); } - class GtkExtendedTitleBarWindowBackend: WindowBackend, IExtendedTitleBarWindowBackend + class GtkExtendedTitleBarWindowBackend: ThemedGtkWindowBackend, IExtendedTitleBarWindowBackend { HeaderBox toolbar; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs index 711c07c15d..d0bfc5b028 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs @@ -355,14 +355,8 @@ namespace MonoDevelop.Components.MainToolbar } context.MoveTo (0, Allocation.Height - 0.5); context.RelLineTo (Allocation.Width, 0); - context.SetSourceColor (Styles.ToolbarBottomBorderColor); + context.SetSourceColor (Styles.ToolbarBottomBorderColor.ToCairoColor ()); context.Stroke (); - - context.MoveTo (0, Allocation.Height - 1.5); - context.RelLineTo (Allocation.Width, 0); - context.SetSourceColor (Styles.ToolbarBottomGlowColor); - context.Stroke (); - } return base.OnExposeEvent (evnt); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ResultsDataSource.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ResultsDataSource.cs index bffa3c343e..5812694d83 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ResultsDataSource.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/ResultsDataSource.cs @@ -123,7 +123,7 @@ namespace MonoDevelop.Components.MainToolbar { if (isSelected) return GLib.Markup.EscapeText (this [item].PlainText); - return this [item].GetMarkupText (); + return this [item].GetMarkupText (isSelected); } string ISearchDataSource.GetDescriptionMarkup (int item, bool isSelected) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchInSolutionSearchCategory.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchInSolutionSearchCategory.cs index c882f1f992..c4a1afe7e9 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchInSolutionSearchCategory.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchInSolutionSearchCategory.cs @@ -93,7 +93,7 @@ namespace MonoDevelop.Components.MainToolbar FindInFilesDialog.SearchReplace (pattern.Pattern, null, new WholeSolutionScope (), options, null); } - public override string GetMarkupText () + public override string GetMarkupText (bool selected) { return GettextCatalog.GetString ("Search in Solution..."); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs index affe92ebfd..f18bdb998f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs @@ -43,11 +43,12 @@ namespace MonoDevelop.Components.MainToolbar { const int yMargin = 0; const int xMargin = 6; - const int itemSeparatorHeight = 2; + const int itemSeparatorHeight = 0; const int marginIconSpacing = 4; const int iconTextSpacing = 6; const int categorySeparatorHeight = 8; const int headerMarginSize = 100; + const int itemPadding = 4; List<SearchCategory> categories = new List<SearchCategory> (); List<Tuple<SearchCategory, IReadOnlyList<SearchResult>>> results = new List<Tuple<SearchCategory, IReadOnlyList<SearchResult>>> (); @@ -111,11 +112,11 @@ namespace MonoDevelop.Components.MainToolbar } public SearchPopupWindow () { - headerColor = CairoExtensions.ParseColor ("8c8c8c"); - separatorLine = CairoExtensions.ParseColor ("dedede"); - lightSearchBackground = CairoExtensions.ParseColor ("ffffff"); - darkSearchBackground = CairoExtensions.ParseColor ("f7f7f7"); - selectionBackgroundColor = CairoExtensions.ParseColor ("cccccc"); + headerColor = Styles.GlobalSearch.HeaderTextColor.ToCairoColor (); + separatorLine = Styles.GlobalSearch.SeparatorLineColor.ToCairoColor (); + lightSearchBackground = Styles.GlobalSearch.HeaderBackgroundColor.ToCairoColor (); + darkSearchBackground = Styles.GlobalSearch.BackgroundColor.ToCairoColor (); + selectionBackgroundColor = Styles.GlobalSearch.SelectionBackgroundColor.ToCairoColor (); TypeHint = Gdk.WindowTypeHint.Combo; this.SkipTaskbarHint = true; this.SkipPagerHint = true; @@ -157,6 +158,7 @@ namespace MonoDevelop.Components.MainToolbar HideTooltip (); this.declarationviewwindow.Destroy (); selectedItem = topItem = null; + currentTooltip = null; base.OnDestroyed (); } @@ -282,22 +284,22 @@ namespace MonoDevelop.Components.MainToolbar col.Task = cat.GetResults (col, pattern, token); } - Task.WhenAll (collectors.Select (c => c.Task)).ContinueWith (t => {
+ Task.WhenAll (collectors.Select (c => c.Task)).ContinueWith (t => { Application.Invoke (delegate { - if (token.IsCancellationRequested)
+ if (token.IsCancellationRequested) return; - var newResults = new List<Tuple<SearchCategory, IReadOnlyList<SearchResult>>> (collectors.Count);
- foreach (var col in collectors) {
- if (col.Task.IsCanceled) {
- continue;
+ var newResults = new List<Tuple<SearchCategory, IReadOnlyList<SearchResult>>> (collectors.Count); + foreach (var col in collectors) { + if (col.Task.IsCanceled) { + continue; } else if (col.Task.IsFaulted) { - LoggingService.LogError ($"Error getting search results for {col.Category}", col.Task.Exception);
- } else {
- newResults.Add (Tuple.Create (col.Category, col.Results));
- }
+ LoggingService.LogError ($"Error getting search results for {col.Category}", col.Task.Exception); + } else { + newResults.Add (Tuple.Create (col.Category, col.Results)); + } } - ShowResults (newResults);
- isInSearch = false;
+ ShowResults (newResults); + isInSearch = false; AnimatedResize (); }); }, token); @@ -352,9 +354,9 @@ namespace MonoDevelop.Components.MainToolbar layout.SetMarkup (GetRowMarkup (dataSrc[i])); int w, h; layout.GetPixelSize (out w, out h); - if (y + h + itemSeparatorHeight > maxHeight) + if (y + h + itemSeparatorHeight + itemPadding * 2 > maxHeight) break; - y += h + itemSeparatorHeight; + y += h + itemSeparatorHeight + itemPadding * 2; calculatedItems++; } } @@ -363,7 +365,7 @@ namespace MonoDevelop.Components.MainToolbar layout.SetMarkup (GettextCatalog.GetString ("No matches")); int w, h; layout.GetPixelSize (out w, out h); - var realHeight = h + itemSeparatorHeight + 4; + var realHeight = h + itemSeparatorHeight + 4 + itemPadding * 2; y += realHeight; } else { y -= itemSeparatorHeight; @@ -396,7 +398,7 @@ namespace MonoDevelop.Components.MainToolbar layout.SetMarkup (GetRowMarkup (topItem.DataSource[topItem.Item])); int w, h; layout.GetPixelSize (out w, out h); - y += h + itemSeparatorHeight; + y += h + itemSeparatorHeight + itemPadding * 2; if (y > py) return new ItemIdentifier (topItem.Category, topItem.DataSource, topItem.Item); } @@ -411,7 +413,7 @@ namespace MonoDevelop.Components.MainToolbar int w, h; layout.GetPixelSize (out w, out h); - y += h + itemSeparatorHeight; + y += h + itemSeparatorHeight + itemPadding * 2; if (y > py){ return new ItemIdentifier (category, dataSrc, i); } @@ -572,25 +574,12 @@ namespace MonoDevelop.Components.MainToolbar } TooltipInformationWindow declarationviewwindow = new TooltipInformationWindow (); - uint declarationViewTimer, declarationViewWindowOpacityTimer; - void RemoveDeclarationViewTimer () - { - if (declarationViewWindowOpacityTimer != 0) { - GLib.Source.Remove (declarationViewWindowOpacityTimer); - declarationViewWindowOpacityTimer = 0; - } - if (declarationViewTimer != 0) { - GLib.Source.Remove (declarationViewTimer); - declarationViewTimer = 0; - } - } + TooltipInformation currentTooltip; void HideTooltip () { - RemoveDeclarationViewTimer (); if (declarationviewwindow != null) { declarationviewwindow.Hide (); - declarationviewwindow.Opacity = 0; } if (tooltipSrc != null) tooltipSrc.Cancel (); @@ -599,10 +588,11 @@ namespace MonoDevelop.Components.MainToolbar CancellationTokenSource tooltipSrc = null; async void ShowTooltip () { - HideTooltip (); var currentSelectedItem = selectedItem; - if (currentSelectedItem == null || currentSelectedItem.DataSource == null) + if (currentSelectedItem == null || currentSelectedItem.DataSource == null) { + HideTooltip (); return; + } var i = currentSelectedItem.Item; if (i < 0 || i >= currentSelectedItem.DataSource.Count) return; @@ -612,64 +602,29 @@ namespace MonoDevelop.Components.MainToolbar tooltipSrc = new CancellationTokenSource (); var token = tooltipSrc.Token; - TooltipInformation tooltip; try { - tooltip = await currentSelectedItem.DataSource [i].GetTooltipInformation (token); + currentTooltip = await currentSelectedItem.DataSource [i].GetTooltipInformation (token); } catch (OperationCanceledException) { + HideTooltip (); return; } catch (Exception e) { LoggingService.LogError ("Error while creating search popup window tooltip", e); + HideTooltip (); return; } - if (tooltip == null || string.IsNullOrEmpty (tooltip.SignatureMarkup) || token.IsCancellationRequested) + if (currentTooltip == null || string.IsNullOrEmpty (currentTooltip.SignatureMarkup) || token.IsCancellationRequested) { + HideTooltip (); return; + } + declarationviewwindow.Clear (); - declarationviewwindow.AddOverload (tooltip); + declarationviewwindow.AddOverload (currentTooltip); declarationviewwindow.CurrentOverload = 0; - declarationViewTimer = GLib.Timeout.Add (250, DelayedTooltipShow); - } - - bool DelayedTooltipShow () - { declarationviewwindow.ShowArrow = true; var rect = SelectedItemRectangle; - - declarationviewwindow.ShowPopup (this, new Gdk.Rectangle (0, (int)rect.Y, Allocation.Width, (int)rect.Height), PopupPosition.Right); - if (declarationViewWindowOpacityTimer != 0) - GLib.Source.Remove (declarationViewWindowOpacityTimer); - declarationViewWindowOpacityTimer = GLib.Timeout.Add (50, new OpacityTimer (this).Timer); - declarationViewTimer = 0; - return false; + declarationviewwindow.ShowPopup (this, new Gdk.Rectangle (0, (int)rect.Y - 5, Allocation.Width, (int)rect.Height), PopupPosition.Right); } - class OpacityTimer - { - public double Opacity { get; private set; } - - SearchPopupWindow window; - // static int num = 0; - // int id; - public OpacityTimer (SearchPopupWindow window) - { - // id = num++; - this.window = window; - Opacity = 0.0; - window.declarationviewwindow.Opacity = Opacity; - } - - public bool Timer () - { - Opacity = System.Math.Min (1.0, Opacity + 0.33); - window.declarationviewwindow.Opacity = Opacity; - bool result = Math.Round (Opacity * 10.0) < 10; - if (!result) - window.declarationViewWindowOpacityTimer = 0; - return result; - } - } - - - void SelectNextCategory () { if (selectedItem == null) @@ -709,6 +664,7 @@ namespace MonoDevelop.Components.MainToolbar ); } } + ShowTooltip (); QueueDraw (); } @@ -741,12 +697,14 @@ namespace MonoDevelop.Components.MainToolbar } else { selectedItem = topItem; } + ShowTooltip (); QueueDraw (); } void SelectFirstCategory () { selectedItem = topItem; + ShowTooltip (); QueueDraw (); } @@ -760,6 +718,7 @@ namespace MonoDevelop.Components.MainToolbar r.Item2, r.Item2.Count - 1 ); + ShowTooltip (); QueueDraw (); } @@ -872,8 +831,8 @@ namespace MonoDevelop.Components.MainToolbar int w, h; layout.GetPixelSize (out w, out h); if (topItem.Category == selectedItem.Category && topItem.Item == selectedItem.Item) - return new Cairo.Rectangle (0, y, Allocation.Width, h + itemSeparatorHeight); - y += h + itemSeparatorHeight; + return new Cairo.Rectangle (0, y, Allocation.Width, h + itemSeparatorHeight + itemPadding * 2); + y += h + itemSeparatorHeight + itemPadding * 2; } foreach (var result in results) { var category = result.Item1; @@ -888,8 +847,8 @@ namespace MonoDevelop.Components.MainToolbar layout.GetPixelSize (out w, out h); if (selectedItem.Category == category && selectedItem.DataSource == dataSrc && selectedItem.Item == i) - return new Cairo.Rectangle (0, y, Allocation.Width, h + itemSeparatorHeight); - y += h + itemSeparatorHeight; + return new Cairo.Rectangle (0, y, Allocation.Width, h + itemSeparatorHeight + itemPadding * 2); + y += h + itemSeparatorHeight + itemPadding * 2; // var region = dataSrc.GetRegion (i); // if (!region.IsEmpty) { @@ -927,7 +886,7 @@ namespace MonoDevelop.Components.MainToolbar context.SetSourceColor (separatorLine); context.Stroke (); } else { - context.SetSourceRGB (1, 1, 1); + context.SetSourceColor (darkSearchBackground); context.Rectangle (Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height); context.Fill (); } @@ -937,36 +896,39 @@ namespace MonoDevelop.Components.MainToolbar if (topItem != null) { headerLayout.SetText (GettextCatalog.GetString ("Top Result")); headerLayout.GetPixelSize (out w, out h); - context.MoveTo (alloc.Left + headerMarginSize - w - xMargin, y); + context.MoveTo (alloc.Left + headerMarginSize - w - xMargin, y + itemPadding); context.SetSourceColor (headerColor); Pango.CairoHelper.ShowLayout (context, headerLayout); var category = topItem.Category; var dataSrc = topItem.DataSource; var i = topItem.Item; + var isSelected = selectedItem != null && selectedItem.Category == category && selectedItem.Item == i; double x = alloc.X + xMargin + headerMarginSize; context.SetSourceRGB (0, 0, 0); - layout.SetMarkup (GetRowMarkup (dataSrc[i])); + layout.SetMarkup (GetRowMarkup (dataSrc[i], isSelected)); layout.GetPixelSize (out w, out h); - if (selectedItem != null && selectedItem.Category == category && selectedItem.Item == i) { + if (isSelected) { context.SetSourceColor (selectionBackgroundColor); - context.Rectangle (alloc.X + headerMarginSize, y, Allocation.Width - adjustedMarginSize, h); + context.Rectangle (alloc.X + headerMarginSize + 1, y, Allocation.Width - adjustedMarginSize - 1, h + itemPadding * 2); context.Fill (); context.SetSourceRGB (1, 1, 1); } var px = dataSrc[i].Icon; if (px != null) { - context.DrawImage (this, px, (int)x + marginIconSpacing, (int)y + (h - px.Height) / 2); + if (isSelected) + px = px.WithStyles ("sel"); + context.DrawImage (this, px, (int)x + marginIconSpacing, (int)(y + itemPadding)); x += px.Width + iconTextSpacing + marginIconSpacing; } - context.MoveTo (x, y); + context.MoveTo (x, y + itemPadding); context.SetSourceRGB (0, 0, 0); Pango.CairoHelper.ShowLayout (context, layout); - y += h + itemSeparatorHeight; + y += h + itemSeparatorHeight + itemPadding * 2; } @@ -980,10 +942,10 @@ namespace MonoDevelop.Components.MainToolbar headerLayout.SetText (category.Name); headerLayout.GetPixelSize (out w, out h); - if (y + h > Allocation.Height) + if (y + h + itemPadding * 2 > Allocation.Height) break; - context.MoveTo (alloc.X + headerMarginSize - w - xMargin, y); + context.MoveTo (alloc.X + headerMarginSize - w - xMargin, y + itemPadding); context.SetSourceColor (headerColor); Pango.CairoHelper.ShowLayout (context, headerLayout); @@ -992,49 +954,54 @@ namespace MonoDevelop.Components.MainToolbar for (int i = 0; i < maxItems && i < dataSrc.Count; i++) { if (topItem != null && topItem.Category == category && topItem.Item == i) continue; + var isSelected = selectedItem != null && selectedItem.Category == category && selectedItem.Item == i; double x = alloc.X + xMargin + headerMarginSize; context.SetSourceRGB (0, 0, 0); - layout.SetMarkup (GetRowMarkup (dataSrc[i])); + layout.SetMarkup (GetRowMarkup (dataSrc[i], isSelected)); layout.GetPixelSize (out w, out h); - if (y + h + itemSeparatorHeight > Allocation.Height) + if (y + h + itemSeparatorHeight + itemPadding * 2 > Allocation.Height) break; - if (selectedItem != null && selectedItem.Category == category && selectedItem.Item == i) { + if (isSelected) { context.SetSourceColor (selectionBackgroundColor); - context.Rectangle (alloc.X + headerMarginSize, y, Allocation.Width - adjustedMarginSize, h); + context.Rectangle (alloc.X + headerMarginSize + 1, y, Allocation.Width - adjustedMarginSize - 1, h + itemPadding * 2); context.Fill (); context.SetSourceRGB (1, 1, 1); } var px = dataSrc[i].Icon; if (px != null) { - context.DrawImage (this, px, (int)x + marginIconSpacing, (int)y + (h - px.Height) / 2); + if (isSelected) + px = px.WithStyles ("sel"); + context.DrawImage (this, px, (int)x + marginIconSpacing, (int)(y + itemPadding)); x += px.Width + iconTextSpacing + marginIconSpacing; } - context.MoveTo (x, y); + context.MoveTo (x, y + itemPadding); context.SetSourceRGB (0, 0, 0); Pango.CairoHelper.ShowLayout (context, layout); - y += h + itemSeparatorHeight; + y += h + itemSeparatorHeight + itemPadding * 2; } if (result != r.Last ()) { y += categorySeparatorHeight; } } if (y == alloc.Y + yMargin) { - context.SetSourceRGB (0, 0, 0); + context.SetSourceColor (Styles.GlobalSearch.ResultTextColor.ToCairoColor ()); layout.SetMarkup (isInSearch ? GettextCatalog.GetString ("Searching...") : GettextCatalog.GetString ("No matches")); context.MoveTo (alloc.X + xMargin, y); Pango.CairoHelper.ShowLayout (context, layout); } } - string GetRowMarkup (SearchResult result) + string GetRowMarkup (SearchResult result, bool selected = false) { - string txt = "<span foreground=\"#606060\">" + result.GetMarkupText() +"</span>"; + var resultFgColor = selected ? Styles.GlobalSearch.SelectedResultTextColor : Styles.GlobalSearch.ResultTextColor; + var descFgColor = selected ? Styles.GlobalSearch.SelectedResultDescriptionTextColor : Styles.GlobalSearch.ResultDescriptionTextColor; + string txt = "<span foreground=\"" + Styles.ColorGetHex (resultFgColor) + "\">" + result.GetMarkupText(selected) +"</span>"; string desc = result.GetDescriptionMarkupText (); if (!string.IsNullOrEmpty (desc)) - txt += "<span foreground=\"#8F8F8F\" size=\"small\">\n" + desc + "</span>"; + txt += "<span foreground=\"" + Styles.ColorGetHex (descFgColor) + "\" size=\"small\">\n" + desc + "</span>"; return txt; } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs index f18845e6ed..fdab266827 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchResult.cs @@ -39,6 +39,7 @@ using Microsoft.CodeAnalysis; using System.Linq; using System.Threading; using System.Threading.Tasks; +using MonoDevelop.Ide.Gui; namespace MonoDevelop.Components.MainToolbar { @@ -55,9 +56,9 @@ namespace MonoDevelop.Components.MainToolbar { protected string match; - public virtual string GetMarkupText () + public virtual string GetMarkupText (bool selected) { - return HighlightMatch (PlainText, match); + return HighlightMatch (PlainText, match, selected); } public virtual string GetDescriptionMarkupText () @@ -99,7 +100,7 @@ namespace MonoDevelop.Components.MainToolbar Rank = rank; } - protected static string HighlightMatch (string text, string toMatch) + protected static string HighlightMatch (string text, string toMatch, bool selected) { var lane = StringMatcher.GetMatcher (toMatch, true).GetMatch (text); StringBuilder result = new StringBuilder (); @@ -109,7 +110,8 @@ namespace MonoDevelop.Components.MainToolbar int pos = lane[n]; if (pos - lastPos > 0) MarkupUtilities.AppendEscapedString (result, text.Substring (lastPos, pos - lastPos)); - result.Append ("<span foreground=\"#4d4d4d\" font_weight=\"bold\">"); + var matchColor = selected ? Styles.GlobalSearch.SelectedResultMatchTextColor : Styles.GlobalSearch.ResultMatchTextColor; + result.Append ("<span foreground=\"" + Styles.ColorGetHex (matchColor) + "\" font_weight=\"bold\">"); MarkupUtilities.AppendEscapedString (result, text[pos].ToString ()); result.Append ("</span>"); lastPos = pos + 1; @@ -237,9 +239,9 @@ namespace MonoDevelop.Components.MainToolbar } } - public override string GetMarkupText () + public override string GetMarkupText (bool selected) { - return HighlightMatch (MatchedString, match); + return HighlightMatch (MatchedString, match, selected); } public override bool CanActivate { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs index d44c745af4..774ef4cbb8 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusArea.cs @@ -323,7 +323,7 @@ namespace MonoDevelop.Components.MainToolbar } - using (var font = FontService.SansFont.CopyModified (0.8d)) { + using (var font = FontService.SansFont.CopyModified (MonoDevelop.Ide.Gui.Styles.FontScale11)) { errors.Visible = ec > 0; errors.ModifyFont (font); errors.Text = ec.ToString (); @@ -865,6 +865,8 @@ namespace MonoDevelop.Components.MainToolbar var alloc = Allocation; //alloc.Inflate (0, -2); ctx.Rectangle (alloc.X, alloc.Y, 1, alloc.Height); + + // FIXME: VV: Remove gradient features using (Cairo.LinearGradient gr = new LinearGradient (alloc.X, alloc.Y, alloc.X, alloc.Y + alloc.Height)) { gr.AddColorStop (0, new Cairo.Color (0, 0, 0, 0)); gr.AddColorStop (0.5, new Cairo.Color (0, 0, 0, 0.2)); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusAreaTheme.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusAreaTheme.cs index 2434d1b7df..45da0b1667 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusAreaTheme.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/StatusAreaTheme.cs @@ -77,9 +77,11 @@ namespace MonoDevelop.Components.MainToolbar context.Clip (); int x1 = arg.Allocation.X + arg.MousePosition.X - 200; int x2 = x1 + 400; + + // FIXME: VV: Remove gradient features using (Cairo.LinearGradient gradient = new LinearGradient (x1, 0, x2, 0)) { - Cairo.Color targetColor = Styles.StatusBarFill1Color; + Cairo.Color targetColor = Styles.StatusBarFill1Color.ToCairoColor (); Cairo.Color transparentColor = targetColor; targetColor.A = .7; transparentColor.A = 0; @@ -201,12 +203,12 @@ namespace MonoDevelop.Components.MainToolbar { LayoutRoundedRectangle (context, region, -1, -1); context.LineWidth = 1; - context.SetSourceColor (Styles.StatusBarInnerColor); + context.SetSourceColor (Styles.StatusBarInnerColor.ToCairoColor ()); context.Stroke (); LayoutRoundedRectangle (context, region); context.LineWidth = 1; - context.SetSourceColor (Styles.StatusBarBorderColor); + context.SetSourceColor (Styles.StatusBarBorderColor.ToCairoColor ()); context.StrokePreserve (); } @@ -216,8 +218,8 @@ namespace MonoDevelop.Components.MainToolbar context.ClipPreserve (); using (LinearGradient lg = new LinearGradient (region.X, region.Y, region.X, region.Y + region.Height)) { - lg.AddColorStop (0, Styles.StatusBarFill1Color); - lg.AddColorStop (1, Styles.StatusBarFill4Color); + lg.AddColorStop (0, Styles.StatusBarFill1Color.ToCairoColor ()); + lg.AddColorStop (1, Styles.StatusBarFill4Color.ToCairoColor ()); context.SetSource (lg); context.FillPreserve (); @@ -229,8 +231,8 @@ namespace MonoDevelop.Components.MainToolbar context.Translate (midX, midY); using (RadialGradient rg = new RadialGradient (0, 0, 0, 0, 0, region.Height * 1.2)) { - rg.AddColorStop (0, Styles.StatusBarFill1Color); - rg.AddColorStop (1, Styles.WithAlpha (Styles.StatusBarFill1Color, 0)); + rg.AddColorStop (0, Styles.StatusBarFill1Color.ToCairoColor ()); + rg.AddColorStop (1, Styles.StatusBarFill1Color.WithAlpha (0).ToCairoColor ()); context.Scale (region.Width / (double)region.Height, 1.0); context.SetSource (rg); @@ -239,8 +241,8 @@ namespace MonoDevelop.Components.MainToolbar context.Restore (); using (LinearGradient lg = new LinearGradient (0, region.Y, 0, region.Y + region.Height)) { - lg.AddColorStop (0, Styles.StatusBarShadowColor1); - lg.AddColorStop (1, Styles.WithAlpha (Styles.StatusBarShadowColor1, Styles.StatusBarShadowColor1.A * 0.2)); + lg.AddColorStop (0, Styles.StatusBarShadowColor1.ToCairoColor ()); + lg.AddColorStop (1, Styles.StatusBarShadowColor1.WithAlpha (Styles.StatusBarShadowColor1.Alpha * 0.2).ToCairoColor ()); LayoutRoundedRectangle (context, region, 0, -1); context.LineWidth = 1; @@ -249,8 +251,8 @@ namespace MonoDevelop.Components.MainToolbar } using (LinearGradient lg = new LinearGradient (0, region.Y, 0, region.Y + region.Height)) { - lg.AddColorStop (0, Styles.StatusBarShadowColor2); - lg.AddColorStop (1, Styles.WithAlpha (Styles.StatusBarShadowColor2, Styles.StatusBarShadowColor2.A * 0.2)); + lg.AddColorStop (0, Styles.StatusBarShadowColor2.ToCairoColor ()); + lg.AddColorStop (1, Styles.StatusBarShadowColor2.WithAlpha (Styles.StatusBarShadowColor2.Alpha * 0.2).ToCairoColor ()); LayoutRoundedRectangle (context, region, 0, -2); context.LineWidth = 1; @@ -285,10 +287,10 @@ namespace MonoDevelop.Components.MainToolbar draw: (c, o) => { // The smaller the pixel range of our gradient the less error there will be in it. using (var lg = new LinearGradient (surfaceWidth - 250, 0, surfaceWidth, 0)) { - lg.AddColorStop (0.00, Styles.WithAlpha (Styles.StatusBarErrorColor, 0.15 * o)); - lg.AddColorStop (0.10, Styles.WithAlpha (Styles.StatusBarErrorColor, 0.15 * o)); - lg.AddColorStop (0.88, Styles.WithAlpha (Styles.StatusBarErrorColor, 0.30 * o)); - lg.AddColorStop (1.00, Styles.WithAlpha (Styles.StatusBarErrorColor, 0.00 * o)); + lg.AddColorStop (0.00, Styles.StatusBarErrorColor.WithAlpha (0.15 * o).ToCairoColor ()); + lg.AddColorStop (0.10, Styles.StatusBarErrorColor.WithAlpha (0.15 * o).ToCairoColor ()); + lg.AddColorStop (0.88, Styles.StatusBarErrorColor.WithAlpha (0.30 * o).ToCairoColor ()); + lg.AddColorStop (1.00, Styles.StatusBarErrorColor.WithAlpha (0.00 * o).ToCairoColor ()); c.SetSource (lg); c.Paint (); @@ -303,12 +305,12 @@ namespace MonoDevelop.Components.MainToolbar context.Clip (); LayoutRoundedRectangle (context, bounding, 0, 0, 1); - context.SetSourceColor (Styles.WithAlpha (Styles.StatusBarProgressBackgroundColor, Styles.StatusBarProgressBackgroundColor.A * arg.ProgressBarAlpha)); + context.SetSourceColor (Styles.StatusBarProgressBackgroundColor.WithAlpha (Styles.StatusBarProgressBackgroundColor.Alpha * arg.ProgressBarAlpha).ToCairoColor ()); context.FillPreserve (); context.ResetClip (); - context.SetSourceColor (Styles.WithAlpha (Styles.StatusBarProgressOutlineColor, Styles.StatusBarProgressOutlineColor.A * arg.ProgressBarAlpha)); + context.SetSourceColor (Styles.StatusBarProgressOutlineColor.WithAlpha (Styles.StatusBarProgressOutlineColor.Alpha * arg.ProgressBarAlpha).ToCairoColor ()); context.LineWidth = 1; context.Stroke (); } @@ -321,7 +323,7 @@ namespace MonoDevelop.Components.MainToolbar protected virtual Cairo.Color FontColor () { - return Styles.StatusBarTextColor; + return Styles.StatusBarTextColor.ToCairoColor (); } void DrawString (string text, bool isMarkup, Cairo.Context context, int x, int y, int width, double opacity, Pango.Context pango, StatusArea.RenderArg arg) @@ -347,7 +349,7 @@ namespace MonoDevelop.Components.MainToolbar // Subtract off remainder instead of drop to prefer higher centering when centering an odd number of pixels context.MoveTo (x, y - h / 2 - (h % 2)); - context.SetSourceColor (Styles.WithAlpha (FontColor (), opacity)); + context.SetSourceColor (CairoExtensions.WithAlpha (FontColor (), opacity)); Pango.CairoHelper.ShowLayout (context, pl); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/BooleanEditorCell.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/BooleanEditorCell.cs index 67c56f6cf1..1ae1306146 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/BooleanEditorCell.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/BooleanEditorCell.cs @@ -31,39 +31,62 @@ using System.ComponentModel; namespace MonoDevelop.Components.PropertyGrid.PropertyEditors { - [PropertyEditorType (typeof (bool))]
+ [PropertyEditorType (typeof (bool))] public class BooleanEditorCell : PropertyEditorCell { static int indicatorSize; static int indicatorSpacing; - + static Gtk.Style style; + static BooleanEditorCell () { - Gtk.CheckButton cb = new Gtk.CheckButton (); - indicatorSize = (int) cb.StyleGetProperty ("indicator-size"); - indicatorSpacing = (int) cb.StyleGetProperty ("indicator-spacing"); + // reinit style + MonoDevelop.Ide.Gui.Styles.Changed += (sender, e) => style = null; + } + + // we can't override Initialize () or use the default constructor for this, + // because a valid Gdk.Window is required for full Gtk.Style initialization + static void InitializeStyle (Gtk.Widget container) + { + if (style == null && container.GdkWindow != null) { + Gtk.CheckButton cb = new BooleanEditor (); + cb.GdkWindow = container.GdkWindow; + cb.Parent = container; + cb.Realize (); + style = cb.Style; + style.Attach (container.GdkWindow); + indicatorSize = (int) cb.StyleGetProperty ("indicator-size"); + indicatorSpacing = (int) cb.StyleGetProperty ("indicator-spacing"); + style.Detach (); + cb.Dispose (); + } } public override void GetSize (int availableWidth, out int width, out int height) { - width = 20; - height = 20; + width = indicatorSize; + height = indicatorSize; } public override void Render (Gdk.Drawable window, Cairo.Context ctx, Gdk.Rectangle bounds, Gtk.StateType state) { + if (style == null) + InitializeStyle (Container); + Gtk.ShadowType sh = (bool) Value ? Gtk.ShadowType.In : Gtk.ShadowType.Out; + int s = indicatorSize - 1; if (s > bounds.Height) s = bounds.Height; if (s > bounds.Width) s = bounds.Width; - Gtk.Style.PaintCheck (Container.GetNativeWidget<Gtk.Widget> ().Style, window, state, sh, bounds, Container, "checkbutton", bounds.X + indicatorSpacing - 1, bounds.Y + (bounds.Height - s)/2, s, s); + + Gtk.Style.PaintCheck (style, window, state, sh, bounds, Container, "checkbutton", bounds.X + indicatorSpacing - 1, bounds.Y + (bounds.Height - s)/2, s, s); } protected override IPropertyEditor CreateEditor (Gdk.Rectangle cell_area, Gtk.StateType state) { - return new BooleanEditor (); + return new BooleanEditor { State = state }; } } @@ -73,6 +96,7 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors { if (session.Property.PropertyType != typeof(bool)) throw new ApplicationException ("Boolean editor does not support editing values of type " + session.Property.PropertyType); + Sensitive = !session.Property.IsReadOnly; } public object Value { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs index e752a17056..a4070bdd75 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs @@ -93,6 +93,7 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors AllowGrow = true,
AllowShrink = true,
};
+ IdeTheme.ApplyTheme (dialog);
var toplevel = this.Container.GetNativeWidget<Gtk.Widget> ().Toplevel as Gtk.Window;
if (toplevel != null)
dialog.TransientFor = toplevel;
@@ -118,17 +119,17 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors hBox.PackEnd (buttonBox, false, false, 5);
//add/remove buttons
- Button addButton = new Button (new Image (Stock.Add, IconSize.Button));
+ Button addButton = new Button (new ImageView (Stock.Add, IconSize.Button));
buttonBox.PackStart (addButton, false, false, 0);
if (types [0].IsAbstract)
addButton.Sensitive = false;
- Button removeButton = new Button (new Gtk.Image (Stock.Remove, IconSize.Button));
+ Button removeButton = new Button (new ImageView (Stock.Remove, IconSize.Button));
buttonBox.PackStart (removeButton, false, false, 0);
//sorting buttons
- Button upButton = new Button (new Image (Stock.GoUp, IconSize.Button));
+ Button upButton = new Button (new ImageView (Stock.GoUp, IconSize.Button));
buttonBox.PackStart (upButton, false, false, 0);
- Button downButton = new Button (new Image (Stock.GoDown, IconSize.Button));
+ Button downButton = new Button (new ImageView (Stock.GoDown, IconSize.Button));
buttonBox.PackStart (downButton, false, false, 0);
//Third column has list (TreeView) in a ScrolledWindow
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs index 925bf269e9..76facbfeaa 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs @@ -53,6 +53,7 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors sc.Add (treeView); dialog = new Gtk.Dialog (); + IdeTheme.ApplyTheme (dialog); dialog.VBox.Add (sc); dialog.AddButton (Gtk.Stock.Cancel, Gtk.ResponseType.Cancel); dialog.AddButton (Gtk.Stock.Ok, Gtk.ResponseType.Ok); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs index b7cb6a3f82..be86d5b542 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/TextEditorDialog.cs @@ -48,6 +48,7 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors sc.Add (textview); dialog = new Gtk.Dialog (); + IdeTheme.ApplyTheme (dialog); dialog.AddButton (Gtk.Stock.Cancel, Gtk.ResponseType.Cancel); dialog.AddButton (Gtk.Stock.Ok, Gtk.ResponseType.Ok); dialog.VBox.Add (sc); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGrid.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGrid.cs index b3914cc0ec..9c19b383b9 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGrid.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGrid.cs @@ -88,25 +88,27 @@ namespace MonoDevelop.Components.PropertyGrid base.PackStart (tb, false, false, 0);
toolbar = tb;
- catButton = new RadioButton ((Gtk.RadioButton)null); + catButton = new RadioButton ((Gtk.RadioButton)null);
+ catButton.Name = "MonoDevelop.PropertyGridToolbar.GtkRadioButton"; catButton.DrawIndicator = false;
catButton.Relief = ReliefStyle.None;
- catButton.Image = new Gtk.Image (MonoDevelop.Ide.Gui.Stock.GroupByCategory, IconSize.Menu);
+ catButton.Image = new ImageView (MonoDevelop.Ide.Gui.Stock.GroupByCategory, IconSize.Menu);
catButton.Image.Show ();
catButton.TooltipText = GettextCatalog.GetString ("Sort in categories");
catButton.Toggled += new EventHandler (toolbarClick);
toolbar.Insert (catButton, 0); alphButton = new RadioButton (catButton);
+ alphButton.Name = "MonoDevelop.PropertyGridToolbar.GtkRadioButton";
alphButton.DrawIndicator = false;
alphButton.Relief = ReliefStyle.None;
- alphButton.Image = new Gtk.Image (MonoDevelop.Ide.Gui.Stock.SortAlphabetically, IconSize.Menu);
+ alphButton.Image = new ImageView (MonoDevelop.Ide.Gui.Stock.SortAlphabetically, IconSize.Menu);
alphButton.Image.Show (); alphButton.TooltipText = GettextCatalog.GetString ("Sort alphabetically");
alphButton.Clicked += new EventHandler (toolbarClick);
toolbar.Insert (alphButton, 1); - catButton.Active = true; + catButton.Active = true;
#endregion
@@ -270,7 +272,7 @@ namespace MonoDevelop.Components.PropertyGrid void UpdateTabs () {
bool visible = currentObject != null && toolbar.Children.OfType<TabRadioToolButton> ().Count (but => but.Tab.CanExtend (currentObject)) > 1; - foreach (var w in toolbar.Children.OfType<TabRadioToolButton> ()) + foreach (var w in toolbar.Children.OfType<TabRadioToolButton> ())
w.Visible = visible;
if (tabSectionSeparator != null)
tabSectionSeparator.Visible = visible;
@@ -378,7 +380,7 @@ namespace MonoDevelop.Components.PropertyGrid descTextView.LeftMargin = 5;
descTextView.RightMargin = 5;
- Pango.FontDescription font = Style.FontDescription.Copy ();
+ Pango.FontDescription font = Style.FontDescription.Copy (); // TODO: VV: Use FontService
font.Size = (font.Size * 8) / 10;
descTextView.ModifyFont (font);
@@ -449,6 +451,7 @@ namespace MonoDevelop.Components.PropertyGrid DrawIndicator = false; Relief = ReliefStyle.None;
NoShowAll = true;
+ Name = "MonoDevelop.PropertyGridToolbar.GtkRadioButton";
} public PropertyTab Tab; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGridTable.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGridTable.cs index a75e829847..30feb1e47f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGridTable.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyGridTable.cs @@ -31,6 +31,7 @@ using System.Collections.Generic; using Cairo; using System.Linq; using MonoDevelop.Core; +using MonoDevelop.Ide.Gui; namespace MonoDevelop.Components.PropertyGrid { @@ -53,9 +54,6 @@ namespace MonoDevelop.Components.PropertyGrid const int PropertyLeftPadding = 8; const int PropertyContentLeftPadding = 8; const int PropertyIndent = 8; - static readonly Cairo.Color LabelBackgroundColor = new Cairo.Color (250d/255d, 250d/255d, 250d/255d); - static readonly Cairo.Color DividerColor = new Cairo.Color (217d/255d, 217d/255d, 217d/255d); - static readonly Cairo.Color CategoryLabelColor = new Cairo.Color (128d/255d, 128d/255d, 128d/255d); const uint animationTimeSpan = 10; const int animationStepSize = 20; @@ -447,15 +445,12 @@ namespace MonoDevelop.Components.PropertyGrid using (Cairo.Context ctx = CairoHelper.Create (evnt.Window)) { int dx = (int)((double)Allocation.Width * dividerPosition); ctx.LineWidth = 1; - ctx.Rectangle (0, 0, dx, Allocation.Height); - ctx.SetSourceColor (LabelBackgroundColor); - ctx.Fill (); - ctx.Rectangle (dx, 0, Allocation.Width - dx, Allocation.Height); - ctx.SetSourceRGB (1, 1, 1); + ctx.Rectangle (0, 0, Allocation.Width, Allocation.Height); + ctx.SetSourceColor (Styles.PropertyPadLabelBackgroundColor.ToCairoColor ()); ctx.Fill (); ctx.MoveTo (dx + 0.5, 0); ctx.RelLineTo (0, Allocation.Height); - ctx.SetSourceColor (DividerColor); + ctx.SetSourceColor (Styles.PropertyPadDividerColor.ToCairoColor ()); ctx.Stroke (); int y = 0; @@ -481,12 +476,8 @@ namespace MonoDevelop.Components.PropertyGrid if (r.IsCategory) { var rh = h + CategoryTopBottomPadding*2; ctx.Rectangle (0, y, Allocation.Width, rh); - using (var gr = new LinearGradient (0, y, 0, rh)) { - gr.AddColorStop (0, new Cairo.Color (248d/255d, 248d/255d, 248d/255d)); - gr.AddColorStop (1, new Cairo.Color (240d/255d, 240d/255d, 240d/255d)); - ctx.SetSource (gr); - ctx.Fill (); - } + ctx.SetSourceColor (Styles.PadCategoryBackgroundColor.ToCairoColor ()); + ctx.Fill (); if (lastCategory == null || lastCategory.Expanded || lastCategory.AnimatingExpand) { ctx.MoveTo (0, y + 0.5); @@ -494,11 +485,11 @@ namespace MonoDevelop.Components.PropertyGrid } ctx.MoveTo (0, y + rh - 0.5); ctx.LineTo (Allocation.Width, y + rh - 0.5); - ctx.SetSourceColor (DividerColor); + ctx.SetSourceColor (Styles.PadCategoryBorderColor.ToCairoColor ()); ctx.Stroke (); ctx.MoveTo (x, y + CategoryTopBottomPadding); - ctx.SetSourceColor (CategoryLabelColor); + ctx.SetSourceColor (Styles.PadCategoryLabelColor.ToCairoColor ()); Pango.CairoHelper.ShowLayout (ctx, layout); var img = r.Expanded ? discloseUp : discloseDown; @@ -556,10 +547,10 @@ namespace MonoDevelop.Components.PropertyGrid // Repaing the background because the cairo clip doesn't work for gdk primitives int dx = (int)((double)Allocation.Width * dividerPosition); ctx.Rectangle (0, y, dx, Allocation.Height - y); - ctx.SetSourceColor (LabelBackgroundColor); + ctx.SetSourceColor (Styles.PropertyPadLabelBackgroundColor.ToCairoColor ()); ctx.Fill (); ctx.Rectangle (dx + 1, y, Allocation.Width - dx - 1, Allocation.Height - y); - ctx.SetSourceRGB (1, 1, 1); + ctx.SetSourceColor (Styles.BrowserPadBackground.ToCairoColor()); ctx.Fill (); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CairoExtensions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CairoExtensions.cs index 3a21270833..6fe1fceea4 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CairoExtensions.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CairoExtensions.cs @@ -542,6 +542,11 @@ namespace MonoDevelop.Components return img; } + public static Cairo.Color WithAlpha (Cairo.Color c, double alpha) + { + return new Cairo.Color (c.R, c.G, c.B, alpha); + } + public static Cairo.Color MultiplyAlpha (this Cairo.Color self, double alpha) { return new Cairo.Color (self.R, self.G, self.B, self.A * alpha); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CellRendererImage.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CellRendererImage.cs index 3cd15e12d5..48bb6d0925 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CellRendererImage.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CellRendererImage.cs @@ -42,7 +42,7 @@ namespace MonoDevelop.Components /// Image to be used to represent "no image". This is necessary since GLib.Value can't hold /// null values for object that are not of subclasses of GLib.Object /// </summary> - public static readonly Xwt.Drawing.Image NullImage = ImageService.GetIcon ("md-empty"); + public static readonly Xwt.Drawing.Image NullImage = ImageService.GetIcon ("md-empty", Gtk.IconSize.Menu); public CellRendererImage () { @@ -133,6 +133,11 @@ namespace MonoDevelop.Components if (img == null) return; + if ((flags & Gtk.CellRendererState.Selected) != 0) + img = img.WithStyles ("sel"); + if (!img.HasFixedSize) + img = img.WithSize (Gtk.IconSize.Menu); + using (var ctx = Gdk.CairoHelper.Create (window)) { var x = cell_area.X + cell_area.Width / 2 - (int)(img.Width / 2); var y = cell_area.Y + cell_area.Height / 2 - (int)(img.Height / 2); @@ -156,8 +161,11 @@ namespace MonoDevelop.Components { var img = GetImage (); if (img != null) { - width = (int)img.Width; - height = (int)img.Height; + if (img.HasFixedSize) { + width = (int)img.Width; + height = (int)img.Height; + } else + Gtk.IconSize.Menu.GetSize(out width, out height); } else width = height = 0; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ExtendedLabel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ExtendedLabel.cs index f31d401c26..222c1a3ab3 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ExtendedLabel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ExtendedLabel.cs @@ -24,13 +24,13 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; +using Cairo; +using Gdk; namespace MonoDevelop.Components { class ExtendedLabel: Gtk.Label { - bool dropShadowVisible; - public ExtendedLabel () { } @@ -38,20 +38,9 @@ namespace MonoDevelop.Components public ExtendedLabel (string text): base (text) { } - - public bool DropShadowVisible { - get { return dropShadowVisible; } - set { - dropShadowVisible = value; - QueueDraw (); - } - } protected override bool OnExposeEvent (Gdk.EventExpose evnt) { - if (!dropShadowVisible) - return base.OnExposeEvent (evnt); - Pango.Layout la = new Pango.Layout (PangoContext); int w, h; if (UseMarkup) @@ -63,8 +52,31 @@ namespace MonoDevelop.Components int tx = Allocation.X + (int) Xpad + (int) ((float)(Allocation.Width - (int)(Xpad*2) - w) * Xalign); int ty = Allocation.Y + (int) Ypad + (int) ((float)(Allocation.Height - (int)(Ypad*2) - h) * Yalign); - - GdkWindow.DrawLayout (Style.TextGC (State), tx, ty, la); + + using (var ctx = CairoHelper.Create (evnt.Window)) { + ctx.SetSourceColor (Style.Text (State).ToCairoColor ()); + ctx.MoveTo (tx, ty); + + // In order to get the same result as in MonoDevelop.Components.DockNotebook.TabStrip.DrawTab() + // (document tabs) we need to draw using a LinearGradient (because of issues below), + // but we don't want to mask the actual text here, like in the doc tabs. + // Therefore we use a LinearGradient and mask only the last vertical pixel line + // of the label with 0.99 alpha, which forces Cairo to render the whole layout + // in the desired way. + + // Semi-transparent gradient disables sub-pixel rendering of the label (reverting to grayscale antialiasing). + // As Mac sub-pixel font rendering looks stronger than grayscale rendering, the label used in pad tabs + // looked different. We need to simulate same gradient treatment as we have in document tabs. + + using (var lg = new LinearGradient (tx + w - 1, 0, tx + w, 0)) { + var color = Style.Text (State).ToCairoColor (); + lg.AddColorStop (0, color); + color.A = 0.99; + lg.AddColorStop (1, color); + ctx.SetSource (lg); + Pango.CairoHelper.ShowLayout (ctx, la); + } + } la.Dispose (); return true; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FixedWidthWrapLabel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FixedWidthWrapLabel.cs index ba06864d99..f7c12d9134 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FixedWidthWrapLabel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FixedWidthWrapLabel.cs @@ -42,6 +42,7 @@ namespace MonoDevelop.Components bool use_markup = false; Pango.Layout layout; int indent; + int spacing; int width = int.MaxValue; bool breakOnPunctuation; @@ -87,6 +88,7 @@ namespace MonoDevelop.Components if (FontDescription != null) layout.FontDescription = FontDescription; layout.Indent = (int) (indent * Pango.Scale.PangoScale); + layout.Spacing = (int) (spacing * Pango.Scale.PangoScale); layout.Wrap = wrapMode; if (width >= 0) layout.Width = (int)(width * Pango.Scale.PangoScale); @@ -204,6 +206,17 @@ namespace MonoDevelop.Components } } } + + public int Spacing { + get { return spacing; } + set { + spacing = value; + if (layout != null) { + layout.Spacing = (int) (spacing * Pango.Scale.PangoScale); + QueueResize (); + } + } + } public bool BreakOnPunctuation { get { return breakOnPunctuation; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs index 9e235c83b5..3a5aad8ca2 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs @@ -39,7 +39,15 @@ namespace MonoDevelop.Components { static Dictionary<TreeView, TreeViewTooltipsData> treeData = new Dictionary<TreeView, TreeViewTooltipsData> (); - static readonly Xwt.Toolkit gtkToolkit = Xwt.Toolkit.LoadedToolkits.First (t => t.Type == Xwt.ToolkitType.Gtk); + static Xwt.Toolkit gtkToolkit; + + internal static Xwt.Toolkit GtkToolkit { + get { + if (gtkToolkit == null) + gtkToolkit = Xwt.Toolkit.LoadedToolkits.FirstOrDefault (t => t.Type == Xwt.ToolkitType.Gtk); + return gtkToolkit; + } + } public static Cairo.Color ToCairoColor (this Gdk.Color color) { @@ -55,6 +63,11 @@ namespace MonoDevelop.Components (double)color.Blue / ushort.MaxValue); } + public static string GetHex (this Gdk.Color color) + { + return String.Format("#{0:x2}{1:x2}{2:x2}", (byte)(color.Red), (byte)(color.Green), (byte)(color.Blue)); + } + public static Gdk.Color ToGdkColor (this Cairo.Color color) { return new Gdk.Color ((byte)(color.R * 255d), (byte)(color.G * 255d), (byte)(color.B * 255d)); @@ -109,64 +122,70 @@ namespace MonoDevelop.Components return c.ToCairoColor (); } + /// <summary> + /// Makes a color lighter or darker + /// </summary> + /// <param name='lightAmount'> + /// Amount of lightness to add. If the value is positive, the color will be lighter, + /// if negative it will be darker. Value must be between 0 and 1. + /// </param> + public static Xwt.Drawing.Color AddLight (this Xwt.Drawing.Color color, double lightAmount) + { + color.Light += lightAmount; + return color; + } + public static Xwt.Drawing.Context CreateXwtContext (this Gtk.Widget w) { var c = Gdk.CairoHelper.Create (w.GdkWindow); - return gtkToolkit.WrapContext (w, c); + return GtkToolkit.WrapContext (w, c); } public static Gtk.Widget ToGtkWidget (this Xwt.Widget widget) { - return (Gtk.Widget) gtkToolkit.GetNativeWidget (widget); + return (Gtk.Widget) GtkToolkit.GetNativeWidget (widget); } public static void DrawImage (this Cairo.Context s, Gtk.Widget widget, Xwt.Drawing.Image image, double x, double y) { - gtkToolkit.RenderImage (widget, s, image, x, y); + GtkToolkit.RenderImage (widget, s, image, x, y); } public static Xwt.Drawing.Image ToXwtImage (this Gdk.Pixbuf pix) { - return gtkToolkit.WrapImage (pix); + return GtkToolkit.WrapImage (pix); } public static Gdk.Pixbuf ToPixbuf (this Xwt.Drawing.Image image) { - return (Gdk.Pixbuf)gtkToolkit.GetNativeImage (image); + return (Gdk.Pixbuf)GtkToolkit.GetNativeImage (image); } public static Gdk.Pixbuf ToPixbuf (this Xwt.Drawing.Image image, Gtk.IconSize size) { - return (Gdk.Pixbuf)gtkToolkit.GetNativeImage (image.WithSize (size)); + return (Gdk.Pixbuf)GtkToolkit.GetNativeImage (image.WithSize (size)); } public static Xwt.Drawing.Image WithSize (this Xwt.Drawing.Image image, Gtk.IconSize size) { int w, h; - if (!Gtk.Icon.SizeLookup (size, out w, out h)) - return image;
- if (size == IconSize.Menu)
- w = h = 16; + size.GetSize (out w, out h); return image.WithSize (w, h); } - public static Xwt.Drawing.Image GetImageResource (this RuntimeAddin addin, string resource) + public static Xwt.Size GetSize (this IconSize size) { - using (var s = addin.GetResource (resource)) { - var img = Xwt.Drawing.Image.FromStream (s); - int i = resource.LastIndexOf ('.'); - if (i != -1) { - var resource2x = resource.Substring (0, i) + "@2x" + resource.Substring (i); - var s2x = addin.GetResource (resource2x); - if (s2x != null) { - using (s2x) { - var img2x = Xwt.Drawing.Image.FromStream (s2x); - return Xwt.Drawing.Image.CreateMultiSizeIcon (new Xwt.Drawing.Image[] {img, img2x}); - } - } - } - return img; - } + int w, h; + size.GetSize (out w, out h); + return new Xwt.Size (w, h); + } + + public static void GetSize (this IconSize size, out int width, out int height) + { + if (!Icon.SizeLookup (size, out width, out height)) + return; + if (size == IconSize.Menu) + width = height = 16; } public static Gdk.Point GetScreenCoordinates (this Gtk.Widget w, Gdk.Point p) @@ -325,14 +344,14 @@ namespace MonoDevelop.Components public static Gdk.Point ToScreenCoordinates (Gtk.Widget widget, Gdk.Window w, int x, int y) { int ox, oy; - w.GetOrigin (out ox, out oy);
- //Bug 31032 - this is workaround bug in GTK on Windows OS which has widget.Allocation.X/Y
- //relative to widget.GdkWindow.Toplevel instead to widget.GdkWindow which is GdkWindow decicated
- //to TreeView so widget.Allocation.X/Y should always be 0,0(which is true on Mac)
- //hence skipping adding Allocation.X/Y since they should always be 0,0 anyway
- if (!(widget is TreeView)) {
- ox += widget.Allocation.X;
- oy += widget.Allocation.Y;
+ w.GetOrigin (out ox, out oy); + //Bug 31032 - this is workaround bug in GTK on Windows OS which has widget.Allocation.X/Y + //relative to widget.GdkWindow.Toplevel instead to widget.GdkWindow which is GdkWindow decicated + //to TreeView so widget.Allocation.X/Y should always be 0,0(which is true on Mac) + //hence skipping adding Allocation.X/Y since they should always be 0,0 anyway + if (!(widget is TreeView)) { + ox += widget.Allocation.X; + oy += widget.Allocation.Y; } return new Gdk.Point (ox + x, oy + y); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs index 415365a65f..36e0902426 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkWorkarounds.cs @@ -1260,6 +1260,25 @@ namespace MonoDevelop.Components supportsHiResIcons = false; return null; } + + [DllImport (PangoUtil.LIBGTK, CallingConvention = CallingConvention.Cdecl)] + static extern void gtk_object_set_data (IntPtr raw, IntPtr key, IntPtr data); + + public static void SetData<T> (Gtk.Object gtkobject, string key, T data) where T: struct + { + IntPtr pkey = GLib.Marshaller.StringToPtrGStrdup (key); + IntPtr pdata = Marshal.AllocHGlobal(Marshal.SizeOf(data)); + Marshal.StructureToPtr(data, pdata, false); + gtk_object_set_data (gtkobject.Handle, pkey, pdata); + Marshal.FreeHGlobal(pdata); + GLib.Marshaller.Free (pkey); + gtkobject.Data [key] = data; + } + + public static void SetTransparentBgHint (this Widget widget, bool enable) + { + SetData (widget, "transparent-bg-hint", enable); + } } public struct KeyboardShortcut : IEquatable<KeyboardShortcut> diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HPanedThin.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HPanedThin.cs index a4f1fec7b4..6ad66fed98 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HPanedThin.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HPanedThin.cs @@ -78,7 +78,7 @@ namespace MonoDevelop.Components if (Child1 != null && Child1.Visible && Child2 != null && Child2.Visible) { var gc = new Gdk.GC (evnt.Window); - gc.RgbFgColor = Styles.ThinSplitterColor; + gc.RgbFgColor = Styles.ThinSplitterColor.ToGdkColor (); var x = Child1.Allocation.X + Child1.Allocation.Width; evnt.Window.DrawLine (gc, x, Allocation.Y, x, Allocation.Y + Allocation.Height); gc.Dispose (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HeaderBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HeaderBox.cs index c34e0eda46..ec21b26c1b 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HeaderBox.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HeaderBox.cs @@ -170,6 +170,8 @@ namespace MonoDevelop.Components cr.RelLineTo (-rect.Width, 0); cr.RelLineTo (0, -rect.Height); cr.ClosePath (); + + // FIXME: VV: Remove gradient features using (Cairo.Gradient pat = new Cairo.LinearGradient (rect.X, rect.Y, rect.X, rect.Bottom)) { pat.AddColorStop (0, gcol.ToCairoColor ()); gcol.Light -= 0.1; @@ -213,6 +215,7 @@ namespace MonoDevelop.Components GdkWindow.DrawLine (borderColor, rect.Right - n, rect.Y, rect.Right - n, rect.Bottom); if (showTopShadow) { + // FIXME: VV: Remove gradient features using (Cairo.Context cr = Gdk.CairoHelper.Create (GdkWindow)) { cr.Rectangle (Allocation.X, Allocation.Y, Allocation.Width, shadowSize); using (Cairo.Gradient pat = new Cairo.LinearGradient (rect.X, rect.Y, rect.X, rect.Y + shadowSize)) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HelperMethods.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HelperMethods.cs index 5b758e5a50..c4e6d316eb 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HelperMethods.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/HelperMethods.cs @@ -82,6 +82,11 @@ namespace MonoDevelop.Components IntPtr handle = pango_layout_get_context (layout.Handle); return handle.Equals (IntPtr.Zero) ? null : GLib.Object.GetObject (handle) as Pango.Context; } + + public static double GetPixelBaseline (this Pango.Layout layout) + { + return layout.Iter.Baseline / Pango.Scale.PangoScale; + } public static void DrawLine (this Cairo.Context cr, Cairo.Color color, double x1, double y1, double x2, double y2) { @@ -114,6 +119,28 @@ namespace MonoDevelop.Components cr.SetSourceRGBA (color.R, color.G, color.B, color.A); } + public static bool Contains (this Cairo.Rectangle rect, Gdk.Point point) + { + return ((point.X >= rect.X) && (point.X < (rect.X + rect.Width)) && + (point.Y >= rect.Y) && (point.Y < (rect.Y + rect.Height))); + } + + public static bool Contains (this Cairo.Rectangle rect, double x, double y) + { + return ((x >= rect.X) && (x < (rect.X + rect.Width)) && + (y >= rect.Y) && (y < (rect.Y + rect.Height))); + } + + public static Cairo.Rectangle Inflate (this Cairo.Rectangle rect, double width, double height) + { + return new Cairo.Rectangle( + rect.X - width, + rect.Y - height, + rect.Width + (width * 2), + rect.Height + (height * 2) + ); + } + //this is needed for building against old Mono.Cairo versions [Obsolete] public static void SetSource (this Cairo.Context cr, Cairo.Pattern pattern) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/IdeDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/IdeDialog.cs new file mode 100644 index 0000000000..5d4e15fc24 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/IdeDialog.cs @@ -0,0 +1,45 @@ +// +// IdeDialog.cs +// +// Author: +// Lluis Sanchez Gual <lluis@xamarin.com> +// +// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using Gtk; +using MonoDevelop.Components.Theming; + +namespace MonoDevelop.Components +{ + public class IdeDialog: Gtk.Dialog + { + public IdeDialog () + { + IdeTheme.ApplyTheme (this); + } + + public IdeDialog (string title, Gtk.Window parentWindow, DialogFlags flags): base (title, parentWindow, flags) + { + IdeTheme.ApplyTheme (this); + } + } +} + diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/IdeTheme.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/IdeTheme.cs new file mode 100644 index 0000000000..28e3a84631 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/IdeTheme.cs @@ -0,0 +1,352 @@ +// +// ThemeExtensions.cs +// +// Author: +// Lluis Sanchez Gual <lluis@xamarin.com> +// +// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using System.Collections.Generic; +using System.IO; +using MonoDevelop.Core; +using MonoDevelop.Ide; +using MonoDevelop.Ide.Gui; +using System.Linq; + +#if MAC +using AppKit; +using Foundation; +using MonoDevelop.Components.Mac; +#endif + +namespace MonoDevelop.Components +{ + public static class IdeTheme + { + internal static string DefaultTheme; + internal static string DefaultGtkDataFolder; + internal static string DefaultGtk2RcFiles; + + public static Skin UserInterfaceSkin { get; private set; } + + static IdeTheme () + { + DefaultGtkDataFolder = Environment.GetEnvironmentVariable ("GTK_DATA_PREFIX"); + DefaultGtk2RcFiles = Environment.GetEnvironmentVariable ("GTK2_RC_FILES"); + // FIXME: Immediate theme switching disabled, until: + // MAC: NSAppearance issues are fixed + // WIN: spradic Gtk crashes on theme realoding are fixed + //IdeApp.Preferences.UserInterfaceTheme.Changed += (sender, e) => UpdateGtkTheme (); + } + + internal static void InitializeGtk (string progname, ref string[] args) + { + if (Gtk.Settings.Default != null) + throw new InvalidOperationException ("Gtk already initialized!"); + + //HACK: we must initilize some Gtk rc before Gtk.Application is initialized on Mac/Windows + // otherwise it will not be loaded correctly and theme switching won't work. + if (!Platform.IsLinux) + UpdateGtkTheme (); + + Gtk.Application.Init (BrandingService.ApplicationName, ref args); + } + + internal static void SetupXwtTheme () + { + Xwt.Drawing.Context.RegisterStyles ("dark", "disabled"); + + #if MAC + Xwt.Drawing.Context.RegisterStyles ("sel"); + #endif + + Xwt.Toolkit.CurrentEngine.RegisterBackend <Xwt.Backends.IWindowBackend, ThemedGtkWindowBackend>(); + Xwt.Toolkit.CurrentEngine.RegisterBackend <Xwt.Backends.IDialogBackend, ThemedGtkDialogBackend>(); + } + + internal static void SetupGtkTheme () + { + if (Gtk.Settings.Default == null) + return; + + if (Platform.IsLinux) { + DefaultTheme = Gtk.Settings.Default.ThemeName; + string theme = IdeApp.Preferences.UserInterfaceTheme; + if (string.IsNullOrEmpty (theme)) + theme = DefaultTheme; + ValidateGtkTheme (ref theme); + if (theme != DefaultTheme) + Gtk.Settings.Default.ThemeName = theme; + LoggingService.LogInfo ("GTK: Using Gtk theme from {0}", Path.Combine (Gtk.Rc.ThemeDir, Gtk.Settings.Default.ThemeName)); + } else + DefaultTheme = "Light"; + + // HACK: on Windows we have to load the theme twice on startup. During the first run we + // set the environment variables from InitializeGtk() and after Gtk initialization + // we set the active theme from here. Otherwise Gtk will preload the default theme with + // the Wimp engine, which can break our own configs. + if (Platform.IsWindows) + UpdateGtkTheme (); + } + + internal static void UpdateGtkTheme () + { + if (DefaultTheme == null) + SetupGtkTheme (); + + string current_theme = IdeApp.Preferences.UserInterfaceTheme; + + if (!Platform.IsLinux) { + UserInterfaceSkin = IdeApp.Preferences.UserInterfaceTheme == "Dark" ? Skin.Dark : Skin.Light; + if (current_theme != UserInterfaceSkin.ToString ()) // Only Skin names allowed on Win/Mac + current_theme = UserInterfaceSkin.ToString (); + } + + var use_bundled_theme = false; + + + // Use the bundled gtkrc only if the Xamarin theme is installed + if (File.Exists (Path.Combine (Gtk.Rc.ModuleDir, "libxamarin.so")) || File.Exists (Path.Combine (Gtk.Rc.ModuleDir, "libxamarin.dll"))) + use_bundled_theme = true; + // on Windows we can't rely on Gtk.Rc.ModuleDir to be valid + // and test additionally the default installation dir + if (!use_bundled_theme && Platform.IsWindows) { + var gtkBasePath = Environment.GetEnvironmentVariable ("GTK_BASEPATH"); + if (String.IsNullOrEmpty (gtkBasePath)) + gtkBasePath = "C:\\Program Files (x86)\\GtkSharp\\2.12\\"; + if (File.Exists (Path.Combine (gtkBasePath, "lib\\gtk-2.0\\2.10.0\\engines\\libxamarin.dll"))) + use_bundled_theme = true; + } + + if (use_bundled_theme) { + + if (!Directory.Exists (UserProfile.Current.ConfigDir)) + Directory.CreateDirectory (UserProfile.Current.ConfigDir); + + if (Platform.IsWindows) {
+ // HACK: Gtk Bug: Rc.ReparseAll () and the include "[rcfile]" gtkrc statement are broken on Windows.
+ // We must provide our own XDG folder structure to switch bundled themes.
+ var rc_themes = UserProfile.Current.ConfigDir.Combine ("share", "themes");
+ var rc_theme_light = rc_themes.Combine ("Light", "gtk-2.0", "gtkrc");
+ var rc_theme_dark = rc_themes.Combine ("Dark", "gtk-2.0", "gtkrc");
+ if (!Directory.Exists (rc_theme_light.ParentDirectory))
+ Directory.CreateDirectory (rc_theme_light.ParentDirectory);
+ if (!Directory.Exists (rc_theme_dark.ParentDirectory))
+ Directory.CreateDirectory (rc_theme_dark.ParentDirectory);
+
+ string gtkrc = PropertyService.EntryAssemblyPath.Combine ("gtkrc");
+ File.Copy (gtkrc + ".win32", rc_theme_light, true);
+ File.Copy (gtkrc + ".win32-dark", rc_theme_dark, true);
+ + var themeDir = UserProfile.Current.ConfigDir; + if (!themeDir.IsAbsolute) + themeDir = themeDir.ToAbsolute (Environment.CurrentDirectory);
+ Environment.SetEnvironmentVariable ("GTK_DATA_PREFIX", themeDir);
+
+ // set the actual theme and reset the environment only after Gtk has been fully
+ // initialized. See SetupGtkTheme ().
+ if (Gtk.Settings.Default != null) {
+ LoggingService.LogInfo ("GTK: Using Gtk theme from {0}", Path.Combine (Gtk.Rc.ThemeDir, current_theme));
+ Gtk.Settings.Default.ThemeName = current_theme;
+ Environment.SetEnvironmentVariable ("GTK_DATA_PREFIX", DefaultGtkDataFolder); + } + + } else if (Platform.IsMac) { + + var gtkrc = "gtkrc.mac"; + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Dark) + gtkrc += "-dark"; + gtkrc = PropertyService.EntryAssemblyPath.Combine (gtkrc); + + LoggingService.LogInfo ("GTK: Using gtkrc from {0}", gtkrc); + + // Generate a dummy rc file and use that to include the real rc. This allows changing the rc + // on the fly. All we have to do is rewrite the dummy rc changing the include and call ReparseAll + var rcFile = UserProfile.Current.ConfigDir.Combine ("gtkrc"); + File.WriteAllText (rcFile, "include \"" + gtkrc + "\""); + Environment.SetEnvironmentVariable ("GTK2_RC_FILES", rcFile); + + Gtk.Rc.ReparseAll (); + } + + } else if (Gtk.Settings.Default != null && current_theme != Gtk.Settings.Default.ThemeName) { + LoggingService.LogInfo ("GTK: Using Gtk theme from {0}", Path.Combine (Gtk.Rc.ThemeDir, current_theme)); + Gtk.Settings.Default.ThemeName = current_theme; + } + + // let Gtk realize the new theme + // Style is being updated by DefaultWorkbench.OnStyleSet () + // This ensures that the theme and all styles have been loaded when + // the Styles.Changed event is raised. + //GLib.Timeout.Add (50, delegate { UpdateStyles(); return false; }); + } + + internal static void UpdateStyles () + { + if (Platform.IsLinux) { + var defaultStyle = Gtk.Rc.GetStyle (IdeApp.Workbench.RootWindow); + var bgColor = defaultStyle.Background (Gtk.StateType.Normal); + UserInterfaceSkin = HslColor.Brightness (bgColor) < 0.5 ? Skin.Dark : Skin.Light; + } + + if (UserInterfaceSkin == Skin.Dark) + Xwt.Drawing.Context.SetGlobalStyle ("dark"); + else + Xwt.Drawing.Context.ClearGlobalStyle ("dark"); + + Styles.LoadStyle (); + #if MAC + UpdateMacWindows (); + #endif + } + + internal static string[] gtkThemeFallbacks = new string[] { + "Xamarin",// the best! + "Gilouche", // SUSE + "Mint-X", // MINT + "Radiance", // Ubuntu 'light' theme (MD looks better with the light theme in 4.0 - if that changes switch this one) + "Clearlooks" // GTK theme + }; + + static void ValidateGtkTheme (ref string theme) + { + if (!MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.IsBadGtkTheme (theme)) + return; + + var themes = MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.InstalledThemes; + + string fallback = gtkThemeFallbacks + .Select (fb => themes.FirstOrDefault (t => string.Compare (fb, t, StringComparison.OrdinalIgnoreCase) == 0)) + .FirstOrDefault (t => t != null); + + string message = "Theme Not Supported"; + + string detail; + if (themes.Count > 0) { + detail = + "Your system is using the '{0}' GTK+ theme, which is known to be very unstable. MonoDevelop will " + + "now switch to an alternate GTK+ theme.\n\n" + + "This message will continue to be shown at startup until you set a alternate GTK+ theme as your " + + "default in the GTK+ Theme Selector or MonoDevelop Preferences."; + } else { + detail = + "Your system is using the '{0}' GTK+ theme, which is known to be very unstable, and no other GTK+ " + + "themes appear to be installed. Please install another GTK+ theme.\n\n" + + "This message will continue to be shown at startup until you install a different GTK+ theme and " + + "set it as your default in the GTK+ Theme Selector or MonoDevelop Preferences."; + } + + MessageService.GenericAlert (Gtk.Stock.DialogWarning, message, BrandingService.BrandApplicationName (detail), AlertButton.Ok); + + theme = fallback ?? themes.FirstOrDefault () ?? theme; + } + +#if MAC + static Dictionary<NSWindow, NSObject> nsWindows = new Dictionary<NSWindow, NSObject> (); + + public static void ApplyTheme (NSWindow window) + { + if (!nsWindows.ContainsKey(window)) { + nsWindows [window] = NSNotificationCenter.DefaultCenter.AddObserver (NSWindow.WillCloseNotification, OnClose, window); + SetTheme (window); + } + } + + static void SetTheme (NSWindow window) + { + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) + window.Appearance = NSAppearance.GetAppearance (NSAppearance.NameAqua); + else + window.Appearance = NSAppearance.GetAppearance (NSAppearance.NameVibrantDark); + + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) { + window.StyleMask &= ~NSWindowStyle.TexturedBackground; + return; + } + + if (window is NSPanel || window.ContentView.Class.Name != "GdkQuartzView") + window.BackgroundColor = MonoDevelop.Ide.Gui.Styles.BackgroundColor.ToNSColor (); + else { + object[] platforms = Mono.Addins.AddinManager.GetExtensionObjects ("/MonoDevelop/Core/PlatformService"); + if (platforms.Length > 0) { + var platformService = (MonoDevelop.Ide.Desktop.PlatformService)platforms [0]; + var image = Xwt.Drawing.Image.FromResource (platformService.GetType().Assembly, "maintoolbarbg.png"); + + window.IsOpaque = false; + window.BackgroundColor = NSColor.FromPatternImage (image.ToBitmap().ToNSImage()); + } + } + window.StyleMask |= NSWindowStyle.TexturedBackground; + } + + static void OnClose (NSNotification note) + { + var w = (NSWindow)note.Object; + NSNotificationCenter.DefaultCenter.RemoveObserver(nsWindows[w]); + nsWindows.Remove (w); + } + + static void UpdateMacWindows () + { + foreach (var w in nsWindows.Keys) + SetTheme (w); + } + + static void OnGtkWindowRealized (object s, EventArgs a) + { + var nsw = MonoDevelop.Components.Mac.GtkMacInterop.GetNSWindow ((Gtk.Window) s); + if (nsw != null) + ApplyTheme (nsw); + } +#endif + + public static void ApplyTheme (this Gtk.Window window) + { + #if MAC + window.Realized += OnGtkWindowRealized; + if (window.IsRealized) { + var nsw = MonoDevelop.Components.Mac.GtkMacInterop.GetNSWindow (window); + if (nsw != null) + ApplyTheme (nsw); + } + #endif + } + } + + public class ThemedGtkWindowBackend : Xwt.GtkBackend.WindowBackend + { + public override void Initialize () + { + base.Initialize (); + IdeTheme.ApplyTheme (Window); + } + } + + public class ThemedGtkDialogBackend : Xwt.GtkBackend.DialogBackend + { + public override void Initialize () + { + base.Initialize (); + IdeTheme.ApplyTheme (Window); + } + } +} + diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/IdeWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/IdeWindow.cs new file mode 100644 index 0000000000..1c1e232952 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/IdeWindow.cs @@ -0,0 +1,38 @@ +// +// IdeWindow.cs +// +// Author: +// Lluis Sanchez Gual <lluis@xamarin.com> +// +// Copyright (c) 2015 Xamarin, Inc (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; + +namespace MonoDevelop.Components +{ + public class IdeWindow: Gtk.Window + { + public IdeWindow (Gtk.WindowType type): base (type) + { + IdeTheme.ApplyTheme (this); + } + } +} + diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ImageView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ImageView.cs index 8b9bc5a851..efe7bf474f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ImageView.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ImageView.cs @@ -28,9 +28,12 @@ using Gdk; namespace MonoDevelop.Components { - public class ImageView: Gtk.DrawingArea + [System.ComponentModel.ToolboxItem (true)] + public class ImageView: Gtk.Misc { Xwt.Drawing.Image image; + string iconId; + Gtk.IconSize? size; public ImageView () { @@ -42,6 +45,13 @@ namespace MonoDevelop.Components this.image = image; } + public ImageView (string iconId, Gtk.IconSize size): this () + { + this.iconId = iconId; + this.size = size; + image = MonoDevelop.Ide.ImageService.GetIcon (iconId, size); + } + public Xwt.Drawing.Image Image { get { return image; } set { @@ -51,21 +61,32 @@ namespace MonoDevelop.Components } } - float xalign = 0.5f; - public float Xalign { - get { return xalign; } + public void SetIcon (string iconId, Gtk.IconSize size) + { + this.iconId = iconId; + this.size = size; + Image = MonoDevelop.Ide.ImageService.GetIcon (iconId, size); + } + + public Gtk.IconSize IconSize { + get { + return size.HasValue ? size.Value : Gtk.IconSize.Invalid; + } set { - xalign = (float)(value * IconScale); - QueueDraw (); + size = value; + if (iconId != null) + Image = MonoDevelop.Ide.ImageService.GetIcon (iconId, size.Value); } } - float yalign = 0.5f; - public float Yalign { - get { return yalign; } + public string IconId { + get { + return iconId; + } set { - yalign = (float)(value * IconScale); - QueueDraw (); + iconId = value; + if (size.HasValue) + Image = MonoDevelop.Ide.ImageService.GetIcon (iconId, size.Value); } } @@ -75,21 +96,40 @@ namespace MonoDevelop.Components protected override void OnSizeRequested (ref Gtk.Requisition requisition) { + requisition.Width = Xpad * 2; + requisition.Height = Ypad * 2; if (image != null) { - requisition.Width = (int)(image.Width * IconScale); - requisition.Height = (int)(image.Height * IconScale); + requisition.Width += (int)(image.Width * IconScale); + requisition.Height += (int)(image.Height * IconScale); + } + } + + bool IsParentDisabled () + { + var parent = Parent; + if (parent != null) { + if (!parent.Sensitive) + return true; + // special case: Buttons with image and label align children with HBox and Alignment + // Button -> Alignment -> HBox -> [ImageView|Label] + parent = parent.Parent.Parent as Gtk.Button; + if (parent != null && !parent.Sensitive) + return true; } + return false; } protected override bool OnExposeEvent (Gdk.EventExpose evnt) { if (image != null) { + var alloc = Allocation; + alloc.Inflate (-Xpad, -Ypad); using (var ctx = CairoHelper.Create (evnt.Window)) { - var x = Math.Round (Allocation.X + (Allocation.Width - image.Width * IconScale) * Xalign); - var y = Math.Round (Allocation.Y + (Allocation.Height - image.Height * IconScale) * Yalign); + var x = Math.Round (alloc.X + (alloc.Width - image.Width * IconScale) * Xalign); + var y = Math.Round (alloc.Y + (alloc.Height - image.Height * IconScale) * Yalign); ctx.Save (); ctx.Scale (IconScale, IconScale); - ctx.DrawImage (this, image, x / IconScale, y / IconScale); + ctx.DrawImage (this, IsParentDisabled () ? image.WithAlpha (0.4) : image, x / IconScale, y / IconScale); ctx.Restore (); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/InfoBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/InfoBar.cs index ba09473f9f..ede744ca50 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/InfoBar.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/InfoBar.cs @@ -36,7 +36,7 @@ namespace MonoDevelop.Components /// </summary> public class InfoBar : HBox { - Image img; + ImageView img; MessageType messageType; HBox messageHBox = new HBox (); public InfoBar () : this (MessageType.Other) @@ -83,11 +83,11 @@ namespace MonoDevelop.Components } if (img == null) { - img = new Gtk.Image (iconName, IconSize.Dialog); + img = new ImageView (iconName, IconSize.Dialog); messageHBox.PackEnd (img, false, false, 12); img.SetAlignment (0.5f, 0.5f); } else { - img.IconName = iconName; + img.IconId = iconName; } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDMenu.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDMenu.cs index 0fb99e7190..e667692bb6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDMenu.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/MDMenu.cs @@ -56,7 +56,6 @@ namespace MonoDevelop.Components.Mac AutoEnablesItems = false; Title = (ces.Name ?? "").Replace ("_", ""); - Font = NSFont.MenuFontOfSize (12); foreach (CommandEntry ce in ces) { if (ce.CommandId == Command.Separator) { AddItem (NSMenuItem.SeparatorItem); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/Util.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/Util.cs index 67d1c0ad12..6edfe3894e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/Util.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Mac/Util.cs @@ -99,6 +99,27 @@ namespace MonoDevelop.Components.Mac return NSColor.FromDeviceRgba ((float)col.Red, (float)col.Green, (float)col.Blue, (float)col.Alpha); } + public static NSColor ToNSColor (this Cairo.Color col) + { + return NSColor.FromDeviceRgba ((float)col.R, (float)col.G, (float)col.B, (float)col.A); + } + + static readonly CoreGraphics.CGColorSpace DeviceRgbColorSpace = CoreGraphics.CGColorSpace.CreateDeviceRGB (); + + public static CoreGraphics.CGColor ToCGColor (this Cairo.Color col) + { + return new CoreGraphics.CGColor (DeviceRgbColorSpace, new nfloat[] { + (nfloat)col.R, (nfloat)col.G, (nfloat)col.B, (nfloat)col.A + }); + } + + public static CoreGraphics.CGColor ToCGColor (this Color col) + { + return new CoreGraphics.CGColor (DeviceRgbColorSpace, new nfloat[] { + (nfloat)col.Red, (nfloat)col.Green, (nfloat)col.Blue, (nfloat)col.Alpha + }); + } + static Selector applyFontTraits = new Selector ("applyFontTraits:range:"); public static NSAttributedString ToAttributedString (this FormattedText ft) @@ -139,7 +160,7 @@ namespace MonoDevelop.Components.Mac else if (att is LinkTextAttribute) { var xa = (LinkTextAttribute)att; ns.AddAttribute (NSStringAttributeKey.Link, new NSUrl (xa.Target.ToString ()), r); - ns.AddAttribute (NSStringAttributeKey.ForegroundColor, NSColor.Blue, r); + ns.AddAttribute (NSStringAttributeKey.ForegroundColor, Ide.Gui.Styles.LinkForegroundColor.ToNSColor (), r); ns.AddAttribute (NSStringAttributeKey.UnderlineStyle, NSNumber.FromInt32 ((int)NSUnderlineStyle.Single), r); } else if (att is StrikethroughTextAttribute) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButton.cs index 7733cf6ca8..842770df79 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButton.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButton.cs @@ -40,7 +40,7 @@ namespace MonoDevelop.Components MenuCreator creator; ContextMenuCreator contextMenuCreator; Label label; - Image image; + ImageView image; Arrow arrow; bool isOpen; @@ -51,7 +51,7 @@ namespace MonoDevelop.Components box.Spacing = 6; Add (box); - image = new Image (); + image = new ImageView (); image.NoShowAll = true; box.PackStart (image, false, false, 0); label = new Label (); @@ -201,7 +201,7 @@ namespace MonoDevelop.Components public string StockImage { set { - image.Pixbuf = RenderIcon (value, IconSize.Button, null); + image.SetIcon (value, IconSize.Button); image.Show (); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MiniButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MiniButton.cs index 715045bf8c..29a8b3ca9c 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MiniButton.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MiniButton.cs @@ -59,7 +59,7 @@ namespace MonoDevelop.Components public MiniButton (string text, string icon): this () { HBox box = new HBox (false, 3); - Image img = new Image (icon, IconSize.Menu); + ImageView img = new ImageView (icon, IconSize.Menu); box.PackStart (img, false, false, 0); Label label = new Label (text); label.Xalign = 0; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs index de14159fcc..defe968695 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PathBar.cs @@ -32,6 +32,7 @@ using Gdk; using MonoDevelop.Ide; using MonoDevelop.Ide.Gui; using MonoDevelop.Core.Text; +using MonoDevelop.Ide.Fonts; namespace MonoDevelop.Components { @@ -246,13 +247,8 @@ namespace MonoDevelop.Components protected override bool OnExposeEvent (EventExpose evnt) { using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) { - ctx.Rectangle (0, 0, Allocation.Width, Allocation.Height); - using (var g = new Cairo.LinearGradient (0, 0, 0, Allocation.Height)) { - g.AddColorStop (0, Styles.BreadcrumbBackgroundColor); - g.AddColorStop (1, Styles.BreadcrumbGradientEndColor); - ctx.SetSource (g); - } + ctx.SetSourceColor (Styles.BreadcrumbBackgroundColor.ToCairoColor ()); ctx.Fill (); if (widths == null) @@ -287,6 +283,7 @@ namespace MonoDevelop.Components } layout.Attributes = (i == activeIndex) ? boldAtts : null; + layout.FontDescription = FontService.SansFont.CopyModified (Styles.FontScale11); layout.SetMarkup (GetFirstLineFromMarkup (leftPath [i].Markup)); ctx.Save (); @@ -345,6 +342,7 @@ namespace MonoDevelop.Components } layout.Attributes = (i == activeIndex) ? boldAtts : null; + layout.FontDescription = FontService.SansFont.CopyModified (Styles.FontScale11); layout.SetMarkup (GetFirstLineFromMarkup (rightPath [i].Markup)); ctx.Save (); @@ -373,7 +371,7 @@ namespace MonoDevelop.Components ctx.MoveTo (0, Allocation.Height - 0.5); ctx.RelLineTo (Allocation.Width, 0); - ctx.SetSourceColor (Styles.BreadcrumbBottomBorderColor); + ctx.SetSourceColor (Styles.BreadcrumbBottomBorderColor.ToCairoColor ()); ctx.LineWidth = 1; ctx.Stroke (); } @@ -387,7 +385,7 @@ namespace MonoDevelop.Components ctx.LineTo (x + arrowSize, y + size / 2); ctx.LineTo (x, y + size); ctx.ClosePath (); - ctx.SetSourceColor (CairoExtensions.ColorShade (Style.Dark (State).ToCairoColor (), 0.6)); + ctx.SetSourceColor (Styles.BaseIconColor.ToCairoColor()); ctx.Fill (); } @@ -399,13 +397,8 @@ namespace MonoDevelop.Components double height = Allocation.Height - topPadding - bottomPadding + buttonPadding * 2; ctx.Rectangle (x, y, width, height); - ctx.SetSourceColor (Styles.BreadcrumbButtonFillColor); + ctx.SetSourceColor (Styles.BreadcrumbButtonFillColor.ToCairoColor ()); ctx.Fill (); - - ctx.Rectangle (x + 0.5, y + 0.5, width - 1, height - 1); - ctx.SetSourceColor (Styles.BreadcrumbButtonBorderColor); - ctx.LineWidth = 1; - ctx.Stroke (); } int[] ReduceWidths (int overflow) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWidget.cs index bbd72a8e8d..5974852928 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWidget.cs @@ -173,12 +173,11 @@ namespace MonoDevelop.Components if (Theme.DrawPager) { Theme.RenderPager (context, PangoContext, - new Gdk.Rectangle (Allocation.X, Allocation.Y, paintSize.Width, paintSize.Height)); + BorderAllocation); } - Theme.RenderBorder (context, BorderAllocation, position); + Theme.RenderShadow (context, BorderAllocation, position); context.Restore (); - } return base.OnExposeEvent (evnt); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs index ea983bfcd3..2147c668ca 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindow.cs @@ -62,6 +62,7 @@ namespace MonoDevelop.Components AppPaintable = true; TypeHint = WindowTypeHint.Tooltip; CheckScreenColormap (); + AddEvents ((int)EventMask.ButtonReleaseMask); alignment = new Alignment (0, 0, 1f, 1f); alignment.Show (); @@ -102,6 +103,8 @@ namespace MonoDevelop.Components } } + public int CaretSpacing { get; set; } + public bool ShowArrow { get { return Theme.ShowArrow; } set { Theme.ShowArrow = value; } @@ -198,6 +201,8 @@ namespace MonoDevelop.Components set; } + protected PopupPosition CurrentPosition { get { return position; }} + public virtual void RepositionWindow (Gdk.Rectangle? newCaret = null) { if (parent == null) @@ -228,6 +233,10 @@ namespace MonoDevelop.Components caret = GtkUtil.ToScreenCoordinates (parent, parent.GdkWindow, caret); } + caret.Inflate (CaretSpacing, CaretSpacing); + if (!Core.Platform.IsWindows) + caret.Inflate (-1, -1); + Gtk.Requisition request = SizeRequest (); var screen = parent.Screen; Gdk.Rectangle geometry = GtkWorkarounds.GetUsableMonitorGeometry (screen, screen.GetMonitorAtPoint (caret.X, caret.Y)); @@ -264,14 +273,14 @@ namespace MonoDevelop.Components switch ((PopupPosition)((int)position & 0x0f)) { case PopupPosition.Top: - y = caret.Bottom; + y = caret.Bottom + 1; break; case PopupPosition.Bottom: y = caret.Y - request.Height; break; case PopupPosition.Right: x = caret.X - request.Width; break; case PopupPosition.Left: - x = caret.Right; break; + x = caret.Right + 1; break; } int offset; if ((position & PopupPosition.Top) != 0 || (position & PopupPosition.Bottom) != 0) { @@ -380,12 +389,11 @@ namespace MonoDevelop.Components if (Theme.DrawPager) { Theme.RenderPager (context, PangoContext, - new Gdk.Rectangle (Allocation.X, Allocation.Y, paintSize.Width, paintSize.Height)); + BorderAllocation); } - Theme.RenderBorder (context, BorderAllocation, position); + Theme.RenderShadow (context, BorderAllocation, position); context.Restore (); - } if (changed) @@ -402,7 +410,7 @@ namespace MonoDevelop.Components void UpdatePadding () { uint top,left,bottom,right; - top = left = bottom = right = (uint)Theme.Padding + 1; + top = left = bottom = right = (uint)(Theme.Padding + (Core.Platform.IsWindows ? 1 : 2)); if (ShowArrow) { if ((position & PopupPosition.Top) != 0) @@ -458,9 +466,54 @@ namespace MonoDevelop.Components rect.Width -= Theme.ArrowLength; } } + if (!Core.Platform.IsWindows) { + if ((position & PopupPosition.Top) != 0) { + rect.Y += 1; + rect.Height -= 1; + } + else if ((position & PopupPosition.Bottom) != 0) { + rect.Height -= 1; + } + else if ((position & PopupPosition.Left) != 0) { + rect.X += 1; + rect.Width -= 1; + } + else if ((position & PopupPosition.Right) != 0) { + rect.Width -= 1; + } + } return rect; } } + + public event EventHandler PagerLeftClicked; + public event EventHandler PagerRightClicked; + + protected virtual void OnPagerLeftClicked () + { + if (PagerLeftClicked != null) + PagerLeftClicked (this, null); + } + + protected virtual void OnPagerRightClicked () + { + if (PagerRightClicked != null) + PagerRightClicked (this, null); + } + + protected override bool OnButtonReleaseEvent (EventButton evnt) + { + if (evnt.Button != 1 || !Theme.DrawPager) + return base.OnButtonPressEvent (evnt); + + var retval = false; + if (retval = Theme.HitTestPagerLeftArrow (PangoContext, BorderAllocation, new Point ((int)evnt.X, (int)evnt.Y))) + OnPagerLeftClicked (); + else if (retval = Theme.HitTestPagerRightArrow (PangoContext, BorderAllocation, new Point ((int)evnt.X, (int)evnt.Y))) + OnPagerRightClicked (); + + return retval; + } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindowTheme.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindowTheme.cs index 29bf1dcc25..fc4bb17539 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindowTheme.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PopoverWindowTheme.cs @@ -55,9 +55,8 @@ namespace MonoDevelop.Components int padding; int arrowWidth; int arrowLength; - Cairo.Color topColor; - Cairo.Color bottomColor; - Cairo.Color borderColor; + Cairo.Color backgroundColor; + Cairo.Color shadowColor; Pango.FontDescription font; int currentPage; int pages; @@ -65,58 +64,37 @@ namespace MonoDevelop.Components bool pagerVertical; bool showArrow; PopupPosition targetPosition; + static readonly int pagerArrowPadding = 4; public event EventHandler RedrawNeeded; /// <summary> - /// Gets or sets the color of the top of the gradient used to render the background. + /// Gets or sets the color of the background. /// </summary> - public Cairo.Color TopColor { - get { return topColor; } - set { SetAndEmit (value, topColor, ref topColor); } + public Cairo.Color BackgroundColor { + get { return backgroundColor; } + set { SetAndEmit (value, backgroundColor, ref backgroundColor); } } + Cairo.Color pagerBackgroundColor = CairoExtensions.ParseColor ("ffffff"); /// <summary> - /// Gets or sets the color of the bottom of the gradient used to render the background. + /// Gets or sets the color of the background color of the pager. /// </summary> - public Cairo.Color BottomColor { - get { return bottomColor; } - set { SetAndEmit (value, bottomColor, ref bottomColor); } - } - - /// <summary> - /// Gets or sets the color of the border of the entire window. Set to transparent to disable border drawing. - /// </summary> - public Cairo.Color BorderColor { - get { return borderColor; } - set { SetAndEmit (value, borderColor, ref borderColor); } - } - - - Cairo.Color pagerBackgroundColorTop = CairoExtensions.ParseColor ("ffffff"); - /// <summary> - /// Gets or sets the color of the top background color of the pager. - /// </summary> - public Cairo.Color PagerBackgroundColorTop { + public Cairo.Color PagerBackgroundColor { get { - return pagerBackgroundColorTop; + return pagerBackgroundColor; } set { - pagerBackgroundColorTop = value; + pagerBackgroundColor = value; } } - Cairo.Color pagerBackgroundColorBottom = CairoExtensions.ParseColor ("f5f5f5"); /// <summary> - /// Gets or sets the color of the bottom background color of the pager. + /// Gets or sets the color of the border of the entire window. Set to transparent to disable border drawing. /// </summary> - public Cairo.Color PagerBackgroundColorBottom { - get { - return pagerBackgroundColorBottom; - } - set { - pagerBackgroundColorBottom = value; - } + public Cairo.Color ShadowColor { + get { return shadowColor; } + set { SetAndEmit (value, shadowColor, ref shadowColor); } } Cairo.Color pagerTriangleColor = CairoExtensions.ParseColor ("737373"); @@ -141,10 +119,11 @@ namespace MonoDevelop.Components public Cairo.Color PagerTextColor { get { if (!pagerColorSet) { - return new Cairo.Color (BorderColor.R * .7, - BorderColor.G * .7, - BorderColor.B * .7, - BorderColor.A); + // FIXME: VV: Sane value! + //return new Cairo.Color (BorderColor.R * .7, + // BorderColor.G * .7, + // BorderColor.B * .7, + // BorderColor.A); } return pagerTextColor; } @@ -244,12 +223,11 @@ namespace MonoDevelop.Components public int ArrowOffset { private get; set; } /// <summary> - /// Convenience method to set the top and bottom color to the same color. + /// Set the background color. /// </summary> - public void SetFlatColor (Cairo.Color color) + public void SetBackgroundColor (Cairo.Color color) { - TopColor = color; - BottomColor = color; + BackgroundColor = color; } public PopoverWindowTheme () @@ -258,21 +236,17 @@ namespace MonoDevelop.Components Padding = 6; ArrowWidth = 10; ArrowLength = 5; - TopColor = new Cairo.Color (1, 1, 1); - BottomColor = new Cairo.Color (1, 1, 1); - BorderColor = new Cairo.Color (0.7, 0.7, 0.7); + BackgroundColor = Styles.PopoverWindow.DefaultBackgroundColor.ToCairoColor (); + ShadowColor = Styles.PopoverWindow.ShadowColor.ToCairoColor (); Font = Pango.FontDescription.FromString ("Normal"); } public void SetSchemeColors (ColorScheme scheme) { - TopColor = scheme.TooltipText.Background.AddLight (0.03); - BottomColor = scheme.TooltipText.Background; - BorderColor = scheme.TooltipBorder.Color; + BackgroundColor = scheme.TooltipText.Background; PagerTextColor = scheme.TooltipPagerText.Color; - PagerBackgroundColorTop = scheme.TooltipPagerTop.Color; - PagerBackgroundColorBottom = scheme.TooltipPagerBottom.Color; + PagerBackgroundColor = scheme.TooltipPager.Color; PagerTriangleColor = scheme.TooltipPagerTriangle.Color; } @@ -293,11 +267,36 @@ namespace MonoDevelop.Components public virtual void RenderBorder (Cairo.Context context, Gdk.Rectangle region, PopupPosition arrowPosition) { SetBorderPath (context, region, arrowPosition); - context.SetSourceColor (BorderColor); + context.SetSourceColor (BackgroundColor); context.LineWidth = 1; context.Stroke (); } + public virtual void RenderShadow (Cairo.Context context, Gdk.Rectangle region, PopupPosition arrowPosition) + { + RenderBorder (context, region, arrowPosition); + double r = CornerRadius; + double x = region.X + 0.5, y = region.Y + 0.5, w = region.Width - 1, h = region.Height - 1; + context.MoveTo(x + w, y + h - r); + context.Arc(x + w - r, y + h - r, r, 0, Math.PI * 0.5); + if (ShowArrow && (arrowPosition & PopupPosition.Bottom) != 0) { + double apos = ArrowOffset; + context.LineTo (x + apos + ArrowWidth / 2, y + h); + context.RelLineTo (-ArrowWidth / 2, ArrowLength); + context.RelLineTo (-ArrowWidth / 2, -ArrowLength); + } + context.Arc(x + r, y + h - r, r, Math.PI * 0.5, Math.PI); + + // FIXME: VV: Remove gradient features + using (var lg = new Cairo.LinearGradient (0, y + h - r, 0, y + h)) { + lg.AddColorStop (0.5, ShadowColor.MultiplyAlpha (0.0)); + lg.AddColorStop (1, ShadowColor); + context.SetSource (lg); + context.LineWidth = 1; + context.Stroke (); + } + } + object setBorderPathLastArgs; public virtual bool SetBorderPath (Cairo.Context context, Gdk.Rectangle region, PopupPosition arrowPosition) { @@ -353,13 +352,9 @@ namespace MonoDevelop.Components /// </summary> public virtual void RenderBackground (Cairo.Context context, Gdk.Rectangle region) { - using (var lg = new Cairo.LinearGradient (0, region.Y, 0, region.Y + region.Height)) { - lg.AddColorStop (0, TopColor); - lg.AddColorStop (1, BottomColor); - context.Rectangle (region.X, region.Y, region.Width, region.Height); - context.SetSource (lg); - context.Fill (); - } + context.Rectangle (region.X, region.Y, region.Width, region.Height); + context.SetSourceColor (BackgroundColor); + context.Fill (); } /// <summary> @@ -371,33 +366,60 @@ namespace MonoDevelop.Components CairoExtensions.RoundedRectangle (context, region.X, region.Y, region.Width, region.Height, CornerRadius); context.Clip (); - Pango.Layout layout = SetupPagerText (context, pangoContext); - int textWidth, textHeight; - layout.GetPixelSize (out textWidth, out textHeight); - - int width = textWidth + Styles.PopoverWindow.PagerTriangleSize * 2 + 20; - int height = Styles.PopoverWindow.PagerHeight; + Pango.Layout layout = SetupPagerText (pangoContext); + var boundingBox = GetPagerBounds (layout, region); - Gdk.Rectangle boundingBox = new Gdk.Rectangle (region.X + region.Width - width, 0, width, height); RenderPagerBackground (context, boundingBox); - int arrowPadding = 4; - Gdk.Rectangle arrowRect = new Gdk.Rectangle (boundingBox.X + arrowPadding, + Gdk.Rectangle arrowRect = new Gdk.Rectangle (boundingBox.X + pagerArrowPadding, boundingBox.Y + (boundingBox.Height - Styles.PopoverWindow.PagerTriangleSize) / 2, Styles.PopoverWindow.PagerTriangleSize, Styles.PopoverWindow.PagerTriangleSize); RenderPagerArrow (context, arrowRect, PagerVertical ? ArrowType.Up : ArrowType.Left); - arrowRect.X = boundingBox.X + boundingBox.Width - (arrowPadding + Styles.PopoverWindow.PagerTriangleSize); + arrowRect.X = boundingBox.X + boundingBox.Width - (pagerArrowPadding + Styles.PopoverWindow.PagerTriangleSize); RenderPagerArrow (context, arrowRect, PagerVertical ? ArrowType.Down : ArrowType.Right); RenderPagerText (context, layout, boundingBox); } + Gdk.Rectangle GetPagerBounds (Pango.Layout layout, Gdk.Rectangle region) + { + int textWidth, textHeight; + layout.GetPixelSize (out textWidth, out textHeight); + + int width = textWidth + Styles.PopoverWindow.PagerTriangleSize * 2 + 20; + int height = Styles.PopoverWindow.PagerHeight; + + return new Gdk.Rectangle (region.X + region.Width - width, 0, width, height); + } + + public bool HitTestPagerLeftArrow (Pango.Context pangoContext, Gdk.Rectangle region, Gdk.Point hitPoint) + { + Pango.Layout layout = SetupPagerText (pangoContext); + var boundingBox = GetPagerBounds (layout, region); + Gdk.Rectangle arrowActiveRect = new Gdk.Rectangle (boundingBox.X, + boundingBox.Y, + Styles.PopoverWindow.PagerTriangleSize + (pagerArrowPadding * 2), + boundingBox.Height); + return arrowActiveRect.Contains (hitPoint); + } + + public bool HitTestPagerRightArrow (Pango.Context pangoContext, Gdk.Rectangle region, Gdk.Point hitPoint) + { + Pango.Layout layout = SetupPagerText (pangoContext); + var boundingBox = GetPagerBounds (layout, region); + Gdk.Rectangle arrowActiveRect = new Gdk.Rectangle (boundingBox.X + boundingBox.Width - (pagerArrowPadding * 2 + Styles.PopoverWindow.PagerTriangleSize), + boundingBox.Y, + Styles.PopoverWindow.PagerTriangleSize + (pagerArrowPadding * 2), + boundingBox.Height); + return arrowActiveRect.Contains (hitPoint); + } + /// <summary> /// Sets the Pango.Layout for pager text as it will be rendered. This will be used to perform sizing on the rest of the pager. /// </summary> - protected virtual Pango.Layout SetupPagerText (Cairo.Context context, Pango.Context pangoContext) + protected virtual Pango.Layout SetupPagerText (Pango.Context pangoContext) { Pango.Layout pl = new Pango.Layout (pangoContext); pl.SetText (string.Format ("{0} of {1}", CurrentPage + 1, NumPages)); @@ -430,31 +452,15 @@ namespace MonoDevelop.Components { // draw background CairoExtensions.RoundedRectangle (context, - bounds.X, - bounds.Y, - bounds.Width, - bounds.Height, - CornerRadius, - CairoCorners.BottomLeft); - using (var lg = new Cairo.LinearGradient (0, bounds.Y, 0, bounds.Y + bounds.Height)) { - lg.AddColorStop (0, PagerBackgroundColorTop); - lg.AddColorStop (1, PagerBackgroundColorBottom); - - context.SetSource (lg); - context.Fill (); - } - - // draw outline - CairoExtensions.RoundedRectangle (context, - bounds.X + .5, - bounds.Y + .5, - bounds.Width - 1, + bounds.X + 1, + bounds.Y + 1, + bounds.Width - 2, bounds.Height - 1, CornerRadius, - CairoCorners.BottomLeft); - context.LineWidth = 1; - context.SetSourceColor (BorderColor); - context.Stroke (); + CairoCorners.All); + + context.SetSourceColor (PagerBackgroundColor); + context.Fill (); } /// <summary> diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs index 188f400dd3..ec00542e32 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SearchEntry.cs @@ -123,6 +123,7 @@ namespace MonoDevelop.Components BuildMenu (); NoShowAll = true; + GtkWorkarounds.SetTransparentBgHint (this, true); } public Xwt.Drawing.Image FilterButtonPixbuf { @@ -389,7 +390,10 @@ namespace MonoDevelop.Components var alloc = new Gdk.Rectangle (alignment.Allocation.X, box.Allocation.Y, alignment.Allocation.Width, box.Allocation.Height); if (hasFrame && (!roundedShape || (roundedShape && !customRoundedShapeDrawing))) { - Style.PaintShadow (entry.Style, GdkWindow, StateType.Normal, ShadowType.In, + if (Platform.IsLinux) + Style.PaintFlatBox (Style, GdkWindow, entry.State, ShadowType.None, + evnt.Area, this, "entry_bg", alloc.X + 2, alloc.Y + 2, alloc.Width - 4, alloc.Height - 4); + Style.PaintShadow (entry.Style, GdkWindow, entry.State, entry.ShadowType, evnt.Area, entry, "entry", alloc.X, alloc.Y, alloc.Width, alloc.Height); /* using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) { ctx.LineWidth = 1; @@ -418,7 +422,7 @@ namespace MonoDevelop.Components if (hasFrame && roundedShape && customRoundedShapeDrawing) { using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) { RoundBorder (ctx, alloc.X + 0.5, alloc.Y + 0.5, alloc.Width - 1, alloc.Height - 1); - ctx.SetSourceColor (Styles.WidgetBorderColor); + ctx.SetSourceColor (Styles.WidgetBorderColor.ToCairoColor ()); ctx.LineWidth = 1; ctx.Stroke (); } @@ -647,6 +651,8 @@ namespace MonoDevelop.Components parent.StyleSet += OnParentStyleSet; WidthChars = 1; + + GtkWorkarounds.SetTransparentBgHint (this, true); } private void OnParentStyleSet (object o, EventArgs args) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TabLabel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TabLabel.cs index b3080ef23b..8e6aeee4e6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TabLabel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TabLabel.cs @@ -14,7 +14,7 @@ namespace MonoDevelop.Components public class TabLabel : HBox { private Label title; - private Gtk.Image icon; + private ImageView icon; private EventBox titleBox; private static Xwt.Drawing.Image closeImage; @@ -31,7 +31,7 @@ namespace MonoDevelop.Components { } - public TabLabel (Label label, Gtk.Image icon) : base (false, 0) + public TabLabel (Label label, ImageView icon) : base (false, 0) { this.title = label; this.icon = icon; @@ -71,7 +71,7 @@ namespace MonoDevelop.Components set { title = value; } } - public Gtk.Image Icon + public ImageView Icon { get { return icon; } set { icon = value; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Tabstrip.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Tabstrip.cs index 6678828568..eddfbca6fb 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Tabstrip.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/Tabstrip.cs @@ -31,15 +31,13 @@ using System.Drawing.Design; using Cairo; using Gtk; using System.Linq; +using MonoDevelop.Ide.Gui; +using MonoDevelop.Ide.Fonts; namespace MonoDevelop.Components { class Tabstrip : DrawingArea { - static readonly Cairo.Color BackgroundGradientStart = new Cairo.Color (241d / 255d, 241d / 255d, 241d / 255d); - static readonly Cairo.Color BackgroundGradientEnd = BackgroundGradientStart;//new Cairo.Color (224d / 255d, 224d / 255d, 224d / 255d); - internal static readonly Cairo.Color ActiveGradientStart = new Cairo.Color (92d / 255d, 93d / 255d, 94d / 255d); - internal static readonly Cairo.Color ActiveGradientEnd = new Cairo.Color (134d / 255d, 136d / 255d, 137d / 255d); readonly List<Tab> tabs = new List<Tab> (); readonly List<Cairo.PointD> tabSizes = new List<Cairo.PointD> (); @@ -180,19 +178,9 @@ namespace MonoDevelop.Components { using (var cr = Gdk.CairoHelper.Create (evnt.Window)) { cr.Rectangle (0, 0, Allocation.Width, Allocation.Height); - using (LinearGradient gr = new LinearGradient (0, 0, 0, Allocation.Height)) { - gr.AddColorStop (0, BackgroundGradientStart); - gr.AddColorStop (1, BackgroundGradientEnd); - cr.SetSource (gr); - } + cr.SetSourceColor (Styles.SubTabBarBackgroundColor.ToCairoColor ()); cr.Fill (); - cr.MoveTo (0.5, 0.5); - cr.Line (0.5, 0.5, Allocation.Width - 1, 0.5); - cr.SetSourceRGB (1,1,1); - cr.LineWidth = 1; - cr.Stroke (); - for (int i = tabs.Count; i --> 0;) { if (i == ActiveTab) continue; @@ -274,7 +262,9 @@ namespace MonoDevelop.Components { this.parent = parent; this.Label = label; + layout = PangoUtil.CreateLayout (parent); + layout.FontDescription = FontService.SansFont.CopyModified (Styles.FontScale11); layout.SetText (label); layout.Alignment = Pango.Alignment.Center; layout.GetPixelSize (out w, out h); @@ -288,9 +278,9 @@ namespace MonoDevelop.Components public Cairo.PointD Size { get { if (IsSeparator) - return new Cairo.PointD (w, h + Padding*2); + return new Cairo.PointD (w, h + Padding * 2); else - return new Cairo.PointD (Math.Max (45, w + SpacerWidth * 2), h + Padding*2); + return new Cairo.PointD (Math.Max (45, w + SpacerWidth * 2), h + Padding * 2); } } @@ -302,7 +292,7 @@ namespace MonoDevelop.Components cr.MoveTo (x, rectangle.Y + 0.5 + 2); cr.RelLineTo (0, rectangle.Height - 1 - 4); cr.ClosePath (); - cr.SetSourceColor (parent.Style.Dark (StateType.Normal).ToCairoColor ()); + cr.SetSourceColor (Styles.SubTabBarSeparatorColor.ToCairoColor ()); cr.LineWidth = 1; cr.Stroke (); return; @@ -311,50 +301,26 @@ namespace MonoDevelop.Components if (Active || HoverPosition.X >= 0) { if (Active) { cr.Rectangle (rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height); - using (var gr = new LinearGradient (rectangle.X, rectangle.Y, rectangle.X, rectangle.Y + rectangle.Height)) { - gr.AddColorStop (0, Tabstrip.ActiveGradientStart); - gr.AddColorStop (1, Tabstrip.ActiveGradientEnd); - cr.SetSource (gr); - } + cr.SetSourceColor (Styles.SubTabBarActiveBackgroundColor.ToCairoColor ()); cr.Fill (); - cr.Rectangle (rectangle.X + 0.5, rectangle.Y + 0.5, rectangle.Width - 1, rectangle.Height - 1); - cr.SetSourceRGBA (1, 1, 1, 0.05); - cr.LineWidth = 1; - cr.Stroke (); } else if (HoverPosition.X >= 0) { cr.Rectangle (rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height); - using (var gr = new LinearGradient (rectangle.X, rectangle.Y, rectangle.X, rectangle.Y + rectangle.Height)) { - var c1 = Tabstrip.ActiveGradientStart; - var c2 = Tabstrip.ActiveGradientEnd; - c1.A = 0.2; - c2.A = 0.2; - gr.AddColorStop (0, c1); - gr.AddColorStop (1, c2); - cr.SetSource (gr); - } + cr.SetSourceColor (Styles.SubTabBarHoverBackgroundColor.ToCairoColor ()); cr.Fill (); } } - if (Active) - cr.SetSourceRGB (1, 1, 1); - else - cr.SetSourceColor (parent.Style.Text (StateType.Normal).ToCairoColor ()); - - if (layout.Width != (int)rectangle.Width) - layout.Width = (int)rectangle.Width; + if (Active) { + cr.SetSourceColor (Styles.SubTabBarActiveTextColor.ToCairoColor ()); + layout.FontDescription = FontService.SansFont.CopyModified (Styles.FontScale11, Pango.Weight.Bold); + } else { + cr.SetSourceColor (Styles.SubTabBarTextColor.ToCairoColor ()); + layout.FontDescription = FontService.SansFont.CopyModified (Styles.FontScale11); + } - #if MAC - /* On Cocoa, Pango doesn't render text correctly using layout width/height computation. - * For instance here we need to balance some kind of internal padding by two pixels which - * only happens on Mac. - */ - const int verticalOffset = -2; - #else - const int verticalOffset = 0; - #endif + layout.Width = (int)rectangle.Width; - cr.MoveTo (rectangle.X + (int)(rectangle.Width / 2), (rectangle.Height - h) / 2 + verticalOffset); + cr.MoveTo (rectangle.X + (int)(rectangle.Width / 2), (rectangle.Height - h) / 2 - 1); Pango.CairoHelper.ShowLayout (cr, layout); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipPopoverWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipPopoverWindow.cs index 74847c43f1..ce54d5e15f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipPopoverWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/TooltipPopoverWindow.cs @@ -26,6 +26,7 @@ using System; using MonoDevelop.Ide.Tasks; using MonoDevelop.Ide.Gui; +using MonoDevelop.Ide.Fonts; namespace MonoDevelop.Components { @@ -39,8 +40,8 @@ namespace MonoDevelop.Components public TooltipPopoverWindow () { - Theme.SetFlatColor (Styles.PopoverWindow.DefaultBackgroundColor); - Theme.BorderColor = Styles.PopoverWindow.DefaultBorderColor; + Theme.SetBackgroundColor (Styles.PopoverWindow.DefaultBackgroundColor.ToCairoColor ()); + Theme.Font = FontService.SansFont.CopyModified (Styles.FontScale11); ShowArrow = true; } @@ -80,38 +81,30 @@ namespace MonoDevelop.Components if (severity.HasValue) { Theme.Padding = 3; Theme.CornerRadius = 3; - Theme.BorderColor = new Cairo.Color (0, 0, 0, 0); - alignment.SetPadding (4, 4, 6, 6); + alignment.SetPadding (4, 5, 4, 4); - var f = Style.FontDescription.Copy (); - f.Size = ((f.Size / (int)Pango.Scale.PangoScale) - 1) * (int)Pango.Scale.PangoScale; - label.ModifyFont (f); + label.ModifyFont (FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11)); switch (severity.Value) { case TaskSeverity.Information: - Theme.SetFlatColor (Styles.PopoverWindow.InformationBackgroundColor); - Theme.BorderColor = Styles.PopoverWindow.InformationBorderColor; + Theme.SetBackgroundColor (Styles.PopoverWindow.InformationBackgroundColor.ToCairoColor ()); break; case TaskSeverity.Comment: - Theme.SetFlatColor (Styles.PopoverWindow.InformationBackgroundColor); - Theme.BorderColor = Styles.PopoverWindow.InformationBorderColor; + Theme.SetBackgroundColor (Styles.PopoverWindow.InformationBackgroundColor.ToCairoColor ()); break; case TaskSeverity.Error: - Theme.SetFlatColor (Styles.PopoverWindow.ErrorBackgroundColor); - Theme.BorderColor = Styles.PopoverWindow.ErrorBorderColor; + Theme.SetBackgroundColor (Styles.PopoverWindow.ErrorBackgroundColor.ToCairoColor ()); return; case TaskSeverity.Warning: - Theme.SetFlatColor (Styles.PopoverWindow.WarningBackgroundColor); - Theme.BorderColor = Styles.PopoverWindow.WarningBorderColor; + Theme.SetBackgroundColor (Styles.PopoverWindow.WarningBackgroundColor.ToCairoColor ()); return; } } else { - Theme.SetFlatColor (Styles.PopoverWindow.DefaultBackgroundColor); - Theme.BorderColor = Styles.PopoverWindow.DefaultBorderColor; + Theme.SetBackgroundColor (Styles.PopoverWindow.DefaultBackgroundColor.ToCairoColor ()); } } } @@ -120,8 +113,9 @@ namespace MonoDevelop.Components { if (label == null) { alignment = new Gtk.Alignment (0.5f, 0.5f, 1f, 1f); - alignment.SetPadding (6, 6, 6, 6); + alignment.SetPadding (4, 5, 4, 4); label = new Gtk.Label (); + label.ModifyFont (Theme.Font); alignment.Add (label); ContentBox.Add (alignment); alignment.ShowAll (); @@ -130,32 +124,29 @@ namespace MonoDevelop.Components void UpdateLabel () { - if (severity.HasValue) { - string msg = hasMarkup ? text : GLib.Markup.EscapeText (text); + string msg = hasMarkup ? text : GLib.Markup.EscapeText (text); + if (severity.HasValue) { switch (severity.Value) { case TaskSeverity.Information: - label.Markup = "<b><span color='" + CairoExtensions.ColorGetHex (Styles.PopoverWindow.InformationTextColor) + "'>" + msg + "</span></b>"; + label.Markup = "<span font='" + Theme.Font.ToString () + "' color='" + Styles.ColorGetHex (Styles.PopoverWindow.InformationTextColor) + "'>" + msg + "</span>"; return; case TaskSeverity.Comment: - label.Markup = "<b><span color='" + CairoExtensions.ColorGetHex (Styles.PopoverWindow.InformationTextColor) + "'>" + msg + "</span></b>"; + label.Markup = "<span font='" + Theme.Font.ToString () + "' color='" + Styles.ColorGetHex (Styles.PopoverWindow.InformationTextColor) + "'>" + msg + "</span>"; return; case TaskSeverity.Error: - label.Markup = "<b><span color='" + CairoExtensions.ColorGetHex (Styles.PopoverWindow.ErrorTextColor) + "'>" + msg + "</span></b>"; + label.Markup = "<span font='" + Theme.Font.ToString () + "' color='" + Styles.ColorGetHex (Styles.PopoverWindow.ErrorTextColor) + "'>" + msg + "</span>"; return; case TaskSeverity.Warning: - label.Markup = "<b><span color='" + CairoExtensions.ColorGetHex (Styles.PopoverWindow.WarningTextColor) + "'>" + msg + "</span></b>"; + label.Markup = "<span font='" + Theme.Font.ToString () + "' color='" + Styles.ColorGetHex (Styles.PopoverWindow.WarningTextColor) + "'>" + msg + "</span>"; return; } } - if (hasMarkup) - label.Markup = text; - else - label.Text = text; + label.Markup = "<span font='" + Theme.Font.ToString () + "' color='" + Styles.ColorGetHex (Styles.PopoverWindow.DefaultTextColor) + "'>" + msg + "</span>"; } void AdjustSize () diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/VPanedThin.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/VPanedThin.cs index ac607fda01..b2d116950b 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/VPanedThin.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/VPanedThin.cs @@ -65,7 +65,7 @@ namespace MonoDevelop.Components if (Child1 != null && Child1.Visible && Child2 != null && Child2.Visible) { var gc = new Gdk.GC (evnt.Window); - gc.RgbFgColor = Styles.ThinSplitterColor; + gc.RgbFgColor = Styles.ThinSplitterColor.ToGdkColor (); var y = Child1.Allocation.Y + Child1.Allocation.Height; evnt.Window.DrawLine (gc, Allocation.X, y, Allocation.X + Allocation.Width, y); gc.Dispose (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs index e5cb182cd1..d9dfd7307e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs @@ -285,7 +285,6 @@ namespace MonoDevelop.Ide.CodeCompletion declarationviewwindow.OverloadLeft (); else declarationviewwindow.OverloadRight (); - UpdateDeclarationView (); } else { CompletionWindowManager.HideWindow (); OnWindowClosed (EventArgs.Empty); @@ -618,10 +617,8 @@ namespace MonoDevelop.Ide.CodeCompletion } else { declarationviewwindow.SetDefaultScheme (); } - var style = Editor.Highlighting.SyntaxModeService.GetColorStyle (IdeApp.Preferences.ColorScheme); - declarationviewwindow.Theme.SetFlatColor (style.CompletionTooltipWindow.Color); - if (style.CompletionWindow.HasBorderColor) - declarationviewwindow.Theme.BorderColor = style.CompletionTooltipWindow.BorderColor; + declarationviewwindow.CaretSpacing = Gui.Styles.TooltipInfoSpacing; + declarationviewwindow.Theme.SetBackgroundColor (Gui.Styles.CodeCompletion.BackgroundColor.ToCairoColor ()); } void RepositionDeclarationViewWindow () @@ -642,7 +639,7 @@ namespace MonoDevelop.Ide.CodeCompletion base.GdkWindow.GetOrigin (out ox, out oy); declarationviewwindow.MaximumYTopBound = oy; int y = rect.Y + Theme.Padding - (int)List.vadj.Value; - declarationviewwindow.ShowPopup (this, new Gdk.Rectangle (Gui.Styles.TooltipInfoSpacing, Math.Min (Allocation.Height, Math.Max (0, y)), Allocation.Width, rect.Height), PopupPosition.Left); + declarationviewwindow.ShowPopup (this, new Gdk.Rectangle (0, Math.Min (Allocation.Height, Math.Max (0, y)), Allocation.Width, rect.Height), PopupPosition.Left); declarationViewHidden = false; } @@ -797,7 +794,7 @@ namespace MonoDevelop.Ide.CodeCompletion box.PackStart (new HSeparator (), false, false, 0); var hbox = new HBox (); hbox.BorderWidth = 3; - hbox.PackStart (new Image ("md-parser", IconSize.Menu), false, false, 0); + hbox.PackStart (new ImageView ("md-parser", IconSize.Menu), false, false, 0); var lab = new Label (GettextCatalog.GetString ("Gathering class information...")); lab.Xalign = 0; hbox.PackStart (lab, true, true, 3); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs index 0eb0a0612d..6e2ba70467 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs @@ -39,7 +39,7 @@ using MonoDevelop.Ide.Editor.Highlighting; using MonoDevelop.Ide.Editor.Extension; using MonoDevelop.Core; using Xwt.Drawing; -using MonoDevelop.Ide.TypeSystem; +using MonoDevelop.Ide.Gui; namespace MonoDevelop.Ide.CodeCompletion { @@ -48,6 +48,7 @@ namespace MonoDevelop.Ide.CodeCompletion int listWidth = minSize; const int minSize = 300; const int maxListWidth = 600; + const int rows = 10; Pango.Layout layout, categoryLayout, noMatchLayout; ListWindow win; int selection = 0; @@ -126,7 +127,7 @@ namespace MonoDevelop.Ide.CodeCompletion } } - FontDescription itemFont; + FontDescription itemFont, noMatchFont, categoryFont; const int marginIconSpacing = 4; const int iconTextSpacing = 6; @@ -136,14 +137,38 @@ namespace MonoDevelop.Ide.CodeCompletion void SetFont () { // TODO: Add font property to ICompletionWidget; + if (itemFont != null) itemFont.Dispose (); + + if (categoryFont != null) + categoryFont.Dispose (); + + if (noMatchFont != null) + noMatchFont.Dispose (); + itemFont = FontService.MonospaceFont.Copy (); - var newSize = itemFont.Size * (completionWidget != null ? this.completionWidget.ZoomLevel : 1); - if (newSize > 0) { - itemFont.Size = (int)newSize; + categoryFont = FontService.SansFont.CopyModified (Styles.FontScale11); + noMatchFont = FontService.SansFont.CopyModified (Styles.FontScale11); + + var newItemFontSize = itemFont.Size; + var newCategoryFontSize = categoryFont.Size; + var newNoMatchFontSize = noMatchFont.Size; + + if (newItemFontSize > 0) { + itemFont.Size = (int)newItemFontSize; layout.FontDescription = itemFont; } + + if (newCategoryFontSize > 0) { + categoryFont.Size = (int)newCategoryFontSize; + categoryLayout.FontDescription = categoryFont; + } + + if (newNoMatchFontSize > 0) { + noMatchFont.Size = (int)newNoMatchFontSize; + noMatchLayout.FontDescription = noMatchFont; + } } public ListWidget (ListWindow win) @@ -408,7 +433,7 @@ namespace MonoDevelop.Ide.CodeCompletion } string NoMatchesMsg { - get { return MonoDevelop.Core.GettextCatalog.GetString ("No Completions Found"); } + get { return MonoDevelop.Core.GettextCatalog.GetString ("No completions found"); } } string NoSuggestionsMsg { @@ -418,13 +443,15 @@ namespace MonoDevelop.Ide.CodeCompletion protected override bool OnExposeEvent (Gdk.EventExpose args) { using (var context = Gdk.CairoHelper.Create (args.Window)) { + var scalef = GtkWorkarounds.GetScaleFactor (this); context.LineWidth = 1; var alloc = Allocation; int width = alloc.Width; int height = alloc.Height; context.Rectangle (args.Area.X, args.Area.Y, args.Area.Width, args.Area.Height); - var backgroundColor = ColorScheme.CompletionWindow.Color; - var textColor = ColorScheme.GetForeground (ColorScheme.CompletionText); + var backgroundColor = Styles.CodeCompletion.BackgroundColor.ToCairoColor (); + var textColor = Styles.CodeCompletion.TextColor.ToCairoColor (); + var categoryColor = Styles.CodeCompletion.CategoryColor.ToCairoColor (); context.SetSourceColor (backgroundColor); context.Fill (); int xpos = iconTextSpacing; @@ -438,7 +465,7 @@ namespace MonoDevelop.Ide.CodeCompletion int lWidth, lHeight; noMatchLayout.GetPixelSize (out lWidth, out lHeight); context.SetSourceColor (textColor); - context.MoveTo ((width - lWidth) / 2, yPos + (height - lHeight - yPos) / 2 - lHeight); + context.MoveTo ((width - lWidth) / 2, yPos + (height - lHeight - yPos) / 2 - lHeight / 2); Pango.CairoHelper.ShowLayout (context, noMatchLayout); return false; } @@ -459,9 +486,9 @@ namespace MonoDevelop.Ide.CodeCompletion } context.Rectangle (0, ypos, Allocation.Width, rowHeight); context.SetSourceColor (backgroundColor); - context.Fill ();
-
-
+ context.Fill (); + + // layout.SetMarkup ("<span weight='bold' foreground='#AAAAAA'>" + (category.CompletionCategory != null ? category.CompletionCategory.DisplayText : "Uncategorized") + "</span>"); // window.DrawLayout (textGCInsensitive, x - 1, ypos + 1 + (rowHeight - py) / 2, layout); // layout.SetMarkup ("<span weight='bold'>" + (category.CompletionCategory != null ? category.CompletionCategory.DisplayText : "Uncategorized") + "</span>"); @@ -469,7 +496,7 @@ namespace MonoDevelop.Ide.CodeCompletion int px, py; categoryLayout.GetPixelSize (out px, out py); context.MoveTo (x, ypos + (rowHeight - py) / 2); - context.SetSourceColor (textColor); + context.SetSourceColor (categoryColor); Pango.CairoHelper.ShowLayout (context, categoryLayout); }, delegate (Category curCategory, int item, int itemidx, int ypos) { if (ypos >= height) @@ -499,23 +526,18 @@ namespace MonoDevelop.Ide.CodeCompletion Pango.AttrList attrList = layout.Attributes ?? new Pango.AttrList (); for (int newSelection = 0; newSelection < matchIndices.Length; newSelection++) { int idx = matchIndices [newSelection]; - ChunkStyle stringStyle; - if (item == SelectedItem) { - stringStyle = ColorScheme.CompletionSelectedMatchingSubstring; - } else { - stringStyle= ColorScheme.CompletionMatchingSubstring; - } - var highlightColor = (Cairo.Color)ColorScheme.GetForeground (stringStyle); - var fg = new AttrForeground ((ushort)(highlightColor.R * ushort.MaxValue), (ushort)(highlightColor.G * ushort.MaxValue), (ushort)(highlightColor.B * ushort.MaxValue)); - fg.StartIndex = (uint)idx; - fg.EndIndex = (uint)(idx + 1); - attrList.Insert (fg); - - if (stringStyle.FontWeight != FontWeight.Normal) { - var variant = new AttrWeight ((Pango.Weight)stringStyle.FontWeight); - variant.StartIndex = (uint)idx; - variant.EndIndex = (uint)(idx + 1); - attrList.Insert (variant); + var bold = new AttrWeight (Weight.Bold); + + bold.StartIndex = (uint)idx; + bold.EndIndex = (uint)(idx + 1); + attrList.Insert (bold); + + if (item != SelectedItem) { + var highlightColor = (item == SelectedItem) ? Styles.CodeCompletion.SelectionHighlightColor : Styles.CodeCompletion.HighlightColor; + var fg = new AttrForeground ((ushort)(highlightColor.Red * ushort.MaxValue), (ushort)(highlightColor.Green * ushort.MaxValue), (ushort)(highlightColor.Blue * ushort.MaxValue)); + fg.StartIndex = (uint)idx; + fg.EndIndex = (uint)(idx + 1); + attrList.Insert (fg); } } layout.Attributes = attrList; @@ -525,6 +547,8 @@ namespace MonoDevelop.Ide.CodeCompletion Xwt.Drawing.Image icon = win.DataProvider.GetIcon (item); int iconHeight, iconWidth; if (icon != null) { + if (item == SelectedItem) + icon = icon.WithStyles("sel"); iconWidth = (int)icon.Width; iconHeight = (int)icon.Height; } else if (!Gtk.Icon.SizeLookup (IconSize.Menu, out iconWidth, out iconHeight)) { @@ -536,30 +560,22 @@ namespace MonoDevelop.Ide.CodeCompletion typos = he < rowHeight ? ypos + (int)Math.Ceiling((rowHeight - he) / 2.0) : ypos; + if (scalef <= 1.0) + typos -= 1; // 1px up on non HiDPI iypos = iconHeight < rowHeight ? ypos + (rowHeight - iconHeight) / 2 : ypos; if (item == SelectedItem) { - context.Rectangle (0, ypos, Allocation.Width, rowHeight / 2); - var barStyle = SelectionEnabled ? ColorScheme.CompletionSelectionBarBackground : ColorScheme.CompletionSelectionBarBackgroundInactive; - var barBorderStyle = SelectionEnabled ? ColorScheme.CompletionSelectionBarBorder : ColorScheme.CompletionSelectionBarBorderInactive; + var barStyle = SelectionEnabled ? Styles.CodeCompletion.SelectionBackgroundColor : Styles.CodeCompletion.SelectionBackgroundInactiveColor; - context.SetSourceColor (barStyle.Color); + context.Rectangle (0, ypos, Allocation.Width, rowHeight); + context.SetSourceColor (barStyle.ToCairoColor ()); context.Fill (); - context.Rectangle (0, ypos + rowHeight / 2, Allocation.Width, rowHeight / 2); - context.SetSourceColor (barStyle.SecondColor); - context.Fill (); - - context.Rectangle (0.5, ypos + 0.5, Allocation.Width - 1, rowHeight - 1); - if (!SelectionEnabled) - context.SetDash (new double[] {4, 4}, 0); - context.SetSourceColor (barBorderStyle.Color); - context.Stroke (); } if (icon != null) { context.DrawImage (this, icon, xpos, iypos); xpos += iconTextSpacing; } - context.SetSourceColor (item == SelectedItem ? ColorScheme.GetForeground (ColorScheme.CompletionSelectedText) : textColor); + context.SetSourceColor ((item == SelectedItem ? Styles.CodeCompletion.SelectionTextColor : Styles.CodeCompletion.TextColor).ToCairoColor ()); var textXPos = xpos + iconWidth + 2; context.MoveTo (textXPos, typos); layout.Width = (int)((Allocation.Width - textXPos) * Pango.Scale.PangoScale); @@ -581,6 +597,8 @@ namespace MonoDevelop.Ide.CodeCompletion layout.GetPixelSize (out w, out h); wi += w; typos = h < rowHeight ? ypos + (rowHeight - h) / 2 : ypos; + if (scalef <= 1.0) + typos -= 1; // 1px up on non HiDPI context.MoveTo (Allocation.Width - w, typos); Pango.CairoHelper.ShowLayout (context, layout); } @@ -749,7 +767,7 @@ namespace MonoDevelop.Ide.CodeCompletion var icon = ImageService.GetIcon (TypeSystem.Stock.Namespace, IconSize.Menu); rowHeight = Math.Max (1, (int)icon.Height + 2); - int newHeight = rowHeight * IdeApp.Preferences.CompletionListRows; + int newHeight = rowHeight * rows; if (Allocation.Width != listWidth || Allocation.Height != newHeight) this.SetSizeRequest (listWidth, newHeight); SetAdjustments (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWindow.cs index fe7e9d9f8c..daba7f1cc7 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWindow.cs @@ -89,25 +89,44 @@ namespace MonoDevelop.Ide.CodeCompletion list.ScrollEvent += new ScrollEventHandler (OnScrolled); scrollbar = new MonoDevelop.Components.CompactScrolledWindow (); + scrollbar.Name = "CompletionScrolledWindow"; // use a different gtkrc style for GtkScrollBar scrollbar.Child = list; list.ButtonPressEvent += delegate(object o, ButtonPressEventArgs args) { if (args.Event.Button == 1 && args.Event.Type == Gdk.EventType.TwoButtonPress) DoubleClick (); }; vbox.PackEnd (scrollbar, true, true, 0); - ContentBox.Add (vbox); + var colorBox = new EventBox (); + colorBox.Add (vbox); + ContentBox.Add (colorBox); this.AutoSelect = true; this.TypeHint = WindowTypeHint.Menu; - Theme.CornerRadius = 4; + Theme.CornerRadius = 0; + Theme.Padding = 0; + + UpdateStyle (); + Gui.Styles.Changed += HandleSkinChanged; + IdeApp.Preferences.ColorScheme.Changed += HandleSkinChanged; + } + + void HandleSkinChanged (object sender, EventArgs e) + { + UpdateStyle (); + } + + void UpdateStyle () + { + Theme.SetBackgroundColor (Gui.Styles.CodeCompletion.BackgroundColor.ToCairoColor ()); + Theme.ShadowColor = Gui.Styles.PopoverWindow.ShadowColor.ToCairoColor (); + ContentBox.Child.ModifyBg (StateType.Normal, Gui.Styles.CodeCompletion.BackgroundColor.ToGdkColor ()); + list.ModifyBg (StateType.Normal, Gui.Styles.CodeCompletion.BackgroundColor.ToGdkColor ()); } - protected override void OnShown () + protected override void OnDestroyed () { - var style = SyntaxModeService.GetColorStyle (IdeApp.Preferences.ColorScheme); - Theme.SetFlatColor (style.CompletionWindow.Color); - if (style.CompletionWindow.HasBorderColor) - Theme.BorderColor = style.CompletionWindow.BorderColor; - base.OnShown (); + base.OnDestroyed (); + Gui.Styles.Changed -= HandleSkinChanged; + IdeApp.Preferences.ColorScheme.Changed -= HandleSkinChanged; } protected virtual void DoubleClick () diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs index 6d84be79d3..7b72ec5fcc 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs @@ -36,6 +36,7 @@ using MonoDevelop.Ide.Editor.Highlighting; using MonoDevelop.Ide.Editor.Extension; using System.Threading.Tasks; using System.Threading; +using MonoDevelop.Ide.Gui; namespace MonoDevelop.Ide.CodeCompletion { @@ -79,8 +80,6 @@ namespace MonoDevelop.Ide.CodeCompletion headlabel = new MonoDevelop.Components.FixedWidthWrapLabel (); headlabel.Indent = -20; - - headlabel.FontDescription = FontService.GetFontDescription ("Editor").CopyModified (1.1); headlabel.Wrap = Pango.WrapMode.WordChar; headlabel.BreakOnCamelCasing = false; @@ -96,18 +95,43 @@ namespace MonoDevelop.Ide.CodeCompletion vb2.Spacing = 4; vb2.PackStart (hb, true, true, 0); ContentBox.Add (vb2); + + UpdateStyle (); + Styles.Changed += HandleSkinChanged; + IdeApp.Preferences.ColorScheme.Changed += HandleSkinChanged; + ShowAll (); DesktopService.RemoveWindowShadow (this); } - protected override void OnShown () + void UpdateStyle () { var scheme = SyntaxModeService.GetColorStyle (IdeApp.Preferences.ColorScheme); + if (!scheme.FitsIdeSkin (IdeApp.Preferences.UserInterfaceSkin)) + scheme = SyntaxModeService.GetDefaultColorStyle (IdeApp.Preferences.UserInterfaceSkin); + Theme.SetSchemeColors (scheme); - foreColor = scheme.PlainText.Foreground; + Theme.Font = FontService.SansFont.CopyModified (Styles.FontScale11); + Theme.ShadowColor = Styles.PopoverWindow.ShadowColor.ToCairoColor (); + foreColor = Styles.PopoverWindow.DefaultTextColor.ToCairoColor (); + headlabel.ModifyFg (StateType.Normal, foreColor.ToGdkColor ()); + headlabel.FontDescription = FontService.GetFontDescription ("Editor").CopyModified (Styles.FontScale11); - base.OnShown (); + if (this.Visible) + QueueDraw (); + } + + void HandleSkinChanged (object sender, EventArgs e) + { + UpdateStyle (); + } + + protected override void OnDestroyed () + { + base.OnDestroyed (); + Styles.Changed -= HandleSkinChanged; + IdeApp.Preferences.ColorScheme.Changed -= HandleSkinChanged; } int lastParam = -2; @@ -207,7 +231,7 @@ namespace MonoDevelop.Ide.CodeCompletion VBox CreateCategory (string categoryName, string categoryContentMarkup) { - return TooltipInformationWindow.CreateCategory (categoryName, categoryContentMarkup, foreColor); + return TooltipInformationWindow.CreateCategory (categoryName, categoryContentMarkup, foreColor, Theme.Font); } public void ChangeOverload () @@ -215,6 +239,20 @@ namespace MonoDevelop.Ide.CodeCompletion lastParam = -2; ResetTooltipInformation (); } + + protected override void OnPagerLeftClicked () + { + if (Ext != null && Widget != null) + ParameterInformationWindowManager.OverloadUp (Ext, Widget); + base.OnPagerRightClicked (); + } + + protected override void OnPagerRightClicked () + { + if (Ext != null && Widget != null) + ParameterInformationWindowManager.OverloadDown (Ext, Widget); + base.OnPagerRightClicked (); + } public void HideParameterInfo () { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindowManager.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindowManager.cs index 5634ea75a8..fc7c2e6e51 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindowManager.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindowManager.cs @@ -67,28 +67,10 @@ namespace MonoDevelop.Ide.CodeCompletion if (methods.Count == 0) return false; - MethodData cmd = methods [methods.Count - 1]; - if (descriptor.SpecialKey == SpecialKey.Down) { - if (cmd.MethodProvider.Count <= 1) - return false; - if (cmd.CurrentOverload < cmd.MethodProvider.Count - 1) - cmd.CurrentOverload ++; - else - cmd.CurrentOverload = 0; - window.ChangeOverload (); - UpdateWindow (ext, widget); - return true; + return OverloadDown (ext, widget); } else if (descriptor.SpecialKey == SpecialKey.Up) { - if (cmd.MethodProvider.Count <= 1) - return false; - if (cmd.CurrentOverload > 0) - cmd.CurrentOverload --; - else - cmd.CurrentOverload = cmd.MethodProvider.Count - 1; - window.ChangeOverload (); - UpdateWindow (ext, widget); - return true; + return OverloadUp (ext, widget); } else if (descriptor.SpecialKey == SpecialKey.Escape) { HideWindow (ext, widget); @@ -96,6 +78,38 @@ namespace MonoDevelop.Ide.CodeCompletion } return false; } + + internal static bool OverloadDown (CompletionTextEditorExtension ext, ICompletionWidget widget) + { + if (methods.Count == 0) + return false; + MethodData cmd = methods [methods.Count - 1]; + if (cmd.MethodProvider.Count <= 1) + return false; + if (cmd.CurrentOverload < cmd.MethodProvider.Count - 1) + cmd.CurrentOverload ++; + else + cmd.CurrentOverload = 0; + window.ChangeOverload (); + UpdateWindow (ext, widget); + return true; + } + + internal static bool OverloadUp (CompletionTextEditorExtension ext, ICompletionWidget widget) + { + if (methods.Count == 0) + return false; + MethodData cmd = methods [methods.Count - 1]; + if (cmd.MethodProvider.Count <= 1) + return false; + if (cmd.CurrentOverload > 0) + cmd.CurrentOverload --; + else + cmd.CurrentOverload = cmd.MethodProvider.Count - 1; + window.ChangeOverload (); + UpdateWindow (ext, widget); + return true; + } internal static void PostProcessKeyEvent (CompletionTextEditorExtension ext, ICompletionWidget widget, KeyDescriptor descriptor) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs index 37316ca81b..720aac3688 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs @@ -29,6 +29,7 @@ using MonoDevelop.Components; using System.Collections.Generic; using MonoDevelop.Core; using MonoDevelop.Ide.Fonts; +using MonoDevelop.Ide.Gui; using System.Linq; using MonoDevelop.Ide.Editor; using MonoDevelop.Ide.Editor.Highlighting; @@ -87,7 +88,7 @@ namespace MonoDevelop.Ide.CodeCompletion return; using (var layout = new Pango.Layout (PangoContext)) { - layout.FontDescription = FontService.GetFontDescription ("Editor"); + layout.FontDescription = Theme.Font; layout.SetMarkup (tooltipInformation.SignatureMarkup); int w, h; layout.GetPixelSize (out w, out h); @@ -126,11 +127,11 @@ namespace MonoDevelop.Ide.CodeCompletion headLabel.WidthRequest = -1; } foreach (var cat in o.Categories) { - descriptionBox.PackStart (CreateCategory (GetHeaderMarkup (cat.Item1), cat.Item2, foreColor), true, true, 4); + descriptionBox.PackStart (CreateCategory (GetHeaderMarkup (cat.Item1), cat.Item2, foreColor, Theme.Font), true, true, 4); } if (!string.IsNullOrEmpty (o.SummaryMarkup)) { - descriptionBox.PackStart (CreateCategory (GetHeaderMarkup (GettextCatalog.GetString ("Summary")), o.SummaryMarkup, foreColor), true, true, 4); + descriptionBox.PackStart (CreateCategory (GetHeaderMarkup (GettextCatalog.GetString ("Summary")), o.SummaryMarkup, foreColor, Theme.Font), true, true, 4); } if (!string.IsNullOrEmpty (o.FooterMarkup)) { @@ -141,7 +142,7 @@ namespace MonoDevelop.Ide.CodeCompletion contentLabel.MaxWidth = 400; contentLabel.Markup = o.FooterMarkup.Trim (); contentLabel.ModifyFg (StateType.Normal, foreColor.ToGdkColor ()); - contentLabel.FontDescription = FontService.GetFontDescription ("Editor"); + contentLabel.FontDescription = Theme.Font; descriptionBox.PackEnd (contentLabel, true, true, 4); } @@ -152,7 +153,13 @@ namespace MonoDevelop.Ide.CodeCompletion descriptionBox.ShowAll (); } Theme.CurrentPage = current_overload; - QueueResize (); + // if the target is not on the left or top side, we may loose the arrow alignment on our target + // and must reposition + if (!CurrentPosition.HasFlag (PopupPosition.Left) && + !CurrentPosition.HasFlag (PopupPosition.Top)) + RepositionWindow (); + else + QueueResize (); } } @@ -202,7 +209,7 @@ namespace MonoDevelop.Ide.CodeCompletion current_overload = 0; } - internal static VBox CreateCategory (string categoryName, string categoryContentMarkup, Cairo.Color foreColor) + internal static VBox CreateCategory (string categoryName, string categoryContentMarkup, Cairo.Color foreColor, Pango.FontDescription font) { var vbox = new VBox (); @@ -212,7 +219,9 @@ namespace MonoDevelop.Ide.CodeCompletion var catLabel = new FixedWidthWrapLabel (); catLabel.Markup = categoryName; catLabel.ModifyFg (StateType.Normal, foreColor.ToGdkColor ()); - catLabel.FontDescription = FontService.GetFontDescription ("Editor"); + catLabel.FontDescription = font.Copy (); + catLabel.FontDescription.Weight = Pango.Weight.Bold; + catLabel.FontDescription.Size = catLabel.FontDescription.Size + (int)(1 * Pango.Scale.PangoScale); vbox.PackStart (catLabel, false, true, 0); } @@ -223,12 +232,13 @@ namespace MonoDevelop.Ide.CodeCompletion contentLabel.Wrap = Pango.WrapMode.WordChar; + contentLabel.Spacing = 1; contentLabel.BreakOnCamelCasing = false; contentLabel.BreakOnPunctuation = false; contentLabel.MaxWidth = 400; contentLabel.Markup = categoryContentMarkup.Trim (); contentLabel.ModifyFg (StateType.Normal, foreColor.ToGdkColor ()); - contentLabel.FontDescription = FontService.GetFontDescription ("Editor"); + contentLabel.FontDescription = font; hbox.PackStart (contentLabel, true, true, 0); vbox.PackStart (hbox, true, true, 0); @@ -243,9 +253,17 @@ namespace MonoDevelop.Ide.CodeCompletion internal void SetDefaultScheme () { var scheme = SyntaxModeService.GetColorStyle (IdeApp.Preferences.ColorScheme); + if (!scheme.FitsIdeSkin (IdeApp.Preferences.UserInterfaceSkin)) + scheme = SyntaxModeService.GetDefaultColorStyle (IdeApp.Preferences.UserInterfaceSkin); + Theme.SetSchemeColors (scheme); - foreColor = scheme.PlainText.Foreground; + foreColor = Styles.PopoverWindow.DefaultTextColor.ToCairoColor (); headLabel.ModifyFg (StateType.Normal, foreColor.ToGdkColor ()); + headLabel.FontDescription = FontService.GetFontDescription ("Editor").CopyModified (Styles.FontScale11); + Theme.Font = FontService.SansFont.CopyModified (Styles.FontScale11); + Theme.ShadowColor = Styles.PopoverWindow.ShadowColor.ToCairoColor (); + if (this.Visible) + ShowOverload (); } public TooltipInformationWindow () : base () @@ -261,7 +279,6 @@ namespace MonoDevelop.Ide.CodeCompletion headLabel = new FixedWidthWrapLabel (); headLabel.Indent = -20; - headLabel.FontDescription = FontService.GetFontDescription ("Editor").CopyModified (1.1); headLabel.Wrap = Pango.WrapMode.WordChar; headLabel.BreakOnCamelCasing = false; headLabel.BreakOnPunctuation = false; @@ -283,6 +300,8 @@ namespace MonoDevelop.Ide.CodeCompletion vb2.ShowAll (); SetDefaultScheme (); + Styles.Changed += HandleSkinChanged; + IdeApp.Preferences.ColorScheme.Changed += HandleSkinChanged; } public override void RepositionWindow(Gdk.Rectangle? newCaret = null) @@ -295,5 +314,29 @@ namespace MonoDevelop.Ide.CodeCompletion return false; }); } + + protected override void OnPagerLeftClicked () + { + OverloadLeft (); + base.OnPagerLeftClicked (); + } + + protected override void OnPagerRightClicked () + { + OverloadRight (); + base.OnPagerRightClicked (); + } + + void HandleSkinChanged (object sender, EventArgs e) + { + SetDefaultScheme (); + } + + protected override void OnDestroyed () + { + base.OnDestroyed (); + Styles.Changed -= HandleSkinChanged; + IdeApp.Preferences.ColorScheme.Changed -= HandleSkinChanged; + } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/HelpCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/HelpCommands.cs index 623c3d4dd4..7af7b25668 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/HelpCommands.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/HelpCommands.cs @@ -90,6 +90,12 @@ namespace MonoDevelop.Ide.Commands { CommonAboutDialog.ShowAboutDialog (); } + + protected override void Update (CommandInfo info) + { + base.Update (info); + info.Icon = MonoDevelop.Core.BrandingService.HelpAboutIconId; + } } class SendFeedbackHandler : CommandHandler diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ColorScheme.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ColorScheme.cs index 48e675b087..126fd79a13 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ColorScheme.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/ColorScheme.cs @@ -70,14 +70,8 @@ namespace MonoDevelop.Ide.Editor.Highlighting [ColorDescription("Indicator Margin(Separator)", VSSetting="color=Indicator Margin/Background")] public AmbientColor IndicatorMarginSeparator { get; private set; } - [ColorDescription("Tooltip Border")] - public AmbientColor TooltipBorder { get; private set; } - [ColorDescription("Tooltip Pager Top")] - public AmbientColor TooltipPagerTop { get; private set; } - - [ColorDescription("Tooltip Pager Bottom")] - public AmbientColor TooltipPagerBottom { get; private set; } + public AmbientColor TooltipPager { get; private set; } [ColorDescription("Tooltip Pager Triangle")] public AmbientColor TooltipPagerTriangle { get; private set; } @@ -1044,18 +1038,12 @@ namespace MonoDevelop.Ide.Editor.Highlighting h.L += 0.01; result.TooltipText.Background = h; - result.TooltipPagerTop = new AmbientColor (); - result.TooltipPagerTop.Colors.Add (Tuple.Create ("color", result.TooltipText.Background)); - - result.TooltipPagerBottom = new AmbientColor (); - result.TooltipPagerBottom.Colors.Add (Tuple.Create ("color", result.TooltipText.Background)); + result.TooltipPager = new AmbientColor (); + result.TooltipPager.Colors.Add (Tuple.Create ("color", result.TooltipText.Background)); result.TooltipPagerTriangle = new AmbientColor (); result.TooltipPagerTriangle.Colors.Add (Tuple.Create ("color", AlphaBlend (result.PlainText.Foreground, result.PlainText.Background, 0.8))); - result.TooltipBorder = new AmbientColor (); - result.TooltipBorder.Colors.Add (Tuple.Create ("color", AlphaBlend (result.PlainText.Foreground, result.PlainText.Background, 0.5))); - var defaultStyle = SyntaxModeService.GetColorStyle (HslColor.Brightness (result.PlainText.Background) < 0.5 ? "Monokai" : "Default"); foreach (var color in textColors.Values) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/SyntaxModeService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/SyntaxModeService.cs index db4d199846..a08e2fe172 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/SyntaxModeService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/SyntaxModeService.cs @@ -66,6 +66,31 @@ namespace MonoDevelop.Ide.Editor.Highlighting } } + public static ColorScheme GetDefaultColorStyle (this Skin skin) + { + switch (skin) { + case Skin.Light: + return GetColorStyle (IdePreferences.DefaultLightColorScheme); + case Skin.Dark: + return GetColorStyle (IdePreferences.DefaultDarkColorScheme); + default: + throw new InvalidOperationException (); + } + } + + public static ColorScheme GetUserColorStyle (this Skin skin) + { + var schemeName = IdeApp.Preferences.ColorScheme.ValueForSkin (skin); + return GetColorStyle (schemeName); + } + + public static bool FitsIdeSkin (this ColorScheme scheme, Skin skin) + { + if (skin == Skin.Dark) + return (scheme.PlainText.Background.L <= 0.5); + return (scheme.PlainText.Background.L > 0.5); + } + public static ColorScheme GetColorStyle (string name) { if (styles.ContainsKey (name)) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs index d6d86864c3..6b37d6d84c 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs @@ -258,6 +258,8 @@ namespace MonoDevelop.Ide.Editor UpdateStylePolicy (currentPolicy); FontService.RegisterFontChangedCallback ("Editor", UpdateFont); FontService.RegisterFontChangedCallback ("MessageBubbles", UpdateFont); + + IdeApp.Preferences.ColorScheme.Changed += OnColorSchemeChanged; } void UpdateFont () @@ -690,10 +692,14 @@ namespace MonoDevelop.Ide.Editor return colorScheme; } set { - if (colorScheme.Set (value)) - OnChanged (EventArgs.Empty); + colorScheme.Set (value); } } + + void OnColorSchemeChanged (object sender, EventArgs e) + { + OnChanged (EventArgs.Empty); + } ConfigurationProperty<bool> generateFormattingUndoStep = ConfigurationProperty.Create ("GenerateFormattingUndoStep", false); public bool GenerateFormattingUndoStep { @@ -756,6 +762,7 @@ namespace MonoDevelop.Ide.Editor public void Dispose () { FontService.RemoveCallback (UpdateFont); + IdeApp.Preferences.ColorScheme.Changed -= OnColorSchemeChanged; } protected void OnChanged (EventArgs args) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/ITextEditorImpl.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/ITextEditorImpl.cs index 83fe4e1a81..8e9638b239 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/ITextEditorImpl.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/InternalExtensionAPI/ITextEditorImpl.cs @@ -199,7 +199,7 @@ namespace MonoDevelop.Ide.Editor IEnumerable<IFoldSegment> GetFoldingsIn (int offset, int length); - string GetPangoMarkup (int offset, int length); + string GetPangoMarkup (int offset, int length, bool fitIdeStyle = false); void SetIndentationTracker (IndentationTracker indentationTracker); void SetSelectionSurroundingProvider (SelectionSurroundingProvider surroundingProvider); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs index 02729e3641..db5f65f1dd 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs @@ -1164,16 +1164,16 @@ namespace MonoDevelop.Ide.Editor #endregion - public string GetPangoMarkup (int offset, int length) + public string GetPangoMarkup (int offset, int length, bool fitIdeStyle = false) { - return textEditorImpl.GetPangoMarkup (offset, length); + return textEditorImpl.GetPangoMarkup (offset, length, fitIdeStyle); } - public string GetPangoMarkup (ISegment segment) + public string GetPangoMarkup (ISegment segment, bool fitIdeStyle = false) { if (segment == null) throw new ArgumentNullException (nameof (segment)); - return textEditorImpl.GetPangoMarkup (segment.Offset, segment.Length); + return textEditorImpl.GetPangoMarkup (segment.Offset, segment.Length, fitIdeStyle); } public static implicit operator Microsoft.CodeAnalysis.Text.SourceText (TextEditor editor) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs index 93a50109bb..cd974b4cdb 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs @@ -143,6 +143,7 @@ namespace MonoDevelop.Ide.FindInFiles FindInFilesDialog (bool showReplace) { Build (); + IdeTheme.ApplyTheme (this); properties = PropertyService.Get ("MonoDevelop.FindReplaceDialogs.SearchOptions", new Properties ()); SetButtonIcon (toggleReplaceInFiles, "gtk-find-and-replace"); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs index ba3f8f9c5e..257dabc8ce 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs @@ -209,12 +209,24 @@ namespace MonoDevelop.Ide.FindInFiles scrolledwindowLogView.Hide (); treeviewSearchResults.FixedHeightMode = true; + UpdateStyles (); + IdeApp.Preferences.ColorScheme.Changed += UpdateStyles; } - - protected override void OnRealized () + + void UpdateStyles (object sender = null, EventArgs e = null) { - base.OnRealized (); highlightStyle = SyntaxModeService.GetColorStyle (IdeApp.Preferences.ColorScheme); + if (!highlightStyle.FitsIdeSkin (IdeApp.Preferences.UserInterfaceSkin)) + highlightStyle = SyntaxModeService.GetDefaultColorStyle (Ide.IdeApp.Preferences.UserInterfaceSkin); + + if (markupCache != null) + markupCache = new List<Tuple<SearchResult, string>> (); + if (IsRealized) { + store.Foreach ((model, path, iter) => { + model.EmitRowChanged (path, iter); + return false; + }); + } } void ButtonPinClicked (object sender, EventArgs e) @@ -311,10 +323,10 @@ namespace MonoDevelop.Ide.FindInFiles double delta = Math.Abs (b1 - b2); if (delta < 0.1) { HslColor color1 = color; - color1.L -= 0.5; + color1.L += IdeApp.Preferences.UserInterfaceSkin == Skin.Light ? -0.5 : 0.5; if (Math.Abs (HslColor.Brightness (color1) - b2) < delta) { color1 = color; - color1.L += 0.5; + color1.L += IdeApp.Preferences.UserInterfaceSkin == Skin.Light ? 0.5 : -0.5; } return color1; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs index d8473dcb86..8ed930dad7 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontChooserPanelWidget.cs @@ -86,6 +86,7 @@ namespace MonoDevelop.Ide.Fonts DestroyWithParent = true, TransientFor = this.Toplevel as Gtk.Window }; + MonoDevelop.Components.IdeTheme.ApplyTheme (selectionDialog); try { string fontValue = FontService.FilterFontName (GetFont (desc.Name)); selectionDialog.SetFontName (fontValue); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontService.cs index bd57e3f8b7..100c7cd3f6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Fonts/FontService.cs @@ -39,25 +39,19 @@ namespace MonoDevelop.Ide.Fonts static Dictionary<string, FontDescription> loadedFonts = new Dictionary<string, FontDescription> (); static Properties fontProperties; - static string defaultMonospaceFontName, defaultSansFontName; - static FontDescription defaultMonospaceFont, defaultSansFont; + static string defaultMonospaceFontName = String.Empty; + static FontDescription defaultMonospaceFont = new FontDescription (); static void LoadDefaults () { if (defaultMonospaceFont != null) { defaultMonospaceFont.Dispose (); - defaultSansFont.Dispose (); } #pragma warning disable 618 defaultMonospaceFontName = DesktopService.DefaultMonospaceFont; defaultMonospaceFont = FontDescription.FromString (defaultMonospaceFontName); #pragma warning restore 618 - - var label = new Gtk.Label (""); - defaultSansFont = label.Style.FontDescription.Copy (); - label.Destroy (); - defaultSansFontName = defaultSansFont.ToString (); } internal static IEnumerable<FontDescriptionCodon> FontDescriptions { @@ -91,10 +85,10 @@ namespace MonoDevelop.Ide.Fonts } public static FontDescription MonospaceFont { get { return defaultMonospaceFont; } } - public static FontDescription SansFont { get { return defaultSansFont; } } + public static FontDescription SansFont { get { return Gui.Styles.DefaultFont; } } public static string MonospaceFontName { get { return defaultMonospaceFontName; } } - public static string SansFontName { get { return defaultSansFontName; } } + public static string SansFontName { get { return Gui.Styles.DefaultFontName; } } [Obsolete ("Use MonospaceFont")] public static FontDescription DefaultMonospaceFontDescription { @@ -117,7 +111,7 @@ namespace MonoDevelop.Ide.Fonts case "_DEFAULT_MONOSPACE": return defaultMonospaceFontName; case "_DEFAULT_SANS": - return defaultSansFontName; + return SansFontName; default: return name; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs index 48cbf412be..7446c0e012 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs @@ -67,8 +67,6 @@ namespace MonoDevelop.Ide.Gui.Components TreeBuilderContext builderContext; Hashtable callbacks = new Hashtable (); bool editingText = false; - bool showSelectionPopupButton; - Gtk.TreeIter? lastPopupButtonIter; TreePadOption[] options; TreeOptions globalOptions; @@ -246,7 +244,6 @@ namespace MonoDevelop.Ide.Gui.Components tree.CursorChanged += OnSelectionChanged; tree.KeyPressEvent += OnKeyPress; - tree.ButtonPressEvent += HandleButtonPressEvent; tree.MotionNotifyEvent += HandleMotionNotifyEvent; tree.LeaveNotifyEvent += HandleLeaveNotifyEvent; @@ -334,7 +331,6 @@ namespace MonoDevelop.Ide.Gui.Components cell.TextMarkup = info.Label; cell.StatusIcon = info.StatusIconInternal; - cell.ShowPopupButton = (bool)model.GetValue (it, ShowPopupColumn); } public void UpdateBuilders (NodeBuilder[] builders, TreePadOption[] options) @@ -478,18 +474,6 @@ namespace MonoDevelop.Ide.Gui.Components } [GLib.ConnectBefore] - void HandleButtonPressEvent (object o, Gtk.ButtonPressEventArgs args) - { - if (ShowSelectionPopupButton && text_render.PointerInButton ((int)args.Event.XRoot, (int)args.Event.YRoot)) { - text_render.Pushed = true; - args.RetVal = true; - var entryset = BuildEntrySet (); - - IdeApp.CommandService.ShowContextMenu (tree, args.Event, entryset, this, HandleMenuHidden); - } - } - - [GLib.ConnectBefore] void HandleMotionNotifyEvent (object o, Gtk.MotionNotifyEventArgs args) { Gtk.TreePath path; @@ -498,12 +482,6 @@ namespace MonoDevelop.Ide.Gui.Components bool popupShown = false; if (tree.GetPathAtPos ((int)args.Event.X, (int)args.Event.Y, out path, out col, out cx, out cy)) { - if (ShowSelectionPopupButton) { - text_render.PointerPosition = new Gdk.Point ((int)args.Event.XRoot, (int)args.Event.YRoot); - var area = tree.GetCellArea (path, tree.Columns [0]); - tree.QueueDrawArea (area.X, area.Y, area.Width, area.Height); - } - Gtk.TreeIter it; if (store.GetIter (out it, path)) { var info = (NodeInfo)store.GetValue (it, NodeInfoColumn); @@ -2049,14 +2027,6 @@ namespace MonoDevelop.Ide.Gui.Components tree.CollapseAll(); } - public bool ShowSelectionPopupButton { - get { return showSelectionPopupButton; } - set { - showSelectionPopupButton = value; - UpdateSelectionPopupButton (); - } - } - [GLib.ConnectBefore] void OnKeyPress (object o, Gtk.KeyPressEventArgs args) { @@ -2119,33 +2089,8 @@ namespace MonoDevelop.Ide.Gui.Components ActivateCurrentItem (); } - void UpdateSelectionPopupButton () - { - if (editingText) - return; - - if (lastPopupButtonIter != null) { - if (store.IterIsValid (lastPopupButtonIter.Value)) - tree.Model.SetValue (lastPopupButtonIter.Value, ShowPopupColumn, false); - lastPopupButtonIter = null; - } - - if (showSelectionPopupButton) { - var sel = Tree.Selection.GetSelectedRows (); - if (sel.Length > 0) { - Gtk.TreeIter it; - if (store.GetIter (out it, sel[0])) { - lastPopupButtonIter = it; - tree.Model.SetValue (it, ShowPopupColumn, true); - } - } - } - } - void OnSelectionChanged (object sender, EventArgs args) { - UpdateSelectionPopupButton (); - TreeNodeNavigator node = (TreeNodeNavigator) GetSelectedNode (); if (node != null) { NodeBuilder[] chain = node.NodeBuilderChain; @@ -2210,24 +2155,6 @@ namespace MonoDevelop.Ide.Gui.Components return widget.Parent; } - class PopupButton: Gtk.EventBox - { - public event EventHandler Clicked; - - public PopupButton () - { - Gtk.Button b = new Gtk.Button ("..."); - b.CanFocus = false; - Add (b); - - b.Clicked += delegate { - if (Clicked != null) - Clicked (this, EventArgs.Empty); - }; - ShowAll (); - } - } - internal class PadCheckMenuItem: Gtk.CheckMenuItem { internal string Id; @@ -2426,9 +2353,6 @@ namespace MonoDevelop.Ide.Gui.Components Pango.Layout layout; Pango.FontDescription scaledFont, customFont; - static Xwt.Drawing.Image popupIcon; - static Xwt.Drawing.Image popupIconDown; - static Xwt.Drawing.Image popupIconHover; bool bound; ExtensibleTreeView parent; Gdk.Rectangle buttonScreenRect; @@ -2455,9 +2379,6 @@ namespace MonoDevelop.Ide.Gui.Components static CustomCellRendererText () { - popupIcon = Xwt.Drawing.Image.FromResource ("tree-popup-button.png"); - popupIconDown = Xwt.Drawing.Image.FromResource ("tree-popup-button-down.png"); - popupIconHover = Xwt.Drawing.Image.FromResource ("tree-popup-button-hover.png"); } [GLib.Property ("text-markup")] @@ -2466,9 +2387,6 @@ namespace MonoDevelop.Ide.Gui.Components set { Markup = markup = value; } } - [GLib.Property ("show-popup-button")] - public bool ShowPopupButton { get; set; } - [GLib.Property ("status-icon")] public Xwt.Drawing.Image StatusIcon { get; set; } @@ -2477,6 +2395,31 @@ namespace MonoDevelop.Ide.Gui.Components this.parent = parent; } + static Xwt.Size defaultIconSize = Gtk.IconSize.Menu.GetSize (); + + static Xwt.Size GetZoomedIconSize (Xwt.Drawing.Image icon, double zoom) + { + if (icon == null || icon == CellRendererImage.NullImage) + return defaultIconSize; + + var size = icon.HasFixedSize ? icon.Size : defaultIconSize; + + if (zoom == 1) + return size; + + int w = (int) (zoom * (double) size.Width); + int h = (int) (zoom * (double) size.Height); + if (w == 0) w = 1; + if (h == 0) h = 1; + return new Xwt.Size (w, h); + } + + static Xwt.Drawing.Image GetResized (Xwt.Drawing.Image icon, double zoom) + { + var size = GetZoomedIconSize (icon, zoom); + return icon.WithSize (size); + } + void SetupLayout (Gtk.Widget widget) { @@ -2522,82 +2465,18 @@ namespace MonoDevelop.Ide.Gui.Components bool hasStatusIcon = StatusIcon != CellRendererImage.NullImage && StatusIcon != null; if (hasStatusIcon) { + var img = GetResized (StatusIcon, zoom); + if (st == Gtk.StateType.Selected) + img = img.WithStyles ("sel"); var x = tx + w + StatusIconSpacing; using (var ctx = Gdk.CairoHelper.Create (window)) { - ctx.DrawImage (widget, StatusIcon, x, cell_area.Y + (cell_area.Height - StatusIcon.Height) / 2); + ctx.DrawImage (widget, img, x, cell_area.Y + (cell_area.Height - img.Height) / 2); } } window.DrawLayout (widget.Style.TextGC (st), tx, ty, layout); hasStatusIcon = false; - - if (ShowPopupButton || hasStatusIcon) { - if (!bound) { - bound = true; - ((Gtk.ScrolledWindow)widget.Parent).Hadjustment.ValueChanged += delegate { - foreach (var r in parent.Tree.Selection.GetSelectedRows ()) { - var rect = parent.Tree.GetCellArea (r, parent.Tree.Columns [0]); - parent.Tree.QueueDrawArea (rect.X, rect.Y, rect.Width, rect.Height); - } - }; - } - - var selected = (flags & Gtk.CellRendererState.Selected) != 0; - if (selected || hasStatusIcon) { - var icon = Pushed ? popupIconDown : popupIcon; - var dy = (cell_area.Height - (int)icon.Height) / 2 - 1; - var y = cell_area.Y + dy; - var x = cell_area.X + cell_area.Width - (int)icon.Width - dy; - - var sw = (Gtk.ScrolledWindow)widget.Parent; - int ox, oy, ow, oh; - sw.GdkWindow.GetOrigin (out ox, out oy); - sw.GdkWindow.GetSize (out ow, out oh); - ox += sw.Allocation.X; - oy += sw.Allocation.Y; - if (sw.VScrollbar.Visible) - ow -= sw.VScrollbar.Allocation.Width; - - int cx, cy, cw, ch; - ((Gdk.Window)window).GetOrigin (out cx, out cy); - ((Gdk.Window)window).GetSize (out cw, out ch); - cx += widget.Allocation.X; - cy += widget.Allocation.Y; - - int rp = ox + ow; - int diff = rp - (cx + cw); - - if (diff < 0) { - x += diff; - if (x < cell_area.X + 20) - x = cell_area.X + 20; - } - - buttonScreenRect = new Gdk.Rectangle (cx + x, cy + y, (int)popupIcon.Width, (int)popupIcon.Height); - - buttonAllocation = new Gdk.Rectangle (x, y, (int)popupIcon.Width, (int)popupIcon.Height); - buttonAllocation = GtkUtil.ToScreenCoordinates (widget, ((Gdk.Window)window), buttonAllocation); - buttonAllocation = GtkUtil.ToWindowCoordinates (widget, widget.GdkWindow, buttonAllocation); - - bool mouseOver = (flags & Gtk.CellRendererState.Prelit) != 0 && buttonScreenRect.Contains (PointerPosition); - if (mouseOver && !Pushed) - icon = popupIconHover; - - using (var ctx = Gdk.CairoHelper.Create (window)) { - if (ShowPopupButton && selected) { - if (hasStatusIcon) - x -= (int) icon.Width + StatusIconSpacing; - ctx.DrawImage (widget, icon, x, y); - if (hasStatusIcon) - x += (int) icon.Width + StatusIconSpacing; - } - if (hasStatusIcon) { - ctx.DrawImage (widget, StatusIcon, x, y); - } - } - } - } } public Gdk.Rectangle GetStatusIconArea (Gtk.Widget widget, Gdk.Rectangle cell_area) @@ -2607,16 +2486,19 @@ namespace MonoDevelop.Ide.Gui.Components int w, h; layout.GetPixelSize (out w, out h); + var iconSize = GetZoomedIconSize (StatusIcon, zoom); int tx = cell_area.X + (int)Xpad; var x = tx + w + StatusIconSpacing; - return new Gdk.Rectangle (x, cell_area.Y, (int) StatusIcon.Width, (int) cell_area.Height); + return new Gdk.Rectangle (x, cell_area.Y, (int) iconSize.Width, (int) cell_area.Height); } public override void GetSize (Gtk.Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height) { base.GetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height); - if (StatusIcon != CellRendererImage.NullImage && StatusIcon != null) - width += (int) StatusIcon.Width + StatusIconSpacing; + if (StatusIcon != CellRendererImage.NullImage && StatusIcon != null) { + var iconSize = GetZoomedIconSize (StatusIcon, zoom); + width += (int)iconSize.Width + StatusIconSpacing; + } } public double Zoom { @@ -2806,19 +2688,21 @@ namespace MonoDevelop.Ide.Gui.Components if (value == null || value == CellRendererImage.NullImage) return null; + var img = value.HasFixedSize ? value : value.WithSize (Gtk.IconSize.Menu); + if (zoom == 1) - return value; + return img; Xwt.Drawing.Image resized; - if (resizedCache.TryGetValue (value, out resized)) + if (resizedCache.TryGetValue (img, out resized)) return resized; - int w = (int) (zoom * (double) value.Width); - int h = (int) (zoom * (double) value.Height); + int w = (int) (zoom * (double) img.Width); + int h = (int) (zoom * (double) img.Height); if (w == 0) w = 1; if (h == 0) h = 1; - resized = value.WithSize (w, h); - resizedCache [value] = resized; + resized = img.WithSize (w, h); + resizedCache [img] = resized; return resized; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/LogView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/LogView.cs index e6e2e39e7b..1f267996a8 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/LogView.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/LogView.cs @@ -37,6 +37,7 @@ using MonoDevelop.Ide.Fonts; using MonoDevelop.Components.Commands; using MonoDevelop.Ide.Commands; using System.Linq; +using MonoDevelop.Components; namespace MonoDevelop.Ide.Gui.Components { @@ -258,7 +259,7 @@ namespace MonoDevelop.Ide.Gui.Components closeButton = new Button (); closeButton.CanFocus = true; closeButton.Relief = ReliefStyle.None; - closeButton.Image = ImageService.GetImage ("gtk-close", IconSize.Menu); + closeButton.Image = new ImageView ("gtk-close", IconSize.Menu); closeButton.Clicked += delegate { HideSearchBox (); }; @@ -268,7 +269,7 @@ namespace MonoDevelop.Ide.Gui.Components buttonSearchForward.CanFocus = true; buttonSearchForward.Relief = ReliefStyle.None; buttonSearchForward.TooltipText = GettextCatalog.GetString ("Find next {0}", GetShortcut (SearchCommands.FindNext)); - buttonSearchForward.Image = ImageService.GetImage ("gtk-go-down", IconSize.Menu); + buttonSearchForward.Image = new ImageView ("gtk-go-down", IconSize.Menu); buttonSearchForward.Clicked += delegate { FindNext (); }; @@ -278,7 +279,7 @@ namespace MonoDevelop.Ide.Gui.Components buttonSearchBackward.CanFocus = true; buttonSearchBackward.Relief = ReliefStyle.None; buttonSearchBackward.TooltipText = GettextCatalog.GetString ("Find previous {0}", GetShortcut (SearchCommands.FindPrevious)); - buttonSearchBackward.Image = ImageService.GetImage ("gtk-go-up", IconSize.Menu); + buttonSearchBackward.Image = new ImageView ("gtk-go-up", IconSize.Menu); buttonSearchBackward.Clicked += delegate { FindPrev (); }; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/NodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/NodeBuilder.cs index 43fe8d16e4..76a5e918c7 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/NodeBuilder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/NodeBuilder.cs @@ -198,13 +198,12 @@ namespace MonoDevelop.Ide.Gui.Components if (StatusSeverity.HasValue) { switch (StatusSeverity.Value) { case TaskSeverity.Error: - return ImageService.GetIcon ("md-project-status-error"); + return ImageService.GetIcon ("md-error"); case TaskSeverity.Warning: - return ImageService.GetIcon ("md-project-status-warning"); + return ImageService.GetIcon ("md-warning"); case TaskSeverity.Information: - return ImageService.GetIcon ("md-project-status-information"); case TaskSeverity.Comment: - return ImageService.GetIcon ("md-project-status-information"); + return ImageService.GetIcon ("md-information"); } } return CellRendererImage.NullImage; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/AddinLoadErrorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/AddinLoadErrorDialog.cs index 330b87bb08..b7716e200d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/AddinLoadErrorDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/AddinLoadErrorDialog.cs @@ -33,10 +33,11 @@ using System.Reflection; using Mono.Addins; using MonoDevelop.Core; +using MonoDevelop.Components; namespace MonoDevelop.Ide.Gui.Dialogs { - internal partial class AddinLoadErrorDialog: Gtk.Dialog + internal partial class AddinLoadErrorDialog: IdeDialog { public AddinLoadErrorDialog (AddinError[] errors, bool warning) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs index b7a4e7aa90..cf8b1785cb 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs @@ -44,10 +44,11 @@ using Pango; using System.IO; using Mono.Addins; using System.Collections.Generic; +using MonoDevelop.Components; namespace MonoDevelop.Ide.Gui.Dialogs { - internal class CommonAboutDialog : Dialog + internal class CommonAboutDialog : IdeDialog { public CommonAboutDialog () { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs index 6ebee7c490..caceb45d9b 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs @@ -6,11 +6,12 @@ using Gtk; using MonoDevelop.Core; using MonoDevelop.Ide.Gui; +using MonoDevelop.Components; using System.Threading.Tasks; namespace MonoDevelop.Ide.Gui.Dialogs { - internal class DirtyFilesDialog : Gtk.Dialog + internal class DirtyFilesDialog : IdeDialog { Button btnSaveAndQuit; Button btnQuit; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GtkAlertDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GtkAlertDialog.cs index 467d13b680..743114fc34 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GtkAlertDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GtkAlertDialog.cs @@ -136,7 +136,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs newButton.UseUnderline = true; newButton.UseStock = button.IsStockButton; if (!String.IsNullOrEmpty (button.Icon)) - newButton.Image = new Image (button.Icon, IconSize.Button); + newButton.Image = new ImageView (button.Icon, IconSize.Button); newButton.Clicked += ButtonClicked; ActionArea.Add (newButton); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MimeTypePolicyOptionsSection.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MimeTypePolicyOptionsSection.cs index 2ea4007ad8..6f77e3e99f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MimeTypePolicyOptionsSection.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MimeTypePolicyOptionsSection.cs @@ -36,7 +36,8 @@ using MonoDevelop.Ide.Gui.Dialogs; using MonoDevelop.Projects; using MonoDevelop.Projects.Policies; using MonoDevelop.Ide.Extensions; - +using MonoDevelop.Components;
+
namespace MonoDevelop.Ide.Gui.Dialogs { class MimeTypePolicyOptionsSection: OptionsPanel @@ -113,7 +114,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs warningMessage = new HBox (); warningMessage.Spacing = 6; - Image img = new Image (Stock.Warning, IconSize.Menu); + var img = new ImageView (Stock.Warning, IconSize.Menu); warningMessage.PackStart (img, false, false, 0); Label wl = new Label (GettextCatalog.GetString ("Changes done in this section will only be applied to new projects. " + "Settings for existing projects can be modified in the project (or solution) options dialog.")); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MultiMessageDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MultiMessageDialog.cs index edda654d3d..fc762a8b11 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MultiMessageDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/MultiMessageDialog.cs @@ -27,13 +27,14 @@ using System; using Gtk; +using MonoDevelop.Components;
using MonoDevelop.Core; namespace MonoDevelop.Ide.Gui.Dialogs { public partial class MultiMessageDialog : Gtk.Dialog { - Image lastImage; + ImageView lastImage; public MultiMessageDialog() { @@ -56,13 +57,13 @@ namespace MonoDevelop.Ide.Gui.Dialogs HSeparator sep = new HSeparator (); sep.Show (); msgBox.PackStart (sep, false, false, 0); - lastImage.IconSize = (int) Gtk.IconSize.Menu; + lastImage.IconSize = Gtk.IconSize.Menu; } HBox box = new HBox (); box.Spacing = 12; Alignment imgBox = new Alignment (0, 0, 0, 0); - Image img = new Image (icon, lastImage != null ? Gtk.IconSize.Menu : IconSize.Dialog); + var img = new ImageView (icon, lastImage != null ? Gtk.IconSize.Menu : IconSize.Dialog); imgBox.Add (img); lastImage = img; box.PackStart (imgBox, false, false, 0); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs index 49c62300eb..6f6b26eb9a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs @@ -37,7 +37,7 @@ using MonoDevelop.Components; namespace MonoDevelop.Ide.Gui.Dialogs { - public partial class OptionsDialog : Gtk.Dialog + public partial class OptionsDialog : IdeDialog { Gtk.HBox mainHBox; Gtk.TreeView tree; @@ -140,6 +140,13 @@ namespace MonoDevelop.Ide.Gui.Dialogs c.Light += 0.09; fboxHeader.BackgroundColor = c.ToGdkColor (); }; + StyleSet += delegate { + if (IsRealized) { + var c = Style.Background (Gtk.StateType.Normal).ToXwtColor (); + c.Light += 0.09; + fboxHeader.BackgroundColor = c.ToGdkColor (); + } + }; vbox.PackStart (fboxHeader, false, false, 0); pageFrame = new HBox (); @@ -192,6 +199,9 @@ namespace MonoDevelop.Ide.Gui.Dialogs ExpandCategories (); this.DefaultResponse = Gtk.ResponseType.Ok; + buttonOk.CanDefault = true; + buttonOk.GrabDefault (); + DefaultWidth = 960; DefaultHeight = 680; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/PolicyOptionsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/PolicyOptionsPanel.cs index 3425865f84..29421b3e2d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/PolicyOptionsPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/PolicyOptionsPanel.cs @@ -36,7 +36,8 @@ using MonoDevelop.Core; using MonoDevelop.Ide.Gui.Dialogs; using MonoDevelop.Projects; using MonoDevelop.Projects.Policies; - +using MonoDevelop.Components;
+
namespace MonoDevelop.Ide.Gui.Dialogs { public abstract class PolicyOptionsPanel<T> : ItemOptionsPanel, IOptionsPanel where T : class, IEquatable<T>, new () @@ -87,7 +88,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs warningMessage = new HBox (); warningMessage.Spacing = 6; - Image img = new Image (Stock.Warning, IconSize.LargeToolbar); + var img = new ImageView (Stock.Warning, IconSize.LargeToolbar); warningMessage.PackStart (img, false, false, 0); Label wl = new Label (GettextCatalog.GetString ("Changes done in this section will only be applied to new projects. " + "Settings for existing projects can be modified in the project (or solution) options dialog.")); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ProgressDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ProgressDialog.cs index 116b2789c9..58586584fe 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ProgressDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ProgressDialog.cs @@ -50,6 +50,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs public ProgressDialog (MonoDevelop.Components.Window parent, bool allowCancel, bool showDetails) { + MonoDevelop.Components.IdeTheme.ApplyTheme (this); this.Build (); this.Title = BrandingService.ApplicationName; HasSeparator = false; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/TipOfTheDay.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/TipOfTheDay.cs index acc235f4c5..0df342e63d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/TipOfTheDay.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/TipOfTheDay.cs @@ -5,10 +5,11 @@ using System.Xml; using MonoDevelop.Core; using System.Collections.Generic; using MonoDevelop.Components.Commands; +using MonoDevelop.Components; namespace MonoDevelop.Ide.Gui.Dialogs { - internal partial class TipOfTheDayWindow : Gtk.Window + internal partial class TipOfTheDayWindow : IdeWindow { List<string> tips = new List<string> (); int currentTip; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/IDEStyleOptionsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/IDEStyleOptionsPanel.cs index 560d7ef057..d659f866ec 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/IDEStyleOptionsPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/IDEStyleOptionsPanel.cs @@ -57,6 +57,8 @@ namespace MonoDevelop.Ide.Gui.OptionPanels partial class IDEStyleOptionsPanelWidget : Gtk.Bin { + string currentTheme; + static Lazy<List<string>> themes = new Lazy<List<string>> (() => { var searchDirs = new List<string> (); @@ -70,7 +72,6 @@ namespace MonoDevelop.Ide.Gui.OptionPanels var themes = FindThemes (searchDirs).ToList (); - themes.Sort (); return themes; }); @@ -86,41 +87,78 @@ namespace MonoDevelop.Ide.Gui.OptionPanels this.Build(); Load (); } - + void Load () { - for (int n=1; n < isoCodes.Length; n += 2) + currentTheme = IdeApp.Preferences.UserInterfaceTheme; + + for (int n = 1; n < isoCodes.Length; n += 2) comboLanguage.AppendText (GettextCatalog.GetString (isoCodes [n])); - + int i = Array.IndexOf (isoCodes, IdeApp.Preferences.UserInterfaceLanguage); if (i == -1) i = 0; comboLanguage.Active = i / 2; - - comboTheme.AppendText (GettextCatalog.GetString ("(Default)")); + + if (Platform.IsLinux) + comboTheme.AppendText (GettextCatalog.GetString ("(Default)")); foreach (string t in InstalledThemes) comboTheme.AppendText (t); + + var sel = themes.Value.IndexOf (IdeApp.Preferences.UserInterfaceTheme); + if (sel == -1) + sel = 0; + else if (Platform.IsLinux) + sel++; - comboTheme.Active = themes.Value.IndexOf (IdeApp.Preferences.UserInterfaceTheme) + 1; + comboTheme.Active = sel; + comboTheme.Changed += ComboThemeChanged; + } - labelTheme.Visible = comboTheme.Visible = !Platform.IsMac && !Platform.IsWindows; + void ComboThemeChanged (object sender, EventArgs e) + { + SetTheme (); } - + + void SetTheme () + { + string theme; + if (comboTheme.Active == 0 && Platform.IsLinux) + theme = ""; + else + theme = comboTheme.ActiveText; + SetTheme (theme); + } + + void SetTheme (string theme) + { + if (theme.Length == 0 && Platform.IsLinux) { + currentTheme = ""; + } else { + currentTheme = theme; + } + } + // Code for getting the list of themes based on f-spot static ICollection<string> FindThemes (IEnumerable<string> themeDirs) { var themes = new HashSet<string> (); - string gtkrc = System.IO.Path.Combine ("gtk-2.0", "gtkrc"); - foreach (string themeDir in themeDirs) { - if (string.IsNullOrEmpty (themeDir) || !System.IO.Directory.Exists (themeDir)) - continue; - foreach (FilePath dir in System.IO.Directory.GetDirectories (themeDir)) { - if (System.IO.File.Exists (dir.Combine (gtkrc))) { - var themeName = dir.FileName; - if (!IsBadGtkTheme (themeName)) - themes.Add (themeName); + if (Platform.IsLinux) { + string gtkrc = System.IO.Path.Combine ("gtk-2.0", "gtkrc"); + foreach (string themeDir in themeDirs) { + if (string.IsNullOrEmpty (themeDir) || !System.IO.Directory.Exists (themeDir)) + continue; + foreach (FilePath dir in System.IO.Directory.GetDirectories (themeDir)) { + if (System.IO.File.Exists (dir.Combine (gtkrc))) { + var themeName = dir.FileName; + if (!IsBadGtkTheme (themeName)) + themes.Add (themeName); + } } } + } else { + themes.Add ("Light"); + themes.Add ("Dark"); } return themes; } @@ -146,20 +184,18 @@ namespace MonoDevelop.Ide.Gui.OptionPanels ) ); } - string theme; - if (comboTheme.Active == 0) { - theme = IdeStartup.DefaultTheme; - IdeApp.Preferences.UserInterfaceTheme.Value = ""; - } - else { - theme = comboTheme.ActiveText; - IdeApp.Preferences.UserInterfaceTheme.Value = theme; + + if (currentTheme != IdeApp.Preferences.UserInterfaceTheme.Value) { + IdeApp.Preferences.UserInterfaceTheme.Value = currentTheme; + MessageService.ShowMessage ( + GettextCatalog.GetString ( + "The user interface theme change will take effect the next time you start {0}", + BrandingService.ApplicationName + ) + ); } - - if (theme != Gtk.Settings.Default.ThemeName) - Gtk.Settings.Default.ThemeName = theme; } - + static string[] isoCodes = new string[] { "", "(Default)", "ca", "Catalan", diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/SdkLocationPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/SdkLocationPanel.cs index 41d3d64cbc..1a4972f73c 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/SdkLocationPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/SdkLocationPanel.cs @@ -83,7 +83,7 @@ namespace MonoDevelop.Ide.Gui.OptionPanels { FolderEntry locationEntry = new FolderEntry (); Label messageLabel = new Label (); - Image messageIcon = new Image (); + ImageView messageIcon = new ImageView (); SdkLocationPanel panel; public SdkLocationWidget (SdkLocationPanel panel) : base (false, 12) @@ -124,24 +124,24 @@ namespace MonoDevelop.Ide.Gui.OptionPanels if (!location.IsNullOrEmpty) { if (panel.ValidateSdkLocation (location)) { messageLabel.Text = GettextCatalog.GetString ("SDK found at specified location."); - messageIcon.Stock = Gtk.Stock.Apply; + messageIcon.SetIcon (Gtk.Stock.Apply, IconSize.Menu); return; } messageLabel.Text = GettextCatalog.GetString ("No SDK found at specified location."); - messageIcon.Stock = Gtk.Stock.Cancel; + messageIcon.SetIcon (Gtk.Stock.Cancel, IconSize.Menu); return; } foreach (var loc in panel.DefaultSdkLocations) { if (panel.ValidateSdkLocation (loc)) { messageLabel.Text = GettextCatalog.GetString ("SDK found at default location."); - messageIcon.Stock = Gtk.Stock.Apply; + messageIcon.SetIcon (Gtk.Stock.Apply, IconSize.Menu); return; } } messageLabel.Text = GettextCatalog.GetString ("No SDK found at default location."); - messageIcon.Stock = Gtk.Stock.Cancel; + messageIcon.SetIcon (Gtk.Stock.Cancel, IconSize.Menu); } FilePath CleanPath (FilePath path) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/TasksOptionsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/TasksOptionsPanel.cs index 4ecc709367..1f4862e455 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/TasksOptionsPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/TasksOptionsPanel.cs @@ -66,6 +66,8 @@ namespace MonoDevelop.Ide.Gui.OptionPanels buttonChange.Clicked += new EventHandler (ChangeToken); buttonRemove.Clicked += new EventHandler (RemoveToken); entryToken.Changed += new EventHandler (Validate); + + Styles.Changed += HandleUserInterfaceSkinChanged; } void Validate (object sender, EventArgs args) @@ -167,7 +169,17 @@ namespace MonoDevelop.Ide.Gui.OptionPanels { foreach (var ctag in CommentTag.SpecialCommentTags) tokensStore.AppendValues (ctag.Tag, ctag.Priority); - + + LoadColors (); + } + + void HandleUserInterfaceSkinChanged (object sender, EventArgs e) + { + LoadColors (); + } + + public void LoadColors () + { colorbuttonHighPrio.Color = StringToColor (IdeApp.Preferences.UserTasksHighPrioColor); colorbuttonNormalPrio.Color = StringToColor (IdeApp.Preferences.UserTasksNormalPrioColor); colorbuttonLowPrio.Color = StringToColor (IdeApp.Preferences.UserTasksLowPrioColor); @@ -209,6 +221,12 @@ namespace MonoDevelop.Ide.Gui.OptionPanels } return color; } + + public override void Destroy () + { + Styles.Changed -= HandleUserInterfaceSkinChanged; + base.Destroy (); + } } internal class TasksOptionsPanel : OptionsPanel diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs index 6bcec43c58..50618aeb33 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectFileNodeBuilder.cs @@ -86,18 +86,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad if (file.IsLink && nodeInfo.Icon != null) { var overlay = ImageService.GetIcon ("md-link-overlay").WithSize (Xwt.IconSize.Small); - var cached = Context.GetComposedIcon (nodeInfo.Icon, overlay); - if (cached != null) - nodeInfo.Icon = cached; - else { - var ib = new Xwt.Drawing.ImageBuilder (nodeInfo.Icon.Width, nodeInfo.Icon.Height); - ib.Context.DrawImage (nodeInfo.Icon, 0, 0); - ib.Context.DrawImage (overlay, 0, 0); - var res = ib.ToVectorImage (); - ib.Dispose (); - Context.CacheComposedIcon (nodeInfo.Icon, overlay, res); - nodeInfo.Icon = res; - } + nodeInfo.OverlayBottomRight = overlay; } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectSolutionPad.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectSolutionPad.cs index 07b78ed0e8..fb573226f2 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectSolutionPad.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectSolutionPad.cs @@ -57,7 +57,6 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad } return null; }); - TreeView.ShowSelectionPopupButton = true; } protected override void OnSelectionChanged (object sender, EventArgs args) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/DefaultMonitorPad.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/DefaultMonitorPad.cs index 7d51b9571e..1224e93802 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/DefaultMonitorPad.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/DefaultMonitorPad.cs @@ -80,18 +80,18 @@ namespace MonoDevelop.Ide.Gui.Pads DockItemToolbar toolbar = window.GetToolbar (DockPositionType.Right); - buttonStop = new Button (new Gtk.Image (Stock.Stop, IconSize.Menu)); + buttonStop = new Button (new ImageView (Stock.Stop, IconSize.Menu)); buttonStop.Clicked += new EventHandler (OnButtonStopClick); buttonStop.TooltipText = GettextCatalog.GetString ("Stop"); toolbar.Add (buttonStop); - buttonClear = new Button (new Gtk.Image (Stock.Broom, IconSize.Menu)); + buttonClear = new Button (new ImageView (Stock.Broom, IconSize.Menu)); buttonClear.Clicked += new EventHandler (OnButtonClearClick); buttonClear.TooltipText = GettextCatalog.GetString ("Clear console"); toolbar.Add (buttonClear); buttonPin = new ToggleButton (); - buttonPin.Image = new Gtk.Image (Stock.PinUp, IconSize.Menu); + buttonPin.Image = new ImageView (Stock.PinUp, IconSize.Menu); buttonPin.Image.ShowAll (); buttonPin.Clicked += new EventHandler (OnButtonPinClick); buttonPin.TooltipText = GettextCatalog.GetString ("Pin output pad"); @@ -135,9 +135,9 @@ namespace MonoDevelop.Ide.Gui.Pads void OnButtonPinClick (object sender, EventArgs e) { if (buttonPin.Active) - ((Gtk.Image)buttonPin.Image).Stock = (IconId) "md-pin-down"; + ((ImageView)buttonPin.Image).SetIcon ("md-pin-down", IconSize.Menu); else - ((Gtk.Image)buttonPin.Image).Stock = (IconId) "md-pin-up"; + ((ImageView)buttonPin.Image).SetIcon ("md-pin-down", IconSize.Menu); } public bool AllowReuse { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs index 6ed1ef5c5c..a793bddcd3 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs @@ -128,7 +128,7 @@ namespace MonoDevelop.Ide.Gui.Pads errorBtn = new ToggleButton { Name = "toggleErrors" }; errorBtn.Active = ShowErrors; - errorBtn.Image = new Gtk.Image (Stock.Error, Gtk.IconSize.Menu); + errorBtn.Image = new ImageView (Stock.Error, Gtk.IconSize.Menu); errorBtn.Image.Show (); errorBtn.Toggled += new EventHandler (FilterChanged); errorBtn.TooltipText = GettextCatalog.GetString ("Show Errors"); @@ -137,7 +137,7 @@ namespace MonoDevelop.Ide.Gui.Pads warnBtn = new ToggleButton { Name = "toggleWarnings" }; warnBtn.Active = ShowWarnings; - warnBtn.Image = new Gtk.Image (Stock.Warning, Gtk.IconSize.Menu); + warnBtn.Image = new ImageView (Stock.Warning, Gtk.IconSize.Menu); warnBtn.Image.Show (); warnBtn.Toggled += new EventHandler (FilterChanged); warnBtn.TooltipText = GettextCatalog.GetString ("Show Warnings"); @@ -146,7 +146,7 @@ namespace MonoDevelop.Ide.Gui.Pads msgBtn = new ToggleButton { Name = "toggleMessages" }; msgBtn.Active = ShowMessages; - msgBtn.Image = new Gtk.Image (Stock.Information, Gtk.IconSize.Menu); + msgBtn.Image = new ImageView (Stock.Information, Gtk.IconSize.Menu); msgBtn.Image.Show (); msgBtn.Toggled += new EventHandler (FilterChanged); msgBtn.TooltipText = GettextCatalog.GetString ("Show Messages"); @@ -157,7 +157,7 @@ namespace MonoDevelop.Ide.Gui.Pads logBtn = new ToggleButton { Name = "toggleBuildOutput" }; logBtn.Label = GettextCatalog.GetString ("Build Output"); - logBtn.Image = ImageService.GetImage ("md-message-log", Gtk.IconSize.Menu); + logBtn.Image = new ImageView ("md-message-log", Gtk.IconSize.Menu); logBtn.Image.Show (); logBtn.TooltipText = GettextCatalog.GetString ("Show build output"); logBtn.Toggled += HandleLogBtnToggled; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ConfigurationComboBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ConfigurationComboBox.cs index fb0a44eaf6..1d7cbd363e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ConfigurationComboBox.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ConfigurationComboBox.cs @@ -82,7 +82,7 @@ namespace MonoDevelop.Ide.Gui fd = null; } if (toolbar.IconSize == Gtk.IconSize.Menu || toolbar.IconSize == Gtk.IconSize.SmallToolbar) { - fd = Style.FontDescription.Copy (); + fd = Style.FontDescription.Copy (); // TODO: VV: Use FontService fd.Size = (int) (fd.Size * Pango.Scale.Small); } combo.ModifyLabelFont (fd); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs index 552ecac8c6..7640f14774 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs @@ -863,7 +863,6 @@ namespace MonoDevelop.Ide.Gui // correct style (the style of the window). At this point the widget is not yet a child // of the window, so its style is not yet the correct one. tabControl.InitSize (); - var barHeight = tabControl.BarHeight; // The main document area documentDockItem = dock.AddItem ("Documents"); @@ -873,32 +872,8 @@ namespace MonoDevelop.Ide.Gui documentDockItem.Label = GettextCatalog.GetString ("Documents"); documentDockItem.Content = new DockNotebookContainer (tabControl, true); - DockVisualStyle style = new DockVisualStyle (); - style.PadTitleLabelColor = Styles.PadLabelColor.ToXwtColor (); - style.PadBackgroundColor = Styles.PadBackground.ToXwtColor (); - style.InactivePadBackgroundColor = Styles.InactivePadBackground.ToXwtColor (); - style.PadTitleHeight = barHeight; - dock.DefaultVisualStyle = style; - - style = new DockVisualStyle (); - style.PadTitleLabelColor = Styles.PadLabelColor.ToXwtColor (); - style.PadTitleHeight = barHeight; - style.ShowPadTitleIcon = false; - style.UppercaseTitles = false; - style.ExpandedTabs = true; - style.PadBackgroundColor = Styles.BrowserPadBackground.ToXwtColor (); - style.InactivePadBackgroundColor = Styles.InactiveBrowserPadBackground.ToXwtColor (); - style.TreeBackgroundColor = Styles.BrowserPadBackground.ToXwtColor (); - dock.SetDockItemStyle ("ProjectPad", style); - dock.SetDockItemStyle ("ClassPad", style); - -// dock.SetRegionStyle ("Documents/Left", style); - //dock.SetRegionStyle ("Documents/Right", style); - -// style = new DockVisualStyle (); -// style.SingleColumnMode = true; -// dock.SetRegionStyle ("Documents/Left;Documents/Right", style); -// dock.SetDockItemStyle ("Documents", style); + LoadDockStyles (); + Styles.Changed += (sender, e) => LoadDockStyles (); // Add some hiden items to be used as position reference DockItem dit = dock.AddItem ("__left"); @@ -949,6 +924,45 @@ namespace MonoDevelop.Ide.Gui LoggingService.LogError (ex.ToString ()); } } + + void LoadDockStyles () + { + var barHeight = tabControl.BarHeight; + + DockVisualStyle style = new DockVisualStyle (); + style.PadTitleLabelColor = Styles.PadLabelColor; + style.InactivePadTitleLabelColor = Styles.InactivePadLabelColor; + style.PadBackgroundColor = Styles.PadBackground; + style.TreeBackgroundColor = Styles.BaseBackgroundColor; + style.InactivePadBackgroundColor = Styles.InactivePadBackground; + style.PadTitleHeight = barHeight; + dock.DefaultVisualStyle = style; + + style = new DockVisualStyle (); + style.PadTitleLabelColor = Styles.PadLabelColor; + style.InactivePadTitleLabelColor = Styles.InactivePadLabelColor; + style.PadTitleHeight = barHeight; + // style.ShowPadTitleIcon = false; // VV: Now we want to have icons on all pads + style.UppercaseTitles = false; + style.ExpandedTabs = true; + style.PadBackgroundColor = Styles.BrowserPadBackground; + style.InactivePadBackgroundColor = Styles.InactiveBrowserPadBackground; + style.TreeBackgroundColor = Styles.BrowserPadBackground; + dock.SetDockItemStyle ("ProjectPad", style); + dock.SetDockItemStyle ("ClassPad", style); + + + + // dock.SetRegionStyle ("Documents/Left", style); + //dock.SetRegionStyle ("Documents/Right", style); + + // style = new DockVisualStyle (); + // style.SingleColumnMode = true; + // dock.SetRegionStyle ("Documents/Left;Documents/Right", style); + // dock.SetDockItemStyle ("Documents", style); + + dock.UpdateStyles (); + } void InitializeLayout (string name) { @@ -1023,6 +1037,12 @@ namespace MonoDevelop.Ide.Gui return dock.CurrentLayout.EndsWith (fullViewModeTag); } } + + protected override void OnStyleSet (Gtk.Style previous_style) + { + base.OnStyleSet (previous_style); + IdeTheme.UpdateStyles (); + } protected override bool OnConfigureEvent (Gdk.EventConfigure evnt) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DockItemToolbarLoader.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DockItemToolbarLoader.cs index 734a6f870b..7307ae1c66 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DockItemToolbarLoader.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DockItemToolbarLoader.cs @@ -34,7 +34,8 @@ using MonoDevelop.Components.Docking; using MonoDevelop.Components.Commands; using Gtk; using System.Collections.Generic; - +using MonoDevelop.Components;
+
namespace MonoDevelop.Ide.Gui { public static class DockItemToolbarLoader @@ -142,6 +143,7 @@ namespace MonoDevelop.Ide.Gui string stockId; Button button; object cmdId; + ImageView image; CommandEntryDisplayType displayType; public ToolButtonStatus (object cmdId, Button button, CommandEntryDisplayType displayType = CommandEntryDisplayType.Default) @@ -186,8 +188,10 @@ namespace MonoDevelop.Ide.Gui if (displayType != CommandEntryDisplayType.TextOnly && cmdInfo.Icon != stockId) { stockId = cmdInfo.Icon; - button.Image = new Gtk.Image (cmdInfo.Icon, Gtk.IconSize.Menu); + button.Image = image = new ImageView (cmdInfo.Icon, Gtk.IconSize.Menu); } + if (button.Image != null && cmdInfo.Enabled != button.Sensitive) + image.Image = image.Image.WithStyles (cmdInfo.Enabled ? "" : "disabled").WithAlpha (cmdInfo.Enabled ? 1.0 : 0.4); if (cmdInfo.Enabled != button.Sensitive) button.Sensitive = cmdInfo.Enabled; if (cmdInfo.Visible != button.Visible) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs index b06ac83f7b..ba93f44736 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs @@ -238,7 +238,7 @@ namespace MonoDevelop.Ide cr.MoveTo (xPos + item.Icon.Width + 2 + itemPadding, yPos + (iconHeight - h) / 2); layout.SetText (Ellipsize (item.ListTitle ?? item.Title, maxLength)); cr.ShowLayout (layout); - cr.DrawImage (this, item.Icon, (int)xPos + itemPadding, + cr.DrawImage (this, item == ActiveItem ? item.Icon.WithStyles ("sel") : item.Icon, (int)xPos + itemPadding, (int)(yPos + (iconHeight - item.Icon.Height) / 2)); yPos += iconHeight; if (++curItem >= maxItems) { @@ -549,7 +549,7 @@ namespace MonoDevelop.Ide } } - internal class DocumentSwitcher : Gtk.Window + internal class DocumentSwitcher : IdeWindow { List<MonoDevelop.Ide.Gui.Document> documents; Xwt.ImageView imageTitle = new Xwt.ImageView (); @@ -573,7 +573,7 @@ namespace MonoDevelop.Ide this.WindowPosition = Gtk.WindowPosition.CenterOnParent; this.TypeHint = WindowTypeHint.Dialog; - this.ModifyBg (StateType.Normal, this.Style.Base (StateType.Normal)); + this.ModifyBg (StateType.Normal, Styles.BaseBackgroundColor.ToGdkColor ()); VBox vBox = new VBox (); HBox hBox = new HBox (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentToolbar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentToolbar.cs index d718a2c950..ca4a8d9350 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentToolbar.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentToolbar.cs @@ -109,8 +109,8 @@ namespace MonoDevelop.Ide.Gui void ChangeColor (Gtk.Widget w) { w.Realized += delegate { - w.ModifyText (StateType.Normal, Styles.BreadcrumbTextColor); - w.ModifyFg (StateType.Normal, Styles.BreadcrumbTextColor); + w.ModifyText (StateType.Normal, Styles.BreadcrumbTextColor.ToGdkColor ()); + w.ModifyFg (StateType.Normal, Styles.BreadcrumbTextColor.ToGdkColor ()); }; if (w is Gtk.Container) { foreach (var c in ((Gtk.Container)w).Children) @@ -161,16 +161,12 @@ namespace MonoDevelop.Ide.Gui { using (var ctx = Gdk.CairoHelper.Create (GdkWindow)) { ctx.Rectangle (0, 0, Allocation.Width, Allocation.Height); - using (Cairo.LinearGradient g = new Cairo.LinearGradient (0, 0, 0, Allocation.Height)) { - g.AddColorStop (0, Styles.BreadcrumbBackgroundColor); - g.AddColorStop (1, Styles.BreadcrumbGradientEndColor); - ctx.SetSource (g); - ctx.Fill (); - } + ctx.SetSourceColor (Styles.BreadcrumbBackgroundColor.ToCairoColor ()); + ctx.Fill (); ctx.MoveTo (0.5, Allocation.Height - 0.5); ctx.RelLineTo (Allocation.Width, 0); - ctx.SetSourceColor (Styles.BreadcrumbBottomBorderColor); + ctx.SetSourceColor (Styles.BreadcrumbBottomBorderColor.ToCairoColor ()); ctx.LineWidth = 1; ctx.Stroke (); } @@ -181,8 +177,8 @@ namespace MonoDevelop.Ide.Gui public class DocumentToolButton : Control { - public DocumentToolButtonImage Image { - get { return (Gtk.Image)button.Image; } + public ImageView Image { + get { return (ImageView)button.Image; } set { button.Image = value; } } @@ -206,8 +202,8 @@ namespace MonoDevelop.Ide.Gui { button = new Button (); Label = label; - Image = new Gtk.Image (stockId, IconSize.Menu); - button.Image.Show (); + Image = new ImageView (stockId, IconSize.Menu); + Image.Show (); } protected override object CreateNativeWidget<T> () @@ -226,8 +222,8 @@ namespace MonoDevelop.Ide.Gui public class DocumentToolButtonImage : Control { - Gtk.Image image; - internal DocumentToolButtonImage (Gtk.Image image) + ImageView image; + internal DocumentToolButtonImage (ImageView image) { this.image = image; } @@ -242,7 +238,7 @@ namespace MonoDevelop.Ide.Gui return d.GetNativeWidget<Gtk.Widget> (); } - public static implicit operator DocumentToolButtonImage (Gtk.Image d) + public static implicit operator DocumentToolButtonImage (ImageView d) { return new DocumentToolButtonImage (d); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs index f344b92a4e..c0ced3594f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs @@ -81,7 +81,10 @@ namespace MonoDevelop.Ide HasResizeGrip = true; HeaderBox hb = new HeaderBox (1, 0, 0, 0); - hb.BorderColor = Styles.DockSeparatorColor; + hb.StyleSet += (o, args) => { + hb.BorderColor = Styles.DockSeparatorColor.ToGdkColor (); + hb.BackgroundColor = Styles.DockBarBackground.ToGdkColor (); + }; var mainBox = new HBox (); mainBox.PackStart (new Label (""), true, true, 0); hb.Add (mainBox); @@ -124,6 +127,9 @@ namespace MonoDevelop.Ide // Dock area CustomFrame dfr = new CustomFrame (0, 0, 1, 0); + dfr.StyleSet += (o, args) => { + dfr.BorderColor = Styles.DockSeparatorColor.ToGdkColor (); + }; dfr.ShowAll (); DefaultWorkbench wb = (DefaultWorkbench)IdeApp.Workbench.RootWindow; var dockBar = wb.DockFrame.ExtractDockBar (PositionType.Bottom); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SideBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SideBar.cs index d18e6c7184..ccabbb926c 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SideBar.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SideBar.cs @@ -227,7 +227,7 @@ namespace MonoDevelop.Ide.Gui this.orientation = orientation; if (string.IsNullOrEmpty (icon)) { -// if (label == "Debug") icon = "md-execute-debug"; +// if (label == "Debug") icon = "md-bug"; // if (label == "Default") icon = "md-solution"; } this.label = label; @@ -299,6 +299,8 @@ namespace MonoDevelop.Ide.Gui else c2.L *= 0.9; Cairo.Gradient pat; + + // FIXME: VV: Remove gradient features pat = new Cairo.LinearGradient (x, y, x+w-2, y); pat.AddColorStop (0, c2); pat.AddColorStop (1, c1); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StockIcons.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StockIcons.cs index ab077adb90..b14eade292 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StockIcons.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StockIcons.cs @@ -38,7 +38,7 @@ namespace MonoDevelop.Ide.Gui public static readonly IconId BreakPoint = "md-break-point"; public static readonly IconId BuildCombine = "md-build-combine"; public static readonly IconId Class = "md-class"; - public static readonly IconId ClearAllBookmarks = "md-clear-all-bookmarks"; + public static readonly IconId ClearAllBookmarks = "md-bookmark-clear-all"; public static readonly IconId CloseAllDocuments = "md-close-all-documents"; public static readonly IconId CloseCombine = "md-close-combine-icon"; public static readonly IconId CloseIcon = Gtk.Stock.Close; @@ -59,11 +59,11 @@ namespace MonoDevelop.Ide.Gui public static readonly IconId Field = "md-field"; public static readonly IconId FileXmlIcon = "md-file-xml-icon"; public static readonly IconId FindIcon = "md-magnify"; - public static readonly IconId FindInFiles = "md-find-in-files"; - public static readonly IconId FindNextIcon = "md-find-next-icon"; + public static readonly IconId FindNextIcon = "md-find-next"; + public static readonly IconId FindPrevIcon = "md-find-prev"; public static readonly IconId FullScreen = Gtk.Stock.Fullscreen; - public static readonly IconId GotoNextbookmark = "md-goto-nextbookmark"; - public static readonly IconId GotoPrevbookmark = "md-goto-prevbookmark"; + public static readonly IconId GotoNextbookmark = "md-bookmark-next"; + public static readonly IconId GotoPrevbookmark = "md-bookmark-prev"; public static readonly IconId Information = "md-information"; public static readonly IconId Interface = "md-interface"; public static readonly IconId InternalClass = "md-internal-class"; @@ -101,6 +101,7 @@ namespace MonoDevelop.Ide.Gui public static readonly IconId PrivateProperty = "md-private-property"; public static readonly IconId PrivateStruct = "md-private-struct"; public static readonly IconId Property = "md-property"; + public static readonly IconId Properties = "md-preferences"; public static readonly IconId ProtectedClass = "md-protected-class"; public static readonly IconId ProtectedDelegate = "md-protected-delegate"; public static readonly IconId ProtectedEnum = "md-protected-enum"; @@ -118,7 +119,6 @@ namespace MonoDevelop.Ide.Gui public static readonly IconId Reference = "md-reference"; public static readonly IconId ReferenceWarning = "md-reference-warning"; public static readonly IconId ReplaceIcon = Gtk.Stock.FindAndReplace; - public static readonly IconId ReplaceInFiles = "md-replace-in-files"; public static readonly IconId ResourceFileIcon = "md-resource-file-icon"; public static readonly IconId Console = "md-console"; public static readonly IconId RunProgramIcon = Gtk.Stock.Execute; @@ -130,7 +130,7 @@ namespace MonoDevelop.Ide.Gui public static readonly IconId Struct = "md-struct"; public static readonly IconId TaskListIcon = "md-task-list"; public static readonly IconId TextFileIcon = "md-text-file-icon"; - public static readonly IconId ToggleBookmark = "md-toggle-bookmark"; + public static readonly IconId ToggleBookmark = "md-bookmark-toggle"; public static readonly IconId UndoIcon = Gtk.Stock.Undo; public static readonly IconId Warning = "md-warning"; public static readonly IconId XmlFileIcon = "md-xml-file-icon"; @@ -151,6 +151,7 @@ namespace MonoDevelop.Ide.Gui public static readonly IconId StatusUpdatesDownloading = "md-status-updates-downloading"; public static readonly IconId StatusUpdatesPaused = "md-status-updates-paused"; public static readonly IconId StatusUpdatesReady = "md-status-updates-ready"; + public static readonly IconId StatusInstrumentation = "md-status-instrumentation"; public static readonly IconId Broom = "md-clear"; public static readonly IconId Stop = "md-stop"; public static readonly IconId MessageLog = "md-message-log"; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs index 939128622a..942f96b9da 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Styles.cs @@ -1,21 +1,21 @@ -// + // // Styles.cs -// +// // Author: // Lluis Sanchez <lluis@xamarin.com> -// +// // Copyright (c) 2012 Xamarin Inc -// +// // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal // in the Software without restriction, including without limitation the rights // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell // copies of the Software, and to permit persons to whom the Software is // furnished to do so, subject to the following conditions: -// +// // The above copyright notice and this permission notice shall be included in // all copies or substantial portions of the Software. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -25,107 +25,139 @@ // THE SOFTWARE. using System; using MonoDevelop.Components; +using Xwt.Drawing; +using System.Security.Policy; + +#if MAC +using AppKit; +#endif namespace MonoDevelop.Ide.Gui { - static class Styles + public static class Styles { - public static readonly Cairo.Color BaseBackgroundColor = new Cairo.Color (1, 1, 1); - public static readonly Cairo.Color BaseForegroundColor = new Cairo.Color (0, 0, 0); + public static event EventHandler Changed; + + public static Color BackgroundColor { get; internal set; } // must be the bg color from Gtkrc + public static Color BaseBackgroundColor { get; internal set; } // must be the base color from Gtkrc + public static Color BaseForegroundColor { get; internal set; } // must be the text color from Gtkrc + public static Color BaseSelectionBackgroundColor { get; internal set; } + public static Color BaseSelectionTextColor { get; internal set; } + public static Color BaseIconColor { get; internal set; } + public static Color LinkForegroundColor { get; internal set; } + + public static Color ErrorForegroundColor { get; internal set; } + public static Color WarningForegroundColor { get; internal set; } + public static Color InformationForegroundColor { get; internal set; } + + public static Pango.FontDescription DefaultFont { get; internal set; } + public static string DefaultFontName { get; internal set; } + + public static double FontScale11 = 0.92308; + public static double FontScale12 = 1; + public static double FontScale13 = 1.07693; + public static double FontScale14 = 1.15385; + + public static Color ThinSplitterColor { get; internal set; } + public static Color SeparatorColor { get; internal set; } + public static Color PrimaryBackgroundColor { get; internal set; } + public static Color SecondaryBackgroundLighterColor { get; internal set; } + public static Color SecondaryBackgroundDarkerColor { get; internal set; } + public static Color DimTextColor { get; internal set; } + public static Color StatusInformationBackgroundColor { get; internal set; } + public static Color StatusInformationTextColor { get; internal set; } + public static Color StatusWarningBackgroundColor { get; internal set; } + public static Color StatusWarningTextColor { get; internal set; } + public static Color StatusErrorBackgroundColor { get; internal set; } + public static Color StatusErrorTextColor { get; internal set; } - // General + // Document tab bar - public static readonly Gdk.Color ThinSplitterColor = new Gdk.Color (166, 166, 166); - public static readonly Xwt.Drawing.Color DimTextColor = Xwt.Drawing.Color.FromBytes (170, 170, 170); + public static Color TabBarBackgroundColor { get; internal set; } + public static Color TabBarActiveTextColor { get; internal set; } + public static Color TabBarNotifyTextColor { get; internal set; } + public static Color TabBarInactiveTextColor { get; internal set; } - // Document tab bar + public static Color BreadcrumbBackgroundColor { get; internal set; } + public static Color BreadcrumbTextColor { get; internal set; } + public static Color BreadcrumbButtonFillColor { get; internal set; } + public static Color BreadcrumbBottomBorderColor { get; internal set; } + // Document Subview Tabs - public static readonly Cairo.Color TabBarBackgroundColor = CairoExtensions.ParseColor ("c2c2c2"); - public static readonly Cairo.Color TabBarActiveTextColor = new Cairo.Color (0, 0, 0); - - public static readonly Cairo.Color TabBarActiveGradientStartColor = Shift (TabBarBackgroundColor, 0.92); - public static readonly Cairo.Color TabBarActiveGradientEndColor = TabBarBackgroundColor; - public static readonly Cairo.Color TabBarGradientStartColor = Shift (TabBarBackgroundColor, 1.02); - public static readonly Cairo.Color TabBarGradientEndColor = TabBarBackgroundColor; - public static readonly Cairo.Color TabBarGradientShadowColor = Shift (TabBarBackgroundColor, 0.8); - public static readonly Cairo.Color TabBarHoverActiveTextColor = TabBarActiveTextColor; - public static readonly Cairo.Color TabBarInactiveTextColor = Blend (new Cairo.Color (0, 0, 0), TabBarGradientStartColor, 0.4); - public static readonly Cairo.Color TabBarHoverInactiveTextColor = new Cairo.Color (0, 0, 0); - - public static readonly Cairo.Color BreadcrumbGradientStartColor = CairoExtensions.ParseColor ("FFFFFF"); - public static readonly Cairo.Color BreadcrumbBackgroundColor = Shift (BreadcrumbGradientStartColor, .95); - public static readonly Cairo.Color BreadcrumbGradientEndColor = Shift (BreadcrumbGradientStartColor, 0.9); - public static readonly Cairo.Color BreadcrumbBorderColor = Shift (BreadcrumbBackgroundColor, 0.6); - public static readonly Cairo.Color BreadcrumbInnerBorderColor = WithAlpha (BaseBackgroundColor, 0.1d); - public static readonly Gdk.Color BreadcrumbTextColor = Shift (BaseForegroundColor, 0.8).ToGdkColor (); - public static readonly Cairo.Color BreadcrumbButtonBorderColor = Shift (BaseBackgroundColor, 0.8); - public static readonly Cairo.Color BreadcrumbButtonFillColor = WithAlpha (BaseBackgroundColor, 0.1d); - public static readonly Cairo.Color BreadcrumbBottomBorderColor = Shift (BreadcrumbBackgroundColor, 0.7d); - public static readonly bool BreadcrumbInvertedIcons = false; - public static readonly bool BreadcrumbGreyscaleIcons = false; + public static Color SubTabBarBackgroundColor { get; internal set; } + public static Color SubTabBarTextColor { get; internal set; } + public static Color SubTabBarActiveBackgroundColor { get; internal set; } + public static Color SubTabBarActiveTextColor { get; internal set; } + public static Color SubTabBarHoverBackgroundColor { get; internal set; } + public static Color SubTabBarSeparatorColor { get; internal set; } // Dock pads - - public static readonly Cairo.Color DockTabBarGradientTop = new Cairo.Color (248d / 255d, 248d / 255d, 248d / 255d); - public static readonly Cairo.Color DockTabBarGradientStart = new Cairo.Color (242d / 255d, 242d / 255d, 242d / 255d); - public static readonly Cairo.Color DockTabBarGradientEnd = new Cairo.Color (230d / 255d, 230d / 255d, 230d / 255d); - public static readonly Cairo.Color DockTabBarShadowGradientStart = new Cairo.Color (154d / 255d, 154d / 255d, 154d / 255d, 1); - public static readonly Cairo.Color DockTabBarShadowGradientEnd = new Cairo.Color (154d / 255d, 154d / 255d, 154d / 255d, 0); - public static readonly Gdk.Color PadBackground = new Gdk.Color (240, 240, 240); - public static readonly Gdk.Color InactivePadBackground = ReduceLight (PadBackground, 0.9); - public static readonly Gdk.Color PadLabelColor = new Gdk.Color (92, 99, 102); - public static readonly Gdk.Color DockFrameBackground = new Gdk.Color (157, 162, 166); - public static readonly Gdk.Color DockSeparatorColor = ThinSplitterColor; + public static Color PadBackground { get; internal set; } + public static Color InactivePadBackground { get; internal set; } + public static Color PadLabelColor { get; internal set; } + public static Color InactivePadLabelColor { get; internal set; } + public static Color DockFrameBackground { get; internal set; } + public static Color DockSeparatorColor { get; internal set; } + public static Color DockBarBackground { get; internal set; } + public static Color DockBarPrelightColor { get; internal set; } + public static Color DockBarLabelColor { get; internal set; } - public static readonly Gdk.Color BrowserPadBackground = new Gdk.Color (225, 228, 232); - public static readonly Gdk.Color InactiveBrowserPadBackground = new Gdk.Color (240, 240, 240); + public static Color BrowserPadBackground { get; internal set; } + public static Color InactiveBrowserPadBackground { get; internal set; } - public static readonly Cairo.Color DockBarBackground1 = PadBackground.ToCairoColor (); - public static readonly Cairo.Color DockBarBackground2 = Shift (PadBackground.ToCairoColor (), 0.95); - public static readonly Cairo.Color DockBarSeparatorColorDark = new Cairo.Color (0, 0, 0, 0.2); - public static readonly Cairo.Color DockBarSeparatorColorLight = new Cairo.Color (1, 1, 1, 0.3); + public static Color PadCategoryBackgroundColor { get; internal set; } + public static Color PadCategoryBorderColor { get; internal set; } + public static Color PadCategoryLabelColor { get; internal set; } - public static readonly Cairo.Color DockBarPrelightColor = CairoExtensions.ParseColor ("ffffff"); + public static Color PropertyPadLabelBackgroundColor { get; internal set; } + public static Color PropertyPadDividerColor { get; internal set; } // Status area - public static readonly Cairo.Color WidgetBorderColor = CairoExtensions.ParseColor ("8c8c8c"); + public static Color WidgetBorderColor { get; internal set; } + + public static Color StatusBarBorderColor { get; internal set; } - public static readonly Cairo.Color StatusBarBorderColor = CairoExtensions.ParseColor ("919191"); + public static Color StatusBarFill1Color { get; internal set; } + public static Color StatusBarFill2Color { get; internal set; } + public static Color StatusBarFill3Color { get; internal set; } + public static Color StatusBarFill4Color { get; internal set; } - public static readonly Cairo.Color StatusBarFill1Color = CairoExtensions.ParseColor ("f5fafc"); - public static readonly Cairo.Color StatusBarFill2Color = CairoExtensions.ParseColor ("e9f1f3"); - public static readonly Cairo.Color StatusBarFill3Color = CairoExtensions.ParseColor ("d8e7ea"); - public static readonly Cairo.Color StatusBarFill4Color = CairoExtensions.ParseColor ("d1e3e7"); + public static Color StatusBarErrorColor { get; internal set; } - public static readonly Cairo.Color StatusBarErrorColor = CairoExtensions.ParseColor ("FF6363"); + public static Color StatusBarInnerColor { get; internal set; } + public static Color StatusBarShadowColor1 { get; internal set; } + public static Color StatusBarShadowColor2 { get; internal set; } + public static Color StatusBarTextColor { get; internal set; } + public static Color StatusBarProgressBackgroundColor { get; internal set; } + public static Color StatusBarProgressOutlineColor { get; internal set; } - public static readonly Cairo.Color StatusBarInnerColor = new Cairo.Color (0,0,0, 0.08); - public static readonly Cairo.Color StatusBarShadowColor1 = new Cairo.Color (0,0,0, 0.06); - public static readonly Cairo.Color StatusBarShadowColor2 = new Cairo.Color (0,0,0, 0.02); - public static readonly Cairo.Color StatusBarTextColor = CairoExtensions.ParseColor ("555555"); - public static readonly Cairo.Color StatusBarProgressBackgroundColor = new Cairo.Color (0, 0, 0, 0.1); - public static readonly Cairo.Color StatusBarProgressOutlineColor = new Cairo.Color (0, 0, 0, 0.1); + public static readonly Pango.FontDescription StatusFont = Pango.FontDescription.FromString ("Normal"); - public static readonly Pango.FontDescription StatusFont = Pango.FontDescription.FromString ("Normal");
-
public static int StatusFontPixelHeight { get { return (int)(11 * PixelScale); } } public static int ProgressBarHeight { get { return (int)(18 * PixelScale); } } public static int ProgressBarInnerPadding { get { return (int)(4 * PixelScale); } } public static int ProgressBarOuterPadding { get { return (int)(4 * PixelScale); } } - static readonly double PixelScale = GtkWorkarounds.GetPixelScale (); + static double? pixelScale = null; + + static double PixelScale { + get { + if (!pixelScale.HasValue) + pixelScale = GtkWorkarounds.GetPixelScale (); + return (double)pixelScale; + } + } // Toolbar - public static readonly Cairo.Color ToolbarBottomBorderColor = new Cairo.Color (0.5, 0.5, 0.5); - public static readonly Cairo.Color ToolbarBottomGlowColor = new Cairo.Color (1, 1, 1, 0.2); + public static Color ToolbarBottomBorderColor { get; internal set; } // Code Completion - public static readonly int TooltipInfoSpacing = 1; + public static readonly int TooltipInfoSpacing; // Popover Windows @@ -134,76 +166,428 @@ namespace MonoDevelop.Ide.Gui public static readonly int PagerTriangleSize = 6; public static readonly int PagerHeight = 16; - public static readonly Cairo.Color DefaultBackgroundColor = CairoExtensions.ParseColor ("f2f2f2"); - public static readonly Cairo.Color ErrorBackgroundColor = CairoExtensions.ParseColor ("E27267"); - public static readonly Cairo.Color WarningBackgroundColor = CairoExtensions.ParseColor ("efd46c"); - public static readonly Cairo.Color InformationBackgroundColor = CairoExtensions.ParseColor ("709DC9"); + public static Color DefaultBackgroundColor { get; internal set; } + public static Color ErrorBackgroundColor { get; internal set; } + public static Color WarningBackgroundColor { get; internal set; } + public static Color InformationBackgroundColor { get; internal set; } - public static readonly Cairo.Color DefaultBorderColor = CairoExtensions.ParseColor ("ffeeba"); - public static readonly Cairo.Color ErrorBorderColor = CairoExtensions.ParseColor ("c97968"); - public static readonly Cairo.Color WarningBorderColor = CairoExtensions.ParseColor ("e8c12c"); - public static readonly Cairo.Color InformationBorderColor = CairoExtensions.ParseColor ("6688bc"); + public static Color DefaultTextColor { get; internal set; } + public static Color ErrorTextColor { get; internal set; } + public static Color WarningTextColor { get; internal set; } + public static Color InformationTextColor { get; internal set; } - public static readonly Cairo.Color DefaultTextColor = CairoExtensions.ParseColor ("665a36"); - public static readonly Cairo.Color ErrorTextColor = CairoExtensions.ParseColor ("ffffff"); - public static readonly Cairo.Color WarningTextColor = CairoExtensions.ParseColor ("563b00"); - public static readonly Cairo.Color InformationTextColor = CairoExtensions.ParseColor ("ffffff"); + public static Color ShadowColor { get; internal set; } public static class ParamaterWindows { - public static readonly Cairo.Color GradientStartColor = CairoExtensions.ParseColor ("fffee6"); - public static readonly Cairo.Color GradientEndColor = CairoExtensions.ParseColor ("fffcd1"); + public static Color GradientStartColor { get; internal set; } + public static Color GradientEndColor { get; internal set; } } } + // Code Completion + + public static class CodeCompletion + { + public static Color BackgroundColor { get; internal set; } + public static Color TextColor { get; internal set; } + public static Color CategoryColor { get; internal set; } + public static Color HighlightColor { get; internal set; } + public static Color SelectionBackgroundColor { get; internal set; } + public static Color SelectionBackgroundInactiveColor { get; internal set; } + public static Color SelectionTextColor { get; internal set; } + public static Color SelectionHighlightColor { get; internal set; } + } + + // Global Search + + public static class GlobalSearch + { + public static Color HeaderTextColor { get; internal set; } + public static Color SeparatorLineColor { get; internal set; } + public static Color HeaderBackgroundColor { get; internal set; } + public static Color BackgroundColor { get; internal set; } + public static Color SelectionBackgroundColor { get; internal set; } + public static Color ResultTextColor { get; internal set; } + public static Color ResultDescriptionTextColor { get; internal set; } + public static Color ResultMatchTextColor { get; internal set; } + public static Color SelectedResultTextColor { get; internal set; } + public static Color SelectedResultDescriptionTextColor { get; internal set; } + public static Color SelectedResultMatchTextColor { get; internal set; } + } + + // New Project Dialog + + public static class NewProjectDialog + { + public static Color BannerBackgroundColor { get; internal set; } + public static Color BannerLineColor { get; internal set; } + public static Color BannerForegroundColor { get; internal set; } + public static Color CategoriesBackgroundColor { get; internal set; } + public static Color TemplateListBackgroundColor { get; internal set; } + public static Color TemplateBackgroundColor { get; internal set; } + public static Color TemplateSectionSeparatorColor { get; internal set; } + public static Color TemplateLanguageButtonBackground { get; internal set; } + public static Color TemplateLanguageButtonTriangle { get; internal set; } + public static Color ProjectConfigurationLeftHandBackgroundColor { get; internal set; } + public static Color ProjectConfigurationRightHandBackgroundColor { get; internal set; } + public static Color ProjectConfigurationPreviewLabelColor { get; internal set; } + public static Color ProjectConfigurationSeparatorColor { get; internal set; } + } + + // Editor + + public static class Editor + { + public static Color SmartTagMarkerColorLight { get; internal set; } + public static Color SmartTagMarkerColorDark { get; internal set; } + public static Color SearchErrorForegroundColor { get; internal set; } + } + // Helper methods - internal static Cairo.Color Shift (Cairo.Color color, double factor) + internal static Color Shift (Color color, double factor) + { + return new Color (color.Red * factor, color.Green * factor, color.Blue * factor, color.Alpha); + } + + internal static Color MidColor (double factor) { - return new Cairo.Color (color.R * factor, color.G * factor, color.B * factor, color.A); + return BaseBackgroundColor.BlendWith (BaseForegroundColor, factor); } - internal static Cairo.Color WithAlpha (Cairo.Color c, double alpha) + internal static Color ReduceLight (Color color, double factor) { - return new Cairo.Color (c.R, c.G, c.B, alpha); + color.Light *= factor; + return color; } - internal static Cairo.Color Blend (Cairo.Color color, Cairo.Color targetColor, double factor) + internal static Color IncreaseLight (Color color, double factor) { - return new Cairo.Color (color.R + ((targetColor.R - color.R) * factor), - color.G + ((targetColor.G - color.G) * factor), - color.B + ((targetColor.B - color.B) * factor), - color.A - ); + color.Light += (1 - color.Light) * factor; + return color; } - internal static Cairo.Color MidColor (double factor) + public static string ColorGetHex (Color color, bool withAlpha = false) { - return Blend (BaseBackgroundColor, BaseForegroundColor, factor); + if (withAlpha) { + return String.Format("#{0:x2}{1:x2}{2:x2}{3:x2}", (byte)(color.Red * 255), (byte)(color.Green * 255), + (byte)(color.Blue * 255), (byte)(color.Alpha * 255)); + } else { + return String.Format("#{0:x2}{1:x2}{2:x2}", (byte)(color.Red * 255), (byte)(color.Green * 255), + (byte)(color.Blue * 255)); + } } - internal static Cairo.Color ReduceLight (Cairo.Color color, double factor) + static Styles () { - var c = color.ToXwtColor (); - c.Light *= factor; - return c.ToCairoColor (); + if (Core.Platform.IsWindows) + TooltipInfoSpacing = 0; + else + TooltipInfoSpacing = -4; + LoadStyle (); } - internal static Cairo.Color IncreaseLight (Cairo.Color color, double factor) + internal static void LoadStyle () { - var c = color.ToXwtColor (); - c.Light += (1 - c.Light) * factor; - return c.ToCairoColor (); + Gtk.Style defaultStyle; + Gtk.Widget styledWidget; + if (IdeApp.Workbench == null || IdeApp.Workbench.RootWindow == null) { + styledWidget = new Gtk.Label (String.Empty); + defaultStyle = styledWidget.Style; + } else { + styledWidget = IdeApp.Workbench.RootWindow; + defaultStyle = Gtk.Rc.GetStyle (styledWidget); + } + + BackgroundColor = defaultStyle.Background (Gtk.StateType.Normal).ToXwtColor (); // must be the bg color from Gtkrc + BaseBackgroundColor = defaultStyle.Base (Gtk.StateType.Normal).ToXwtColor (); // must be the base color from Gtkrc + BaseForegroundColor = defaultStyle.Foreground (Gtk.StateType.Normal).ToXwtColor (); // must be the text color from Gtkrc + BaseSelectionBackgroundColor = defaultStyle.Base (Gtk.StateType.Selected).ToXwtColor (); + BaseSelectionTextColor = defaultStyle.Text (Gtk.StateType.Selected).ToXwtColor (); + + LinkForegroundColor = ((Gdk.Color)styledWidget.StyleGetProperty ("link-color")).ToXwtColor (); + if (LinkForegroundColor == Colors.Black) // the style returs black when not initialized + LinkForegroundColor = Colors.Blue; // set the link color to generic blue until initialization is finished + + DefaultFont = defaultStyle.FontDescription.Copy (); + DefaultFontName = DefaultFont.ToString (); + + if (IdeApp.Preferences == null || IdeApp.Preferences.UserInterfaceSkin == Skin.Light) + LoadLightStyle (); + else + LoadDarkStyle (); + + // Shared colors + + DockBarLabelColor = BaseIconColor; + DockSeparatorColor = DockFrameBackground; + PropertyPadLabelBackgroundColor = PrimaryBackgroundColor; + PadCategoryBorderColor = SeparatorColor; + PadCategoryLabelColor = BaseForegroundColor; + PadCategoryBackgroundColor = SecondaryBackgroundLighterColor; + PadLabelColor = BaseForegroundColor; + SubTabBarActiveBackgroundColor = BaseSelectionBackgroundColor; + SubTabBarActiveTextColor = BaseSelectionTextColor; + SubTabBarSeparatorColor = SubTabBarTextColor; + InactiveBrowserPadBackground = InactivePadBackground; + + // Tabs + + TabBarBackgroundColor = DockFrameBackground; + TabBarInactiveTextColor = InactivePadLabelColor; + TabBarActiveTextColor = BaseForegroundColor; + + // Breadcrumbs + + BreadcrumbTextColor = BaseForegroundColor; + + // Document Subview Tabs + + SubTabBarTextColor = BaseForegroundColor; + + // Popover Window + + PopoverWindow.InformationBackgroundColor = StatusInformationBackgroundColor; + PopoverWindow.InformationTextColor = StatusInformationTextColor; + PopoverWindow.WarningBackgroundColor = StatusWarningBackgroundColor; + PopoverWindow.WarningTextColor = StatusWarningTextColor; + PopoverWindow.ErrorBackgroundColor = StatusErrorBackgroundColor; + PopoverWindow.ErrorTextColor = StatusErrorTextColor; + + // Code Completion + + CodeCompletion.SelectionBackgroundColor = BaseSelectionBackgroundColor; + CodeCompletion.SelectionTextColor = BaseSelectionTextColor; + + // Global Search + + GlobalSearch.BackgroundColor = PrimaryBackgroundColor; + GlobalSearch.HeaderBackgroundColor = SecondaryBackgroundLighterColor; + GlobalSearch.HeaderTextColor = DimTextColor; + GlobalSearch.SeparatorLineColor = SeparatorColor; + GlobalSearch.SelectionBackgroundColor = BaseSelectionBackgroundColor; + GlobalSearch.ResultTextColor = BaseForegroundColor; + GlobalSearch.ResultDescriptionTextColor = DimTextColor; + GlobalSearch.SelectedResultTextColor = BaseSelectionTextColor; + GlobalSearch.SelectedResultDescriptionTextColor = BaseSelectionTextColor; + GlobalSearch.SelectedResultMatchTextColor = BaseSelectionTextColor; + + // New Project Dialog + + NewProjectDialog.TemplateBackgroundColor = PrimaryBackgroundColor; + NewProjectDialog.TemplateLanguageButtonTriangle = BaseIconColor; + NewProjectDialog.ProjectConfigurationPreviewLabelColor = BaseForegroundColor; + NewProjectDialog.CategoriesBackgroundColor = SecondaryBackgroundDarkerColor; + NewProjectDialog.ProjectConfigurationLeftHandBackgroundColor = SecondaryBackgroundDarkerColor; + NewProjectDialog.ProjectConfigurationRightHandBackgroundColor = PrimaryBackgroundColor; + + // Editor + + Editor.SmartTagMarkerColorLight = Color.FromName ("#ff70fe").WithAlpha (.5); + Editor.SmartTagMarkerColorDark = Color.FromName ("#ffffff").WithAlpha (.5); + Editor.SearchErrorForegroundColor = ErrorForegroundColor; + + if (Changed != null) + Changed (null, EventArgs.Empty); } - internal static Gdk.Color ReduceLight (Gdk.Color color, double factor) + internal static void LoadLightStyle () { - return ReduceLight (color.ToCairoColor (), factor).ToGdkColor (); + BaseIconColor = Color.FromName ("#575757"); + ThinSplitterColor = Color.FromName ("#dadada"); + SeparatorColor = Color.FromName ("#f2f2f4"); + PrimaryBackgroundColor = BaseBackgroundColor; + SecondaryBackgroundDarkerColor = Color.FromName ("#e7eaee"); + SecondaryBackgroundLighterColor = Color.FromName ("#f9f9fb"); + DimTextColor = Color.FromName ("#888888"); + PadBackground = Color.FromName ("#fafafa"); + InactivePadBackground = Color.FromName ("#e8e8e8"); + InactivePadLabelColor = Color.FromName ("#777777"); + DockFrameBackground = Color.FromName ("#bfbfbf"); + DockBarBackground = Color.FromName ("#dddddd"); + DockBarPrelightColor = Color.FromName ("#eeeeee"); + BrowserPadBackground = Color.FromName ("#ebedf0"); + PropertyPadDividerColor = Color.FromName ("#efefef"); + + ErrorForegroundColor = Color.FromName ("#db6246"); + WarningForegroundColor = Color.FromName ("#a08000"); + InformationForegroundColor = Color.FromName ("#5785bd"); + + // these colors need to match colors from status icons + StatusInformationBackgroundColor = Color.FromName ("#87b6f0"); + StatusInformationTextColor = BaseBackgroundColor; + StatusWarningBackgroundColor = Color.FromName ("#f1c40f"); + StatusWarningTextColor = BaseBackgroundColor; + StatusErrorBackgroundColor = Color.FromName ("#f56d4f"); + StatusErrorTextColor = BaseBackgroundColor; + + // Tabs + + TabBarNotifyTextColor = Color.FromName ("#ff00ff"); // TODO: VV + + // Breadcrumb + + BreadcrumbBackgroundColor = PadBackground; + BreadcrumbButtonFillColor = BaseSelectionBackgroundColor.WithAlpha (0.2); + BreadcrumbBottomBorderColor = DockBarBackground; + + // Document Subview Tabs + + SubTabBarBackgroundColor = PadBackground; + SubTabBarHoverBackgroundColor = BaseSelectionBackgroundColor.WithAlpha (0.2); + + // WidgetBorderColor = Color.FromName ("#ff00ff"); // TODO: 8c8c8c - UNUSED (used for custom drawn `SearchEntry` but it isn’t used anymore, so its deprecated) + + // Status area (GTK) + // FIXME: VV: Will test after the preview build + + StatusBarBorderColor = Color.FromName ("#ff00ff"); // TODO: VV: 919191 + StatusBarFill1Color = Color.FromName ("#ff00ff"); // TODO: VV: f5fafc + StatusBarFill2Color = Color.FromName ("#ff00ff"); // TODO: VV: e9f1f3 + StatusBarFill3Color = Color.FromName ("#ff00ff"); // TODO: VV: d8e7ea + StatusBarFill4Color = Color.FromName ("#ff00ff"); // TODO: VV: d1e3e7 + StatusBarErrorColor = Color.FromName ("#ff00ff"); // TODO: VV: FF6363 + StatusBarInnerColor = Color.FromName ("#ff00ff").WithAlpha (.08); // TODO: VV: 000000 + StatusBarShadowColor1 = Color.FromName ("#ff00ff").WithAlpha (.06); // TODO: VV: 000000 + StatusBarShadowColor2 = Color.FromName ("#ff00ff").WithAlpha (.02); // TODO: VV: 000000 + StatusBarTextColor = BaseForegroundColor; // TODO: VV + StatusBarProgressBackgroundColor = Color.FromName ("#ff00ff").WithAlpha (.1); // TODO: VV: 000000 + StatusBarProgressOutlineColor = Color.FromName ("#ff00ff").WithAlpha (.1); // TODO: VV: 000000 + + // Toolbar + + ToolbarBottomBorderColor = Color.FromName ("#afafaf"); + + // Global Search + + GlobalSearch.ResultMatchTextColor = Color.FromName ("#4d4d4d"); + + // Popover Window + + PopoverWindow.DefaultBackgroundColor = Color.FromName ("#f2f2f2"); // gtkrc @tooltip_bg_color + PopoverWindow.DefaultTextColor = Color.FromName ("#555555"); + PopoverWindow.ShadowColor = Color.FromName ("#000000").WithAlpha (.05); + + PopoverWindow.ParamaterWindows.GradientStartColor = Color.FromName ("#fffee6"); + PopoverWindow.ParamaterWindows.GradientEndColor = Color.FromName ("#fffcd1"); + + // Code Completion + + CodeCompletion.BackgroundColor = Color.FromName ("#eef1f2"); + CodeCompletion.TextColor = Color.FromName ("#646566"); + CodeCompletion.CategoryColor = DimTextColor; + CodeCompletion.HighlightColor = Color.FromName ("#ba3373"); + CodeCompletion.SelectionBackgroundInactiveColor = Color.FromName ("#7e96c0"); + CodeCompletion.SelectionHighlightColor = CodeCompletion.HighlightColor; + + // New Project Dialog + + NewProjectDialog.BannerBackgroundColor = Color.FromName ("#77828c"); + NewProjectDialog.BannerLineColor = Color.FromName ("#707a83"); + NewProjectDialog.BannerForegroundColor = BaseBackgroundColor; + NewProjectDialog.TemplateListBackgroundColor = Color.FromName ("#f9f9fa"); + NewProjectDialog.TemplateSectionSeparatorColor = Color.FromName ("#e2e2e2"); + NewProjectDialog.TemplateLanguageButtonBackground = BaseBackgroundColor; + NewProjectDialog.ProjectConfigurationSeparatorColor = Color.FromName ("#d2d5d9"); } - internal static Gdk.Color IncreaseLight (Gdk.Color color, double factor) + internal static void LoadDarkStyle () { - return IncreaseLight (color.ToCairoColor (), factor).ToGdkColor (); + BaseIconColor = Color.FromName ("#bfbfbf"); + ThinSplitterColor = Color.FromName ("#2e2e2e"); + SeparatorColor = Color.FromName ("#4b4b4b"); + PrimaryBackgroundColor = BaseBackgroundColor; + SecondaryBackgroundDarkerColor = Color.FromName ("#484848"); + SecondaryBackgroundLighterColor = SeparatorColor; + DimTextColor = Color.FromName ("#777777"); + PadBackground = Color.FromName ("#525252"); + InactivePadBackground = Color.FromName ("#474747"); + InactivePadLabelColor = Color.FromName ("#999999"); + DockFrameBackground = Color.FromName ("#303030"); + DockBarBackground = PadBackground; + DockBarPrelightColor = Color.FromName ("#666666"); + BrowserPadBackground = Color.FromName ("#484b55"); + PropertyPadDividerColor = SeparatorColor; + + ErrorForegroundColor = Color.FromName ("#ff866b"); + WarningForegroundColor = Color.FromName ("#ffd21c"); + InformationForegroundColor = Color.FromName ("#9cc8ff"); + + // these colors need to match colors from status icons + StatusInformationBackgroundColor = Color.FromName ("#8fc1ff"); + StatusInformationTextColor = Color.FromName ("#394d66"); + StatusWarningBackgroundColor = Color.FromName ("#ffcf0f"); + StatusWarningTextColor = Color.FromName ("#665206"); + StatusErrorBackgroundColor = Color.FromName ("#ff7152"); + StatusErrorTextColor = Color.FromName ("#662d20"); + + // Tabs + + TabBarNotifyTextColor = Color.FromName ("#ff00ff"); // TODO: VV + + // Breadcrumb + + BreadcrumbBackgroundColor = PadBackground; + BreadcrumbButtonFillColor = SecondaryBackgroundLighterColor; + BreadcrumbBottomBorderColor = BreadcrumbBackgroundColor; + + // Document Subview Tabs + + SubTabBarBackgroundColor = PadBackground; + SubTabBarHoverBackgroundColor = SecondaryBackgroundLighterColor; + + // Status area (GTK) + // FIXME: Will test after the preview build + + StatusBarBorderColor = Color.FromName ("#ff00ff"); // TODO: VV: 919191 + StatusBarFill1Color = Color.FromName ("#ff00ff"); // TODO: VV: f5fafc + StatusBarFill2Color = Color.FromName ("#ff00ff"); // TODO: VV: e9f1f3 + StatusBarFill3Color = Color.FromName ("#ff00ff"); // TODO: VV: d8e7ea + StatusBarFill4Color = Color.FromName ("#ff00ff"); // TODO: VV: d1e3e7 + StatusBarErrorColor = Color.FromName ("#ff00ff"); // TODO: VV: FF6363 + StatusBarInnerColor = Color.FromName ("#ff00ff").WithAlpha (.08); // TODO: VV: 000000 + StatusBarShadowColor1 = Color.FromName ("#ff00ff").WithAlpha (.06); // TODO: VV: 000000 + StatusBarShadowColor2 = Color.FromName ("#ff00ff").WithAlpha (.02); // TODO: VV: 000000 + StatusBarTextColor = BaseForegroundColor; // TODO: VV + StatusBarProgressBackgroundColor = Color.FromName ("#ff00ff").WithAlpha (.1); // TODO: VV: 000000 + StatusBarProgressOutlineColor = Color.FromName ("#ff00ff").WithAlpha (.1); // TODO: VV: 000000 + + // Toolbar + + ToolbarBottomBorderColor = Color.FromName ("#444444"); + + // Global Search + + GlobalSearch.ResultMatchTextColor = BaseSelectionTextColor; + + // Popover window + + PopoverWindow.DefaultBackgroundColor = Color.FromName ("#5e5e5e"); + PopoverWindow.DefaultTextColor = Color.FromName ("#bdc1c1"); + PopoverWindow.ShadowColor = Color.FromName ("#000000").WithAlpha (0); // transparent since dark skin doesn't need shadows + + PopoverWindow.ParamaterWindows.GradientStartColor = Color.FromName ("#fffee6"); + PopoverWindow.ParamaterWindows.GradientEndColor = Color.FromName ("#fffcd1"); + + // Code Completion + + CodeCompletion.BackgroundColor = PopoverWindow.DefaultBackgroundColor; + CodeCompletion.TextColor = Color.FromName ("#c3c5c6"); + CodeCompletion.CategoryColor = Color.FromName ("#a1a1a1"); + CodeCompletion.HighlightColor = Color.FromName ("#f9d33c"); + CodeCompletion.SelectionBackgroundInactiveColor = Color.FromName ("#7e96c0"); + CodeCompletion.SelectionHighlightColor = CodeCompletion.HighlightColor; + + // New Project Dialog + + NewProjectDialog.BannerBackgroundColor = Color.FromName ("#6a737e"); + NewProjectDialog.BannerLineColor = NewProjectDialog.BannerBackgroundColor; + NewProjectDialog.BannerForegroundColor = Color.FromName ("#ffffff"); + NewProjectDialog.TemplateListBackgroundColor = DockBarBackground; + NewProjectDialog.TemplateSectionSeparatorColor = ThinSplitterColor; + NewProjectDialog.TemplateLanguageButtonBackground = SecondaryBackgroundDarkerColor; + NewProjectDialog.ProjectConfigurationSeparatorColor = Color.FromName ("#6e6e6e"); } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ToolbarComboBox.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ToolbarComboBox.cs index 4b821b558e..01fac931a1 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ToolbarComboBox.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ToolbarComboBox.cs @@ -65,7 +65,7 @@ namespace MonoDevelop.Ide.Gui { if (Style != null) { if (toolbar.IconSize == Gtk.IconSize.Menu || toolbar.IconSize == Gtk.IconSize.SmallToolbar) { - Pango.FontDescription fd = Style.FontDescription.Copy (); + Pango.FontDescription fd = Style.FontDescription.Copy (); // TODO: VV: Use FontService fd.Size = (int) (fd.Size * Pango.Scale.Small); ctx.FontDesc = fd; } else { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeOptionsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeOptionsPanel.cs index bc2a0b85b0..f8ec40c5fe 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeOptionsPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeOptionsPanel.cs @@ -35,7 +35,8 @@ using MonoDevelop.Core.Assemblies; using Gtk; using MonoDevelop.Ide.Gui.Dialogs; - +using MonoDevelop.Components;
+
namespace MonoDevelop.Ide.Projects.OptionPanels { internal class PortableRuntimeOptionsPanel : ItemOptionsPanel @@ -65,8 +66,8 @@ namespace MonoDevelop.Ide.Projects.OptionPanels TargetFramework target; HBox warningHBox; Label warning; - Image warningImage; - Image infoImage; + ImageView warningImage; + ImageView infoImage; ComboBox selectorCombo; bool disableEvents; @@ -414,8 +415,8 @@ namespace MonoDevelop.Ide.Projects.OptionPanels warning.SetAlignment (0.0f, 0.5f); warning.Show (); - infoImage = new Image (GetType ().Assembly, "warning-16.png"); - warningImage = new Image (GetType ().Assembly, "error-16.png"); + infoImage = new ImageView (Xwt.Drawing.Image.FromResource (GetType ().Assembly, "warning-16.png")); + warningImage = new ImageView (Xwt.Drawing.Image.FromResource (GetType ().Assembly, "error-16.png")); warningHBox = new HBox (false, 6); warningHBox.PackStart (infoImage, false, false, 0); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddExternalFileDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddExternalFileDialog.cs index 111d928081..dd01c1279d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddExternalFileDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddExternalFileDialog.cs @@ -32,6 +32,7 @@ namespace MonoDevelop.Ide.Projects { public AddExternalFileDialog (string file) { + MonoDevelop.Components.IdeTheme.ApplyTheme (this); HasSeparator = true; this.Build (); radioCopy.Active = true; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddMimeTypeDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddMimeTypeDialog.cs index 5ea7153076..a3510252fe 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddMimeTypeDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddMimeTypeDialog.cs @@ -84,7 +84,7 @@ namespace MonoDevelop.Ide.Projects desc = mt; buttonOk.Sensitive = mimeType != null; labelDesc.Text = desc ?? string.Empty; - image.Pixbuf = img.ToPixbuf (Gtk.IconSize.Menu); + image.Image = img; } string TryGetFileType (string name) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.UI.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.UI.cs index c1f28ff9ba..61ff873e80 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.UI.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.UI.cs @@ -28,19 +28,20 @@ using Gdk; using Gtk;
using MonoDevelop.Components;
using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
using MonoDevelop.Ide.Templates;
namespace MonoDevelop.Ide.Projects
{
- partial class GtkNewProjectDialogBackend : Gtk.Dialog
+ partial class GtkNewProjectDialogBackend : IdeDialog
{
- Color bannerBackgroundColor = new Color (119, 130, 140);
- Color bannerLineColor = new Color (112, 122, 131);
- Color whiteColor = new Color (255, 255, 255);
- Color categoriesBackgroundColor = new Color (225, 228, 232);
- Color templateListBackgroundColor = new Color (240, 240, 240);
- Color templateBackgroundColor = new Color (255, 255, 255);
- Color templateSectionSeparatorColor = new Color (208, 208, 208);
+ Color bannerBackgroundColor = Styles.NewProjectDialog.BannerBackgroundColor.ToGdkColor ();
+ Color bannerLineColor = Styles.NewProjectDialog.BannerLineColor.ToGdkColor ();
+ Color whiteColor = Styles.NewProjectDialog.BannerForegroundColor.ToGdkColor ();
+ Color categoriesBackgroundColor = Styles.NewProjectDialog.CategoriesBackgroundColor.ToGdkColor ();
+ Color templateListBackgroundColor = Styles.NewProjectDialog.TemplateListBackgroundColor.ToGdkColor ();
+ Color templateBackgroundColor = Styles.NewProjectDialog.TemplateBackgroundColor.ToGdkColor ();
+ Color templateSectionSeparatorColor = Styles.NewProjectDialog.TemplateSectionSeparatorColor.ToGdkColor ();
VBox centreVBox;
HBox templatesHBox;
@@ -69,6 +70,32 @@ namespace MonoDevelop.Ide.Projects GtkTemplateCellRenderer templateTextRenderer;
GtkTemplateCategoryCellRenderer categoryTextRenderer;
+ static GtkNewProjectDialogBackend ()
+ {
+ UpdateStyles ();
+ Styles.Changed += (sender, e) => UpdateStyles ();
+ }
+
+ static void UpdateStyles ()
+ {
+ var categoriesBackgroundColorHex = Styles.ColorGetHex (Styles.NewProjectDialog.CategoriesBackgroundColor);
+ var templateListBackgroundColorHex = Styles.ColorGetHex (Styles.NewProjectDialog.TemplateListBackgroundColor);
+
+ string rcstyle = "style \"templateCategoriesTreeView\"\r\n{\r\n" +
+ " base[NORMAL] = \"" + categoriesBackgroundColorHex + "\"\r\n" +
+ " GtkTreeView::even-row-color = \"" + categoriesBackgroundColorHex + "\"\r\n" +
+ "}\r\n";
+ rcstyle += "style \"templatesTreeView\"\r\n{\r\n" +
+ " base[NORMAL] = \"" + templateListBackgroundColorHex + "\"\r\n" +
+ " GtkTreeView::even-row-color = \"" + templateListBackgroundColorHex + "\"" +
+ "\r\n}";
+
+ rcstyle += "widget \"*templateCategoriesTreeView*\" style \"templateCategoriesTreeView\"\r\n";
+ rcstyle += "widget \"*templatesTreeView*\" style \"templatesTreeView\"\r\n";
+
+ Rc.ParseString (rcstyle);
+ }
+
void Build ()
{
BorderWidth = 0;
@@ -105,7 +132,7 @@ namespace MonoDevelop.Ide.Projects topBannerLabel = new Label ();
topBannerLabel.Name = "topBannerLabel";
- Pango.FontDescription font = topBannerLabel.Style.FontDescription.Copy ();
+ Pango.FontDescription font = topBannerLabel.Style.FontDescription.Copy (); // TODO: VV: Use FontService
font.Size = (int)(font.Size * 1.8);
topBannerLabel.ModifyFont (font);
topBannerLabel.ModifyFg (StateType.Normal, whiteColor);
@@ -127,10 +154,11 @@ namespace MonoDevelop.Ide.Projects centreVBox.PackEnd (templatesHBox, true, true, 0);
// Template categories.
- var templateCategoriesVBox = new VBox ();
- templateCategoriesVBox.Name = "templateCategoriesVBox";
- templateCategoriesVBox.BorderWidth = 0;
- templateCategoriesVBox.WidthRequest = GtkWorkarounds.ConvertToPixelScale (220);
+ var templateCategoriesBgBox = new EventBox ();
+ templateCategoriesBgBox.Name = "templateCategoriesVBox";
+ templateCategoriesBgBox.BorderWidth = 0;
+ templateCategoriesBgBox.ModifyBg (StateType.Normal, categoriesBackgroundColor);
+ templateCategoriesBgBox.WidthRequest = GtkWorkarounds.ConvertToPixelScale (220);
var templateCategoriesScrolledWindow = new ScrolledWindow ();
templateCategoriesScrolledWindow.Name = "templateCategoriesScrolledWindow";
templateCategoriesScrolledWindow.HscrollbarPolicy = PolicyType.Never;
@@ -141,17 +169,17 @@ namespace MonoDevelop.Ide.Projects templateCategoriesTreeView.BorderWidth = 0;
templateCategoriesTreeView.HeadersVisible = false;
templateCategoriesTreeView.Model = templateCategoriesListStore;
- templateCategoriesTreeView.ModifyBase (StateType.Normal, categoriesBackgroundColor);
templateCategoriesTreeView.AppendColumn (CreateTemplateCategoriesTreeViewColumn ());
templateCategoriesScrolledWindow.Add (templateCategoriesTreeView);
- templateCategoriesVBox.PackStart (templateCategoriesScrolledWindow, true, true, 0);
- templatesHBox.PackStart (templateCategoriesVBox, false, false, 0);
+ templateCategoriesBgBox.Add (templateCategoriesScrolledWindow);
+ templatesHBox.PackStart (templateCategoriesBgBox, false, false, 0);
// Templates.
- var templatesVBox = new VBox (); - templatesVBox.Name = "templatesVBox";
- templatesVBox.WidthRequest = GtkWorkarounds.ConvertToPixelScale (400); - templatesHBox.PackStart (templatesVBox, false, false, 0);
+ var templatesBgBox = new EventBox ();
+ templatesBgBox.ModifyBg (StateType.Normal, templateListBackgroundColor); + templatesBgBox.Name = "templatesVBox";
+ templatesBgBox.WidthRequest = GtkWorkarounds.ConvertToPixelScale (400); + templatesHBox.PackStart (templatesBgBox, false, false, 0);
var templatesScrolledWindow = new ScrolledWindow ();
templatesScrolledWindow.Name = "templatesScrolledWindow";
templatesScrolledWindow.HscrollbarPolicy = PolicyType.Never;
@@ -161,10 +189,9 @@ namespace MonoDevelop.Ide.Projects templatesTreeView.Name = "templatesTreeView";
templatesTreeView.HeadersVisible = false;
templatesTreeView.Model = templatesListStore;
- templatesTreeView.ModifyBase (StateType.Normal, templateListBackgroundColor);
templatesTreeView.AppendColumn (CreateTemplateListTreeViewColumn ());
templatesScrolledWindow.Add (templatesTreeView);
- templatesVBox.PackStart (templatesScrolledWindow, true, true, 0);
+ templatesBgBox.Add (templatesScrolledWindow);
// Template
var templateEventBox = new EventBox ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.cs index 4c8c1551c9..e7c2b1b2bd 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkNewProjectDialogBackend.cs @@ -32,6 +32,7 @@ using MonoDevelop.Components; using MonoDevelop.Components.AutoTest;
using MonoDevelop.Components.Commands;
using MonoDevelop.Ide.Templates;
+using MonoDevelop.Ide.Gui;
namespace MonoDevelop.Ide.Projects
{
@@ -119,7 +120,7 @@ namespace MonoDevelop.Ide.Projects }
ClearPopupMenuItems ();
AddLanguageMenuItems (popupMenu, template);
- popupMenu.ModifyBg (StateType.Normal, GtkTemplateCellRenderer.LanguageButtonBackgroundColor);
+ popupMenu.ModifyBg (StateType.Normal, Styles.NewProjectDialog.TemplateLanguageButtonBackground.ToGdkColor ());
popupMenu.ShowAll ();
MenuPositionFunc posFunc = (Menu m, out int x, out int y, out bool pushIn) => {
@@ -221,7 +222,7 @@ namespace MonoDevelop.Ide.Projects void AddTopLevelTemplateCategory (TemplateCategory category)
{
- Xwt.Drawing.Image icon = GetIcon (category.IconId, IconSize.Menu);
+ Xwt.Drawing.Image icon = GetIcon (category.IconId ?? "md-platform-other", IconSize.Menu);
categoryTextRenderer.CategoryIconWidth = (int)icon.Width;
templateCategoriesListStore.AppendValues (
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs index 9c30e16114..a69502c279 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs @@ -31,6 +31,7 @@ using Gtk; using MonoDevelop.Components;
using MonoDevelop.Core;
using MonoDevelop.Ide.Tasks;
+using MonoDevelop.Ide.Gui;
namespace MonoDevelop.Ide.Projects
{
@@ -39,8 +40,8 @@ namespace MonoDevelop.Ide.Projects {
FinalProjectConfigurationPage projectConfiguration;
uint defaultTableRows;
- Gdk.Color separatorColor = new Gdk.Color (176, 178, 181);
- Gdk.Color leftHandBackgroundColor = new Gdk.Color (225, 228, 232);
+ Gdk.Color separatorColor = Styles.NewProjectDialog.ProjectConfigurationSeparatorColor.ToGdkColor ();
+ Gdk.Color leftHandBackgroundColor = Styles.NewProjectDialog.ProjectConfigurationLeftHandBackgroundColor.ToGdkColor ();
DrawingArea extraControlsSeparator;
List<ExtraControlTableRow> extraControlRows = new List<ExtraControlTableRow> ();
@@ -51,7 +52,7 @@ namespace MonoDevelop.Ide.Projects solutionNameSeparator.ModifyBg (StateType.Normal, separatorColor);
locationSeparator.ModifyBg (StateType.Normal, separatorColor);
- eventBox.ModifyBg (StateType.Normal, new Gdk.Color (255, 255, 255));
+ eventBox.ModifyBg (StateType.Normal, Styles.NewProjectDialog.ProjectConfigurationRightHandBackgroundColor.ToGdkColor ());
leftBorderEventBox.ModifyBg (StateType.Normal, leftHandBackgroundColor);
projectConfigurationRightBorderEventBox.ModifyBg (StateType.Normal, leftHandBackgroundColor);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectFolderPreviewWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectFolderPreviewWidget.cs index ebe0bbce7a..57e94e9b57 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectFolderPreviewWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectFolderPreviewWidget.cs @@ -30,6 +30,7 @@ using Gtk; using MonoDevelop.Components;
using MonoDevelop.Core;
using MonoDevelop.Components.AutoTest;
+using MonoDevelop.Ide.Gui;
using System.ComponentModel;
namespace MonoDevelop.Ide.Projects
@@ -53,10 +54,36 @@ namespace MonoDevelop.Ide.Projects FinalProjectConfigurationPage projectConfiguration;
+ static GtkProjectFolderPreviewWidget ()
+ {
+ UpdateStyles ();
+ Styles.Changed += (sender, e) => UpdateStyles ();
+ }
+
+ static void UpdateStyles ()
+ {
+ var bgColorHex = Styles.ColorGetHex (Styles.NewProjectDialog.ProjectConfigurationRightHandBackgroundColor);
+
+ string rcstyle = "style \"projectFolderPreviewWidget\"\r\n{\r\n" +
+ " base[NORMAL] = \"" + bgColorHex + "\"\r\n" +
+ " GtkTreeView::even-row-color = \"" + bgColorHex + "\"\r\n" +
+ "}\r\n";
+ rcstyle += "widget \"*projectFolderPreviewWidget*\" style \"projectFolderPreviewWidget\"\r\n";
+
+ Rc.ParseString (rcstyle);
+ }
+
public GtkProjectFolderPreviewWidget ()
{
this.Build ();
+ folderTreeView.Name = "projectFolderPreviewWidget";
+
+ previewLabel.LabelProp = String.Format (
+ "<span weight='bold' foreground='{0}'>{1}</span>",
+ Styles.ColorGetHex (Styles.NewProjectDialog.ProjectConfigurationPreviewLabelColor),
+ global::Mono.Unix.Catalog.GetString ("PREVIEW"));
+
CreateFolderTreeViewColumns ();
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkTemplateCategoryCellRenderer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkTemplateCategoryCellRenderer.cs index 6b3e461ccd..b2a1264315 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkTemplateCategoryCellRenderer.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkTemplateCategoryCellRenderer.cs @@ -91,8 +91,11 @@ namespace MonoDevelop.Ide.Projects int iconY = cell_area.Y + ((cell_area.Height - (int)CategoryIcon.Height) / 2) + topLevelTemplateHeadingYOffset;
var iconRect = new Rectangle (cell_area.X + (int)Xpad, iconY, (int)CategoryIcon.Width, (int)CategoryIcon.Height);
+ var img = CategoryIcon;
+ if ((flags & Gtk.CellRendererState.Selected) != 0)
+ img = img.WithStyles ("sel");
using (var ctx = CairoHelper.Create (window)) {
- ctx.DrawImage (widget, CategoryIcon, iconRect.X, iconRect.Y);
+ ctx.DrawImage (widget, img, iconRect.X, iconRect.Y);
}
return iconRect;
}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkTemplateCellRenderer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkTemplateCellRenderer.cs index 2d02ec48ae..832aa2bcbc 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkTemplateCellRenderer.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkTemplateCellRenderer.cs @@ -31,15 +31,13 @@ using Gdk; using Gtk;
using MonoDevelop.Components;
using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
using MonoDevelop.Ide.Templates;
namespace MonoDevelop.Ide.Projects
{
class GtkTemplateCellRenderer : CellRendererText
{
- public static Color LanguageButtonBackgroundColor = new Color (247, 247, 247);
-
- Color triangleColor = new Color (83, 83, 83);
Rectangle languageRect;
int dropdownTriangleWidth = 8;
int dropdownTriangleHeight = 5;
@@ -124,7 +122,7 @@ namespace MonoDevelop.Ide.Projects DrawTemplateNameText (window, widget, cell_area, iconRect, languageRect, flags);
RoundBorder (ctx, languageRect.X, languageRect.Y, languageRect.Width, languageRect.Height);
- SetSourceColor (ctx, LanguageButtonBackgroundColor.ToCairoColor ());
+ SetSourceColor (ctx, Styles.NewProjectDialog.TemplateLanguageButtonBackground.ToCairoColor ());
ctx.Fill ();
int languageTextX = languageRect.X + GetLanguageLeftHandPadding (scale);
@@ -185,8 +183,11 @@ namespace MonoDevelop.Ide.Projects {
var iconRect = new Rectangle (cell_area.X + (int)Xpad, cell_area.Y + (int)Ypad, (int)TemplateIcon.Width, (int)TemplateIcon.Height);
+ var img = TemplateIcon;
+ if ((flags & Gtk.CellRendererState.Selected) != 0)
+ img = img.WithStyles ("sel");
using (var ctx = CairoHelper.Create (window)) {
- ctx.DrawImage (widget, TemplateIcon, iconRect.X, iconRect.Y);
+ ctx.DrawImage (widget, img, iconRect.X, iconRect.Y);
}
return iconRect;
@@ -279,7 +280,7 @@ namespace MonoDevelop.Ide.Projects int width = (int)(scale * dropdownTriangleWidth);
int height = (int)(scale * dropdownTriangleHeight);
- SetSourceColor (ctx, triangleColor.ToCairoColor ());
+ SetSourceColor (ctx, Styles.NewProjectDialog.TemplateLanguageButtonTriangle.ToCairoColor ());
ctx.MoveTo (x, y);
ctx.LineTo (x + width, y);
ctx.LineTo (x + (width / 2), y + height);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs index 06c6ab560e..9df4ad07eb 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs @@ -136,7 +136,9 @@ namespace MonoDevelop.Ide.Tasks comments.TasksAdded += GeneratedTaskAdded; comments.TasksRemoved += GeneratedTaskRemoved; - PropertyService.PropertyChanged += OnPropertyUpdated; + IdeApp.Preferences.UserTasksHighPrioColor.Changed += OnPropertyUpdated; + IdeApp.Preferences.UserTasksNormalPrioColor.Changed += OnPropertyUpdated; + IdeApp.Preferences.UserTasksLowPrioColor.Changed += OnPropertyUpdated; // Initialize with existing tags. foreach (TaskListEntry t in comments) @@ -151,7 +153,9 @@ namespace MonoDevelop.Ide.Tasks comments.TasksAdded -= GeneratedTaskAdded; comments.TasksRemoved -= GeneratedTaskRemoved; - PropertyService.PropertyChanged -= OnPropertyUpdated; + IdeApp.Preferences.UserTasksHighPrioColor.Changed -= OnPropertyUpdated; + IdeApp.Preferences.UserTasksNormalPrioColor.Changed -= OnPropertyUpdated; + IdeApp.Preferences.UserTasksLowPrioColor.Changed -= OnPropertyUpdated; }; } @@ -608,36 +612,20 @@ namespace MonoDevelop.Ide.Tasks return color; } - void OnPropertyUpdated (object sender, PropertyChangedEventArgs e) + void OnPropertyUpdated (object sender, EventArgs e) { - bool change = false; - if (e.Key == "Monodevelop.UserTasksHighPrioColor" && e.NewValue != e.OldValue) - { - highPrioColor = StringToColor ((string)e.NewValue); - change = true; - } - if (e.Key == "Monodevelop.UserTasksNormalPrioColor" && e.NewValue != e.OldValue) - { - normalPrioColor = StringToColor ((string)e.NewValue); - change = true; - } - if (e.Key == "Monodevelop.UserTasksLowPrioColor" && e.NewValue != e.OldValue) - { - lowPrioColor = StringToColor ((string)e.NewValue); - change = true; - } - - if (change) + highPrioColor = StringToColor (IdeApp.Preferences.UserTasksHighPrioColor); + normalPrioColor = StringToColor (IdeApp.Preferences.UserTasksNormalPrioColor); + lowPrioColor = StringToColor (IdeApp.Preferences.UserTasksLowPrioColor); + + TreeIter iter; + if (store.GetIterFirst (out iter)) { - TreeIter iter; - if (store.GetIterFirst (out iter)) + do { - do - { - TaskListEntry task = (TaskListEntry) store.GetValue (iter, (int)Columns.Task); - store.SetValue (iter, (int)Columns.Foreground, GetColorByPriority (task.Priority)); - } while (store.IterNext (ref iter)); - } + TaskListEntry task = (TaskListEntry) store.GetValue (iter, (int)Columns.Task); + store.SetValue (iter, (int)Columns.Foreground, GetColorByPriority (task.Priority)); + } while (store.IterNext (ref iter)); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs index 73963fb385..d0e32fffcf 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs @@ -109,21 +109,21 @@ namespace MonoDevelop.Ide.Tasks newButton = new Button (); newButton.Label = GettextCatalog.GetString ("New Task"); - newButton.Image = new Gtk.Image (Gtk.Stock.New, IconSize.Button); + newButton.Image = new ImageView (Gtk.Stock.New, IconSize.Button); newButton.Image.Show (); newButton.Clicked += new EventHandler (NewUserTaskClicked); newButton.TooltipText = GettextCatalog.GetString ("Create New Task"); copyButton = new Button (); copyButton.Label = GettextCatalog.GetString ("Copy Task"); - copyButton.Image = new Gtk.Image (Gtk.Stock.Copy, IconSize.Button); + copyButton.Image = new ImageView (Gtk.Stock.Copy, IconSize.Button); copyButton.Image.Show (); copyButton.Clicked += CopyUserTaskClicked; copyButton.TooltipText = GettextCatalog.GetString ("Copy Task Description"); delButton = new Button (); delButton.Label = GettextCatalog.GetString ("Delete Task"); - delButton.Image = new Gtk.Image (Gtk.Stock.Delete, IconSize.Button); + delButton.Image = new ImageView (Gtk.Stock.Delete, IconSize.Button); delButton.Image.Show (); delButton.Clicked += new EventHandler (DeleteUserTaskClicked); delButton.TooltipText = GettextCatalog.GetString ("Delete Task"); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs index 5d37b2d7d2..c07a19f487 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/DefaultWelcomePage.cs @@ -33,8 +33,8 @@ namespace MonoDevelop.Ide.WelcomePage { protected override void BuildContent (Container parent) { - LogoImage = Xwt.Drawing.Image.FromResource ("WelcomePage_Logo.png"); - TopBorderImage = Xwt.Drawing.Image.FromResource ("WelcomePage_TopBorderRepeat.png"); + LogoImage = Xwt.Drawing.Image.FromResource ("welcome-logo.png"); + TopBorderImage = Xwt.Drawing.Image.FromResource ("welcome-tile.png"); var mainAlignment = new Gtk.Alignment (0.5f, 0.5f, 0f, 1f); @@ -43,10 +43,10 @@ namespace MonoDevelop.Ide.WelcomePage var row1 = new WelcomePageRow (); row1.PackStart (new WelcomePageButtonBar ( - new WelcomePageBarButton ("MonoDevelop.com", "http://www.monodevelop.com", "link-cloud.png"), - new WelcomePageBarButton (GettextCatalog.GetString ("Documentation"), "http://www.go-mono.com/docs", "link-info.png"), - new WelcomePageBarButton (GettextCatalog.GetString ("Support"), "http://monodevelop.com/index.php?title=Help_%26_Contact", "link-heart.png"), - new WelcomePageBarButton (GettextCatalog.GetString ("Q&A"), "http://stackoverflow.com/questions/tagged/monodevelop", "link-chat.png") + new WelcomePageBarButton ("MonoDevelop.com", "http://www.monodevelop.com", "welcome-link-md-16.png"), + new WelcomePageBarButton (GettextCatalog.GetString ("Documentation"), "http://www.go-mono.com/docs", "welcome-link-info-16.png"), + new WelcomePageBarButton (GettextCatalog.GetString ("Support"), "http://monodevelop.com/index.php?title=Help_%26_Contact", "welcome-link-support-16.png"), + new WelcomePageBarButton (GettextCatalog.GetString ("Q&A"), "http://stackoverflow.com/questions/tagged/monodevelop", "welcome-link-chat-16.png") ) ); mainCol.PackStart (row1, false, false, 0); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/Style.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/Style.cs index 3fa2c6ec1a..dff580097a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/Style.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/Style.cs @@ -6,54 +6,59 @@ namespace MonoDevelop.Ide.WelcomePage { public static class WelcomeScreen { - public const string FontFamilyMac = "Lucida Grande"; - public const string FontFamilyWindows = "Calibri"; // TODO: VV: "Segoe UI" - public const int VerticalPadding = 24; - public const int HorizontalPadding = 50; - public const string BackgroundTile = "./images/tiny_grid.png"; - public const string InnerShadowColor = "black"; - public const double InnerShadowOpacity = 0.4; - public const int InnerShadowSize = 10; - public static int Spacing = 20; + public const string FontFamilyMac = "Sans"; + public const string FontFamilyWindows = "Sans"; + public const int VerticalPadding = 24; // TODO: VV: Seems to be unused + public const int HorizontalPadding = 50; // TODO: VV: Seems to be unused + public static string BackgroundColor { get; internal set; } + public const string BackgroundTile = "./images/tiny_grid.png"; // TODO: VV: Seems to be unused + public static string InnerShadowColor { get; internal set; } + public const double InnerShadowOpacity = 0.4; // TODO: VV: Seems to be unused + public const int InnerShadowSize = 10; // TODO: VV: Seems to be unused + public static int Spacing = 30; // space between header and pads public static class Links { - public const string Color = "#555555"; - public const string HoverColor = "#000000"; - public const int FontSize = 16; - public const int LinkSeparation = 24; - public const int BottomMargin = 24; - public const int IconTextSpacing = 8; + public static string Color { get; internal set; } + public static string HoverColor { get; internal set; } + public const int FontSize = 12; + public const int LinkSeparation = 30; + public const int BottomMargin = 24; // TODO: VV: Seems to be unused + public const int IconTextSpacing = 4; } public static class Pad { - public const string TitleFontFamilyMac = "Lucida Grande"; - public const string TitleFontFamilyWindows = "Calibri"; // TODO: VV: "Segoe UI" + public const string TitleFontFamilyMac = "Sans"; + public const string TitleFontFamilyWindows = "Sans"; public const int Padding = 20; - public const string BackgroundColor = "#FFF"; - public const string BorderColor = "#CCC"; - public const string TextColor = "#555555"; - public const string ShadowColor = "#000"; - public const double ShadowOpacity = 0.2; - public const int ShadowSize = 3; + public static string BackgroundColor { get; internal set; } + public static string BorderColor { get; internal set; } + public static string TextColor { get; internal set; } + public static string ShadowColor { get; internal set; } + public const double ShadowOpacity = 0.2; // TODO: VV: Seems to be unused + public const int ShadowSize = 2; public const int ShadowVerticalOffset = 1; + public const int LargeTitleFontSize = 22; - public const string LargeTitleFontColor = "#444444"; - public const int LargeTitleMarginBottom = 10; - public const string MediumTitleColor = "#222222"; - public const int MediumTitleFontSize = 15; - public const int MediumTitleMarginBottom = 2; - public const string SmallTitleColor = "#777777"; - public const int SmallTitleFontSize = 13; - public const int SummaryFontSize = 12; - public const string SummaryFontFamily = "Arial"; // TODO: VV: "Segoe UI" - public const int SummaryLineHeight = 19; + public static string LargeTitleFontColor { get; internal set; } + public const int LargeTitleMarginBottom = 22; + + public static string MediumTitleColor { get; internal set; } + public const int MediumTitleFontSize = 12; + public const int MediumTitleMarginBottom = 7; + + public static string SmallTitleColor { get; internal set; } + public const int SmallTitleFontSize = 10; + + public const int SummaryFontSize = 11; + public const string SummaryFontFamily = "Sans"; + public const int SummaryLineHeight = 19; // TODO: VV: Seems to be unused public const int SummaryParagraphMarginTop = 8; public static class FeaturedApp { - public const int Width = 400; + public const int Width = 370; public static class Preview { @@ -63,13 +68,12 @@ namespace MonoDevelop.Ide.WelcomePage public static class News { - public const int Width = 500; + public const int Width = 470; public static class Item { public const int MarginBottom = 26; - public const string TitleHoverColor = "#0982B3"; - public const int FirstMarginTop = 18; + public static string TitleHoverColor { get; internal set; } } } @@ -81,23 +85,80 @@ namespace MonoDevelop.Ide.WelcomePage { public const int Width = 260; public const int Height = 46; - public const string HoverBackgroundColor = "#f9feff"; - public const string HoverBorderColor = "#dddddd"; + public static string HoverBackgroundColor { get; internal set; } + public static string HoverBorderColor { get; internal set; } public const int TitleFontSize = 12; - public const int PathFontSize = 11; + public const int PathFontSize = 10; public const int TextLeftPadding = 38; - public const int TitleBottomMargin = 0; + public const int TitleBottomMargin = 4; + // TODO: VV: Seems to be unused public static class PinButton { - public const string NormalImage = "unstar-overlay-16.png"; - public const string NormalHoverImage = "unstar-overlay-hover-16.png"; - public const string PinnedImage = "star-overlay-16.png"; - public const string PinnedHoverImage = "star-overlay-hover-16.png"; + public const string NormalImage = "unstar-16.png"; + public const string NormalHoverImage = "unstar-hover-16.png"; + public const string PinnedImage = "star-16.png"; + public const string PinnedHoverImage = "star-hover-16.png"; } } } } + + static WelcomeScreen () + { + LoadStyles (); + MonoDevelop.Ide.Gui.Styles.Changed += (o, e) => LoadStyles (); + } + + public static void LoadStyles () + { + var bgColor = Gui.Styles.BaseBackgroundColor.ToHexString (false); + var fgColor = Gui.Styles.BaseForegroundColor.ToHexString (false); + var dimColor = Gui.Styles.DimTextColor.ToHexString (false); + var padColor = Gui.Styles.PadBackground.ToHexString (false); + var hoverColor = Gui.Styles.DockBarPrelightColor.ToHexString (false); + + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) { + BackgroundColor = bgColor; + InnerShadowColor = bgColor; + + Links.Color = dimColor; + Links.HoverColor = fgColor; + + Pad.BackgroundColor = padColor; + Pad.BorderColor = padColor; + Pad.TextColor = fgColor; + Pad.ShadowColor = "#000000"; + Pad.LargeTitleFontColor = fgColor; + Pad.MediumTitleColor = fgColor; + Pad.SmallTitleColor = dimColor; + + Pad.News.Item.TitleHoverColor = "#3496d9"; + + Pad.Solutions.SolutionTile.HoverBackgroundColor = hoverColor; + Pad.Solutions.SolutionTile.HoverBorderColor = hoverColor; + } else { + // TODO: VV: A beeter background, for some peculiar reason only black works here + BackgroundColor = "#000000"; + InnerShadowColor = "#000000"; + + Links.Color = "#868686"; + Links.HoverColor = fgColor; + + Pad.BackgroundColor = "#222222"; // TODO: VV: We can't use the padColor here because of the BackgroundColor bug, so override + Pad.BorderColor = "#222222"; + Pad.TextColor = fgColor; + Pad.ShadowColor = "#000000"; + Pad.LargeTitleFontColor = fgColor; + Pad.MediumTitleColor = fgColor; + Pad.SmallTitleColor = dimColor; + + Pad.News.Item.TitleHoverColor = "#5babed"; + + Pad.Solutions.SolutionTile.HoverBackgroundColor = "#2b3e50"; + Pad.Solutions.SolutionTile.HoverBorderColor = "#2b3e50"; + } + } } public static string GetFormatString (string fontFace, int fontSize, string color, Pango.Weight weight = Pango.Weight.Normal) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs index a2a4e777ae..e38918156b 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageBarButton.cs @@ -74,10 +74,7 @@ namespace MonoDevelop.Ide.WelcomePage public WelcomePageBarButton (string title, string href, string iconResource = null) { - FontFamily = Platform.IsMac ? Styles.WelcomeScreen.FontFamilyMac : Styles.WelcomeScreen.FontFamilyWindows; - HoverColor = Styles.WelcomeScreen.Links.HoverColor; - Color = Styles.WelcomeScreen.Links.Color; - FontSize = Styles.WelcomeScreen.Links.FontSize; + UpdateStyle (); VisibleWindow = false; this.Text = GettextCatalog.GetString (title); @@ -98,11 +95,33 @@ namespace MonoDevelop.Ide.WelcomePage box.ShowAll (); Add (box); + Gui.Styles.Changed += UpdateStyle; Update (); Events |= (Gdk.EventMask.EnterNotifyMask | Gdk.EventMask.LeaveNotifyMask | Gdk.EventMask.ButtonReleaseMask); } + void UpdateStyle (object sender = null, EventArgs e = null) + { + OnUpdateStyle (); + if (label != null) { + box.Remove (label); + box.PackStart (label = CreateLabel ()); + box.ShowAll (); + Update (); + } + QueueResize (); + } + + protected virtual void OnUpdateStyle () + { + FontFamily = Platform.IsMac ? Styles.WelcomeScreen.FontFamilyMac : Styles.WelcomeScreen.FontFamilyWindows; + HoverColor = Styles.WelcomeScreen.Links.HoverColor; + Color = Styles.WelcomeScreen.Links.Color; + FontSize = Styles.WelcomeScreen.Links.FontSize; + FontWeight = Pango.Weight.Bold; + } + protected virtual Label CreateLabel () { return new Label (); @@ -161,6 +180,12 @@ namespace MonoDevelop.Ide.WelcomePage var color = mouseOver ? HoverColor : Color; label.Markup = WelcomePageSection.FormatText (FontFamily, FontSize, FontWeight, color, Text); } + + protected override void OnDestroyed () + { + Gui.Styles.Changed -= UpdateStyle; + base.OnDestroyed (); + } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs index ebd9c0f9ec..0e62e2707e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFeedItem.cs @@ -36,10 +36,10 @@ namespace MonoDevelop.Ide.WelcomePage {
class WelcomePageFeedItem : Gtk.EventBox
{
- static readonly string linkUnderlinedFormat;
- static readonly string linkFormat;
- static readonly string descFormat;
- static readonly string subtitleFormat;
+ static string linkUnderlinedFormat;
+ static string linkFormat;
+ static string descFormat;
+ static string subtitleFormat;
Label titleLabel;
Label subtitleLabel;
@@ -56,9 +56,15 @@ namespace MonoDevelop.Ide.WelcomePage static WelcomePageFeedItem ()
{
+ UpdateStyle ();
+ Gui.Styles.Changed += (sender, e) => UpdateStyle();
+ }
+
+ static void UpdateStyle ()
+ {
var face = Platform.IsMac ? Styles.WelcomeScreen.Pad.TitleFontFamilyMac : Styles.WelcomeScreen.Pad.TitleFontFamilyWindows;
- linkUnderlinedFormat = Styles.GetFormatString (face, Styles.WelcomeScreen.Pad.MediumTitleFontSize, Styles.WelcomeScreen.Pad.News.Item.TitleHoverColor);
- linkFormat = Styles.GetFormatString (face, Styles.WelcomeScreen.Pad.MediumTitleFontSize, Styles.WelcomeScreen.Pad.MediumTitleColor);
+ linkUnderlinedFormat = Styles.GetFormatString (face, Styles.WelcomeScreen.Pad.MediumTitleFontSize, Styles.WelcomeScreen.Pad.News.Item.TitleHoverColor, Pango.Weight.Bold);
+ linkFormat = Styles.GetFormatString (face, Styles.WelcomeScreen.Pad.MediumTitleFontSize, Styles.WelcomeScreen.Pad.MediumTitleColor, Pango.Weight.Bold);
descFormat = Styles.GetFormatString (Styles.WelcomeScreen.Pad.SummaryFontFamily, Styles.WelcomeScreen.Pad.SummaryFontSize, Styles.WelcomeScreen.Pad.TextColor);
subtitleFormat = Styles.GetFormatString (face, Styles.WelcomeScreen.Pad.SmallTitleFontSize, Styles.WelcomeScreen.Pad.SmallTitleColor);
}
@@ -171,6 +177,13 @@ namespace MonoDevelop.Ide.WelcomePage summaryLabel.Attributes.Insert (rise);
Add (box);
+
+ Gui.Styles.Changed += UpdateStyle;
+ }
+
+ void UpdateStyle (object sender, EventArgs args)
+ {
+ UpdateLabel (false);
}
int allocWidth;
@@ -365,5 +378,11 @@ namespace MonoDevelop.Ide.WelcomePage return GettextCatalog.GetString ("Open {0}", link);
}
}
+
+ protected override void OnDestroyed ()
+ {
+ Gui.Styles.Changed -= UpdateStyle;
+ base.OnDestroyed ();
+ }
}
}
\ No newline at end of file diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFirstRun.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFirstRun.cs index df2f768770..f9b2b67ea8 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFirstRun.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageFirstRun.cs @@ -45,7 +45,6 @@ namespace MonoDevelop.Ide.WelcomePage static readonly Gdk.Point IconPosition = new Gdk.Point (WidgetSize.Width - 220 - Padding, WidgetSize.Height / 2); static readonly double PreviewSize = 350; - Xwt.Drawing.Image starburst; Xwt.Drawing.Image brandedIcon; MouseTracker tracker; @@ -80,7 +79,6 @@ namespace MonoDevelop.Ide.WelcomePage { VisibleWindow = false; SetSizeRequest (WidgetSize.Width, WidgetSize.Height); - starburst = Xwt.Drawing.Image.FromResource ("starburst.png"); string iconFile = BrandingService.GetString ("ApplicationIcon"); if (iconFile != null) { @@ -142,16 +140,9 @@ namespace MonoDevelop.Ide.WelcomePage context.FillPreserve (); } - context.Save (); - context.Translate (IconPosition.X, IconPosition.Y); - context.Scale (0.75, 0.75); - context.DrawImage (this, starburst, -starburst.Width / 2, -starburst.Height / 2); - context.Restore (); - context.LineWidth = 1; context.SetSourceRGB (.29, .47, .67); context.Stroke (); - } void RenderPreview (Cairo.Context context, Gdk.Point position, double opacity) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs index 08cc70f4cb..d869cbc26c 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageListButton.cs @@ -57,93 +57,24 @@ namespace MonoDevelop.Ide.WelcomePage public int LeftTextPadding { get; set; } public int InternalPadding { get; set; } + public string SmallTitleColor { get; set; } + public string MediumTitleColor { get; set; } - string smallTitleColor = Styles.WelcomeScreen.Pad.SmallTitleColor; - public string SmallTitleColor { - get { - return smallTitleColor; - } - set { - smallTitleColor = value; - } - } - - string mediumTitleColor = Styles.WelcomeScreen.Pad.MediumTitleColor; - public string MediumTitleColor { - get { - return mediumTitleColor; - } - set { - mediumTitleColor = value; - } - } - - string titleFontFace = Platform.IsMac ? Styles.WelcomeScreen.Pad.TitleFontFamilyMac : Styles.WelcomeScreen.Pad.TitleFontFamilyWindows; - public string TitleFontFace { - get { - return titleFontFace; - } - set { - titleFontFace = value; - } - } - - string smallTitleFontFace = Platform.IsMac ? Styles.WelcomeScreen.Pad.TitleFontFamilyMac : Styles.WelcomeScreen.Pad.TitleFontFamilyWindows; - public string SmallTitleFontFace { - get { - return smallTitleFontFace; - } - set { - smallTitleFontFace = value; - } - } - - string hoverBackgroundColor = Styles.WelcomeScreen.Pad.Solutions.SolutionTile.HoverBackgroundColor; - public string HoverBackgroundColor { - get { - return hoverBackgroundColor; - } - set { - hoverBackgroundColor = value; - } - } - - string hoverBorderColor = Styles.WelcomeScreen.Pad.Solutions.SolutionTile.HoverBorderColor; - public string HoverBorderColor { - get { - return hoverBorderColor; - } - set { - hoverBorderColor = value; - } - } + public string TitleFontFace { get; set; } + public string SmallTitleFontFace { get; set; } - int titleFontSize = Styles.WelcomeScreen.Pad.Solutions.SolutionTile.TitleFontSize; - public int TitleFontSize { - get { - return titleFontSize; - } - set { - titleFontSize = value; - } - } + public string HoverBackgroundColor { get; set; } + public string HoverBorderColor { get; set; } - int smallTitleFontSize = Styles.WelcomeScreen.Pad.Solutions.SolutionTile.PathFontSize; - public int SmallTitleFontSize { - get { - return smallTitleFontSize; - } - set { - smallTitleFontSize = value; - } - } + public int TitleFontSize { get; set; } + public int SmallTitleFontSize { get; set; } static WelcomePageListButton () { - starNormal = Xwt.Drawing.Image.FromResource ("unstar-overlay-16.png"); - starNormalHover = Xwt.Drawing.Image.FromResource ("unstar-overlay-hover-16.png"); - starPinned = Xwt.Drawing.Image.FromResource ("star-overlay-16.png"); - starPinnedHover = Xwt.Drawing.Image.FromResource ("star-overlay-hover-16.png"); + starNormal = Xwt.Drawing.Image.FromResource ("unstar-16.png"); + starNormalHover = Xwt.Drawing.Image.FromResource ("unstar-hover-16.png"); + starPinned = Xwt.Drawing.Image.FromResource ("star-16.png"); + starPinnedHover = Xwt.Drawing.Image.FromResource ("star-hover-16.png"); } public WelcomePageListButton (string title, string subtitle, Xwt.Drawing.Image icon, string actionUrl) @@ -153,14 +84,37 @@ namespace MonoDevelop.Ide.WelcomePage this.subtitle = subtitle; this.icon = icon; this.actionUrl = actionUrl; - this.SmallTitleColor = smallTitleColor; - this.MediumTitleColor = mediumTitleColor; + WidthRequest = Styles.WelcomeScreen.Pad.Solutions.SolutionTile.Width; HeightRequest = Styles.WelcomeScreen.Pad.Solutions.SolutionTile.Height + 2; Events |= (Gdk.EventMask.EnterNotifyMask | Gdk.EventMask.LeaveNotifyMask | Gdk.EventMask.ButtonReleaseMask | Gdk.EventMask.PointerMotionMask); LeftTextPadding = Styles.WelcomeScreen.Pad.Solutions.SolutionTile.TextLeftPadding; InternalPadding = Styles.WelcomeScreen.Pad.Padding; + + Gui.Styles.Changed += UpdateStyle; + UpdateStyle (); + } + + void UpdateStyle (object sender = null, EventArgs e = null) + { + OnUpdateStyle (); + QueueDraw (); + } + + protected virtual void OnUpdateStyle () + { + SmallTitleColor = Styles.WelcomeScreen.Pad.SmallTitleColor; + MediumTitleColor = Styles.WelcomeScreen.Pad.MediumTitleColor; + + TitleFontFace = Platform.IsMac ? Styles.WelcomeScreen.Pad.TitleFontFamilyMac : Styles.WelcomeScreen.Pad.TitleFontFamilyWindows; + SmallTitleFontFace = Platform.IsMac ? Styles.WelcomeScreen.Pad.TitleFontFamilyMac : Styles.WelcomeScreen.Pad.TitleFontFamilyWindows; + + HoverBackgroundColor = Styles.WelcomeScreen.Pad.Solutions.SolutionTile.HoverBackgroundColor; + HoverBorderColor = Styles.WelcomeScreen.Pad.Solutions.SolutionTile.HoverBorderColor; + + TitleFontSize = Styles.WelcomeScreen.Pad.Solutions.SolutionTile.TitleFontSize; + SmallTitleFontSize = Styles.WelcomeScreen.Pad.Solutions.SolutionTile.PathFontSize; } public bool AllowPinning { get; set; } @@ -298,7 +252,7 @@ namespace MonoDevelop.Ide.WelcomePage Pango.Layout titleLayout = new Pango.Layout (PangoContext); titleLayout.Width = Pango.Units.FromPixels (textWidth); titleLayout.Ellipsize = Pango.EllipsizeMode.End; - titleLayout.SetMarkup (WelcomePageSection.FormatText (TitleFontFace, titleFontSize, TitleFontWeight, MediumTitleColor, title)); + titleLayout.SetMarkup (WelcomePageSection.FormatText (TitleFontFace, TitleFontSize, Pango.Weight.Bold, MediumTitleColor, title)); Pango.Layout subtitleLayout = null; @@ -306,7 +260,7 @@ namespace MonoDevelop.Ide.WelcomePage subtitleLayout = new Pango.Layout (PangoContext); subtitleLayout.Width = Pango.Units.FromPixels (textWidth); subtitleLayout.Ellipsize = Pango.EllipsizeMode.Start; - subtitleLayout.SetMarkup (WelcomePageSection.FormatText (SmallTitleFontFace, smallTitleFontSize, Pango.Weight.Normal, SmallTitleColor, subtitle)); + subtitleLayout.SetMarkup (WelcomePageSection.FormatText (SmallTitleFontFace, SmallTitleFontSize, Pango.Weight.Normal, SmallTitleColor, subtitle)); } int height = 0; @@ -322,15 +276,21 @@ namespace MonoDevelop.Ide.WelcomePage int tx = Allocation.X + InternalPadding + LeftTextPadding; int ty = Allocation.Y + (Allocation.Height - height) / 2; - DrawLayout (ctx, titleLayout, TitleFontFace, titleFontSize, TitleFontWeight, MediumTitleColor, tx, ty); + DrawLayout (ctx, titleLayout, TitleFontFace, TitleFontSize, Pango.Weight.Bold, MediumTitleColor, tx, ty); if (subtitleLayout != null) { ty += h1 + Styles.WelcomeScreen.Pad.Solutions.SolutionTile.TitleBottomMargin; - DrawLayout (ctx, subtitleLayout, SmallTitleFontFace, smallTitleFontSize, Pango.Weight.Normal, SmallTitleColor, tx, ty); + DrawLayout (ctx, subtitleLayout, SmallTitleFontFace, SmallTitleFontSize, Pango.Weight.Normal, SmallTitleColor, tx, ty); } } return true; } + + protected override void OnDestroyed () + { + Gui.Styles.Changed -= UpdateStyle; + base.OnDestroyed (); + } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs index 3e700d0bf5..266dffc6aa 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageRecentProjectsList.cs @@ -44,8 +44,8 @@ namespace MonoDevelop.Ide.WelcomePage public WelcomePageRecentProjectsList (string title = null, int count = 10): base (title)
{
- openProjectIcon = Xwt.Drawing.Image.FromResource ("open_solution.png");
- newProjectIcon = Xwt.Drawing.Image.FromResource ("new_solution.png");
+ openProjectIcon = Xwt.Drawing.Image.FromResource ("welcome-open-solution-16.png");
+ newProjectIcon = Xwt.Drawing.Image.FromResource ("welcome-new-solution-16.png");
box = new VBox ();
itemCount = count;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs index 969fbb2fa7..5e88950dbb 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageSection.cs @@ -35,14 +35,21 @@ namespace MonoDevelop.Ide.WelcomePage { string title; - static readonly string headerFormat; + static string headerFormat; + Label label; Alignment root = new Alignment (0, 0, 1f, 1f); protected Gtk.Alignment ContentAlignment { get; private set; } protected Gtk.Alignment TitleAlignment { get; private set; } static WelcomePageSection () { + UpdateStyle (); + Gui.Styles.Changed += (sender, e) => UpdateStyle(); + } + + static void UpdateStyle () + { var face = Platform.IsMac ? Styles.WelcomeScreen.Pad.TitleFontFamilyMac : Styles.WelcomeScreen.Pad.TitleFontFamilyWindows; headerFormat = Styles.GetFormatString (face, Styles.WelcomeScreen.Pad.LargeTitleFontSize, Styles.WelcomeScreen.Pad.LargeTitleFontColor); } @@ -62,6 +69,15 @@ namespace MonoDevelop.Ide.WelcomePage TitleAlignment.SetPadding (p, Styles.WelcomeScreen.Pad.LargeTitleMarginBottom, p, p); ContentAlignment = new Alignment (0f, 0f, 1f, 1f); ContentAlignment.SetPadding (0, p, p, p); + + Gui.Styles.Changed += UpdateStyle; + } + + void UpdateStyle (object sender, EventArgs args) + { + if (label != null) + label.Markup = string.Format (headerFormat, title); + QueueDraw (); } public void SetContent (Gtk.Widget w) @@ -75,7 +91,7 @@ namespace MonoDevelop.Ide.WelcomePage } var box = new VBox (); - var label = new Gtk.Label () { Markup = string.Format (headerFormat, title), Xalign = (uint) 0 }; + label = new Label () { Markup = string.Format (headerFormat, title), Xalign = (uint) 0 }; TitleAlignment.Add (label); box.PackStart (TitleAlignment, false, false, 0); box.PackStart (ContentAlignment, false, false, 0); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs index 79fca3b031..f1891c7ac0 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageTipOfTheDaySection.cs @@ -27,6 +27,7 @@ using System; using MonoDevelop.Core; using System.Xml; using System.Collections.Generic; +using MonoDevelop.Ide.Fonts; namespace MonoDevelop.Ide.WelcomePage { @@ -56,12 +57,14 @@ namespace MonoDevelop.Ide.WelcomePage label.Xalign = 0; label.Wrap = true; label.WidthRequest = 200; + label.ModifyFont (FontService.SansFont.CopyModified (Gui.Styles.FontScale11)); + label.SetPadding (0, 10); label.Text = currentTip != -1 ? tips[currentTip] : ""; box.PackStart (label, true, true, 0); var next = new Gtk.Button (GettextCatalog.GetString ("Next Tip")); - next.Relief = Gtk.ReliefStyle.None; + next.Relief = Gtk.ReliefStyle.Normal; next.Clicked += delegate { if (tips.Count == 0) return; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageWidget.cs index b4f946bf36..bb189d0ec0 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageWidget.cs @@ -73,7 +73,7 @@ namespace MonoDevelop.Ide.WelcomePage ShowScrollbars = true; VisibleWindow = false; - BackgroundColor = "white"; + UpdateTeme (null, null); LogoHeight = 90; var background = new WelcomePageWidgetBackground (); @@ -104,6 +104,12 @@ namespace MonoDevelop.Ide.WelcomePage IdeApp.Workbench.GuiLocked += OnLock; IdeApp.Workbench.GuiUnlocked += OnUnlock; + MonoDevelop.Ide.Gui.Styles.Changed += UpdateTeme; + } + + void UpdateTeme (object sender, EventArgs e) + { + BackgroundColor = Styles.WelcomeScreen.BackgroundColor; } void OnLock (object s, EventArgs a) @@ -126,6 +132,7 @@ namespace MonoDevelop.Ide.WelcomePage base.OnDestroyed (); IdeApp.Workbench.GuiLocked -= OnLock; IdeApp.Workbench.GuiUnlocked -= OnUnlock; + MonoDevelop.Ide.Gui.Styles.Changed -= UpdateTeme; } public class WelcomePageWidgetBackground : Gtk.EventBox @@ -135,13 +142,23 @@ namespace MonoDevelop.Ide.WelcomePage public double OverdrawOpacity { get; set; } public int OverdrawOffset { get; set; } - protected override void OnRealized () + Gdk.Color backgroundColor = Gdk.Color.Zero; + + public WelcomePageWidgetBackground () + { + MonoDevelop.Ide.Gui.Styles.Changed += UpdateTeme; + } + + void UpdateTeme (object sender, EventArgs e) { - Gdk.Color color = Gdk.Color.Zero; - if (!Gdk.Color.Parse (Owner.BackgroundColor, ref color)) - color = Style.White; - ModifyBg (StateType.Normal, color); + if (!Gdk.Color.Parse (Owner.BackgroundColor, ref backgroundColor) || !Gdk.Color.Parse (Styles.WelcomeScreen.BackgroundColor, ref backgroundColor)) + backgroundColor = Style.White; + ModifyBg (StateType.Normal, backgroundColor); + } + protected override void OnRealized () + { + UpdateTeme (null, null); base.OnRealized (); } @@ -164,7 +181,7 @@ namespace MonoDevelop.Ide.WelcomePage protected override bool OnExposeEvent (EventExpose evnt) { using (var context = CairoHelper.Create (evnt.Window)) { - context.SetSourceRGB (1, 1, 1); + context.SetSourceRGB (backgroundColor.Red, backgroundColor.Green, backgroundColor.Blue); context.Operator = Cairo.Operator.Source; context.Paint (); context.Operator = Cairo.Operator.Over; @@ -193,6 +210,12 @@ namespace MonoDevelop.Ide.WelcomePage return true; } + + protected override void OnDestroyed () + { + MonoDevelop.Ide.Gui.Styles.Changed -= UpdateTeme; + base.OnDestroyed (); + } } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/link-chat.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/link-chat.png Binary files differdeleted file mode 100644 index 2c97dca82b..0000000000 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/link-chat.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/link-cloud.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/link-cloud.png Binary files differdeleted file mode 100644 index c83a739dbd..0000000000 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/link-cloud.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/link-heart.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/link-heart.png Binary files differdeleted file mode 100644 index bffca62b12..0000000000 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/link-heart.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/link-info.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/link-info.png Binary files differdeleted file mode 100644 index 7bb2eda750..0000000000 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/link-info.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/new_solution.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/new_solution.png Binary files differdeleted file mode 100644 index c2197388ab..0000000000 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/new_solution.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/open_solution.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/open_solution.png Binary files differdeleted file mode 100644 index 111660560e..0000000000 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/open_solution.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/starburst.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/starburst.png Binary files differdeleted file mode 100644 index 857aa26e15..0000000000 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/starburst.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-chat-16.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-chat-16.png Binary files differnew file mode 100644 index 0000000000..e914d15d5f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-chat-16.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-chat-16@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-chat-16@2x.png Binary files differnew file mode 100644 index 0000000000..a72868ad39 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-chat-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-chat-16~dark.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-chat-16~dark.png Binary files differnew file mode 100644 index 0000000000..b9aaf29306 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-chat-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-chat-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-chat-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..98a5f48d16 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-chat-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-info-16.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-info-16.png Binary files differnew file mode 100644 index 0000000000..46a1683d62 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-info-16.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-info-16@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-info-16@2x.png Binary files differnew file mode 100644 index 0000000000..706120e646 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-info-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-info-16~dark.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-info-16~dark.png Binary files differnew file mode 100644 index 0000000000..5de6e781dd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-info-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-info-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-info-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..37ff0fbabc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-info-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-md-16.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-md-16.png Binary files differnew file mode 100644 index 0000000000..4de7f8aec0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-md-16.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-md-16@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-md-16@2x.png Binary files differnew file mode 100644 index 0000000000..54ca319ac4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-md-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-md-16~dark.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-md-16~dark.png Binary files differnew file mode 100644 index 0000000000..b58e3d6578 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-md-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-md-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-md-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..624771d270 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-md-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-support-16.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-support-16.png Binary files differnew file mode 100644 index 0000000000..d1c51fdef7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-support-16.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-support-16@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-support-16@2x.png Binary files differnew file mode 100644 index 0000000000..e559634066 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-support-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-support-16~dark.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-support-16~dark.png Binary files differnew file mode 100644 index 0000000000..2653e93337 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-support-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-support-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-support-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..688f50aba6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-link-support-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-new-solution-16.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-new-solution-16.png Binary files differnew file mode 100644 index 0000000000..aade182b99 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-new-solution-16.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-new-solution-16@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-new-solution-16@2x.png Binary files differnew file mode 100644 index 0000000000..1698e8c62b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-new-solution-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-new-solution-16~dark.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-new-solution-16~dark.png Binary files differnew file mode 100644 index 0000000000..a7fb210b7d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-new-solution-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-new-solution-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-new-solution-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..15b6c627a9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-new-solution-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-open-solution-16.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-open-solution-16.png Binary files differnew file mode 100644 index 0000000000..f93245df08 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-open-solution-16.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-open-solution-16@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-open-solution-16@2x.png Binary files differnew file mode 100644 index 0000000000..d58b179943 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-open-solution-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-open-solution-16~dark.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-open-solution-16~dark.png Binary files differnew file mode 100644 index 0000000000..0866a5c72e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-open-solution-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-open-solution-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-open-solution-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..5802972af0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/icons/welcome-open-solution-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj index ad039afa62..f96246e650 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj @@ -258,23 +258,77 @@ <EmbeddedResource Include="templates\EmptyXMLFile.xft.xml"> <LogicalName>EmptyXMLFile.xft.xml</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\assembly-reference-overlay-16.png"> - <LogicalName>assembly-reference-overlay-16.png</LogicalName> + <EmbeddedResource Include="icons\reference-assembly-16.png"> + <LogicalName>reference-assembly-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\assembly-reference-overlay-16%402x.png"> - <LogicalName>assembly-reference-overlay-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\reference-assembly-16%402x.png"> + <LogicalName>reference-assembly-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\invalid-reference-overlay-16.png"> - <LogicalName>invalid-reference-overlay-16.png</LogicalName> + <EmbeddedResource Include="icons\reference-assembly-16~dark.png"> + <LogicalName>reference-assembly-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\invalid-reference-overlay-16%402x.png"> - <LogicalName>invalid-reference-overlay-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\reference-assembly-16~dark%402x.png"> + <LogicalName>reference-assembly-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\project-reference-overlay-16.png"> - <LogicalName>project-reference-overlay-16.png</LogicalName> + <EmbeddedResource Include="icons\reference-assembly-16~sel.png"> + <LogicalName>reference-assembly-16~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\project-reference-overlay-16%402x.png"> - <LogicalName>project-reference-overlay-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\reference-assembly-16~sel%402x.png"> + <LogicalName>reference-assembly-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-assembly-16~dark~sel.png"> + <LogicalName>reference-assembly-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-assembly-16~dark~sel%402x.png"> + <LogicalName>reference-assembly-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-invalid-16.png"> + <LogicalName>reference-invalid-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-invalid-16%402x.png"> + <LogicalName>reference-invalid-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-invalid-16~dark.png"> + <LogicalName>reference-invalid-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-invalid-16~dark%402x.png"> + <LogicalName>reference-invalid-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-invalid-16~sel.png"> + <LogicalName>reference-invalid-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-invalid-16~sel%402x.png"> + <LogicalName>reference-invalid-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-invalid-16~dark~sel.png"> + <LogicalName>reference-invalid-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-invalid-16~dark~sel%402x.png"> + <LogicalName>reference-invalid-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-project-16.png"> + <LogicalName>reference-project-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-project-16%402x.png"> + <LogicalName>reference-project-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-project-16~dark.png"> + <LogicalName>reference-project-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-project-16~dark%402x.png"> + <LogicalName>reference-project-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-project-16~sel.png"> + <LogicalName>reference-project-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-project-16~sel%402x.png"> + <LogicalName>reference-project-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-project-16~dark~sel.png"> + <LogicalName>reference-project-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-project-16~dark~sel%402x.png"> + <LogicalName>reference-project-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="templates\GenericProject.xpt.xml"> <LogicalName>GenericProject.xpt.xml</LogicalName> @@ -282,18 +336,81 @@ <EmbeddedResource Include="gtk-gui\gui.stetic"> <LogicalName>gui.stetic</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="gtk-gui\objects.xml"> + <LogicalName>objects.xml</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\pin-down-16.png"> <LogicalName>pin-down-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pin-down-16%402x.png"> <LogicalName>pin-down-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pin-down-16~dark.png"> + <LogicalName>pin-down-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-down-16~dark%402x.png"> + <LogicalName>pin-down-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-down-16~sel.png"> + <LogicalName>pin-down-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-down-16~sel%402x.png"> + <LogicalName>pin-down-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-down-16~dark~sel.png"> + <LogicalName>pin-down-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-down-16~dark~sel%402x.png"> + <LogicalName>pin-down-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-down-16~disabled.png"> + <LogicalName>pin-down-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-down-16~disabled%402x.png"> + <LogicalName>pin-down-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-down-16~dark~disabled.png"> + <LogicalName>pin-down-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-down-16~dark~disabled%402x.png"> + <LogicalName>pin-down-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\pin-up-16.png"> <LogicalName>pin-up-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pin-up-16%402x.png"> <LogicalName>pin-up-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pin-up-16~dark.png"> + <LogicalName>pin-up-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-up-16~dark%402x.png"> + <LogicalName>pin-up-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-up-16~sel.png"> + <LogicalName>pin-up-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-up-16~sel%402x.png"> + <LogicalName>pin-up-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-up-16~dark~sel.png"> + <LogicalName>pin-up-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-up-16~dark~sel%402x.png"> + <LogicalName>pin-up-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-up-16~disabled.png"> + <LogicalName>pin-up-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-up-16~disabled%402x.png"> + <LogicalName>pin-up-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-up-16~dark~disabled.png"> + <LogicalName>pin-up-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pin-up-16~dark~disabled%402x.png"> + <LogicalName>pin-up-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="options\KeyBindingSchemeEmacs.xml"> <LogicalName>KeyBindingSchemeEmacs.xml</LogicalName> </EmbeddedResource> @@ -306,12 +423,6 @@ <EmbeddedResource Include="options\KeyBindingSchemeMonoDevelop1.xml"> <LogicalName>KeyBindingSchemeMonoDevelop1.xml</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\navigate-next-16.png"> - <LogicalName>navigate-next-16.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\navigate-previous-16.png"> - <LogicalName>navigate-previous-16.png</LogicalName> - </EmbeddedResource> <EmbeddedResource Include="options\KeyBindingSchemeMonoDevelop2.xml"> <LogicalName>KeyBindingSchemeMonoDevelop2.xml</LogicalName> </EmbeddedResource> @@ -348,14 +459,41 @@ <EmbeddedResource Include="MonoDevelop.Ide.CodeFormatting\InvariantTextStylePolicy.xml"> <LogicalName>InvariantTextStylePolicy.xml</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\add-namespace-16.png"> - <LogicalName>add-namespace-16.png</LogicalName> + <EmbeddedResource Include="icons\new-namespace-16.png"> + <LogicalName>new-namespace-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-namespace-16%402x.png"> + <LogicalName>new-namespace-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-namespace-16~dark.png"> + <LogicalName>new-namespace-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-namespace-16~dark%402x.png"> + <LogicalName>new-namespace-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-assembly-16.png"> + <LogicalName>project-assembly-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-assembly-16%402x.png"> + <LogicalName>project-assembly-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-assembly-16~dark.png"> + <LogicalName>project-assembly-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-assembly-16~dark%402x.png"> + <LogicalName>project-assembly-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\assembly-project-16.png"> - <LogicalName>assembly-project-16.png</LogicalName> + <EmbeddedResource Include="icons\project-assembly-16~sel.png"> + <LogicalName>project-assembly-16~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\assembly-project-16%402x.png"> - <LogicalName>assembly-project-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\project-assembly-16~sel%402x.png"> + <LogicalName>project-assembly-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-assembly-16~dark~sel.png"> + <LogicalName>project-assembly-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-assembly-16~dark~sel%402x.png"> + <LogicalName>project-assembly-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\breakpoint-16.png"> <LogicalName>breakpoint-16.png</LogicalName> @@ -363,36 +501,168 @@ <EmbeddedResource Include="icons\breakpoint-16%402x.png"> <LogicalName>breakpoint-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-16~dark.png"> + <LogicalName>breakpoint-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-16~dark%402x.png"> + <LogicalName>breakpoint-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-16~disabled.png"> + <LogicalName>breakpoint-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-16~disabled%402x.png"> + <LogicalName>breakpoint-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-16~dark~disabled.png"> + <LogicalName>breakpoint-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-16~dark~disabled%402x.png"> + <LogicalName>breakpoint-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\breakpoint-disable-all-16.png"> <LogicalName>breakpoint-disable-all-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\breakpoint-disable-all-16%402x.png"> <LogicalName>breakpoint-disable-all-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-disable-all-16~dark.png"> + <LogicalName>breakpoint-disable-all-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-disable-all-16~dark%402x.png"> + <LogicalName>breakpoint-disable-all-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-disable-all-16~disabled.png"> + <LogicalName>breakpoint-disable-all-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-disable-all-16~disabled%402x.png"> + <LogicalName>breakpoint-disable-all-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-disable-all-16~dark~disabled.png"> + <LogicalName>breakpoint-disable-all-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-disable-all-16~dark~disabled%402x.png"> + <LogicalName>breakpoint-disable-all-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\breakpoint-disabled-16.png"> <LogicalName>breakpoint-disabled-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\breakpoint-disabled-16%402x.png"> <LogicalName>breakpoint-disabled-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-disabled-16~dark.png"> + <LogicalName>breakpoint-disabled-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-disabled-16~dark%402x.png"> + <LogicalName>breakpoint-disabled-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-disabled-16~disabled.png"> + <LogicalName>breakpoint-disabled-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-disabled-16~disabled%402x.png"> + <LogicalName>breakpoint-disabled-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-disabled-16~dark~disabled.png"> + <LogicalName>breakpoint-disabled-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-disabled-16~dark~disabled%402x.png"> + <LogicalName>breakpoint-disabled-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\breakpoint-invalid-16.png"> <LogicalName>breakpoint-invalid-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\breakpoint-invalid-16%402x.png"> <LogicalName>breakpoint-invalid-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-invalid-16~dark.png"> + <LogicalName>breakpoint-invalid-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-invalid-16~dark%402x.png"> + <LogicalName>breakpoint-invalid-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-invalid-16~disabled.png"> + <LogicalName>breakpoint-invalid-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-invalid-16~disabled%402x.png"> + <LogicalName>breakpoint-invalid-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-invalid-16~dark~disabled.png"> + <LogicalName>breakpoint-invalid-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-invalid-16~dark~disabled%402x.png"> + <LogicalName>breakpoint-invalid-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\breakpoint-new-16.png"> <LogicalName>breakpoint-new-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\breakpoint-new-16%402x.png"> <LogicalName>breakpoint-new-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-new-16~dark.png"> + <LogicalName>breakpoint-new-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-new-16~dark%402x.png"> + <LogicalName>breakpoint-new-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-new-16~disabled.png"> + <LogicalName>breakpoint-new-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-new-16~disabled%402x.png"> + <LogicalName>breakpoint-new-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-new-16~dark~disabled.png"> + <LogicalName>breakpoint-new-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-new-16~dark~disabled%402x.png"> + <LogicalName>breakpoint-new-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-new-16.png"> + <LogicalName>catchpoint-new-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-new-16%402x.png"> + <LogicalName>catchpoint-new-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-new-16~dark.png"> + <LogicalName>catchpoint-new-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-new-16~dark%402x.png"> + <LogicalName>catchpoint-new-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-new-16~disabled.png"> + <LogicalName>catchpoint-new-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-new-16~disabled%402x.png"> + <LogicalName>catchpoint-new-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-new-16~dark~disabled.png"> + <LogicalName>catchpoint-new-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-new-16~dark~disabled%402x.png"> + <LogicalName>catchpoint-new-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\breakpoint-on-off-16.png"> <LogicalName>breakpoint-on-off-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\breakpoint-on-off-16%402x.png"> <LogicalName>breakpoint-on-off-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-on-off-16~dark.png"> + <LogicalName>breakpoint-on-off-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-on-off-16~dark%402x.png"> + <LogicalName>breakpoint-on-off-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-on-off-16~disabled.png"> + <LogicalName>breakpoint-on-off-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-on-off-16~disabled%402x.png"> + <LogicalName>breakpoint-on-off-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-on-off-16~dark~disabled.png"> + <LogicalName>breakpoint-on-off-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breakpoint-on-off-16~dark~disabled%402x.png"> + <LogicalName>breakpoint-on-off-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\build-project-16.png"> <LogicalName>build-project-16.png</LogicalName> </EmbeddedResource> @@ -405,23 +675,107 @@ <EmbeddedResource Include="icons\element-template-16%402x.png"> <LogicalName>element-template-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-template-16~dark.png"> + <LogicalName>element-template-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-template-16~dark%402x.png"> + <LogicalName>element-template-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-template-16~sel.png"> + <LogicalName>element-template-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-template-16~sel%402x.png"> + <LogicalName>element-template-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-template-16~dark~sel.png"> + <LogicalName>element-template-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-template-16~dark~sel%402x.png"> + <LogicalName>element-template-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-template-surroundwith-16.png"> <LogicalName>element-template-surroundwith-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-template-surroundwith-16%402x.png"> <LogicalName>element-template-surroundwith-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-template-surroundwith-16~dark.png"> + <LogicalName>element-template-surroundwith-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-template-surroundwith-16~dark%402x.png"> + <LogicalName>element-template-surroundwith-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-template-surroundwith-16~sel.png"> + <LogicalName>element-template-surroundwith-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-template-surroundwith-16~sel%402x.png"> + <LogicalName>element-template-surroundwith-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-template-surroundwith-16~dark~sel.png"> + <LogicalName>element-template-surroundwith-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-template-surroundwith-16~dark~sel%402x.png"> + <LogicalName>element-template-surroundwith-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\comment-16.png"> <LogicalName>comment-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\comment-16%402x.png"> <LogicalName>comment-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\edit-find-next-16.png"> - <LogicalName>edit-find-next-16.png</LogicalName> + <EmbeddedResource Include="icons\comment-16~dark.png"> + <LogicalName>comment-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\comment-16~dark%402x.png"> + <LogicalName>comment-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-next-16.png"> + <LogicalName>find-next-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-next-16%402x.png"> + <LogicalName>find-next-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-next-16~dark.png"> + <LogicalName>find-next-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-next-16~dark%402x.png"> + <LogicalName>find-next-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-prev-16.png"> + <LogicalName>find-prev-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-prev-16%402x.png"> + <LogicalName>find-prev-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-prev-16~dark.png"> + <LogicalName>find-prev-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-prev-16~dark%402x.png"> + <LogicalName>find-prev-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\select-all-16.png"> + <LogicalName>select-all-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\select-all-16%402x.png"> + <LogicalName>select-all-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\select-all-16~dark.png"> + <LogicalName>select-all-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\select-all-16~dark%402x.png"> + <LogicalName>select-all-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\edit-select-all-16.png"> - <LogicalName>edit-select-all-16.png</LogicalName> + <EmbeddedResource Include="icons\select-all-16~disabled.png"> + <LogicalName>select-all-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\select-all-16~disabled%402x.png"> + <LogicalName>select-all-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\select-all-16~dark~disabled.png"> + <LogicalName>select-all-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\select-all-16~dark~disabled%402x.png"> + <LogicalName>select-all-16~dark~disabled@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-class-16.png"> <LogicalName>element-class-16.png</LogicalName> @@ -429,17 +783,71 @@ <EmbeddedResource Include="icons\element-class-16%402x.png"> <LogicalName>element-class-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-class-16~dark.png"> + <LogicalName>element-class-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-class-16~dark%402x.png"> + <LogicalName>element-class-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-class-16~sel.png"> + <LogicalName>element-class-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-class-16~sel%402x.png"> + <LogicalName>element-class-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-class-16~dark~sel.png"> + <LogicalName>element-class-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-class-16~dark~sel%402x.png"> + <LogicalName>element-class-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-delegate-16.png"> <LogicalName>element-delegate-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-delegate-16%402x.png"> <LogicalName>element-delegate-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-enumeration-16.png"> - <LogicalName>element-enumeration-16.png</LogicalName> + <EmbeddedResource Include="icons\element-delegate-16~dark.png"> + <LogicalName>element-delegate-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-delegate-16~dark%402x.png"> + <LogicalName>element-delegate-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-delegate-16~sel.png"> + <LogicalName>element-delegate-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-delegate-16~sel%402x.png"> + <LogicalName>element-delegate-16~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-enumeration-16%402x.png"> - <LogicalName>element-enumeration-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\element-delegate-16~dark~sel.png"> + <LogicalName>element-delegate-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-delegate-16~dark~sel%402x.png"> + <LogicalName>element-delegate-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-enum-16.png"> + <LogicalName>element-enum-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-enum-16%402x.png"> + <LogicalName>element-enum-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-enum-16~dark.png"> + <LogicalName>element-enum-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-enum-16~dark%402x.png"> + <LogicalName>element-enum-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-enum-16~sel.png"> + <LogicalName>element-enum-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-enum-16~sel%402x.png"> + <LogicalName>element-enum-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-enum-16~dark~sel.png"> + <LogicalName>element-enum-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-enum-16~dark~sel%402x.png"> + <LogicalName>element-enum-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-event-16.png"> <LogicalName>element-event-16.png</LogicalName> @@ -447,59 +855,239 @@ <EmbeddedResource Include="icons\element-event-16%402x.png"> <LogicalName>element-event-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-event-16~dark.png"> + <LogicalName>element-event-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-event-16~dark%402x.png"> + <LogicalName>element-event-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-event-16~sel.png"> + <LogicalName>element-event-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-event-16~sel%402x.png"> + <LogicalName>element-event-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-event-16~dark~sel.png"> + <LogicalName>element-event-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-event-16~dark~sel%402x.png"> + <LogicalName>element-event-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-extensionmethod-16.png"> <LogicalName>element-extensionmethod-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-extensionmethod-16%402x.png"> <LogicalName>element-extensionmethod-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-extensionmethod-16~dark.png"> + <LogicalName>element-extensionmethod-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-extensionmethod-16~dark%402x.png"> + <LogicalName>element-extensionmethod-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-extensionmethod-16~sel.png"> + <LogicalName>element-extensionmethod-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-extensionmethod-16~sel%402x.png"> + <LogicalName>element-extensionmethod-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-extensionmethod-16~dark~sel.png"> + <LogicalName>element-extensionmethod-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-extensionmethod-16~dark~sel%402x.png"> + <LogicalName>element-extensionmethod-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-field-16.png"> <LogicalName>element-field-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-field-16%402x.png"> <LogicalName>element-field-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-field-16~dark.png"> + <LogicalName>element-field-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-field-16~dark%402x.png"> + <LogicalName>element-field-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-field-16~sel.png"> + <LogicalName>element-field-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-field-16~sel%402x.png"> + <LogicalName>element-field-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-field-16~dark~sel.png"> + <LogicalName>element-field-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-field-16~dark~sel%402x.png"> + <LogicalName>element-field-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-interface-16.png"> <LogicalName>element-interface-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-interface-16%402x.png"> <LogicalName>element-interface-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-interface-16~dark.png"> + <LogicalName>element-interface-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-interface-16~dark%402x.png"> + <LogicalName>element-interface-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-interface-16~sel.png"> + <LogicalName>element-interface-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-interface-16~sel%402x.png"> + <LogicalName>element-interface-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-interface-16~dark~sel.png"> + <LogicalName>element-interface-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-interface-16~dark~sel%402x.png"> + <LogicalName>element-interface-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-constant-16.png"> <LogicalName>element-constant-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-constant-16%402x.png"> <LogicalName>element-constant-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-constant-16~dark.png"> + <LogicalName>element-constant-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-constant-16~dark%402x.png"> + <LogicalName>element-constant-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-constant-16~sel.png"> + <LogicalName>element-constant-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-constant-16~sel%402x.png"> + <LogicalName>element-constant-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-constant-16~dark~sel.png"> + <LogicalName>element-constant-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-constant-16~dark~sel%402x.png"> + <LogicalName>element-constant-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-method-16.png"> <LogicalName>element-method-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-method-16%402x.png"> <LogicalName>element-method-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-method-16~dark.png"> + <LogicalName>element-method-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-method-16~dark%402x.png"> + <LogicalName>element-method-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-method-16~sel.png"> + <LogicalName>element-method-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-method-16~sel%402x.png"> + <LogicalName>element-method-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-method-16~dark~sel.png"> + <LogicalName>element-method-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-method-16~dark~sel%402x.png"> + <LogicalName>element-method-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-method-new-16.png"> <LogicalName>element-method-new-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-method-new-16%402x.png"> <LogicalName>element-method-new-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-method-new-16~dark.png"> + <LogicalName>element-method-new-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-method-new-16~dark%402x.png"> + <LogicalName>element-method-new-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-method-new-16~sel.png"> + <LogicalName>element-method-new-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-method-new-16~sel%402x.png"> + <LogicalName>element-method-new-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-method-new-16~dark~sel.png"> + <LogicalName>element-method-new-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-method-new-16~dark~sel%402x.png"> + <LogicalName>element-method-new-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-namespace-16.png"> <LogicalName>element-namespace-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-namespace-16%402x.png"> <LogicalName>element-namespace-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-namespace-16~dark.png"> + <LogicalName>element-namespace-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-namespace-16~dark%402x.png"> + <LogicalName>element-namespace-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-namespace-16~sel.png"> + <LogicalName>element-namespace-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-namespace-16~sel%402x.png"> + <LogicalName>element-namespace-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-namespace-16~dark~sel.png"> + <LogicalName>element-namespace-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-namespace-16~dark~sel%402x.png"> + <LogicalName>element-namespace-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-property-16.png"> <LogicalName>element-property-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-property-16%402x.png"> <LogicalName>element-property-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-structure-16.png"> - <LogicalName>element-structure-16.png</LogicalName> + <EmbeddedResource Include="icons\element-property-16~dark.png"> + <LogicalName>element-property-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-property-16~dark%402x.png"> + <LogicalName>element-property-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-property-16~sel.png"> + <LogicalName>element-property-16~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-structure-16%402x.png"> - <LogicalName>element-structure-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\element-property-16~sel%402x.png"> + <LogicalName>element-property-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-property-16~dark~sel.png"> + <LogicalName>element-property-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-property-16~dark~sel%402x.png"> + <LogicalName>element-property-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-struct-16.png"> + <LogicalName>element-struct-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-struct-16%402x.png"> + <LogicalName>element-struct-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-struct-16~dark.png"> + <LogicalName>element-struct-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-struct-16~dark%402x.png"> + <LogicalName>element-struct-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-struct-16~sel.png"> + <LogicalName>element-struct-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-struct-16~sel%402x.png"> + <LogicalName>element-struct-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-struct-16~dark~sel.png"> + <LogicalName>element-struct-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-struct-16~dark~sel%402x.png"> + <LogicalName>element-struct-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-class-32.png"> <LogicalName>file-class-32.png</LogicalName> @@ -507,11 +1095,47 @@ <EmbeddedResource Include="icons\file-class-32%402x.png"> <LogicalName>file-class-32@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\file-enumeration-32.png"> - <LogicalName>file-enumeration-32.png</LogicalName> + <EmbeddedResource Include="icons\file-class-32~dark.png"> + <LogicalName>file-class-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-class-32~dark%402x.png"> + <LogicalName>file-class-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-class-32~sel.png"> + <LogicalName>file-class-32~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\file-enumeration-32%402x.png"> - <LogicalName>file-enumeration-32@2x.png</LogicalName> + <EmbeddedResource Include="icons\file-class-32~sel%402x.png"> + <LogicalName>file-class-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-class-32~dark~sel.png"> + <LogicalName>file-class-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-class-32~dark~sel%402x.png"> + <LogicalName>file-class-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-enum-32.png"> + <LogicalName>file-enum-32.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-enum-32%402x.png"> + <LogicalName>file-enum-32@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-enum-32~dark.png"> + <LogicalName>file-enum-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-enum-32~dark%402x.png"> + <LogicalName>file-enum-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-enum-32~sel.png"> + <LogicalName>file-enum-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-enum-32~sel%402x.png"> + <LogicalName>file-enum-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-enum-32~dark~sel.png"> + <LogicalName>file-enum-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-enum-32~dark~sel%402x.png"> + <LogicalName>file-enum-32~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-interface-32.png"> <LogicalName>file-interface-32.png</LogicalName> @@ -519,38 +1143,155 @@ <EmbeddedResource Include="icons\file-interface-32%402x.png"> <LogicalName>file-interface-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-interface-32~dark.png"> + <LogicalName>file-interface-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-interface-32~dark%402x.png"> + <LogicalName>file-interface-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-interface-32~sel.png"> + <LogicalName>file-interface-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-interface-32~sel%402x.png"> + <LogicalName>file-interface-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-interface-32~dark~sel.png"> + <LogicalName>file-interface-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-interface-32~dark~sel%402x.png"> + <LogicalName>file-interface-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-struct-32.png"> <LogicalName>file-struct-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-struct-32%402x.png"> <LogicalName>file-struct-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-struct-32~dark.png"> + <LogicalName>file-struct-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-struct-32~dark%402x.png"> + <LogicalName>file-struct-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-struct-32~sel.png"> + <LogicalName>file-struct-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-struct-32~sel%402x.png"> + <LogicalName>file-struct-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-struct-32~dark~sel.png"> + <LogicalName>file-struct-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-struct-32~dark~sel%402x.png"> + <LogicalName>file-struct-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-xml-16.png"> <LogicalName>file-xml-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-xml-16%402x.png"> <LogicalName>file-xml-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-xml-16~dark.png"> + <LogicalName>file-xml-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-xml-16~dark%402x.png"> + <LogicalName>file-xml-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-xml-16~sel.png"> + <LogicalName>file-xml-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-xml-16~sel%402x.png"> + <LogicalName>file-xml-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-xml-16~dark~sel.png"> + <LogicalName>file-xml-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-xml-16~dark~sel%402x.png"> + <LogicalName>file-xml-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-xml-32.png"> <LogicalName>file-xml-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-xml-32%402x.png"> <LogicalName>file-xml-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-xml-32~dark.png"> + <LogicalName>file-xml-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-xml-32~dark%402x.png"> + <LogicalName>file-xml-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-xml-32~sel.png"> + <LogicalName>file-xml-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-xml-32~sel%402x.png"> + <LogicalName>file-xml-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-xml-32~dark~sel.png"> + <LogicalName>file-xml-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-xml-32~dark~sel%402x.png"> + <LogicalName>file-xml-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-script-16.png"> <LogicalName>file-script-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-script-16%402x.png"> <LogicalName>file-script-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-script-16~dark.png"> + <LogicalName>file-script-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-script-16~dark%402x.png"> + <LogicalName>file-script-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-script-16~sel.png"> + <LogicalName>file-script-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-script-16~sel%402x.png"> + <LogicalName>file-script-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-script-16~dark~sel.png"> + <LogicalName>file-script-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-script-16~dark~sel%402x.png"> + <LogicalName>file-script-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-script-32.png"> <LogicalName>file-script-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-script-32%402x.png"> <LogicalName>file-script-32@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-new-16.png"> - <LogicalName>folder-new-16.png</LogicalName> + <EmbeddedResource Include="icons\file-script-32~dark.png"> + <LogicalName>file-script-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-script-32~dark%402x.png"> + <LogicalName>file-script-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-script-32~sel.png"> + <LogicalName>file-script-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-script-32~sel%402x.png"> + <LogicalName>file-script-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-script-32~dark~sel.png"> + <LogicalName>file-script-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-script-32~dark~sel%402x.png"> + <LogicalName>file-script-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-folder-16.png"> + <LogicalName>new-folder-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-folder-16%402x.png"> + <LogicalName>new-folder-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-folder-16~dark.png"> + <LogicalName>new-folder-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-folder-16~dark%402x.png"> + <LogicalName>new-folder-16~dark@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-keyword-16.png"> <LogicalName>element-keyword-16.png</LogicalName> @@ -558,6 +1299,24 @@ <EmbeddedResource Include="icons\element-keyword-16%402x.png"> <LogicalName>element-keyword-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-keyword-16~dark.png"> + <LogicalName>element-keyword-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-keyword-16~dark%402x.png"> + <LogicalName>element-keyword-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-keyword-16~sel.png"> + <LogicalName>element-keyword-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-keyword-16~sel%402x.png"> + <LogicalName>element-keyword-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-keyword-16~dark~sel.png"> + <LogicalName>element-keyword-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-keyword-16~dark~sel%402x.png"> + <LogicalName>element-keyword-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\monodevelop-16.png"> <LogicalName>monodevelop-16.png</LogicalName> </EmbeddedResource> @@ -576,74 +1335,299 @@ <EmbeddedResource Include="icons\package-16%402x.png"> <LogicalName>package-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\package-16~dark.png"> + <LogicalName>package-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-16~dark%402x.png"> + <LogicalName>package-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-16~sel.png"> + <LogicalName>package-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-16~sel%402x.png"> + <LogicalName>package-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-16~dark~sel.png"> + <LogicalName>package-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-16~dark~sel%402x.png"> + <LogicalName>package-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\package-24.png"> <LogicalName>package-24.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\package-24%402x.png"> <LogicalName>package-24@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\package-24~dark.png"> + <LogicalName>package-24~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-24~dark%402x.png"> + <LogicalName>package-24~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-24~sel.png"> + <LogicalName>package-24~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-24~sel%402x.png"> + <LogicalName>package-24~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-24~dark~sel.png"> + <LogicalName>package-24~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-24~dark~sel%402x.png"> + <LogicalName>package-24~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\package-32.png"> <LogicalName>package-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\package-32%402x.png"> <LogicalName>package-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\package-32~dark.png"> + <LogicalName>package-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-32~dark%402x.png"> + <LogicalName>package-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-32~sel.png"> + <LogicalName>package-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-32~sel%402x.png"> + <LogicalName>package-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-32~dark~sel.png"> + <LogicalName>package-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-32~dark~sel%402x.png"> + <LogicalName>package-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\package-48.png"> <LogicalName>package-48.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\package-48%402x.png"> <LogicalName>package-48@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~dark.png"> + <LogicalName>package-48~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~dark%402x.png"> + <LogicalName>package-48~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~sel.png"> + <LogicalName>package-48~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~sel%402x.png"> + <LogicalName>package-48~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~dark~sel.png"> + <LogicalName>package-48~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-48~dark~sel%402x.png"> + <LogicalName>package-48~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\pad-task-list-16.png"> <LogicalName>pad-task-list-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pad-task-list-16%402x.png"> <LogicalName>pad-task-list-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pad-task-list-16~dark.png"> + <LogicalName>pad-task-list-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-task-list-16~dark%402x.png"> + <LogicalName>pad-task-list-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-task-list-16~sel.png"> + <LogicalName>pad-task-list-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-task-list-16~sel%402x.png"> + <LogicalName>pad-task-list-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-task-list-16~dark~sel.png"> + <LogicalName>pad-task-list-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-task-list-16~dark~sel%402x.png"> + <LogicalName>pad-task-list-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\project-16.png"> <LogicalName>project-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\project-16%402x.png"> <LogicalName>project-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\project-16~dark.png"> + <LogicalName>project-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-16~dark%402x.png"> + <LogicalName>project-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-16~sel.png"> + <LogicalName>project-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-16~sel%402x.png"> + <LogicalName>project-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-16~dark~sel.png"> + <LogicalName>project-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-16~dark~sel%402x.png"> + <LogicalName>project-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\project-32.png"> <LogicalName>project-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\project-32%402x.png"> <LogicalName>project-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\project-32~dark.png"> + <LogicalName>project-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-32~dark%402x.png"> + <LogicalName>project-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-32~sel.png"> + <LogicalName>project-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-32~sel%402x.png"> + <LogicalName>project-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-32~dark~sel.png"> + <LogicalName>project-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-32~dark~sel%402x.png"> + <LogicalName>project-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\project-console-overlay-32.png"> <LogicalName>project-console-overlay-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\project-console-overlay-32%402x.png"> <LogicalName>project-console-overlay-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\project-console-overlay-32~dark.png"> + <LogicalName>project-console-overlay-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-console-overlay-32~dark%402x.png"> + <LogicalName>project-console-overlay-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-console-overlay-32~sel.png"> + <LogicalName>project-console-overlay-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-console-overlay-32~sel%402x.png"> + <LogicalName>project-console-overlay-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-console-overlay-32~dark~sel.png"> + <LogicalName>project-console-overlay-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-console-overlay-32~dark~sel%402x.png"> + <LogicalName>project-console-overlay-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\project-gui-overlay-32.png"> <LogicalName>project-gui-overlay-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\project-gui-overlay-32%402x.png"> <LogicalName>project-gui-overlay-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\project-gui-overlay-32~dark.png"> + <LogicalName>project-gui-overlay-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-gui-overlay-32~dark%402x.png"> + <LogicalName>project-gui-overlay-32~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\project-library-overlay-32.png"> <LogicalName>project-library-overlay-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\project-library-overlay-32%402x.png"> <LogicalName>project-library-overlay-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\project-library-overlay-32~dark.png"> + <LogicalName>project-library-overlay-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-library-overlay-32~dark%402x.png"> + <LogicalName>project-library-overlay-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-library-overlay-32~sel.png"> + <LogicalName>project-library-overlay-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-library-overlay-32~sel%402x.png"> + <LogicalName>project-library-overlay-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-library-overlay-32~dark~sel.png"> + <LogicalName>project-library-overlay-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-library-overlay-32~dark~sel%402x.png"> + <LogicalName>project-library-overlay-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\project-shared-assets-overlay-32.png"> <LogicalName>project-shared-assets-overlay-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\project-shared-assets-overlay-32%402x.png"> <LogicalName>project-shared-assets-overlay-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\project-shared-assets-overlay-32~dark.png"> + <LogicalName>project-shared-assets-overlay-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-shared-assets-overlay-32~dark%402x.png"> + <LogicalName>project-shared-assets-overlay-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-shared-assets-overlay-32~sel.png"> + <LogicalName>project-shared-assets-overlay-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-shared-assets-overlay-32~sel%402x.png"> + <LogicalName>project-shared-assets-overlay-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-shared-assets-overlay-32~dark~sel.png"> + <LogicalName>project-shared-assets-overlay-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-shared-assets-overlay-32~dark~sel%402x.png"> + <LogicalName>project-shared-assets-overlay-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\project-package-overlay-32.png"> <LogicalName>project-package-overlay-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\project-package-overlay-32%402x.png"> <LogicalName>project-package-overlay-32@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\project-new-16.png"> - <LogicalName>project-new-16.png</LogicalName> + <EmbeddedResource Include="icons\project-package-overlay-32~dark.png"> + <LogicalName>project-package-overlay-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-package-overlay-32~dark%402x.png"> + <LogicalName>project-package-overlay-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-package-overlay-32~sel.png"> + <LogicalName>project-package-overlay-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-package-overlay-32~sel%402x.png"> + <LogicalName>project-package-overlay-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-package-overlay-32~dark~sel.png"> + <LogicalName>project-package-overlay-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-package-overlay-32~dark~sel%402x.png"> + <LogicalName>project-package-overlay-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-project-16.png"> + <LogicalName>new-project-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-project-16%402x.png"> + <LogicalName>new-project-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-project-16~dark.png"> + <LogicalName>new-project-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-project-16~dark%402x.png"> + <LogicalName>new-project-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-workspace-16.png"> + <LogicalName>new-workspace-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-workspace-16%402x.png"> + <LogicalName>new-workspace-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-workspace-16~dark.png"> + <LogicalName>new-workspace-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-workspace-16~dark%402x.png"> + <LogicalName>new-workspace-16~dark@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\package-source-16.png"> <LogicalName>package-source-16.png</LogicalName> @@ -651,83 +1635,311 @@ <EmbeddedResource Include="icons\package-source-16%402x.png"> <LogicalName>package-source-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\package-source-16~dark.png"> + <LogicalName>package-source-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-source-16~dark%402x.png"> + <LogicalName>package-source-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-source-16~sel.png"> + <LogicalName>package-source-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-source-16~sel%402x.png"> + <LogicalName>package-source-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-source-16~dark~sel.png"> + <LogicalName>package-source-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\package-source-16~dark~sel%402x.png"> + <LogicalName>package-source-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\reference-16.png"> <LogicalName>reference-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\reference-16%402x.png"> <LogicalName>reference-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\reference-16~dark.png"> + <LogicalName>reference-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-16~dark%402x.png"> + <LogicalName>reference-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-16~sel.png"> + <LogicalName>reference-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-16~sel%402x.png"> + <LogicalName>reference-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-16~dark~sel.png"> + <LogicalName>reference-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\reference-16~dark~sel%402x.png"> + <LogicalName>reference-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\solution-16.png"> <LogicalName>solution-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\solution-16%402x.png"> <LogicalName>solution-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\solution-16~dark.png"> + <LogicalName>solution-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\solution-16~dark%402x.png"> + <LogicalName>solution-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\solution-16~sel.png"> + <LogicalName>solution-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\solution-16~sel%402x.png"> + <LogicalName>solution-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\solution-16~dark~sel.png"> + <LogicalName>solution-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\solution-16~dark~sel%402x.png"> + <LogicalName>solution-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\solution-32.png"> <LogicalName>solution-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\solution-32%402x.png"> <LogicalName>solution-32@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\solution-64.png"> - <LogicalName>solution-64.png</LogicalName> + <EmbeddedResource Include="icons\solution-32~dark.png"> + <LogicalName>solution-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\solution-32~dark%402x.png"> + <LogicalName>solution-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\solution-32~sel.png"> + <LogicalName>solution-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\solution-32~sel%402x.png"> + <LogicalName>solution-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\solution-32~dark~sel.png"> + <LogicalName>solution-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\solution-32~dark~sel%402x.png"> + <LogicalName>solution-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-solution-folder-16.png"> + <LogicalName>new-solution-folder-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-solution-folder-16%402x.png"> + <LogicalName>new-solution-folder-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-solution-folder-16~dark.png"> + <LogicalName>new-solution-folder-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-solution-folder-16~dark%402x.png"> + <LogicalName>new-solution-folder-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-solution-16.png"> + <LogicalName>new-solution-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-solution-16%402x.png"> + <LogicalName>new-solution-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-solution-16~dark.png"> + <LogicalName>new-solution-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\new-solution-16~dark%402x.png"> + <LogicalName>new-solution-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-diamond-overlay-16.png"> + <LogicalName>element-visibility-private-diamond-overlay-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-diamond-overlay-16%402x.png"> + <LogicalName>element-visibility-private-diamond-overlay-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-diamond-overlay-16~dark.png"> + <LogicalName>element-visibility-private-diamond-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-diamond-overlay-16~dark%402x.png"> + <LogicalName>element-visibility-private-diamond-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-diamond-overlay-16~sel.png"> + <LogicalName>element-visibility-private-diamond-overlay-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-diamond-overlay-16~sel%402x.png"> + <LogicalName>element-visibility-private-diamond-overlay-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-diamond-overlay-16~dark~sel.png"> + <LogicalName>element-visibility-private-diamond-overlay-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-diamond-overlay-16~dark~sel%402x.png"> + <LogicalName>element-visibility-private-diamond-overlay-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-square-overlay-16.png"> + <LogicalName>element-visibility-private-square-overlay-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-square-overlay-16%402x.png"> + <LogicalName>element-visibility-private-square-overlay-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-square-overlay-16~dark.png"> + <LogicalName>element-visibility-private-square-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-square-overlay-16~dark%402x.png"> + <LogicalName>element-visibility-private-square-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-square-overlay-16~sel.png"> + <LogicalName>element-visibility-private-square-overlay-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-square-overlay-16~sel%402x.png"> + <LogicalName>element-visibility-private-square-overlay-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-square-overlay-16~dark~sel.png"> + <LogicalName>element-visibility-private-square-overlay-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-private-square-overlay-16~dark~sel%402x.png"> + <LogicalName>element-visibility-private-square-overlay-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-protected-diamond-overlay-16.png"> + <LogicalName>element-visibility-protected-diamond-overlay-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\solution-64%402x.png"> - <LogicalName>solution-64@2x.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-diamond-overlay-16%402x.png"> + <LogicalName>element-visibility-protected-diamond-overlay-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\solution-128.png"> - <LogicalName>solution-128.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-diamond-overlay-16~dark.png"> + <LogicalName>element-visibility-protected-diamond-overlay-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\solution-128%402x.png"> - <LogicalName>solution-128@2x.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-diamond-overlay-16~dark%402x.png"> + <LogicalName>element-visibility-protected-diamond-overlay-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\solution-folder-new-16.png"> - <LogicalName>solution-folder-new-16.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-diamond-overlay-16~sel.png"> + <LogicalName>element-visibility-protected-diamond-overlay-16~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\solution-new-16.png"> - <LogicalName>solution-new-16.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-diamond-overlay-16~sel%402x.png"> + <LogicalName>element-visibility-protected-diamond-overlay-16~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-visibility-internal-overlay-16.png"> - <LogicalName>element-visibility-internal-overlay-16.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-diamond-overlay-16~dark~sel.png"> + <LogicalName>element-visibility-protected-diamond-overlay-16~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-visibility-internal-overlay-16%402x.png"> - <LogicalName>element-visibility-internal-overlay-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-diamond-overlay-16~dark~sel%402x.png"> + <LogicalName>element-visibility-protected-diamond-overlay-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-visibility-private-overlay-16.png"> - <LogicalName>element-visibility-private-overlay-16.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-square-overlay-16.png"> + <LogicalName>element-visibility-protected-square-overlay-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-visibility-private-overlay-16%402x.png"> - <LogicalName>element-visibility-private-overlay-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-square-overlay-16%402x.png"> + <LogicalName>element-visibility-protected-square-overlay-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-visibility-protected-overlay-16.png"> - <LogicalName>element-visibility-protected-overlay-16.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-square-overlay-16~dark.png"> + <LogicalName>element-visibility-protected-square-overlay-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-visibility-protected-overlay-16%402x.png"> - <LogicalName>element-visibility-protected-overlay-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-square-overlay-16~dark%402x.png"> + <LogicalName>element-visibility-protected-square-overlay-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-visibility-internal-an-protected-overlay-16.png"> - <LogicalName>element-visibility-internal-an-protected-overlay-16.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-square-overlay-16~sel.png"> + <LogicalName>element-visibility-protected-square-overlay-16~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-visibility-internal-an-protected-overlay-16%402x.png"> - <LogicalName>element-visibility-internal-an-protected-overlay-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-square-overlay-16~sel%402x.png"> + <LogicalName>element-visibility-protected-square-overlay-16~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-visibility-internal-or-protected-overlay-16.png"> - <LogicalName>element-visibility-internal-or-protected-overlay-16.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-square-overlay-16~dark~sel.png"> + <LogicalName>element-visibility-protected-square-overlay-16~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-visibility-internal-or-protected-overlay-16%402x.png"> - <LogicalName>element-visibility-internal-or-protected-overlay-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-protected-square-overlay-16~dark~sel%402x.png"> + <LogicalName>element-visibility-protected-square-overlay-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-visibility-static-overlay-16.png"> - <LogicalName>element-visibility-static-overlay-16.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-internal-diamond-overlay-16.png"> + <LogicalName>element-visibility-internal-diamond-overlay-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\element-visibility-static-overlay-16%402x.png"> - <LogicalName>element-visibility-static-overlay-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-internal-diamond-overlay-16%402x.png"> + <LogicalName>element-visibility-internal-diamond-overlay-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\project-web-overlay-32.png"> - <LogicalName>project-web-overlay-32.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-internal-diamond-overlay-16~dark.png"> + <LogicalName>element-visibility-internal-diamond-overlay-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\project-web-overlay-32%402x.png"> - <LogicalName>project-web-overlay-32@2x.png</LogicalName> + <EmbeddedResource Include="icons\element-visibility-internal-diamond-overlay-16~dark%402x.png"> + <LogicalName>element-visibility-internal-diamond-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-internal-diamond-overlay-16~sel.png"> + <LogicalName>element-visibility-internal-diamond-overlay-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-internal-diamond-overlay-16~sel%402x.png"> + <LogicalName>element-visibility-internal-diamond-overlay-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-internal-diamond-overlay-16~dark~sel.png"> + <LogicalName>element-visibility-internal-diamond-overlay-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-internal-diamond-overlay-16~dark~sel%402x.png"> + <LogicalName>element-visibility-internal-diamond-overlay-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-internal-square-overlay-16.png"> + <LogicalName>element-visibility-internal-square-overlay-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-internal-square-overlay-16%402x.png"> + <LogicalName>element-visibility-internal-square-overlay-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-internal-square-overlay-16~dark.png"> + <LogicalName>element-visibility-internal-square-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-internal-square-overlay-16~dark%402x.png"> + <LogicalName>element-visibility-internal-square-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-internal-square-overlay-16~sel.png"> + <LogicalName>element-visibility-internal-square-overlay-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-internal-square-overlay-16~sel%402x.png"> + <LogicalName>element-visibility-internal-square-overlay-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-internal-square-overlay-16~dark~sel.png"> + <LogicalName>element-visibility-internal-square-overlay-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-visibility-internal-square-overlay-16~dark~sel%402x.png"> + <LogicalName>element-visibility-internal-square-overlay-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-static-overlay-16.png"> + <LogicalName>element-static-overlay-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-static-overlay-16%402x.png"> + <LogicalName>element-static-overlay-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-static-overlay-16~dark.png"> + <LogicalName>element-static-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-static-overlay-16~dark%402x.png"> + <LogicalName>element-static-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-static-overlay-16~sel.png"> + <LogicalName>element-static-overlay-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-static-overlay-16~sel%402x.png"> + <LogicalName>element-static-overlay-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-static-overlay-16~dark~sel.png"> + <LogicalName>element-static-overlay-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-static-overlay-16~dark~sel%402x.png"> + <LogicalName>element-static-overlay-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-web-32.png"> + <LogicalName>project-web-32.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-web-32%402x.png"> + <LogicalName>project-web-32@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-web-32~dark.png"> + <LogicalName>project-web-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-web-32~dark%402x.png"> + <LogicalName>project-web-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-web-32~sel.png"> + <LogicalName>project-web-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-web-32~sel%402x.png"> + <LogicalName>project-web-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-web-32~dark~sel.png"> + <LogicalName>project-web-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\project-web-32~dark~sel%402x.png"> + <LogicalName>project-web-32~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\workspace-16.png"> <LogicalName>workspace-16.png</LogicalName> @@ -735,30 +1947,84 @@ <EmbeddedResource Include="icons\workspace-16%402x.png"> <LogicalName>workspace-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\workspace-16~dark.png"> + <LogicalName>workspace-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\workspace-16~dark%402x.png"> + <LogicalName>workspace-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\workspace-16~sel.png"> + <LogicalName>workspace-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\workspace-16~sel%402x.png"> + <LogicalName>workspace-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\workspace-16~dark~sel.png"> + <LogicalName>workspace-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\workspace-16~dark~sel%402x.png"> + <LogicalName>workspace-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\workspace-32.png"> <LogicalName>workspace-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\workspace-32%402x.png"> <LogicalName>workspace-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\workspace-32~dark.png"> + <LogicalName>workspace-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\workspace-32~dark%402x.png"> + <LogicalName>workspace-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\workspace-32~sel.png"> + <LogicalName>workspace-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\workspace-32~sel%402x.png"> + <LogicalName>workspace-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\workspace-32~dark~sel.png"> + <LogicalName>workspace-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\workspace-32~dark~sel%402x.png"> + <LogicalName>workspace-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="MonoDevelop.Components.Docking\icons\pad-minimize-9.png"> <LogicalName>pad-minimize-9.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="MonoDevelop.Components.Docking\icons\pad-minimize-9%402x.png"> <LogicalName>pad-minimize-9@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Components.Docking\icons\pad-minimize-9~dark.png"> + <LogicalName>pad-minimize-9~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Components.Docking\icons\pad-minimize-9~dark%402x.png"> + <LogicalName>pad-minimize-9~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="MonoDevelop.Components.Docking\icons\pad-close-9.png"> <LogicalName>pad-close-9.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="MonoDevelop.Components.Docking\icons\pad-close-9%402x.png"> <LogicalName>pad-close-9@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Components.Docking\icons\pad-close-9~dark.png"> + <LogicalName>pad-close-9~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Components.Docking\icons\pad-close-9~dark%402x.png"> + <LogicalName>pad-close-9~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="MonoDevelop.Components.Docking\icons\pad-dock-9.png"> <LogicalName>pad-dock-9.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="MonoDevelop.Components.Docking\icons\pad-dock-9%402x.png"> <LogicalName>pad-dock-9@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Components.Docking\icons\pad-dock-9~dark.png"> + <LogicalName>pad-dock-9~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Components.Docking\icons\pad-dock-9~dark%402x.png"> + <LogicalName>pad-dock-9~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="MonoDevelop.Ide.Gui.Pads.ProjectPad\ProjectPadContextMenu.addin.xml"> <LogicalName>ProjectPadContextMenu.addin.xml</LogicalName> </EmbeddedResource> @@ -810,33 +2076,90 @@ <EmbeddedResource Include="icons\feedback-16%402x.png"> <LogicalName>feedback-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\feedback-16~dark.png"> + <LogicalName>feedback-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\feedback-16~dark%402x.png"> + <LogicalName>feedback-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\feedback-16~disabled.png"> + <LogicalName>feedback-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\feedback-16~disabled%402x.png"> + <LogicalName>feedback-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\feedback-16~dark~disabled.png"> + <LogicalName>feedback-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\feedback-16~dark~disabled%402x.png"> + <LogicalName>feedback-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\updates-16.png"> <LogicalName>updates-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\updates-16%402x.png"> <LogicalName>updates-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="branding\WelcomePage_Logo.png"> - <LogicalName>WelcomePage_Logo.png</LogicalName> + <EmbeddedResource Include="icons\updates-16~dark.png"> + <LogicalName>updates-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\updates-16~dark%402x.png"> + <LogicalName>updates-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\updates-16~disabled.png"> + <LogicalName>updates-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\updates-16~disabled%402x.png"> + <LogicalName>updates-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\updates-16~dark~disabled.png"> + <LogicalName>updates-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\updates-16~dark~disabled%402x.png"> + <LogicalName>updates-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="branding\welcome-logo.png"> + <LogicalName>welcome-logo.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="branding\welcome-logo%402x.png"> + <LogicalName>welcome-logo@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="branding\welcome-tile.png"> + <LogicalName>welcome-tile.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="branding\WelcomePage_TopBorderRepeat.png"> - <LogicalName>WelcomePage_TopBorderRepeat.png</LogicalName> + <EmbeddedResource Include="branding\welcome-tile%402x.png"> + <LogicalName>welcome-tile@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="branding\AboutImage.png"> <LogicalName>AboutImage.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="branding\AboutImage%402x.png"> + <LogicalName>AboutImage@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\popup-close-16.png"> <LogicalName>popup-close-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\popup-close-16%402x.png"> <LogicalName>popup-close-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\popup-close-16~dark.png"> + <LogicalName>popup-close-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\popup-close-16~dark%402x.png"> + <LogicalName>popup-close-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\popup-close-hover-16.png"> <LogicalName>popup-close-hover-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\popup-close-hover-16%402x.png"> <LogicalName>popup-close-hover-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\popup-close-hover-16~dark.png"> + <LogicalName>popup-close-hover-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\popup-close-hover-16~dark%402x.png"> + <LogicalName>popup-close-hover-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\assets\btn-debug-base-left-cap-normal.png"> <LogicalName>btn-debug-base-left-cap-normal.png</LogicalName> </EmbeddedResource> @@ -927,17 +2250,71 @@ <EmbeddedResource Include="icons\disclose-arrow-down-16%402x.png"> <LogicalName>disclose-arrow-down-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\disclose-arrow-down-16~dark.png"> + <LogicalName>disclose-arrow-down-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\disclose-arrow-down-16~dark%402x.png"> + <LogicalName>disclose-arrow-down-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\disclose-arrow-up-16.png"> <LogicalName>disclose-arrow-up-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\disclose-arrow-up-16%402x.png"> <LogicalName>disclose-arrow-up-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\pad-search-results-16.png"> - <LogicalName>pad-search-results-16.png</LogicalName> + <EmbeddedResource Include="icons\disclose-arrow-up-16~dark.png"> + <LogicalName>disclose-arrow-up-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\disclose-arrow-up-16~dark%402x.png"> + <LogicalName>disclose-arrow-up-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-search-16.png"> + <LogicalName>pad-search-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-search-16%402x.png"> + <LogicalName>pad-search-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-search-16~dark.png"> + <LogicalName>pad-search-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-search-16~dark%402x.png"> + <LogicalName>pad-search-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\pad-search-results-16%402x.png"> - <LogicalName>pad-search-results-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\pad-search-16~sel.png"> + <LogicalName>pad-search-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-search-16~sel%402x.png"> + <LogicalName>pad-search-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-search-16~dark~sel.png"> + <LogicalName>pad-search-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-search-16~dark~sel%402x.png"> + <LogicalName>pad-search-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-solution-16.png"> + <LogicalName>pad-solution-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-solution-16%402x.png"> + <LogicalName>pad-solution-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-solution-16~dark.png"> + <LogicalName>pad-solution-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-solution-16~dark%402x.png"> + <LogicalName>pad-solution-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-solution-16~sel.png"> + <LogicalName>pad-solution-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-solution-16~sel%402x.png"> + <LogicalName>pad-solution-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-solution-16~dark~sel.png"> + <LogicalName>pad-solution-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-solution-16~dark~sel%402x.png"> + <LogicalName>pad-solution-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\searchbox-clear-mac-16.png"> <LogicalName>searchbox-clear-mac-16.png</LogicalName> @@ -945,68 +2322,146 @@ <EmbeddedResource Include="icons\searchbox-clear-mac-16%402x.png"> <LogicalName>searchbox-clear-mac-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\searchbox-clear-mac-16~dark.png"> + <LogicalName>searchbox-clear-mac-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\searchbox-clear-mac-16~dark%402x.png"> + <LogicalName>searchbox-clear-mac-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\searchbox-clear-win-24.png"> <LogicalName>searchbox-clear-win-24.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\searchbox-clear-win-24~dark.png"> + <LogicalName>searchbox-clear-win-24~dark.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\searchbox-clear-win-24~hover.png"> <LogicalName>searchbox-clear-win-24~hover.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\searchbox-clear-win-24~hover~dark.png"> + <LogicalName>searchbox-clear-win-24~hover~dark.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\searchbox-clear-win-24~pressed.png"> <LogicalName>searchbox-clear-win-24~pressed.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\searchbox-clear-win-24~pressed~dark.png"> + <LogicalName>searchbox-clear-win-24~pressed~dark.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\searchbox-search-mac-16.png"> <LogicalName>searchbox-search-mac-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\searchbox-search-mac-16%402x.png"> <LogicalName>searchbox-search-mac-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\searchbox-search-mac-16~dark.png"> + <LogicalName>searchbox-search-mac-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\searchbox-search-mac-16~dark%402x.png"> + <LogicalName>searchbox-search-mac-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\searchbox-search-win-24.png"> <LogicalName>searchbox-search-win-24.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\searchbox-search-win-24~dark.png"> + <LogicalName>searchbox-search-win-24~dark.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\searchbox-search-win-24~hover.png"> <LogicalName>searchbox-search-win-24~hover.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\searchbox-search-win-24~hover~dark.png"> + <LogicalName>searchbox-search-win-24~hover~dark.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\searchbox-search-win-24~pressed.png"> <LogicalName>searchbox-search-win-24~pressed.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\tree-popup-button.png"> - <LogicalName>tree-popup-button.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\tree-popup-button%402x.png"> - <LogicalName>tree-popup-button@2x.png</LogicalName> + <EmbeddedResource Include="icons\searchbox-search-win-24~pressed~dark.png"> + <LogicalName>searchbox-search-win-24~pressed~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\tree-popup-button-hover.png"> - <LogicalName>tree-popup-button-hover.png</LogicalName> + <EmbeddedResource Include="icons\bookmark-clear-all-16.png"> + <LogicalName>bookmark-clear-all-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\tree-popup-button-hover%402x.png"> - <LogicalName>tree-popup-button-hover@2x.png</LogicalName> + <EmbeddedResource Include="icons\bookmark-clear-all-16%402x.png"> + <LogicalName>bookmark-clear-all-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\tree-popup-button-down.png"> - <LogicalName>tree-popup-button-down.png</LogicalName> + <EmbeddedResource Include="icons\bookmark-clear-all-16~dark.png"> + <LogicalName>bookmark-clear-all-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\tree-popup-button-down%402x.png"> - <LogicalName>tree-popup-button-down@2x.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\clear-all-bookmarks-16.png"> - <LogicalName>clear-all-bookmarks-16.png</LogicalName> + <EmbeddedResource Include="icons\bookmark-clear-all-16~dark%402x.png"> + <LogicalName>bookmark-clear-all-16~dark@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\close-all-documents-16.png"> <LogicalName>close-all-documents-16.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\close-all-documents-16%402x.png"> + <LogicalName>close-all-documents-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\close-all-documents-16~dark.png"> + <LogicalName>close-all-documents-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\close-all-documents-16~dark%402x.png"> + <LogicalName>close-all-documents-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\close-solution-16.png"> <LogicalName>close-solution-16.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\close-solution-16%402x.png"> + <LogicalName>close-solution-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\close-solution-16~dark.png"> + <LogicalName>close-solution-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\close-solution-16~dark%402x.png"> + <LogicalName>close-solution-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\columns-one-16.png"> + <LogicalName>columns-one-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\columns-one-16%402x.png"> + <LogicalName>columns-one-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\columns-one-16~dark.png"> + <LogicalName>columns-one-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\columns-one-16~dark%402x.png"> + <LogicalName>columns-one-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\columns-two-16.png"> + <LogicalName>columns-two-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\columns-two-16%402x.png"> + <LogicalName>columns-two-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\columns-two-16~dark.png"> + <LogicalName>columns-two-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\columns-two-16~dark%402x.png"> + <LogicalName>columns-two-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\empty-16.png"> <LogicalName>empty-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\find-in-files-16.png"> - <LogicalName>find-in-files-16.png</LogicalName> + <EmbeddedResource Include="icons\bookmark-next-16.png"> + <LogicalName>bookmark-next-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\bookmark-next-16%402x.png"> + <LogicalName>bookmark-next-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\bookmark-next-16~dark.png"> + <LogicalName>bookmark-next-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\bookmark-next-16~dark%402x.png"> + <LogicalName>bookmark-next-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\bookmark-prev-16.png"> + <LogicalName>bookmark-prev-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\bookmark-prev-16%402x.png"> + <LogicalName>bookmark-prev-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\goto-next-bookmark-16.png"> - <LogicalName>goto-next-bookmark-16.png</LogicalName> + <EmbeddedResource Include="icons\bookmark-prev-16~dark.png"> + <LogicalName>bookmark-prev-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\goto-prev-bookmark-16.png"> - <LogicalName>goto-prev-bookmark-16.png</LogicalName> + <EmbeddedResource Include="icons\bookmark-prev-16~dark%402x.png"> + <LogicalName>bookmark-prev-16~dark@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pad-application-output-16.png"> <LogicalName>pad-application-output-16.png</LogicalName> @@ -1014,20 +2469,95 @@ <EmbeddedResource Include="icons\pad-application-output-16%402x.png"> <LogicalName>pad-application-output-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pad-application-output-16~dark.png"> + <LogicalName>pad-application-output-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-application-output-16~dark%402x.png"> + <LogicalName>pad-application-output-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-application-output-16~sel.png"> + <LogicalName>pad-application-output-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-application-output-16~sel%402x.png"> + <LogicalName>pad-application-output-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-application-output-16~dark~sel.png"> + <LogicalName>pad-application-output-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-application-output-16~dark~sel%402x.png"> + <LogicalName>pad-application-output-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-classes-16.png"> + <LogicalName>pad-classes-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-classes-16%402x.png"> + <LogicalName>pad-classes-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-classes-16~dark.png"> + <LogicalName>pad-classes-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-classes-16~dark%402x.png"> + <LogicalName>pad-classes-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-classes-16~sel.png"> + <LogicalName>pad-classes-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-classes-16~sel%402x.png"> + <LogicalName>pad-classes-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-classes-16~dark~sel.png"> + <LogicalName>pad-classes-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-classes-16~dark~sel%402x.png"> + <LogicalName>pad-classes-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\pad-immediate-16.png"> <LogicalName>pad-immediate-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pad-immediate-16%402x.png"> <LogicalName>pad-immediate-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\pad-generic-pad-16.png"> - <LogicalName>pad-generic-pad-16.png</LogicalName> + <EmbeddedResource Include="icons\pad-immediate-16~dark.png"> + <LogicalName>pad-immediate-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-immediate-16~dark%402x.png"> + <LogicalName>pad-immediate-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-immediate-16~sel.png"> + <LogicalName>pad-immediate-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-immediate-16~sel%402x.png"> + <LogicalName>pad-immediate-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-immediate-16~dark~sel.png"> + <LogicalName>pad-immediate-16~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\pad-generic-pad-16%402x.png"> - <LogicalName>pad-generic-pad-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\pad-immediate-16~dark~sel%402x.png"> + <LogicalName>pad-immediate-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\replace-in-files-16.png"> - <LogicalName>replace-in-files-16.png</LogicalName> + <EmbeddedResource Include="icons\pad-generic-16.png"> + <LogicalName>pad-generic-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-generic-16%402x.png"> + <LogicalName>pad-generic-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-generic-16~dark.png"> + <LogicalName>pad-generic-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-generic-16~dark%402x.png"> + <LogicalName>pad-generic-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-generic-16~sel.png"> + <LogicalName>pad-generic-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-generic-16~sel%402x.png"> + <LogicalName>pad-generic-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-generic-16~dark~sel.png"> + <LogicalName>pad-generic-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-generic-16~dark~sel%402x.png"> + <LogicalName>pad-generic-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-resource-16.png"> <LogicalName>file-resource-16.png</LogicalName> @@ -1035,65 +2565,299 @@ <EmbeddedResource Include="icons\file-resource-16%402x.png"> <LogicalName>file-resource-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-resource-16~dark.png"> + <LogicalName>file-resource-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-resource-16~dark%402x.png"> + <LogicalName>file-resource-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-resource-16~sel.png"> + <LogicalName>file-resource-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-resource-16~sel%402x.png"> + <LogicalName>file-resource-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-resource-16~dark~sel.png"> + <LogicalName>file-resource-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-resource-16~dark~sel%402x.png"> + <LogicalName>file-resource-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-resource-32.png"> <LogicalName>file-resource-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-resource-32%402x.png"> <LogicalName>file-resource-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-resource-32~dark.png"> + <LogicalName>file-resource-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-resource-32~dark%402x.png"> + <LogicalName>file-resource-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-resource-32~sel.png"> + <LogicalName>file-resource-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-resource-32~sel%402x.png"> + <LogicalName>file-resource-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-resource-32~dark~sel.png"> + <LogicalName>file-resource-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-resource-32~dark~sel%402x.png"> + <LogicalName>file-resource-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-text-32.png"> <LogicalName>file-text-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-text-32%402x.png"> <LogicalName>file-text-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-text-32~dark.png"> + <LogicalName>file-text-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-text-32~dark%402x.png"> + <LogicalName>file-text-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-text-32~sel.png"> + <LogicalName>file-text-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-text-32~sel%402x.png"> + <LogicalName>file-text-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-text-32~dark~sel.png"> + <LogicalName>file-text-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-text-32~dark~sel%402x.png"> + <LogicalName>file-text-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-text-16.png"> <LogicalName>file-text-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-text-16%402x.png"> <LogicalName>file-text-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\toggle-bookmark-16.png"> - <LogicalName>toggle-bookmark-16.png</LogicalName> + <EmbeddedResource Include="icons\file-text-16~dark.png"> + <LogicalName>file-text-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-text-16~dark%402x.png"> + <LogicalName>file-text-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-text-16~sel.png"> + <LogicalName>file-text-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-text-16~sel%402x.png"> + <LogicalName>file-text-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-text-16~dark~sel.png"> + <LogicalName>file-text-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-text-16~dark~sel%402x.png"> + <LogicalName>file-text-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\bookmark-toggle-16.png"> + <LogicalName>bookmark-toggle-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\bookmark-toggle-16%402x.png"> + <LogicalName>bookmark-toggle-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\bookmark-toggle-16~dark.png"> + <LogicalName>bookmark-toggle-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\bookmark-toggle-16~dark%402x.png"> + <LogicalName>bookmark-toggle-16~dark@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\web-search-16.png"> <LogicalName>web-search-16.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\web-search-16%402x.png"> + <LogicalName>web-search-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\web-search-16~dark.png"> + <LogicalName>web-search-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\web-search-16~dark%402x.png"> + <LogicalName>web-search-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\web-search-16~disabled.png"> + <LogicalName>web-search-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\web-search-16~disabled%402x.png"> + <LogicalName>web-search-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\web-search-16~dark~disabled.png"> + <LogicalName>web-search-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\web-search-16~dark~disabled%402x.png"> + <LogicalName>web-search-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-generic-16.png"> <LogicalName>file-generic-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-generic-16%402x.png"> <LogicalName>file-generic-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-generic-16~dark.png"> + <LogicalName>file-generic-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-generic-16~dark%402x.png"> + <LogicalName>file-generic-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-generic-16~sel.png"> + <LogicalName>file-generic-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-generic-16~sel%402x.png"> + <LogicalName>file-generic-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-generic-16~dark~sel.png"> + <LogicalName>file-generic-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-generic-16~dark~sel%402x.png"> + <LogicalName>file-generic-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-generic-32.png"> <LogicalName>file-generic-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-generic-32%402x.png"> <LogicalName>file-generic-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-generic-32~dark.png"> + <LogicalName>file-generic-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-generic-32~dark%402x.png"> + <LogicalName>file-generic-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-generic-32~sel.png"> + <LogicalName>file-generic-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-generic-32~sel%402x.png"> + <LogicalName>file-generic-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-generic-32~dark~sel.png"> + <LogicalName>file-generic-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-generic-32~dark~sel%402x.png"> + <LogicalName>file-generic-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\tabbar-prev-12.png"> <LogicalName>tabbar-prev-12.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\tabbar-prev-12%402x.png"> <LogicalName>tabbar-prev-12@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-prev-12~dark.png"> + <LogicalName>tabbar-prev-12~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-prev-12~dark%402x.png"> + <LogicalName>tabbar-prev-12~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-prev-hover-12.png"> + <LogicalName>tabbar-prev-hover-12.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-prev-hover-12%402x.png"> + <LogicalName>tabbar-prev-hover-12@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-prev-hover-12~dark.png"> + <LogicalName>tabbar-prev-hover-12~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-prev-hover-12~dark%402x.png"> + <LogicalName>tabbar-prev-hover-12~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\tabbar-next-12.png"> <LogicalName>tabbar-next-12.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\tabbar-next-12%402x.png"> <LogicalName>tabbar-next-12@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\breadcrumb-previous-normal-16.png"> - <LogicalName>breadcrumb-previous-normal-16.png</LogicalName> + <EmbeddedResource Include="icons\tabbar-next-12~dark.png"> + <LogicalName>tabbar-next-12~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\breadcrumb-previous-normal-16%402x.png"> - <LogicalName>breadcrumb-previous-normal-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\tabbar-next-12~dark%402x.png"> + <LogicalName>tabbar-next-12~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\breadcrumb-next-normal-16.png"> - <LogicalName>breadcrumb-next-normal-16.png</LogicalName> + <EmbeddedResource Include="icons\tabbar-next-hover-12.png"> + <LogicalName>tabbar-next-hover-12.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\breadcrumb-next-normal-16%402x.png"> - <LogicalName>breadcrumb-next-normal-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\tabbar-next-hover-12%402x.png"> + <LogicalName>tabbar-next-hover-12@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-next-hover-12~dark.png"> + <LogicalName>tabbar-next-hover-12~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-next-hover-12~dark%402x.png"> + <LogicalName>tabbar-next-hover-12~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tab-close-9.png"> + <LogicalName>tab-close-9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tab-close-9%402x.png"> + <LogicalName>tab-close-9@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tab-close-9~dark.png"> + <LogicalName>tab-close-9~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tab-close-9~dark%402x.png"> + <LogicalName>tab-close-9~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tab-dirty-9.png"> + <LogicalName>tab-dirty-9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tab-dirty-9%402x.png"> + <LogicalName>tab-dirty-9@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tab-dirty-9~dark.png"> + <LogicalName>tab-dirty-9~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tab-dirty-9~dark%402x.png"> + <LogicalName>tab-dirty-9~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-menu-12.png"> + <LogicalName>tabbar-menu-12.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-menu-12%402x.png"> + <LogicalName>tabbar-menu-12@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-menu-12~dark.png"> + <LogicalName>tabbar-menu-12~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-menu-12~dark%402x.png"> + <LogicalName>tabbar-menu-12~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-menu-hover-12.png"> + <LogicalName>tabbar-menu-hover-12.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-menu-hover-12%402x.png"> + <LogicalName>tabbar-menu-hover-12@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-menu-hover-12~dark.png"> + <LogicalName>tabbar-menu-hover-12~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\tabbar-menu-hover-12~dark%402x.png"> + <LogicalName>tabbar-menu-hover-12~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breadcrumb-prev-16.png"> + <LogicalName>breadcrumb-prev-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breadcrumb-prev-16%402x.png"> + <LogicalName>breadcrumb-prev-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breadcrumb-prev-16~dark.png"> + <LogicalName>breadcrumb-prev-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breadcrumb-prev-16~dark%402x.png"> + <LogicalName>breadcrumb-prev-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breadcrumb-next-16.png"> + <LogicalName>breadcrumb-next-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breadcrumb-next-16%402x.png"> + <LogicalName>breadcrumb-next-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breadcrumb-next-16~dark.png"> + <LogicalName>breadcrumb-next-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\breadcrumb-next-16~dark%402x.png"> + <LogicalName>breadcrumb-next-16~dark@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\information-16.png"> <LogicalName>information-16.png</LogicalName> @@ -1101,54 +2865,216 @@ <EmbeddedResource Include="icons\information-16%402x.png"> <LogicalName>information-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\information-16~dark.png"> + <LogicalName>information-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-16~dark%402x.png"> + <LogicalName>information-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-16~sel.png"> + <LogicalName>information-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-16~sel%402x.png"> + <LogicalName>information-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-16~dark~sel.png"> + <LogicalName>information-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-16~dark~sel%402x.png"> + <LogicalName>information-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\information-24.png"> <LogicalName>information-24.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\information-24%402x.png"> <LogicalName>information-24@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\information-24~dark.png"> + <LogicalName>information-24~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-24~dark%402x.png"> + <LogicalName>information-24~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-24~sel.png"> + <LogicalName>information-24~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-24~sel%402x.png"> + <LogicalName>information-24~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-24~dark~sel.png"> + <LogicalName>information-24~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-24~dark~sel%402x.png"> + <LogicalName>information-24~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\information-32.png"> <LogicalName>information-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\information-32%402x.png"> <LogicalName>information-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\information-32~dark.png"> + <LogicalName>information-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-32~dark%402x.png"> + <LogicalName>information-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-32~sel.png"> + <LogicalName>information-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-32~sel%402x.png"> + <LogicalName>information-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-32~dark~sel.png"> + <LogicalName>information-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-32~dark~sel%402x.png"> + <LogicalName>information-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\information-48.png"> <LogicalName>information-48.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\information-48%402x.png"> <LogicalName>information-48@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\information-48~dark.png"> + <LogicalName>information-48~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-48~dark%402x.png"> + <LogicalName>information-48~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-48~sel.png"> + <LogicalName>information-48~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-48~sel%402x.png"> + <LogicalName>information-48~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-48~dark~sel.png"> + <LogicalName>information-48~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\information-48~dark~sel%402x.png"> + <LogicalName>information-48~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\question-16.png"> <LogicalName>question-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\question-16%402x.png"> <LogicalName>question-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\question-16~dark.png"> + <LogicalName>question-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-16~dark%402x.png"> + <LogicalName>question-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-16~sel.png"> + <LogicalName>question-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-16~sel%402x.png"> + <LogicalName>question-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-16~dark~sel.png"> + <LogicalName>question-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-16~dark~sel%402x.png"> + <LogicalName>question-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\question-24.png"> <LogicalName>question-24.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\question-24%402x.png"> <LogicalName>question-24@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\question-24~dark.png"> + <LogicalName>question-24~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-24~dark%402x.png"> + <LogicalName>question-24~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-24~sel.png"> + <LogicalName>question-24~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-24~sel%402x.png"> + <LogicalName>question-24~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-24~dark~sel.png"> + <LogicalName>question-24~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-24~dark~sel%402x.png"> + <LogicalName>question-24~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\question-32.png"> <LogicalName>question-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\question-32%402x.png"> <LogicalName>question-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\question-32~dark.png"> + <LogicalName>question-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-32~dark%402x.png"> + <LogicalName>question-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-32~sel.png"> + <LogicalName>question-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-32~sel%402x.png"> + <LogicalName>question-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-32~dark~sel.png"> + <LogicalName>question-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-32~dark~sel%402x.png"> + <LogicalName>question-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\question-48.png"> <LogicalName>question-48.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\question-48%402x.png"> <LogicalName>question-48@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\question-48~dark.png"> + <LogicalName>question-48~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-48~dark%402x.png"> + <LogicalName>question-48~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-48~sel.png"> + <LogicalName>question-48~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-48~sel%402x.png"> + <LogicalName>question-48~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-48~dark~sel.png"> + <LogicalName>question-48~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\question-48~dark~sel%402x.png"> + <LogicalName>question-48~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\command-16.png"> <LogicalName>command-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\command-16%402x.png"> <LogicalName>command-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\command-16~dark.png"> + <LogicalName>command-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\command-16~dark%402x.png"> + <LogicalName>command-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\command-16~sel.png"> + <LogicalName>command-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\command-16~sel%402x.png"> + <LogicalName>command-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\command-16~dark~sel.png"> + <LogicalName>command-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\command-16~dark~sel%402x.png"> + <LogicalName>command-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="MonoDevelop.Components.MainToolbar\icons\ico-build-disabled-32.png"> <LogicalName>ico-build-disabled-32.png</LogicalName> </EmbeddedResource> @@ -1167,29 +3093,119 @@ <EmbeddedResource Include="icons\stop-16%402x.png"> <LogicalName>stop-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\stop-16~dark.png"> + <LogicalName>stop-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\stop-16~dark%402x.png"> + <LogicalName>stop-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\stop-16~disabled.png"> + <LogicalName>stop-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\stop-16~disabled%402x.png"> + <LogicalName>stop-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\stop-16~dark~disabled.png"> + <LogicalName>stop-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\stop-16~dark~disabled%402x.png"> + <LogicalName>stop-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\clear-16.png"> <LogicalName>clear-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\clear-16%402x.png"> <LogicalName>clear-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\link-chat.png"> - <LogicalName>link-chat.png</LogicalName> + <EmbeddedResource Include="icons\clear-16~dark.png"> + <LogicalName>clear-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\clear-16~dark%402x.png"> + <LogicalName>clear-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\clear-16~disabled.png"> + <LogicalName>clear-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\clear-16~disabled%402x.png"> + <LogicalName>clear-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\clear-16~dark~disabled.png"> + <LogicalName>clear-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\clear-16~dark~disabled%402x.png"> + <LogicalName>clear-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-chat-16.png"> + <LogicalName>welcome-link-chat-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-chat-16%402x.png"> + <LogicalName>welcome-link-chat-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-chat-16~dark.png"> + <LogicalName>welcome-link-chat-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-chat-16~dark%402x.png"> + <LogicalName>welcome-link-chat-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\link-cloud.png"> - <LogicalName>link-cloud.png</LogicalName> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-md-16.png"> + <LogicalName>welcome-link-md-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\link-heart.png"> - <LogicalName>link-heart.png</LogicalName> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-md-16%402x.png"> + <LogicalName>welcome-link-md-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\link-info.png"> - <LogicalName>link-info.png</LogicalName> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-md-16~dark.png"> + <LogicalName>welcome-link-md-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\new_solution.png"> - <LogicalName>new_solution.png</LogicalName> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-md-16~dark%402x.png"> + <LogicalName>welcome-link-md-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\open_solution.png"> - <LogicalName>open_solution.png</LogicalName> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-support-16.png"> + <LogicalName>welcome-link-support-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-support-16%402x.png"> + <LogicalName>welcome-link-support-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-support-16~dark.png"> + <LogicalName>welcome-link-support-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-support-16~dark%402x.png"> + <LogicalName>welcome-link-support-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-info-16.png"> + <LogicalName>welcome-link-info-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-info-16%402x.png"> + <LogicalName>welcome-link-info-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-info-16~dark.png"> + <LogicalName>welcome-link-info-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-link-info-16~dark%402x.png"> + <LogicalName>welcome-link-info-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-new-solution-16.png"> + <LogicalName>welcome-new-solution-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-new-solution-16%402x.png"> + <LogicalName>welcome-new-solution-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-new-solution-16~dark.png"> + <LogicalName>welcome-new-solution-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-new-solution-16~dark%402x.png"> + <LogicalName>welcome-new-solution-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-open-solution-16.png"> + <LogicalName>welcome-open-solution-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-open-solution-16%402x.png"> + <LogicalName>welcome-open-solution-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-open-solution-16~dark.png"> + <LogicalName>welcome-open-solution-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\welcome-open-solution-16~dark%402x.png"> + <LogicalName>welcome-open-solution-16~dark@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\link-overlay-16.png"> <LogicalName>link-overlay-16.png</LogicalName> @@ -1197,26 +3213,107 @@ <EmbeddedResource Include="icons\link-overlay-16%402x.png"> <LogicalName>link-overlay-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\link-overlay-16~dark.png"> + <LogicalName>link-overlay-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\link-overlay-16~dark%402x.png"> + <LogicalName>link-overlay-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\pad-error-list-16.png"> <LogicalName>pad-error-list-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pad-error-list-16%402x.png"> <LogicalName>pad-error-list-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-16~dark.png"> + <LogicalName>pad-error-list-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-16~dark%402x.png"> + <LogicalName>pad-error-list-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-16~sel.png"> + <LogicalName>pad-error-list-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-16~sel%402x.png"> + <LogicalName>pad-error-list-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-16~dark~sel.png"> + <LogicalName>pad-error-list-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-16~dark~sel%402x.png"> + <LogicalName>pad-error-list-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\pad-error-list-errors-16.png"> <LogicalName>pad-error-list-errors-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pad-error-list-errors-16%402x.png"> <LogicalName>pad-error-list-errors-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-errors-16~dark.png"> + <LogicalName>pad-error-list-errors-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-errors-16~dark%402x.png"> + <LogicalName>pad-error-list-errors-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-errors-16~disabled.png"> + <LogicalName>pad-error-list-errors-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-errors-16~disabled%402x.png"> + <LogicalName>pad-error-list-errors-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-errors-16~dark~disabled.png"> + <LogicalName>pad-error-list-errors-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-errors-16~dark~disabled%402x.png"> + <LogicalName>pad-error-list-errors-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-errors-16~sel.png"> + <LogicalName>pad-error-list-errors-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-errors-16~sel%402x.png"> + <LogicalName>pad-error-list-errors-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-errors-16~dark~sel.png"> + <LogicalName>pad-error-list-errors-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-errors-16~dark~sel%402x.png"> + <LogicalName>pad-error-list-errors-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\pad-error-list-warnings-16.png"> <LogicalName>pad-error-list-warnings-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pad-error-list-warnings-16%402x.png"> <LogicalName>pad-error-list-warnings-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="MonoDevelop.Ide.WelcomePage\icons\starburst.png"> - <LogicalName>starburst.png</LogicalName> + <EmbeddedResource Include="icons\pad-error-list-warnings-16~dark.png"> + <LogicalName>pad-error-list-warnings-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-warnings-16~dark%402x.png"> + <LogicalName>pad-error-list-warnings-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-warnings-16~disabled.png"> + <LogicalName>pad-error-list-warnings-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-warnings-16~disabled%402x.png"> + <LogicalName>pad-error-list-warnings-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-warnings-16~dark~disabled.png"> + <LogicalName>pad-error-list-warnings-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-warnings-16~dark~disabled%402x.png"> + <LogicalName>pad-error-list-warnings-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-warnings-16~sel.png"> + <LogicalName>pad-error-list-warnings-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-warnings-16~sel%402x.png"> + <LogicalName>pad-error-list-warnings-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-warnings-16~dark~sel.png"> + <LogicalName>pad-error-list-warnings-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-error-list-warnings-16~dark~sel%402x.png"> + <LogicalName>pad-error-list-warnings-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-variable-16.png"> <LogicalName>element-variable-16.png</LogicalName> @@ -1224,131 +3321,431 @@ <EmbeddedResource Include="icons\element-variable-16%402x.png"> <LogicalName>element-variable-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-variable-16~dark.png"> + <LogicalName>element-variable-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-variable-16~dark%402x.png"> + <LogicalName>element-variable-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-variable-16~sel.png"> + <LogicalName>element-variable-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-variable-16~sel%402x.png"> + <LogicalName>element-variable-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-variable-16~dark~sel.png"> + <LogicalName>element-variable-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-variable-16~dark~sel%402x.png"> + <LogicalName>element-variable-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-exception-16.png"> <LogicalName>element-exception-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-exception-16%402x.png"> <LogicalName>element-exception-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-exception-16~dark.png"> + <LogicalName>element-exception-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-exception-16~dark%402x.png"> + <LogicalName>element-exception-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-exception-16~sel.png"> + <LogicalName>element-exception-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-exception-16~sel%402x.png"> + <LogicalName>element-exception-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-exception-16~dark~sel.png"> + <LogicalName>element-exception-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-exception-16~dark~sel%402x.png"> + <LogicalName>element-exception-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-fs-field-16.png"> <LogicalName>element-fs-field-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-fs-field-16%402x.png"> <LogicalName>element-fs-field-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-fs-field-16~dark.png"> + <LogicalName>element-fs-field-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-fs-field-16~dark%402x.png"> + <LogicalName>element-fs-field-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-fs-field-16~sel.png"> + <LogicalName>element-fs-field-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-fs-field-16~sel%402x.png"> + <LogicalName>element-fs-field-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-fs-field-16~dark~sel.png"> + <LogicalName>element-fs-field-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-fs-field-16~dark~sel%402x.png"> + <LogicalName>element-fs-field-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-module-16.png"> <LogicalName>element-module-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-module-16%402x.png"> <LogicalName>element-module-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-module-16~dark.png"> + <LogicalName>element-module-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-module-16~dark%402x.png"> + <LogicalName>element-module-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-module-16~sel.png"> + <LogicalName>element-module-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-module-16~sel%402x.png"> + <LogicalName>element-module-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-module-16~dark~sel.png"> + <LogicalName>element-module-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-module-16~dark~sel%402x.png"> + <LogicalName>element-module-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-other-declaration-16.png"> <LogicalName>element-other-declaration-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-other-declaration-16%402x.png"> <LogicalName>element-other-declaration-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-other-declaration-16~dark.png"> + <LogicalName>element-other-declaration-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-other-declaration-16~dark%402x.png"> + <LogicalName>element-other-declaration-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-other-declaration-16~sel.png"> + <LogicalName>element-other-declaration-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-other-declaration-16~sel%402x.png"> + <LogicalName>element-other-declaration-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-other-declaration-16~dark~sel.png"> + <LogicalName>element-other-declaration-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-other-declaration-16~dark~sel%402x.png"> + <LogicalName>element-other-declaration-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\element-type-16.png"> <LogicalName>element-type-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\element-type-16%402x.png"> <LogicalName>element-type-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\element-type-16~dark.png"> + <LogicalName>element-type-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-type-16~dark%402x.png"> + <LogicalName>element-type-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-type-16~sel.png"> + <LogicalName>element-type-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-type-16~sel%402x.png"> + <LogicalName>element-type-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-type-16~dark~sel.png"> + <LogicalName>element-type-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\element-type-16~dark~sel%402x.png"> + <LogicalName>element-type-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-source-16.png"> <LogicalName>file-source-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-source-16%402x.png"> <LogicalName>file-source-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-source-16~dark.png"> + <LogicalName>file-source-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-source-16~dark%402x.png"> + <LogicalName>file-source-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-source-16~sel.png"> + <LogicalName>file-source-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-source-16~sel%402x.png"> + <LogicalName>file-source-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-source-16~dark~sel.png"> + <LogicalName>file-source-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-source-16~dark~sel%402x.png"> + <LogicalName>file-source-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-source-32.png"> <LogicalName>file-source-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-source-32%402x.png"> <LogicalName>file-source-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-source-32~dark.png"> + <LogicalName>file-source-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-source-32~dark%402x.png"> + <LogicalName>file-source-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-source-32~sel.png"> + <LogicalName>file-source-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-source-32~sel%402x.png"> + <LogicalName>file-source-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-source-32~dark~sel.png"> + <LogicalName>file-source-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-source-32~dark~sel%402x.png"> + <LogicalName>file-source-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-header-16.png"> <LogicalName>file-header-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-header-16%402x.png"> <LogicalName>file-header-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-header-16~dark.png"> + <LogicalName>file-header-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-header-16~dark%402x.png"> + <LogicalName>file-header-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-header-16~sel.png"> + <LogicalName>file-header-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-header-16~sel%402x.png"> + <LogicalName>file-header-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-header-16~dark~sel.png"> + <LogicalName>file-header-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-header-16~dark~sel%402x.png"> + <LogicalName>file-header-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-header-32.png"> <LogicalName>file-header-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-header-32%402x.png"> <LogicalName>file-header-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-header-32~dark.png"> + <LogicalName>file-header-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-header-32~dark%402x.png"> + <LogicalName>file-header-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-header-32~sel.png"> + <LogicalName>file-header-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-header-32~sel%402x.png"> + <LogicalName>file-header-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-header-32~dark~sel.png"> + <LogicalName>file-header-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-header-32~dark~sel%402x.png"> + <LogicalName>file-header-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-unit-test-32.png"> <LogicalName>file-unit-test-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-unit-test-32%402x.png"> <LogicalName>file-unit-test-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-unit-test-32~dark.png"> + <LogicalName>file-unit-test-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-unit-test-32~dark%402x.png"> + <LogicalName>file-unit-test-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-unit-test-32~sel.png"> + <LogicalName>file-unit-test-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-unit-test-32~sel%402x.png"> + <LogicalName>file-unit-test-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-unit-test-32~dark~sel.png"> + <LogicalName>file-unit-test-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-unit-test-32~dark~sel%402x.png"> + <LogicalName>file-unit-test-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-web-16.png"> <LogicalName>file-web-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-web-16%402x.png"> <LogicalName>file-web-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-web-16~dark.png"> + <LogicalName>file-web-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-web-16~dark%402x.png"> + <LogicalName>file-web-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-web-16~sel.png"> + <LogicalName>file-web-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-web-16~sel%402x.png"> + <LogicalName>file-web-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-web-16~dark~sel.png"> + <LogicalName>file-web-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-web-16~dark~sel%402x.png"> + <LogicalName>file-web-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-web-32.png"> <LogicalName>file-web-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-web-32%402x.png"> <LogicalName>file-web-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\file-web-32~dark.png"> + <LogicalName>file-web-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-web-32~dark%402x.png"> + <LogicalName>file-web-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-web-32~sel.png"> + <LogicalName>file-web-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-web-32~sel%402x.png"> + <LogicalName>file-web-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-web-32~dark~sel.png"> + <LogicalName>file-web-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-web-32~dark~sel%402x.png"> + <LogicalName>file-web-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\file-gtk-32.png"> <LogicalName>file-gtk-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\file-gtk-32%402x.png"> <LogicalName>file-gtk-32@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-component-mac-16.png"> - <LogicalName>folder-component-mac-16.png</LogicalName> + <EmbeddedResource Include="icons\file-gtk-32~dark.png"> + <LogicalName>file-gtk-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-gtk-32~dark%402x.png"> + <LogicalName>file-gtk-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-gtk-32~sel.png"> + <LogicalName>file-gtk-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-gtk-32~sel%402x.png"> + <LogicalName>file-gtk-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-gtk-32~dark~sel.png"> + <LogicalName>file-gtk-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\file-gtk-32~dark~sel%402x.png"> + <LogicalName>file-gtk-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-component-16.png"> + <LogicalName>folder-component-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-component-16%402x.png"> + <LogicalName>folder-component-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-component-16~dark.png"> + <LogicalName>folder-component-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-component-16~dark%402x.png"> + <LogicalName>folder-component-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-component-16~sel.png"> + <LogicalName>folder-component-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-component-16~sel%402x.png"> + <LogicalName>folder-component-16~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-component-mac-16%402x.png"> - <LogicalName>folder-component-mac-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\folder-component-16~dark~sel.png"> + <LogicalName>folder-component-16~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-component-win-16.png"> - <LogicalName>folder-component-win-16.png</LogicalName> + <EmbeddedResource Include="icons\folder-component-16~dark~sel%402x.png"> + <LogicalName>folder-component-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-component-win-16%402x.png"> - <LogicalName>folder-component-win-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\folder-generic-16.png"> + <LogicalName>folder-generic-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-generic-mac-16.png"> - <LogicalName>folder-generic-mac-16.png</LogicalName> + <EmbeddedResource Include="icons\folder-generic-16%402x.png"> + <LogicalName>folder-generic-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-generic-mac-16%402x.png"> - <LogicalName>folder-generic-mac-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\folder-generic-16~dark.png"> + <LogicalName>folder-generic-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-generic-win-16.png"> - <LogicalName>folder-generic-win-16.png</LogicalName> + <EmbeddedResource Include="icons\folder-generic-16~dark%402x.png"> + <LogicalName>folder-generic-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-generic-win-16%402x.png"> - <LogicalName>folder-generic-win-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\folder-generic-16~sel.png"> + <LogicalName>folder-generic-16~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-special-mac-16.png"> - <LogicalName>folder-special-mac-16.png</LogicalName> + <EmbeddedResource Include="icons\folder-generic-16~sel%402x.png"> + <LogicalName>folder-generic-16~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-special-mac-16%402x.png"> - <LogicalName>folder-special-mac-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\folder-generic-16~dark~sel.png"> + <LogicalName>folder-generic-16~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-special-win-16.png"> - <LogicalName>folder-special-win-16.png</LogicalName> + <EmbeddedResource Include="icons\folder-generic-16~dark~sel%402x.png"> + <LogicalName>folder-generic-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-special-win-16%402x.png"> - <LogicalName>folder-special-win-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\folder-resource-16.png"> + <LogicalName>folder-resource-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-web-reference-mac-16.png"> - <LogicalName>folder-web-reference-mac-16.png</LogicalName> + <EmbeddedResource Include="icons\folder-resource-16%402x.png"> + <LogicalName>folder-resource-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-web-reference-mac-16%402x.png"> - <LogicalName>folder-web-reference-mac-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\folder-resource-16~dark.png"> + <LogicalName>folder-resource-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-web-reference-win-16.png"> - <LogicalName>folder-web-reference-win-16.png</LogicalName> + <EmbeddedResource Include="icons\folder-resource-16~dark%402x.png"> + <LogicalName>folder-resource-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-web-reference-win-16%402x.png"> - <LogicalName>folder-web-reference-win-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\folder-resource-16~sel.png"> + <LogicalName>folder-resource-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-resource-16~sel%402x.png"> + <LogicalName>folder-resource-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-resource-16~dark~sel.png"> + <LogicalName>folder-resource-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-resource-16~dark~sel%402x.png"> + <LogicalName>folder-resource-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-solution-16.png"> + <LogicalName>folder-solution-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-solution-16%402x.png"> + <LogicalName>folder-solution-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-solution-16~dark.png"> + <LogicalName>folder-solution-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-solution-16~dark%402x.png"> + <LogicalName>folder-solution-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-solution-16~sel.png"> + <LogicalName>folder-solution-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-solution-16~sel%402x.png"> + <LogicalName>folder-solution-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-solution-16~dark~sel.png"> + <LogicalName>folder-solution-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-solution-16~dark~sel%402x.png"> + <LogicalName>folder-solution-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\pad-help-16.png"> <LogicalName>pad-help-16.png</LogicalName> @@ -1356,41 +3753,83 @@ <EmbeddedResource Include="icons\pad-help-16%402x.png"> <LogicalName>pad-help-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\pad-help-16~dark.png"> + <LogicalName>pad-help-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-help-16~dark%402x.png"> + <LogicalName>pad-help-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-help-16~sel.png"> + <LogicalName>pad-help-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-help-16~sel%402x.png"> + <LogicalName>pad-help-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-help-16~dark~sel.png"> + <LogicalName>pad-help-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\pad-help-16~dark~sel%402x.png"> + <LogicalName>pad-help-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\preferences-16.png"> <LogicalName>preferences-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\preferences-16%402x.png"> <LogicalName>preferences-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\preferences-16~dark.png"> + <LogicalName>preferences-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\preferences-16~dark%402x.png"> + <LogicalName>preferences-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\sort-alphabetically-16.png"> <LogicalName>sort-alphabetically-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\sort-alphabetically-16%402x.png"> <LogicalName>sort-alphabetically-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\sort-alphabetically-16~dark.png"> + <LogicalName>sort-alphabetically-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\sort-alphabetically-16~dark%402x.png"> + <LogicalName>sort-alphabetically-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\group-by-category-16.png"> <LogicalName>group-by-category-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\group-by-category-16%402x.png"> <LogicalName>group-by-category-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\group-by-category-16~dark.png"> + <LogicalName>group-by-category-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\group-by-category-16~dark%402x.png"> + <LogicalName>group-by-category-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\add-16.png"> <LogicalName>add-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\add-16%402x.png"> <LogicalName>add-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\warning-overlay-9.png"> - <LogicalName>warning-overlay-9.png</LogicalName> + <EmbeddedResource Include="icons\add-16~dark.png"> + <LogicalName>add-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\add-16~dark%402x.png"> + <LogicalName>add-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\warning-overlay-9%402x.png"> - <LogicalName>warning-overlay-9@2x.png</LogicalName> + <EmbeddedResource Include="icons\add-16~disabled.png"> + <LogicalName>add-16~disabled.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\warning-8.png"> - <LogicalName>warning-8.png</LogicalName> + <EmbeddedResource Include="icons\add-16~disabled%402x.png"> + <LogicalName>add-16~disabled@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\warning-8%402x.png"> - <LogicalName>warning-8@2x.png</LogicalName> + <EmbeddedResource Include="icons\add-16~dark~disabled.png"> + <LogicalName>add-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\add-16~dark~disabled%402x.png"> + <LogicalName>add-16~dark~disabled@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\warning-16.png"> <LogicalName>warning-16.png</LogicalName> @@ -1398,125 +3837,431 @@ <EmbeddedResource Include="icons\warning-16%402x.png"> <LogicalName>warning-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\warning-16~dark.png"> + <LogicalName>warning-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-16~dark%402x.png"> + <LogicalName>warning-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-16~sel.png"> + <LogicalName>warning-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-16~sel%402x.png"> + <LogicalName>warning-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-16~dark~sel.png"> + <LogicalName>warning-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-16~dark~sel%402x.png"> + <LogicalName>warning-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\warning-24.png"> <LogicalName>warning-24.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\warning-24%402x.png"> <LogicalName>warning-24@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\warning-24~dark.png"> + <LogicalName>warning-24~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-24~dark%402x.png"> + <LogicalName>warning-24~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-24~sel.png"> + <LogicalName>warning-24~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-24~sel%402x.png"> + <LogicalName>warning-24~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-24~dark~sel.png"> + <LogicalName>warning-24~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-24~dark~sel%402x.png"> + <LogicalName>warning-24~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\warning-32.png"> <LogicalName>warning-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\warning-32%402x.png"> <LogicalName>warning-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\warning-32~dark.png"> + <LogicalName>warning-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-32~dark%402x.png"> + <LogicalName>warning-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-32~sel.png"> + <LogicalName>warning-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-32~sel%402x.png"> + <LogicalName>warning-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-32~dark~sel.png"> + <LogicalName>warning-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-32~dark~sel%402x.png"> + <LogicalName>warning-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\warning-48.png"> <LogicalName>warning-48.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\warning-48%402x.png"> <LogicalName>warning-48@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\warning-48~dark.png"> + <LogicalName>warning-48~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-48~dark%402x.png"> + <LogicalName>warning-48~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-48~sel.png"> + <LogicalName>warning-48~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-48~sel%402x.png"> + <LogicalName>warning-48~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-48~dark~sel.png"> + <LogicalName>warning-48~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\warning-48~dark~sel%402x.png"> + <LogicalName>warning-48~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\error-16.png"> <LogicalName>error-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\error-16%402x.png"> <LogicalName>error-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\error-16~dark.png"> + <LogicalName>error-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-16~dark%402x.png"> + <LogicalName>error-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-16~sel.png"> + <LogicalName>error-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-16~sel%402x.png"> + <LogicalName>error-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-16~dark~sel.png"> + <LogicalName>error-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-16~dark~sel%402x.png"> + <LogicalName>error-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\error-24.png"> <LogicalName>error-24.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\error-24%402x.png"> <LogicalName>error-24@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\error-24~dark.png"> + <LogicalName>error-24~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-24~dark%402x.png"> + <LogicalName>error-24~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-24~sel.png"> + <LogicalName>error-24~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-24~sel%402x.png"> + <LogicalName>error-24~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-24~dark~sel.png"> + <LogicalName>error-24~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-24~dark~sel%402x.png"> + <LogicalName>error-24~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\error-32.png"> <LogicalName>error-32.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\error-32%402x.png"> <LogicalName>error-32@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\error-32~dark.png"> + <LogicalName>error-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-32~dark%402x.png"> + <LogicalName>error-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-32~sel.png"> + <LogicalName>error-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-32~sel%402x.png"> + <LogicalName>error-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-32~dark~sel.png"> + <LogicalName>error-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-32~dark~sel%402x.png"> + <LogicalName>error-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\error-48.png"> <LogicalName>error-48.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\error-48%402x.png"> <LogicalName>error-48@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\error-48~dark.png"> + <LogicalName>error-48~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-48~dark%402x.png"> + <LogicalName>error-48~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-48~sel.png"> + <LogicalName>error-48~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-48~sel%402x.png"> + <LogicalName>error-48~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-48~dark~sel.png"> + <LogicalName>error-48~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\error-48~dark~sel%402x.png"> + <LogicalName>error-48~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\execute-16.png"> <LogicalName>execute-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\execute-16%402x.png"> <LogicalName>execute-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\execute-16~dark.png"> + <LogicalName>execute-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\execute-16~dark%402x.png"> + <LogicalName>execute-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\execute-16~disabled.png"> + <LogicalName>execute-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\execute-16~disabled%402x.png"> + <LogicalName>execute-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\execute-16~dark~disabled.png"> + <LogicalName>execute-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\execute-16~dark~disabled%402x.png"> + <LogicalName>execute-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\execute-all-16.png"> + <LogicalName>execute-all-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\execute-all-16%402x.png"> + <LogicalName>execute-all-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\execute-all-16~dark.png"> + <LogicalName>execute-all-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\execute-all-16~dark%402x.png"> + <LogicalName>execute-all-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\execute-all-16~disabled.png"> + <LogicalName>execute-all-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\execute-all-16~disabled%402x.png"> + <LogicalName>execute-all-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\execute-all-16~dark~disabled.png"> + <LogicalName>execute-all-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\execute-all-16~dark~disabled%402x.png"> + <LogicalName>execute-all-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\done-16.png"> <LogicalName>done-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\done-16%402x.png"> <LogicalName>done-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\done-16~dark.png"> + <LogicalName>done-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-16~dark%402x.png"> + <LogicalName>done-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-16~sel.png"> + <LogicalName>done-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-16~sel%402x.png"> + <LogicalName>done-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-16~dark~sel.png"> + <LogicalName>done-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-16~dark~sel%402x.png"> + <LogicalName>done-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-24.png"> + <LogicalName>done-24.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-24%402x.png"> + <LogicalName>done-24@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-24~dark.png"> + <LogicalName>done-24~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-24~dark%402x.png"> + <LogicalName>done-24~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-24~sel.png"> + <LogicalName>done-24~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-24~sel%402x.png"> + <LogicalName>done-24~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-24~dark~sel.png"> + <LogicalName>done-24~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-24~dark~sel%402x.png"> + <LogicalName>done-24~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-32.png"> + <LogicalName>done-32.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-32%402x.png"> + <LogicalName>done-32@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-32~dark.png"> + <LogicalName>done-32~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-32~dark%402x.png"> + <LogicalName>done-32~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-32~sel.png"> + <LogicalName>done-32~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-32~sel%402x.png"> + <LogicalName>done-32~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-32~dark~sel.png"> + <LogicalName>done-32~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-32~dark~sel%402x.png"> + <LogicalName>done-32~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-48.png"> + <LogicalName>done-48.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-48%402x.png"> + <LogicalName>done-48@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-48~dark.png"> + <LogicalName>done-48~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-48~dark%402x.png"> + <LogicalName>done-48~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-48~sel.png"> + <LogicalName>done-48~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-48~sel%402x.png"> + <LogicalName>done-48~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-48~dark~sel.png"> + <LogicalName>done-48~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\done-48~dark~sel%402x.png"> + <LogicalName>done-48~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\edit-16.png"> <LogicalName>edit-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\edit-16%402x.png"> <LogicalName>edit-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\edit-16~dark.png"> + <LogicalName>edit-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\edit-16~dark%402x.png"> + <LogicalName>edit-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\edit-16~disabled.png"> + <LogicalName>edit-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\edit-16~disabled%402x.png"> + <LogicalName>edit-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\edit-16~dark~disabled.png"> + <LogicalName>edit-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\edit-16~dark~disabled%402x.png"> + <LogicalName>edit-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\star-16.png"> <LogicalName>star-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\star-16%402x.png"> <LogicalName>star-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\star-16~dark.png"> + <LogicalName>star-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\star-16~dark%402x.png"> + <LogicalName>star-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\star-hover-16.png"> <LogicalName>star-hover-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\star-hover-16%402x.png"> <LogicalName>star-hover-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\star-overlay-16.png"> - <LogicalName>star-overlay-16.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\star-overlay-16%402x.png"> - <LogicalName>star-overlay-16@2x.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\star-overlay-hover-16.png"> - <LogicalName>star-overlay-hover-16.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\star-overlay-hover-16%402x.png"> - <LogicalName>star-overlay-hover-16@2x.png</LogicalName> - </EmbeddedResource> <EmbeddedResource Include="icons\unstar-16.png"> <LogicalName>unstar-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\unstar-16%402x.png"> <LogicalName>unstar-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\unstar-16~dark.png"> + <LogicalName>unstar-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\unstar-16~dark%402x.png"> + <LogicalName>unstar-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\unstar-hover-16.png"> <LogicalName>unstar-hover-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\unstar-hover-16%402x.png"> <LogicalName>unstar-hover-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\unstar-overlay-16.png"> - <LogicalName>unstar-overlay-16.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\unstar-overlay-16%402x.png"> - <LogicalName>unstar-overlay-16@2x.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\unstar-overlay-hover-16.png"> - <LogicalName>unstar-overlay-hover-16.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\unstar-overlay-hover-16%402x.png"> - <LogicalName>unstar-overlay-hover-16@2x.png</LogicalName> - </EmbeddedResource> <EmbeddedResource Include="icons\remove-16.png"> <LogicalName>remove-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\remove-16%402x.png"> <LogicalName>remove-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\properties-16.png"> - <LogicalName>properties-16.png</LogicalName> + <EmbeddedResource Include="icons\remove-16~dark.png"> + <LogicalName>remove-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\remove-16~dark%402x.png"> + <LogicalName>remove-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\remove-16~disabled.png"> + <LogicalName>remove-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\remove-16~disabled%402x.png"> + <LogicalName>remove-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\remove-16~dark~disabled.png"> + <LogicalName>remove-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\remove-16~dark~disabled%402x.png"> + <LogicalName>remove-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\run-unit-tests-16.png"> + <LogicalName>run-unit-tests-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\run-unit-tests-16%402x.png"> + <LogicalName>run-unit-tests-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\properties-16%402x.png"> - <LogicalName>properties-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\run-unit-tests-16~dark.png"> + <LogicalName>run-unit-tests-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\run-unit-tests-16~dark%402x.png"> + <LogicalName>run-unit-tests-16~dark@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-load-save-16.png"> <LogicalName>prefs-load-save-16.png</LogicalName> @@ -1524,89 +4269,359 @@ <EmbeddedResource Include="icons\prefs-load-save-16%402x.png"> <LogicalName>prefs-load-save-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-load-save-16~dark.png"> + <LogicalName>prefs-load-save-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-load-save-16~dark%402x.png"> + <LogicalName>prefs-load-save-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-load-save-16~sel.png"> + <LogicalName>prefs-load-save-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-load-save-16~sel%402x.png"> + <LogicalName>prefs-load-save-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-load-save-16~dark~sel.png"> + <LogicalName>prefs-load-save-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-load-save-16~dark~sel%402x.png"> + <LogicalName>prefs-load-save-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-code-formatting-16.png"> <LogicalName>prefs-code-formatting-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-code-formatting-16%402x.png"> <LogicalName>prefs-code-formatting-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-formatting-16~dark.png"> + <LogicalName>prefs-code-formatting-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-formatting-16~dark%402x.png"> + <LogicalName>prefs-code-formatting-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-formatting-16~sel.png"> + <LogicalName>prefs-code-formatting-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-formatting-16~sel%402x.png"> + <LogicalName>prefs-code-formatting-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-formatting-16~dark~sel.png"> + <LogicalName>prefs-code-formatting-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-formatting-16~dark~sel%402x.png"> + <LogicalName>prefs-code-formatting-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-language-16.png"> <LogicalName>prefs-language-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-language-16%402x.png"> <LogicalName>prefs-language-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-language-16~dark.png"> + <LogicalName>prefs-language-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-language-16~dark%402x.png"> + <LogicalName>prefs-language-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-language-16~dark~sel.png"> + <LogicalName>prefs-language-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-language-16~dark~sel%402x.png"> + <LogicalName>prefs-language-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-language-16~sel.png"> + <LogicalName>prefs-language-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-language-16~sel%402x.png"> + <LogicalName>prefs-language-16~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-key-bindings-16.png"> <LogicalName>prefs-key-bindings-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-key-bindings-16%402x.png"> <LogicalName>prefs-key-bindings-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-key-bindings-16~dark.png"> + <LogicalName>prefs-key-bindings-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-key-bindings-16~dark%402x.png"> + <LogicalName>prefs-key-bindings-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-key-bindings-16~sel.png"> + <LogicalName>prefs-key-bindings-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-key-bindings-16~sel%402x.png"> + <LogicalName>prefs-key-bindings-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-key-bindings-16~dark~sel.png"> + <LogicalName>prefs-key-bindings-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-key-bindings-16~dark~sel%402x.png"> + <LogicalName>prefs-key-bindings-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-fonts-16.png"> <LogicalName>prefs-fonts-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-fonts-16%402x.png"> <LogicalName>prefs-fonts-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-fonts-16~dark.png"> + <LogicalName>prefs-fonts-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-fonts-16~dark%402x.png"> + <LogicalName>prefs-fonts-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-fonts-16~sel.png"> + <LogicalName>prefs-fonts-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-fonts-16~sel%402x.png"> + <LogicalName>prefs-fonts-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-fonts-16~dark~sel.png"> + <LogicalName>prefs-fonts-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-fonts-16~dark~sel%402x.png"> + <LogicalName>prefs-fonts-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-author-information-16.png"> <LogicalName>prefs-author-information-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-author-information-16%402x.png"> <LogicalName>prefs-author-information-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-author-information-16~dark.png"> + <LogicalName>prefs-author-information-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-author-information-16~dark%402x.png"> + <LogicalName>prefs-author-information-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-author-information-16~sel.png"> + <LogicalName>prefs-author-information-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-author-information-16~sel%402x.png"> + <LogicalName>prefs-author-information-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-author-information-16~dark~sel.png"> + <LogicalName>prefs-author-information-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-author-information-16~dark~sel%402x.png"> + <LogicalName>prefs-author-information-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-sdk-locations-16.png"> <LogicalName>prefs-sdk-locations-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-sdk-locations-16%402x.png"> <LogicalName>prefs-sdk-locations-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-sdk-locations-16~dark.png"> + <LogicalName>prefs-sdk-locations-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-sdk-locations-16~dark%402x.png"> + <LogicalName>prefs-sdk-locations-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-sdk-locations-16~sel.png"> + <LogicalName>prefs-sdk-locations-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-sdk-locations-16~sel%402x.png"> + <LogicalName>prefs-sdk-locations-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-sdk-locations-16~dark~sel.png"> + <LogicalName>prefs-sdk-locations-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-sdk-locations-16~dark~sel%402x.png"> + <LogicalName>prefs-sdk-locations-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-external-tools-16.png"> <LogicalName>prefs-external-tools-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-external-tools-16%402x.png"> <LogicalName>prefs-external-tools-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-external-tools-16~dark.png"> + <LogicalName>prefs-external-tools-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-external-tools-16~dark%402x.png"> + <LogicalName>prefs-external-tools-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-external-tools-16~sel.png"> + <LogicalName>prefs-external-tools-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-external-tools-16~sel%402x.png"> + <LogicalName>prefs-external-tools-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-external-tools-16~dark~sel.png"> + <LogicalName>prefs-external-tools-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-external-tools-16~dark~sel%402x.png"> + <LogicalName>prefs-external-tools-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-build-16.png"> <LogicalName>prefs-build-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-build-16%402x.png"> <LogicalName>prefs-build-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-build-16~dark.png"> + <LogicalName>prefs-build-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-build-16~dark%402x.png"> + <LogicalName>prefs-build-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-build-16~dark~sel.png"> + <LogicalName>prefs-build-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-build-16~dark~sel%402x.png"> + <LogicalName>prefs-build-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-build-16~sel.png"> + <LogicalName>prefs-build-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-build-16~sel%402x.png"> + <LogicalName>prefs-build-16~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-play-16.png"> <LogicalName>prefs-play-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-play-16%402x.png"> <LogicalName>prefs-play-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-play-16~dark.png"> + <LogicalName>prefs-play-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-play-16~dark%402x.png"> + <LogicalName>prefs-play-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-play-16~dark~sel.png"> + <LogicalName>prefs-play-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-play-16~dark~sel%402x.png"> + <LogicalName>prefs-play-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-play-16~sel.png"> + <LogicalName>prefs-play-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-play-16~sel%402x.png"> + <LogicalName>prefs-play-16~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-updates-16.png"> <LogicalName>prefs-updates-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-updates-16%402x.png"> <LogicalName>prefs-updates-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-updates-16~dark.png"> + <LogicalName>prefs-updates-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-updates-16~dark%402x.png"> + <LogicalName>prefs-updates-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-updates-16~sel.png"> + <LogicalName>prefs-updates-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-updates-16~sel%402x.png"> + <LogicalName>prefs-updates-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-updates-16~dark~sel.png"> + <LogicalName>prefs-updates-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-updates-16~dark~sel%402x.png"> + <LogicalName>prefs-updates-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-task-list-16.png"> <LogicalName>prefs-task-list-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-task-list-16%402x.png"> <LogicalName>prefs-task-list-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-task-list-16~dark.png"> + <LogicalName>prefs-task-list-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-task-list-16~dark%402x.png"> + <LogicalName>prefs-task-list-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-task-list-16~sel.png"> + <LogicalName>prefs-task-list-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-task-list-16~sel%402x.png"> + <LogicalName>prefs-task-list-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-task-list-16~dark~sel.png"> + <LogicalName>prefs-task-list-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-task-list-16~dark~sel%402x.png"> + <LogicalName>prefs-task-list-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-generic-16.png"> <LogicalName>prefs-generic-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-generic-16%402x.png"> <LogicalName>prefs-generic-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\prefs-csharp-16.png"> - <LogicalName>prefs-csharp-16.png</LogicalName> + <EmbeddedResource Include="icons\prefs-generic-16~dark.png"> + <LogicalName>prefs-generic-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-generic-16~dark%402x.png"> + <LogicalName>prefs-generic-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-generic-16~dark~sel.png"> + <LogicalName>prefs-generic-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-generic-16~dark~sel%402x.png"> + <LogicalName>prefs-generic-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-generic-16~sel.png"> + <LogicalName>prefs-generic-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-generic-16~sel%402x.png"> + <LogicalName>prefs-generic-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-source-16.png"> + <LogicalName>prefs-source-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-source-16%402x.png"> + <LogicalName>prefs-source-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-source-16~dark.png"> + <LogicalName>prefs-source-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-source-16~dark%402x.png"> + <LogicalName>prefs-source-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-source-16~sel.png"> + <LogicalName>prefs-source-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-source-16~sel%402x.png"> + <LogicalName>prefs-source-16~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\prefs-csharp-16%402x.png"> - <LogicalName>prefs-csharp-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\prefs-source-16~dark~sel.png"> + <LogicalName>prefs-source-16~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\prefs-standard-header-16.png"> - <LogicalName>prefs-standard-header-16.png</LogicalName> + <EmbeddedResource Include="icons\prefs-source-16~dark~sel%402x.png"> + <LogicalName>prefs-source-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\prefs-standard-header-16%402x.png"> - <LogicalName>prefs-standard-header-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\prefs-header-16.png"> + <LogicalName>prefs-header-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-header-16%402x.png"> + <LogicalName>prefs-header-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-header-16~dark.png"> + <LogicalName>prefs-header-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-header-16~dark%402x.png"> + <LogicalName>prefs-header-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-header-16~sel.png"> + <LogicalName>prefs-header-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-header-16~sel%402x.png"> + <LogicalName>prefs-header-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-header-16~dark~sel.png"> + <LogicalName>prefs-header-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-header-16~dark~sel%402x.png"> + <LogicalName>prefs-header-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-dotnet-naming-policies-16.png"> <LogicalName>prefs-dotnet-naming-policies-16.png</LogicalName> @@ -1614,83 +4629,323 @@ <EmbeddedResource Include="icons\prefs-dotnet-naming-policies-16%402x.png"> <LogicalName>prefs-dotnet-naming-policies-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-dotnet-naming-policies-16~dark.png"> + <LogicalName>prefs-dotnet-naming-policies-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-dotnet-naming-policies-16~dark%402x.png"> + <LogicalName>prefs-dotnet-naming-policies-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-dotnet-naming-policies-16~sel.png"> + <LogicalName>prefs-dotnet-naming-policies-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-dotnet-naming-policies-16~sel%402x.png"> + <LogicalName>prefs-dotnet-naming-policies-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-dotnet-naming-policies-16~dark~sel.png"> + <LogicalName>prefs-dotnet-naming-policies-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-dotnet-naming-policies-16~dark~sel%402x.png"> + <LogicalName>prefs-dotnet-naming-policies-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-code-templates-16.png"> <LogicalName>prefs-code-templates-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-code-templates-16%402x.png"> <LogicalName>prefs-code-templates-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-templates-16~dark.png"> + <LogicalName>prefs-code-templates-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-templates-16~dark%402x.png"> + <LogicalName>prefs-code-templates-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-templates-16~sel.png"> + <LogicalName>prefs-code-templates-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-templates-16~sel%402x.png"> + <LogicalName>prefs-code-templates-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-templates-16~dark~sel.png"> + <LogicalName>prefs-code-templates-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-code-templates-16~dark~sel%402x.png"> + <LogicalName>prefs-code-templates-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\prefs-name-conventions-16.png"> <LogicalName>prefs-name-conventions-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\prefs-name-conventions-16%402x.png"> <LogicalName>prefs-name-conventions-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-name-conventions-16~dark.png"> + <LogicalName>prefs-name-conventions-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-name-conventions-16~dark%402x.png"> + <LogicalName>prefs-name-conventions-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-name-conventions-16~sel.png"> + <LogicalName>prefs-name-conventions-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-name-conventions-16~sel%402x.png"> + <LogicalName>prefs-name-conventions-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-name-conventions-16~dark~sel.png"> + <LogicalName>prefs-name-conventions-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\prefs-name-conventions-16~dark~sel%402x.png"> + <LogicalName>prefs-name-conventions-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\copy-16.png"> <LogicalName>copy-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\copy-16%402x.png"> <LogicalName>copy-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\copy-16~dark.png"> + <LogicalName>copy-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\copy-16~dark%402x.png"> + <LogicalName>copy-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\find-16.png"> <LogicalName>find-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\find-16%402x.png"> <LogicalName>find-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\find-16~dark.png"> + <LogicalName>find-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-16~dark%402x.png"> + <LogicalName>find-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-16~sel.png"> + <LogicalName>find-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-16~sel%402x.png"> + <LogicalName>find-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-16~dark~sel.png"> + <LogicalName>find-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-16~dark~sel%402x.png"> + <LogicalName>find-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\find-and-replace-16.png"> <LogicalName>find-and-replace-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\find-and-replace-16%402x.png"> <LogicalName>find-and-replace-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\find-and-replace-16~dark.png"> + <LogicalName>find-and-replace-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-and-replace-16~dark%402x.png"> + <LogicalName>find-and-replace-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-and-replace-16~sel.png"> + <LogicalName>find-and-replace-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-and-replace-16~sel%402x.png"> + <LogicalName>find-and-replace-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-and-replace-16~dark~sel.png"> + <LogicalName>find-and-replace-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\find-and-replace-16~dark~sel%402x.png"> + <LogicalName>find-and-replace-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\go-back-16.png"> <LogicalName>go-back-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\go-back-16%402x.png"> <LogicalName>go-back-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\go-back-16~dark.png"> + <LogicalName>go-back-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-back-16~dark%402x.png"> + <LogicalName>go-back-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-back-16~disabled.png"> + <LogicalName>go-back-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-back-16~disabled%402x.png"> + <LogicalName>go-back-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-back-16~dark~disabled.png"> + <LogicalName>go-back-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-back-16~dark~disabled%402x.png"> + <LogicalName>go-back-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\go-down-16.png"> <LogicalName>go-down-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\go-down-16%402x.png"> <LogicalName>go-down-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\go-down-16~dark.png"> + <LogicalName>go-down-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-down-16~dark%402x.png"> + <LogicalName>go-down-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-down-16~disabled.png"> + <LogicalName>go-down-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-down-16~disabled%402x.png"> + <LogicalName>go-down-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-down-16~dark~disabled.png"> + <LogicalName>go-down-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-down-16~dark~disabled%402x.png"> + <LogicalName>go-down-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\go-forward-16.png"> <LogicalName>go-forward-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\go-forward-16%402x.png"> <LogicalName>go-forward-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\go-forward-16~dark.png"> + <LogicalName>go-forward-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-forward-16~dark%402x.png"> + <LogicalName>go-forward-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-forward-16~disabled.png"> + <LogicalName>go-forward-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-forward-16~disabled%402x.png"> + <LogicalName>go-forward-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-forward-16~dark~disabled.png"> + <LogicalName>go-forward-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-forward-16~dark~disabled%402x.png"> + <LogicalName>go-forward-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-to-line-16.png"> + <LogicalName>go-to-line-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-to-line-16%402x.png"> + <LogicalName>go-to-line-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-to-line-16~dark.png"> + <LogicalName>go-to-line-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-to-line-16~dark%402x.png"> + <LogicalName>go-to-line-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-to-matching-brace-16.png"> + <LogicalName>go-to-matching-brace-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-to-matching-brace-16%402x.png"> + <LogicalName>go-to-matching-brace-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-to-matching-brace-16~dark.png"> + <LogicalName>go-to-matching-brace-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-to-matching-brace-16~dark%402x.png"> + <LogicalName>go-to-matching-brace-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\go-up-16.png"> <LogicalName>go-up-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\go-up-16%402x.png"> <LogicalName>go-up-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\go-up-16~dark.png"> + <LogicalName>go-up-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-up-16~dark%402x.png"> + <LogicalName>go-up-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-up-16~disabled.png"> + <LogicalName>go-up-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-up-16~disabled%402x.png"> + <LogicalName>go-up-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-up-16~dark~disabled.png"> + <LogicalName>go-up-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\go-up-16~dark~disabled%402x.png"> + <LogicalName>go-up-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\undo-16.png"> <LogicalName>undo-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\undo-16%402x.png"> <LogicalName>undo-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\undo-16~dark.png"> + <LogicalName>undo-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\undo-16~dark%402x.png"> + <LogicalName>undo-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\undo-16~disabled.png"> + <LogicalName>undo-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\undo-16~disabled%402x.png"> + <LogicalName>undo-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\undo-16~dark~disabled.png"> + <LogicalName>undo-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\undo-16~dark~disabled%402x.png"> + <LogicalName>undo-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\home-16.png"> <LogicalName>home-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\home-16%402x.png"> <LogicalName>home-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\home-16~dark.png"> + <LogicalName>home-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\home-16~dark%402x.png"> + <LogicalName>home-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\home-16~dark~sel.png"> + <LogicalName>home-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\home-16~dark~sel%402x.png"> + <LogicalName>home-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\home-16~sel.png"> + <LogicalName>home-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\home-16~sel%402x.png"> + <LogicalName>home-16~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\jump-to-16.png"> <LogicalName>jump-to-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\jump-to-16%402x.png"> <LogicalName>jump-to-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\media-play-16.png"> - <LogicalName>media-play-16.png</LogicalName> + <EmbeddedResource Include="icons\jump-to-16~dark.png"> + <LogicalName>jump-to-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\media-play-16%402x.png"> - <LogicalName>media-play-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\jump-to-16~dark%402x.png"> + <LogicalName>jump-to-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\jump-to-16~disabled.png"> + <LogicalName>jump-to-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\jump-to-16~disabled%402x.png"> + <LogicalName>jump-to-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\jump-to-16~dark~disabled.png"> + <LogicalName>jump-to-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\jump-to-16~dark~disabled%402x.png"> + <LogicalName>jump-to-16~dark~disabled@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\missing-image-16.png"> <LogicalName>missing-image-16.png</LogicalName> @@ -1698,164 +4953,701 @@ <EmbeddedResource Include="icons\missing-image-16%402x.png"> <LogicalName>missing-image-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\missing-image-32.png"> + <LogicalName>missing-image-32.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\missing-image-32%402x.png"> + <LogicalName>missing-image-32@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\missing-image-48.png"> + <LogicalName>missing-image-48.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\missing-image-48%402x.png"> + <LogicalName>missing-image-48@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\open-16.png"> <LogicalName>open-16.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\open-16%402x.png"> + <LogicalName>open-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\open-16~dark.png"> + <LogicalName>open-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\open-16~dark%402x.png"> + <LogicalName>open-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\refresh-16.png"> <LogicalName>refresh-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\refresh-16%402x.png"> <LogicalName>refresh-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\refresh-16~dark.png"> + <LogicalName>refresh-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\refresh-16~dark%402x.png"> + <LogicalName>refresh-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\refresh-16~disabled.png"> + <LogicalName>refresh-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\refresh-16~disabled%402x.png"> + <LogicalName>refresh-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\refresh-16~dark~disabled.png"> + <LogicalName>refresh-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\refresh-16~dark~disabled%402x.png"> + <LogicalName>refresh-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\save-16.png"> <LogicalName>save-16.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\save-16%402x.png"> + <LogicalName>save-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\save-16~dark.png"> + <LogicalName>save-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\save-16~dark%402x.png"> + <LogicalName>save-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\save-all-16.png"> <LogicalName>save-all-16.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\save-all-16%402x.png"> + <LogicalName>save-all-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\save-all-16~dark.png"> + <LogicalName>save-all-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\save-all-16~dark%402x.png"> + <LogicalName>save-all-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-actual-16.png"> + <LogicalName>zoom-actual-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-actual-16%402x.png"> + <LogicalName>zoom-actual-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-actual-16~dark.png"> + <LogicalName>zoom-actual-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-actual-16~dark%402x.png"> + <LogicalName>zoom-actual-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-actual-16~sel.png"> + <LogicalName>zoom-actual-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-actual-16~sel%402x.png"> + <LogicalName>zoom-actual-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-actual-16~dark~sel.png"> + <LogicalName>zoom-actual-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-actual-16~dark~sel%402x.png"> + <LogicalName>zoom-actual-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\zoom-in-16.png"> <LogicalName>zoom-in-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\zoom-in-16%402x.png"> <LogicalName>zoom-in-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-in-16~dark.png"> + <LogicalName>zoom-in-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-in-16~dark%402x.png"> + <LogicalName>zoom-in-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-in-16~dark~sel.png"> + <LogicalName>zoom-in-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-in-16~dark~sel%402x.png"> + <LogicalName>zoom-in-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-in-16~sel.png"> + <LogicalName>zoom-in-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-in-16~sel%402x.png"> + <LogicalName>zoom-in-16~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\zoom-out-16.png"> <LogicalName>zoom-out-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\zoom-out-16%402x.png"> <LogicalName>zoom-out-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-out-16~dark.png"> + <LogicalName>zoom-out-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-out-16~dark%402x.png"> + <LogicalName>zoom-out-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-out-16~dark~sel.png"> + <LogicalName>zoom-out-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-out-16~dark~sel%402x.png"> + <LogicalName>zoom-out-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-out-16~sel.png"> + <LogicalName>zoom-out-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\zoom-out-16~sel%402x.png"> + <LogicalName>zoom-out-16~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\spinner-14-1.png"> <LogicalName>spinner-14-1.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\spinner-14-1%402x.png"> <LogicalName>spinner-14-1@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-1~dark.png"> + <LogicalName>spinner-14-1~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-1~dark%402x.png"> + <LogicalName>spinner-14-1~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-1~dark~sel.png"> + <LogicalName>spinner-14-1~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-1~dark~sel%402x.png"> + <LogicalName>spinner-14-1~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-1~sel.png"> + <LogicalName>spinner-14-1~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-1~sel%402x.png"> + <LogicalName>spinner-14-1~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\spinner-14-2.png"> <LogicalName>spinner-14-2.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\spinner-14-2%402x.png"> <LogicalName>spinner-14-2@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-2~dark.png"> + <LogicalName>spinner-14-2~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-2~dark%402x.png"> + <LogicalName>spinner-14-2~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-2~dark~sel.png"> + <LogicalName>spinner-14-2~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-2~dark~sel%402x.png"> + <LogicalName>spinner-14-2~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-2~sel.png"> + <LogicalName>spinner-14-2~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-2~sel%402x.png"> + <LogicalName>spinner-14-2~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\spinner-14-3.png"> <LogicalName>spinner-14-3.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\spinner-14-3%402x.png"> <LogicalName>spinner-14-3@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-3~dark.png"> + <LogicalName>spinner-14-3~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-3~dark%402x.png"> + <LogicalName>spinner-14-3~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-3~dark~sel.png"> + <LogicalName>spinner-14-3~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-3~dark~sel%402x.png"> + <LogicalName>spinner-14-3~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-3~sel.png"> + <LogicalName>spinner-14-3~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-3~sel%402x.png"> + <LogicalName>spinner-14-3~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\spinner-14-4.png"> <LogicalName>spinner-14-4.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\spinner-14-4%402x.png"> <LogicalName>spinner-14-4@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-4~dark.png"> + <LogicalName>spinner-14-4~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-4~dark%402x.png"> + <LogicalName>spinner-14-4~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-4~dark~sel.png"> + <LogicalName>spinner-14-4~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-4~dark~sel%402x.png"> + <LogicalName>spinner-14-4~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-4~sel.png"> + <LogicalName>spinner-14-4~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-4~sel%402x.png"> + <LogicalName>spinner-14-4~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\spinner-14-5.png"> <LogicalName>spinner-14-5.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\spinner-14-5%402x.png"> <LogicalName>spinner-14-5@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-5~dark.png"> + <LogicalName>spinner-14-5~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-5~dark%402x.png"> + <LogicalName>spinner-14-5~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-5~dark~sel.png"> + <LogicalName>spinner-14-5~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-5~dark~sel%402x.png"> + <LogicalName>spinner-14-5~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-5~sel.png"> + <LogicalName>spinner-14-5~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-14-5~sel%402x.png"> + <LogicalName>spinner-14-5~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-1.png"> + <LogicalName>spinner-16-1.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-1%402x.png"> + <LogicalName>spinner-16-1@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-1~dark.png"> + <LogicalName>spinner-16-1~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-1~dark%402x.png"> + <LogicalName>spinner-16-1~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-1~dark~sel.png"> + <LogicalName>spinner-16-1~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-1~dark~sel%402x.png"> + <LogicalName>spinner-16-1~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-1~sel.png"> + <LogicalName>spinner-16-1~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-1~sel%402x.png"> + <LogicalName>spinner-16-1~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-2.png"> + <LogicalName>spinner-16-2.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-2%402x.png"> + <LogicalName>spinner-16-2@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-2~dark.png"> + <LogicalName>spinner-16-2~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-2~dark%402x.png"> + <LogicalName>spinner-16-2~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-2~dark~sel.png"> + <LogicalName>spinner-16-2~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-2~dark~sel%402x.png"> + <LogicalName>spinner-16-2~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-2~sel.png"> + <LogicalName>spinner-16-2~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-2~sel%402x.png"> + <LogicalName>spinner-16-2~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-3.png"> + <LogicalName>spinner-16-3.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-3%402x.png"> + <LogicalName>spinner-16-3@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-3~dark.png"> + <LogicalName>spinner-16-3~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-3~dark%402x.png"> + <LogicalName>spinner-16-3~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-3~dark~sel.png"> + <LogicalName>spinner-16-3~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-3~dark~sel%402x.png"> + <LogicalName>spinner-16-3~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-3~sel.png"> + <LogicalName>spinner-16-3~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-3~sel%402x.png"> + <LogicalName>spinner-16-3~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-4.png"> + <LogicalName>spinner-16-4.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-4%402x.png"> + <LogicalName>spinner-16-4@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-4~dark.png"> + <LogicalName>spinner-16-4~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-4~dark%402x.png"> + <LogicalName>spinner-16-4~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-4~dark~sel.png"> + <LogicalName>spinner-16-4~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-4~dark~sel%402x.png"> + <LogicalName>spinner-16-4~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-4~sel.png"> + <LogicalName>spinner-16-4~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-4~sel%402x.png"> + <LogicalName>spinner-16-4~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-5.png"> + <LogicalName>spinner-16-5.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-5%402x.png"> + <LogicalName>spinner-16-5@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-5~dark.png"> + <LogicalName>spinner-16-5~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-5~dark%402x.png"> + <LogicalName>spinner-16-5~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-5~dark~sel.png"> + <LogicalName>spinner-16-5~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-5~dark~sel%402x.png"> + <LogicalName>spinner-16-5~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-5~sel.png"> + <LogicalName>spinner-16-5~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-16-5~sel%402x.png"> + <LogicalName>spinner-16-5~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\spinner-18-1.png"> <LogicalName>spinner-18-1.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\spinner-18-1%402x.png"> <LogicalName>spinner-18-1@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-1~dark.png"> + <LogicalName>spinner-18-1~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-1~dark%402x.png"> + <LogicalName>spinner-18-1~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-1~dark~sel.png"> + <LogicalName>spinner-18-1~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-1~dark~sel%402x.png"> + <LogicalName>spinner-18-1~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-1~sel.png"> + <LogicalName>spinner-18-1~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-1~sel%402x.png"> + <LogicalName>spinner-18-1~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\spinner-18-2.png"> <LogicalName>spinner-18-2.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\spinner-18-2%402x.png"> <LogicalName>spinner-18-2@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-2~dark.png"> + <LogicalName>spinner-18-2~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-2~dark%402x.png"> + <LogicalName>spinner-18-2~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-2~dark~sel.png"> + <LogicalName>spinner-18-2~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-2~dark~sel%402x.png"> + <LogicalName>spinner-18-2~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-2~sel.png"> + <LogicalName>spinner-18-2~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-2~sel%402x.png"> + <LogicalName>spinner-18-2~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\spinner-18-3.png"> <LogicalName>spinner-18-3.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\spinner-18-3%402x.png"> <LogicalName>spinner-18-3@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-3~dark.png"> + <LogicalName>spinner-18-3~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-3~dark%402x.png"> + <LogicalName>spinner-18-3~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-3~dark~sel.png"> + <LogicalName>spinner-18-3~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-3~dark~sel%402x.png"> + <LogicalName>spinner-18-3~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-3~sel.png"> + <LogicalName>spinner-18-3~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-3~sel%402x.png"> + <LogicalName>spinner-18-3~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\spinner-18-4.png"> <LogicalName>spinner-18-4.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\spinner-18-4%402x.png"> <LogicalName>spinner-18-4@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-4~dark.png"> + <LogicalName>spinner-18-4~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-4~dark%402x.png"> + <LogicalName>spinner-18-4~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-4~dark~sel.png"> + <LogicalName>spinner-18-4~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-4~dark~sel%402x.png"> + <LogicalName>spinner-18-4~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-4~sel.png"> + <LogicalName>spinner-18-4~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-4~sel%402x.png"> + <LogicalName>spinner-18-4~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\spinner-18-5.png"> <LogicalName>spinner-18-5.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\spinner-18-5%402x.png"> <LogicalName>spinner-18-5@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-5~dark.png"> + <LogicalName>spinner-18-5~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-5~dark%402x.png"> + <LogicalName>spinner-18-5~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-5~dark~sel.png"> + <LogicalName>spinner-18-5~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-5~dark~sel%402x.png"> + <LogicalName>spinner-18-5~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-5~sel.png"> + <LogicalName>spinner-18-5~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\spinner-18-5~sel%402x.png"> + <LogicalName>spinner-18-5~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\bug-16.png"> + <LogicalName>bug-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\bug-16%402x.png"> + <LogicalName>bug-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\bug-16~dark.png"> + <LogicalName>bug-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\bug-16~dark%402x.png"> + <LogicalName>bug-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\catchpoint-16.png"> <LogicalName>catchpoint-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\catchpoint-16%402x.png"> <LogicalName>catchpoint-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-16~dark.png"> + <LogicalName>catchpoint-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-16~dark%402x.png"> + <LogicalName>catchpoint-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-16~disabled.png"> + <LogicalName>catchpoint-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-16~disabled%402x.png"> + <LogicalName>catchpoint-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-16~dark~disabled.png"> + <LogicalName>catchpoint-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-16~dark~disabled%402x.png"> + <LogicalName>catchpoint-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\catchpoint-disabled-16.png"> <LogicalName>catchpoint-disabled-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\catchpoint-disabled-16%402x.png"> <LogicalName>catchpoint-disabled-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\project-status-information-16.png"> - <LogicalName>project-status-information-16.png</LogicalName> + <EmbeddedResource Include="icons\catchpoint-disabled-16~dark.png"> + <LogicalName>catchpoint-disabled-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\catchpoint-disabled-16~dark%402x.png"> + <LogicalName>catchpoint-disabled-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\project-status-information-16%402x.png"> - <LogicalName>project-status-information-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\catchpoint-disabled-16~disabled.png"> + <LogicalName>catchpoint-disabled-16~disabled.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\project-status-warning-16.png"> - <LogicalName>project-status-warning-16.png</LogicalName> + <EmbeddedResource Include="icons\catchpoint-disabled-16~disabled%402x.png"> + <LogicalName>catchpoint-disabled-16~disabled@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\project-status-warning-16%402x.png"> - <LogicalName>project-status-warning-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\catchpoint-disabled-16~dark~disabled.png"> + <LogicalName>catchpoint-disabled-16~dark~disabled.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\project-status-error-16.png"> - <LogicalName>project-status-error-16.png</LogicalName> + <EmbeddedResource Include="icons\catchpoint-disabled-16~dark~disabled%402x.png"> + <LogicalName>catchpoint-disabled-16~dark~disabled@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\project-status-error-16%402x.png"> - <LogicalName>project-status-error-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\platform-android-16.png"> + <LogicalName>platform-android-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\platform-android-16%402x.png"> - <LogicalName>platform-android-light-16@2x.png</LogicalName> + <LogicalName>platform-android-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-android-16~dark.png"> + <LogicalName>platform-android-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-android-16~dark%402x.png"> + <LogicalName>platform-android-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-android-16~sel.png"> + <LogicalName>platform-android-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-android-16~sel%402x.png"> + <LogicalName>platform-android-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-android-16~dark~sel.png"> + <LogicalName>platform-android-16~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\platform-cross-platform-16.png"> - <LogicalName>platform-cross-platform-light-16.png</LogicalName> + <EmbeddedResource Include="icons\platform-android-16~dark~sel%402x.png"> + <LogicalName>platform-android-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\platform-cross-platform-16%402x.png"> - <LogicalName>platform-cross-platform-light-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\platform-crossplatform-16.png"> + <LogicalName>platform-crossplatform-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-crossplatform-16%402x.png"> + <LogicalName>platform-crossplatform-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-crossplatform-16~dark.png"> + <LogicalName>platform-crossplatform-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-crossplatform-16~dark%402x.png"> + <LogicalName>platform-crossplatform-16~dark@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\platform-ios-16.png"> - <LogicalName>platform-ios-light-16.png</LogicalName> + <LogicalName>platform-ios-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\platform-ios-16%402x.png"> - <LogicalName>platform-ios-light-16@2x.png</LogicalName> + <LogicalName>platform-ios-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-ios-16~dark.png"> + <LogicalName>platform-ios-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-ios-16~dark%402x.png"> + <LogicalName>platform-ios-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-ios-16~sel.png"> + <LogicalName>platform-ios-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-ios-16~sel%402x.png"> + <LogicalName>platform-ios-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-ios-16~dark~sel.png"> + <LogicalName>platform-ios-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-ios-16~dark~sel%402x.png"> + <LogicalName>platform-ios-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\platform-mac-16.png"> - <LogicalName>platform-mac-light-16.png</LogicalName> + <LogicalName>platform-mac-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\platform-mac-16%402x.png"> - <LogicalName>platform-mac-light-16@2x.png</LogicalName> + <LogicalName>platform-mac-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-mac-16~dark.png"> + <LogicalName>platform-mac-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-mac-16~dark%402x.png"> + <LogicalName>platform-mac-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-mac-16~sel.png"> + <LogicalName>platform-mac-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-mac-16~sel%402x.png"> + <LogicalName>platform-mac-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-mac-16~dark~sel.png"> + <LogicalName>platform-mac-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-mac-16~dark~sel%402x.png"> + <LogicalName>platform-mac-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\platform-other-16.png"> - <LogicalName>platform-other-light-16.png</LogicalName> + <LogicalName>platform-other-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\platform-other-16%402x.png"> - <LogicalName>platform-other-light-16@2x.png</LogicalName> + <LogicalName>platform-other-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\platform-android-16.png"> - <LogicalName>platform-android-light-16.png</LogicalName> + <EmbeddedResource Include="icons\platform-other-16~dark.png"> + <LogicalName>platform-other-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-other-16~dark%402x.png"> + <LogicalName>platform-other-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-other-16~sel.png"> + <LogicalName>platform-other-16~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="templates\images\generic-project.png"> - <LogicalName>generic-project.png</LogicalName> + <EmbeddedResource Include="icons\platform-other-16~sel%402x.png"> + <LogicalName>platform-other-16~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="templates\images\generic-project%402x.png"> - <LogicalName>generic-project@2x.png</LogicalName> + <EmbeddedResource Include="icons\platform-other-16~dark~sel.png"> + <LogicalName>platform-other-16~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="templates\images\blank-solution.png"> - <LogicalName>blank-solution.png</LogicalName> + <EmbeddedResource Include="icons\platform-other-16~dark~sel%402x.png"> + <LogicalName>platform-other-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="templates\images\blank-solution%402x.png"> - <LogicalName>blank-solution@2x.png</LogicalName> + <EmbeddedResource Include="templates\images\project.png"> + <LogicalName>project.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\project%402x.png"> + <LogicalName>project@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\project~dark.png"> + <LogicalName>project~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\project~dark%402x.png"> + <LogicalName>project~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\solution.png"> + <LogicalName>solution.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\solution%402x.png"> + <LogicalName>solution@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\solution~dark.png"> + <LogicalName>solution~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\solution~dark%402x.png"> + <LogicalName>solution~dark@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="templates\images\console-project.png"> <LogicalName>console-project.png</LogicalName> @@ -1863,36 +5655,72 @@ <EmbeddedResource Include="templates\images\console-project%402x.png"> <LogicalName>console-project@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="templates\images\console-project~dark.png"> + <LogicalName>console-project~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\console-project~dark%402x.png"> + <LogicalName>console-project~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="templates\images\library-project.png"> <LogicalName>library-project.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="templates\images\library-project%402x.png"> <LogicalName>library-project@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="templates\images\library-project~dark.png"> + <LogicalName>library-project~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\library-project~dark%402x.png"> + <LogicalName>library-project~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="templates\images\pcl-project.png"> <LogicalName>pcl-project.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="templates\images\pcl-project%402x.png"> <LogicalName>pcl-project@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="templates\images\pcl-project~dark.png"> + <LogicalName>pcl-project~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\pcl-project~dark%402x.png"> + <LogicalName>pcl-project~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="templates\images\shared-project.png"> <LogicalName>shared-project.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="templates\images\shared-project%402x.png"> <LogicalName>shared-project@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="templates\images\shared-project~dark.png"> + <LogicalName>shared-project~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\shared-project~dark%402x.png"> + <LogicalName>shared-project~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="templates\images\workspace.png"> <LogicalName>workspace.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="templates\images\workspace%402x.png"> <LogicalName>workspace@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="templates\images\workspace~dark.png"> + <LogicalName>workspace~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\workspace~dark%402x.png"> + <LogicalName>workspace~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="templates\images\gtk2-project.png"> <LogicalName>gtk2-project.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="templates\images\gtk2-project%402x.png"> <LogicalName>gtk2-project@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="templates\images\gtk2-project~dark.png"> + <LogicalName>gtk2-project~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="templates\images\gtk2-project~dark%402x.png"> + <LogicalName>gtk2-project~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\preview-active-16.png"> <LogicalName>preview-active-16.png</LogicalName> </EmbeddedResource> @@ -1905,125 +5733,227 @@ <EmbeddedResource Include="icons\preview-hover-16%402x.png"> <LogicalName>preview-hover-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\preview-normal-16.png"> - <LogicalName>preview-normal-16.png</LogicalName> + <EmbeddedResource Include="icons\preview-hover-16~dark.png"> + <LogicalName>preview-hover-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\preview-normal-16%402x.png"> - <LogicalName>preview-normal-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\preview-hover-16~dark%402x.png"> + <LogicalName>preview-hover-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\preview-selected-16.png"> - <LogicalName>preview-selected-16.png</LogicalName> + <EmbeddedResource Include="icons\preview-hover-16~dark~sel.png"> + <LogicalName>preview-hover-16~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\preview-selected-16%402x.png"> - <LogicalName>preview-selected-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\preview-hover-16~dark~sel%402x.png"> + <LogicalName>preview-hover-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-normal-1-16.png"> - <LogicalName>spinner-normal-1-16.png</LogicalName> + <EmbeddedResource Include="icons\preview-hover-16~sel.png"> + <LogicalName>preview-hover-16~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-normal-1-16%402x.png"> - <LogicalName>spinner-normal-1-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\preview-hover-16~sel%402x.png"> + <LogicalName>preview-hover-16~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-normal-2-16.png"> - <LogicalName>spinner-normal-2-16.png</LogicalName> + <EmbeddedResource Include="icons\preview-16.png"> + <LogicalName>preview-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-normal-2-16%402x.png"> - <LogicalName>spinner-normal-2-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\preview-16%402x.png"> + <LogicalName>preview-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-normal-3-16.png"> - <LogicalName>spinner-normal-3-16.png</LogicalName> + <EmbeddedResource Include="icons\preview-16~dark.png"> + <LogicalName>preview-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-normal-3-16%402x.png"> - <LogicalName>spinner-normal-3-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\preview-16~dark%402x.png"> + <LogicalName>preview-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-normal-4-16.png"> - <LogicalName>spinner-normal-4-16.png</LogicalName> + <EmbeddedResource Include="icons\preview-16~dark~sel.png"> + <LogicalName>preview-16~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-normal-4-16%402x.png"> - <LogicalName>spinner-normal-4-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\preview-16~dark~sel%402x.png"> + <LogicalName>preview-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-normal-5-16.png"> - <LogicalName>spinner-normal-5-16.png</LogicalName> + <EmbeddedResource Include="icons\preview-16~sel.png"> + <LogicalName>preview-16~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-normal-5-16%402x.png"> - <LogicalName>spinner-normal-5-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\preview-16~sel%402x.png"> + <LogicalName>preview-16~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-selected-1-16.png"> - <LogicalName>spinner-selected-1-16.png</LogicalName> + <EmbeddedResource Include="icons\project-nunit-overlay-32.png"> + <LogicalName>project-nunit-overlay-32.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-selected-1-16%402x.png"> - <LogicalName>spinner-selected-1-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\project-nunit-overlay-32%402x.png"> + <LogicalName>project-nunit-overlay-32@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-selected-2-16.png"> - <LogicalName>spinner-selected-2-16.png</LogicalName> + <EmbeddedResource Include="icons\project-nunit-overlay-32~dark.png"> + <LogicalName>project-nunit-overlay-32~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-selected-2-16%402x.png"> - <LogicalName>spinner-selected-2-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\project-nunit-overlay-32~dark%402x.png"> + <LogicalName>project-nunit-overlay-32~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-selected-3-16.png"> - <LogicalName>spinner-selected-3-16.png</LogicalName> + <EmbeddedResource Include="icons\project-nunit-overlay-32~sel.png"> + <LogicalName>project-nunit-overlay-32~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-selected-3-16%402x.png"> - <LogicalName>spinner-selected-3-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\project-nunit-overlay-32~sel%402x.png"> + <LogicalName>project-nunit-overlay-32~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-selected-4-16.png"> - <LogicalName>spinner-selected-4-16.png</LogicalName> + <EmbeddedResource Include="icons\project-nunit-overlay-32~dark~sel.png"> + <LogicalName>project-nunit-overlay-32~dark~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-selected-4-16%402x.png"> - <LogicalName>spinner-selected-4-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\project-nunit-overlay-32~dark~sel%402x.png"> + <LogicalName>project-nunit-overlay-32~dark~sel@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-selected-5-16.png"> - <LogicalName>spinner-selected-5-16.png</LogicalName> + <EmbeddedResource Include="icons\status-instrumentation-16.png"> + <LogicalName>status-instrumentation-16.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\spinner-selected-5-16%402x.png"> - <LogicalName>spinner-selected-5-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\status-instrumentation-16%402x.png"> + <LogicalName>status-instrumentation-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\done-24.png"> - <LogicalName>done-24.png</LogicalName> + <EmbeddedResource Include="icons\status-instrumentation-16~dark.png"> + <LogicalName>status-instrumentation-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\done-24%402x.png"> - <LogicalName>done-24@2x.png</LogicalName> + <EmbeddedResource Include="icons\status-instrumentation-16~dark%402x.png"> + <LogicalName>status-instrumentation-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\done-32.png"> - <LogicalName>done-32.png</LogicalName> + <EmbeddedResource Include="resources\tabbar-back.9.png"> + <LogicalName>tabbar-back.9.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\done-32%402x.png"> - <LogicalName>done-32@2x.png</LogicalName> + <EmbeddedResource Include="resources\tabbar-back%402x.9.png"> + <LogicalName>tabbar-back@2x.9.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\done-48.png"> - <LogicalName>done-48.png</LogicalName> + <EmbeddedResource Include="resources\tabbar-back~dark.9.png"> + <LogicalName>tabbar-back~dark.9.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\done-48%402x.png"> - <LogicalName>done-48@2x.png</LogicalName> + <EmbeddedResource Include="resources\tabbar-back~dark%402x.9.png"> + <LogicalName>tabbar-back~dark@2x.9.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\project-nunit-overlay-32.png"> - <LogicalName>project-nunit-overlay-32.png</LogicalName> + <EmbeddedResource Include="resources\padbar-back.9.png"> + <LogicalName>padbar-back.9.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\project-nunit-overlay-32%402x.png"> - <LogicalName>project-nunit-overlay-32@2x.png</LogicalName> + <EmbeddedResource Include="resources\padbar-back%402x.9.png"> + <LogicalName>padbar-back@2x.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\padbar-back~dark.9.png"> + <LogicalName>padbar-back~dark.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\padbar-back~dark%402x.9.png"> + <LogicalName>padbar-back~dark@2x.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\tabbar-inactive.9.png"> + <LogicalName>tabbar-inactive.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\tabbar-inactive%402x.9.png"> + <LogicalName>tabbar-inactive@2x.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\tabbar-inactive~dark.9.png"> + <LogicalName>tabbar-inactive~dark.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\tabbar-inactive~dark%402x.9.png"> + <LogicalName>tabbar-inactive~dark@2x.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\padbar-inactive.9.png"> + <LogicalName>padbar-inactive.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\padbar-inactive%402x.9.png"> + <LogicalName>padbar-inactive@2x.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\padbar-inactive~dark.9.png"> + <LogicalName>padbar-inactive~dark.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\padbar-inactive~dark%402x.9.png"> + <LogicalName>padbar-inactive~dark@2x.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\tabbar-active.9.png"> + <LogicalName>tabbar-active.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\tabbar-active%402x.9.png"> + <LogicalName>tabbar-active@2x.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\tabbar-active~dark.9.png"> + <LogicalName>tabbar-active~dark.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\tabbar-active~dark%402x.9.png"> + <LogicalName>tabbar-active~dark@2x.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\padbar-active.9.png"> + <LogicalName>padbar-active.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\padbar-active%402x.9.png"> + <LogicalName>padbar-active@2x.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\padbar-active~dark.9.png"> + <LogicalName>padbar-active~dark.9.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="resources\padbar-active~dark%402x.9.png"> + <LogicalName>padbar-active~dark@2x.9.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\platform-tvos-16.png"> - <LogicalName>platform-tvos-light-16.png</LogicalName> + <LogicalName>platform-tvos-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\platform-tvos-16%402x.png"> - <LogicalName>platform-tvos-light-16@2x.png</LogicalName> + <LogicalName>platform-tvos-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-tvos-16~dark.png"> + <LogicalName>platform-tvos-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-tvos-16~dark%402x.png"> + <LogicalName>platform-tvos-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-tvos-16~sel.png"> + <LogicalName>platform-tvos-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-tvos-16~sel%402x.png"> + <LogicalName>platform-tvos-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-tvos-16~dark~sel.png"> + <LogicalName>platform-tvos-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-tvos-16~dark~sel%402x.png"> + <LogicalName>platform-tvos-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\platform-watchos-16.png"> - <LogicalName>platform-watchos-light-16.png</LogicalName> + <LogicalName>platform-watchos-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\platform-watchos-16%402x.png"> - <LogicalName>platform-watchos-light-16@2x.png</LogicalName> + <LogicalName>platform-watchos-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-watchos-16~dark.png"> + <LogicalName>platform-watchos-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-watchos-16~dark%402x.png"> + <LogicalName>platform-watchos-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-watchos-16~sel.png"> + <LogicalName>platform-watchos-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-watchos-16~sel%402x.png"> + <LogicalName>platform-watchos-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-watchos-16~dark~sel.png"> + <LogicalName>platform-watchos-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\platform-watchos-16~dark~sel%402x.png"> + <LogicalName>platform-watchos-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-assets-16.png"> + <LogicalName>folder-assets-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-assets-16%402x.png"> + <LogicalName>folder-assets-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-assets-mac-16.png"> - <LogicalName>folder-assets-mac-16.png</LogicalName> + <EmbeddedResource Include="icons\folder-assets-16~dark.png"> + <LogicalName>folder-assets-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-assets-mac-16%402x.png"> - <LogicalName>folder-assets-mac-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\folder-assets-16~dark%402x.png"> + <LogicalName>folder-assets-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-assets-win-16.png"> - <LogicalName>folder-assets-win-16.png</LogicalName> + <EmbeddedResource Include="icons\folder-assets-16~sel.png"> + <LogicalName>folder-assets-16~sel.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\folder-assets-win-16%402x.png"> - <LogicalName>folder-assets-win-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\folder-assets-16~sel%402x.png"> + <LogicalName>folder-assets-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-assets-16~dark~sel.png"> + <LogicalName>folder-assets-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\folder-assets-16~dark~sel%402x.png"> + <LogicalName>folder-assets-16~dark~sel@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\parser-16.png"> <LogicalName>parser-16.png</LogicalName> @@ -2031,24 +5961,60 @@ <EmbeddedResource Include="icons\parser-16%402x.png"> <LogicalName>parser-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\parser-16~dark.png"> + <LogicalName>parser-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\parser-16~dark%402x.png"> + <LogicalName>parser-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\parser-16~sel.png"> + <LogicalName>parser-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\parser-16~sel%402x.png"> + <LogicalName>parser-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\parser-16~dark~sel.png"> + <LogicalName>parser-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\parser-16~dark~sel%402x.png"> + <LogicalName>parser-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-building-1-16.png"> <LogicalName>status-building-1-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-building-1-16%402x.png"> <LogicalName>status-building-1-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-building-1-16~dark.png"> + <LogicalName>status-building-1-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-building-1-16~dark%402x.png"> + <LogicalName>status-building-1-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-building-2-16.png"> <LogicalName>status-building-2-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-building-2-16%402x.png"> <LogicalName>status-building-2-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-building-2-16~dark.png"> + <LogicalName>status-building-2-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-building-2-16~dark%402x.png"> + <LogicalName>status-building-2-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-building-3-16.png"> <LogicalName>status-building-3-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-building-3-16%402x.png"> <LogicalName>status-building-3-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-building-3-16~dark.png"> + <LogicalName>status-building-3-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-building-3-16~dark%402x.png"> + <LogicalName>status-building-3-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-building-4-16.png"> <LogicalName>status-building-4-16.png</LogicalName> </EmbeddedResource> @@ -2061,311 +6027,635 @@ <EmbeddedResource Include="icons\status-building-5-16%402x.png"> <LogicalName>status-building-5-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-building-5-16~dark.png"> + <LogicalName>status-building-5-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-building-5-16~dark%402x.png"> + <LogicalName>status-building-5-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-connecting-1-16.png"> <LogicalName>status-connecting-1-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-connecting-1-16%402x.png"> <LogicalName>status-connecting-1-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-connecting-1-16~dark.png"> + <LogicalName>status-connecting-1-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-connecting-1-16~dark%402x.png"> + <LogicalName>status-connecting-1-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-connecting-2-16.png"> <LogicalName>status-connecting-2-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-connecting-2-16%402x.png"> <LogicalName>status-connecting-2-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-connecting-2-16~dark.png"> + <LogicalName>status-connecting-2-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-connecting-2-16~dark%402x.png"> + <LogicalName>status-connecting-2-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-connecting-3-16.png"> <LogicalName>status-connecting-3-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-connecting-3-16%402x.png"> <LogicalName>status-connecting-3-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-connecting-3-16~dark.png"> + <LogicalName>status-connecting-3-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-connecting-3-16~dark%402x.png"> + <LogicalName>status-connecting-3-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-connecting-4-16.png"> <LogicalName>status-connecting-4-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-connecting-4-16%402x.png"> <LogicalName>status-connecting-4-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-connecting-4-16~dark.png"> + <LogicalName>status-connecting-4-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-connecting-4-16~dark%402x.png"> + <LogicalName>status-connecting-4-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-connecting-5-16.png"> <LogicalName>status-connecting-5-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-connecting-5-16%402x.png"> <LogicalName>status-connecting-5-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-connecting-5-16~dark.png"> + <LogicalName>status-connecting-5-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-connecting-5-16~dark%402x.png"> + <LogicalName>status-connecting-5-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-connecting-6-16.png"> <LogicalName>status-connecting-6-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-connecting-6-16%402x.png"> <LogicalName>status-connecting-6-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-connecting-6-16~dark.png"> + <LogicalName>status-connecting-6-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-connecting-6-16~dark%402x.png"> + <LogicalName>status-connecting-6-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-paused-16.png"> <LogicalName>status-updates-paused-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-paused-16%402x.png"> <LogicalName>status-updates-paused-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-paused-16~dark.png"> + <LogicalName>status-updates-paused-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-paused-16~dark%402x.png"> + <LogicalName>status-updates-paused-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-ready-16.png"> <LogicalName>status-updates-ready-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-ready-16%402x.png"> <LogicalName>status-updates-ready-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-ready-16~dark.png"> + <LogicalName>status-updates-ready-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-ready-16~dark%402x.png"> + <LogicalName>status-updates-ready-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-error-16.png"> <LogicalName>status-error-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-error-16%402x.png"> <LogicalName>status-error-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-error-16~dark.png"> + <LogicalName>status-error-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-error-16~dark%402x.png"> + <LogicalName>status-error-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-error-count-16.png"> <LogicalName>status-error-count-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-error-count-16%402x.png"> <LogicalName>status-error-count-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-error-count-16~dark.png"> + <LogicalName>status-error-count-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-error-count-16~dark%402x.png"> + <LogicalName>status-error-count-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-opening-1-16.png"> <LogicalName>status-opening-1-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-opening-1-16%402x.png"> <LogicalName>status-opening-1-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-opening-1-16~dark.png"> + <LogicalName>status-opening-1-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-opening-1-16~dark%402x.png"> + <LogicalName>status-opening-1-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-opening-2-16.png"> <LogicalName>status-opening-2-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-opening-2-16%402x.png"> <LogicalName>status-opening-2-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-opening-2-16~dark.png"> + <LogicalName>status-opening-2-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-opening-2-16~dark%402x.png"> + <LogicalName>status-opening-2-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-opening-3-16.png"> <LogicalName>status-opening-3-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-opening-3-16%402x.png"> <LogicalName>status-opening-3-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-opening-3-16~dark.png"> + <LogicalName>status-opening-3-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-opening-3-16~dark%402x.png"> + <LogicalName>status-opening-3-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-opening-4-16.png"> <LogicalName>status-opening-4-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-opening-4-16%402x.png"> <LogicalName>status-opening-4-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-opening-4-16~dark.png"> + <LogicalName>status-opening-4-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-opening-4-16~dark%402x.png"> + <LogicalName>status-opening-4-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-opening-5-16.png"> <LogicalName>status-opening-5-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-opening-5-16%402x.png"> <LogicalName>status-opening-5-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-opening-5-16~dark.png"> + <LogicalName>status-opening-5-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-opening-5-16~dark%402x.png"> + <LogicalName>status-opening-5-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-opening-6-16.png"> <LogicalName>status-opening-6-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-opening-6-16%402x.png"> <LogicalName>status-opening-6-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-opening-6-16~dark.png"> + <LogicalName>status-opening-6-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-opening-6-16~dark%402x.png"> + <LogicalName>status-opening-6-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-parsing-16.png"> <LogicalName>status-parsing-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-parsing-16%402x.png"> <LogicalName>status-parsing-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-parsing-16~dark.png"> + <LogicalName>status-parsing-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-parsing-16~dark%402x.png"> + <LogicalName>status-parsing-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-pulling-1-16.png"> <LogicalName>status-pulling-1-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-pulling-1-16%402x.png"> <LogicalName>status-pulling-1-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-pulling-1-16~dark.png"> + <LogicalName>status-pulling-1-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-pulling-1-16~dark%402x.png"> + <LogicalName>status-pulling-1-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-pulling-2-16.png"> <LogicalName>status-pulling-2-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-pulling-2-16%402x.png"> <LogicalName>status-pulling-2-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-pulling-2-16~dark.png"> + <LogicalName>status-pulling-2-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-pulling-2-16~dark%402x.png"> + <LogicalName>status-pulling-2-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-pulling-3-16.png"> <LogicalName>status-pulling-3-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-pulling-3-16%402x.png"> <LogicalName>status-pulling-3-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-pulling-3-16~dark.png"> + <LogicalName>status-pulling-3-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-pulling-3-16~dark%402x.png"> + <LogicalName>status-pulling-3-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-pulling-4-16.png"> <LogicalName>status-pulling-4-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-pulling-4-16%402x.png"> <LogicalName>status-pulling-4-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-pulling-4-16~dark.png"> + <LogicalName>status-pulling-4-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-pulling-4-16~dark%402x.png"> + <LogicalName>status-pulling-4-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-pulling-5-16.png"> <LogicalName>status-pulling-5-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-pulling-5-16%402x.png"> <LogicalName>status-pulling-5-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-pulling-5-16~dark.png"> + <LogicalName>status-pulling-5-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-pulling-5-16~dark%402x.png"> + <LogicalName>status-pulling-5-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-pulling-6-16.png"> <LogicalName>status-pulling-6-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-pulling-6-16%402x.png"> <LogicalName>status-pulling-6-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-pulling-6-16~dark.png"> + <LogicalName>status-pulling-6-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-pulling-6-16~dark%402x.png"> + <LogicalName>status-pulling-6-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-pushing-1-16.png"> <LogicalName>status-pushing-1-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-pushing-1-16%402x.png"> <LogicalName>status-pushing-1-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-pushing-1-16~dark.png"> + <LogicalName>status-pushing-1-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-pushing-1-16~dark%402x.png"> + <LogicalName>status-pushing-1-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-pushing-2-16.png"> <LogicalName>status-pushing-2-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-pushing-2-16%402x.png"> <LogicalName>status-pushing-2-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-pushing-2-16~dark.png"> + <LogicalName>status-pushing-2-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-pushing-2-16~dark%402x.png"> + <LogicalName>status-pushing-2-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-pushing-3-16.png"> <LogicalName>status-pushing-3-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-pushing-3-16%402x.png"> <LogicalName>status-pushing-3-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-pushing-3-16~dark.png"> + <LogicalName>status-pushing-3-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-pushing-3-16~dark%402x.png"> + <LogicalName>status-pushing-3-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-pushing-4-16.png"> <LogicalName>status-pushing-4-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-pushing-4-16%402x.png"> <LogicalName>status-pushing-4-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-pushing-4-16~dark.png"> + <LogicalName>status-pushing-4-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-pushing-4-16~dark%402x.png"> + <LogicalName>status-pushing-4-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-pushing-5-16.png"> <LogicalName>status-pushing-5-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-pushing-5-16%402x.png"> <LogicalName>status-pushing-5-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-pushing-5-16~dark.png"> + <LogicalName>status-pushing-5-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-pushing-5-16~dark%402x.png"> + <LogicalName>status-pushing-5-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-pushing-6-16.png"> <LogicalName>status-pushing-6-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-pushing-6-16%402x.png"> <LogicalName>status-pushing-6-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-pushing-6-16~dark.png"> + <LogicalName>status-pushing-6-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-pushing-6-16~dark%402x.png"> + <LogicalName>status-pushing-6-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-ready-16.png"> <LogicalName>status-ready-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-ready-16%402x.png"> <LogicalName>status-ready-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-ready-16~dark.png"> + <LogicalName>status-ready-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-ready-16~dark%402x.png"> + <LogicalName>status-ready-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-searching-1-16.png"> <LogicalName>status-searching-1-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-searching-1-16%402x.png"> <LogicalName>status-searching-1-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-searching-1-16~dark.png"> + <LogicalName>status-searching-1-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-searching-1-16~dark%402x.png"> + <LogicalName>status-searching-1-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-searching-2-16.png"> <LogicalName>status-searching-2-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-searching-2-16%402x.png"> <LogicalName>status-searching-2-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-searching-2-16~dark.png"> + <LogicalName>status-searching-2-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-searching-2-16~dark%402x.png"> + <LogicalName>status-searching-2-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-searching-3-16.png"> <LogicalName>status-searching-3-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-searching-3-16%402x.png"> <LogicalName>status-searching-3-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-searching-3-16~dark.png"> + <LogicalName>status-searching-3-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-searching-3-16~dark%402x.png"> + <LogicalName>status-searching-3-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-searching-4-16.png"> <LogicalName>status-searching-4-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-searching-4-16%402x.png"> <LogicalName>status-searching-4-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-searching-4-16~dark.png"> + <LogicalName>status-searching-4-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-searching-4-16~dark%402x.png"> + <LogicalName>status-searching-4-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-success-16.png"> <LogicalName>status-success-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-success-16%402x.png"> <LogicalName>status-success-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-success-16~dark.png"> + <LogicalName>status-success-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-success-16~dark%402x.png"> + <LogicalName>status-success-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-downloading-1-16.png"> <LogicalName>status-updates-downloading-1-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-downloading-1-16%402x.png"> <LogicalName>status-updates-downloading-1-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-downloading-1-16~dark.png"> + <LogicalName>status-updates-downloading-1-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-downloading-1-16~dark%402x.png"> + <LogicalName>status-updates-downloading-1-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-downloading-2-16.png"> <LogicalName>status-updates-downloading-2-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-downloading-2-16%402x.png"> <LogicalName>status-updates-downloading-2-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-downloading-2-16~dark.png"> + <LogicalName>status-updates-downloading-2-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-downloading-2-16~dark%402x.png"> + <LogicalName>status-updates-downloading-2-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-downloading-3-16.png"> <LogicalName>status-updates-downloading-3-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-downloading-3-16%402x.png"> <LogicalName>status-updates-downloading-3-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-downloading-3-16~dark.png"> + <LogicalName>status-updates-downloading-3-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-downloading-3-16~dark%402x.png"> + <LogicalName>status-updates-downloading-3-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-downloading-4-16.png"> <LogicalName>status-updates-downloading-4-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-downloading-4-16%402x.png"> <LogicalName>status-updates-downloading-4-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-downloading-4-16~dark.png"> + <LogicalName>status-updates-downloading-4-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-downloading-4-16~dark%402x.png"> + <LogicalName>status-updates-downloading-4-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-downloading-5-16.png"> <LogicalName>status-updates-downloading-5-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-downloading-5-16%402x.png"> <LogicalName>status-updates-downloading-5-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-downloading-5-16~dark.png"> + <LogicalName>status-updates-downloading-5-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-downloading-5-16~dark%402x.png"> + <LogicalName>status-updates-downloading-5-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-downloading-6-16.png"> <LogicalName>status-updates-downloading-6-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-updates-downloading-6-16%402x.png"> <LogicalName>status-updates-downloading-6-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-downloading-6-16~dark.png"> + <LogicalName>status-updates-downloading-6-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-updates-downloading-6-16~dark%402x.png"> + <LogicalName>status-updates-downloading-6-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-waiting-1-16.png"> <LogicalName>status-waiting-1-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-waiting-1-16%402x.png"> <LogicalName>status-waiting-1-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-waiting-1-16~dark.png"> + <LogicalName>status-waiting-1-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-waiting-1-16~dark%402x.png"> + <LogicalName>status-waiting-1-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-waiting-2-16.png"> <LogicalName>status-waiting-2-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-waiting-2-16%402x.png"> <LogicalName>status-waiting-2-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-waiting-2-16~dark.png"> + <LogicalName>status-waiting-2-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-waiting-2-16~dark%402x.png"> + <LogicalName>status-waiting-2-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-waiting-3-16.png"> <LogicalName>status-waiting-3-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-waiting-3-16%402x.png"> <LogicalName>status-waiting-3-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-waiting-3-16~dark.png"> + <LogicalName>status-waiting-3-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-waiting-3-16~dark%402x.png"> + <LogicalName>status-waiting-3-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-waiting-4-16.png"> <LogicalName>status-waiting-4-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-waiting-4-16%402x.png"> <LogicalName>status-waiting-4-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-waiting-4-16~dark.png"> + <LogicalName>status-waiting-4-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-waiting-4-16~dark%402x.png"> + <LogicalName>status-waiting-4-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-waiting-5-16.png"> <LogicalName>status-waiting-5-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-waiting-5-16%402x.png"> <LogicalName>status-waiting-5-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-waiting-5-16~dark.png"> + <LogicalName>status-waiting-5-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-waiting-5-16~dark%402x.png"> + <LogicalName>status-waiting-5-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-warning-16.png"> <LogicalName>status-warning-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-warning-16%402x.png"> <LogicalName>status-warning-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\status-warning-16~dark.png"> + <LogicalName>status-warning-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\status-warning-16~dark%402x.png"> + <LogicalName>status-warning-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\status-warning-count-16.png"> <LogicalName>status-warning-count-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\status-warning-count-16%402x.png"> <LogicalName>status-warning-count-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\zoom-100-16.png"> - <LogicalName>zoom-100-16.png</LogicalName> + <EmbeddedResource Include="icons\status-warning-count-16~dark.png"> + <LogicalName>status-warning-count-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\zoom-100-16%402x.png"> - <LogicalName>zoom-100-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\status-warning-count-16~dark%402x.png"> + <LogicalName>status-warning-count-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\unindent-16.png"> + <LogicalName>unindent-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\unindent-16%402x.png"> <LogicalName>unindent-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\unindent-16.png"> - <LogicalName>unindent-16.png</LogicalName> + <EmbeddedResource Include="icons\unindent-16~dark.png"> + <LogicalName>unindent-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\unindent-16~dark%402x.png"> + <LogicalName>unindent-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\about-md-16.png"> + <LogicalName>about-md-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\about-md-16%402x.png"> + <LogicalName>about-md-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\about-md-16~dark.png"> + <LogicalName>about-md-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\about-16.png"> - <LogicalName>about-16.png</LogicalName> + <EmbeddedResource Include="icons\about-md-16~dark%402x.png"> + <LogicalName>about-md-16~dark@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\about-16%402x.png"> - <LogicalName>about-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\about-md-16~disabled.png"> + <LogicalName>about-md-16~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\about-md-16~disabled%402x.png"> + <LogicalName>about-md-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\about-md-16~dark~disabled.png"> + <LogicalName>about-md-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\about-md-16~dark~disabled%402x.png"> + <LogicalName>about-md-16~dark~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\plugin-menu-16.png"> + <LogicalName>plugin-menu-16.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\plugin-menu-16%402x.png"> + <LogicalName>plugin-menu-16@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\plugin-menu-16~dark.png"> + <LogicalName>plugin-menu-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\plugin-menu-16~dark%402x.png"> + <LogicalName>plugin-menu-16~dark@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\cut-16.png"> <LogicalName>cut-16.png</LogicalName> @@ -2373,29 +6663,71 @@ <EmbeddedResource Include="icons\cut-16%402x.png"> <LogicalName>cut-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\cut-16~dark.png"> + <LogicalName>cut-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\cut-16~dark%402x.png"> + <LogicalName>cut-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\fullscreen-16.png"> <LogicalName>fullscreen-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\fullscreen-16%402x.png"> <LogicalName>fullscreen-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\fullscreen-16~dark.png"> + <LogicalName>fullscreen-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\fullscreen-16~dark%402x.png"> + <LogicalName>fullscreen-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\fullscreen-16~sel.png"> + <LogicalName>fullscreen-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\fullscreen-16~sel%402x.png"> + <LogicalName>fullscreen-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\fullscreen-16~dark~sel.png"> + <LogicalName>fullscreen-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\fullscreen-16~dark~sel%402x.png"> + <LogicalName>fullscreen-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\help-16.png"> <LogicalName>help-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\help-16%402x.png"> <LogicalName>help-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\help-16~dark.png"> + <LogicalName>help-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\help-16~dark%402x.png"> + <LogicalName>help-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\help-16~sel.png"> + <LogicalName>help-16~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\help-16~sel%402x.png"> + <LogicalName>help-16~sel@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\help-16~dark~sel.png"> + <LogicalName>help-16~dark~sel.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\help-16~dark~sel%402x.png"> + <LogicalName>help-16~dark~sel@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\indent-16.png"> <LogicalName>indent-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\indent-16%402x.png"> <LogicalName>indent-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\page-setup-16.png"> - <LogicalName>page-setup-16.png</LogicalName> + <EmbeddedResource Include="icons\indent-16~dark.png"> + <LogicalName>indent-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\page-setup-16%402x.png"> - <LogicalName>page-setup-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\indent-16~dark%402x.png"> + <LogicalName>indent-16~dark@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\paste-16.png"> <LogicalName>paste-16.png</LogicalName> @@ -2403,23 +6735,23 @@ <EmbeddedResource Include="icons\paste-16%402x.png"> <LogicalName>paste-16@2x.png</LogicalName> </EmbeddedResource> + <EmbeddedResource Include="icons\paste-16~dark.png"> + <LogicalName>paste-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\paste-16~dark%402x.png"> + <LogicalName>paste-16~dark@2x.png</LogicalName> + </EmbeddedResource> <EmbeddedResource Include="icons\print-16.png"> <LogicalName>print-16.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\print-16%402x.png"> <LogicalName>print-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\print-preview-16.png"> - <LogicalName>print-preview-16.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\print-preview-16%402x.png"> - <LogicalName>print-preview-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\print-16~dark.png"> + <LogicalName>print-16~dark.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\quit-16.png"> - <LogicalName>quit-16.png</LogicalName> - </EmbeddedResource> - <EmbeddedResource Include="icons\quit-16%402x.png"> - <LogicalName>quit-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\print-16~dark%402x.png"> + <LogicalName>print-16~dark@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="icons\redo-16.png"> <LogicalName>redo-16.png</LogicalName> @@ -2427,11 +6759,23 @@ <EmbeddedResource Include="icons\redo-16%402x.png"> <LogicalName>redo-16@2x.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\revert-to-saved-16.png"> - <LogicalName>revert-to-saved-16.png</LogicalName> + <EmbeddedResource Include="icons\redo-16~dark.png"> + <LogicalName>redo-16~dark.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\redo-16~dark%402x.png"> + <LogicalName>redo-16~dark@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\redo-16~disabled.png"> + <LogicalName>redo-16~disabled.png</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="icons\revert-to-saved-16%402x.png"> - <LogicalName>revert-to-saved-16@2x.png</LogicalName> + <EmbeddedResource Include="icons\redo-16~disabled%402x.png"> + <LogicalName>redo-16~disabled@2x.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\redo-16~dark~disabled.png"> + <LogicalName>redo-16~dark~disabled.png</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="icons\redo-16~dark~disabled%402x.png"> + <LogicalName>redo-16~dark~disabled@2x.png</LogicalName> </EmbeddedResource> <EmbeddedResource Include="templates\AppManifest.xft.xml"> <LogicalName>AppManifest.xft.xml</LogicalName> @@ -3384,6 +7728,9 @@ <Compile Include="MonoDevelop.Components\Windows\GtkWin32Interop.cs" /> <Compile Include="MonoDevelop.Ide.Editor.Extension\AbstractNavigationExtension.cs" /> <Compile Include="MonoDevelop.Components\FileChooserAction.cs" /> + <Compile Include="MonoDevelop.Components\IdeDialog.cs" /> + <Compile Include="MonoDevelop.Components\IdeWindow.cs" /> + <Compile Include="MonoDevelop.Components\IdeTheme.cs" /> <Compile Include="MonoDevelop.Ide.Templates\PropertyDescriptionTemplate.cs" /> <Compile Include="MonoDevelop.Ide.Templates\FileTemplateTagsModifier.cs" /> <Compile Include="MonoDevelop.Ide.Templates\CombinedTagModel.cs" /> @@ -3447,19 +7794,19 @@ <Folder Include="MonoDevelop.Components\Windows\" /> </ItemGroup> <ItemGroup> - <Content Include="gtkrc.win32"> + <Content Include="gtkrc"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> - <Content Include="gtkrc.mac"> + <Content Include="gtkrc.win32"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> - <Content Include="gtkrc.mac-yosemite"> + <Content Include="gtkrc.win32-dark"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> - <Content Include="gtkrc"> + <Content Include="gtkrc.mac"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> - <Content Include="gtkrc.win32-vista"> + <Content Include="gtkrc.mac-dark"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> </ItemGroup> diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs index b5ce18e2e7..3a49d07326 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs @@ -454,7 +454,7 @@ namespace MonoDevelop.Ide { if (IdeApp.Preferences.EnableInstrumentation) { if (instrumentationStatusIcon == null) { - instrumentationStatusIcon = IdeApp.Workbench.StatusBar.ShowStatusIcon (ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.Information)); + instrumentationStatusIcon = IdeApp.Workbench.StatusBar.ShowStatusIcon (ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.StatusInstrumentation)); instrumentationStatusIcon.ToolTip = "Instrumentation service enabled"; instrumentationStatusIcon.Clicked += delegate { InstrumentationService.StartMonitor (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs index 6655e96a7e..ffff05ccad 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdePreferences.cs @@ -111,7 +111,7 @@ namespace MonoDevelop.Ide } public readonly ConfigurationProperty<string> UserInterfaceLanguage = Runtime.Preferences.UserInterfaceLanguage; - public readonly ConfigurationProperty<string> UserInterfaceTheme = ConfigurationProperty.Create ("MonoDevelop.Ide.UserInterfaceTheme", ""); + public readonly ConfigurationProperty<string> UserInterfaceTheme = ConfigurationProperty.Create ("MonoDevelop.Ide.UserInterfaceTheme", Platform.IsLinux ? "" : "Light"); public readonly ConfigurationProperty<WorkbenchCompactness> WorkbenchCompactness = ConfigurationProperty.Create ("MonoDevelop.Ide.WorkbenchCompactness", MonoDevelop.Ide.WorkbenchCompactness.Normal); public readonly ConfigurationProperty<bool> LoadPrevSolutionOnStartup = ConfigurationProperty.Create ("SharpDevelop.LoadPrevProjectOnStartup", false); public readonly ConfigurationProperty<bool> CreateFileBackupCopies = ConfigurationProperty.Create ("SharpDevelop.CreateBackupCopy", false); @@ -141,16 +141,66 @@ namespace MonoDevelop.Ide public readonly ConfigurationProperty<bool> AddOpeningOnly = ConfigurationProperty.Create ("AddOpeningOnly", false); public readonly ConfigurationProperty<bool> FilterCompletionListByEditorBrowsable = ConfigurationProperty.Create ("FilterCompletionListByEditorBrowsable", true); public readonly ConfigurationProperty<bool> IncludeEditorBrowsableAdvancedMembers = ConfigurationProperty.Create ("IncludeEditorBrowsableAdvancedMembers", true); - public readonly ConfigurationProperty<int> CompletionListRows = ConfigurationProperty.Create ("CompletionListRows", 7); + + public Skin UserInterfaceSkin { + get { return MonoDevelop.Components.IdeTheme.UserInterfaceSkin; } + } + + internal static readonly string DefaultLightColorScheme = "Default"; + internal static readonly string DefaultDarkColorScheme = "Oblivion"; public readonly ConfigurationProperty<bool> EnableSourceAnalysis = ConfigurationProperty.Create ("MonoDevelop.AnalysisCore.AnalysisEnabled_V2", true); public readonly ConfigurationProperty<bool> EnableUnitTestEditorIntegration = ConfigurationProperty.Create ("Testing.EnableUnitTestEditorIntegration", false); - public readonly ConfigurationProperty<string> ColorScheme = ConfigurationProperty.Create ("ColorScheme", "Default"); + public readonly SkinConfigurationProperty<string> ColorScheme = new SkinConfigurationProperty<string> ("ColorScheme", DefaultLightColorScheme, DefaultDarkColorScheme); + + public readonly SkinConfigurationProperty<string> UserTasksHighPrioColor = new SkinConfigurationProperty<string> ("Monodevelop.UserTasksHighPrioColor", "", "rgb:ffff/ffff/ffff"); + public readonly SkinConfigurationProperty<string> UserTasksNormalPrioColor = new SkinConfigurationProperty<string> ("Monodevelop.UserTasksNormalPrioColor", "", "rgb:ffff/ffff/ffff"); + public readonly SkinConfigurationProperty<string> UserTasksLowPrioColor = new SkinConfigurationProperty<string> ("Monodevelop.UserTasksLowPrioColor", "", "rgb:ffff/ffff/ffff"); + + public class SkinConfigurationProperty<T>: ConfigurationProperty<T> + { + readonly ConfigurationProperty<T> lightConfiguration; + readonly ConfigurationProperty<T> darkConfiguration; + + public SkinConfigurationProperty (string propertyName, T defaultLightValue, T defaultDarkValue, string oldName = null) + { + lightConfiguration = ConfigurationProperty.Create<T> (propertyName, defaultLightValue, oldName); + darkConfiguration = ConfigurationProperty.Create<T> (propertyName + "-Dark", defaultDarkValue, oldName + "-Dark"); + + lightConfiguration.Changed += (s,e) => OnChanged (); + darkConfiguration.Changed += (s,e) => OnChanged (); + MonoDevelop.Ide.Gui.Styles.Changed += (sender, e) => OnChanged (); + } + + public T ValueForSkin (Skin skin) + { + switch (skin) { + case Skin.Light: + return lightConfiguration.Value; + case Skin.Dark: + return darkConfiguration.Value; + default: + throw new InvalidOperationException (); + } + } + + protected override T OnGetValue () + { + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) + return lightConfiguration; + else + return darkConfiguration; + } - public readonly ConfigurationProperty<string> UserTasksHighPrioColor = ConfigurationProperty.Create ("Monodevelop.UserTasksHighPrioColor", ""); - public readonly ConfigurationProperty<string> UserTasksNormalPrioColor = ConfigurationProperty.Create ("Monodevelop.UserTasksNormalPrioColor", ""); - public readonly ConfigurationProperty<string> UserTasksLowPrioColor = ConfigurationProperty.Create ("Monodevelop.UserTasksLowPrioColor", ""); + protected override bool OnSetValue (T value) + { + if (IdeApp.Preferences.UserInterfaceSkin == Skin.Light) + return lightConfiguration.Set (value); + else + return darkConfiguration.Set (value); + } + } } public enum BeforeCompileAction { @@ -158,5 +208,11 @@ namespace MonoDevelop.Ide SaveAllFiles, PromptForSave, } + + public enum Skin + { + Light, + Dark + } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs index cbc7591401..d0dda71c02 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs @@ -62,7 +62,6 @@ namespace MonoDevelop.Ide Socket listen_socket = null; ArrayList errorsList = new ArrayList (); bool initialized; - internal static string DefaultTheme; static readonly int ipcBasePort = 40000; Task<int> IApplication.Run (string[] args) @@ -105,10 +104,8 @@ namespace MonoDevelop.Ide LoggingService.LogError ("Error initialising GLib logging.", ex); } - SetupTheme (); - var args = options.RemainingArgs.ToArray (); - Gtk.Application.Init (BrandingService.ApplicationName, ref args); + IdeTheme.InitializeGtk (BrandingService.ApplicationName, ref args); LoggingService.LogInfo ("Using GTK+ {0}", IdeVersionInfo.GetGtkVersion ()); @@ -118,6 +115,7 @@ namespace MonoDevelop.Ide Xwt.Application.InitializeAsGuest (Xwt.ToolkitType.Gtk); Xwt.Toolkit.CurrentEngine.RegisterBackend<IExtendedTitleBarWindowBackend,GtkExtendedTitleBarWindowBackend> (); Xwt.Toolkit.CurrentEngine.RegisterBackend<IExtendedTitleBarDialogBackend,GtkExtendedTitleBarDialogBackend> (); + IdeTheme.SetupXwtTheme (); //default to Windows IME on Windows if (Platform.IsWindows && GtkWorkarounds.GtkMinorVersion >= 16) { @@ -160,13 +158,7 @@ namespace MonoDevelop.Ide Counters.Initialization.Trace ("Initializing theme"); - DefaultTheme = Gtk.Settings.Default.ThemeName; - string theme = IdeApp.Preferences.UserInterfaceTheme; - if (string.IsNullOrEmpty (theme)) - theme = DefaultTheme; - ValidateGtkTheme (ref theme); - if (theme != DefaultTheme) - Gtk.Settings.Default.ThemeName = theme; + IdeTheme.SetupGtkTheme (); ProgressMonitor monitor = new MonoDevelop.Core.ProgressMonitoring.ConsoleProgressMonitor (); @@ -335,31 +327,6 @@ namespace MonoDevelop.Ide lockupCheckThread.Start (); } - void SetupTheme () - { - // Use the bundled gtkrc only if the Xamarin theme is installed - if (File.Exists (Path.Combine (Gtk.Rc.ModuleDir, "libxamarin.so")) || File.Exists (Path.Combine (Gtk.Rc.ModuleDir, "libxamarin.dll"))) { - var gtkrc = "gtkrc"; - if (Platform.IsWindows) { - gtkrc += ".win32"; - var osv = Environment.OSVersion.Version; - if (osv.Major == 6 && osv.Minor < 1) - gtkrc += "-vista"; - } else if (Platform.IsMac) { - gtkrc += ".mac"; - - var osv = Platform.OSVersion; - if (osv.Major == 10 && osv.Minor >= 10) { - gtkrc += "-yosemite"; - } - } - - var gtkrcf = PropertyService.EntryAssemblyPath.Combine (gtkrc); - LoggingService.LogInfo ("GTK: Using gtkrc from {0}", gtkrcf); - Environment.SetEnvironmentVariable ("GTK2_RC_FILES", gtkrcf); - } - } - [System.Runtime.InteropServices.DllImport("kernel32.dll", CharSet = System.Runtime.InteropServices.CharSet.Unicode, SetLastError = true)] [return: System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.Bool)] static extern bool SetDllDirectory (string lpPathName); @@ -497,47 +464,6 @@ namespace MonoDevelop.Ide IdeApp.Workbench.Present (); return false; } - - internal static string[] gtkThemeFallbacks = new string[] { - "Xamarin",// the best! - "Gilouche", // SUSE - "Mint-X", // MINT - "Radiance", // Ubuntu 'light' theme (MD looks better with the light theme in 4.0 - if that changes switch this one) - "Clearlooks" // GTK theme - }; - - static void ValidateGtkTheme (ref string theme) - { - if (!MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.IsBadGtkTheme (theme)) - return; - - var themes = MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.InstalledThemes; - - string fallback = gtkThemeFallbacks - .Select (fb => themes.FirstOrDefault (t => string.Compare (fb, t, StringComparison.OrdinalIgnoreCase) == 0)) - .FirstOrDefault (t => t != null); - - string message = "Theme Not Supported"; - - string detail; - if (themes.Count > 0) { - detail = - "Your system is using the '{0}' GTK+ theme, which is known to be very unstable. MonoDevelop will " + - "now switch to an alternate GTK+ theme.\n\n" + - "This message will continue to be shown at startup until you set a alternate GTK+ theme as your " + - "default in the GTK+ Theme Selector or MonoDevelop Preferences."; - } else { - detail = - "Your system is using the '{0}' GTK+ theme, which is known to be very unstable, and no other GTK+ " + - "themes appear to be installed. Please install another GTK+ theme.\n\n" + - "This message will continue to be shown at startup until you install a different GTK+ theme and " + - "set it as your default in the GTK+ Theme Selector or MonoDevelop Preferences."; - } - - MessageService.GenericAlert (Gtk.Stock.DialogWarning, message, BrandingService.BrandApplicationName (detail), AlertButton.Ok); - - theme = fallback ?? themes.FirstOrDefault () ?? theme; - } void CheckFileWatcher () { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ImageService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ImageService.cs index 83c08b3d37..1e7d4eb26d 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ImageService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ImageService.cs @@ -59,6 +59,7 @@ namespace MonoDevelop.Ide static List<RuntimeAddin> addins = new List<RuntimeAddin> (); static Dictionary<string, string> composedIcons = new Dictionary<string, string> (); + static Dictionary<RuntimeAddin, CustomImageLoader> imageLoaders = new Dictionary<RuntimeAddin, CustomImageLoader> (); // Dictionary of extension nodes by stock icon id. It holds nodes that have not yet been loaded static Dictionary<string, List<StockIconCodon>> iconStock = new Dictionary<string, List<StockIconCodon>> (); @@ -89,16 +90,11 @@ namespace MonoDevelop.Ide w = h = -1; iconSizes[i].Width = w; iconSizes[i].Height = h; - }
- if (Platform.IsWindows) {
- iconSizes[(int)Gtk.IconSize.Menu].Width = 16;
- iconSizes[(int)Gtk.IconSize.Menu].Height = 16;
} - - // Preload icons defined in MD.Ide. Ensures that the gtk icon overrides are available. - var current = AddinManager.CurrentAddin; - foreach (var id in AddinManager.GetExtensionNodes (IconsExtensionPath).OfType<StockIconCodon> ().Where (c => c.Addin == current).Select (c => c.StockId).Distinct ()) - EnsureStockIconIsLoaded (id); + if (Platform.IsWindows) { + iconSizes[(int)Gtk.IconSize.Menu].Width = 16; + iconSizes[(int)Gtk.IconSize.Menu].Height = 16; + } } static Xwt.Drawing.Image LoadStockIcon (StockIconCodon iconCodon, bool forceWildcard) @@ -109,92 +105,37 @@ namespace MonoDevelop.Ide static Xwt.Drawing.Image LoadStockIcon (RuntimeAddin addin, string stockId, string resource, string imageFile, string iconId, Gtk.IconSize iconSize, string animation, bool forceWildcard) { try { - Gdk.Pixbuf pixbuf = null, pixbuf2x = null; AnimatedIcon animatedIcon = null; Func<Stream[]> imageLoader = null; + Xwt.Drawing.Image img = null; + if (!string.IsNullOrEmpty (resource) || !string.IsNullOrEmpty (imageFile)) { - // using the stream directly produces a gdk warning. - byte[] buffer; if (resource != null) { - imageLoader = delegate { - var stream = addin.GetResource (resource); - var stream2x = addin.GetResource2x (resource); - if (stream2x == null) - return new [] { stream }; - else - return new [] { stream, stream2x }; - }; + CustomImageLoader loader; + if (!imageLoaders.TryGetValue (addin, out loader)) + loader = imageLoaders [addin] = new CustomImageLoader (addin); + img = Xwt.Drawing.Image.FromCustomLoader (loader, resource); } else { - imageLoader = delegate { - var file = addin.GetFilePath (imageFile); - var stream = File.OpenRead (file); - Stream stream2x = null; - var file2x = Path.Combine (Path.GetDirectoryName (file), Path.GetFileNameWithoutExtension (file) + "@2x" + Path.GetExtension (file)); - if (File.Exists (file2x)) - stream2x = File.OpenRead (file2x); - else { - file2x = file + "@2x"; - if (File.Exists (file2x)) - stream2x = File.OpenRead (file2x); - } - if (stream2x == null) - return new [] { stream }; - else - return new [] { stream, stream2x }; - }; - } - var streams = imageLoader (); - - var st = streams[0]; - var st2x = streams.Length > 1 ? streams[1] : null; - - using (st) { - if (st == null || st.Length < 0) { - LoggingService.LogError ("Did not find resource '{0}' in addin '{1}' for icon '{2}'", - resource, addin.Id, stockId); - return null; - } - buffer = new byte [st.Length]; - st.Read (buffer, 0, (int)st.Length); + img = Xwt.Drawing.Image.FromFile (addin.GetFilePath (imageFile)); } - pixbuf = new Gdk.Pixbuf (buffer); - - using (st2x) { - if (st2x != null && st2x.Length >= 0) { - buffer = new byte [st2x.Length]; - st2x.Read (buffer, 0, (int)st2x.Length); - pixbuf2x = new Gdk.Pixbuf (buffer); - } - } - } else if (!string.IsNullOrEmpty (iconId)) { var id = GetStockIdForImageSpec (addin, iconId, iconSize); - pixbuf = GetPixbuf (id, iconSize); - pixbuf2x = Get2xIconVariant (pixbuf); + img = GetIcon (id, iconSize); // This may be an animation, get it animationFactory.TryGetValue (id, out animatedIcon); } else if (!string.IsNullOrEmpty (animation)) { string id = GetStockIdForImageSpec (addin, "animation:" + animation, iconSize); - pixbuf = GetPixbuf (id, iconSize); + img = GetIcon (id, iconSize); // This *should* be an animation animationFactory.TryGetValue (id, out animatedIcon); } - Gtk.IconSize size = forceWildcard? Gtk.IconSize.Invalid : iconSize; - if (pixbuf != null) - AddToIconFactory (stockId, pixbuf, pixbuf2x, size); - if (animatedIcon != null) AddToAnimatedIconFactory (stockId, animatedIcon); - var img = Xwt.Toolkit.CurrentEngine.WrapImage (pixbuf); - if (pixbuf2x != null) { - var img2x = Xwt.Toolkit.CurrentEngine.WrapImage (pixbuf2x); - img = Xwt.Drawing.Image.CreateMultiResolutionImage (new [] { img, img2x }); - } if (imageLoader != null) img.SetStreamSource (imageLoader); @@ -225,6 +166,8 @@ namespace MonoDevelop.Ide public static Xwt.Drawing.Image GetIcon (string name, Gtk.IconSize size = IconSize.Menu) { + // Converts an image spec into a real stock icon id + name = GetStockIdForImageSpec (name, size); return GetIcon (name).WithSize (size); } @@ -243,7 +186,7 @@ namespace MonoDevelop.Ide if (string.IsNullOrEmpty (name)) { LoggingService.LogWarning ("Empty icon requested. Stack Trace: " + Environment.NewLine + Environment.StackTrace); - icons [name] = img = CreateColorIcon ("#FF0000"); + icons [name] = img = GetMissingIcon (); return img; } @@ -259,15 +202,41 @@ namespace MonoDevelop.Ide if (icons.TryGetValue (name, out img)) return img; - Gtk.IconSet iconset = Gtk.IconFactory.LookupDefault (name); - if (iconset == null && !Gtk.IconTheme.Default.HasIcon (name) && generateDefaultIcon) { + if (generateDefaultIcon) { LoggingService.LogWarning ("Unknown icon: " + name); - return CreateColorIcon ("#FF0000FF"); + return GetMissingIcon (); } return icons [name] = img = Xwt.Toolkit.CurrentEngine.WrapImage (name); } + static Xwt.Drawing.Image GetMissingIcon () + { + Xwt.Drawing.Image img; + if (icons.TryGetValue ("gtk-missing-image", out img)) + return img; + + EnsureStockIconIsLoaded ("gtk-missing-image"); + + // Try again since it may have already been registered + if (icons.TryGetValue ("gtk-missing-image", out img)) + return img; + + // fallback to default Gtk icon if the Gtk theme has one + if (Gtk.IconTheme.Default.HasIcon ("gtk-missing-image")) + return icons ["gtk-missing-image"] = img = GtkUtil.GtkToolkit.WrapImage ("gtk-missing-image"); + + // we should never end up here, log an error + LoggingService.LogError ("Loading gtk-missing-image icon failed. Stack Trace: " + Environment.NewLine + Environment.StackTrace); + return CreateColorIcon ("#FF00FF"); + } + + public static Xwt.Drawing.Image GetImageResource (this RuntimeAddin addin, string resource) + { + var loader = new CustomImageLoader (addin); + return Xwt.Drawing.Image.FromCustomLoader (loader, resource); + } + static Gdk.Pixbuf GetPixbuf (string name, Gtk.IconSize size, bool generateDefaultIcon = true) { if (string.IsNullOrEmpty (name)) { @@ -294,7 +263,7 @@ namespace MonoDevelop.Ide if (iconset != null) return iconset.RenderIcon (Gtk.Widget.DefaultStyle, Gtk.TextDirection.Ltr, Gtk.StateType.Normal, size, null, null); - if (Gtk.IconTheme.Default.HasIcon (stockid)) {
+ if (Gtk.IconTheme.Default.HasIcon (stockid)) { int h = iconSizes[(int)size].Height; Gdk.Pixbuf result = Gtk.IconTheme.Default.LoadIcon (stockid, h, (Gtk.IconLookupFlags)0); return result; @@ -478,45 +447,6 @@ namespace MonoDevelop.Ide return GetStockIdForImageSpec (addin, filename, iconSize); } - static void AddToIconFactory (string stockId, Gdk.Pixbuf pixbuf, Gdk.Pixbuf pixbuf2x, Gtk.IconSize iconSize) - { - Gtk.IconSet iconSet = iconFactory.Lookup (stockId); - if (iconSet == null) { - iconSet = new Gtk.IconSet (); - iconFactory.Add (stockId, iconSet); - } - - Gtk.IconSource source = new Gtk.IconSource (); - Gtk.IconSource source2x = null; - - if (Platform.IsWindows) { - var pixel_scale = GtkWorkarounds.GetPixelScale (); - source.Pixbuf = pixbuf.ScaleSimple ((int)(pixbuf.Width * pixel_scale), (int)(pixbuf.Height * pixel_scale), Gdk.InterpType.Bilinear); - } else { - source.Pixbuf = pixbuf; - } - - source.Size = iconSize; - source.SizeWildcarded = iconSize == Gtk.IconSize.Invalid; - - if (pixbuf2x != null) { - if (GtkWorkarounds.SetSourceScale (source, 1)) { - GtkWorkarounds.SetSourceScaleWildcarded (source, false); - source2x = new Gtk.IconSource (); - source2x.Pixbuf = pixbuf2x; - source2x.Size = iconSize; - source2x.SizeWildcarded = iconSize == Gtk.IconSize.Invalid; - GtkWorkarounds.SetSourceScale (source2x, 2); - GtkWorkarounds.SetSourceScaleWildcarded (source2x, false); - } - } else { - GtkWorkarounds.SetSourceScaleWildcarded (source, true); - } - - iconSet.AddSource (source); - if (source2x != null) - iconSet.AddSource (source2x); - } static void AddToAnimatedIconFactory (string stockId, AnimatedIcon aicon) { @@ -567,9 +497,9 @@ namespace MonoDevelop.Ide string stockId = "__asm" + addinId + "__" + id + "__" + size; if (!hash.ContainsKey (stockId)) { var aicon = new AnimatedIcon (addin, id, size); - AddToIconFactory (stockId, aicon.FirstFrame.WithSize (size).ToPixbuf (), null, size); AddToAnimatedIconFactory (stockId, aicon); hash[stockId] = stockId; + icons [stockId] = aicon.FirstFrame; } return stockId; } @@ -592,6 +522,7 @@ namespace MonoDevelop.Ide if (composedIcons.TryGetValue (id, out cid)) return cid; System.Collections.ICollection col = size == Gtk.IconSize.Invalid ? Enum.GetValues (typeof(Gtk.IconSize)) : new object [] { size }; + var frames = new List<Xwt.Drawing.Image> (); foreach (Gtk.IconSize sz in col) { if (sz == Gtk.IconSize.Invalid) continue; @@ -617,9 +548,10 @@ namespace MonoDevelop.Ide ib.Context.DrawImage (px, 0, 0); } - if (icon != null) - AddToIconFactory (id, ib.ToBitmap ().ToPixbuf (), ib.ToBitmap (2f).WithSize (icon.Width * 2, icon.Height * 2).ToPixbuf (), sz); + frames.Add (ib.ToVectorImage ()); } + + icons [id] = Xwt.Drawing.Image.CreateMultiSizeIcon (frames); composedIcons[id] = id; return id; } @@ -631,6 +563,8 @@ namespace MonoDevelop.Ide static string GetStockIdForImageSpec (RuntimeAddin addin, string filename, Gtk.IconSize size) { + if (String.IsNullOrEmpty (filename)) + return String.Empty; if (filename.IndexOf ('|') == -1) return PrivGetStockId (addin, filename, size); @@ -894,4 +828,30 @@ namespace MonoDevelop.Ide } } + class CustomImageLoader : Xwt.Drawing.IImageLoader + { + RuntimeAddin addin; + Dictionary<System.Reflection.Assembly, string []> resources = new Dictionary<System.Reflection.Assembly, string[]> (); + + public CustomImageLoader (RuntimeAddin addin) + { + this.addin = addin; + } + + public IEnumerable<string> GetAlternativeFiles (string fileName, string baseName, string ext) + { + var r = addin.GetResourceInfo (fileName); + + string [] resourceList; + if (!resources.TryGetValue (r.ReferencedAssembly, out resourceList)) + resourceList = resources [r.ReferencedAssembly] = r.ReferencedAssembly.GetManifestResourceNames (); + + return resourceList; + } + + public Stream LoadImage (string fileName) + { + return addin.GetResource (fileName, true); + } + } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs index 917e1115a6..07674bf7cc 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs @@ -364,6 +364,7 @@ namespace MonoDevelop.Ide dialog.TransientFor = parent; dialog.DestroyWithParent = true; + MonoDevelop.Components.IdeTheme.ApplyTheme (dialog); if (dialog.Title == null) dialog.Title = BrandingService.ApplicationName; diff --git a/main/src/core/MonoDevelop.Ide/branding/AboutImage.png b/main/src/core/MonoDevelop.Ide/branding/AboutImage.png Binary files differindex 6b2c38e02b..810e565711 100644 --- a/main/src/core/MonoDevelop.Ide/branding/AboutImage.png +++ b/main/src/core/MonoDevelop.Ide/branding/AboutImage.png diff --git a/main/src/core/MonoDevelop.Ide/branding/AboutImage@2x.png b/main/src/core/MonoDevelop.Ide/branding/AboutImage@2x.png Binary files differnew file mode 100644 index 0000000000..8e1bbaa0c3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/branding/AboutImage@2x.png diff --git a/main/src/core/MonoDevelop.Ide/branding/WelcomePage_Logo.png b/main/src/core/MonoDevelop.Ide/branding/WelcomePage_Logo.png Binary files differdeleted file mode 100644 index e81972cabd..0000000000 --- a/main/src/core/MonoDevelop.Ide/branding/WelcomePage_Logo.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/branding/WelcomePage_TopBorderRepeat.png b/main/src/core/MonoDevelop.Ide/branding/WelcomePage_TopBorderRepeat.png Binary files differdeleted file mode 100644 index c4ab9643fe..0000000000 --- a/main/src/core/MonoDevelop.Ide/branding/WelcomePage_TopBorderRepeat.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/branding/welcome-logo.png b/main/src/core/MonoDevelop.Ide/branding/welcome-logo.png Binary files differnew file mode 100644 index 0000000000..664e7914b3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/branding/welcome-logo.png diff --git a/main/src/core/MonoDevelop.Ide/branding/welcome-logo@2x.png b/main/src/core/MonoDevelop.Ide/branding/welcome-logo@2x.png Binary files differnew file mode 100644 index 0000000000..747f04de74 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/branding/welcome-logo@2x.png diff --git a/main/src/core/MonoDevelop.Ide/branding/welcome-tile.png b/main/src/core/MonoDevelop.Ide/branding/welcome-tile.png Binary files differnew file mode 100644 index 0000000000..87d09ad51b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/branding/welcome-tile.png diff --git a/main/src/core/MonoDevelop.Ide/branding/welcome-tile@2x.png b/main/src/core/MonoDevelop.Ide/branding/welcome-tile@2x.png Binary files differnew file mode 100644 index 0000000000..b8ba2822d4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/branding/welcome-tile@2x.png diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Execution.MonoExecutionParametersWidget.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Execution.MonoExecutionParametersWidget.cs index 9d8eaea9db..6105f1f393 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Execution.MonoExecutionParametersWidget.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Execution.MonoExecutionParametersWidget.cs @@ -39,14 +39,11 @@ namespace MonoDevelop.Ide.Execution this.buttonReset.Name = "buttonReset"; this.buttonReset.UseUnderline = true; this.buttonReset.Label = global::Mono.Unix.Catalog.GetString ("Clear All Options"); - global::Gtk.Image w2 = new global::Gtk.Image (); - w2.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-clear", global::Gtk.IconSize.Menu); - this.buttonReset.Image = w2; this.vbox4.Add (this.buttonReset); - global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.buttonReset])); - w3.Position = 0; - w3.Expand = false; - w3.Fill = false; + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.buttonReset])); + w2.Position = 0; + w2.Expand = false; + w2.Fill = false; // Container child vbox4.Gtk.Box+BoxChild this.buttonPreview = new global::Gtk.Button (); this.buttonPreview.CanFocus = true; @@ -54,15 +51,15 @@ namespace MonoDevelop.Ide.Execution this.buttonPreview.UseUnderline = true; this.buttonPreview.Label = global::Mono.Unix.Catalog.GetString ("Preview Options"); this.vbox4.Add (this.buttonPreview); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.buttonPreview])); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.buttonPreview])); + w3.Position = 1; + w3.Expand = false; + w3.Fill = false; + this.hbox1.Add (this.vbox4); + global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox4])); w4.Position = 1; w4.Expand = false; w4.Fill = false; - this.hbox1.Add (this.vbox4); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox4])); - w5.Position = 1; - w5.Expand = false; - w5.Fill = false; this.Add (this.hbox1); if ((this.Child != null)) { this.Child.ShowAll (); diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.AddinLoadErrorDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.AddinLoadErrorDialog.cs index b9bb1ac53a..1224f0049f 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.AddinLoadErrorDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.AddinLoadErrorDialog.cs @@ -5,14 +5,23 @@ namespace MonoDevelop.Ide.Gui.Dialogs internal partial class AddinLoadErrorDialog { private global::Gtk.HBox hbox1; - private global::Gtk.Image image1; + + private global::MonoDevelop.Components.ImageView iconError; + private global::Gtk.VBox vbox4; + private global::Gtk.Label label4; + private global::Gtk.ScrolledWindow scrolledwindow1; + private global::Gtk.TreeView errorTree; + private global::Gtk.Label messageLabel; + private global::Gtk.Button noButton; + private global::Gtk.Button yesButton; + private global::Gtk.Button closeButton; protected virtual void Build () @@ -35,13 +44,14 @@ namespace MonoDevelop.Ide.Gui.Dialogs this.hbox1.Spacing = 12; this.hbox1.BorderWidth = ((uint)(6)); // Container child hbox1.Gtk.Box+BoxChild - this.image1 = new global::Gtk.Image (); - this.image1.Name = "image1"; - this.image1.Xalign = 0F; - this.image1.Yalign = 0F; - this.image1.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-error", global::Gtk.IconSize.Dialog); - this.hbox1.Add (this.image1); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.image1])); + this.iconError = new global::MonoDevelop.Components.ImageView (); + this.iconError.Name = "iconError"; + this.iconError.Xalign = 0F; + this.iconError.Yalign = 0F; + this.iconError.IconId = "gtk-dialog-error"; + this.iconError.IconSize = ((global::Gtk.IconSize)(6)); + this.hbox1.Add (this.iconError); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.iconError])); w2.Position = 0; w2.Expand = false; w2.Fill = false; diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.cs index f4fdbc339a..ca122cc984 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.cs @@ -104,14 +104,11 @@ namespace MonoDevelop.Ide.Gui.Dialogs this.newButton.Name = "newButton"; this.newButton.UseUnderline = true; this.newButton.Label = global::Mono.Unix.Catalog.GetString ("Create _Layout"); - global::Gtk.Image w10 = new global::Gtk.Image (); - w10.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", global::Gtk.IconSize.Menu); - this.newButton.Image = w10; this.AddActionWidget (this.newButton, -5); - global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w8 [this.newButton])); - w11.Position = 1; - w11.Expand = false; - w11.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w8 [this.newButton])); + w10.Position = 1; + w10.Expand = false; + w10.Fill = false; if ((this.Child != null)) { this.Child.ShowAll (); } diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.SelectFileFormatDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.SelectFileFormatDialog.cs index d9aca4cf16..6ecb4fa2b4 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.SelectFileFormatDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.SelectFileFormatDialog.cs @@ -5,21 +5,37 @@ namespace MonoDevelop.Ide.Gui.Dialogs partial class SelectFileFormatDialog { private global::Gtk.HBox hbox1; + private global::Gtk.VBox vbox3; - private global::Gtk.Image image146; + + private global::MonoDevelop.Components.ImageView iconWarning; + private global::Gtk.VBox vbox2; + private global::Gtk.Label label1; + private global::Gtk.Label labelMessage; + private global::Gtk.Label labelWarnings; + private global::Gtk.Label label6; + private global::Gtk.Alignment alignment2; + private global::Gtk.Table table1; + private global::Gtk.Alignment alignment3; + private global::Gtk.Label labelCurrentFormat; + private global::Gtk.ComboBox comboNewFormat; + private global::Gtk.Label label3; + private global::Gtk.Label label4; + private global::Gtk.Button buttonCancel; + private global::Gtk.Button buttonOk; protected virtual void Build () @@ -43,11 +59,12 @@ namespace MonoDevelop.Ide.Gui.Dialogs this.vbox3.Name = "vbox3"; this.vbox3.Spacing = 6; // Container child vbox3.Gtk.Box+BoxChild - this.image146 = new global::Gtk.Image (); - this.image146.Name = "image146"; - this.image146.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-warning", global::Gtk.IconSize.Dialog); - this.vbox3.Add (this.image146); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.image146])); + this.iconWarning = new global::MonoDevelop.Components.ImageView (); + this.iconWarning.Name = "iconWarning"; + this.iconWarning.IconId = "gtk-dialog-warning"; + this.iconWarning.IconSize = ((global::Gtk.IconSize)(6)); + this.vbox3.Add (this.iconWarning); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.iconWarning])); w2.Position = 0; w2.Expand = false; w2.Fill = false; diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs index dc7193ad18..18c021446e 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs @@ -5,16 +5,27 @@ namespace MonoDevelop.Ide.Gui.Dialogs internal partial class TipOfTheDayWindow { private global::Gtk.VBox vbox2; + private global::Gtk.VBox vbox3; + private global::Gtk.HBox hbox7; - private global::Gtk.Image image5; + + private global::MonoDevelop.Components.ImageView iconInfo; + private global::Gtk.Label categoryLabel; + private global::Gtk.ScrolledWindow scrolledwindow2; + private global::Gtk.TextView tipTextview; + private global::Gtk.HBox hbox5; + private global::Gtk.CheckButton noshowCheckbutton; + private global::Gtk.HButtonBox hbuttonbox1; + private global::Gtk.Button nextButton; + private global::Gtk.Button closeButton; protected virtual void Build () @@ -39,13 +50,14 @@ namespace MonoDevelop.Ide.Gui.Dialogs this.hbox7.Name = "hbox7"; this.hbox7.Spacing = 5; // Container child hbox7.Gtk.Box+BoxChild - this.image5 = new global::Gtk.Image (); - this.image5.Name = "image5"; - this.image5.Xalign = 0F; - this.image5.Yalign = 0F; - this.image5.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-info", global::Gtk.IconSize.Dialog); - this.hbox7.Add (this.image5); - global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox7 [this.image5])); + this.iconInfo = new global::MonoDevelop.Components.ImageView (); + this.iconInfo.Name = "iconInfo"; + this.iconInfo.Xalign = 0F; + this.iconInfo.Yalign = 0F; + this.iconInfo.IconId = "gtk-dialog-info"; + this.iconInfo.IconSize = ((global::Gtk.IconSize)(6)); + this.hbox7.Add (this.iconInfo); + global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox7 [this.iconInfo])); w1.Position = 0; w1.Expand = false; // Container child hbox7.Gtk.Box+BoxChild @@ -107,13 +119,10 @@ namespace MonoDevelop.Ide.Gui.Dialogs this.nextButton.Name = "nextButton"; this.nextButton.UseUnderline = true; this.nextButton.Label = global::Mono.Unix.Catalog.GetString ("_Next Tip"); - global::Gtk.Image w8 = new global::Gtk.Image (); - w8.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-forward", global::Gtk.IconSize.Button); - this.nextButton.Image = w8; this.hbuttonbox1.Add (this.nextButton); - global::Gtk.ButtonBox.ButtonBoxChild w9 = ((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1 [this.nextButton])); - w9.Expand = false; - w9.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1 [this.nextButton])); + w8.Expand = false; + w8.Fill = false; // Container child hbuttonbox1.Gtk.ButtonBox+ButtonBoxChild this.closeButton = new global::Gtk.Button (); this.closeButton.CanDefault = true; @@ -122,17 +131,17 @@ namespace MonoDevelop.Ide.Gui.Dialogs this.closeButton.UseUnderline = true; this.closeButton.Label = "gtk-close"; this.hbuttonbox1.Add (this.closeButton); - global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1 [this.closeButton])); - w10.Position = 1; - w10.Expand = false; - w10.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w9 = ((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1 [this.closeButton])); + w9.Position = 1; + w9.Expand = false; + w9.Fill = false; this.hbox5.Add (this.hbuttonbox1); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.hbuttonbox1])); - w11.Position = 1; + global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.hbuttonbox1])); + w10.Position = 1; this.vbox2.Add (this.hbox5); - global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox5])); - w12.Position = 1; - w12.Expand = false; + global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox5])); + w11.Position = 1; + w11.Expand = false; this.Add (this.vbox2); if ((this.Child != null)) { this.Child.ShowAll (); diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs index 1f7c68b751..9138732a01 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs @@ -28,7 +28,7 @@ namespace MonoDevelop.Ide.Gui.OptionPanels private global::Gtk.HBox warningBox; - private global::Gtk.Image image3; + private global::MonoDevelop.Components.ImageView imageWarning; private global::Gtk.Label label2; @@ -140,11 +140,12 @@ namespace MonoDevelop.Ide.Gui.OptionPanels this.warningBox.Name = "warningBox"; this.warningBox.Spacing = 6; // Container child warningBox.Gtk.Box+BoxChild - this.image3 = new global::Gtk.Image (); - this.image3.Name = "image3"; - this.image3.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-warning", global::Gtk.IconSize.Menu); - this.warningBox.Add (this.image3); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.warningBox [this.image3])); + this.imageWarning = new global::MonoDevelop.Components.ImageView (); + this.imageWarning.Name = "imageWarning"; + this.imageWarning.IconId = "gtk-dialog-warning"; + this.imageWarning.IconSize = ((global::Gtk.IconSize)(1)); + this.warningBox.Add (this.imageWarning); + global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.warningBox [this.imageWarning])); w8.Position = 0; w8.Expand = false; w8.Fill = false; @@ -231,19 +232,16 @@ namespace MonoDevelop.Ide.Gui.OptionPanels this.updateButton.Name = "updateButton"; this.updateButton.UseUnderline = true; this.updateButton.Label = global::Mono.Unix.Catalog.GetString ("Apply"); - global::Gtk.Image w20 = new global::Gtk.Image (); - w20.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-apply", global::Gtk.IconSize.Button); - this.updateButton.Image = w20; this.hbox.Add (this.updateButton); - global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox [this.updateButton])); - w21.Position = 2; + global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox [this.updateButton])); + w20.Position = 2; + w20.Expand = false; + w20.Fill = false; + this.vbox.Add (this.hbox); + global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox [this.hbox])); + w21.Position = 6; w21.Expand = false; w21.Fill = false; - this.vbox.Add (this.hbox); - global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox [this.hbox])); - w22.Position = 6; - w22.Expand = false; - w22.Fill = false; this.Add (this.vbox); if ((this.Child != null)) { this.Child.ShowAll (); diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.AddExternalFileDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.AddExternalFileDialog.cs index f758b49f47..a492c3442c 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.AddExternalFileDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.AddExternalFileDialog.cs @@ -5,22 +5,39 @@ namespace MonoDevelop.Ide.Projects internal partial class AddExternalFileDialog { private global::Gtk.HBox hbox1; + private global::Gtk.VBox vbox3; - private global::Gtk.Image image23; + + private global::MonoDevelop.Components.ImageView iconQuestion; + private global::Gtk.VBox vbox2; + private global::Gtk.Label labelTitle; + private global::Gtk.Alignment alignment1; + private global::Gtk.VBox vbox4; + private global::Gtk.RadioButton radioKeep; + private global::Gtk.Label labelKeep; + private global::Gtk.RadioButton radioCopy; + private global::Gtk.Label label4; + private global::Gtk.RadioButton radioMove; + private global::Gtk.Label label5; + private global::Gtk.RadioButton radioLink; + private global::Gtk.Label label6; + private global::Gtk.CheckButton checkApplyAll; + private global::Gtk.Button buttonCancel; + private global::Gtk.Button buttonOk; protected virtual void Build () @@ -44,11 +61,12 @@ namespace MonoDevelop.Ide.Projects this.vbox3.Name = "vbox3"; this.vbox3.Spacing = 6; // Container child vbox3.Gtk.Box+BoxChild - this.image23 = new global::Gtk.Image (); - this.image23.Name = "image23"; - this.image23.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-question", global::Gtk.IconSize.Dialog); - this.vbox3.Add (this.image23); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.image23])); + this.iconQuestion = new global::MonoDevelop.Components.ImageView (); + this.iconQuestion.Name = "iconQuestion"; + this.iconQuestion.IconId = "gtk-dialog-question"; + this.iconQuestion.IconSize = ((global::Gtk.IconSize)(6)); + this.vbox3.Add (this.iconQuestion); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.iconQuestion])); w2.Position = 0; w2.Expand = false; w2.Fill = false; diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.AddMimeTypeDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.AddMimeTypeDialog.cs index 06a5ead747..61f30da982 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.AddMimeTypeDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.AddMimeTypeDialog.cs @@ -5,12 +5,19 @@ namespace MonoDevelop.Ide.Projects internal partial class AddMimeTypeDialog { private global::Gtk.VBox vbox2; + private global::Gtk.Label label1; + private global::Gtk.Entry entry; + private global::Gtk.HBox hbox1; - private global::Gtk.Image image; + + private global::MonoDevelop.Components.ImageView image; + private global::Gtk.Label labelDesc; + private global::Gtk.Button buttonCancel; + private global::Gtk.Button buttonOk; protected virtual void Build () @@ -55,9 +62,10 @@ namespace MonoDevelop.Ide.Projects this.hbox1.Name = "hbox1"; this.hbox1.Spacing = 6; // Container child hbox1.Gtk.Box+BoxChild - this.image = new global::Gtk.Image (); + this.image = new global::MonoDevelop.Components.ImageView (); this.image.Name = "image"; - this.image.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-error", global::Gtk.IconSize.Menu); + this.image.IconId = "gtk-dialog-error"; + this.image.IconSize = ((global::Gtk.IconSize)(1)); this.hbox1.Add (this.image); global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.image])); w4.Position = 0; diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.DeleteConfigDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.DeleteConfigDialog.cs index 85f290f362..6cf3df29ed 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.DeleteConfigDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.DeleteConfigDialog.cs @@ -5,11 +5,17 @@ namespace MonoDevelop.Ide.Projects internal partial class DeleteConfigDialog { private global::Gtk.HBox hbox64; - private global::Gtk.Image image6; + + private global::MonoDevelop.Components.ImageView imageQuestion; + private global::Gtk.VBox vbox80; + private global::Gtk.Label label107; + private global::Gtk.CheckButton deleteChildrenCheck; + private global::Gtk.Button button11; + private global::Gtk.Button button12; protected virtual void Build () @@ -28,12 +34,13 @@ namespace MonoDevelop.Ide.Projects this.hbox64.Spacing = 12; this.hbox64.BorderWidth = ((uint)(12)); // Container child hbox64.Gtk.Box+BoxChild - this.image6 = new global::Gtk.Image (); - this.image6.Name = "image6"; - this.image6.Yalign = 0F; - this.image6.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-dialog-question", global::Gtk.IconSize.Dialog); - this.hbox64.Add (this.image6); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox64 [this.image6])); + this.imageQuestion = new global::MonoDevelop.Components.ImageView (); + this.imageQuestion.Name = "imageQuestion"; + this.imageQuestion.Yalign = 0F; + this.imageQuestion.IconSize = ((global::Gtk.IconSize)(6)); + this.imageQuestion.IconId = "gtk-dialog-question"; + this.hbox64.Add (this.imageQuestion); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox64 [this.imageQuestion])); w2.Position = 0; w2.Expand = false; w2.Fill = false; @@ -68,7 +75,7 @@ namespace MonoDevelop.Ide.Projects w5.Position = 1; w1.Add (this.hbox64); global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1 [this.hbox64])); - w6.Position = 2; + w6.Position = 0; // Internal child MonoDevelop.Ide.Projects.DeleteConfigDialog.ActionArea global::Gtk.HButtonBox w7 = this.ActionArea; w7.Name = "dialog-action_area7"; diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.GtkProjectFolderPreviewWidget.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.GtkProjectFolderPreviewWidget.cs index e896c5f91a..8e549ed264 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.GtkProjectFolderPreviewWidget.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.GtkProjectFolderPreviewWidget.cs @@ -33,7 +33,7 @@ namespace MonoDevelop.Ide.Projects // Container child previewLabelHBox.Gtk.Box+BoxChild
this.previewLabel = new global::Gtk.Label ();
this.previewLabel.Name = "previewLabel";
- this.previewLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span weight=\'bold\' foreground=\'#555555\'>PREVIEW</span>");
+ this.previewLabel.LabelProp = "<span weight='bold' foreground='#555555'>PREVIEW</span>";
this.previewLabel.UseMarkup = true;
this.previewLabelHBox.Add (this.previewLabel);
global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.previewLabelHBox [this.previewLabel]));
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.CodeFormattingPanelWidget.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.CodeFormattingPanelWidget.cs index 6f9d349c9a..025ca5444b 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.CodeFormattingPanelWidget.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.OptionPanels.CodeFormattingPanelWidget.cs @@ -5,13 +5,21 @@ namespace MonoDevelop.Ide.Projects.OptionPanels internal partial class CodeFormattingPanelWidget { private global::Gtk.VBox vbox1; + private global::Gtk.Label label1; + private global::Gtk.HBox hbox1; + private global::Gtk.ScrolledWindow GtkScrolledWindow; + private global::Gtk.TreeView tree; + private global::Gtk.VBox boxButtons; + private global::Gtk.Button buttonAdd; + private global::Gtk.Button buttonRemove; + private global::Gtk.Button buttonEdit; protected virtual void Build () diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.ProjectFileSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.ProjectFileSelectorDialog.cs index 6b3eabbc0e..61d4f351a8 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.ProjectFileSelectorDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.ProjectFileSelectorDialog.cs @@ -22,6 +22,8 @@ namespace MonoDevelop.Ide.Projects private global::Gtk.Button AddFileButton; + private global::MonoDevelop.Components.ImageView imageAdd; + private global::Gtk.HBox typeBox; private global::Gtk.Label label2; @@ -93,11 +95,13 @@ namespace MonoDevelop.Ide.Projects this.AddFileButton.TooltipMarkup = "Add existing files to the project"; this.AddFileButton.CanFocus = true; this.AddFileButton.Name = "AddFileButton"; - this.AddFileButton.UseUnderline = true; this.AddFileButton.Relief = ((global::Gtk.ReliefStyle)(2)); - global::Gtk.Image w7 = new global::Gtk.Image (); - w7.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-add", global::Gtk.IconSize.Menu); - this.AddFileButton.Image = w7; + // Container child AddFileButton.Gtk.Container+ContainerChild + this.imageAdd = new global::MonoDevelop.Components.ImageView (); + this.imageAdd.Name = "imageAdd"; + this.imageAdd.IconSize = ((global::Gtk.IconSize)(1)); + this.imageAdd.IconId = "gtk-add"; + this.AddFileButton.Add (this.imageAdd); this.hbox2.Add (this.AddFileButton); global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.AddFileButton])); w8.Position = 0; diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.SelectReferenceDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.SelectReferenceDialog.cs index 97c14e1eff..c0262c6ab2 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.SelectReferenceDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Projects.SelectReferenceDialog.cs @@ -5,18 +5,33 @@ namespace MonoDevelop.Ide.Projects internal partial class SelectReferenceDialog { private global::Gtk.VBox vbox5; + private global::Gtk.HPaned hpaned1; + private global::Gtk.Alignment alignment1; + private global::Gtk.Alignment alignment2; + private global::Gtk.VBox boxRefs; + private global::Gtk.Alignment selectedHeader; + private global::Gtk.HBox hbox2; + private global::Gtk.Label label114; + private global::Gtk.Button RemoveReferenceButton; + + private global::MonoDevelop.Components.ImageView imageAdd; + private global::Gtk.HBox hbox4; + private global::Gtk.ScrolledWindow scrolledwindow2; + private global::Gtk.TreeView ReferencesTreeView; + private global::Gtk.Button cancelbutton; + private global::Gtk.Button okbutton; protected virtual void Build () @@ -80,35 +95,26 @@ namespace MonoDevelop.Ide.Projects this.RemoveReferenceButton = new global::Gtk.Button (); this.RemoveReferenceButton.TooltipMarkup = "Remove"; this.RemoveReferenceButton.Name = "RemoveReferenceButton"; - this.RemoveReferenceButton.UseUnderline = true; this.RemoveReferenceButton.FocusOnClick = false; this.RemoveReferenceButton.Relief = ((global::Gtk.ReliefStyle)(2)); // Container child RemoveReferenceButton.Gtk.Container+ContainerChild - global::Gtk.Alignment w4 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F); - // Container child GtkAlignment.Gtk.Container+ContainerChild - global::Gtk.HBox w5 = new global::Gtk.HBox (); - w5.Spacing = 2; - // Container child GtkHBox.Gtk.Container+ContainerChild - global::Gtk.Image w6 = new global::Gtk.Image (); - w6.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-delete", global::Gtk.IconSize.Menu); - w5.Add (w6); - // Container child GtkHBox.Gtk.Container+ContainerChild - global::Gtk.Label w8 = new global::Gtk.Label (); - w5.Add (w8); - w4.Add (w5); - this.RemoveReferenceButton.Add (w4); + this.imageAdd = new global::MonoDevelop.Components.ImageView (); + this.imageAdd.Name = "imageAdd"; + this.imageAdd.IconId = "gtk-delete"; + this.imageAdd.IconSize = ((global::Gtk.IconSize)(1)); + this.RemoveReferenceButton.Add (this.imageAdd); this.hbox2.Add (this.RemoveReferenceButton); - global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.RemoveReferenceButton])); - w12.PackType = ((global::Gtk.PackType)(1)); - w12.Position = 1; - w12.Expand = false; - w12.Fill = false; + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.RemoveReferenceButton])); + w5.PackType = ((global::Gtk.PackType)(1)); + w5.Position = 1; + w5.Expand = false; + w5.Fill = false; this.selectedHeader.Add (this.hbox2); this.boxRefs.Add (this.selectedHeader); - global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.boxRefs [this.selectedHeader])); - w14.Position = 0; - w14.Expand = false; - w14.Fill = false; + global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.boxRefs [this.selectedHeader])); + w7.Position = 0; + w7.Expand = false; + w7.Fill = false; // Container child boxRefs.Gtk.Box+BoxChild this.hbox4 = new global::Gtk.HBox (); this.hbox4.HeightRequest = 150; @@ -124,27 +130,27 @@ namespace MonoDevelop.Ide.Projects this.ReferencesTreeView.HeadersVisible = false; this.scrolledwindow2.Add (this.ReferencesTreeView); this.hbox4.Add (this.scrolledwindow2); - global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.scrolledwindow2])); - w16.Position = 0; + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.scrolledwindow2])); + w9.Position = 0; this.boxRefs.Add (this.hbox4); - global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.boxRefs [this.hbox4])); - w17.Position = 1; + global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.boxRefs [this.hbox4])); + w10.Position = 1; this.alignment2.Add (this.boxRefs); this.hpaned1.Add (this.alignment2); - global::Gtk.Paned.PanedChild w19 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.alignment2])); - w19.Shrink = false; + global::Gtk.Paned.PanedChild w12 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.alignment2])); + w12.Shrink = false; this.vbox5.Add (this.hpaned1); - global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hpaned1])); - w20.Position = 0; + global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.hpaned1])); + w13.Position = 0; w1.Add (this.vbox5); - global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox5])); - w21.Position = 0; + global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox5])); + w14.Position = 0; // Internal child MonoDevelop.Ide.Projects.SelectReferenceDialog.ActionArea - global::Gtk.HButtonBox w22 = this.ActionArea; - w22.Name = "dialog-action_area2"; - w22.Spacing = 10; - w22.BorderWidth = ((uint)(5)); - w22.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); + global::Gtk.HButtonBox w15 = this.ActionArea; + w15.Name = "dialog-action_area2"; + w15.Spacing = 10; + w15.BorderWidth = ((uint)(5)); + w15.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); // Container child dialog-action_area2.Gtk.ButtonBox+ButtonBoxChild this.cancelbutton = new global::Gtk.Button (); this.cancelbutton.Name = "cancelbutton"; @@ -152,9 +158,9 @@ namespace MonoDevelop.Ide.Projects this.cancelbutton.UseUnderline = true; this.cancelbutton.Label = "gtk-cancel"; this.AddActionWidget (this.cancelbutton, -6); - global::Gtk.ButtonBox.ButtonBoxChild w23 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w22 [this.cancelbutton])); - w23.Expand = false; - w23.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w16 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w15 [this.cancelbutton])); + w16.Expand = false; + w16.Fill = false; // Container child dialog-action_area2.Gtk.ButtonBox+ButtonBoxChild this.okbutton = new global::Gtk.Button (); this.okbutton.Name = "okbutton"; @@ -162,10 +168,10 @@ namespace MonoDevelop.Ide.Projects this.okbutton.UseUnderline = true; this.okbutton.Label = "gtk-ok"; this.AddActionWidget (this.okbutton, -5); - global::Gtk.ButtonBox.ButtonBoxChild w24 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w22 [this.okbutton])); - w24.Position = 1; - w24.Expand = false; - w24.Fill = false; + global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w15 [this.okbutton])); + w17.Position = 1; + w17.Expand = false; + w17.Fill = false; if ((this.Child != null)) { this.Child.ShowAll (); } diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.SelectEncodingsDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.SelectEncodingsDialog.cs index addc17c850..00931c3aaf 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.SelectEncodingsDialog.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.SelectEncodingsDialog.cs @@ -5,23 +5,45 @@ namespace MonoDevelop.Ide internal partial class SelectEncodingsDialog { private global::Gtk.Table table5; + private global::Gtk.Label label106; + private global::Gtk.Label label107; + private global::Gtk.ScrolledWindow scrolledwindow10; + private global::Gtk.TreeView listAvail; + private global::Gtk.ScrolledWindow scrolledwindow11; + private global::Gtk.TreeView listSelected; + private global::Gtk.VBox vbox74; + private global::Gtk.Label label108; + private global::Gtk.Button btnAdd; + + private global::MonoDevelop.Components.ImageView imageAdd; + private global::Gtk.Button btnRemove; + + private global::MonoDevelop.Components.ImageView imageRemove; + private global::Gtk.Label label109; + private global::Gtk.VBox vbox75; + private global::Gtk.Button btnUp; - private global::Gtk.Image image9; + + private global::MonoDevelop.Components.ImageView imageUp; + private global::Gtk.Button btnDown; - private global::Gtk.Image image10; + + private global::MonoDevelop.Components.ImageView imageDown; + private global::Gtk.Button cancelbutton1; + private global::Gtk.Button okbutton1; protected virtual void Build () @@ -111,27 +133,28 @@ namespace MonoDevelop.Ide // Container child vbox74.Gtk.Box+BoxChild this.btnAdd = new global::Gtk.Button (); this.btnAdd.Name = "btnAdd"; - this.btnAdd.UseUnderline = true; - this.btnAdd.Label = ""; - global::Gtk.Image w9 = new global::Gtk.Image (); - w9.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-forward", global::Gtk.IconSize.Button); - this.btnAdd.Image = w9; + // Container child btnAdd.Gtk.Container+ContainerChild + this.imageAdd = new global::MonoDevelop.Components.ImageView (); + this.imageAdd.Name = "imageAdd"; + this.imageAdd.IconSize = ((global::Gtk.IconSize)(4)); + this.imageAdd.IconId = "gtk-add"; + this.btnAdd.Add (this.imageAdd); this.vbox74.Add (this.btnAdd); global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox74 [this.btnAdd])); w10.Position = 1; - w10.Expand = false; w10.Fill = false; // Container child vbox74.Gtk.Box+BoxChild this.btnRemove = new global::Gtk.Button (); this.btnRemove.Name = "btnRemove"; - this.btnRemove.Label = null; - global::Gtk.Image w11 = new global::Gtk.Image (); - w11.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-back", global::Gtk.IconSize.SmallToolbar); - this.btnRemove.Image = w11; + // Container child btnRemove.Gtk.Container+ContainerChild + this.imageRemove = new global::MonoDevelop.Components.ImageView (); + this.imageRemove.Name = "imageRemove"; + this.imageRemove.IconSize = ((global::Gtk.IconSize)(4)); + this.imageRemove.IconId = "gtk-remove"; + this.btnRemove.Add (this.imageRemove); this.vbox74.Add (this.btnRemove); global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox74 [this.btnRemove])); w12.Position = 2; - w12.Expand = false; w12.Fill = false; // Container child vbox74.Gtk.Box+BoxChild this.label109 = new global::Gtk.Label (); @@ -157,13 +180,11 @@ namespace MonoDevelop.Ide this.btnUp = new global::Gtk.Button (); this.btnUp.Name = "btnUp"; // Container child btnUp.Gtk.Container+ContainerChild - this.image9 = new global::Gtk.Image (); - this.image9.Name = "image9"; - this.image9.Xalign = 0F; - this.image9.Yalign = 0F; - this.image9.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-up", global::Gtk.IconSize.Button); - this.btnUp.Add (this.image9); - this.btnUp.Label = null; + this.imageUp = new global::MonoDevelop.Components.ImageView (); + this.imageUp.Name = "imageUp"; + this.imageUp.IconSize = ((global::Gtk.IconSize)(4)); + this.imageUp.IconId = "gtk-go-up"; + this.btnUp.Add (this.imageUp); this.vbox75.Add (this.btnUp); global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox75 [this.btnUp])); w16.Position = 0; @@ -173,13 +194,11 @@ namespace MonoDevelop.Ide this.btnDown = new global::Gtk.Button (); this.btnDown.Name = "btnDown"; // Container child btnDown.Gtk.Container+ContainerChild - this.image10 = new global::Gtk.Image (); - this.image10.Name = "image10"; - this.image10.Xalign = 0F; - this.image10.Yalign = 0F; - this.image10.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-go-down", global::Gtk.IconSize.Button); - this.btnDown.Add (this.image10); - this.btnDown.Label = null; + this.imageDown = new global::MonoDevelop.Components.ImageView (); + this.imageDown.Name = "imageDown"; + this.imageDown.IconSize = ((global::Gtk.IconSize)(4)); + this.imageDown.IconId = "gtk-go-down"; + this.btnDown.Add (this.imageDown); this.vbox75.Add (this.btnDown); global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox75 [this.btnDown])); w18.Position = 1; diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/generated.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/generated.cs index 097e9cb288..886fd2e124 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/generated.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/generated.cs @@ -17,7 +17,7 @@ namespace Stetic internal class BinContainer { private Gtk.Widget child; - + private Gtk.UIManager uimanager; public static BinContainer Attach (Gtk.Bin bin) @@ -60,7 +60,7 @@ namespace Stetic Gtk.Widget w; w = this.child.Toplevel; if (((w != null) - && typeof (Gtk.Window).IsInstanceOfType (w))) { + && typeof(Gtk.Window).IsInstanceOfType (w))) { ((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup); this.uimanager = null; } @@ -68,44 +68,6 @@ namespace Stetic } } - internal class IconLoader - { - public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size) - { - Gdk.Pixbuf res = widget.RenderIcon (name, size, null); - if ((res != null)) { - return res; - } else { - int sz; - int sy; - global::Gtk.Icon.SizeLookup (size, out sz, out sy); - try { - return Gtk.IconTheme.Default.LoadIcon (name, sz, 0); - } catch (System.Exception) { - if ((name != "gtk-missing-image")) { - return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size); - } else { - Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz); - Gdk.GC gc = new Gdk.GC (pmap); - gc.RgbFgColor = new Gdk.Color (255, 255, 255); - pmap.DrawRectangle (gc, true, 0, 0, sz, sz); - gc.RgbFgColor = new Gdk.Color (0, 0, 0); - pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1)); - gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round); - gc.RgbFgColor = new Gdk.Color (255, 0, 0); - pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - - (sz / 4)), ((sz - 1) - - (sz / 4))); - pmap.DrawLine (gc, ((sz - 1) - - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - - (sz / 4))); - return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz); - } - } - } - } - } - internal class ActionGroups { public static Gtk.ActionGroup GetActionGroup (System.Type type) diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic index 7d4dcfb933..ace9f139ae 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic @@ -5,6 +5,7 @@ <target-gtk-version>2.12</target-gtk-version> </configuration> <import> + <widget-library name="../../../../build/bin/Mono.TextEditor.dll" /> <widget-library name="../../../../external/xwt/Xwt.Gtk/bin/Debug/Xwt.Gtk.dll" /> <widget-library name="../../../../external/mono-addins/bin/Mono.Addins.Gui.dll" /> <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" internal="true" /> @@ -330,9 +331,10 @@ <property name="MemberName" /> <property name="Spacing">6</property> <child> - <widget class="Gtk.Image" id="image3"> + <widget class="MonoDevelop.Components.ImageView" id="imageWarning"> <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-dialog-warning Menu</property> + <property name="IconId">gtk-dialog-warning</property> + <property name="IconSize">Menu</property> </widget> <packing> <property name="Position">0</property> @@ -451,8 +453,7 @@ <widget class="Gtk.Button" id="updateButton"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-apply Button</property> + <property name="Type">TextOnly</property> <property name="Label" translatable="yes">Apply</property> <property name="UseUnderline">True</property> </widget> @@ -759,11 +760,12 @@ <property name="MemberName" /> <property name="Spacing">5</property> <child> - <widget class="Gtk.Image" id="image5"> + <widget class="MonoDevelop.Components.ImageView" id="iconInfo"> <property name="MemberName" /> <property name="Xalign">0</property> <property name="Yalign">0</property> - <property name="Pixbuf">stock:gtk-dialog-info Dialog</property> + <property name="IconId">gtk-dialog-info</property> + <property name="IconSize">Dialog</property> </widget> <packing> <property name="Position">0</property> @@ -847,8 +849,7 @@ <child> <widget class="Gtk.Button" id="nextButton"> <property name="MemberName" /> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-go-forward Button</property> + <property name="Type">TextOnly</property> <property name="Label" translatable="yes">_Next Tip</property> <property name="UseUnderline">True</property> </widget> @@ -1688,8 +1689,7 @@ Diagnostic</property> <property name="CanDefault">True</property> <property name="HasDefault">True</property> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-new Menu</property> + <property name="Type">TextOnly</property> <property name="Label" translatable="yes">Create _Layout</property> <property name="UseUnderline">True</property> <property name="ResponseId">-5</property> @@ -2453,11 +2453,15 @@ Diagnostic</property> <child> <widget class="Gtk.Button" id="btnAdd"> <property name="MemberName" /> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-go-forward Button</property> - <property name="Label" translatable="yes" /> - <property name="UseUnderline">True</property> + <property name="Type">Custom</property> <signal name="Clicked" handler="OnAddClicked" /> + <child> + <widget class="MonoDevelop.Components.ImageView" id="imageAdd"> + <property name="MemberName" /> + <property name="IconSize">Button</property> + <property name="IconId">gtk-add</property> + </widget> + </child> </widget> <packing> <property name="Position">1</property> @@ -2469,9 +2473,15 @@ Diagnostic</property> <child> <widget class="Gtk.Button" id="btnRemove"> <property name="MemberName" /> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-go-back SmallToolbar</property> + <property name="Type">Custom</property> <signal name="Clicked" handler="OnRemoveClicked" /> + <child> + <widget class="MonoDevelop.Components.ImageView" id="imageRemove"> + <property name="MemberName" /> + <property name="IconSize">Button</property> + <property name="IconId">gtk-remove</property> + </widget> + </child> </widget> <packing> <property name="Position">2</property> @@ -2518,11 +2528,10 @@ Diagnostic</property> <property name="Type">Custom</property> <signal name="Clicked" handler="OnUpClicked" /> <child> - <widget class="Gtk.Image" id="image9"> + <widget class="MonoDevelop.Components.ImageView" id="imageUp"> <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="Yalign">0</property> - <property name="Pixbuf">stock:gtk-go-up Button</property> + <property name="IconSize">Button</property> + <property name="IconId">gtk-go-up</property> </widget> </child> </widget> @@ -2539,11 +2548,10 @@ Diagnostic</property> <property name="Type">Custom</property> <signal name="Clicked" handler="OnDownClicked" /> <child> - <widget class="Gtk.Image" id="image10"> + <widget class="MonoDevelop.Components.ImageView" id="imageDown"> <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="Yalign">0</property> - <property name="Pixbuf">stock:gtk-go-down Button</property> + <property name="IconSize">Button</property> + <property name="IconId">gtk-go-down</property> </widget> </child> </widget> @@ -2639,11 +2647,12 @@ Diagnostic</property> <property name="Spacing">12</property> <property name="BorderWidth">6</property> <child> - <widget class="Gtk.Image" id="image1"> + <widget class="MonoDevelop.Components.ImageView" id="iconError"> <property name="MemberName" /> <property name="Xalign">0</property> <property name="Yalign">0</property> - <property name="Pixbuf">stock:gtk-dialog-error Dialog</property> + <property name="IconId">gtk-dialog-error</property> + <property name="IconSize">Dialog</property> </widget> <packing> <property name="Position">0</property> @@ -5897,9 +5906,10 @@ All solutions</property> <property name="MemberName" /> <property name="Spacing">6</property> <child> - <widget class="Gtk.Image" id="image146"> + <widget class="MonoDevelop.Components.ImageView" id="iconWarning"> <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-dialog-warning Dialog</property> + <property name="IconId">gtk-dialog-warning</property> + <property name="IconSize">Dialog</property> </widget> <packing> <property name="Position">0</property> @@ -7797,10 +7807,11 @@ All solutions</property> <property name="Spacing">12</property> <property name="BorderWidth">12</property> <child> - <widget class="Gtk.Image" id="image6"> + <widget class="MonoDevelop.Components.ImageView" id="imageQuestion"> <property name="MemberName" /> <property name="Yalign">0</property> - <property name="Pixbuf">stock:gtk-dialog-question Dialog</property> + <property name="IconSize">Dialog</property> + <property name="IconId">gtk-dialog-question</property> </widget> <packing> <property name="Position">0</property> @@ -9119,12 +9130,17 @@ Visual Studio generates a default ID for embedded resources, instead of simply u <property name="MemberName" /> <property name="Tooltip" translatable="yes">Add existing files to the project</property> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-add Menu</property> - <property name="Label" translatable="yes" /> + <property name="Type">Custom</property> <property name="UseUnderline">True</property> <property name="Relief">None</property> <signal name="Clicked" handler="OnAddFileButtonClicked" /> + <child> + <widget class="MonoDevelop.Components.ImageView" id="imageAdd"> + <property name="MemberName" /> + <property name="IconSize">Menu</property> + <property name="IconId">gtk-add</property> + </widget> + </child> </widget> <packing> <property name="Position">0</property> @@ -9283,10 +9299,11 @@ Visual Studio generates a default ID for embedded resources, instead of simply u <property name="MemberName" /> <property name="Spacing">6</property> <child> - <widget class="Gtk.Image" id="image"> + <widget class="MonoDevelop.Components.ImageView" id="image"> <property name="MemberName" /> <property name="Visible">False</property> - <property name="Pixbuf">stock:gtk-dialog-error Menu</property> + <property name="IconId">gtk-dialog-error</property> + <property name="IconSize">Menu</property> </widget> <packing> <property name="Position">0</property> @@ -9869,8 +9886,7 @@ Visual Studio generates a default ID for embedded resources, instead of simply u <widget class="Gtk.Button" id="buttonReset"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-clear Menu</property> + <property name="Type">TextOnly</property> <property name="Label" translatable="yes">Clear All Options</property> <property name="UseUnderline">True</property> <signal name="Clicked" handler="OnButtonResetClicked" /> @@ -9982,13 +9998,17 @@ Visual Studio generates a default ID for embedded resources, instead of simply u <widget class="Gtk.Button" id="RemoveReferenceButton"> <property name="MemberName" /> <property name="Tooltip">Remove</property> - <property name="Type">TextAndIcon</property> - <property name="Icon">stock:gtk-delete Menu</property> - <property name="Label" /> - <property name="UseUnderline">True</property> + <property name="Type">Custom</property> <property name="FocusOnClick">False</property> <property name="Relief">None</property> <signal name="Clicked" handler="RemoveReference" /> + <child> + <widget class="MonoDevelop.Components.ImageView" id="imageAdd"> + <property name="MemberName" /> + <property name="IconId">gtk-delete</property> + <property name="IconSize">Menu</property> + </widget> + </child> </widget> <packing> <property name="PackType">End</property> @@ -10996,9 +11016,10 @@ Visual Studio generates a default ID for embedded resources, instead of simply u <property name="MemberName" /> <property name="Spacing">6</property> <child> - <widget class="Gtk.Image" id="image23"> + <widget class="MonoDevelop.Components.ImageView" id="iconQuestion"> <property name="MemberName" /> - <property name="Pixbuf">stock:gtk-dialog-question Dialog</property> + <property name="IconId">gtk-dialog-question</property> + <property name="IconSize">Dialog</property> </widget> <packing> <property name="Position">0</property> @@ -11332,7 +11353,7 @@ Visual Studio generates a default ID for embedded resources, instead of simply u <child> <widget class="Gtk.Label" id="previewLabel"> <property name="MemberName" /> - <property name="LabelProp" translatable="yes"><span weight='bold' foreground='#555555'>PREVIEW</span></property> + <property name="LabelProp"><span weight='bold' foreground='#555555'>PREVIEW</span></property> <property name="UseMarkup">True</property> </widget> <packing> diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml b/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml new file mode 100644 index 0000000000..6f84df8755 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml @@ -0,0 +1,241 @@ +<objects attr-sync="off"> + <object type="MonoDevelop.Components.ImageView" palette-category="General" allow-children="false" base-type="Gtk.Misc"> + <itemgroups> + <itemgroup label="ImageView Properties"> + <property name="IconId" /> + <property name="IconSize" /> + </itemgroup> + </itemgroups> + <signals /> + </object> + <object type="MonoDevelop.Ide.Gui.Components.ExtensibleTreeView" palette-category="General" allow-children="false" base-type="Gtk.ScrolledWindow"> + <itemgroups> + <itemgroup label="ExtensibleTreeView Properties"> + <property name="Id" /> + <property name="Zoom" /> + </itemgroup> + </itemgroups> + <signals> + <itemgroup label="ExtensibleTreeView Signals"> + <signal name="CurrentItemActivated" /> + </itemgroup> + </signals> + </object> + <object type="MonoDevelop.Ide.Gui.Components.ExecutionModeComboBox" palette-category="General" allow-children="false" base-type="Gtk.Bin"> + <itemgroups /> + <signals> + <itemgroup label="ExecutionModeComboBox Signals"> + <signal name="SelectionChanged" /> + </itemgroup> + </signals> + </object> + <object type="MonoDevelop.Components.FileEntry" palette-category="MonoDevelop.Components" allow-children="false" base-type="Gtk.HBox"> + <itemgroups /> + <signals /> + </object> + <object type="MonoDevelop.Components.FolderEntry" palette-category="MonoDevelop.Components" allow-children="false" base-type="Gtk.HBox"> + <itemgroups /> + <signals /> + </object> + <object type="MonoDevelop.Components.MenuButton" palette-category="MonoDevelop.Components" allow-children="false" base-type="Gtk.Button"> + <itemgroups> + <itemgroup label="MenuButton Properties"> + <property name="Label" /> + <property name="UseUnderline" /> + <property name="UseMarkup" /> + </itemgroup> + </itemgroups> + <signals /> + </object> + <object type="MonoDevelop.Components.FixedWidthWrapLabel" palette-category="MonoDevelop.Components" allow-children="false" base-type="Gtk.Widget"> + <itemgroups> + <itemgroup label="FixedWidthWrapLabel Properties"> + <property name="MaxWidth" /> + <property name="Markup" /> + <property name="Text" /> + <property name="Indent" /> + <property name="BreakOnPunctuation" /> + <property name="BreakOnCamelCasing" /> + </itemgroup> + </itemgroups> + <signals /> + </object> + <object type="MonoDevelop.Components.FolderListSelector" palette-category="General" allow-children="false" base-type="Gtk.Bin"> + <itemgroups /> + <signals /> + </object> + <object type="MonoDevelop.Components.SearchEntry" palette-category="General" allow-children="false" base-type="Gtk.EventBox"> + <itemgroups> + <itemgroup label="SearchEntry Properties"> + <property name="ForceFilterButtonVisible" /> + <property name="HasFrame" /> + <property name="RoundedShape" /> + <property name="IsCheckMenu" /> + <property name="ActiveFilterID" /> + <property name="EmptyMessage" /> + <property name="Query" /> + <property name="Ready" /> + <property name="HasFocus" /> + </itemgroup> + </itemgroups> + <signals> + <itemgroup label="SearchEntry Signals"> + <signal name="Changed" /> + <signal name="Activated" /> + <signal name="FilterChanged" /> + <signal name="RequestMenu" /> + </itemgroup> + </signals> + </object> + <object type="MonoDevelop.Components.PropertyGrid.PropertyGrid" palette-category="MonoDevelop.Components" allow-children="false" base-type="Gtk.VBox"> + <itemgroups> + <itemgroup label="PropertyGrid Properties"> + <property name="ShowToolbar" /> + <property name="ShowHelp" /> + </itemgroup> + </itemgroups> + <signals> + <itemgroup label="PropertyGrid Signals"> + <signal name="Changed" /> + </itemgroup> + </signals> + </object> + <object type="MonoDevelop.Components.MenuButtonEntry" palette-category="MonoDevelop.Components" allow-children="false" base-type="Gtk.HBox"> + <itemgroups> + <itemgroup label="MenuButtonEntry Properties"> + <property name="Text" /> + </itemgroup> + </itemgroups> + <signals /> + </object> + <object type="MonoDevelop.Ide.Gui.Components.ProjectFileEntry" palette-category="General" allow-children="false" base-type="Gtk.HBox"> + <itemgroups> + <itemgroup label="ProjectFileEntry Properties"> + <property name="DialogTitle" /> + <property name="DefaultFilter" /> + <property name="VerifyFileExistsInProject" /> + <property name="EntryIsEditable" /> + </itemgroup> + </itemgroups> + <signals> + <itemgroup label="ProjectFileEntry Signals"> + <signal name="Changed" /> + </itemgroup> + </signals> + </object> + <object type="MonoDevelop.Ide.Projects.OptionPanels.BaseDirectoryPanelWidget" palette-category="MonoDevelop.Projects.Gui" allow-children="false" base-type="Gtk.Bin"> + <itemgroups> + <itemgroup label="BaseDirectoryPanelWidget Properties"> + <property name="BaseDirectory" /> + </itemgroup> + </itemgroups> + <signals /> + </object> + <object type="MonoDevelop.Ide.Gui.Components.EnvVarList" palette-category="MonoDevelop.Projects.Gui" allow-children="false" base-type="Gtk.ScrolledWindow"> + <itemgroups /> + <signals /> + </object> + <object type="MonoDevelop.Ide.Gui.Components.StringTagSelectorButton" palette-category="General" allow-children="false" base-type="Gtk.Bin"> + <itemgroups /> + <signals /> + </object> + <object type="MonoDevelop.Components.CompactScrolledWindow" palette-category="General" allow-children="false" base-type="Gtk.ScrolledWindow"> + <itemgroups> + <itemgroup label="CompactScrolledWindow Properties"> + <property name="ShowBorderLine" /> + </itemgroup> + </itemgroups> + <signals /> + </object> + <object type="MonoDevelop.Ide.Gui.Components.ProjectSelectorWidget" palette-category="General" allow-children="false" base-type="Gtk.Bin"> + <itemgroups> + <itemgroup label="ProjectSelectorWidget Properties"> + <property name="ShowCheckboxes" /> + <property name="CascadeCheckboxSelection" /> + </itemgroup> + </itemgroups> + <signals> + <itemgroup label="ProjectSelectorWidget Signals"> + <signal name="SelectionChanged" /> + <signal name="ActiveChanged" /> + </itemgroup> + </signals> + </object> + <object type="MonoDevelop.Ide.ProgressMonitoring.ProgressBarMonitor" palette-category="General" allow-children="false" base-type="Gtk.Bin"> + <itemgroups> + <itemgroup label="ProgressBarMonitor Properties"> + <property name="AllowCancel" /> + <property name="ShowErrorsDialog" /> + </itemgroup> + </itemgroups> + <signals /> + </object> + <object type="MonoDevelop.Ide.Gui.Components.PriorityList" palette-category="General" allow-children="false" base-type="Gtk.Bin"> + <itemgroups /> + <signals /> + </object> + <object type="MonoDevelop.Ide.Projects.OptionPanels.PortableRuntimeOptionsPanelWidget" palette-category="General" allow-children="false" base-type="Gtk.Bin"> + <itemgroups /> + <signals /> + </object> + <object type="MonoDevelop.Components.DropDownBox" palette-category="Widgets" allow-children="false" base-type="Gtk.Button"> + <itemgroups> + <itemgroup label="DropDownBox Properties"> + <property name="Text" /> + <property name="DrawButtonShape" /> + <property name="DrawRightBorder" /> + <property name="DrawLeftBorder" /> + <property name="DefaultIconHeight" /> + <property name="DefaultIconWidth" /> + <property name="FixedWidth" /> + <property name="FixedHeight" /> + </itemgroup> + </itemgroups> + <signals /> + </object> + <object type="Mono.TextEditor.PopupWindow.TooltipWindow.FixedWidthWrapLabel" palette-category="MonoDevelop.Components" allow-children="false" base-type="Gtk.Widget"> + <itemgroups> + <itemgroup label="FixedWidthWrapLabel Properties"> + <property name="MaxWidth" /> + <property name="Markup" /> + <property name="Text" /> + <property name="Indent" /> + <property name="BreakOnPunctuation" /> + <property name="BreakOnCamelCasing" /> + </itemgroup> + </itemgroups> + <signals /> + </object> + <object type="Mono.TextEditor.Theatrics.AnimatedVBox" palette-category="Mono.TextEditor" allow-children="false" base-type="Gtk.Container"> + <itemgroups /> + <signals /> + </object> + <object type="Mono.TextEditor.TextEditor" palette-category="Mono.TextEditor" allow-children="false" base-type="Gtk.Container"> + <itemgroups> + <itemgroup label="TextEditor Properties"> + <property name="TabsToSpaces" /> + <property name="IMModule" /> + <property name="LineHeight" /> + <property name="SelectedText" /> + <property name="SelectionAnchor" /> + <property name="Text" /> + <property name="SearchPattern" /> + <property name="HighlightSearchPattern" /> + <property name="IsCaseSensitive" /> + <property name="IsWholeWordOnly" /> + </itemgroup> + </itemgroups> + <signals> + <itemgroup label="TextEditor Signals"> + <signal name="VScroll" /> + <signal name="HScroll" /> + <signal name="SelectionChanged" /> + <signal name="Painted" /> + <signal name="LinkRequest" /> + <signal name="EditorOptionsChanged" /> + <signal name="HighlightSearchPatternChanged" /> + <signal name="BeginHover" /> + </itemgroup> + </signals> + </object> +</objects>
\ No newline at end of file diff --git a/main/src/core/MonoDevelop.Ide/gtkrc b/main/src/core/MonoDevelop.Ide/gtkrc index cd967ef523..0144ec125d 100644 --- a/main/src/core/MonoDevelop.Ide/gtkrc +++ b/main/src/core/MonoDevelop.Ide/gtkrc @@ -1,26 +1,30 @@ -# Theme for Xamarin composed by Lanedo GmbH -# Copyright 2012 Xamarin Inc. -# Authors: +# Xamarin Studio GTK Theme +# Copyright 2012-2016 Xamarin Inc. +# Authors: # Christian Kellner <christian.kellner@lanedo.com> # Carlos Garnacho <carlos.garnacho@lanedo.com> +# Cody Russell <cody@xamarin.com> +# Vsevolod Kukol <vsevolod.kukol@xamarin.com> +# Vaclav Vancura <vaclav@xamarin.com> + gtk-color-scheme = -"bg_color: #f5f5f5 -fg_color: #000 -base_color: #fff -text_color: #000 +"bg_color: #f5f5f5 +fg_color: #000 +base_color: #fff +text_color: #000 selected_bg_color: #649dd6 selected_fg_color: #fff -tooltip_bg_color: #fff9e5 -tooltip_fg_color: #000" - -gtk-button-images = 0 -gtk-menu-images = 0 -gtk-toolbar-style = 0 -gtk-enable-mnemonics = 0 -gtk-icon-sizes = "gtk-small-toolbar=16,16:gtk-large-toolbar=22,22" +tooltip_bg_color: #fff9e5 +tooltip_fg_color: #000 + +gtk-button-images = 0 +gtk-menu-images = 0 +gtk-toolbar-style = 0 +gtk-enable-mnemonics = 0 +gtk-icon-sizes = "gtk-small-toolbar=16,16:gtk-large-toolbar=22,22" gtk-toolbar-icon-size = large-toolbar -gtk-auto-mnemonics = 1 +gtk-auto-mnemonics = 1 style "default" { @@ -28,31 +32,33 @@ style "default" { ythickness = 1 ### colours - bg[NORMAL] = @bg_color - bg[PRELIGHT] = @bg_color - bg[SELECTED] = @selected_bg_color - bg[INSENSITIVE] = @bg_color - bg[ACTIVE] = @bg_color - - fg[NORMAL] = @fg_color - fg[PRELIGHT] = @fg_color - fg[SELECTED] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) - fg[ACTIVE] = @fg_color - - text[NORMAL] = @text_color - text[PRELIGHT] = @text_color - text[SELECTED] = @selected_fg_color + + bg[NORMAL] = @bg_color + bg[PRELIGHT] = @bg_color + bg[SELECTED] = @selected_bg_color + bg[INSENSITIVE] = @bg_color + bg[ACTIVE] = @bg_color + + fg[NORMAL] = @fg_color + fg[PRELIGHT] = @fg_color + fg[SELECTED] = @selected_fg_color + fg[INSENSITIVE] = darker (@bg_color) + fg[ACTIVE] = @fg_color + + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color text[INSENSITIVE] = darker (@bg_color) - text[ACTIVE] = @text_color + text[ACTIVE] = @fg_color - base[NORMAL] = @base_color - base[PRELIGHT] = @selected_bg_color - base[SELECTED] = @selected_bg_color + base[NORMAL] = @base_color + base[PRELIGHT] = @selected_bg_color + base[SELECTED] = @selected_bg_color base[INSENSITIVE] = @bg_color - base[ACTIVE] = shade (1.3, @selected_bg_color) + base[ACTIVE] = shade (1.3, @selected_bg_color) ### style properties + GtkWidget::new-tooltip-style = 1 GtkEntry::honors-transparent-bg-hint = 1 @@ -63,7 +69,7 @@ style "default" { GtkButton::default-border = { 0, 0, 0, 0 } GtkButton::inner-border = { 2, 2, 4, 4 } - GtkTreeView::odd-row-color = @base_color + GtkTreeView::odd-row-color = "#fafafa" GtkScrolledWindow::scrollbar-spacing = 0 GtkScale::slider-length = 14 @@ -74,17 +80,16 @@ style "default" { GtkComboBox::arrow-size = 12 engine "xamarin" { - arrowstyle = 2 - rgba = TRUE - roundness = 3 + rgba = TRUE + roundness = 3 glazestyle = 0 - menustyle = 0 - menuitemstyle = 0 + menustyle = 0 + menuitemstyle = 0 menubaritemstyle = 0 - comboboxstyle = 1 - spinbuttonstyle = 1 + comboboxstyle = 1 + spinbuttonstyle = 1 colorize_scrollbar = FALSE progressbarstyle = 0 trough_shades = { 0.842, 0.886 } @@ -101,23 +106,23 @@ style "wider" = "default" { ythickness = 3 } - style "button" { xthickness = 2 ythickness = 4 - bg[NORMAL] = @bg_color - bg[PRELIGHT] = shade(1.1, @bg_color) - bg[ACTIVE] = @bg_color + bg[NORMAL] = @bg_color + bg[PRELIGHT] = shade(1.1, @bg_color) + bg[ACTIVE] = @bg_color bg[INSENSITIVE] = @bg_color + GtkWidget::focus-padding = 0 engine "xamarin" { contrast = 1.0 - gradient_shades = {0.96, 0.918, 0.926, 0.858} - focus_color = shade(0.6, @bg_color) - textstyle = 1 - } + gradient_shades = {0.96, 0.918, 0.926, 0.858} + focus_color = shade(0.6, @bg_color) + textstyle = 1 + } } style "toggle-button" = "button" { @@ -133,7 +138,7 @@ style "menu" { engine "xamarin" { roundness = 3 - gradient_shades = {1.02, 0.97, 0.92, 0.87} + gradient_shades = {1.02, 0.97, 0.92, 0.87} } } @@ -145,13 +150,14 @@ style "menu-item" { engine "xamarin" { roundness = 0 - gradient_shades = {1.02, 0.97, 0.92, 0.87} + gradient_shades = {1.02, 0.97, 0.92, 0.87} } } style "toolbar" = "default" { bg[NORMAL] = "#ddd" + engine "xamarin" { toolbarstyle = 2 } @@ -161,8 +167,8 @@ style "toolbar-button" { engine "xamarin" { contrast = 1.0 - focus_color = @bg_color - } + focus_color = @bg_color + } } style "tooltip" @@ -176,11 +182,11 @@ style "tooltip" style "treeview" = "default" { - GtkTreeView::odd-row-color = "#f5f5f5" + GtkTreeView::odd-row-color = @bg_color engine "xamarin" { roundness = 0 - gradient_shades = {1.0, 1.0, 1.0, 1.0} + gradient_shades = {1.0, 1.0, 1.0, 1.0} } } @@ -198,21 +204,22 @@ style "icon-view" = "default" { bg[SELECTED] = "#f5f7fa" base[SELECTED] = "#f5f7fa" - fg[SELECTED] = "#000" - text[SELECTED] = "#000" + fg[SELECTED] = @fg_color + text[SELECTED] = @fg_color } style "toolbar-combo-box" = "default" { fg[NORMAL] = "#616161" text[NORMAL] = @fg_color - bg[NORMAL] = "#fff" - base[NORMAL] = "#fff" + bg[NORMAL] = @bg_color + base[NORMAL] = "@bg_color + ythickness = 4 xthickness = 2 engine "xamarin" { - comboboxstyle = 0 + comboboxstyle = 0 arrowstyle = 2 } } @@ -220,6 +227,7 @@ style "toolbar-combo-box" = "default" style "combo-box" = "default" { fg[NORMAL] = "#616161" + xthickness = 2 ythickness = 4 @@ -248,6 +256,7 @@ style "combo-box-label" = "combo-box" style "notebook" = "default" { GtkNotebook::tab-overlap = 1 + bg[ACTIVE] = @base_color bg[NORMAL] = @base_color @@ -259,14 +268,16 @@ style "notebook" = "default" style "radio-button" = "default" { GtkCheckButton::indicator-size = 15 - text[NORMAL] = lighter (@text_color) + + text[NORMAL] = lighter (@fg_color) base[NORMAL] = @base_color - text[ACTIVE] = lighter(@text_color) + text[ACTIVE] = lighter(@fg_color) } style "check-box" = "default" { GtkCheckButton::indicator-size = 15 + base[NORMAL] = "#f8f8f8" text[NORMAL] = "#404040" text[ACTIVE] = "#404040" @@ -276,7 +287,9 @@ style "entry" = "default" { xthickness = 4 ythickness = 4 + GtkEntry::inner-border = { 2, 2, 2, 2 } + base[INSENSITIVE] = shade(1.02, @bg_color) } @@ -284,6 +297,7 @@ style "search-entry" = "wider" { xthickness = 6 ythickness = 4 + bg[NORMAL] = @base_color } @@ -308,6 +322,7 @@ style "progressbar" = "default" { bg[SELECTED] = "#62b3ec" fg[SELECTED] = "#3a67a6" + xthickness = 0 ythickness = 0 } @@ -330,20 +345,25 @@ style "scale" = "default" style "spin-button" = "wider" { fg[NORMAL] = "#616161" + ythickness = 4 + GtkEntry::inner-border = { 2, 2, 1, 1 } + engine "xamarin" { arrowstyle = 3 } } + ### Apply the styles -class "GtkWidget" style "default" -class "GtkEntry" style "entry" +class "GtkWidget" style "default" + +class "GtkEntry" style "entry" class "GtkSpinButton" style "spin-button" -class "GtkFrame" style "wider" -class "GtkRange" style "wide" +class "GtkFrame" style "wider" +class "GtkRange" style "wide" class "GtkSeparator" style "wide" class "GtkScrollbar" style "scrollbar" class "GtkProgressBar" style "progressbar" @@ -357,21 +377,21 @@ class "GtkScale" style "scale" #widget "*GtkEntry" style "entry" widget "*search-entry*" style "search-entry" -widget "*GtkTextView" style "entry" -widget "wizard_dialog" style "wizard-dialog" +widget "*GtkTextView" style "entry" +widget "wizard_dialog" style "wizard-dialog" -widget_class "*<GtkButton>" style "button" +widget_class "*<GtkButton>" style "button" widget_class "*<GtkToggleButton>" style "toggle-button" -widget_class "*<GtkMenu>*" style "menu" -widget_class "*<GtkMenuItem>*" style "menu-item" +widget_class "*<GtkMenu>*" style "menu" +widget_class "*<GtkMenuItem>*" style "menu-item" widget_class "*<GtkToolbar>*" style "toolbar" -widget_class "*ToolButton*" style "toolbar-button" +widget_class "*ToolButton*" style "toolbar-button" -widget_class "*.<GtkTreeView>*" style "treeview" -widget_class "*.GtkTreeView.GtkButton" style "tree-header" -widget_class "*.GtkList.GtkButton" style "tree-header" +widget_class "*.<GtkTreeView>*" style "treeview" +widget_class "*.GtkTreeView.GtkButton" style "tree-header" +widget_class "*.GtkList.GtkButton" style "tree-header" widget_class "*<GtkIconView>" style "icon-view" @@ -390,4 +410,4 @@ widget_class "*.<GtkComboBox>.*.GtkLabel" style "combo-box-label" widget_class "*.<GtkToolbar>.*.<GtkComboBox>.*" style "toolbar-combo-box" widget "*MainToolbar*.GtkComboBox.*" style "toolbar-combo-box" -widget "gtk-tooltip*" style "tooltip" +widget "gtk-tooltip*" style "tooltip" diff --git a/main/src/core/MonoDevelop.Ide/gtkrc.mac b/main/src/core/MonoDevelop.Ide/gtkrc.mac index 65be7377bb..79210201b0 100644 --- a/main/src/core/MonoDevelop.Ide/gtkrc.mac +++ b/main/src/core/MonoDevelop.Ide/gtkrc.mac @@ -1,61 +1,74 @@ -# Mac Theme for Xamarin composed by Lanedo GmbH -# Copyright 2012 Xamarin Inc. -# Authors: +# Xamarin Studio Light Mac GTK Theme +# Copyright 2012-2016 Xamarin Inc. +# Authors: # Christian Kellner <christian.kellner@lanedo.com> # Carlos Garnacho <carlos.garnacho@lanedo.com> +# Cody Russell <cody@xamarin.com> +# Vsevolod Kukol <vsevolod.kukol@xamarin.com> +# Vaclav Vancura <vaclav@xamarin.com> + gtk-color-scheme = -"bg_color: #f5f5f5 -fg_color: #000 -base_color: #fff -text_color: #000 -selected_bg_color: #649dd6 +"bg_color: #f5f5f5 +fg_color: #272727 +base_color: #fff +text_color: #272727 +link_color: #5189ed +selected_bg_color: #5189ed selected_fg_color: #fff -tooltip_bg_color: #f2f2f2 -tooltip_fg_color: #222222 +tooltip_bg_color: #f2f2f2 +tooltip_fg_color: #272727 tooltip_border_color: #b2b2b2" -gtk-button-images = 0 -gtk-menu-images = 0 -gtk-toolbar-style = 0 -gtk-enable-mnemonics = 0 -gtk-icon-sizes = "gtk-small-toolbar=16,16:gtk-large-toolbar=22,22" +gtk-button-images = 0 +gtk-menu-images = 0 +gtk-toolbar-style = 0 +gtk-enable-mnemonics = 0 +gtk-icon-sizes = "gtk-small-toolbar=16,16:gtk-large-toolbar=22,22" gtk-toolbar-icon-size = large-toolbar -gtk-auto-mnemonics = 1 +gtk-auto-mnemonics = 1 gtk-error-bell = 0 gtk-show-input-method-menu = 0 +gtk-font-name = "Helvetica Neue 12" + style "default" { xthickness = 1 ythickness = 1 + font_name = "Helvetica Neue 12" + ### colours - bg[NORMAL] = @bg_color - bg[PRELIGHT] = @bg_color - bg[SELECTED] = @selected_bg_color - bg[INSENSITIVE] = @bg_color - bg[ACTIVE] = @bg_color - - fg[NORMAL] = @fg_color - fg[PRELIGHT] = @fg_color - fg[SELECTED] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) - fg[ACTIVE] = @fg_color - - text[NORMAL] = @text_color - text[PRELIGHT] = @text_color - text[SELECTED] = @selected_fg_color + + bg[NORMAL] = @bg_color + bg[PRELIGHT] = @bg_color + bg[SELECTED] = @selected_bg_color + bg[INSENSITIVE] = @bg_color + bg[ACTIVE] = @bg_color + + fg[NORMAL] = @fg_color + fg[PRELIGHT] = @fg_color + fg[SELECTED] = @selected_fg_color + fg[INSENSITIVE] = darker (@bg_color) + fg[ACTIVE] = @fg_color + + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color text[INSENSITIVE] = darker (@bg_color) - text[ACTIVE] = @text_color + text[ACTIVE] = @fg_color - base[NORMAL] = @base_color - base[PRELIGHT] = @selected_bg_color - base[SELECTED] = @selected_bg_color + base[NORMAL] = @base_color + base[PRELIGHT] = @selected_bg_color + base[SELECTED] = @selected_bg_color base[INSENSITIVE] = @bg_color - base[ACTIVE] = shade (1.3, @selected_bg_color) + base[ACTIVE] = shade (1.3, @selected_bg_color) ### style properties + GtkWidget::new-tooltip-style = 1 + GtkWidget::link-color = @link_color + GtkWidget::visited-link-color = @link_color GtkEntry::honors-transparent-bg-hint = 1 GtkEntry::inner-border = { 2, 2, 2, 2 } @@ -68,10 +81,14 @@ style "default" { GtkButtonBox::child-min-width = 70 GtkButtonBox::child-min-height = 22 - GtkTreeView::odd-row-color = @base_color + GtkCheckButton::indicator-size = 14 + GtkCheckButton::indicator-spacing = 4 + + GtkTreeView::odd-row-color = "#fafafa" GtkScrolledWindow::scrollbar-spacing = 0 GtkScrolledWindow::scrollbars-within-bevel = 1 + GtkScrolledWindow::draw-child-bg = 1 GtkScale::slider-length = 14 GtkRange::trough-side-details = 1 @@ -85,20 +102,22 @@ style "default" { GtkSeparatorMenuItem::horizontal-padding = 2 engine "xamarin" { - arrowstyle = 2 - rgba = TRUE - roundness = 3 + rgba = TRUE + roundness = 3 glazestyle = 0 - menustyle = 0 - menuitemstyle = 0 + menustyle = 0 + menuitemstyle = 0 menubaritemstyle = 0 - comboboxstyle = 1 - spinbuttonstyle = 1 + comboboxstyle = 2 + spinbuttonstyle = 1 colorize_scrollbar = FALSE progressbarstyle = 0 - trough_shades = { 0.842, 0.886 } + gradient_shades = { 1.0, 1.0, 1.0, 1.0 } + fill_shade = 1.0 + + focusstyle = 0 } } @@ -112,78 +131,85 @@ style "wider" = "default" { ythickness = 3 } - -style "button" { +style "button" = "default" { xthickness = 2 ythickness = 4 - bg[NORMAL] = @bg_color - bg[PRELIGHT] = shade(1.1, @bg_color) - bg[ACTIVE] = @bg_color - bg[INSENSITIVE] = @bg_color + font_name = "Helvetica Neue 12" + + bg[NORMAL] = @base_color + bg[PRELIGHT] = @base_color # Mac buttons have no hover state + GtkWidget::focus-padding = 0 + GtkWidget::focus-line-width = 1 engine "xamarin" { + border_shades = {1.4, 1.3} rgba = FALSE contrast = 1.0 - gradient_shades = {0.96, 0.918, 0.926, 0.858} - focus_color = shade(0.6, @bg_color) - textstyle = 1 - } + focus_color = shade(0.6, @bg_color) + textstyle = 0 + highlight_shade = 1.0 + lightborder_shade = 1.0 + } } -style "dialog-button" = "default" { - xthickness = 3 - ythickness = 2 - font_name = "Lucida Grande 13" +style "dialog-button" = "button" { + GtkButton::inner-border = { 7, 7, 3, 4 } - GtkWidget::draw-border = { 2, 2, 2, 2 } - GtkWidget::focus-line-width = 1 - GtkButton::inner-border = { 8, 8, 0, 3 } - - engine "quartz" { - buttontype = "aqua" + engine "xamarin" { + default_button_color = "#51ADF3" } } style "toggle-button" = "button" { - bg[NORMAL] = @base_color - bg[PRELIGHT] = shade(0.98, @base_color) + bg[PRELIGHT] = @base_color engine "xamarin" { rgba = FALSE contrast = 1.0 - gradient_shades = {0.96, 0.918, 0.926, 0.858} - focus_color = shade(0.6, @bg_color) - textstyle = 1 + focus_color = shade(0.6, @bg_color) + textstyle = 1 } } style "menu" { - xthickness = 0 + xthickness = 1 # ythickness = 0 - font_name = "Lucida Grande 14" + + font_name = "Helvetica Neue 12" bg[PRELIGHT] = @selected_fg_color fg[PRELIGHT] = @selected_fg_color text[PRELIGHT] = @selected_fg_color - engine "quartz" { - } + # engine "quartz" { + # } } style "menu-item" = "menu" { ythickness = 2 + GtkWidget::draw-border = { 0, 0, 0, 2 } + + engine "xamarin" { + gradient_shades = {1.0, 1.0, 1.0, 1.0} + contrast = 0.0 + roundness = 0 + } } style "menu-separator" = "menu-item" { ythickness = 3 + engine "xamarin" { + contrast = 1.0 + } } style "toolbar" = "default" { bg[NORMAL] = "#ddd" + engine "xamarin" { toolbarstyle = 2 } @@ -193,8 +219,8 @@ style "toolbar-button" { engine "xamarin" { contrast = 1.0 - focus_color = @bg_color - } + focus_color = @bg_color + } } style "tooltip" @@ -205,23 +231,34 @@ style "tooltip" fg[NORMAL] = @tooltip_fg_color bg[NORMAL] = @tooltip_bg_color bg[SELECTED] = @tooltip_border_color - font_name = "Lucida Grande 12" + + font_name = "Helvetica Neue 12" engine "xamarin" { - roundness = 0 + roundness = 0 } } -style "tree-header" = "wide" +style "treeview" = "default" { - bg[NORMAL] = "#f2f2f2" + base[SELECTED] = @selected_bg_color + base[ACTIVE] = @selected_bg_color + text[SELECTED] = @selected_fg_color + text[ACTIVE] = @selected_fg_color engine "xamarin" { - listviewheaderstyle = 3 - separatorstyle = 1 + roundness = 0 + gradient_shades = { 1.01, 1.01, 1.01, 1.01 } + glazestyle = 1 + focusstyle = 3 } } +style "tree-header" +{ + bg[NORMAL] = "#f2f2f2" +} + style "icon-view" = "default" { bg[SELECTED] = "#f5f7fa" @@ -234,78 +271,99 @@ style "toolbar-combo-box" = "default" { fg[NORMAL] = "#616161" text[NORMAL] = @fg_color - bg[NORMAL] = "#fff" - base[NORMAL] = "#fff" + bg[NORMAL] = @bg_color + base[NORMAL] = @bg_color + ythickness = 4 xthickness = 2 engine "xamarin" { - comboboxstyle = 0 + comboboxstyle = 0 arrowstyle = 2 } } -style "combo-box" = "default" +style "combo-box" = "button" { - fg[NORMAL] = "#616161" - xthickness = 2 - ythickness = 4 + bg[PRELIGHT] = @base_color + base[NORMAL] = "#6cb2f7" + base[ACTIVE] = "#6cb2f7" + base[PRELIGHT] = "#6cb2f7" + fg[NORMAL] = @base_color + fg[PRELIGHT] = @base_color engine "xamarin" { - arrowstyle = 4 + arrowstyle = 3 + fill_shade = 0.7 } } -style "wizard-dialog" +style "combo-box-entry-button" = "combo-box" { - GtkDialog::content-area-border = 0 -} - -style "combo-box-entry" = "combo-box" -{ - engine "xamarin" { - arrowstyle = 3 - } + bg[NORMAL] = "#6cb2f7" + bg[ACTIVE] = "#6cb2f7" + bg[PRELIGHT] = "#6cb2f7" + fg[NORMAL] = @base_color + fg[ACTIVE] = @fg_color + fg[PRELIGHT] = @base_color } -style "combo-box-label" = "combo-box" +style "wizard-dialog" { - fg[NORMAL] = "#595959" + GtkDialog::content-area-border = 0 } style "combo-box-menu" = "menu" { - font_name = "Lucida Grande 12" + font_name = "Helvetica Neue 12" } style "notebook" = "default" { GtkNotebook::tab-overlap = 1 - bg[ACTIVE] = @base_color + GtkNotebook::tab-curvature = 3 + + bg[ACTIVE] = "#e7e7e7" bg[NORMAL] = @base_color engine "xamarin" { - gradient_shades = { 0.945, 0.945, 0.945, 0.685 } + roundness = 0 } } style "radio-or-check-box" = "default" { ythickness = 6 - GtkCheckButton::indicator-size = 14 - GtkCheckButton::indicator-spacing = 4 + engine "quartz" { } } +style "propertygrid-radio-or-check-box" = "radio-or-check-box" +{ + base[ACTIVE] = @base_color + base[SELECTED] = @base_color + base[PRELIGHT] = @base_color + text[SELECTED] = @fg_color + GtkCheckButton::indicator-spacing = 0 + + engine "xamarin" { + } +} + style "entry" = "default" { xthickness = 4 ythickness = 4 + GtkEntry::inner-border = { 2, 2, 2, 2 } + base[INSENSITIVE] = shade(1.02, @bg_color) + bg[SELECTED] = @selected_bg_color engine "xamarin" { rgba = FALSE + roundness = 0 + focusstyle = 2 } } @@ -313,6 +371,7 @@ style "search-entry" = "wider" { xthickness = 6 ythickness = 4 + bg[NORMAL] = @base_color } @@ -320,18 +379,34 @@ style "scrollbar" = "default" { GtkScrollbar::has-forward-stepper = 0 GtkScrollbar::has-backward-stepper = 0 - GtkRange::slider-width = 15 - GtkRange::trough-border = 0 + GtkRange::slider-width = 7 + GtkRange::trough-border = 2 GtkRange::trough-side-details = 0 - - engine "quartz" { + GtkWidget::draw-border = { 0, 0, 0, 0 } + + bg[NORMAL] = "#C0C0C0" + bg[PRELIGHT] = "#C0C0C0" + + engine "xamarin" + { + roundness = 1 + contrast = 0.0 + border_colors = { "#C0C0C0", "#C0C0C0" } + trough_shades = { 1.026, 1.026 } + stepperstyle = 1 } } +style "completion_scrollbar" = "scrollbar" +{ + bg[NORMAL] = @bg_color +} + style "progressbar" = "default" { bg[SELECTED] = "#62b3ec" fg[SELECTED] = "#3a67a6" + bg[ACTIVE] = @base_color xthickness = 0 ythickness = 0 } @@ -354,20 +429,30 @@ style "scale" = "default" style "spin-button" = "wider" { fg[NORMAL] = "#616161" + ythickness = 4 + GtkEntry::inner-border = { 2, 2, 1, 1 } + engine "xamarin" { arrowstyle = 3 } } +style "link-label-fix" +{ + base[PRELIGHT] = @bg_color # disable link hover background +} + + ### Apply the styles -class "GtkWidget" style "default" -class "GtkEntry" style "entry" +class "GtkWidget" style "default" + +class "GtkEntry" style "entry" class "GtkSpinButton" style "spin-button" -class "GtkFrame" style "wider" -class "GtkRange" style "wide" +class "GtkFrame" style "wider" +class "GtkRange" style "wide" class "GtkSeparator" style "wide" class "GtkScrollbar" style "scrollbar" class "GtkProgressBar" style "progressbar" @@ -375,56 +460,66 @@ class "GtkScrolledWindow" style "scrolled-window" class "GtkNotebook" style "notebook" class "GtkButton" style "button" class "GtkToggleButton" style "toggle-button" +class "GtkCheckButton" style "radio-or-check-box" +class "GtkComboBox" style "combo-box" class "GtkScale" style "scale" #widget "*GtkEntry" style "entry" widget "*search-entry*" style "search-entry" -widget "*GtkTextView" style "entry" +widget "*GtkTextView" style "entry" +widget_class "*.GtkButton.*" style "button" widget_class "<GtkDialog>.*.<GtkButton>" style "dialog-button" widget_class "<GtkDialog>*<GtkCheckButton>" style "radio-or-check-box" -widget_class "<GtkDialog>.<GtkVBox>.<GtkButtonBox>.<GtkButton>*" style "dialog-button" -widget_class "<GtkDialog>.<GtkVBox>.<GtkHBox>.<GtkButtonBox>.<GtkButton>*" style "dialog-button" +widget_class "<GtkDialog>.*.<GtkButtonBox>.*.<GtkButton>.*" style "dialog-button" widget "*.toggleFindInFiles" style "toggle-button" widget "*.toggleReplaceInFiles" style "toggle-button" widget "wizard_dialog" style "wizard-dialog" -widget_class "*<GtkMenu>*" style "menu" -widget_class "*<GtkMenuItem>*" style "menu-item" +widget "*CompletionScrolledWindow*" style "completion_scrollbar" + +widget_class "*<GtkMenu>*" style "menu" +widget_class "*<GtkMenuItem>*" style "menu-item" widget_class "*<GtkSeparatorMenuItem>" style "menu-separator" widget "*.gtk-combobox-popup-menu*" style "combo-box-menu" widget_class "*<GtkToolbar>*" style "toolbar" -widget_class "*ToolButton*" style "toolbar-button" +widget_class "*ToolButton*" style "toolbar-button" -widget_class "*.GtkTreeView.GtkButton" style "tree-header" -widget_class "*.GtkList.GtkButton" style "tree-header" +widget_class "*.<GtkTreeView>*" style "treeview" +widget_class "*.<GtkTreeView>.<GtkButton>" style "tree-header" +widget_class "*.<GtkList>.<GtkButton>" style "tree-header" widget_class "*<GtkIconView>" style "icon-view" widget_class "*.<GtkComboBox>.*" style "combo-box" -widget_class "*.<GtkComboBoxText>.*" style "combo-box-entry" -widget_class "*.<GtkComboBoxEntry>.*" style "combo-box-entry" widget_class "*.<GtkComboBoxText>.<GtkEntry>" style "entry" widget_class "*.<GtkComboBoxEntry>.<GtkEntry>" style "entry" -widget_class "*.<GtkComboBoxText>.<GtkToggleButton>" style "button" -widget_class "*.<GtkComboBoxEntry>.<GtkToggleButton>" style "button" -#widget_class "*.<GtkComboBoxEntry>.GtkEntry" style "entry" -#widget_class "*.<GtkComboBoxEntry>.<GtkButton>" style "dialog-button" -widget_class "*.<GtkComboBox>.*.GtkLabel" style "combo-box-label" +widget_class "*.<GtkComboBoxText>.<GtkToggleButton>" style "combo-box-entry-button" +widget_class "*.<GtkComboBoxEntry>.<GtkButton>*" style "combo-box-entry-button" # Comboboxes within toolbars widget_class "*.<GtkToolbar>.*.<GtkComboBox>.*" style "toolbar-combo-box" widget "*MainToolbar*.GtkComboBox.*" style "toolbar-combo-box" -widget "gtk-tooltip*" style "tooltip" +widget "gtk-tooltip*" style "tooltip" binding "gtk-mac-expand-collapse-cursor-row" { - unbind "Left" - unbind "Right" - bind "Left" { "expand-collapse-cursor-row" (0, 0, 0) } - bind "Right" { "expand-collapse-cursor-row" (0, 1, 0) } + unbind "Left" + unbind "Right" + bind "Left" { "expand-collapse-cursor-row" (0, 0, 0) } + bind "Right" { "expand-collapse-cursor-row" (0, 1, 0) } } + class "GtkTreeView" binding "gtk-mac-expand-collapse-cursor-row" + +# HACK: PropertyGrid toolbar option buttons must have murrine style +widget "*MonoDevelop.PropertyGridToolbar.GtkRadioButton" style "toggle-button" + +# BooleanEditorCell must always have murrine style +widget_class "*BooleanEditor*" style "propertygrid-radio-or-check-box" + +# disable hover background on link labels +class "GtkLabel" style "link-label-fix" diff --git a/main/src/core/MonoDevelop.Ide/gtkrc.mac-dark b/main/src/core/MonoDevelop.Ide/gtkrc.mac-dark new file mode 100644 index 0000000000..a1763bfcd9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/gtkrc.mac-dark @@ -0,0 +1,537 @@ +# Xamarin Studio Dark Mac GTK Theme +# Copyright 2012-2016 Xamarin Inc. +# Authors: +# Christian Kellner <christian.kellner@lanedo.com> +# Carlos Garnacho <carlos.garnacho@lanedo.com> +# Cody Russell <cody@xamarin.com> +# Vsevolod Kukol <vsevolod.kukol@xamarin.com> +# Vaclav Vancura <vaclav@xamarin.com> + + +gtk-color-scheme = +"bg_color: #333 +fg_color: #d7d7d7 +base_color: #404040 +text_color: #d7d7d7 +link_color: #56bbf0 +dim_color: #777777 +selected_bg_color: #5189ed +selected_fg_color: #fff +tooltip_bg_color: #5a5a5a +tooltip_fg_color: #d2d5cd +tooltip_border_color: #b2b2b2" + +gtk-button-images = 0 +gtk-menu-images = 0 +gtk-toolbar-style = 0 +gtk-enable-mnemonics = 0 +gtk-icon-sizes = "gtk-small-toolbar=16,16:gtk-large-toolbar=22,22" +gtk-toolbar-icon-size = large-toolbar +gtk-auto-mnemonics = 1 +gtk-error-bell = 0 +gtk-show-input-method-menu = 0 +gtk-font-name = "Helvetica Neue 12" + + +style "default" { + xthickness = 1 + ythickness = 1 + + font_name = "Helvetica Neue 12" + + ### colours + + bg[NORMAL] = @bg_color + bg[PRELIGHT] = @bg_color + bg[SELECTED] = @selected_bg_color + bg[INSENSITIVE] = @bg_color + bg[ACTIVE] = @bg_color + + fg[NORMAL] = @fg_color + fg[PRELIGHT] = @fg_color + fg[SELECTED] = @selected_fg_color + fg[INSENSITIVE] = @dim_color + fg[ACTIVE] = @fg_color + + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = @dim_color + text[ACTIVE] = @fg_color + + base[NORMAL] = @base_color + base[PRELIGHT] = @selected_bg_color + base[SELECTED] = @selected_bg_color + base[INSENSITIVE] = @bg_color + base[ACTIVE] = shade (0.7, @selected_bg_color) + + ### style properties + + GtkWidget::new-tooltip-style = 1 + GtkWidget::link-color = @link_color + GtkWidget::visited-link-color = @link_color + + GtkEntry::honors-transparent-bg-hint = 1 + GtkEntry::inner-border = { 2, 2, 2, 2 } + + GtkButton::child-displacement-x = 0 + GtkButton::child-displacement-y = 0 + GtkButton::default-border = { 0, 0, 0, 0 } + GtkButton::inner-border = { 2, 2, 4, 4 } + + GtkButtonBox::child-min-width = 70 + GtkButtonBox::child-min-height = 22 + + GtkCheckButton::indicator-size = 14 + GtkCheckButton::indicator-spacing = 4 + + GtkTreeView::odd-row-color = "#3b3b3b" + + GtkScrolledWindow::scrollbar-spacing = 0 + GtkScrolledWindow::scrollbars-within-bevel = 1 + GtkScrolledWindow::draw-child-bg = 1 + GtkScale::slider-length = 14 + GtkRange::trough-side-details = 1 + + GtkTreeView::expander-size = 8 + GtkExpander::expander-size = 8 + GtkComboBox::arrow-size = 12 + + GtkMenu::vertical-padding = 4 + GtkMenuItem::horizontal-padding = 9 + GtkMenuItem::toggle-spacing = 0 + GtkSeparatorMenuItem::horizontal-padding = 2 + + engine "xamarin" { + arrowstyle = 2 + rgba = TRUE + roundness = 3 + glazestyle = 0 + + menustyle = 0 + menuitemstyle = 0 + menubaritemstyle = 0 + comboboxstyle = 1 + spinbuttonstyle = 1 + colorize_scrollbar = FALSE + progressbarstyle = 0 + trough_shades = { 0.842, 0.886 } + gradient_shades = { 1.0, 1.0, 1.0, 1.0 } + fill_shade = 1.0 + + focusstyle = 0 + } +} + +style "wide" = "default" { + xthickness = 2 + ythickness = 2 +} + +style "wider" = "default" { + xthickness = 3 + ythickness = 3 +} + +style "button" = "default" { + xthickness = 2 + ythickness = 4 + + font_name = "Helvetica Neue 12" + + bg[NORMAL] = "#595959" + bg[PRELIGHT] = "#595959" # Mac buttons have no hover state + bg[ACTIVE] = shade(1.2, "#595959") + bg[INSENSITIVE] = "#595959" + + fg[NORMAL] = "#fff" + fg[PRELIGHT] = "#fff" + fg[ACTIVE] = "#fff" + fg[INSENSITIVE] = lighter ("#595959") + + GtkWidget::draw-border = { 1, 1, 1, 1 } + GtkWidget::focus-padding = 0 + GtkWidget::focus-line-width = 1 + + engine "xamarin" { + rgba = FALSE + contrast = 1.0 + focus_color = shade(1.4, @bg_color) + focusstyle = 3 + border_colors = { @bg_color, @bg_color } + textstyle = 0 + highlight_shade = 1.0 + lightborder_shade = 1.0 + default_button_color = lighter ("#595959") + } +} + +style "dialog-button" = "button" { + GtkButton::inner-border = { 7, 7, 3, 4 } + + engine "xamarin" { + default_button_color = "#51ADF3" + } +} + +style "toggle-button" = "button" { + bg[NORMAL] = @bg_color + bg[ACTIVE] = shade(0.98, @base_color) + bg[PRELIGHT] = shade(0.98, @base_color) + + engine "xamarin" { + rgba = FALSE + contrast = 1.0 + gradient_shades = {0.96, 0.918, 0.926, 0.858} + focus_color = shade(0.6, @bg_color) + textstyle = 1 + } +} + +style "menu" { + xthickness = 1 + # ythickness = 0 + + font_name = "Helvetica Neue 12" + + bg[PRELIGHT] = @selected_fg_color + fg[PRELIGHT] = @selected_fg_color + text[PRELIGHT] = @selected_fg_color + + # engine "quartz" { + # } +} + +style "menu-item" = "menu" { + ythickness = 2 + + GtkWidget::draw-border = { 0, 0, 0, 2 } + + engine "xamarin" { + gradient_shades = {1.0, 1.0, 1.0, 1.0} + contrast = 0.0 + roundness = 0 + } +} + +style "menu-separator" = "menu-item" { + ythickness = 3 + engine "xamarin" { + contrast = 1.0 + } +} + +style "toolbar" = "default" +{ + bg[NORMAL] = "#ddd" + + engine "xamarin" { + toolbarstyle = 2 + } +} + +style "toolbar-button" +{ + engine "xamarin" { + contrast = 1.0 + focus_color = @bg_color + } +} + +style "tooltip" +{ + xthickness = 5 + ythickness = 5 + + fg[NORMAL] = @tooltip_fg_color + bg[NORMAL] = @tooltip_bg_color + bg[SELECTED] = @tooltip_border_color + + font_name = "Helvetica Neue 12" + + engine "xamarin" { + roundness = 0 + } +} + +style "treeview" = "default" +{ + base[SELECTED] = @selected_bg_color + base[ACTIVE] = @selected_bg_color + text[SELECTED] = @selected_fg_color + text[ACTIVE] = @selected_fg_color + + engine "xamarin" { + roundness = 0 + gradient_shades = { 1.01, 1.01, 1.01, 1.01 } + glazestyle = 1 + focusstyle = 3 + } +} + +style "tree-header" +{ + bg[NORMAL] = @bg_color + bg[INSENSITIVE] = @bg_color + + engine "xamarin" { + border_colors = { @base_color, @base_color } + } +} + +style "icon-view" = "default" +{ + bg[SELECTED] = "#f5f7fa" + base[SELECTED] = "#f5f7fa" + fg[SELECTED] = "#000" + text[SELECTED] = "#000" +} + +style "toolbar-combo-box" = "default" +{ + fg[NORMAL] = "#616161" + text[NORMAL] = @fg_color + bg[NORMAL] = @bg_color + base[NORMAL] = @bg_color + + ythickness = 4 + xthickness = 2 + + engine "xamarin" { + comboboxstyle = 0 + arrowstyle = 2 + } +} + +style "combo-box" = "button" +{ + #bg[PRELIGHT] = @base_color + #fg[NORMAL] = @base_color + #fg[PRELIGHT] = @base_color + + engine "xamarin" { + arrowstyle = 3 + } +} + +style "combo-box-entry-button" = "combo-box" +{ +} + +style "wizard-dialog" +{ + GtkDialog::content-area-border = 0 +} + +style "combo-box-menu" = "menu" { + font_name = "Helvetica Neue 12" +} + +style "notebook" = "default" +{ + GtkNotebook::tab-overlap = 1 + GtkNotebook::tab-curvature = 3 + + bg[ACTIVE] = "#3b3b3b" # inactive tab color + bg[NORMAL] = @base_color # active tab and notebook bg color + + engine "xamarin" { + roundness = 0 + } +} + +style "quartz-radio-or-check-box" = "default" +{ + ythickness = 6 + + engine "quartz" { + } +} + +style "propertygrid-radio-or-check-box" = "default" +{ + GtkCheckButton::indicator-spacing = 0 + + base[NORMAL] = "#fff" + base[ACTIVE] = "#fff" + base[SELECTED] = "#fff" + base[PRELIGHT] = "#fff" + text[SELECTED] = @base_color + + engine "xamarin" { + border_shades = { 1.33, 1.33 } + } +} + +style "entry" = "default" +{ + xthickness = 4 + ythickness = 4 + + GtkEntry::inner-border = { 2, 2, 2, 2 } + + base[INSENSITIVE] = shade(1.02, @bg_color) + bg[SELECTED] = @selected_bg_color + + engine "xamarin" { + rgba = FALSE + roundness = 0 + focusstyle = 2 + } +} + +style "search-entry" = "wider" +{ + xthickness = 6 + ythickness = 4 + + bg[NORMAL] = @base_color +} + +style "scrollbar" = "default" +{ + GtkScrollbar::has-forward-stepper = 0 + GtkScrollbar::has-backward-stepper = 0 + GtkRange::slider-width = 7 + GtkRange::trough-border = 2 + GtkRange::trough-side-details = 0 + GtkWidget::draw-border = { 0, 0, 0, 0 } + + bg[NORMAL] = @fg_color + bg[PRELIGHT] = @fg_color + + engine "xamarin" + { + roundness = 1 + contrast = 0.0 + trough_shades = { 0.975, 0.975 } + stepperstyle = 1 + } +} + +style "completion_scrollbar" = "scrollbar" +{ + bg[NORMAL] = @base_color +} + +style "progressbar" = "default" +{ + bg[SELECTED] = "#62b3ec" + fg[SELECTED] = "#3a67a6" + + xthickness = 0 + ythickness = 0 +} + +style "scrolled-window" = "default" +{ + xthickness = 1 + ythickness = 1 +} + +style "scale" = "default" +{ + bg[SELECTED] = @selected_bg_color + + engine "xamarin" { + roundness = 7 + } +} + +style "spin-button" = "wider" +{ + fg[NORMAL] = "#616161" + + ythickness = 4 + + GtkEntry::inner-border = { 2, 2, 1, 1 } + + engine "xamarin" { + arrowstyle = 3 + } +} + +style "link-label-fix" +{ + base[PRELIGHT] = @bg_color # disable link hover background +} + + +### Apply the styles + +class "GtkWidget" style "default" + +class "GtkEntry" style "entry" +class "GtkSpinButton" style "spin-button" +class "GtkFrame" style "wider" +class "GtkRange" style "wide" +class "GtkSeparator" style "wide" +class "GtkScrollbar" style "scrollbar" +class "GtkProgressBar" style "progressbar" +class "GtkScrolledWindow" style "scrolled-window" +class "GtkNotebook" style "notebook" +class "GtkButton" style "button" +class "GtkToggleButton" style "toggle-button" +class "GtkCheckButton" style "quartz-radio-or-check-box" +class "GtkComboBox" style "combo-box" + +class "GtkScale" style "scale" + +#widget "*GtkEntry" style "entry" +widget "*search-entry*" style "search-entry" +widget "*GtkTextView" style "entry" + +widget_class "*.GtkButton.*" style "button" +widget_class "<GtkDialog>.*.<GtkButton>" style "dialog-button" +widget_class "<GtkDialog>*<GtkCheckButton>" style "quartz-radio-or-check-box" +widget_class "<GtkDialog>.*.<GtkButtonBox>.*.<GtkButton>.*" style "dialog-button" +widget "*.toggleFindInFiles" style "toggle-button" +widget "*.toggleReplaceInFiles" style "toggle-button" +widget "wizard_dialog" style "wizard-dialog" + +widget "*CompletionScrolledWindow*" style "completion_scrollbar" + +widget_class "*<GtkMenu>*" style "menu" +widget_class "*<GtkMenuItem>*" style "menu-item" +widget_class "*<GtkSeparatorMenuItem>" style "menu-separator" +widget "*.gtk-combobox-popup-menu*" style "combo-box-menu" + +widget_class "*<GtkToolbar>*" style "toolbar" +widget_class "*ToolButton*" style "toolbar-button" + +widget_class "*.<GtkTreeView>*" style "treeview" +widget_class "*.<GtkTreeView>.<GtkButton>" style "tree-header" +widget_class "*.<GtkList>.<GtkButton>" style "tree-header" + +widget_class "*<GtkIconView>" style "icon-view" + +widget_class "*.<GtkComboBox>.*" style "combo-box" +widget_class "*.<GtkComboBoxText>.<GtkEntry>" style "entry" +widget_class "*.<GtkComboBoxEntry>.<GtkEntry>" style "entry" +widget_class "*.<GtkComboBoxText>.<GtkToggleButton>" style "combo-box-entry-button" +widget_class "*.<GtkComboBoxEntry>.<GtkButton>*" style "combo-box-entry-button" + +# Comboboxes within toolbars +widget_class "*.<GtkToolbar>.*.<GtkComboBox>.*" style "toolbar-combo-box" +widget "*MainToolbar*.GtkComboBox.*" style "toolbar-combo-box" + +widget "gtk-tooltip*" style "tooltip" + +binding "gtk-mac-expand-collapse-cursor-row" +{ + unbind "Left" + unbind "Right" + bind "Left" { "expand-collapse-cursor-row" (0, 0, 0) } + bind "Right" { "expand-collapse-cursor-row" (0, 1, 0) } +} + +class "GtkTreeView" binding "gtk-mac-expand-collapse-cursor-row" + +# HACK: PropertyGrid toolbar option buttons must have murrine style +widget "*MonoDevelop.PropertyGridToolbar.GtkRadioButton" style "toggle-button" + +# BooleanEditorCell must always have murrine style +widget_class "*BooleanEditor*" style "propertygrid-radio-or-check-box" + +# disable hover background on link labels +class "GtkLabel" style "link-label-fix"
\ No newline at end of file diff --git a/main/src/core/MonoDevelop.Ide/gtkrc.mac-yosemite b/main/src/core/MonoDevelop.Ide/gtkrc.mac-yosemite deleted file mode 100644 index 486cdda2b5..0000000000 --- a/main/src/core/MonoDevelop.Ide/gtkrc.mac-yosemite +++ /dev/null @@ -1,26 +0,0 @@ -include "gtkrc.mac" - -style "default" { - font_name = "Helvetica Neue 13" -} - -style "dialog-button" { - fg[ACTIVE] = @selected_fg_color - font_name = "Helvetica Neue 13" -} - -style "button" { - font_name = "Helvetica Neue 13" -} - -style "menu" { - font_name = "Helvetica Neue 14" -} - -style "combo-box-menu" { - font_name = "Helvetica Neue 12" -} - -style "tooltip" { - font_name = "Helvetica Neue 12" -} diff --git a/main/src/core/MonoDevelop.Ide/gtkrc.win32 b/main/src/core/MonoDevelop.Ide/gtkrc.win32 index 73291d518a..7d00d21817 100644 --- a/main/src/core/MonoDevelop.Ide/gtkrc.win32 +++ b/main/src/core/MonoDevelop.Ide/gtkrc.win32 @@ -1,101 +1,115 @@ -# Windows Theme for Xamarin composed by Lanedo GmbH -# Copyright 2012 Xamarin Inc. -# Authors: +# Xamarin Studio Light Windows GTK Theme +# Copyright 2012-2016 Xamarin Inc. +# Authors: # Christian Kellner <christian.kellner@lanedo.com> # Carlos Garnacho <carlos.garnacho@lanedo.com> +# Cody Russell <cody@xamarin.com> +# Vsevolod Kukol <vsevolod.kukol@xamarin.com> +# Vaclav Vancura <vaclav@xamarin.com> + gtk-color-scheme = -"bg_color: #f5f5f5 -fg_color: #000 -base_color: #fff -text_color: #000 -selected_bg_color: #649dd6 -selected_fg_color: #fff -tooltip_bg_color: #f2f2f2 -tooltip_fg_color: #222222 +"bg_color: #f5f5f5 +fg_color: #000 +base_color: #fff +text_color: #000 +link_color: #5189ed +selected_bg_color: #cce8ff +selected_fg_color: #000 +tooltip_bg_color: #f2f2f2 +tooltip_fg_color: #222222 tooltip_border_color: #b2b2b2" -gtk-button-images = 0 -gtk-menu-images = 0 -gtk-toolbar-style = 0 -gtk-enable-mnemonics = 1 -gtk-icon-sizes = "gtk-small-toolbar=16,16:gtk-large-toolbar=22,22" +gtk-button-images = 0 +gtk-menu-images = 0 +gtk-toolbar-style = 0 +gtk-enable-mnemonics = 1 +gtk-icon-sizes = "gtk-small-toolbar=16,16:gtk-large-toolbar=22,22" gtk-toolbar-icon-size = large-toolbar -gtk-auto-mnemonics = 1 +gtk-auto-mnemonics = 1 gtk-alternative-button-order = 1 gtk-error-bell = 0 gtk-show-input-method-menu = 0 gtk-font-name = "Segoe UI 9" + style "default" { xthickness = 1 ythickness = 1 ### colours - bg[NORMAL] = @bg_color - bg[PRELIGHT] = @bg_color - bg[SELECTED] = @selected_bg_color - bg[INSENSITIVE] = @bg_color - bg[ACTIVE] = @bg_color - - fg[NORMAL] = @fg_color - fg[PRELIGHT] = @fg_color - fg[SELECTED] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) - fg[ACTIVE] = @fg_color - - text[NORMAL] = @text_color - text[PRELIGHT] = @text_color - text[SELECTED] = @selected_fg_color + + bg[NORMAL] = @bg_color + bg[PRELIGHT] = @bg_color + bg[SELECTED] = @selected_bg_color + bg[INSENSITIVE] = @bg_color + bg[ACTIVE] = @bg_color + + fg[NORMAL] = @fg_color + fg[PRELIGHT] = @fg_color + fg[SELECTED] = @selected_fg_color + fg[INSENSITIVE] = darker (@bg_color) + fg[ACTIVE] = @fg_color + + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color text[INSENSITIVE] = darker (@bg_color) - text[ACTIVE] = @text_color + text[ACTIVE] = @fg_color - base[NORMAL] = @base_color - base[PRELIGHT] = @selected_bg_color - base[SELECTED] = @selected_bg_color + base[NORMAL] = @base_color + base[PRELIGHT] = @selected_bg_color + base[SELECTED] = @selected_bg_color base[INSENSITIVE] = @bg_color - base[ACTIVE] = shade (1.3, @selected_bg_color) + base[ACTIVE] = shade (1.3, @selected_bg_color) ### style properties + GtkWidget::new-tooltip-style = 1 + GtkWidget::link-color = @link_color + GtkWidget::visited-link-color = @link_color - GtkEntry::honors-transparent-bg-hint = 1 + GtkEntry::honors-transparent-bg-hint = 1 # transparent search box background GtkEntry::inner-border = { 2, 2, 2, 2 } GtkButton::child-displacement-x = 0 GtkButton::child-displacement-y = 0 GtkButton::default-border = { 0, 0, 0, 0 } - GtkButton::inner-border = { 2, 2, 2, 2 } + GtkButton::inner-border = { 2, 2, 4, 4 } - GtkTreeView::odd-row-color = @base_color + GtkTreeView::odd-row-color = "#fafafa" GtkScrolledWindow::scrollbar-spacing = 0 + GtkScrolledWindow::scrollbars-within-bevel = 1 GtkScale::slider-length = 14 - GtkMenu::horizontal-padding = 3 - GtkMenu::vertical-padding = 3 + GtkMenu::horizontal-padding = 1 + GtkMenu::vertical-padding = 1 GtkMenuItem::horizontal-padding = 2 - GtkSeparatorMenuItem::horizontal-padding = 2 + GtkSeparatorMenuItem::horizontal-padding = 0 GtkTreeView::expander-size = 8 GtkExpander::expander-size = 8 GtkComboBox::arrow-size = 8 + GtkComboBox::appears-as-list = 0 engine "xamarin" { - - arrowstyle = 2 - rgba = TRUE - roundness = 3 + arrowstyle = 3 + rgba = TRUE + roundness = 0 glazestyle = 0 + highlight_shade = 1.0 - menustyle = 0 - menuitemstyle = 0 + menustyle = 0 + menuitemstyle = 0 menubaritemstyle = 0 - comboboxstyle = 1 - spinbuttonstyle = 1 + comboboxstyle = 0 + spinbuttonstyle = 1 colorize_scrollbar = FALSE progressbarstyle = 0 trough_shades = { 0.842, 0.886 } + gradient_shades = { 1.0, 1.0, 1.0, 1.0} + fill_shade = 1.0 } } @@ -109,12 +123,27 @@ style "wider" = "default" { ythickness = 3 } - -style "button" { +style "button" = "default" { xthickness = 2 - ythickness = 1 + ythickness = 4 + + bg[NORMAL] = "#e1e1e1" + bg[PRELIGHT] = "#bee6fd" + bg[ACTIVE] = "#c4e5f6" + bg[SELECTED] = "#ADADAD" + + fg[SELECTED] = @fg_color - engine "wimp" { + GtkWidget::focus-padding = 0 + GtkWidget::focus-line-width = 1 + + engine "xamarin" { + rgba = FALSE + roundness = 0 + contrast = 1.0 + focus_color = "#3c7fb1" + focusstyle = 3 + textstyle = 0 } } @@ -122,21 +151,38 @@ style "menu" = "default" { xthickness = 0 ythickness = 0 - engine "wimp" { - } + fg[PRELIGHT] = @selected_fg_color + text[PRELIGHT] = @selected_fg_color +} + +style "menubar" = "default" { + xthickness = 5 + ythickness = 3 } -style "menu-item" = "default" { +style "menu-item" = "menu" { xthickness = 5 ythickness = 3 - engine "wimp" { + engine "xamarin" { + arrowstyle = 2 + contrast = 0.0 + } +} + +style "menu-separator" = "menu-item" { + xthickness = 0 + ythickness = 2 + + engine "xamarin" { + contrast = 1.0 } } style "toolbar" = "default" { bg[NORMAL] = "#ddd" + engine "xamarin" { toolbarstyle = 2 } @@ -146,8 +192,8 @@ style "toolbar-button" { engine "xamarin" { contrast = 1.0 - focus_color = @bg_color - } + focus_color = @bg_color + } } style "tooltip" @@ -158,23 +204,14 @@ style "tooltip" fg[NORMAL] = @tooltip_fg_color bg[NORMAL] = @tooltip_bg_color bg[SELECTED] = @tooltip_border_color - - engine "xamarin" { - roundness = 0 - } } style "treeview" = "default" { - GtkTreeView::odd-row-color = "#f5f5f5" - - base[SELECTED] = "#bcd0d4" - base[ACTIVE] = "#bcd0d4" - text[SELECTED] = "#000" + base[ACTIVE] = @selected_bg_color + text[ACTIVE] = @selected_fg_color engine "xamarin" { - roundness = 0 - gradient_shades = {1.0, 0.95, 0.95, 0.90} glazestyle = 1 } } @@ -182,10 +219,11 @@ style "treeview" = "default" style "tree-header" = "wide" { bg[NORMAL] = "#f2f2f2" + bg[PRELIGHT] = "#d9ebf9" + bg[ACTIVE] = "#bcdcf4" engine "xamarin" { - listviewheaderstyle = 3 - separatorstyle = 1 + focusstyle = 0 } } @@ -193,40 +231,53 @@ style "icon-view" = "default" { bg[SELECTED] = "#f5f7fa" base[SELECTED] = "#f5f7fa" - fg[SELECTED] = "#000" - text[SELECTED] = "#000" + fg[SELECTED] = @fg_color + text[SELECTED] = @fg_color } -style "toolbar-combo-box" = "default" +style "toolbar-combo-box" = "button" { - fg[NORMAL] = @fg_color - text[NORMAL] = @fg_color - bg[NORMAL] = "#fff" - base[NORMAL] = "#fff" + bg[NORMAL] = @base_color + base[NORMAL] = @base_color - engine "wimp" { - comboboxstyle = 0 - arrowstyle = 2 + ythickness = 4 + xthickness = 2 + GtkWidget::focus-padding = 0 + + engine "xamarin" { + roundness = 3 } } style "combo-box" = "default" { - fg[NORMAL] = "#616161" + bg[NORMAL] = @base_color + bg[ACTIVE] = @base_color + ythickness = 0 + xthickness = 0 +} - engine "wimp" { - arrowstyle = 3 - } +style "combo-box-button" = "button" +{ + bg[PRELIGHT] = @base_color + base[PRELIGHT] = "#ADADAD" + bg[ACTIVE] = "#ADADAD" } -style "combo-box-label" = "combo-box" +style "combo-box-entry" = "entry" +{ + xthickness = 0 + ythickness = 0 +} + +style "combo-box-entry-button" = "combo-box-button" { - fg[NORMAL] = "#595959" } style "notebook" = "default" { GtkNotebook::tab-overlap = 1 + bg[ACTIVE] = @base_color bg[NORMAL] = @base_color @@ -235,37 +286,43 @@ style "notebook" = "default" } } -style "radio-button" = "default" +style "radio-check-box" = "button" { GtkCheckButton::indicator-size = 15 - text[NORMAL] = lighter (@text_color) - base[NORMAL] = @base_color - text[ACTIVE] = lighter(@text_color) -} -style "check-box" = "default" -{ - GtkCheckButton::indicator-size = 15 - base[NORMAL] = "#f8f8f8" - text[NORMAL] = "#404040" - text[ACTIVE] = "#404040" + base[SELECTED] = @base_color + text[SELECTED] = @fg_color + + engine "xamarin" { + focusstyle = 0 + } } style "entry" = "default" { xthickness = 4 ythickness = 4 + GtkEntry::inner-border = { 2, 2, 2, 2 } } style "search-entry" = "wider" { GtkEntry::inner-border = { 0, 0, 0, 0 } + xthickness = 6 ythickness = 4 + bg[NORMAL] = @base_color } +style "search-entry-rounded" = "search-entry" +{ + engine "xamarin" { + roundness = 3 + } +} + style "wizard-dialog" { GtkDialog::content-area-border = 0 @@ -273,10 +330,35 @@ style "wizard-dialog" style "scrollbar" = "default" { - GtkRange::slider-width = 7 - GtkRange::trough-border = 2 + GtkRange::slider-width = 14 + GtkRange::trough-border = 0 + GtkWidget::draw-border = { 0, 0, 0, 0 } + + bg[NORMAL] = "#CDCDCD" # default slider/stepper color + bg[INSENSITIVE] = "#CDCDCD" # disabled slider/stepper color + bg[PRELIGHT] = "#A6A6A6" # hover slider/stepper color + bg[ACTIVE] = "#CDCDCD" # pressed stepper color + + engine "xamarin" + { + contrast = 0.0 + trough_shades = { 1.026, 1.026 } + stepperstyle = 1 + arrowstyle = 0 + } +} + +style "completion_scrollbar" = "scrollbar" +{ + GtkScrollbar::has-forward-stepper = 0 + GtkScrollbar::has-backward-stepper = 0 + GtkRange::slider-width = 9 + + bg[NORMAL] = @bg_color - engine "wimp" { + engine "xamarin" + { + trough_shades = { 0.97, 0.97 } } } @@ -284,6 +366,7 @@ style "progressbar" = "default" { bg[SELECTED] = "#62b3ec" fg[SELECTED] = "#3a67a6" + xthickness = 0 ythickness = 0 } @@ -301,52 +384,67 @@ style "scale" = "default" } } +style "link-label-fix" +{ + base[PRELIGHT] = @bg_color # disable link hover background +} + + ### Apply the styles -class "GtkWidget" style "default" +class "GtkWidget" style "default" -class "GtkEntry" style "entry" +class "GtkEntry" style "entry" class "GtkSpinButton" style "wider" -class "GtkFrame" style "wide" -class "GtkRange" style "wide" +class "GtkFrame" style "wide" +class "GtkRange" style "wide" class "GtkSeparator" style "wide" class "GtkScrollbar" style "scrollbar" class "GtkProgressBar" style "progressbar" class "GtkScrolledWindow" style "scrolled-window" class "GtkNotebook" style "notebook" class "GtkButton" style "button" +class "GtkComboBox" style "combo-box" +class "GtkComboBoxEntry" style "combo-box-entry" -class "GtkRadioButton" style "radio-button" -class "GtkCheckButton" style "check-box" +class "GtkRadioButton" style "radio-check-box" +class "GtkCheckButton" style "radio-check-box" class "GtkScale" style "scale" widget "*GtkEntry" style:highest "entry" widget "*search-entry*" style "search-entry" +widget_class "*Toolbar*.*SearchEntry*" style:highest "search-entry-rounded" + +widget "wizard_dialog" style "wizard-dialog" -widget_class "*<GtkButton>" style "button" -widget "*.GtkToggleButton" style "button" -widget "wizard_dialog" style "wizard-dialog" +widget "*CompletionScrolledWindow*" style "completion_scrollbar" -widget_class "*<GtkMenu>*" style "menu" -widget_class "*<GtkMenuItem>*" style "menu-item" +widget_class "*<GtkMenu>*" style "menu" +widget_class "*<GtkMenuItem>*" style "menu-item" +widget_class "*<GtkSeparatorMenuItem>*" style "menu-separator" +widget_class "*<GtkMenuBar>" style "menubar" widget_class "*<GtkToolbar>*" style "toolbar" -widget_class "*ToolButton*" style "toolbar-button" +widget_class "*ToolButton*" style "toolbar-button" -widget_class "*.<GtkTreeView>*" style "treeview" -widget_class "*.GtkTreeView.GtkButton" style "tree-header" -widget_class "*.GtkList.GtkButton" style "tree-header" +widget_class "*.<GtkTreeView>*" style "treeview" +widget_class "*.<GtkTreeView>.<GtkButton>" style "tree-header" +widget_class "*.<GtkList>.<GtkButton>" style "tree-header" widget_class "*<GtkIconView>" style "icon-view" -class "GtkComboBox" style "combo-box" -widget_class "*.<GtkComboBox>.*" style "combo-box" -widget_class "*.<GtkComboBoxText>.*" style "combo-box" -widget_class "*.<GtkComboBoxEntry>.*" style "combo-box" -widget_class "*.<GtkComboBoxText>.<GtkEntry>" style "entry" -widget_class "*.<GtkComboBox>.*.GtkLabel" style "combo-box-label" +widget_class "*<GtkComboBox>*" style "combo-box" +widget_class "*.<GtkComboBox>*<GtkButton>*" style "combo-box-button" + +widget_class "*<GtkComboBoxText>*" style "combo-box-entry" +widget_class "*.<GtkComboBoxText>*<GtkButton>*" style "combo-box-entry-button" +widget_class "*<GtkComboBoxEntry>*" style "combo-box-entry" +widget_class "*.<GtkComboBoxEntry>*<GtkButton>*" style "combo-box-entry-button" # Comboboxes within toolbars -widget_class "*.<GtkToolbar>.*.<GtkComboBox>.*" style "toolbar-combo-box" -widget "*MainToolbar*.GtkComboBox.*" style "toolbar-combo-box" +widget_class "*.<GtkToolbar>.<GtkComboBox>.<GtkButton>" style "toolbar-combo-box" +widget "*MainToolbar*.GtkComboBox.*" style:highest "toolbar-combo-box" + +widget "gtk-tooltip*" style "tooltip" -widget "gtk-tooltip*" style "tooltip" +# disable hover background on link labels +class "GtkLabel" style "link-label-fix" diff --git a/main/src/core/MonoDevelop.Ide/gtkrc.win32-dark b/main/src/core/MonoDevelop.Ide/gtkrc.win32-dark new file mode 100644 index 0000000000..38d26e2b5b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/gtkrc.win32-dark @@ -0,0 +1,480 @@ +# Xamarin Studio Dark Windows GTK Theme +# Copyright 2012-2016 Xamarin Inc. +# Authors: +# Christian Kellner <christian.kellner@lanedo.com> +# Carlos Garnacho <carlos.garnacho@lanedo.com> +# Cody Russell <cody@xamarin.com> +# Vsevolod Kukol <vsevolod.kukol@xamarin.com> +# Vaclav Vancura <vaclav@xamarin.com> + + +gtk-color-scheme = +"bg_color: #333 +fg_color: #d7d7d7 +base_color: #404040 +text_color: #d7d7d7 +link_color: #56bbf0 +dim_color: #777777 +selected_bg_color: #4c5e6e +selected_fg_color: #bfbfbf +tooltip_bg_color: #5a5a5a +tooltip_fg_color: #d2d5cd +tooltip_border_color: #b2b2b2" + +gtk-button-images = 0 +gtk-menu-images = 0 +gtk-toolbar-style = 0 +gtk-enable-mnemonics = 1 +gtk-icon-sizes = "gtk-small-toolbar=16,16:gtk-large-toolbar=22,22" +gtk-toolbar-icon-size = large-toolbar +gtk-auto-mnemonics = 1 +gtk-alternative-button-order = 1 +gtk-error-bell = 0 +gtk-show-input-method-menu = 0 +gtk-font-name = "Segoe UI 9" + + +style "default" { + xthickness = 1 + ythickness = 1 + + ### colours + + bg[NORMAL] = @bg_color + bg[PRELIGHT] = @bg_color + bg[SELECTED] = @selected_bg_color + bg[INSENSITIVE] = @bg_color + bg[ACTIVE] = @bg_color + + fg[NORMAL] = @fg_color + fg[PRELIGHT] = @fg_color + fg[SELECTED] = @selected_fg_color + fg[INSENSITIVE] = @dim_color + fg[ACTIVE] = @fg_color + + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = @dim_color + text[ACTIVE] = @fg_color + + base[NORMAL] = @base_color + base[PRELIGHT] = @selected_bg_color + base[SELECTED] = @selected_bg_color + base[INSENSITIVE] = @bg_color + base[ACTIVE] = shade (1.3, @selected_bg_color) + + ### style properties + + GtkWidget::new-tooltip-style = 1 + GtkWidget::link-color = @link_color + GtkWidget::visited-link-color = @link_color + + GtkEntry::honors-transparent-bg-hint = 1 # transparent search box background + GtkEntry::inner-border = { 2, 2, 2, 2 } + + GtkButton::child-displacement-x = 0 + GtkButton::child-displacement-y = 0 + GtkButton::default-border = { 0, 0, 0, 0 } + GtkButton::inner-border = { 2, 2, 4, 4 } + + GtkTreeView::odd-row-color = "#3b3b3b" + + GtkScrolledWindow::scrollbar-spacing = 0 + GtkScrolledWindow::scrollbars-within-bevel = 1 + GtkScale::slider-length = 14 + + GtkMenu::horizontal-padding = 1 + GtkMenu::vertical-padding = 1 + GtkMenuItem::horizontal-padding = 2 + GtkSeparatorMenuItem::horizontal-padding = 0 + + GtkTreeView::expander-size = 8 + GtkExpander::expander-size = 8 + GtkComboBox::arrow-size = 8 + GtkComboBox::appears-as-list = 0 + + engine "xamarin" { + arrowstyle = 3 + rgba = TRUE + roundness = 0 + glazestyle = 0 + highlight_shade = 1.0 + + menustyle = 0 + menuitemstyle = 0 + menubaritemstyle = 0 + comboboxstyle = 0 + spinbuttonstyle = 1 + colorize_scrollbar = FALSE + progressbarstyle = 0 + trough_shades = { 0.842, 0.886 } + gradient_shades = { 1.0, 1.0, 1.0, 1.0} + fill_shade = 1.0 + } +} + +style "wide" = "default" { + xthickness = 2 + ythickness = 2 +} + +style "wider" = "default" { + xthickness = 3 + ythickness = 3 +} + +style "button" = "default" { + xthickness = 2 + ythickness = 4 + + bg[NORMAL] = "#3E3E40" + bg[PRELIGHT] ="#595959" + bg[ACTIVE] = "#595959" + bg[INSENSITIVE] = "#595959" + + fg[NORMAL] = "#fff" + fg[PRELIGHT] = "#fff" + fg[ACTIVE] = "black" + fg[INSENSITIVE] = lighter ("#595959") + + GtkWidget::focus-padding = 0 + GtkWidget::focus-line-width = 1 + + engine "xamarin" { + rgba = FALSE + roundness = 0 + contrast = 1.0 + focus_color = shade(1.4, @bg_color) + focusstyle = 3 + textstyle = 0 + default_button_color = lighter ("#595959") + } +} + +style "toggle-button" = "button" { + bg[NORMAL] = @base_color + bg[ACTIVE] = @bg_color + bg[PRELIGHT] = @bg_color + fg[ACTIVE] = "#fff" +} + +style "menu" = "default" { + xthickness = 0 + ythickness = 0 + + base[NORMAL] = @selected_fg_color # option menu color (FIXME: remove murrine dark shade) + base[PRELIGHT] = @selected_fg_color # option menu color (FIXME: remove murrine dark shade) + fg[PRELIGHT] = @selected_fg_color + text[PRELIGHT] = @selected_fg_color +} + +style "menubar" = "default" { + xthickness = 5 + ythickness = 3 + bg[SELECTED] = @bg_color # selected/open background + fg[PRELIGHT] = @selected_fg_color # selected/open text +} + +style "menu-item" = "menu" { + xthickness = 5 + ythickness = 3 + + engine "xamarin" { + arrowstyle = 2 + contrast = 0.0 + } +} + +style "menu-separator" = "menu-item" { + xthickness = 0 + ythickness = 2 + engine "xamarin" { + contrast = 1.0 + } +} + +style "toolbar" = "default" +{ + bg[NORMAL] = "#ddd" + + engine "xamarin" { + toolbarstyle = 2 + } +} + +style "toolbar-button" +{ + engine "xamarin" { + contrast = 1.0 + focus_color = @bg_color + } +} + +style "tooltip" +{ + xthickness = 5 + ythickness = 5 + + fg[NORMAL] = @tooltip_fg_color + bg[NORMAL] = @tooltip_bg_color + bg[SELECTED] = @tooltip_border_color +} + +style "treeview" = "default" +{ + base[ACTIVE] = @selected_bg_color + text[ACTIVE] = @selected_fg_color + + engine "xamarin" { + roundness = 0 + gradient_shades = { 1.01, 1.01, 1.01, 1.01 } + glazestyle = 1 + } +} + +style "tree-header" = "wide" +{ + bg[NORMAL] = @bg_color + bg[PRELIGHT] = lighter (@bg_color) + bg[ACTIVE] = lighter (@bg_color) + + engine "xamarin" { + focusstyle = 0 + listviewheaderstyle = 3 + separatorstyle = 1 + } +} + +style "icon-view" = "default" +{ + bg[SELECTED] = "#f5f7fa" + base[SELECTED] = "#f5f7fa" + fg[SELECTED] = "#000" + text[SELECTED] = "#000" +} + +style "toolbar-combo-box" = "button" +{ + bg[NORMAL] = @bg_color + base[NORMAL] = @bg_color + fg[NORMAL] = @bg_color + text[NORMAL] = @bg_color + + ythickness = 4 + xthickness = 2 + GtkWidget::focus-padding = 0 + + engine "xamarin" { + roundness = 3 + } +} + +style "combo-box" = "default" + { + bg[NORMAL] = @base_color + bg[ACTIVE] = @base_color + ythickness = 0 + xthickness = 0 +} + +style "combo-box-button" = "button" +{ +} + +style "combo-box-entry" = "entry" +{ + xthickness = 0 + ythickness = 0 +} + +style "combo-box-entry-button" = "combo-box-button" +{ +} + +style "notebook" = "default" +{ + GtkNotebook::tab-overlap = 1 + + bg[ACTIVE] = @base_color + bg[NORMAL] = @base_color + + engine "xamarin" { + gradient_shades = { 0.945, 0.945, 0.945, 0.685 } + } +} + +style "radio-check-box" = "button" +{ + GtkCheckButton::indicator-size = 15 + + bg[ACTIVE] = @bg_color + fg[NORMAL] = @fg_color + fg[PRELIGHT] = "#fff" + fg[ACTIVE] = @fg_color + + base[NORMAL] = @base_color + base[ACTIVE] = @base_color + base[SELECTED] = @base_color + base[PRELIGHT] = @base_color + text[PRELIGHT] = "#fff" + + engine "xamarin" { + focusstyle = 0 + } +} + +style "entry" = "default" +{ + xthickness = 4 + ythickness = 4 + + GtkEntry::inner-border = { 2, 2, 2, 2 } +} + +style "search-entry" = "wider" +{ + GtkEntry::inner-border = { 0, 0, 0, 0 } + + xthickness = 6 + ythickness = 4 + + bg[NORMAL] = @base_color +} + +style "search-entry-rounded" = "search-entry" +{ + engine "xamarin" { + roundness = 3 + } +} + +style "wizard-dialog" +{ + GtkDialog::content-area-border = 0 +} + +style "scrollbar" = "default" +{ + GtkRange::slider-width = 14 + GtkRange::trough-border = 0 + GtkWidget::draw-border = { 0, 0, 0, 0 } + + fg[INSENSITIVE] = lighter (@base_color) # inactive arrow + fg[NORMAL] = "black" # active arrow + bg[NORMAL] = @fg_color # default slider/stepper color + bg[INSENSITIVE] = @fg_color # disabled slider/stepper color + bg[PRELIGHT] = shade (0.8, @fg_color) # hover slider/stepper color + bg[ACTIVE] = @fg_color # pressed stepper color + + engine "xamarin" + { + contrast = 0.0 + trough_shades = { 1.026, 1.026 } + stepperstyle = 1 + arrowstyle = 0 + } +} + +style "completion_scrollbar" = "scrollbar" +{ + GtkScrollbar::has-forward-stepper = 0 + GtkScrollbar::has-backward-stepper = 0 + GtkRange::slider-width = 9 + + bg[NORMAL] = @base_color + bg[PRELIGHT] = shade (1.3, @base_color) + + engine "xamarin" + { + trough_shades = { 0.97, 0.97 } + } +} + +style "progressbar" = "default" +{ + bg[SELECTED] = "#62b3ec" + fg[SELECTED] = "#3a67a6" + + xthickness = 0 + ythickness = 0 +} + +style "scrolled-window" = "default" +{ + xthickness = 1 + ythickness = 1 +} + +style "scale" = "default" +{ + engine "xamarin" { + roundness = 7 + } +} + +style "link-label-fix" +{ + base[PRELIGHT] = @bg_color # disable link hover background +} + + +### Apply the styles +class "GtkWidget" style "default" + +class "GtkEntry" style "entry" +class "GtkSpinButton" style "wider" +class "GtkFrame" style "wide" +class "GtkRange" style "wide" +class "GtkSeparator" style "wide" +class "GtkScrollbar" style "scrollbar" +class "GtkProgressBar" style "progressbar" +class "GtkScrolledWindow" style "scrolled-window" +class "GtkNotebook" style "notebook" +class "GtkButton" style "button" +class "GtkToggleButton" style "toggle-button" +class "GtkComboBox" style "combo-box" +class "GtkComboBoxEntry" style "combo-box-entry" + +class "GtkRadioButton" style "radio-check-box" +class "GtkCheckButton" style "radio-check-box" +class "GtkScale" style "scale" + +widget "*GtkEntry" style:highest "entry" +widget "*search-entry*" style "search-entry" +widget_class "*Toolbar*.*SearchEntry*" style:highest "search-entry-rounded" + +widget "wizard_dialog" style "wizard-dialog" + +widget "*CompletionScrolledWindow*" style "completion_scrollbar" + +widget_class "*<GtkMenu>*" style "menu" +widget_class "*<GtkMenuItem>*" style "menu-item" +widget_class "*<GtkSeparatorMenuItem>*" style "menu-separator" +widget_class "*<GtkMenuBar>*" style "menubar" + +widget_class "*<GtkToolbar>*" style "toolbar" +widget_class "*ToolButton*" style "toolbar-button" + +widget_class "*.<GtkTreeView>*" style "treeview" +widget_class "*.<GtkTreeView>.<GtkButton>" style "tree-header" +widget_class "*.<GtkList>.<GtkButton>" style "tree-header" + +widget_class "*<GtkIconView>" style "icon-view" + +widget_class "*<GtkComboBox>*" style "combo-box" +widget_class "*.<GtkComboBox>*<GtkButton>*" style "combo-box-button" + +widget_class "*<GtkComboBoxText>*" style "combo-box-entry" +widget_class "*.<GtkComboBoxText>*<GtkButton>*" style "combo-box-entry-button" +widget_class "*<GtkComboBoxEntry>*" style "combo-box-entry" +widget_class "*.<GtkComboBoxEntry>*<GtkButton>*" style "combo-box-entry-button" + +# Comboboxes within toolbars +widget_class "*.<GtkToolbar>.<GtkComboBox>.<GtkButton>" style "toolbar-combo-box" +widget "*MainToolbar*.GtkComboBox.*" style:highest "toolbar-combo-box" + +widget "gtk-tooltip*" style "tooltip" + +# disable hover background on link labels +class "GtkLabel" style "link-label-fix" diff --git a/main/src/core/MonoDevelop.Ide/gtkrc.win32-vista b/main/src/core/MonoDevelop.Ide/gtkrc.win32-vista deleted file mode 100644 index 58345088f5..0000000000 --- a/main/src/core/MonoDevelop.Ide/gtkrc.win32-vista +++ /dev/null @@ -1,351 +0,0 @@ -# Windows Theme for Xamarin composed by Lanedo GmbH -# Copyright 2012 Xamarin Inc. -# Authors: -# Christian Kellner <christian.kellner@lanedo.com> -# Carlos Garnacho <carlos.garnacho@lanedo.com> - -gtk-color-scheme = -"bg_color: #f5f5f5 -fg_color: #000 -base_color: #fff -text_color: #000 -selected_bg_color: #649dd6 -selected_fg_color: #fff -tooltip_bg_color: #fff9e5 -tooltip_fg_color: #000" - -gtk-button-images = 0 -gtk-menu-images = 0 -gtk-toolbar-style = 0 -gtk-enable-mnemonics = 1 -gtk-icon-sizes = "gtk-small-toolbar=16,16:gtk-large-toolbar=22,22" -gtk-toolbar-icon-size = large-toolbar -gtk-auto-mnemonics = 1 -gtk-alternative-button-order = 1 -gtk-error-bell = 0 -gtk-show-input-method-menu = 0 -gtk-font-name = "Tahoma 8" - -style "default" { - xthickness = 1 - ythickness = 1 - - ### colours - bg[NORMAL] = @bg_color - bg[PRELIGHT] = @bg_color - bg[SELECTED] = @selected_bg_color - bg[INSENSITIVE] = @bg_color - bg[ACTIVE] = @bg_color - - fg[NORMAL] = @fg_color - fg[PRELIGHT] = @fg_color - fg[SELECTED] = @selected_fg_color - fg[INSENSITIVE] = darker (@bg_color) - fg[ACTIVE] = @fg_color - - text[NORMAL] = @text_color - text[PRELIGHT] = @text_color - text[SELECTED] = @selected_fg_color - text[INSENSITIVE] = darker (@bg_color) - text[ACTIVE] = @text_color - - base[NORMAL] = @base_color - base[PRELIGHT] = @selected_bg_color - base[SELECTED] = @selected_bg_color - base[INSENSITIVE] = @bg_color - base[ACTIVE] = shade (1.3, @selected_bg_color) - - ### style properties - GtkWidget::new-tooltip-style = 1 - - GtkEntry::honors-transparent-bg-hint = 1 - GtkEntry::inner-border = { 2, 2, 2, 2 } - - GtkButton::child-displacement-x = 0 - GtkButton::child-displacement-y = 0 - GtkButton::default-border = { 0, 0, 0, 0 } - GtkButton::inner-border = { 2, 2, 2, 2 } - - GtkTreeView::odd-row-color = @base_color - - GtkScrolledWindow::scrollbar-spacing = 0 - GtkScale::slider-length = 14 - - GtkMenu::horizontal-padding = 3 - GtkMenu::vertical-padding = 3 - GtkMenuItem::horizontal-padding = 2 - GtkSeparatorMenuItem::horizontal-padding = 2 - - GtkTreeView::expander-size = 8 - GtkExpander::expander-size = 8 - GtkComboBox::arrow-size = 8 - - engine "xamarin" { - - arrowstyle = 2 - rgba = TRUE - roundness = 3 - glazestyle = 0 - - menustyle = 0 - menuitemstyle = 0 - menubaritemstyle = 0 - comboboxstyle = 1 - spinbuttonstyle = 1 - colorize_scrollbar = FALSE - progressbarstyle = 0 - trough_shades = { 0.842, 0.886 } - } -} - -style "wide" = "default" { - xthickness = 2 - ythickness = 2 -} - -style "wider" = "default" { - xthickness = 3 - ythickness = 3 -} - - -style "button" { - xthickness = 2 - ythickness = 1 - - engine "wimp" { - } -} - -style "menu" = "default" { - xthickness = 0 - ythickness = 0 - - engine "wimp" { - } -} - -style "menu-item" = "default" { - xthickness = 5 - ythickness = 3 - - engine "wimp" { - } -} - -style "toolbar" = "default" -{ - bg[NORMAL] = "#ddd" - engine "xamarin" { - toolbarstyle = 2 - } -} - -style "toolbar-button" -{ - engine "xamarin" { - contrast = 1.0 - focus_color = @bg_color - } -} - -style "tooltip" -{ - xthickness = 5 - ythickness = 5 - - fg[NORMAL] = @tooltip_fg_color - bg[NORMAL] = @tooltip_bg_color - - engine "xamarin" { - roundness = 0 - } -} - -style "treeview" = "default" -{ - GtkTreeView::odd-row-color = "#f5f5f5" - - base[SELECTED] = "#bcd0d4" - base[ACTIVE] = "#bcd0d4" - text[SELECTED] = "#000" - - engine "xamarin" { - roundness = 0 - gradient_shades = {1.0, 0.95, 0.95, 0.90} - glazestyle = 1 - } -} - -style "tree-header" = "wide" -{ - bg[NORMAL] = "#f2f2f2" - - engine "xamarin" { - listviewheaderstyle = 3 - separatorstyle = 1 - } -} - -style "icon-view" = "default" -{ - bg[SELECTED] = "#f5f7fa" - base[SELECTED] = "#f5f7fa" - fg[SELECTED] = "#000" - text[SELECTED] = "#000" -} - -style "toolbar-combo-box" = "default" -{ - fg[NORMAL] = @fg_color - text[NORMAL] = @fg_color - bg[NORMAL] = "#fff" - base[NORMAL] = "#fff" - - engine "wimp" { - comboboxstyle = 0 - arrowstyle = 2 - } -} - -style "combo-box" = "default" -{ - fg[NORMAL] = "#616161" - - engine "wimp" { - arrowstyle = 3 - } -} - -style "combo-box-label" = "combo-box" -{ - fg[NORMAL] = "#595959" -} - -style "notebook" = "default" -{ - GtkNotebook::tab-overlap = 1 - bg[ACTIVE] = @base_color - bg[NORMAL] = @base_color - - engine "xamarin" { - gradient_shades = { 0.945, 0.945, 0.945, 0.685 } - } -} - -style "wizard-dialog" -{ - GtkDialog::content-area-border = 0 -} - -style "radio-button" = "default" -{ - GtkCheckButton::indicator-size = 15 - text[NORMAL] = lighter (@text_color) - base[NORMAL] = @base_color - text[ACTIVE] = lighter(@text_color) -} - -style "check-box" = "default" -{ - GtkCheckButton::indicator-size = 15 - base[NORMAL] = "#f8f8f8" - text[NORMAL] = "#404040" - text[ACTIVE] = "#404040" -} - -style "entry" = "default" -{ - xthickness = 4 - ythickness = 4 - GtkEntry::inner-border = { 2, 2, 2, 2 } -} - -style "search-entry" = "wider" -{ - GtkEntry::inner-border = { 0, 0, 0, 0 } - xthickness = 6 - ythickness = 4 - bg[NORMAL] = @base_color -} - -style "scrollbar" = "default" -{ - GtkRange::slider-width = 7 - GtkRange::trough-border = 2 - - engine "wimp" { - } -} - -style "progressbar" = "default" -{ - bg[SELECTED] = "#62b3ec" - fg[SELECTED] = "#3a67a6" - xthickness = 0 - ythickness = 0 -} - -style "scrolled-window" = "default" -{ - xthickness = 1 - ythickness = 1 -} - -style "scale" = "default" -{ - engine "xamarin" { - roundness = 7 - } -} - -### Apply the styles -class "GtkWidget" style "default" - -class "GtkEntry" style "entry" -class "GtkSpinButton" style "wider" -class "GtkFrame" style "wide" -class "GtkRange" style "wide" -class "GtkSeparator" style "wide" -class "GtkScrollbar" style "scrollbar" -class "GtkProgressBar" style "progressbar" -class "GtkScrolledWindow" style "scrolled-window" -class "GtkNotebook" style "notebook" -class "GtkButton" style "button" - -class "GtkRadioButton" style "radio-button" -class "GtkCheckButton" style "check-box" -class "GtkScale" style "scale" - -widget "*GtkEntry" style:highest "entry" -widget "*search-entry*" style "search-entry" - -widget_class "*<GtkButton>" style "button" -widget "*.GtkToggleButton" style "button" - -widget "wizard_dialog" style "wizard-dialog" - -widget_class "*<GtkMenu>*" style "menu" -widget_class "*<GtkMenuItem>*" style "menu-item" - -widget_class "*<GtkToolbar>*" style "toolbar" -widget_class "*ToolButton*" style "toolbar-button" - -widget_class "*.<GtkTreeView>*" style "treeview" -widget_class "*.GtkTreeView.GtkButton" style "tree-header" -widget_class "*.GtkList.GtkButton" style "tree-header" - -widget_class "*<GtkIconView>" style "icon-view" - -class "GtkComboBox" style "combo-box" -widget_class "*.<GtkComboBox>.*" style "combo-box" -widget_class "*.<GtkComboBoxText>.*" style "combo-box" -widget_class "*.<GtkComboBoxEntry>.*" style "combo-box" -widget_class "*.<GtkComboBoxText>.<GtkEntry>" style "entry" -widget_class "*.<GtkComboBox>.*.GtkLabel" style "combo-box-label" - -# Comboboxes within toolbars -widget_class "*.<GtkToolbar>.*.<GtkComboBox>.*" style "toolbar-combo-box" -widget "*MainToolbar*.GtkComboBox.*" style "toolbar-combo-box" - -widget "gtk-tooltip*" style "tooltip" diff --git a/main/src/core/MonoDevelop.Ide/icons/about-16.png b/main/src/core/MonoDevelop.Ide/icons/about-16.png Binary files differdeleted file mode 100644 index 010d294a76..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/about-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/about-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/about-16@2x.png Binary files differdeleted file mode 100644 index 967143eae9..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/about-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/about-md-16.png b/main/src/core/MonoDevelop.Ide/icons/about-md-16.png Binary files differnew file mode 100644 index 0000000000..6cae3c906c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/about-md-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/about-md-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/about-md-16@2x.png Binary files differnew file mode 100644 index 0000000000..d211c18c55 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/about-md-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/about-md-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/about-md-16~dark.png Binary files differnew file mode 100644 index 0000000000..68846e0620 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/about-md-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/about-md-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/about-md-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..989857e4cc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/about-md-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/about-md-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/about-md-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..df9ec9d7c6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/about-md-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/about-md-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/about-md-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..1be5a700bb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/about-md-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/about-md-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/about-md-16~disabled.png Binary files differnew file mode 100644 index 0000000000..8e64f7bb37 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/about-md-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/about-md-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/about-md-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..557fef35d0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/about-md-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/add-16.png b/main/src/core/MonoDevelop.Ide/icons/add-16.png Binary files differindex 1885122981..bda8b95c9e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/add-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/add-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/add-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/add-16@2x.png Binary files differindex 3b6dece125..9b47efa152 100644 --- a/main/src/core/MonoDevelop.Ide/icons/add-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/add-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/add-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/add-16~dark.png Binary files differnew file mode 100644 index 0000000000..ed52029780 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/add-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/add-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/add-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..77b62ea10f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/add-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/add-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/add-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..36f2f7dd03 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/add-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/add-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/add-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..80e73ad242 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/add-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/add-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/add-16~disabled.png Binary files differnew file mode 100644 index 0000000000..2546d8bfe0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/add-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/add-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/add-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..5e389ec1c4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/add-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/add-namespace-16.png b/main/src/core/MonoDevelop.Ide/icons/add-namespace-16.png Binary files differdeleted file mode 100644 index 46da2c1014..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/add-namespace-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/assembly-project-16.png b/main/src/core/MonoDevelop.Ide/icons/assembly-project-16.png Binary files differdeleted file mode 100644 index 52552a1e07..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/assembly-project-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/assembly-project-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/assembly-project-16@2x.png Binary files differdeleted file mode 100644 index a38862f132..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/assembly-project-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/assembly-reference-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/assembly-reference-overlay-16.png Binary files differdeleted file mode 100644 index 2f7ad7f346..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/assembly-reference-overlay-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/assembly-reference-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/assembly-reference-overlay-16@2x.png Binary files differdeleted file mode 100644 index a574aa2943..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/assembly-reference-overlay-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-clear-all-16.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-clear-all-16.png Binary files differnew file mode 100644 index 0000000000..66478e2c22 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-clear-all-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-clear-all-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-clear-all-16@2x.png Binary files differnew file mode 100644 index 0000000000..581dda8c77 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-clear-all-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-clear-all-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-clear-all-16~dark.png Binary files differnew file mode 100644 index 0000000000..66478e2c22 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-clear-all-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-clear-all-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-clear-all-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..eeff290ba3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-clear-all-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-next-16.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-next-16.png Binary files differnew file mode 100644 index 0000000000..f89a194e5a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-next-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-next-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-next-16@2x.png Binary files differnew file mode 100644 index 0000000000..eaa78c08d2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-next-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-next-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-next-16~dark.png Binary files differnew file mode 100644 index 0000000000..e912b04f50 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-next-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-next-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-next-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0dd176c5e2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-next-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-prev-16.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-prev-16.png Binary files differnew file mode 100644 index 0000000000..8583e40a44 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-prev-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-prev-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-prev-16@2x.png Binary files differnew file mode 100644 index 0000000000..7764c3eecf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-prev-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-prev-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-prev-16~dark.png Binary files differnew file mode 100644 index 0000000000..18cd50f54c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-prev-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-prev-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-prev-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f457cfc19c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-prev-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-toggle-16.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-toggle-16.png Binary files differnew file mode 100644 index 0000000000..5479d0098a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-toggle-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-toggle-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-toggle-16@2x.png Binary files differnew file mode 100644 index 0000000000..87b6c392ff --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-toggle-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-toggle-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-toggle-16~dark.png Binary files differnew file mode 100644 index 0000000000..5ca7a0170a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-toggle-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bookmark-toggle-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/bookmark-toggle-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..520fd91884 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bookmark-toggle-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-16.png b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-16.png Binary files differnew file mode 100644 index 0000000000..f16198f9d4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-16@2x.png Binary files differnew file mode 100644 index 0000000000..ebef7a1c3d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-16~dark.png Binary files differnew file mode 100644 index 0000000000..18f1b16c94 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7315cf8f17 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-normal-16.png b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-normal-16.png Binary files differdeleted file mode 100644 index 6426e3012e..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-normal-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-normal-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-normal-16@2x.png Binary files differdeleted file mode 100644 index 630ceb0e78..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-next-normal-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-prev-16.png b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-prev-16.png Binary files differnew file mode 100644 index 0000000000..fc2e26d5e8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-prev-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-prev-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-prev-16@2x.png Binary files differnew file mode 100644 index 0000000000..bd4e5960b8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-prev-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-prev-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-prev-16~dark.png Binary files differnew file mode 100644 index 0000000000..d43c23f4e5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-prev-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-prev-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-prev-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..3025837c5a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-prev-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-previous-normal-16.png b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-previous-normal-16.png Binary files differdeleted file mode 100644 index 26b2f0315f..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-previous-normal-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-previous-normal-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/breadcrumb-previous-normal-16@2x.png Binary files differdeleted file mode 100644 index ad157a32c0..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/breadcrumb-previous-normal-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-16.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16.png Binary files differindex c0c017eb32..b9a52a2203 100644 --- a/main/src/core/MonoDevelop.Ide/icons/breakpoint-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16@2x.png Binary files differindex 9f68a52e2f..e9c7987cef 100644 --- a/main/src/core/MonoDevelop.Ide/icons/breakpoint-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~dark.png Binary files differnew file mode 100644 index 0000000000..de38a0fb46 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..040f23e224 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..2c4c08f2d9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..a411a244df --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~disabled.png Binary files differnew file mode 100644 index 0000000000..40138ca93c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..0aa16e9590 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16.png Binary files differindex d12cdee514..87543ee644 100644 --- a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16@2x.png Binary files differindex 9d79574af6..037ab42c60 100644 --- a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~dark.png Binary files differnew file mode 100644 index 0000000000..89d6ccbf67 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..ed05a22c09 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..b135096f02 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..b666f5129d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~disabled.png Binary files differnew file mode 100644 index 0000000000..7afd1bc898 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..898e585968 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disable-all-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16.png Binary files differindex b6cd3c74bc..69f5eea9e3 100644 --- a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16@2x.png Binary files differindex 72441964d0..ea593b7d0d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~dark.png Binary files differnew file mode 100644 index 0000000000..aef6a9bda3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6531f2ffbd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..2c4c08f2d9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..a411a244df --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~disabled.png Binary files differnew file mode 100644 index 0000000000..40138ca93c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..0aa16e9590 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-disabled-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16.png Binary files differindex c7075c7e8c..f66f7d2d02 100644 --- a/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16@2x.png Binary files differindex 6a684c6baf..07ed4bcf72 100644 --- a/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~dark.png Binary files differnew file mode 100644 index 0000000000..16f9f15a86 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..cb7c2b5b6e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..9fb11ffc81 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..eedb4c9882 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~disabled.png Binary files differnew file mode 100644 index 0000000000..1d08870951 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..ad843d4380 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-invalid-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16.png Binary files differindex 186cab63bc..2ea56cf35a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16@2x.png Binary files differindex fd0345e0d9..857860315c 100644 --- a/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~dark.png Binary files differnew file mode 100644 index 0000000000..dc193a4aaa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..afb832faf2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..daa3f9f87d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..a9c4706e8e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~disabled.png Binary files differnew file mode 100644 index 0000000000..f79d53e45f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..ce5055b3ff --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-new-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16.png Binary files differindex 99a37a5497..d022a7cf14 100644 --- a/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16@2x.png Binary files differindex 4bdfc0bd33..9d43559fb8 100644 --- a/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~dark.png Binary files differnew file mode 100644 index 0000000000..0e50ad3125 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0d9c4b60b5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..2c4c08f2d9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..a411a244df --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~disabled.png Binary files differnew file mode 100644 index 0000000000..40138ca93c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..0aa16e9590 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/breakpoint-on-off-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bug-16.png b/main/src/core/MonoDevelop.Ide/icons/bug-16.png Binary files differnew file mode 100644 index 0000000000..50b4411287 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bug-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bug-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/bug-16@2x.png Binary files differnew file mode 100644 index 0000000000..ee24941387 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bug-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bug-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/bug-16~dark.png Binary files differnew file mode 100644 index 0000000000..6e7de4f75e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bug-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/bug-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/bug-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..5fe4e118e6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/bug-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-16.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16.png Binary files differindex bc9ee4a041..efb0449ce6 100644 --- a/main/src/core/MonoDevelop.Ide/icons/catchpoint-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16@2x.png Binary files differindex cb1c8a2e3d..502eb453d0 100644 --- a/main/src/core/MonoDevelop.Ide/icons/catchpoint-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~dark.png Binary files differnew file mode 100644 index 0000000000..7741a3b7e4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..a0061883c6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..ca28c47ba7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..35442a52e4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~disabled.png Binary files differnew file mode 100644 index 0000000000..50bc8b019e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..cb01ca4071 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16.png Binary files differindex d22183af90..c1b925f53f 100644 --- a/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16@2x.png Binary files differindex a5f671e0e7..169229370f 100644 --- a/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~dark.png Binary files differnew file mode 100644 index 0000000000..a46283dd5c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..17b10454fe --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..ca28c47ba7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..35442a52e4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~disabled.png Binary files differnew file mode 100644 index 0000000000..50bc8b019e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..cb01ca4071 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-disabled-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16.png Binary files differnew file mode 100644 index 0000000000..1639c4f57a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16@2x.png Binary files differnew file mode 100644 index 0000000000..d7eb09fc97 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~dark.png Binary files differnew file mode 100644 index 0000000000..54c96c820a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..90224cc2c7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..2e5cc06a4b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..c9aca64add --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~disabled.png Binary files differnew file mode 100644 index 0000000000..1bb9aa2223 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..ed8732b7ff --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/catchpoint-new-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/clear-16.png b/main/src/core/MonoDevelop.Ide/icons/clear-16.png Binary files differindex 3805977ddf..b62ac911f2 100644 --- a/main/src/core/MonoDevelop.Ide/icons/clear-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/clear-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/clear-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/clear-16@2x.png Binary files differindex 5a39227a15..635391b07a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/clear-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/clear-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/clear-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/clear-16~dark.png Binary files differnew file mode 100644 index 0000000000..787d66099d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/clear-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/clear-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/clear-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..928f956606 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/clear-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/clear-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/clear-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..f27e2b1a60 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/clear-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/clear-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/clear-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..2b4c5be06a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/clear-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/clear-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/clear-16~disabled.png Binary files differnew file mode 100644 index 0000000000..376de101a7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/clear-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/clear-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/clear-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..1272e3f9ee --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/clear-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/clear-all-bookmarks-16.png b/main/src/core/MonoDevelop.Ide/icons/clear-all-bookmarks-16.png Binary files differdeleted file mode 100644 index e66d6645f4..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/clear-all-bookmarks-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/close-all-documents-16.png b/main/src/core/MonoDevelop.Ide/icons/close-all-documents-16.png Binary files differindex 2b4c24715d..f64ef07440 100644 --- a/main/src/core/MonoDevelop.Ide/icons/close-all-documents-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/close-all-documents-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/close-all-documents-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/close-all-documents-16@2x.png Binary files differnew file mode 100644 index 0000000000..d70f96c789 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/close-all-documents-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/close-all-documents-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/close-all-documents-16~dark.png Binary files differnew file mode 100644 index 0000000000..cafbf5397f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/close-all-documents-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/close-all-documents-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/close-all-documents-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..1b4a2c1e40 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/close-all-documents-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/close-solution-16.png b/main/src/core/MonoDevelop.Ide/icons/close-solution-16.png Binary files differindex 68281f94b4..e7d1f389e6 100644 --- a/main/src/core/MonoDevelop.Ide/icons/close-solution-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/close-solution-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/close-solution-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/close-solution-16@2x.png Binary files differnew file mode 100644 index 0000000000..72579100b7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/close-solution-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/close-solution-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/close-solution-16~dark.png Binary files differnew file mode 100644 index 0000000000..1bc81154dd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/close-solution-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/close-solution-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/close-solution-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..1310b54f52 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/close-solution-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/columns-one-16.png b/main/src/core/MonoDevelop.Ide/icons/columns-one-16.png Binary files differnew file mode 100644 index 0000000000..f93870b639 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/columns-one-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/columns-one-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/columns-one-16@2x.png Binary files differnew file mode 100644 index 0000000000..14b468dc66 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/columns-one-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/columns-one-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/columns-one-16~dark.png Binary files differnew file mode 100644 index 0000000000..4209460934 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/columns-one-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/columns-one-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/columns-one-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d46d372889 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/columns-one-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/columns-two-16.png b/main/src/core/MonoDevelop.Ide/icons/columns-two-16.png Binary files differnew file mode 100644 index 0000000000..c7a6e6c6da --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/columns-two-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/columns-two-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/columns-two-16@2x.png Binary files differnew file mode 100644 index 0000000000..a601604afb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/columns-two-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/columns-two-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/columns-two-16~dark.png Binary files differnew file mode 100644 index 0000000000..0de4c2f6bb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/columns-two-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/columns-two-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/columns-two-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..8d85bf2f8b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/columns-two-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/command-16.png b/main/src/core/MonoDevelop.Ide/icons/command-16.png Binary files differindex 442d0d8a0c..82e8c0b885 100644 --- a/main/src/core/MonoDevelop.Ide/icons/command-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/command-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/command-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/command-16@2x.png Binary files differindex 8bee8dcf7d..df2fae955a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/command-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/command-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/command-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/command-16~dark.png Binary files differnew file mode 100644 index 0000000000..7a1068d660 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/command-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/command-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/command-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6f872077d8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/command-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/command-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/command-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..d44254730c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/command-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/command-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/command-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..11303fa980 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/command-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/command-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/command-16~sel.png Binary files differnew file mode 100644 index 0000000000..d44254730c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/command-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/command-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/command-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..11303fa980 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/command-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/comment-16.png b/main/src/core/MonoDevelop.Ide/icons/comment-16.png Binary files differindex 7c9ad146d5..f7fe199170 100644 --- a/main/src/core/MonoDevelop.Ide/icons/comment-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/comment-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/comment-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/comment-16@2x.png Binary files differindex 0bf30e0162..1b90a2488f 100644 --- a/main/src/core/MonoDevelop.Ide/icons/comment-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/comment-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/comment-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/comment-16~dark.png Binary files differnew file mode 100644 index 0000000000..70b522bc66 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/comment-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/comment-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/comment-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..bf07f8869a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/comment-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/copy-16.png b/main/src/core/MonoDevelop.Ide/icons/copy-16.png Binary files differindex 574162bafa..62187ea94a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/copy-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/copy-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/copy-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/copy-16@2x.png Binary files differindex 343cabc06c..13930e8cf6 100644 --- a/main/src/core/MonoDevelop.Ide/icons/copy-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/copy-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/copy-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/copy-16~dark.png Binary files differnew file mode 100644 index 0000000000..c7f631e981 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/copy-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/copy-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/copy-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..76a204a4aa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/copy-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/cut-16.png b/main/src/core/MonoDevelop.Ide/icons/cut-16.png Binary files differindex ff87558fcd..d700cffe7a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/cut-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/cut-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/cut-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/cut-16@2x.png Binary files differindex ce98d5ccbd..efc2ff2697 100644 --- a/main/src/core/MonoDevelop.Ide/icons/cut-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/cut-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/cut-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/cut-16~dark.png Binary files differnew file mode 100644 index 0000000000..9de0c9af97 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/cut-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/cut-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/cut-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..eb90494390 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/cut-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-down-16.png b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-down-16.png Binary files differindex 026eedc009..56603885d9 100644 --- a/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-down-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-down-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-down-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-down-16@2x.png Binary files differindex df564c74ec..9bb18c73b8 100644 --- a/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-down-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-down-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-down-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-down-16~dark.png Binary files differnew file mode 100644 index 0000000000..93bb055849 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-down-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-down-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-down-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..248789e1e7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-down-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-up-16.png b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-up-16.png Binary files differindex 78bdd4b505..20a473afd7 100644 --- a/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-up-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-up-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-up-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-up-16@2x.png Binary files differindex 84b5ecef99..20ae917ef9 100644 --- a/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-up-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-up-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-up-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-up-16~dark.png Binary files differnew file mode 100644 index 0000000000..74f486e827 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-up-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-up-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-up-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..3c0ea8f3ca --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/disclose-arrow-up-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-16.png b/main/src/core/MonoDevelop.Ide/icons/done-16.png Binary files differindex e4bd153719..75263fa64a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/done-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/done-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-16@2x.png Binary files differindex 4edce4c8c1..a31681ab21 100644 --- a/main/src/core/MonoDevelop.Ide/icons/done-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/done-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/done-16~dark.png Binary files differnew file mode 100644 index 0000000000..823307335a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7d086e66b2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/done-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..d0cb814f71 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2d843fdc49 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/done-16~sel.png Binary files differnew file mode 100644 index 0000000000..d0cb814f71 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2d843fdc49 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-24.png b/main/src/core/MonoDevelop.Ide/icons/done-24.png Binary files differindex 16f94a421c..9e3266d397 100644 --- a/main/src/core/MonoDevelop.Ide/icons/done-24.png +++ b/main/src/core/MonoDevelop.Ide/icons/done-24.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-24@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-24@2x.png Binary files differindex 1a2f0f3181..8eba95a93e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/done-24@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/done-24@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-24~dark.png b/main/src/core/MonoDevelop.Ide/icons/done-24~dark.png Binary files differnew file mode 100644 index 0000000000..ab219b439e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-24~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-24~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-24~dark@2x.png Binary files differnew file mode 100644 index 0000000000..1e59fbe9a7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-24~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-24~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/done-24~dark~sel.png Binary files differnew file mode 100644 index 0000000000..435b61d126 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-24~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-24~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-24~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..bbf994981f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-24~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-24~sel.png b/main/src/core/MonoDevelop.Ide/icons/done-24~sel.png Binary files differnew file mode 100644 index 0000000000..435b61d126 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-24~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-24~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-24~sel@2x.png Binary files differnew file mode 100644 index 0000000000..bbf994981f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-24~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-32.png b/main/src/core/MonoDevelop.Ide/icons/done-32.png Binary files differindex 4edce4c8c1..a31681ab21 100644 --- a/main/src/core/MonoDevelop.Ide/icons/done-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/done-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-32@2x.png Binary files differindex c0e084b2c6..12b4821cde 100644 --- a/main/src/core/MonoDevelop.Ide/icons/done-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/done-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/done-32~dark.png Binary files differnew file mode 100644 index 0000000000..7d086e66b2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..5732873d1c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/done-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..2d843fdc49 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..7e9e40c59d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/done-32~sel.png Binary files differnew file mode 100644 index 0000000000..2d843fdc49 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..7e9e40c59d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-48.png b/main/src/core/MonoDevelop.Ide/icons/done-48.png Binary files differindex 1a2f0f3181..8eba95a93e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/done-48.png +++ b/main/src/core/MonoDevelop.Ide/icons/done-48.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-48@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-48@2x.png Binary files differindex a7089ce1b5..73f2ccff49 100644 --- a/main/src/core/MonoDevelop.Ide/icons/done-48@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/done-48@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-48~dark.png b/main/src/core/MonoDevelop.Ide/icons/done-48~dark.png Binary files differnew file mode 100644 index 0000000000..1e59fbe9a7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-48~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-48~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-48~dark@2x.png Binary files differnew file mode 100644 index 0000000000..81809b9f68 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-48~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-48~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/done-48~dark~sel.png Binary files differnew file mode 100644 index 0000000000..bbf994981f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-48~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-48~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-48~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1edb5ad0f0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-48~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-48~sel.png b/main/src/core/MonoDevelop.Ide/icons/done-48~sel.png Binary files differnew file mode 100644 index 0000000000..bbf994981f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-48~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/done-48~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/done-48~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1edb5ad0f0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/done-48~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/edit-16.png b/main/src/core/MonoDevelop.Ide/icons/edit-16.png Binary files differindex 2854ace426..83485e5988 100644 --- a/main/src/core/MonoDevelop.Ide/icons/edit-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/edit-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/edit-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/edit-16@2x.png Binary files differindex 0e181c6ec5..95ba0548b1 100644 --- a/main/src/core/MonoDevelop.Ide/icons/edit-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/edit-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/edit-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/edit-16~dark.png Binary files differnew file mode 100644 index 0000000000..e76036fa7f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/edit-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/edit-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/edit-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..56aba3102b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/edit-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/edit-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/edit-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..eb3c27f0c7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/edit-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/edit-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/edit-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..f92a645531 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/edit-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/edit-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/edit-16~disabled.png Binary files differnew file mode 100644 index 0000000000..64067d9961 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/edit-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/edit-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/edit-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..3f453bdd1a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/edit-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/edit-find-next-16.png b/main/src/core/MonoDevelop.Ide/icons/edit-find-next-16.png Binary files differdeleted file mode 100644 index 627294400c..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/edit-find-next-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/edit-select-all-16.png b/main/src/core/MonoDevelop.Ide/icons/edit-select-all-16.png Binary files differdeleted file mode 100644 index f4b0b19e09..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/edit-select-all-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-class-16.png b/main/src/core/MonoDevelop.Ide/icons/element-class-16.png Binary files differindex ebba4ec2a0..b052db787b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-class-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-class-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-class-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-class-16@2x.png Binary files differindex 945d003d47..eaef15c0d3 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-class-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-class-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-class-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-class-16~dark.png Binary files differnew file mode 100644 index 0000000000..85b904fba7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-class-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-class-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-class-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..147b435ed3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-class-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-class-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-class-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..905f7e31c9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-class-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-class-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-class-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..302cf6177e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-class-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-class-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-class-16~sel.png Binary files differnew file mode 100644 index 0000000000..905f7e31c9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-class-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-class-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-class-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..302cf6177e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-class-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-constant-16.png b/main/src/core/MonoDevelop.Ide/icons/element-constant-16.png Binary files differindex 0f8e4b33fa..7dc3946986 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-constant-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-constant-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-constant-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-constant-16@2x.png Binary files differindex 70e5f4f7b9..08d9af7557 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-constant-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-constant-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-constant-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-constant-16~dark.png Binary files differnew file mode 100644 index 0000000000..294208b496 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-constant-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-constant-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-constant-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..23363677e3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-constant-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-constant-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-constant-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..c9b3888935 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-constant-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-constant-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-constant-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..addbfe2b91 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-constant-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-constant-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-constant-16~sel.png Binary files differnew file mode 100644 index 0000000000..c9b3888935 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-constant-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-constant-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-constant-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..addbfe2b91 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-constant-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-delegate-16.png b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16.png Binary files differindex cd0d67e8c9..fe1a992849 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-delegate-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-delegate-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16@2x.png Binary files differindex d2aeb13c36..5b8b3383ad 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-delegate-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~dark.png Binary files differnew file mode 100644 index 0000000000..6e019b41c2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..64ef8688f5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..0ae362fe8e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c09e843b72 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~sel.png Binary files differnew file mode 100644 index 0000000000..0ae362fe8e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c09e843b72 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-delegate-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-enum-16.png b/main/src/core/MonoDevelop.Ide/icons/element-enum-16.png Binary files differnew file mode 100644 index 0000000000..dc896b56b9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-enum-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-enum-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-enum-16@2x.png Binary files differnew file mode 100644 index 0000000000..7ec66140dd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-enum-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-enum-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~dark.png Binary files differnew file mode 100644 index 0000000000..32ce34f3ce --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-enum-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..173c25524a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-enum-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..372b7e9d2e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-enum-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f64d2a0af8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-enum-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~sel.png Binary files differnew file mode 100644 index 0000000000..372b7e9d2e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-enum-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f64d2a0af8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-enum-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-enumeration-16.png b/main/src/core/MonoDevelop.Ide/icons/element-enumeration-16.png Binary files differdeleted file mode 100644 index 1dacd4dfd8..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-enumeration-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-enumeration-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-enumeration-16@2x.png Binary files differdeleted file mode 100644 index fef81daa07..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-enumeration-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-event-16.png b/main/src/core/MonoDevelop.Ide/icons/element-event-16.png Binary files differindex d159a61587..1d1e1dac6b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-event-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-event-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-event-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-event-16@2x.png Binary files differindex c5636f6253..a40a378792 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-event-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-event-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-event-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-event-16~dark.png Binary files differnew file mode 100644 index 0000000000..84cd47db79 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-event-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-event-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-event-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..881e570336 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-event-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-event-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-event-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..1b2150077b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-event-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-event-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-event-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1b791c82a8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-event-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-event-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-event-16~sel.png Binary files differnew file mode 100644 index 0000000000..1b2150077b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-event-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-event-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-event-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1b791c82a8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-event-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-exception-16.png b/main/src/core/MonoDevelop.Ide/icons/element-exception-16.png Binary files differindex d25657e2af..c74bf41bf0 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-exception-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-exception-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-exception-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-exception-16@2x.png Binary files differindex e926c3c9ab..cb9e722864 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-exception-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-exception-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-exception-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-exception-16~dark.png Binary files differnew file mode 100644 index 0000000000..1a5ef6cbd1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-exception-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-exception-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-exception-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..1584af2a41 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-exception-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-exception-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-exception-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..0bf6b65547 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-exception-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-exception-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-exception-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..18a33c6fe9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-exception-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-exception-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-exception-16~sel.png Binary files differnew file mode 100644 index 0000000000..0bf6b65547 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-exception-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-exception-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-exception-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..18a33c6fe9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-exception-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16.png b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16.png Binary files differindex d1a6fa4546..aa3fc8cee5 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16@2x.png Binary files differindex 7f7380185a..8c5418f6d3 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~dark.png Binary files differnew file mode 100644 index 0000000000..c9b1ff954e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..9305fff932 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..0db275600b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b0d5217c04 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~sel.png Binary files differnew file mode 100644 index 0000000000..0db275600b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b0d5217c04 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-extensionmethod-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-field-16.png b/main/src/core/MonoDevelop.Ide/icons/element-field-16.png Binary files differindex 78c9a95aa3..fa9b9624b9 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-field-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-field-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-field-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-field-16@2x.png Binary files differindex 06a683ed2b..9101dc1136 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-field-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-field-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-field-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-field-16~dark.png Binary files differnew file mode 100644 index 0000000000..b00faa8ccc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-field-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-field-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-field-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..872030f6d3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-field-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-field-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-field-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..427d88987f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-field-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-field-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-field-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b6d66f5d4e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-field-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-field-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-field-16~sel.png Binary files differnew file mode 100644 index 0000000000..427d88987f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-field-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-field-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-field-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b6d66f5d4e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-field-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16.png b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16.png Binary files differindex fdfd653023..f264ce2f1b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16@2x.png Binary files differindex 2e1b4c5ec9..468cb5ff47 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~dark.png Binary files differnew file mode 100644 index 0000000000..32816de589 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7fecc3c826 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..4c74c21e16 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..cfd82cf076 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~sel.png Binary files differnew file mode 100644 index 0000000000..4c74c21e16 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..cfd82cf076 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-fs-field-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-interface-16.png b/main/src/core/MonoDevelop.Ide/icons/element-interface-16.png Binary files differindex 17c1185960..1adf7b08b6 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-interface-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-interface-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-interface-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-interface-16@2x.png Binary files differindex 824a4e049f..439d806a65 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-interface-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-interface-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-interface-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-interface-16~dark.png Binary files differnew file mode 100644 index 0000000000..612099859d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-interface-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-interface-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-interface-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..5160066e3d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-interface-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-interface-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-interface-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..83726abb16 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-interface-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-interface-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-interface-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..4e69aff776 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-interface-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-interface-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-interface-16~sel.png Binary files differnew file mode 100644 index 0000000000..83726abb16 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-interface-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-interface-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-interface-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..4e69aff776 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-interface-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-keyword-16.png b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16.png Binary files differindex 19a3545ca7..21aac83368 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-keyword-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-keyword-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16@2x.png Binary files differindex 9392908b50..a426ce536d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-keyword-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~dark.png Binary files differnew file mode 100644 index 0000000000..e45a3549e8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..055e9adea5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..8ea5be7b64 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..d71bfe1f0a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~sel.png Binary files differnew file mode 100644 index 0000000000..8ea5be7b64 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..d71bfe1f0a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-keyword-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-16.png b/main/src/core/MonoDevelop.Ide/icons/element-method-16.png Binary files differindex c7981aee39..3b74b453b1 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-method-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-method-16@2x.png Binary files differindex 0e81da2702..40aa43068d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-method-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-method-16~dark.png Binary files differnew file mode 100644 index 0000000000..461cbcdabd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-method-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..c38242f9c7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-method-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..633d2e6cfe --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-method-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..fd7e48ff80 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-method-16~sel.png Binary files differnew file mode 100644 index 0000000000..633d2e6cfe --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-method-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..fd7e48ff80 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-new-16.png b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16.png Binary files differindex 440b505bb8..7a927aeadd 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-method-new-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-new-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16@2x.png Binary files differindex d6011bb744..2d2169f0e8 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-method-new-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~dark.png Binary files differnew file mode 100644 index 0000000000..9c887698b0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d995d046b4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..e1e53bc800 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..93bd8f72f4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~sel.png Binary files differnew file mode 100644 index 0000000000..e1e53bc800 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..93bd8f72f4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-method-new-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-module-16.png b/main/src/core/MonoDevelop.Ide/icons/element-module-16.png Binary files differindex 8c866474da..82b8073839 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-module-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-module-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-module-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-module-16@2x.png Binary files differindex bd2192282e..35afbc2fc6 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-module-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-module-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-module-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-module-16~dark.png Binary files differnew file mode 100644 index 0000000000..3fc4094379 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-module-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-module-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-module-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6109352ab7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-module-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-module-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-module-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..7266232629 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-module-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-module-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-module-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..91c73d5786 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-module-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-module-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-module-16~sel.png Binary files differnew file mode 100644 index 0000000000..7266232629 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-module-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-module-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-module-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..91c73d5786 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-module-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-namespace-16.png b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16.png Binary files differindex 0b3f4a6be3..4b52c9f8db 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-namespace-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-namespace-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16@2x.png Binary files differindex 5783596758..671d3af669 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-namespace-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~dark.png Binary files differnew file mode 100644 index 0000000000..a9740ed4d4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..cffaa89c60 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..8880206f60 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..985ef91fcc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~sel.png Binary files differnew file mode 100644 index 0000000000..8880206f60 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..985ef91fcc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-namespace-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16.png b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16.png Binary files differindex bb9955fb86..86d4ceb376 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16@2x.png Binary files differindex e94d4d8b38..ac3055be32 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~dark.png Binary files differnew file mode 100644 index 0000000000..eec94f65b4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..879a9c829b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..8449b2d0bb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..35c4b41f8e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~sel.png Binary files differnew file mode 100644 index 0000000000..8449b2d0bb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..35c4b41f8e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-other-declaration-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-property-16.png b/main/src/core/MonoDevelop.Ide/icons/element-property-16.png Binary files differindex ce40ece193..9d4af253df 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-property-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-property-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-property-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-property-16@2x.png Binary files differindex e251eb378f..061dce0bf8 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-property-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-property-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-property-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-property-16~dark.png Binary files differnew file mode 100644 index 0000000000..b0b343bc6f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-property-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-property-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-property-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..fa561785dc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-property-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-property-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-property-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..ca1d80d28d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-property-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-property-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-property-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1472f49647 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-property-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-property-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-property-16~sel.png Binary files differnew file mode 100644 index 0000000000..ca1d80d28d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-property-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-property-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-property-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1472f49647 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-property-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16.png Binary files differnew file mode 100644 index 0000000000..4d90bab2c8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16@2x.png Binary files differnew file mode 100644 index 0000000000..b5b57d90fd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..87395a6004 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..81171267d9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..bad4815441 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..26594fd122 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~sel.png Binary files differnew file mode 100644 index 0000000000..bad4815441 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..26594fd122 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-static-overlay-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-struct-16.png b/main/src/core/MonoDevelop.Ide/icons/element-struct-16.png Binary files differnew file mode 100644 index 0000000000..62ee87ece6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-struct-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-struct-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-struct-16@2x.png Binary files differnew file mode 100644 index 0000000000..6d11c90cda --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-struct-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-struct-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~dark.png Binary files differnew file mode 100644 index 0000000000..9b2bf0c3d9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-struct-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f3ef21f350 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-struct-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..55a51ea1c6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-struct-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..cb0a56615d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-struct-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~sel.png Binary files differnew file mode 100644 index 0000000000..55a51ea1c6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-struct-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..cb0a56615d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-struct-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-structure-16.png b/main/src/core/MonoDevelop.Ide/icons/element-structure-16.png Binary files differdeleted file mode 100644 index 862257e473..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-structure-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-structure-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-structure-16@2x.png Binary files differdeleted file mode 100644 index 6408dd5184..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-structure-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-16.png b/main/src/core/MonoDevelop.Ide/icons/element-template-16.png Binary files differindex ba48bc0df4..bd96a3e05e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-template-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-template-16@2x.png Binary files differindex 052e26edf7..acd0b126c7 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-template-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-template-16~dark.png Binary files differnew file mode 100644 index 0000000000..4c13fe0c0f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-template-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..c463c30d34 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-template-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..1422fb77c4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-template-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..4a697deccd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-template-16~sel.png Binary files differnew file mode 100644 index 0000000000..1422fb77c4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-template-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..4a697deccd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16.png b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16.png Binary files differindex 954be6e7af..ee19e422e1 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16@2x.png Binary files differindex a0285c83f0..d89a974980 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~dark.png Binary files differnew file mode 100644 index 0000000000..c56fd403c9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f905cb98d6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..e1bd6d9bfa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c343a58bdb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~sel.png Binary files differnew file mode 100644 index 0000000000..e1bd6d9bfa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c343a58bdb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-template-surroundwith-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-type-16.png b/main/src/core/MonoDevelop.Ide/icons/element-type-16.png Binary files differindex 53a2f5f33f..cdaf922d62 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-type-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-type-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-type-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-type-16@2x.png Binary files differindex 11fcb74fd6..b1df3237b1 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-type-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-type-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-type-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-type-16~dark.png Binary files differnew file mode 100644 index 0000000000..f310bc9da7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-type-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-type-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-type-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..39efcfb5cc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-type-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-type-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-type-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..ecae04d003 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-type-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-type-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-type-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..25ae1097c6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-type-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-type-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-type-16~sel.png Binary files differnew file mode 100644 index 0000000000..ecae04d003 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-type-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-type-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-type-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..25ae1097c6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-type-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-variable-16.png b/main/src/core/MonoDevelop.Ide/icons/element-variable-16.png Binary files differindex 0aa76d6f18..cfd4a6c91b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-variable-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-variable-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-variable-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-variable-16@2x.png Binary files differindex dc9ab381c7..88540c51bb 100644 --- a/main/src/core/MonoDevelop.Ide/icons/element-variable-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/element-variable-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-variable-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-variable-16~dark.png Binary files differnew file mode 100644 index 0000000000..9b011d8adc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-variable-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-variable-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-variable-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..a1de1b954c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-variable-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-variable-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-variable-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..8dc030b61f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-variable-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-variable-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-variable-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..08b3559269 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-variable-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-variable-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-variable-16~sel.png Binary files differnew file mode 100644 index 0000000000..8dc030b61f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-variable-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-variable-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-variable-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..08b3559269 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-variable-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-an-protected-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-an-protected-overlay-16.png Binary files differdeleted file mode 100644 index 3ad97c17a9..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-an-protected-overlay-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-an-protected-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-an-protected-overlay-16@2x.png Binary files differdeleted file mode 100644 index 17d9d009fb..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-an-protected-overlay-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16.png Binary files differnew file mode 100644 index 0000000000..053c28d3a8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16@2x.png Binary files differnew file mode 100644 index 0000000000..3f7337b05e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..c5e0f5d563 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b61592d085 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..3a28391232 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..717989777a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~sel.png Binary files differnew file mode 100644 index 0000000000..3a28391232 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..717989777a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-diamond-overlay-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-or-protected-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-or-protected-overlay-16.png Binary files differdeleted file mode 100644 index 1f2c6b4170..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-or-protected-overlay-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-or-protected-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-or-protected-overlay-16@2x.png Binary files differdeleted file mode 100644 index d0f92e76d1..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-or-protected-overlay-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-overlay-16.png Binary files differdeleted file mode 100644 index d2f0467a91..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-overlay-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-overlay-16@2x.png Binary files differdeleted file mode 100644 index 52fdb73176..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-overlay-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16.png Binary files differnew file mode 100644 index 0000000000..ae605bf04a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16@2x.png Binary files differnew file mode 100644 index 0000000000..6708f9e3a8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..162ef27f0a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..78a2470a05 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..7c2394608a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..bba5cf54cb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~sel.png Binary files differnew file mode 100644 index 0000000000..7c2394608a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..8aa0ccfca6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-internal-square-overlay-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16.png Binary files differnew file mode 100644 index 0000000000..4b18e5f4ff --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16@2x.png Binary files differnew file mode 100644 index 0000000000..8bc281f420 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..785de23b87 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..9ca123f7d9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..92868992b7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b765821098 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~sel.png Binary files differnew file mode 100644 index 0000000000..92868992b7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b765821098 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-diamond-overlay-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-overlay-16.png Binary files differdeleted file mode 100644 index ea6ce98978..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-overlay-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-overlay-16@2x.png Binary files differdeleted file mode 100644 index 902b33f24d..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-overlay-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16.png Binary files differnew file mode 100644 index 0000000000..ad5a319fc2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16@2x.png Binary files differnew file mode 100644 index 0000000000..7f3b4d04e0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..57b49a4afa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7730f1b270 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..835304af34 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..7730f1b270 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~sel.png Binary files differnew file mode 100644 index 0000000000..835304af34 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..7730f1b270 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-private-square-overlay-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16.png Binary files differnew file mode 100644 index 0000000000..3e5ccf693e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16@2x.png Binary files differnew file mode 100644 index 0000000000..899cc6d06c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..6d6f765678 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b914ba05a3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..92868992b7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b765821098 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~sel.png Binary files differnew file mode 100644 index 0000000000..92868992b7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b765821098 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-diamond-overlay-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-overlay-16.png Binary files differdeleted file mode 100644 index 99f63db331..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-overlay-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-overlay-16@2x.png Binary files differdeleted file mode 100644 index 6fd869ba1e..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-overlay-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16.png Binary files differnew file mode 100644 index 0000000000..7c4c58c0fe --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16@2x.png Binary files differnew file mode 100644 index 0000000000..6c57f688da --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..dba7d673aa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2bd88acfd4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..835304af34 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..7730f1b270 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~sel.png Binary files differnew file mode 100644 index 0000000000..835304af34 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..7730f1b270 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/element-visibility-protected-square-overlay-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-static-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-static-overlay-16.png Binary files differdeleted file mode 100644 index c0daec3326..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-visibility-static-overlay-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/element-visibility-static-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/element-visibility-static-overlay-16@2x.png Binary files differdeleted file mode 100644 index f611e2f7c3..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/element-visibility-static-overlay-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/error-16.png b/main/src/core/MonoDevelop.Ide/icons/error-16.png Binary files differindex 30b5da6e9b..4a7c34afc7 100644 --- a/main/src/core/MonoDevelop.Ide/icons/error-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/error-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-16@2x.png Binary files differindex adfd2b7b19..3f0b3fbb10 100644 --- a/main/src/core/MonoDevelop.Ide/icons/error-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/error-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/error-16~dark.png Binary files differnew file mode 100644 index 0000000000..0543df48ad --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..ed1da75fe8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/error-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..8cf9c17624 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1ad7c1da5d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/error-16~sel.png Binary files differnew file mode 100644 index 0000000000..8cf9c17624 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1ad7c1da5d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-24.png b/main/src/core/MonoDevelop.Ide/icons/error-24.png Binary files differindex 637ab79bff..8274a04ef3 100644 --- a/main/src/core/MonoDevelop.Ide/icons/error-24.png +++ b/main/src/core/MonoDevelop.Ide/icons/error-24.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-24@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-24@2x.png Binary files differindex bf5a3b9f70..9f21bb4b4e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/error-24@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/error-24@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-24~dark.png b/main/src/core/MonoDevelop.Ide/icons/error-24~dark.png Binary files differnew file mode 100644 index 0000000000..4ea5f5d7a4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-24~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-24~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-24~dark@2x.png Binary files differnew file mode 100644 index 0000000000..02426d716c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-24~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-24~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/error-24~dark~sel.png Binary files differnew file mode 100644 index 0000000000..ef6c3a3a73 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-24~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-24~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-24~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..ed8a5c205f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-24~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-24~sel.png b/main/src/core/MonoDevelop.Ide/icons/error-24~sel.png Binary files differnew file mode 100644 index 0000000000..ef6c3a3a73 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-24~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-24~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-24~sel@2x.png Binary files differnew file mode 100644 index 0000000000..ed8a5c205f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-24~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-32.png b/main/src/core/MonoDevelop.Ide/icons/error-32.png Binary files differindex adfd2b7b19..3f0b3fbb10 100644 --- a/main/src/core/MonoDevelop.Ide/icons/error-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/error-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-32@2x.png Binary files differindex f422cb3969..1fe771aa66 100644 --- a/main/src/core/MonoDevelop.Ide/icons/error-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/error-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/error-32~dark.png Binary files differnew file mode 100644 index 0000000000..ed1da75fe8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..bf035b1e57 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/error-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..1ad7c1da5d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..4acc1cd5f8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/error-32~sel.png Binary files differnew file mode 100644 index 0000000000..1ad7c1da5d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..4acc1cd5f8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-48.png b/main/src/core/MonoDevelop.Ide/icons/error-48.png Binary files differindex bf5a3b9f70..9f21bb4b4e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/error-48.png +++ b/main/src/core/MonoDevelop.Ide/icons/error-48.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-48@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-48@2x.png Binary files differindex 1e2cd50f70..3f207f796b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/error-48@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/error-48@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-48~dark.png b/main/src/core/MonoDevelop.Ide/icons/error-48~dark.png Binary files differnew file mode 100644 index 0000000000..02426d716c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-48~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-48~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-48~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0e5a84db97 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-48~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-48~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/error-48~dark~sel.png Binary files differnew file mode 100644 index 0000000000..ed8a5c205f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-48~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-48~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-48~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b31b739ad1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-48~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-48~sel.png b/main/src/core/MonoDevelop.Ide/icons/error-48~sel.png Binary files differnew file mode 100644 index 0000000000..ed8a5c205f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-48~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/error-48~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/error-48~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b31b739ad1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/error-48~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-16.png b/main/src/core/MonoDevelop.Ide/icons/execute-16.png Binary files differindex cf578ba7aa..2c49488228 100644 --- a/main/src/core/MonoDevelop.Ide/icons/execute-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/execute-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/execute-16@2x.png Binary files differindex 5e69bde9af..b68fd2cf63 100644 --- a/main/src/core/MonoDevelop.Ide/icons/execute-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/execute-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/execute-16~dark.png Binary files differnew file mode 100644 index 0000000000..914de00009 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/execute-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/execute-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..9311c37e55 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/execute-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/execute-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..1e3b3d7a58 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/execute-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/execute-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..a0004a6e1c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/execute-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/execute-16~disabled.png Binary files differnew file mode 100644 index 0000000000..3c2999f716 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/execute-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/execute-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..03a60abf54 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/execute-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-all-16.png b/main/src/core/MonoDevelop.Ide/icons/execute-all-16.png Binary files differnew file mode 100644 index 0000000000..ad3dc49018 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/execute-all-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-all-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/execute-all-16@2x.png Binary files differnew file mode 100644 index 0000000000..b3ff32411b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/execute-all-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-all-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~dark.png Binary files differnew file mode 100644 index 0000000000..f405523076 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-all-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2d71a6411d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-all-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..588c82ba2f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-all-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..b91582f8fe --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-all-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~disabled.png Binary files differnew file mode 100644 index 0000000000..cc61f3e6f4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/execute-all-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..f328582e20 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/execute-all-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/feedback-16.png b/main/src/core/MonoDevelop.Ide/icons/feedback-16.png Binary files differindex 84e22d720b..7d0758c672 100644 --- a/main/src/core/MonoDevelop.Ide/icons/feedback-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/feedback-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/feedback-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/feedback-16@2x.png Binary files differindex bec324d649..5c6b1ad7d1 100644 --- a/main/src/core/MonoDevelop.Ide/icons/feedback-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/feedback-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/feedback-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/feedback-16~dark.png Binary files differnew file mode 100644 index 0000000000..49172b1abc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/feedback-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/feedback-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/feedback-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..de38b74cb7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/feedback-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/feedback-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/feedback-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..495b0409f4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/feedback-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/feedback-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/feedback-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..cfff0d303b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/feedback-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/feedback-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/feedback-16~disabled.png Binary files differnew file mode 100644 index 0000000000..f65e98051a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/feedback-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/feedback-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/feedback-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..05833b79dc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/feedback-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-class-32.png b/main/src/core/MonoDevelop.Ide/icons/file-class-32.png Binary files differindex b34d144310..3bfce58cbf 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-class-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-class-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-class-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-class-32@2x.png Binary files differindex 2cd3001e89..e9555f2d27 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-class-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-class-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-class-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-class-32~dark.png Binary files differnew file mode 100644 index 0000000000..a3dbb7660f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-class-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-class-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-class-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e2deee5adf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-class-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-class-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-class-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..90896ccf53 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-class-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-class-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-class-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..6cee96331e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-class-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-class-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-class-32~sel.png Binary files differnew file mode 100644 index 0000000000..33c19c75a8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-class-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-class-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-class-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..fcb696c055 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-class-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-enum-32.png b/main/src/core/MonoDevelop.Ide/icons/file-enum-32.png Binary files differnew file mode 100644 index 0000000000..f9d25219f6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-enum-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-enum-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-enum-32@2x.png Binary files differnew file mode 100644 index 0000000000..fc92961799 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-enum-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-enum-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-enum-32~dark.png Binary files differnew file mode 100644 index 0000000000..0f8375ba6e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-enum-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-enum-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-enum-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..54ea878226 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-enum-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-enum-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-enum-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..d3a740b615 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-enum-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-enum-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-enum-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2648642906 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-enum-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-enum-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-enum-32~sel.png Binary files differnew file mode 100644 index 0000000000..72a6247031 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-enum-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-enum-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-enum-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..04ba7e56ea --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-enum-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-enumeration-32.png b/main/src/core/MonoDevelop.Ide/icons/file-enumeration-32.png Binary files differdeleted file mode 100644 index 166208a005..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/file-enumeration-32.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/file-enumeration-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-enumeration-32@2x.png Binary files differdeleted file mode 100644 index 2949d1407d..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/file-enumeration-32@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-16.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-16.png Binary files differindex a6e67ca604..5f58adad06 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-generic-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-16@2x.png Binary files differindex 6a70591325..937d309ecf 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-generic-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-16~dark.png Binary files differnew file mode 100644 index 0000000000..c5661a84d7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..578cd335b5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..3cbf0ebd0a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..44ec4ec4c9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-16~sel.png Binary files differnew file mode 100644 index 0000000000..9d4e060bd8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..a4025ebaf4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-32.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-32.png Binary files differindex 6a70591325..937d309ecf 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-generic-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-32@2x.png Binary files differindex 87bddc3e2a..2105eff238 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-generic-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-32~dark.png Binary files differnew file mode 100644 index 0000000000..578cd335b5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..ad9df469ea --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..44ec4ec4c9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e2aae4532f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-32~sel.png Binary files differnew file mode 100644 index 0000000000..a4025ebaf4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-generic-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-generic-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..34a0cde413 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-generic-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-gtk-32.png b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32.png Binary files differindex 632b146f16..88c4275144 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-gtk-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-gtk-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32@2x.png Binary files differindex d70e405738..634363a935 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-gtk-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~dark.png Binary files differnew file mode 100644 index 0000000000..7263b0da73 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..1dbf0ee24f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..80baa05ff3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..764af8e96f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~sel.png Binary files differnew file mode 100644 index 0000000000..ef27dc2aba --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2b19de6ff5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-gtk-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-16.png b/main/src/core/MonoDevelop.Ide/icons/file-header-16.png Binary files differindex 2b2d4e5cd9..da065700f1 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-header-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-header-16@2x.png Binary files differindex 709d650e11..f3b7c40f56 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-header-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-header-16~dark.png Binary files differnew file mode 100644 index 0000000000..9cf0c88d0a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-header-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..42c1f1f77c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-header-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..29b6efd15b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-header-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..67ef89459e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-header-16~sel.png Binary files differnew file mode 100644 index 0000000000..0e8403eba9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-header-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..a60878e42a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-32.png b/main/src/core/MonoDevelop.Ide/icons/file-header-32.png Binary files differindex 709d650e11..f3b7c40f56 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-header-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-header-32@2x.png Binary files differindex a4eba324a8..c74c86f4e1 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-header-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-header-32~dark.png Binary files differnew file mode 100644 index 0000000000..42c1f1f77c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-header-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..3f2af89122 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-header-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..67ef89459e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-header-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f09a4cd5bd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-header-32~sel.png Binary files differnew file mode 100644 index 0000000000..a60878e42a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-header-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-header-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..77bb2d64e4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-header-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-interface-32.png b/main/src/core/MonoDevelop.Ide/icons/file-interface-32.png Binary files differindex 239e8cf08a..8f62b2d20a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-interface-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-interface-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-interface-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-interface-32@2x.png Binary files differindex 9c6c994728..e5021f7672 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-interface-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-interface-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-interface-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-interface-32~dark.png Binary files differnew file mode 100644 index 0000000000..4bb7343c6c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-interface-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-interface-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-interface-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..fd90e83133 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-interface-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-interface-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-interface-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..42a6a498e0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-interface-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-interface-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-interface-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1b711e7d4a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-interface-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-interface-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-interface-32~sel.png Binary files differnew file mode 100644 index 0000000000..14d96f178e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-interface-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-interface-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-interface-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2efe26f113 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-interface-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-16.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-16.png Binary files differindex bdb9547e73..a57489eb4f 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-resource-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-16@2x.png Binary files differindex 70c9f15fe2..88f3416696 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-resource-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-16~dark.png Binary files differnew file mode 100644 index 0000000000..d52ba7e184 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..cf875eb7e9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..46c1d10f0d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..80b5f2dd71 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-16~sel.png Binary files differnew file mode 100644 index 0000000000..655ef0dfb3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2cd99fc903 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-32.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-32.png Binary files differindex 70c9f15fe2..88f3416696 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-resource-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-32@2x.png Binary files differindex b6cdc76469..1a72c4a84b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-resource-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-32~dark.png Binary files differnew file mode 100644 index 0000000000..cf875eb7e9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..836063bd94 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..80b5f2dd71 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..cc7d5ed773 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-32~sel.png Binary files differnew file mode 100644 index 0000000000..2cd99fc903 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-resource-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-resource-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..352f3dc9ef --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-resource-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-16.png b/main/src/core/MonoDevelop.Ide/icons/file-script-16.png Binary files differindex 78fab9fae2..e0569cbbe9 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-script-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-script-16@2x.png Binary files differindex a77dfbe024..ab3ad4af8a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-script-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-script-16~dark.png Binary files differnew file mode 100644 index 0000000000..aacdad3311 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-script-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..537bf6253c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-script-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..b763fc49a1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-script-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..4531a5946a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-script-16~sel.png Binary files differnew file mode 100644 index 0000000000..ec73be7747 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-script-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..cc2ad69682 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-32.png b/main/src/core/MonoDevelop.Ide/icons/file-script-32.png Binary files differindex a77dfbe024..ab3ad4af8a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-script-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-script-32@2x.png Binary files differindex 892e70fc93..ac889b6b5f 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-script-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-script-32~dark.png Binary files differnew file mode 100644 index 0000000000..537bf6253c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-script-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7baf9046e8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-script-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..4531a5946a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-script-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..fe413182ba --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-script-32~sel.png Binary files differnew file mode 100644 index 0000000000..cc2ad69682 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-script-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-script-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..894f3a46e3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-script-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-16.png b/main/src/core/MonoDevelop.Ide/icons/file-source-16.png Binary files differindex 34b7ac06e1..87fd49e5a6 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-source-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-source-16@2x.png Binary files differindex df5ea2bdc6..9981f54f05 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-source-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-source-16~dark.png Binary files differnew file mode 100644 index 0000000000..0166b821be --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-source-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d6917c820e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-source-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..3b13b595f1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-source-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..5dcf9b35e8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-source-16~sel.png Binary files differnew file mode 100644 index 0000000000..5de35c8be5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-source-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..daf1069540 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-32.png b/main/src/core/MonoDevelop.Ide/icons/file-source-32.png Binary files differindex df5ea2bdc6..9981f54f05 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-source-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-source-32@2x.png Binary files differindex 9f39b45817..b448c76f23 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-source-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-source-32~dark.png Binary files differnew file mode 100644 index 0000000000..d6917c820e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-source-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..25bf30dbd0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-source-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..5dcf9b35e8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-source-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..4199735ac8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-source-32~sel.png Binary files differnew file mode 100644 index 0000000000..daf1069540 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-source-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-source-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..eaf899406e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-source-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-struct-32.png b/main/src/core/MonoDevelop.Ide/icons/file-struct-32.png Binary files differindex 89009b7077..26034afd07 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-struct-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-struct-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-struct-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-struct-32@2x.png Binary files differindex b0e75e05a1..05fb02e473 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-struct-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-struct-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-struct-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-struct-32~dark.png Binary files differnew file mode 100644 index 0000000000..869a2968fa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-struct-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-struct-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-struct-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..80ba441548 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-struct-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-struct-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-struct-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..c67f49fa6a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-struct-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-struct-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-struct-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..76207918fe --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-struct-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-struct-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-struct-32~sel.png Binary files differnew file mode 100644 index 0000000000..0fbcaf39a3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-struct-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-struct-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-struct-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c99789c673 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-struct-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-16.png b/main/src/core/MonoDevelop.Ide/icons/file-text-16.png Binary files differindex 2287f67690..4e8961659d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-text-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-text-16@2x.png Binary files differindex bf8958e404..ef8a338929 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-text-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-text-16~dark.png Binary files differnew file mode 100644 index 0000000000..0c36f14c3b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-text-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d95e609916 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-text-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..e68c0a4f66 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-text-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..d86b7d1e74 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-text-16~sel.png Binary files differnew file mode 100644 index 0000000000..646373c4c2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-text-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1b466d2a9b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-32.png b/main/src/core/MonoDevelop.Ide/icons/file-text-32.png Binary files differindex bf8958e404..ef8a338929 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-text-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-text-32@2x.png Binary files differindex b0e4669507..739fc8f10e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-text-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-text-32~dark.png Binary files differnew file mode 100644 index 0000000000..d95e609916 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-text-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f0fc86a472 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-text-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..d86b7d1e74 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-text-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..0260f77ed2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-text-32~sel.png Binary files differnew file mode 100644 index 0000000000..1b466d2a9b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-text-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-text-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..8fc88db4d5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-text-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32.png b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32.png Binary files differindex 42633e88b5..00c16d0225 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32@2x.png Binary files differindex 8fddb768f6..508a01c322 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~dark.png Binary files differnew file mode 100644 index 0000000000..cb201fc2d9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7a1e452243 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..07fe59d25c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..68b995c7e3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~sel.png Binary files differnew file mode 100644 index 0000000000..3724056aef --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..d57dbc4c8d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-unit-test-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-16.png b/main/src/core/MonoDevelop.Ide/icons/file-web-16.png Binary files differindex 23a6f417bd..d467ec13a2 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-web-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-web-16@2x.png Binary files differindex b6f836b4f8..3e893aa314 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-web-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-web-16~dark.png Binary files differnew file mode 100644 index 0000000000..98026c5d81 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-web-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..bdf8d37f64 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-web-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..d6588df941 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-web-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2e11c56aaa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-web-16~sel.png Binary files differnew file mode 100644 index 0000000000..664bc434e1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-web-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..a4d1d70422 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-32.png b/main/src/core/MonoDevelop.Ide/icons/file-web-32.png Binary files differindex b6f836b4f8..3e893aa314 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-web-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-web-32@2x.png Binary files differindex bb99efb64d..1d5ad8c36b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-web-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-web-32~dark.png Binary files differnew file mode 100644 index 0000000000..bdf8d37f64 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-web-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..58b42ccf9b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-web-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..2e11c56aaa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-web-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e99c144c09 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-web-32~sel.png Binary files differnew file mode 100644 index 0000000000..a4d1d70422 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-web-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-web-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..eee860591b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-web-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-16.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-16.png Binary files differindex fc6082d1cb..658a3e0e60 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-xml-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-16@2x.png Binary files differindex 0aef2fef5d..7b4a3e5602 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-xml-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-16~dark.png Binary files differnew file mode 100644 index 0000000000..8a8ba1294c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..42742edc9c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..712f58462a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2b56aa7bb5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-16~sel.png Binary files differnew file mode 100644 index 0000000000..c1fd928313 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..9b9f7fbae7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-32.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-32.png Binary files differindex 0aef2fef5d..7b4a3e5602 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-xml-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-32@2x.png Binary files differindex 3896b8e119..806c52c5b8 100644 --- a/main/src/core/MonoDevelop.Ide/icons/file-xml-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-32~dark.png Binary files differnew file mode 100644 index 0000000000..42742edc9c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2540c51261 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..2b56aa7bb5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..d28413a948 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-32~sel.png Binary files differnew file mode 100644 index 0000000000..9b9f7fbae7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/file-xml-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/file-xml-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..27034d0dce --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/file-xml-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-16.png b/main/src/core/MonoDevelop.Ide/icons/find-16.png Binary files differindex 85e5d0df07..dc8f18a56f 100644 --- a/main/src/core/MonoDevelop.Ide/icons/find-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/find-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/find-16@2x.png Binary files differindex f53fae3769..1bb1b0150b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/find-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/find-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/find-16~dark.png Binary files differnew file mode 100644 index 0000000000..51b0a5d059 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/find-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2cb367ceaf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/find-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..70bcbb55ea --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/find-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..73e0ceea44 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/find-16~sel.png Binary files differnew file mode 100644 index 0000000000..70bcbb55ea --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/find-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..73e0ceea44 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16.png b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16.png Binary files differindex 4fd9e05804..fb797b81a7 100644 --- a/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16@2x.png Binary files differindex 9ae65404e5..25771151fc 100644 --- a/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~dark.png Binary files differnew file mode 100644 index 0000000000..8c3bb65314 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..8d5957af23 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..d4681e5c23 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..dcf7e16252 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~sel.png Binary files differnew file mode 100644 index 0000000000..d4681e5c23 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..dcf7e16252 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-and-replace-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-in-files-16.png b/main/src/core/MonoDevelop.Ide/icons/find-in-files-16.png Binary files differdeleted file mode 100644 index c8fbe69b3a..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/find-in-files-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/find-next-16.png b/main/src/core/MonoDevelop.Ide/icons/find-next-16.png Binary files differnew file mode 100644 index 0000000000..2290a6d5b4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-next-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-next-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/find-next-16@2x.png Binary files differnew file mode 100644 index 0000000000..1b4c9984c4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-next-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-next-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/find-next-16~dark.png Binary files differnew file mode 100644 index 0000000000..52993db038 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-next-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-next-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/find-next-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..42afe8eeed --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-next-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-prev-16.png b/main/src/core/MonoDevelop.Ide/icons/find-prev-16.png Binary files differnew file mode 100644 index 0000000000..8a431235e0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-prev-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-prev-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/find-prev-16@2x.png Binary files differnew file mode 100644 index 0000000000..04a9bd7e8f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-prev-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-prev-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/find-prev-16~dark.png Binary files differnew file mode 100644 index 0000000000..21fbef72aa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-prev-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/find-prev-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/find-prev-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..970c868b58 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/find-prev-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-assets-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16.png Binary files differnew file mode 100644 index 0000000000..c39e8faaa1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-assets-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16@2x.png Binary files differnew file mode 100644 index 0000000000..698d7f8f11 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~dark.png Binary files differnew file mode 100644 index 0000000000..9b9a329e68 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6eb675e19e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..a417da1f0c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..aa0b68c93a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~sel.png Binary files differnew file mode 100644 index 0000000000..a417da1f0c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..aa0b68c93a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-assets-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-assets-mac-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-assets-mac-16.png Binary files differdeleted file mode 100644 index 79f819e603..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-assets-mac-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-assets-mac-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-assets-mac-16@2x.png Binary files differdeleted file mode 100644 index ab02ba4e94..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-assets-mac-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-assets-win-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-assets-win-16.png Binary files differdeleted file mode 100644 index 9b09b25285..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-assets-win-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-assets-win-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-assets-win-16@2x.png Binary files differdeleted file mode 100644 index fe7de9851d..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-assets-win-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-component-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-component-16.png Binary files differnew file mode 100644 index 0000000000..66945c2c66 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-component-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-component-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-component-16@2x.png Binary files differnew file mode 100644 index 0000000000..c0bc969fef --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-component-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-component-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/folder-component-16~dark.png Binary files differnew file mode 100644 index 0000000000..63727d3270 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-component-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-component-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-component-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..25326338e4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-component-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-component-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/folder-component-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..7f5508f41c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-component-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-component-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-component-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..587aee4512 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-component-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-component-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/folder-component-16~sel.png Binary files differnew file mode 100644 index 0000000000..7f5508f41c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-component-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-component-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-component-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..587aee4512 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-component-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-component-mac-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-component-mac-16.png Binary files differdeleted file mode 100644 index 51fa67e549..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-component-mac-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-component-mac-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-component-mac-16@2x.png Binary files differdeleted file mode 100644 index b950a73ec0..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-component-mac-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-component-win-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-component-win-16.png Binary files differdeleted file mode 100644 index 891aa54875..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-component-win-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-component-win-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-component-win-16@2x.png Binary files differdeleted file mode 100644 index 553126f036..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-component-win-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-generic-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16.png Binary files differnew file mode 100644 index 0000000000..d03ab8e5b4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-generic-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16@2x.png Binary files differnew file mode 100644 index 0000000000..9dafc86fcf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~dark.png Binary files differnew file mode 100644 index 0000000000..b55b41daf0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..8124a4acf1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..8cbac06936 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..979d664225 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~sel.png Binary files differnew file mode 100644 index 0000000000..8cbac06936 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..979d664225 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-generic-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-generic-mac-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-generic-mac-16.png Binary files differdeleted file mode 100644 index 800b76d447..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-generic-mac-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-generic-mac-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-generic-mac-16@2x.png Binary files differdeleted file mode 100644 index c319f59bc2..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-generic-mac-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-generic-win-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-generic-win-16.png Binary files differdeleted file mode 100644 index fe06916af8..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-generic-win-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-generic-win-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-generic-win-16@2x.png Binary files differdeleted file mode 100644 index c9443aae50..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-generic-win-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-new-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-new-16.png Binary files differdeleted file mode 100644 index 426e6e92f1..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-new-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-resource-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16.png Binary files differnew file mode 100644 index 0000000000..1eee3debbf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-resource-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16@2x.png Binary files differnew file mode 100644 index 0000000000..152fa4bf34 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~dark.png Binary files differnew file mode 100644 index 0000000000..b44f689da1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..8741e36cd7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..9ddb319954 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..370c59d01a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~sel.png Binary files differnew file mode 100644 index 0000000000..9ddb319954 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..370c59d01a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-resource-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-solution-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16.png Binary files differnew file mode 100644 index 0000000000..dcdc665905 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-solution-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16@2x.png Binary files differnew file mode 100644 index 0000000000..66814bcfb8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~dark.png Binary files differnew file mode 100644 index 0000000000..7a7d388250 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..cc0aac54c9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..ce6b1e02de --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b17c00c961 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~sel.png Binary files differnew file mode 100644 index 0000000000..ce6b1e02de --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..45394e5e1e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/folder-solution-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-special-mac-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-special-mac-16.png Binary files differdeleted file mode 100644 index 43c2b89ca3..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-special-mac-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-special-mac-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-special-mac-16@2x.png Binary files differdeleted file mode 100644 index 89e8b80498..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-special-mac-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-special-win-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-special-win-16.png Binary files differdeleted file mode 100644 index 883bee1822..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-special-win-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-special-win-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-special-win-16@2x.png Binary files differdeleted file mode 100644 index fe3524f326..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-special-win-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-web-reference-mac-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-web-reference-mac-16.png Binary files differdeleted file mode 100644 index b017bd788e..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-web-reference-mac-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-web-reference-mac-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-web-reference-mac-16@2x.png Binary files differdeleted file mode 100644 index e4f89773dd..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-web-reference-mac-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-web-reference-win-16.png b/main/src/core/MonoDevelop.Ide/icons/folder-web-reference-win-16.png Binary files differdeleted file mode 100644 index 0f412c1753..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-web-reference-win-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/folder-web-reference-win-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/folder-web-reference-win-16@2x.png Binary files differdeleted file mode 100644 index 6b404b4007..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/folder-web-reference-win-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/fullscreen-16.png b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16.png Binary files differindex b9e9ea6321..7ef13592eb 100644 --- a/main/src/core/MonoDevelop.Ide/icons/fullscreen-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/fullscreen-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16@2x.png Binary files differindex 46604c39c8..168599b1a7 100644 --- a/main/src/core/MonoDevelop.Ide/icons/fullscreen-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~dark.png Binary files differnew file mode 100644 index 0000000000..d7c0ab66c1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..14edaec9b8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..df860e0fc5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..67efebeeda --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~sel.png Binary files differnew file mode 100644 index 0000000000..df860e0fc5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..67efebeeda --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/fullscreen-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-back-16.png b/main/src/core/MonoDevelop.Ide/icons/go-back-16.png Binary files differindex a812575428..0c2c73df2e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/go-back-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/go-back-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-back-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-back-16@2x.png Binary files differindex dd2620713e..a8405c6ce8 100644 --- a/main/src/core/MonoDevelop.Ide/icons/go-back-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/go-back-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-back-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/go-back-16~dark.png Binary files differnew file mode 100644 index 0000000000..7eb1a1f873 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-back-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-back-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-back-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..5084a58ff6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-back-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-back-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/go-back-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..d43c23f4e5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-back-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-back-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-back-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..3025837c5a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-back-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-back-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/go-back-16~disabled.png Binary files differnew file mode 100644 index 0000000000..fc2e26d5e8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-back-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-back-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-back-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..bd4e5960b8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-back-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-down-16.png b/main/src/core/MonoDevelop.Ide/icons/go-down-16.png Binary files differindex 24c499b29c..4b7a134d9b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/go-down-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/go-down-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-down-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-down-16@2x.png Binary files differindex 2df5aecf13..7448643689 100644 --- a/main/src/core/MonoDevelop.Ide/icons/go-down-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/go-down-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-down-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/go-down-16~dark.png Binary files differnew file mode 100644 index 0000000000..f82a370e6d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-down-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-down-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-down-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6073cdb86d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-down-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-down-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/go-down-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..8a8078c017 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-down-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-down-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-down-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..0270d5a66b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-down-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-down-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/go-down-16~disabled.png Binary files differnew file mode 100644 index 0000000000..b35b632b41 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-down-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-down-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-down-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..fcf300acee --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-down-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-forward-16.png b/main/src/core/MonoDevelop.Ide/icons/go-forward-16.png Binary files differindex 1d338ba1bb..35f57710eb 100644 --- a/main/src/core/MonoDevelop.Ide/icons/go-forward-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/go-forward-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-forward-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-forward-16@2x.png Binary files differindex cd6c264767..d1b3396e25 100644 --- a/main/src/core/MonoDevelop.Ide/icons/go-forward-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/go-forward-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-forward-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~dark.png Binary files differnew file mode 100644 index 0000000000..f3ca72bda1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-forward-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..73d39bf430 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-forward-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..18f1b16c94 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-forward-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..7315cf8f17 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-forward-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~disabled.png Binary files differnew file mode 100644 index 0000000000..f16198f9d4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-forward-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..ebef7a1c3d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-forward-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-to-line-16.png b/main/src/core/MonoDevelop.Ide/icons/go-to-line-16.png Binary files differnew file mode 100644 index 0000000000..b90f6cfd67 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-to-line-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-to-line-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-to-line-16@2x.png Binary files differnew file mode 100644 index 0000000000..74fd0875d0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-to-line-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-to-line-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/go-to-line-16~dark.png Binary files differnew file mode 100644 index 0000000000..388ec23b6c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-to-line-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-to-line-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-to-line-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..9fd925bd50 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-to-line-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-to-matching-brace-16.png b/main/src/core/MonoDevelop.Ide/icons/go-to-matching-brace-16.png Binary files differnew file mode 100644 index 0000000000..48edc8ba2a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-to-matching-brace-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-to-matching-brace-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-to-matching-brace-16@2x.png Binary files differnew file mode 100644 index 0000000000..1f0a91f068 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-to-matching-brace-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-to-matching-brace-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/go-to-matching-brace-16~dark.png Binary files differnew file mode 100644 index 0000000000..f6cfe4bcbc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-to-matching-brace-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-to-matching-brace-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-to-matching-brace-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..25d405e0b8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-to-matching-brace-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-up-16.png b/main/src/core/MonoDevelop.Ide/icons/go-up-16.png Binary files differindex 3d7f56a783..69617e1eaa 100644 --- a/main/src/core/MonoDevelop.Ide/icons/go-up-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/go-up-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-up-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-up-16@2x.png Binary files differindex d768f10cfa..bc219c594b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/go-up-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/go-up-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-up-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/go-up-16~dark.png Binary files differnew file mode 100644 index 0000000000..9c924f6a82 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-up-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-up-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-up-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..c25340732a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-up-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-up-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/go-up-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..2972604583 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-up-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-up-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-up-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..eeb135745b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-up-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-up-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/go-up-16~disabled.png Binary files differnew file mode 100644 index 0000000000..d6403b1550 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-up-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/go-up-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/go-up-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..abb5f55bab --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/go-up-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/goto-next-bookmark-16.png b/main/src/core/MonoDevelop.Ide/icons/goto-next-bookmark-16.png Binary files differdeleted file mode 100644 index f4f101ce60..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/goto-next-bookmark-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/goto-prev-bookmark-16.png b/main/src/core/MonoDevelop.Ide/icons/goto-prev-bookmark-16.png Binary files differdeleted file mode 100644 index 5fc1e5a8a6..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/goto-prev-bookmark-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/group-by-category-16.png b/main/src/core/MonoDevelop.Ide/icons/group-by-category-16.png Binary files differindex 503eb9c557..6c42b70df2 100644 --- a/main/src/core/MonoDevelop.Ide/icons/group-by-category-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/group-by-category-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/group-by-category-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/group-by-category-16@2x.png Binary files differindex d67f994428..7258f23f8b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/group-by-category-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/group-by-category-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/group-by-category-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/group-by-category-16~dark.png Binary files differnew file mode 100644 index 0000000000..742b8ee9ff --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/group-by-category-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/group-by-category-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/group-by-category-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e3315f3ecf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/group-by-category-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/help-16.png b/main/src/core/MonoDevelop.Ide/icons/help-16.png Binary files differindex af99ef09df..d29e4ddaba 100644 --- a/main/src/core/MonoDevelop.Ide/icons/help-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/help-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/help-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/help-16@2x.png Binary files differindex 923d626671..eb9da942d5 100644 --- a/main/src/core/MonoDevelop.Ide/icons/help-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/help-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/help-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/help-16~dark.png Binary files differnew file mode 100644 index 0000000000..b7e5b41b15 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/help-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/help-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/help-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d2299e6c91 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/help-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/help-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/help-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..8c16140779 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/help-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/help-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/help-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..921059abdf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/help-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/help-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/help-16~sel.png Binary files differnew file mode 100644 index 0000000000..8c16140779 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/help-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/help-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/help-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..921059abdf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/help-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/home-16.png b/main/src/core/MonoDevelop.Ide/icons/home-16.png Binary files differindex 33f0f125d1..a0394bc7ae 100644 --- a/main/src/core/MonoDevelop.Ide/icons/home-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/home-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/home-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/home-16@2x.png Binary files differindex 4911d16866..e79d362863 100644 --- a/main/src/core/MonoDevelop.Ide/icons/home-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/home-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/home-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/home-16~dark.png Binary files differnew file mode 100644 index 0000000000..a491b02dd3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/home-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/home-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/home-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f2e2415723 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/home-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/home-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/home-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..7e7673d986 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/home-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/home-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/home-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c54b31fd47 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/home-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/home-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/home-16~sel.png Binary files differnew file mode 100644 index 0000000000..7e7673d986 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/home-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/home-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/home-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c54b31fd47 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/home-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/indent-16.png b/main/src/core/MonoDevelop.Ide/icons/indent-16.png Binary files differindex 86024f1f7b..566463dfaf 100644 --- a/main/src/core/MonoDevelop.Ide/icons/indent-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/indent-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/indent-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/indent-16@2x.png Binary files differindex f604e0faa5..484325cf21 100644 --- a/main/src/core/MonoDevelop.Ide/icons/indent-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/indent-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/indent-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/indent-16~dark.png Binary files differnew file mode 100644 index 0000000000..e9a7d770f5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/indent-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/indent-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/indent-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..75983aba3f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/indent-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-16.png b/main/src/core/MonoDevelop.Ide/icons/information-16.png Binary files differindex fbddc185a4..874c8d5ec4 100644 --- a/main/src/core/MonoDevelop.Ide/icons/information-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/information-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-16@2x.png Binary files differindex 5557a3de4a..1e5375cedc 100644 --- a/main/src/core/MonoDevelop.Ide/icons/information-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/information-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/information-16~dark.png Binary files differnew file mode 100644 index 0000000000..5fb33e4650 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..8497f8bfb9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/information-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..36422baf2a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..16b54543ed --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/information-16~sel.png Binary files differnew file mode 100644 index 0000000000..36422baf2a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..16b54543ed --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-24.png b/main/src/core/MonoDevelop.Ide/icons/information-24.png Binary files differindex 28e68fb1e2..0e1929869e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/information-24.png +++ b/main/src/core/MonoDevelop.Ide/icons/information-24.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-24@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-24@2x.png Binary files differindex b11eeacab1..a996498298 100644 --- a/main/src/core/MonoDevelop.Ide/icons/information-24@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/information-24@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-24~dark.png b/main/src/core/MonoDevelop.Ide/icons/information-24~dark.png Binary files differnew file mode 100644 index 0000000000..10d5269f0b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-24~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-24~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-24~dark@2x.png Binary files differnew file mode 100644 index 0000000000..740cde446f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-24~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-24~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/information-24~dark~sel.png Binary files differnew file mode 100644 index 0000000000..3756036157 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-24~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-24~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-24~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..32a1de4bf0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-24~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-24~sel.png b/main/src/core/MonoDevelop.Ide/icons/information-24~sel.png Binary files differnew file mode 100644 index 0000000000..3756036157 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-24~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-24~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-24~sel@2x.png Binary files differnew file mode 100644 index 0000000000..32a1de4bf0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-24~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-32.png b/main/src/core/MonoDevelop.Ide/icons/information-32.png Binary files differindex 5557a3de4a..1e5375cedc 100644 --- a/main/src/core/MonoDevelop.Ide/icons/information-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/information-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-32@2x.png Binary files differindex e793ec82ae..4979139c0e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/information-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/information-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/information-32~dark.png Binary files differnew file mode 100644 index 0000000000..8497f8bfb9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..86cd3e5521 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/information-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..16b54543ed --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1e24e4a0e5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/information-32~sel.png Binary files differnew file mode 100644 index 0000000000..16b54543ed --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1e24e4a0e5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-48.png b/main/src/core/MonoDevelop.Ide/icons/information-48.png Binary files differindex b11eeacab1..a996498298 100644 --- a/main/src/core/MonoDevelop.Ide/icons/information-48.png +++ b/main/src/core/MonoDevelop.Ide/icons/information-48.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-48@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-48@2x.png Binary files differindex 8f1fc67009..3eea294793 100644 --- a/main/src/core/MonoDevelop.Ide/icons/information-48@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/information-48@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-48~dark.png b/main/src/core/MonoDevelop.Ide/icons/information-48~dark.png Binary files differnew file mode 100644 index 0000000000..740cde446f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-48~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-48~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-48~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0f2f0f0fed --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-48~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-48~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/information-48~dark~sel.png Binary files differnew file mode 100644 index 0000000000..32a1de4bf0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-48~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-48~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-48~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..05959eb154 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-48~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-48~sel.png b/main/src/core/MonoDevelop.Ide/icons/information-48~sel.png Binary files differnew file mode 100644 index 0000000000..32a1de4bf0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-48~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/information-48~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/information-48~sel@2x.png Binary files differnew file mode 100644 index 0000000000..05959eb154 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/information-48~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/invalid-reference-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/invalid-reference-overlay-16.png Binary files differdeleted file mode 100644 index ecf13c9f69..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/invalid-reference-overlay-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/invalid-reference-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/invalid-reference-overlay-16@2x.png Binary files differdeleted file mode 100644 index 9133b12c49..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/invalid-reference-overlay-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/jump-to-16.png b/main/src/core/MonoDevelop.Ide/icons/jump-to-16.png Binary files differindex 274255670b..fc96996b2b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/jump-to-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/jump-to-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/jump-to-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/jump-to-16@2x.png Binary files differindex 2c0c87596d..1b2fe2c1d5 100644 --- a/main/src/core/MonoDevelop.Ide/icons/jump-to-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/jump-to-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/jump-to-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~dark.png Binary files differnew file mode 100644 index 0000000000..fcaa81804f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/jump-to-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..75c6dcb90f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/jump-to-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..89d5be5e1f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/jump-to-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..0eae90ab44 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/jump-to-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~disabled.png Binary files differnew file mode 100644 index 0000000000..aa3f607efd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/jump-to-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..c2930c227c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/jump-to-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/link-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/link-overlay-16.png Binary files differindex 68a5379291..30bcedb2ac 100644 --- a/main/src/core/MonoDevelop.Ide/icons/link-overlay-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/link-overlay-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/link-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/link-overlay-16@2x.png Binary files differindex bb823ed63a..7fdcfb10bf 100644 --- a/main/src/core/MonoDevelop.Ide/icons/link-overlay-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/link-overlay-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/link-overlay-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/link-overlay-16~dark.png Binary files differnew file mode 100644 index 0000000000..8fbdf7977c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/link-overlay-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/link-overlay-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/link-overlay-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b2b23bab57 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/link-overlay-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/media-play-16.png b/main/src/core/MonoDevelop.Ide/icons/media-play-16.png Binary files differdeleted file mode 100644 index 7b5e2a5b1f..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/media-play-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/media-play-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/media-play-16@2x.png Binary files differdeleted file mode 100644 index 4e2eaf097d..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/media-play-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/missing-image-16.png b/main/src/core/MonoDevelop.Ide/icons/missing-image-16.png Binary files differindex bf13fbba53..06c6c11db8 100644 --- a/main/src/core/MonoDevelop.Ide/icons/missing-image-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/missing-image-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/missing-image-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/missing-image-16@2x.png Binary files differindex 71dba1ed78..f207ccc0ed 100644 --- a/main/src/core/MonoDevelop.Ide/icons/missing-image-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/missing-image-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/missing-image-32.png b/main/src/core/MonoDevelop.Ide/icons/missing-image-32.png Binary files differnew file mode 100644 index 0000000000..f207ccc0ed --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/missing-image-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/missing-image-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/missing-image-32@2x.png Binary files differnew file mode 100644 index 0000000000..4d6cc8cd67 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/missing-image-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/missing-image-48.png b/main/src/core/MonoDevelop.Ide/icons/missing-image-48.png Binary files differnew file mode 100644 index 0000000000..347fc57063 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/missing-image-48.png diff --git a/main/src/core/MonoDevelop.Ide/icons/missing-image-48@2x.png b/main/src/core/MonoDevelop.Ide/icons/missing-image-48@2x.png Binary files differnew file mode 100644 index 0000000000..60f7c3b8a8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/missing-image-48@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/navigate-next-16.png b/main/src/core/MonoDevelop.Ide/icons/navigate-next-16.png Binary files differdeleted file mode 100644 index ea295320f3..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/navigate-next-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/navigate-previous-16.png b/main/src/core/MonoDevelop.Ide/icons/navigate-previous-16.png Binary files differdeleted file mode 100644 index d00ac807f2..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/navigate-previous-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/new-folder-16.png b/main/src/core/MonoDevelop.Ide/icons/new-folder-16.png Binary files differnew file mode 100644 index 0000000000..e78339cecd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-folder-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-folder-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/new-folder-16@2x.png Binary files differnew file mode 100644 index 0000000000..d5253f2868 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-folder-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-folder-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/new-folder-16~dark.png Binary files differnew file mode 100644 index 0000000000..6419dcc00c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-folder-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-folder-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/new-folder-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..1a204198aa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-folder-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-namespace-16.png b/main/src/core/MonoDevelop.Ide/icons/new-namespace-16.png Binary files differnew file mode 100644 index 0000000000..7255aa8490 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-namespace-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-namespace-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/new-namespace-16@2x.png Binary files differnew file mode 100644 index 0000000000..7509eb46ac --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-namespace-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-namespace-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/new-namespace-16~dark.png Binary files differnew file mode 100644 index 0000000000..7351d826df --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-namespace-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-namespace-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/new-namespace-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..1aab895d4b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-namespace-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-project-16.png b/main/src/core/MonoDevelop.Ide/icons/new-project-16.png Binary files differnew file mode 100644 index 0000000000..3863a89871 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-project-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-project-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/new-project-16@2x.png Binary files differnew file mode 100644 index 0000000000..a4595f8573 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-project-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-project-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/new-project-16~dark.png Binary files differnew file mode 100644 index 0000000000..307e595675 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-project-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-project-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/new-project-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..09b88d6a85 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-project-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-solution-16.png b/main/src/core/MonoDevelop.Ide/icons/new-solution-16.png Binary files differnew file mode 100644 index 0000000000..4862aff2cc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-solution-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-solution-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/new-solution-16@2x.png Binary files differnew file mode 100644 index 0000000000..81955bbbe0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-solution-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-solution-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/new-solution-16~dark.png Binary files differnew file mode 100644 index 0000000000..4580ec2f94 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-solution-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-solution-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/new-solution-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6c5c7410ef --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-solution-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-solution-folder-16.png b/main/src/core/MonoDevelop.Ide/icons/new-solution-folder-16.png Binary files differnew file mode 100644 index 0000000000..d0b5f6fa1f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-solution-folder-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-solution-folder-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/new-solution-folder-16@2x.png Binary files differnew file mode 100644 index 0000000000..1a1d790783 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-solution-folder-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-solution-folder-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/new-solution-folder-16~dark.png Binary files differnew file mode 100644 index 0000000000..8860f24280 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-solution-folder-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-solution-folder-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/new-solution-folder-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..51909579f2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-solution-folder-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-workspace-16.png b/main/src/core/MonoDevelop.Ide/icons/new-workspace-16.png Binary files differnew file mode 100644 index 0000000000..3cee932ce3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-workspace-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-workspace-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/new-workspace-16@2x.png Binary files differnew file mode 100644 index 0000000000..fca97a0ac5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-workspace-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-workspace-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/new-workspace-16~dark.png Binary files differnew file mode 100644 index 0000000000..8f577f51b3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-workspace-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/new-workspace-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/new-workspace-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b98c1f2a43 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/new-workspace-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/open-16.png b/main/src/core/MonoDevelop.Ide/icons/open-16.png Binary files differindex fbb0cec986..4a533eb68b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/open-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/open-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/open-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/open-16@2x.png Binary files differnew file mode 100644 index 0000000000..8bd29c5329 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/open-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/open-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/open-16~dark.png Binary files differnew file mode 100644 index 0000000000..bf44fd7264 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/open-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/open-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/open-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..3fb2437a17 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/open-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-16.png b/main/src/core/MonoDevelop.Ide/icons/package-16.png Binary files differindex be53353283..8519a6420d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/package-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/package-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-16@2x.png Binary files differindex 6f21d7aa77..9708a1eded 100644 --- a/main/src/core/MonoDevelop.Ide/icons/package-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/package-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/package-16~dark.png Binary files differnew file mode 100644 index 0000000000..25d4814e13 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6b099dbfbc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/package-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..9eeaade789 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e58ff00899 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/package-16~sel.png Binary files differnew file mode 100644 index 0000000000..9eeaade789 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e58ff00899 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-24.png b/main/src/core/MonoDevelop.Ide/icons/package-24.png Binary files differindex 0e2e9604a4..073227d02c 100644 --- a/main/src/core/MonoDevelop.Ide/icons/package-24.png +++ b/main/src/core/MonoDevelop.Ide/icons/package-24.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-24@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-24@2x.png Binary files differindex 81a5324fce..6dbcbea034 100644 --- a/main/src/core/MonoDevelop.Ide/icons/package-24@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/package-24@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-24~dark.png b/main/src/core/MonoDevelop.Ide/icons/package-24~dark.png Binary files differnew file mode 100644 index 0000000000..c5f8cd9ba5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-24~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-24~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-24~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2fb74b25c1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-24~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-24~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/package-24~dark~sel.png Binary files differnew file mode 100644 index 0000000000..8c10f8e492 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-24~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-24~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-24~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..7fec138598 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-24~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-24~sel.png b/main/src/core/MonoDevelop.Ide/icons/package-24~sel.png Binary files differnew file mode 100644 index 0000000000..8c10f8e492 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-24~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-24~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-24~sel@2x.png Binary files differnew file mode 100644 index 0000000000..7fec138598 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-24~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-32.png b/main/src/core/MonoDevelop.Ide/icons/package-32.png Binary files differindex 6f21d7aa77..9708a1eded 100644 --- a/main/src/core/MonoDevelop.Ide/icons/package-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/package-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-32@2x.png Binary files differindex 8b687efa3d..56b0c40ada 100644 --- a/main/src/core/MonoDevelop.Ide/icons/package-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/package-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/package-32~dark.png Binary files differnew file mode 100644 index 0000000000..6b099dbfbc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..70b6d95f29 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/package-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..e58ff00899 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..ddb889f387 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/package-32~sel.png Binary files differnew file mode 100644 index 0000000000..e58ff00899 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..ddb889f387 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-48.png b/main/src/core/MonoDevelop.Ide/icons/package-48.png Binary files differindex 81a5324fce..6dbcbea034 100644 --- a/main/src/core/MonoDevelop.Ide/icons/package-48.png +++ b/main/src/core/MonoDevelop.Ide/icons/package-48.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-48@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-48@2x.png Binary files differindex 3862bac535..0484944163 100644 --- a/main/src/core/MonoDevelop.Ide/icons/package-48@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/package-48@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-48~dark.png b/main/src/core/MonoDevelop.Ide/icons/package-48~dark.png Binary files differnew file mode 100644 index 0000000000..2fb74b25c1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-48~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-48~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-48~dark@2x.png Binary files differnew file mode 100644 index 0000000000..07520b847c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-48~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-48~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/package-48~dark~sel.png Binary files differnew file mode 100644 index 0000000000..7fec138598 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-48~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-48~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-48~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e134ffbf43 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-48~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-48~sel.png b/main/src/core/MonoDevelop.Ide/icons/package-48~sel.png Binary files differnew file mode 100644 index 0000000000..7fec138598 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-48~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-48~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-48~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e134ffbf43 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-48~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-source-16.png b/main/src/core/MonoDevelop.Ide/icons/package-source-16.png Binary files differindex c01c3f5eb0..9850050463 100644 --- a/main/src/core/MonoDevelop.Ide/icons/package-source-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/package-source-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-source-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-source-16@2x.png Binary files differindex 7e19f0f3b1..7aef0ee9bd 100644 --- a/main/src/core/MonoDevelop.Ide/icons/package-source-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/package-source-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-source-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/package-source-16~dark.png Binary files differnew file mode 100644 index 0000000000..593d3a8b96 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-source-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-source-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-source-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e94c8ac213 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-source-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-source-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/package-source-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..e3aee767a7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-source-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-source-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-source-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..28260cb4c2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-source-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-source-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/package-source-16~sel.png Binary files differnew file mode 100644 index 0000000000..e3aee767a7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-source-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/package-source-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/package-source-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..28260cb4c2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/package-source-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16.png b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16.png Binary files differindex 05d62b949f..7678a94b0a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16@2x.png Binary files differindex e1791a2341..8acc4b1279 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~dark.png Binary files differnew file mode 100644 index 0000000000..a85230475b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..12727393d6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..f9ff247739 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..4113d8b83f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~sel.png Binary files differnew file mode 100644 index 0000000000..e03961d11e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..051da63ace --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-application-output-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-classes-16.png b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16.png Binary files differnew file mode 100644 index 0000000000..1d61a2dc11 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-classes-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16@2x.png Binary files differnew file mode 100644 index 0000000000..89a18c73ab --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~dark.png Binary files differnew file mode 100644 index 0000000000..d095ccc5ba --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..5ff24b996a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..905f7e31c9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..302cf6177e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~sel.png Binary files differnew file mode 100644 index 0000000000..905f7e31c9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..302cf6177e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-classes-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16.png Binary files differindex 9aca71b41e..a04d781670 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16@2x.png Binary files differindex 35ca144f90..99b7ff33fd 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~dark.png Binary files differnew file mode 100644 index 0000000000..c2b7099889 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..cce33fdaf2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..88d9ed9924 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..30f3c11358 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~sel.png Binary files differnew file mode 100644 index 0000000000..88d9ed9924 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..30f3c11358 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16.png Binary files differindex bf74a28182..69db0133df 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16@2x.png Binary files differindex d7b6f5c971..473dfb3084 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark.png Binary files differnew file mode 100644 index 0000000000..bed2fd1472 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..cd21732d4c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..c2b7099889 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..cce33fdaf2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..88d9ed9924 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..30f3c11358 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~disabled.png Binary files differnew file mode 100644 index 0000000000..a04d781670 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..99b7ff33fd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~sel.png Binary files differnew file mode 100644 index 0000000000..88d9ed9924 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..30f3c11358 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-errors-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16.png Binary files differindex d7674e20a1..6d1c250bee 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16@2x.png Binary files differindex 2b20e60100..6dfe066165 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark.png Binary files differnew file mode 100644 index 0000000000..5da3b1e8fc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..cb8065913d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..5da3b1e8fc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..cb8065913d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..b4345ae86d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c0e74510a1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~disabled.png Binary files differnew file mode 100644 index 0000000000..6d1c250bee --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..6dfe066165 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~sel.png Binary files differnew file mode 100644 index 0000000000..b4345ae86d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c0e74510a1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-error-list-warnings-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-generic-16.png b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16.png Binary files differnew file mode 100644 index 0000000000..d861ac549a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-generic-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16@2x.png Binary files differnew file mode 100644 index 0000000000..04481de38c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~dark.png Binary files differnew file mode 100644 index 0000000000..1d52c8c329 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..efcfcaf1c4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..dcd681705c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1065f945af --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~sel.png Binary files differnew file mode 100644 index 0000000000..dcd681705c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1065f945af --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-generic-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-generic-pad-16.png b/main/src/core/MonoDevelop.Ide/icons/pad-generic-pad-16.png Binary files differdeleted file mode 100644 index f6ea553b71..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/pad-generic-pad-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-generic-pad-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-generic-pad-16@2x.png Binary files differdeleted file mode 100644 index 9e89538098..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/pad-generic-pad-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-help-16.png b/main/src/core/MonoDevelop.Ide/icons/pad-help-16.png Binary files differindex af99ef09df..640566bb05 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pad-help-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/pad-help-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-help-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-help-16@2x.png Binary files differindex 923d626671..882bdd164e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pad-help-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/pad-help-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-help-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/pad-help-16~dark.png Binary files differnew file mode 100644 index 0000000000..53a07a3c62 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-help-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-help-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-help-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..5f6496ed8f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-help-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-help-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-help-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..eca72a347b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-help-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-help-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-help-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b1dcd6e7f0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-help-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-help-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-help-16~sel.png Binary files differnew file mode 100644 index 0000000000..eca72a347b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-help-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-help-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-help-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b1dcd6e7f0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-help-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16.png b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16.png Binary files differindex 73668287fb..7678a94b0a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16@2x.png Binary files differindex 3fb43534d5..8acc4b1279 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~dark.png Binary files differnew file mode 100644 index 0000000000..a85230475b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..12727393d6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..f9ff247739 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..4113d8b83f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~sel.png Binary files differnew file mode 100644 index 0000000000..e03961d11e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..051da63ace --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-immediate-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-search-16.png b/main/src/core/MonoDevelop.Ide/icons/pad-search-16.png Binary files differnew file mode 100644 index 0000000000..c6e794702f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-search-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-search-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-search-16@2x.png Binary files differnew file mode 100644 index 0000000000..c1f12aa259 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-search-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-search-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/pad-search-16~dark.png Binary files differnew file mode 100644 index 0000000000..c3b71cfc5a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-search-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-search-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-search-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..8aa943236d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-search-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-search-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-search-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..3ad5af973d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-search-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-search-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-search-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f2fcea39ca --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-search-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-search-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-search-16~sel.png Binary files differnew file mode 100644 index 0000000000..3ad5af973d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-search-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-search-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-search-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f2fcea39ca --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-search-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-search-results-16.png b/main/src/core/MonoDevelop.Ide/icons/pad-search-results-16.png Binary files differdeleted file mode 100644 index 85e5d0df07..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/pad-search-results-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-search-results-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-search-results-16@2x.png Binary files differdeleted file mode 100644 index f53fae3769..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/pad-search-results-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-solution-16.png b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16.png Binary files differnew file mode 100644 index 0000000000..4862aff2cc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-solution-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16@2x.png Binary files differnew file mode 100644 index 0000000000..fa2f04788a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~dark.png Binary files differnew file mode 100644 index 0000000000..4580ec2f94 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..24e2e19986 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..fac7faa890 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..3469d279a6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~sel.png Binary files differnew file mode 100644 index 0000000000..fac7faa890 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..3469d279a6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-solution-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16.png b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16.png Binary files differindex e2b6ca1f54..35cd8c401f 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16@2x.png Binary files differindex 571b8d5d6e..42d87a3f4e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~dark.png Binary files differnew file mode 100644 index 0000000000..ca7ef09e9a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d005245783 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..6386ee383e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..a237744db8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~sel.png Binary files differnew file mode 100644 index 0000000000..6386ee383e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..a237744db8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pad-task-list-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/page-setup-16.png b/main/src/core/MonoDevelop.Ide/icons/page-setup-16.png Binary files differdeleted file mode 100644 index ea7ae273c7..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/page-setup-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/page-setup-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/page-setup-16@2x.png Binary files differdeleted file mode 100644 index 1ca76c3a2a..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/page-setup-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/parser-16.png b/main/src/core/MonoDevelop.Ide/icons/parser-16.png Binary files differindex 9ab8e516c4..4525824d1c 100644 --- a/main/src/core/MonoDevelop.Ide/icons/parser-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/parser-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/parser-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/parser-16@2x.png Binary files differindex 5ca687b93d..07960aec3d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/parser-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/parser-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/parser-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/parser-16~dark.png Binary files differnew file mode 100644 index 0000000000..5f968710da --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/parser-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/parser-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/parser-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..8ca627e7bf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/parser-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/parser-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/parser-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..c077a84bc2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/parser-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/parser-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/parser-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..67177d974f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/parser-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/parser-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/parser-16~sel.png Binary files differnew file mode 100644 index 0000000000..c077a84bc2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/parser-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/parser-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/parser-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..67177d974f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/parser-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/paste-16.png b/main/src/core/MonoDevelop.Ide/icons/paste-16.png Binary files differindex 67edc0d95d..6a99fc60c0 100644 --- a/main/src/core/MonoDevelop.Ide/icons/paste-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/paste-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/paste-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/paste-16@2x.png Binary files differindex 1868224055..ab525b89a2 100644 --- a/main/src/core/MonoDevelop.Ide/icons/paste-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/paste-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/paste-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/paste-16~dark.png Binary files differnew file mode 100644 index 0000000000..22c5d93ffd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/paste-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/paste-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/paste-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..df8a2b8267 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/paste-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-down-16.png b/main/src/core/MonoDevelop.Ide/icons/pin-down-16.png Binary files differindex ed29a7a661..393afc2654 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pin-down-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/pin-down-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-down-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pin-down-16@2x.png Binary files differindex ddc041921f..c95d06a0a4 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pin-down-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/pin-down-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark.png Binary files differnew file mode 100644 index 0000000000..74cfe2707f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f89c95c59d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..a64f14485c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..bf46987f2f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..d0635f325d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..92e2847a9d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-down-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~disabled.png Binary files differnew file mode 100644 index 0000000000..e359f7a757 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-down-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..f85039f95b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-down-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~sel.png Binary files differnew file mode 100644 index 0000000000..d0635f325d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-down-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..92e2847a9d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-down-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-up-16.png b/main/src/core/MonoDevelop.Ide/icons/pin-up-16.png Binary files differindex 564abe3c74..f8dc71e02f 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pin-up-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/pin-up-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-up-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/pin-up-16@2x.png Binary files differindex 9f616764df..a75ed1a543 100644 --- a/main/src/core/MonoDevelop.Ide/icons/pin-up-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/pin-up-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark.png Binary files differnew file mode 100644 index 0000000000..17aaa37cff --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..796511ce04 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..6167ae9f76 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..9b20dddbd3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..25647dd012 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..bcb57a87b8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-up-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~disabled.png Binary files differnew file mode 100644 index 0000000000..0f0de21161 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-up-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..897aaec82f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-up-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~sel.png Binary files differnew file mode 100644 index 0000000000..25647dd012 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/pin-up-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..bcb57a87b8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/pin-up-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-android-16.png b/main/src/core/MonoDevelop.Ide/icons/platform-android-16.png Binary files differindex 0a8d08efba..e4b5e92e10 100644 --- a/main/src/core/MonoDevelop.Ide/icons/platform-android-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/platform-android-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-android-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-android-16@2x.png Binary files differindex e8e7f7ff31..c3f23628a1 100644 --- a/main/src/core/MonoDevelop.Ide/icons/platform-android-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/platform-android-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-android-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/platform-android-16~dark.png Binary files differnew file mode 100644 index 0000000000..f335e871b5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-android-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-android-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-android-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..287a30da57 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-android-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-android-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/platform-android-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..4df8fac976 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-android-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-android-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-android-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..687f8aa50f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-android-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-android-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/platform-android-16~sel.png Binary files differnew file mode 100644 index 0000000000..4df8fac976 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-android-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-android-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-android-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..687f8aa50f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-android-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-cross-platform-16.png b/main/src/core/MonoDevelop.Ide/icons/platform-cross-platform-16.png Binary files differdeleted file mode 100644 index c108092880..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/platform-cross-platform-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-cross-platform-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-cross-platform-16@2x.png Binary files differdeleted file mode 100644 index 7554a97a02..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/platform-cross-platform-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16.png b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16.png Binary files differnew file mode 100644 index 0000000000..ce7a3b59ed --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16@2x.png Binary files differnew file mode 100644 index 0000000000..8c23666827 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~dark.png Binary files differnew file mode 100644 index 0000000000..2e7b146bb6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..344317c016 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..fa6de7105f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..5d127e3fca --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~sel.png Binary files differnew file mode 100644 index 0000000000..fa6de7105f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..5d127e3fca --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-crossplatform-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-ios-16.png b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16.png Binary files differindex 3859a9c5d1..9dc49511ab 100644 --- a/main/src/core/MonoDevelop.Ide/icons/platform-ios-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-ios-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16@2x.png Binary files differindex e262d04e46..71f00883c6 100644 --- a/main/src/core/MonoDevelop.Ide/icons/platform-ios-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~dark.png Binary files differnew file mode 100644 index 0000000000..06c16c60d3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..5d885f9a5c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..6e821835e8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..339c7e8e8f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~sel.png Binary files differnew file mode 100644 index 0000000000..5740257c6b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..a6b22baa39 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-ios-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-mac-16.png b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16.png Binary files differindex 1d61d09bcd..9ef67b0f0e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/platform-mac-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-mac-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16@2x.png Binary files differindex dca40f8bc2..9ed89c9ffe 100644 --- a/main/src/core/MonoDevelop.Ide/icons/platform-mac-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~dark.png Binary files differnew file mode 100644 index 0000000000..ecc6f08a6d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..78cd12c56b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..8ae189920b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..df2bef21c9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~sel.png Binary files differnew file mode 100644 index 0000000000..8ae189920b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..df2bef21c9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-mac-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-other-16.png b/main/src/core/MonoDevelop.Ide/icons/platform-other-16.png Binary files differindex 324914455e..a59eab115f 100644 --- a/main/src/core/MonoDevelop.Ide/icons/platform-other-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/platform-other-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-other-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-other-16@2x.png Binary files differindex 4d4e199da6..1c9f485642 100644 --- a/main/src/core/MonoDevelop.Ide/icons/platform-other-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/platform-other-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-other-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/platform-other-16~dark.png Binary files differnew file mode 100644 index 0000000000..b458f83d38 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-other-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-other-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-other-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..33fb312679 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-other-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-other-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/platform-other-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..89c9aa8e45 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-other-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-other-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-other-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..ae628d9365 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-other-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-other-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/platform-other-16~sel.png Binary files differnew file mode 100644 index 0000000000..89c9aa8e45 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-other-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-other-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-other-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..ae628d9365 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-other-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16.png b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16.png Binary files differindex 103a273603..d526a4ea14 100644 --- a/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16@2x.png Binary files differindex b320f4a89d..85d499e3d7 100644 --- a/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~dark.png Binary files differnew file mode 100644 index 0000000000..60943e0e60 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..ed32d0c3c5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..633e4cbfe0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..3dcf926030 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~sel.png Binary files differnew file mode 100644 index 0000000000..633e4cbfe0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..3dcf926030 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-tvos-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16.png b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16.png Binary files differindex 5ba3db5ba2..6069374409 100644 --- a/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16@2x.png Binary files differindex e2c8c086a1..911151ef6b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~dark.png Binary files differnew file mode 100644 index 0000000000..9d5f701786 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..02d6a11c64 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..615638b0c0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..83261cce64 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~sel.png Binary files differnew file mode 100644 index 0000000000..82edc41979 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1d24fb4b62 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/platform-watchos-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/plugin-menu-16.png b/main/src/core/MonoDevelop.Ide/icons/plugin-menu-16.png Binary files differnew file mode 100644 index 0000000000..ea98899a86 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/plugin-menu-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/plugin-menu-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/plugin-menu-16@2x.png Binary files differnew file mode 100644 index 0000000000..629db188c8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/plugin-menu-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/plugin-menu-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/plugin-menu-16~dark.png Binary files differnew file mode 100644 index 0000000000..1db72f4529 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/plugin-menu-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/plugin-menu-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/plugin-menu-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..305c9eac6d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/plugin-menu-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/popup-close-16.png b/main/src/core/MonoDevelop.Ide/icons/popup-close-16.png Binary files differindex 9ccc4c0018..c290dfda23 100644 --- a/main/src/core/MonoDevelop.Ide/icons/popup-close-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/popup-close-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/popup-close-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/popup-close-16@2x.png Binary files differindex 703311ea77..3c09c3e273 100644 --- a/main/src/core/MonoDevelop.Ide/icons/popup-close-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/popup-close-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/popup-close-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/popup-close-16~dark.png Binary files differnew file mode 100644 index 0000000000..fcd2468a4e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/popup-close-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/popup-close-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/popup-close-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..aa6afaec73 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/popup-close-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/popup-close-hover-16.png b/main/src/core/MonoDevelop.Ide/icons/popup-close-hover-16.png Binary files differindex 64be74322c..2cb21c0a44 100644 --- a/main/src/core/MonoDevelop.Ide/icons/popup-close-hover-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/popup-close-hover-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/popup-close-hover-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/popup-close-hover-16@2x.png Binary files differindex 6badd7e1eb..56ea4f6575 100644 --- a/main/src/core/MonoDevelop.Ide/icons/popup-close-hover-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/popup-close-hover-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/popup-close-hover-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/popup-close-hover-16~dark.png Binary files differnew file mode 100644 index 0000000000..cd12367f41 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/popup-close-hover-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/popup-close-hover-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/popup-close-hover-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..5ce2968a46 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/popup-close-hover-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preferences-16.png b/main/src/core/MonoDevelop.Ide/icons/preferences-16.png Binary files differindex 93648c9b48..78bb996269 100644 --- a/main/src/core/MonoDevelop.Ide/icons/preferences-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/preferences-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preferences-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/preferences-16@2x.png Binary files differindex 17934c90e5..0404b394ba 100644 --- a/main/src/core/MonoDevelop.Ide/icons/preferences-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/preferences-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preferences-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/preferences-16~dark.png Binary files differnew file mode 100644 index 0000000000..1c6d47d2d7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preferences-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preferences-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/preferences-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..262eab6ac9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preferences-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16.png Binary files differindex a911510938..cb7fe7473d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16@2x.png Binary files differindex e6de7cb721..a8795580ad 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~dark.png Binary files differnew file mode 100644 index 0000000000..247f33f3fd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b93b6fc873 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..d8e9a9d918 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..d649953367 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~sel.png Binary files differnew file mode 100644 index 0000000000..1a1c28d97c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..9a9c266d99 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-author-information-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-build-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16.png Binary files differindex 45fd2732a6..6f2a26636d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-build-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-build-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16@2x.png Binary files differindex 2e6aec66a5..2aa0589db4 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-build-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~dark.png Binary files differnew file mode 100644 index 0000000000..032d3bc064 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..5c21cfbc8d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..32345f6e58 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..68aa75df87 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~sel.png Binary files differnew file mode 100644 index 0000000000..32345f6e58 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..68aa75df87 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-build-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16.png Binary files differindex 66313da3bc..bef7c208f7 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16@2x.png Binary files differindex 243e316934..d33f951610 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~dark.png Binary files differnew file mode 100644 index 0000000000..b3e910546b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..df27827d9c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..3641679069 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..7227b6819a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~sel.png Binary files differnew file mode 100644 index 0000000000..3641679069 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..7227b6819a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-formatting-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16.png Binary files differindex ba48bc0df4..ea029c013c 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16@2x.png Binary files differindex 052e26edf7..239ffcf2f4 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~dark.png Binary files differnew file mode 100644 index 0000000000..991ca960a6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7da53894fc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..f109ee7b38 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..69fdfb3c57 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~sel.png Binary files differnew file mode 100644 index 0000000000..bca8cd7ab8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c0ac46e31a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-code-templates-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-csharp-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-csharp-16.png Binary files differdeleted file mode 100644 index 34b7ac06e1..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-csharp-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-csharp-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-csharp-16@2x.png Binary files differdeleted file mode 100644 index df5ea2bdc6..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-csharp-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16.png Binary files differindex e7e0d6f2e6..7255aa8490 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16@2x.png Binary files differindex a5443dde5b..7509eb46ac 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~dark.png Binary files differnew file mode 100644 index 0000000000..7351d826df --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..1aab895d4b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..504203d23e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..bb460cb4b8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~sel.png Binary files differnew file mode 100644 index 0000000000..504203d23e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..bb460cb4b8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-dotnet-naming-policies-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16.png Binary files differindex 73668287fb..7678a94b0a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16@2x.png Binary files differindex 3fb43534d5..8acc4b1279 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~dark.png Binary files differnew file mode 100644 index 0000000000..a85230475b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..12727393d6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..f9ff247739 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..4113d8b83f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~sel.png Binary files differnew file mode 100644 index 0000000000..e03961d11e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..051da63ace --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-external-tools-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16.png Binary files differindex 72ed2240e2..04042bd33c 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16@2x.png Binary files differindex 00609d0eca..5fd87299b2 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~dark.png Binary files differnew file mode 100644 index 0000000000..e3ebeffe45 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d3b14adb75 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..f4ecb7866d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..15aad3fa50 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~sel.png Binary files differnew file mode 100644 index 0000000000..f4ecb7866d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..15aad3fa50 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-fonts-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16.png Binary files differindex 7e65a86774..82e8c0b885 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16@2x.png Binary files differindex 593606db5f..df2fae955a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~dark.png Binary files differnew file mode 100644 index 0000000000..7a1068d660 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6f872077d8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..d44254730c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..11303fa980 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~sel.png Binary files differnew file mode 100644 index 0000000000..d44254730c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..11303fa980 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-generic-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-header-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16.png Binary files differnew file mode 100644 index 0000000000..da065700f1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-header-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16@2x.png Binary files differnew file mode 100644 index 0000000000..f3b7c40f56 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~dark.png Binary files differnew file mode 100644 index 0000000000..9cf0c88d0a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..32dd2ee883 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..29b6efd15b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..67ef89459e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~sel.png Binary files differnew file mode 100644 index 0000000000..0e8403eba9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..a60878e42a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-header-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16.png Binary files differindex 52c35f86fb..cbc4bc7bc5 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16@2x.png Binary files differindex 5184aa50c6..c9a20617fc 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~dark.png Binary files differnew file mode 100644 index 0000000000..18692a25cb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..03b6c78ca6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..005796caa2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..798eaab111 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~sel.png Binary files differnew file mode 100644 index 0000000000..005796caa2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..798eaab111 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-key-bindings-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-language-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16.png Binary files differindex 19f2663360..87f2953c12 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-language-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-language-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16@2x.png Binary files differindex 1e4d00deb6..d5e0271f66 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-language-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~dark.png Binary files differnew file mode 100644 index 0000000000..778eac0789 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7ac3c2cd5a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..6038f48200 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b2fb37ecd9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~sel.png Binary files differnew file mode 100644 index 0000000000..6038f48200 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b2fb37ecd9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-language-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16.png Binary files differindex 4cda9212c9..7aa9e74074 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16@2x.png Binary files differindex 93c03d1a65..8c6dec814b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~dark.png Binary files differnew file mode 100644 index 0000000000..76c9b818ef --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..a0999c040b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..0fdb60432e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..6a3b0d38c8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~sel.png Binary files differnew file mode 100644 index 0000000000..0fdb60432e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..6a3b0d38c8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-load-save-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16.png Binary files differindex e6a8ac57cf..37a58bdcbf 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16@2x.png Binary files differindex 3267cddee2..72307162f4 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~dark.png Binary files differnew file mode 100644 index 0000000000..090d3ee77c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..eb37575e8f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..e2253a115d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..512aa3a32b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~sel.png Binary files differnew file mode 100644 index 0000000000..e2253a115d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..512aa3a32b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-name-conventions-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-play-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16.png Binary files differindex 66bf188a37..1ac53e0a30 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-play-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-play-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16@2x.png Binary files differindex 417e6855b3..3e6e34bce1 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-play-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~dark.png Binary files differnew file mode 100644 index 0000000000..5db07b06b6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..782b120ea9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..1e8e70b6c0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..49bcd138ea --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~sel.png Binary files differnew file mode 100644 index 0000000000..1e8e70b6c0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..49bcd138ea --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-play-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16.png Binary files differindex 800b76d447..e78339cecd 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16@2x.png Binary files differindex c319f59bc2..d5253f2868 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~dark.png Binary files differnew file mode 100644 index 0000000000..6419dcc00c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..1a204198aa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..8cbac06936 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..979d664225 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~sel.png Binary files differnew file mode 100644 index 0000000000..8cbac06936 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..979d664225 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-sdk-locations-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-source-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16.png Binary files differnew file mode 100644 index 0000000000..87fd49e5a6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-source-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16@2x.png Binary files differnew file mode 100644 index 0000000000..9981f54f05 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~dark.png Binary files differnew file mode 100644 index 0000000000..0166b821be --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..948eb0c967 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..3b13b595f1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..5dcf9b35e8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~sel.png Binary files differnew file mode 100644 index 0000000000..5de35c8be5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..daf1069540 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-source-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-standard-header-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-standard-header-16.png Binary files differdeleted file mode 100644 index 83f9bcee6d..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-standard-header-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-standard-header-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-standard-header-16@2x.png Binary files differdeleted file mode 100644 index 05d18fb6bd..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-standard-header-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16.png Binary files differindex 17e0ea108d..1d2fca2301 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16@2x.png Binary files differindex fe974de727..8d0626aabf 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~dark.png Binary files differnew file mode 100644 index 0000000000..5b7aafd80d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..bd0a2b1ed2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..dbf93d603a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1b73159aa9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~sel.png Binary files differnew file mode 100644 index 0000000000..dbf93d603a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..1b73159aa9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-task-list-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16.png Binary files differindex 818f09fb65..831589022a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16@2x.png Binary files differindex 0582e35d0c..4835ff3ce0 100644 --- a/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~dark.png Binary files differnew file mode 100644 index 0000000000..44de0e2701 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..89de0f145e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..68c115d59f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..95a911374a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~sel.png Binary files differnew file mode 100644 index 0000000000..68c115d59f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..95a911374a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-updates-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-16.png b/main/src/core/MonoDevelop.Ide/icons/preview-16.png Binary files differnew file mode 100644 index 0000000000..7b8c7e9566 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preview-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/preview-16@2x.png Binary files differnew file mode 100644 index 0000000000..10489469d1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preview-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/preview-16~dark.png Binary files differnew file mode 100644 index 0000000000..ea423d3b87 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preview-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/preview-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..491a209df4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preview-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/preview-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..7c7225d1e9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preview-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/preview-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..9413e65acd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preview-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/preview-16~sel.png Binary files differnew file mode 100644 index 0000000000..a1df6e6241 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preview-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/preview-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..59b83a27df --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preview-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-active-16.png b/main/src/core/MonoDevelop.Ide/icons/preview-active-16.png Binary files differindex e0de6365cb..31650e7344 100644 --- a/main/src/core/MonoDevelop.Ide/icons/preview-active-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/preview-active-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-active-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/preview-active-16@2x.png Binary files differindex ca93f5f904..29bcecb68c 100644 --- a/main/src/core/MonoDevelop.Ide/icons/preview-active-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/preview-active-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-hover-16.png b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16.png Binary files differindex 7733740ebe..dd278ac139 100644 --- a/main/src/core/MonoDevelop.Ide/icons/preview-hover-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-hover-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16@2x.png Binary files differindex afc00674fb..afc849fcd2 100644 --- a/main/src/core/MonoDevelop.Ide/icons/preview-hover-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~dark.png Binary files differnew file mode 100644 index 0000000000..a15112a11f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2da7812371 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..302f91bc1b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c3108d85d5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~sel.png Binary files differnew file mode 100644 index 0000000000..c83ba2edea --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..67a16fca44 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/preview-hover-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-normal-16.png b/main/src/core/MonoDevelop.Ide/icons/preview-normal-16.png Binary files differdeleted file mode 100644 index f35c0427e5..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/preview-normal-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-normal-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/preview-normal-16@2x.png Binary files differdeleted file mode 100644 index beaf9f827c..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/preview-normal-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-selected-16.png b/main/src/core/MonoDevelop.Ide/icons/preview-selected-16.png Binary files differdeleted file mode 100644 index fb982aa4a8..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/preview-selected-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/preview-selected-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/preview-selected-16@2x.png Binary files differdeleted file mode 100644 index aee1eecd8b..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/preview-selected-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/print-16.png b/main/src/core/MonoDevelop.Ide/icons/print-16.png Binary files differindex 5997b9222e..2194be15cc 100644 --- a/main/src/core/MonoDevelop.Ide/icons/print-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/print-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/print-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/print-16@2x.png Binary files differindex 1dfe6417c5..7cfa2be366 100644 --- a/main/src/core/MonoDevelop.Ide/icons/print-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/print-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/print-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/print-16~dark.png Binary files differnew file mode 100644 index 0000000000..dd42ee1b18 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/print-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/print-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/print-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..236aa65754 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/print-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/print-preview-16.png b/main/src/core/MonoDevelop.Ide/icons/print-preview-16.png Binary files differdeleted file mode 100644 index 45b44f324f..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/print-preview-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/print-preview-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/print-preview-16@2x.png Binary files differdeleted file mode 100644 index 4591d9fc8a..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/print-preview-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-128.png b/main/src/core/MonoDevelop.Ide/icons/project-128.png Binary files differdeleted file mode 100644 index 8098e13c90..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-128.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-128@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-128@2x.png Binary files differdeleted file mode 100644 index e9ac2a54fd..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-128@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-16.png b/main/src/core/MonoDevelop.Ide/icons/project-16.png Binary files differindex d9be88353c..2e64bfff21 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-16@2x.png Binary files differindex 1ad656f8ec..78cc9cfd3c 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/project-16~dark.png Binary files differnew file mode 100644 index 0000000000..242d2cf7d8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2b7173f64a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..864ef4b052 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c0090f39fb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-16~sel.png Binary files differnew file mode 100644 index 0000000000..864ef4b052 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c0090f39fb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-32.png b/main/src/core/MonoDevelop.Ide/icons/project-32.png Binary files differindex 1ad656f8ec..a4595f8573 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-32@2x.png Binary files differindex 2c924032af..b3170ccd54 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/project-32~dark.png Binary files differnew file mode 100644 index 0000000000..09b88d6a85 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..598617ba5d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..c0090f39fb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f91a61f2e8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-32~sel.png Binary files differnew file mode 100644 index 0000000000..c0090f39fb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f91a61f2e8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-64.png b/main/src/core/MonoDevelop.Ide/icons/project-64.png Binary files differdeleted file mode 100644 index 2c924032af..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-64.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-64@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-64@2x.png Binary files differdeleted file mode 100644 index 8098e13c90..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-64@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-assembly-16.png b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16.png Binary files differnew file mode 100644 index 0000000000..01687e46bb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-assembly-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16@2x.png Binary files differnew file mode 100644 index 0000000000..0a490c4a98 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~dark.png Binary files differnew file mode 100644 index 0000000000..fa70c917aa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b3091024de --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..14b2e904dc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..afc9812992 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~sel.png Binary files differnew file mode 100644 index 0000000000..14b2e904dc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..afc9812992 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-assembly-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32.png b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32.png Binary files differindex df34213d91..bff732a7dc 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32@2x.png Binary files differindex d21ed7756c..cfa17b16e0 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~dark.png Binary files differnew file mode 100644 index 0000000000..203c7b497f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d1cc4826b2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..e05e244df3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..ccb5cb455f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~sel.png Binary files differnew file mode 100644 index 0000000000..076760c003 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..d4a8eb5a4d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-console-overlay-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-gui-overlay-32.png b/main/src/core/MonoDevelop.Ide/icons/project-gui-overlay-32.png Binary files differindex 5beba76bf9..05e5a8d444 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-gui-overlay-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-gui-overlay-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-gui-overlay-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-gui-overlay-32@2x.png Binary files differindex 0b84654151..6c5470ab49 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-gui-overlay-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-gui-overlay-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-gui-overlay-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/project-gui-overlay-32~dark.png Binary files differnew file mode 100644 index 0000000000..05e5a8d444 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-gui-overlay-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-gui-overlay-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-gui-overlay-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..53d76b9e46 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-gui-overlay-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32.png b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32.png Binary files differindex d71d03d382..87309c6a05 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32@2x.png Binary files differindex 4009bbed4f..45cae38161 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~dark.png Binary files differnew file mode 100644 index 0000000000..163358c3ad --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..769513420f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..212901e1c6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..913d23caee --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~sel.png Binary files differnew file mode 100644 index 0000000000..4c89454011 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..a662506c39 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-library-overlay-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-new-16.png b/main/src/core/MonoDevelop.Ide/icons/project-new-16.png Binary files differdeleted file mode 100644 index 99022e53cc..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-new-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32.png b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32.png Binary files differindex daa6d0d2a5..94cd21390d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32@2x.png Binary files differindex 664f413a7a..05e84865e9 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~dark.png Binary files differnew file mode 100644 index 0000000000..b67ac9d2e7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0a0c74b70b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..5de67db489 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e5dde885d9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~sel.png Binary files differnew file mode 100644 index 0000000000..5de67db489 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e5dde885d9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-nunit-overlay-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32.png b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32.png Binary files differindex ba79bfa5fa..fce1208071 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32@2x.png Binary files differindex 755c6c6ef4..2ae916ed7e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~dark.png Binary files differnew file mode 100644 index 0000000000..16ca398d87 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..fe2da03e36 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..ac0174f8ac --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..cd230bf060 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~sel.png Binary files differnew file mode 100644 index 0000000000..ac0174f8ac --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..cd230bf060 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-package-overlay-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-reference-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/project-reference-overlay-16.png Binary files differdeleted file mode 100644 index 840eedc201..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-reference-overlay-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-reference-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-reference-overlay-16@2x.png Binary files differdeleted file mode 100644 index 390b60e3fd..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-reference-overlay-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32.png b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32.png Binary files differindex 22a964cdf1..2dd8e56a31 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32@2x.png Binary files differindex 69e1d3ec2b..a36bf5a60b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~dark.png Binary files differnew file mode 100644 index 0000000000..0343312b9e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..8c656c0aac --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..59eca30dad --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..a32f5ff5fe --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~sel.png Binary files differnew file mode 100644 index 0000000000..59eca30dad --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..a32f5ff5fe --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-shared-assets-overlay-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-status-error-16.png b/main/src/core/MonoDevelop.Ide/icons/project-status-error-16.png Binary files differdeleted file mode 100644 index 303b0b6234..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-status-error-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-status-error-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-status-error-16@2x.png Binary files differdeleted file mode 100644 index a64809d01d..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-status-error-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-status-information-16.png b/main/src/core/MonoDevelop.Ide/icons/project-status-information-16.png Binary files differdeleted file mode 100644 index 9a1ed0325c..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-status-information-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-status-information-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-status-information-16@2x.png Binary files differdeleted file mode 100644 index 4418693d5b..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-status-information-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-status-warning-16.png b/main/src/core/MonoDevelop.Ide/icons/project-status-warning-16.png Binary files differdeleted file mode 100644 index 0844d58e39..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-status-warning-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-status-warning-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-status-warning-16@2x.png Binary files differdeleted file mode 100644 index 54a99a5bc2..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-status-warning-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-web-32.png b/main/src/core/MonoDevelop.Ide/icons/project-web-32.png Binary files differnew file mode 100644 index 0000000000..d96f0093c5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-web-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-web-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-web-32@2x.png Binary files differnew file mode 100644 index 0000000000..c36c03a695 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-web-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-web-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/project-web-32~dark.png Binary files differnew file mode 100644 index 0000000000..11668066e7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-web-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-web-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-web-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..96aa2269f0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-web-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-web-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-web-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..0636466f8f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-web-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-web-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-web-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2a285aebcf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-web-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-web-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/project-web-32~sel.png Binary files differnew file mode 100644 index 0000000000..0636466f8f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-web-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-web-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-web-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2a285aebcf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/project-web-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/project-web-overlay-32.png b/main/src/core/MonoDevelop.Ide/icons/project-web-overlay-32.png Binary files differdeleted file mode 100644 index 2e6e5fadee..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-web-overlay-32.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/project-web-overlay-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/project-web-overlay-32@2x.png Binary files differdeleted file mode 100644 index 659e6e0010..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/project-web-overlay-32@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/properties-16.png b/main/src/core/MonoDevelop.Ide/icons/properties-16.png Binary files differdeleted file mode 100644 index bff9c389c1..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/properties-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/properties-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/properties-16@2x.png Binary files differdeleted file mode 100644 index e061e98cae..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/properties-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/question-16.png b/main/src/core/MonoDevelop.Ide/icons/question-16.png Binary files differindex 32776fffc2..5f49f19699 100644 --- a/main/src/core/MonoDevelop.Ide/icons/question-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/question-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-16@2x.png Binary files differindex 7840d7c0f7..a5f03e7de7 100644 --- a/main/src/core/MonoDevelop.Ide/icons/question-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/question-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/question-16~dark.png Binary files differnew file mode 100644 index 0000000000..23042964aa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..391a1586c6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/question-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..8c16140779 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..921059abdf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/question-16~sel.png Binary files differnew file mode 100644 index 0000000000..8c16140779 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..921059abdf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-24.png b/main/src/core/MonoDevelop.Ide/icons/question-24.png Binary files differindex dc79681156..eac063a56d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/question-24.png +++ b/main/src/core/MonoDevelop.Ide/icons/question-24.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-24@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-24@2x.png Binary files differindex 11fb9de802..75edcd40cb 100644 --- a/main/src/core/MonoDevelop.Ide/icons/question-24@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/question-24@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-24~dark.png b/main/src/core/MonoDevelop.Ide/icons/question-24~dark.png Binary files differnew file mode 100644 index 0000000000..61be59835e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-24~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-24~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-24~dark@2x.png Binary files differnew file mode 100644 index 0000000000..8f5008be81 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-24~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-24~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/question-24~dark~sel.png Binary files differnew file mode 100644 index 0000000000..8712680669 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-24~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-24~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-24~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..34bc31f3ec --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-24~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-24~sel.png b/main/src/core/MonoDevelop.Ide/icons/question-24~sel.png Binary files differnew file mode 100644 index 0000000000..8712680669 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-24~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-24~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-24~sel@2x.png Binary files differnew file mode 100644 index 0000000000..34bc31f3ec --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-24~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-32.png b/main/src/core/MonoDevelop.Ide/icons/question-32.png Binary files differindex 7840d7c0f7..a5f03e7de7 100644 --- a/main/src/core/MonoDevelop.Ide/icons/question-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/question-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-32@2x.png Binary files differindex c8aa256070..fe72d7ce8d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/question-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/question-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/question-32~dark.png Binary files differnew file mode 100644 index 0000000000..391a1586c6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2f3fdc061c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/question-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..921059abdf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..49f39a3efc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/question-32~sel.png Binary files differnew file mode 100644 index 0000000000..921059abdf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..49f39a3efc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-48.png b/main/src/core/MonoDevelop.Ide/icons/question-48.png Binary files differindex 11fb9de802..75edcd40cb 100644 --- a/main/src/core/MonoDevelop.Ide/icons/question-48.png +++ b/main/src/core/MonoDevelop.Ide/icons/question-48.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-48@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-48@2x.png Binary files differindex bed96c85fb..62349bdda2 100644 --- a/main/src/core/MonoDevelop.Ide/icons/question-48@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/question-48@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-48~dark.png b/main/src/core/MonoDevelop.Ide/icons/question-48~dark.png Binary files differnew file mode 100644 index 0000000000..8f5008be81 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-48~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-48~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-48~dark@2x.png Binary files differnew file mode 100644 index 0000000000..987bde7942 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-48~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-48~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/question-48~dark~sel.png Binary files differnew file mode 100644 index 0000000000..34bc31f3ec --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-48~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-48~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-48~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..6c37843e42 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-48~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-48~sel.png b/main/src/core/MonoDevelop.Ide/icons/question-48~sel.png Binary files differnew file mode 100644 index 0000000000..34bc31f3ec --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-48~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/question-48~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/question-48~sel@2x.png Binary files differnew file mode 100644 index 0000000000..6c37843e42 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/question-48~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/quit-16.png b/main/src/core/MonoDevelop.Ide/icons/quit-16.png Binary files differdeleted file mode 100644 index d070809f1c..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/quit-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/quit-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/quit-16@2x.png Binary files differdeleted file mode 100644 index f646d9406f..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/quit-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/redo-16.png b/main/src/core/MonoDevelop.Ide/icons/redo-16.png Binary files differindex f7923083ba..4b5ffa35b6 100644 --- a/main/src/core/MonoDevelop.Ide/icons/redo-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/redo-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/redo-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/redo-16@2x.png Binary files differindex 8fe5d8c7cd..304a7a6edb 100644 --- a/main/src/core/MonoDevelop.Ide/icons/redo-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/redo-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/redo-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/redo-16~dark.png Binary files differnew file mode 100644 index 0000000000..a28aac28cc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/redo-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/redo-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/redo-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..9ef4e65b7e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/redo-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/redo-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/redo-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..95b66da2e1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/redo-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/redo-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/redo-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..fc31260f29 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/redo-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/redo-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/redo-16~disabled.png Binary files differnew file mode 100644 index 0000000000..51b45ca7ed --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/redo-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/redo-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/redo-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..44d71e3a9d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/redo-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-16.png b/main/src/core/MonoDevelop.Ide/icons/reference-16.png Binary files differindex b441192270..ad72926212 100644 --- a/main/src/core/MonoDevelop.Ide/icons/reference-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/reference-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-16@2x.png Binary files differindex a59c599aca..dab4f3b6af 100644 --- a/main/src/core/MonoDevelop.Ide/icons/reference-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/reference-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/reference-16~dark.png Binary files differnew file mode 100644 index 0000000000..99719a15fc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f9e7f3c9e7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/reference-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..4030156741 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..0ef2c6e282 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/reference-16~sel.png Binary files differnew file mode 100644 index 0000000000..4030156741 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..0ef2c6e282 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16.png b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16.png Binary files differnew file mode 100644 index 0000000000..dd7539b34f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16@2x.png Binary files differnew file mode 100644 index 0000000000..2edaba5e62 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~dark.png Binary files differnew file mode 100644 index 0000000000..da2f04e748 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b02d98b3d1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..b25654cc2c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..bbdfcf4db6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~sel.png Binary files differnew file mode 100644 index 0000000000..b25654cc2c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..bbdfcf4db6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-assembly-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16.png b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16.png Binary files differnew file mode 100644 index 0000000000..64073e6519 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16@2x.png Binary files differnew file mode 100644 index 0000000000..897a89d695 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~dark.png Binary files differnew file mode 100644 index 0000000000..7185844489 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..98244b534f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..d9b63d1eab --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f5299e9484 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~sel.png Binary files differnew file mode 100644 index 0000000000..d9b63d1eab --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f5299e9484 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-invalid-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-project-16.png b/main/src/core/MonoDevelop.Ide/icons/reference-project-16.png Binary files differnew file mode 100644 index 0000000000..1eec14cd21 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-project-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-project-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-project-16@2x.png Binary files differnew file mode 100644 index 0000000000..d0b0e61933 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-project-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-project-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/reference-project-16~dark.png Binary files differnew file mode 100644 index 0000000000..d70686d82e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-project-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-project-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-project-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..160f08203f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-project-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-project-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/reference-project-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..edac0bae6e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-project-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-project-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-project-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e5d228ced4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-project-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-project-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/reference-project-16~sel.png Binary files differnew file mode 100644 index 0000000000..edac0bae6e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-project-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/reference-project-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/reference-project-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..e5d228ced4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/reference-project-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/refresh-16.png b/main/src/core/MonoDevelop.Ide/icons/refresh-16.png Binary files differindex b7ffd20c72..1e79477e54 100644 --- a/main/src/core/MonoDevelop.Ide/icons/refresh-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/refresh-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/refresh-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/refresh-16@2x.png Binary files differindex b65a18fc0a..1b258ff227 100644 --- a/main/src/core/MonoDevelop.Ide/icons/refresh-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/refresh-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/refresh-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/refresh-16~dark.png Binary files differnew file mode 100644 index 0000000000..abca51c0c2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/refresh-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/refresh-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/refresh-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..a3c8034f24 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/refresh-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/refresh-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/refresh-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..1470ae54ad --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/refresh-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/refresh-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/refresh-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..d6ba2156e6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/refresh-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/refresh-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/refresh-16~disabled.png Binary files differnew file mode 100644 index 0000000000..1cadefe430 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/refresh-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/refresh-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/refresh-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..39ddb2e8a9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/refresh-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/remove-16.png b/main/src/core/MonoDevelop.Ide/icons/remove-16.png Binary files differindex 7e76236f64..b273ff520e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/remove-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/remove-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/remove-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/remove-16@2x.png Binary files differindex 21318f43f2..ee9ae5ae81 100644 --- a/main/src/core/MonoDevelop.Ide/icons/remove-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/remove-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/remove-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/remove-16~dark.png Binary files differnew file mode 100644 index 0000000000..fd98dbf53b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/remove-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/remove-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/remove-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..94ead67a2a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/remove-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/remove-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/remove-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..0941c6aad1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/remove-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/remove-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/remove-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..f3d8c9c63e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/remove-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/remove-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/remove-16~disabled.png Binary files differnew file mode 100644 index 0000000000..f44a63c7a0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/remove-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/remove-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/remove-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..4e7f7c25f6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/remove-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/replace-in-files-16.png b/main/src/core/MonoDevelop.Ide/icons/replace-in-files-16.png Binary files differdeleted file mode 100644 index a7d9b56b75..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/replace-in-files-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/revert-to-saved-16.png b/main/src/core/MonoDevelop.Ide/icons/revert-to-saved-16.png Binary files differdeleted file mode 100644 index b038fa84e2..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/revert-to-saved-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/revert-to-saved-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/revert-to-saved-16@2x.png Binary files differdeleted file mode 100644 index d9528249be..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/revert-to-saved-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/run-unit-tests-16.png b/main/src/core/MonoDevelop.Ide/icons/run-unit-tests-16.png Binary files differnew file mode 100644 index 0000000000..08156925bf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/run-unit-tests-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/run-unit-tests-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/run-unit-tests-16@2x.png Binary files differnew file mode 100644 index 0000000000..a626c128b9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/run-unit-tests-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/run-unit-tests-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/run-unit-tests-16~dark.png Binary files differnew file mode 100644 index 0000000000..c73c3e92fd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/run-unit-tests-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/run-unit-tests-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/run-unit-tests-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..392713f95a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/run-unit-tests-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/save-16.png b/main/src/core/MonoDevelop.Ide/icons/save-16.png Binary files differindex 50d6447f3e..bbf2ef373d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/save-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/save-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/save-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/save-16@2x.png Binary files differnew file mode 100644 index 0000000000..6c62a26e95 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/save-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/save-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/save-16~dark.png Binary files differnew file mode 100644 index 0000000000..86c454278f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/save-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/save-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/save-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..ffaae445be --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/save-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/save-all-16.png b/main/src/core/MonoDevelop.Ide/icons/save-all-16.png Binary files differindex 6c6ae344d2..34d67367a0 100644 --- a/main/src/core/MonoDevelop.Ide/icons/save-all-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/save-all-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/save-all-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/save-all-16@2x.png Binary files differnew file mode 100644 index 0000000000..49f8e1168f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/save-all-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/save-all-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/save-all-16~dark.png Binary files differnew file mode 100644 index 0000000000..ee2106e320 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/save-all-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/save-all-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/save-all-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..dce47e0e76 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/save-all-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-mac-16.png b/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-mac-16.png Binary files differindex 9bcf6370b4..f59eb830b0 100644 --- a/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-mac-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-mac-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-mac-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-mac-16@2x.png Binary files differindex b5c13b6631..79f10ce8c7 100644 --- a/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-mac-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-mac-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-mac-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-mac-16~dark.png Binary files differnew file mode 100644 index 0000000000..2faedc1d16 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-mac-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-mac-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-mac-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e560f6879c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-mac-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-win-24~dark.png b/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-win-24~dark.png Binary files differnew file mode 100644 index 0000000000..5c7610206f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-win-24~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-win-24~hover~dark.png b/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-win-24~hover~dark.png Binary files differnew file mode 100644 index 0000000000..aba7b0b7fa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-win-24~hover~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-win-24~pressed~dark.png b/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-win-24~pressed~dark.png Binary files differnew file mode 100644 index 0000000000..d3de93ee0a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/searchbox-clear-win-24~pressed~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/searchbox-search-mac-16.png b/main/src/core/MonoDevelop.Ide/icons/searchbox-search-mac-16.png Binary files differindex f588df66a2..c6e794702f 100644 --- a/main/src/core/MonoDevelop.Ide/icons/searchbox-search-mac-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/searchbox-search-mac-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/searchbox-search-mac-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/searchbox-search-mac-16@2x.png Binary files differindex c9e1abf19b..c1f12aa259 100644 --- a/main/src/core/MonoDevelop.Ide/icons/searchbox-search-mac-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/searchbox-search-mac-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/searchbox-search-mac-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/searchbox-search-mac-16~dark.png Binary files differnew file mode 100644 index 0000000000..c3b71cfc5a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/searchbox-search-mac-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/searchbox-search-mac-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/searchbox-search-mac-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..8aa943236d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/searchbox-search-mac-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/searchbox-search-win-24~dark.png b/main/src/core/MonoDevelop.Ide/icons/searchbox-search-win-24~dark.png Binary files differnew file mode 100644 index 0000000000..a93808d053 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/searchbox-search-win-24~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/searchbox-search-win-24~hover~dark.png b/main/src/core/MonoDevelop.Ide/icons/searchbox-search-win-24~hover~dark.png Binary files differnew file mode 100644 index 0000000000..9567863c2f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/searchbox-search-win-24~hover~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/searchbox-search-win-24~pressed~dark.png b/main/src/core/MonoDevelop.Ide/icons/searchbox-search-win-24~pressed~dark.png Binary files differnew file mode 100644 index 0000000000..19f2e5c32e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/searchbox-search-win-24~pressed~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/select-all-16.png b/main/src/core/MonoDevelop.Ide/icons/select-all-16.png Binary files differnew file mode 100644 index 0000000000..c0185bdc7c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/select-all-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/select-all-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/select-all-16@2x.png Binary files differnew file mode 100644 index 0000000000..bc1fe27ff3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/select-all-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/select-all-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/select-all-16~dark.png Binary files differnew file mode 100644 index 0000000000..181f860a46 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/select-all-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/select-all-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/select-all-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..ca3af34760 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/select-all-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/select-all-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/select-all-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..6ca2763cd1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/select-all-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/select-all-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/select-all-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..5fdc618d8c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/select-all-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/select-all-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/select-all-16~disabled.png Binary files differnew file mode 100644 index 0000000000..344df7c435 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/select-all-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/select-all-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/select-all-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..2f4a8dcdb7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/select-all-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-128.png b/main/src/core/MonoDevelop.Ide/icons/solution-128.png Binary files differdeleted file mode 100644 index e4fa7bb7f2..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/solution-128.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-128@2x.png b/main/src/core/MonoDevelop.Ide/icons/solution-128@2x.png Binary files differdeleted file mode 100644 index 05c96c2e73..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/solution-128@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-16.png b/main/src/core/MonoDevelop.Ide/icons/solution-16.png Binary files differindex 5581976af9..843f24e70d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/solution-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/solution-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/solution-16@2x.png Binary files differindex 10056155d5..1bdfbfb4a6 100644 --- a/main/src/core/MonoDevelop.Ide/icons/solution-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/solution-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/solution-16~dark.png Binary files differnew file mode 100644 index 0000000000..3ab692dbdc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/solution-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/solution-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..955ecb5578 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/solution-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/solution-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..fac7faa890 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/solution-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/solution-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..bef4cbb6fa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/solution-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/solution-16~sel.png Binary files differnew file mode 100644 index 0000000000..fac7faa890 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/solution-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/solution-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..bef4cbb6fa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/solution-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-32.png b/main/src/core/MonoDevelop.Ide/icons/solution-32.png Binary files differindex 10056155d5..81955bbbe0 100644 --- a/main/src/core/MonoDevelop.Ide/icons/solution-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/solution-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/solution-32@2x.png Binary files differindex 8cc04b0b0f..6d5254b915 100644 --- a/main/src/core/MonoDevelop.Ide/icons/solution-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/solution-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/solution-32~dark.png Binary files differnew file mode 100644 index 0000000000..6c5c7410ef --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/solution-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/solution-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e9a94b3b44 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/solution-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/solution-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..bef4cbb6fa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/solution-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/solution-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..87dae2c7a9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/solution-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/solution-32~sel.png Binary files differnew file mode 100644 index 0000000000..bef4cbb6fa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/solution-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/solution-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..87dae2c7a9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/solution-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-64.png b/main/src/core/MonoDevelop.Ide/icons/solution-64.png Binary files differdeleted file mode 100644 index 8cc04b0b0f..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/solution-64.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-64@2x.png b/main/src/core/MonoDevelop.Ide/icons/solution-64@2x.png Binary files differdeleted file mode 100644 index e4fa7bb7f2..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/solution-64@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-folder-new-16.png b/main/src/core/MonoDevelop.Ide/icons/solution-folder-new-16.png Binary files differdeleted file mode 100644 index 347c30efa8..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/solution-folder-new-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/solution-new-16.png b/main/src/core/MonoDevelop.Ide/icons/solution-new-16.png Binary files differdeleted file mode 100644 index deb9e85d6a..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/solution-new-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/sort-alphabetically-16.png b/main/src/core/MonoDevelop.Ide/icons/sort-alphabetically-16.png Binary files differindex ced221715a..b5d147850c 100644 --- a/main/src/core/MonoDevelop.Ide/icons/sort-alphabetically-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/sort-alphabetically-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/sort-alphabetically-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/sort-alphabetically-16@2x.png Binary files differindex cde44a8f3a..71a05a2402 100644 --- a/main/src/core/MonoDevelop.Ide/icons/sort-alphabetically-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/sort-alphabetically-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/sort-alphabetically-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/sort-alphabetically-16~dark.png Binary files differnew file mode 100644 index 0000000000..55a750cea7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/sort-alphabetically-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/sort-alphabetically-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/sort-alphabetically-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..89324d9ab1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/sort-alphabetically-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-1.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1.png Binary files differindex 46bcd36296..cb147e22f0 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-14-1.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-1@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1@2x.png Binary files differindex d223e473fc..f45863623a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-14-1@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~dark.png Binary files differnew file mode 100644 index 0000000000..6ffd207212 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~dark@2x.png Binary files differnew file mode 100644 index 0000000000..280c6bddfa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~dark~sel.png Binary files differnew file mode 100644 index 0000000000..13a9ebf79c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..fdb5f47ed4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~sel.png Binary files differnew file mode 100644 index 0000000000..13a9ebf79c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~sel@2x.png Binary files differnew file mode 100644 index 0000000000..fdb5f47ed4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-1~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-2.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2.png Binary files differindex b7d78f7bc1..d475d0a6f6 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-14-2.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-2@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2@2x.png Binary files differindex 6a1b63bca9..b0d3a86f3d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-14-2@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~dark.png Binary files differnew file mode 100644 index 0000000000..f7308f075a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e27de8deea --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~dark~sel.png Binary files differnew file mode 100644 index 0000000000..6b92967fac --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..5a233406af --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~sel.png Binary files differnew file mode 100644 index 0000000000..6b92967fac --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~sel@2x.png Binary files differnew file mode 100644 index 0000000000..5a233406af --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-2~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-3.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3.png Binary files differindex 778197b418..ede4a385b8 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-14-3.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-3@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3@2x.png Binary files differindex 8832d93af8..8f3d978905 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-14-3@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~dark.png Binary files differnew file mode 100644 index 0000000000..fff83cb7ec --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7f8851dbcd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~dark~sel.png Binary files differnew file mode 100644 index 0000000000..527770e536 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c638733481 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~sel.png Binary files differnew file mode 100644 index 0000000000..527770e536 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c638733481 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-3~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-4.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4.png Binary files differindex bd3aada045..79d86835ef 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-14-4.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-4@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4@2x.png Binary files differindex 910e6006e7..b3f7d06142 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-14-4@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~dark.png Binary files differnew file mode 100644 index 0000000000..0b51e51acc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~dark@2x.png Binary files differnew file mode 100644 index 0000000000..5b44c716c0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~dark~sel.png Binary files differnew file mode 100644 index 0000000000..b4382b4d55 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2d388b80de --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~sel.png Binary files differnew file mode 100644 index 0000000000..b4382b4d55 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~sel@2x.png Binary files differnew file mode 100644 index 0000000000..2d388b80de --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-4~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-5.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5.png Binary files differindex c6ca97cdac..ad8648ac29 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-14-5.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-5@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5@2x.png Binary files differindex 1d65ac1a40..7267a63e97 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-14-5@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~dark.png Binary files differnew file mode 100644 index 0000000000..f6534e0126 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f2acc90a35 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~dark~sel.png Binary files differnew file mode 100644 index 0000000000..54b751ba4f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b4d1726bc6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~sel.png Binary files differnew file mode 100644 index 0000000000..54b751ba4f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b4d1726bc6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-14-5~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-1.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1.png Binary files differnew file mode 100644 index 0000000000..ce32f64b51 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-1@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1@2x.png Binary files differnew file mode 100644 index 0000000000..5482d173d7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~dark.png Binary files differnew file mode 100644 index 0000000000..7bae4a8f48 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~dark@2x.png Binary files differnew file mode 100644 index 0000000000..85d8e5be02 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~dark~sel.png Binary files differnew file mode 100644 index 0000000000..ef915e9687 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..41b181b168 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~sel.png Binary files differnew file mode 100644 index 0000000000..ef915e9687 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~sel@2x.png Binary files differnew file mode 100644 index 0000000000..41b181b168 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-1~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-2.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2.png Binary files differnew file mode 100644 index 0000000000..367b1a9263 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-2@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2@2x.png Binary files differnew file mode 100644 index 0000000000..b830343750 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~dark.png Binary files differnew file mode 100644 index 0000000000..df1506e288 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~dark@2x.png Binary files differnew file mode 100644 index 0000000000..a410c9af9c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~dark~sel.png Binary files differnew file mode 100644 index 0000000000..8e50d2e8f9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..10e1cec3ec --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~sel.png Binary files differnew file mode 100644 index 0000000000..8e50d2e8f9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~sel@2x.png Binary files differnew file mode 100644 index 0000000000..10e1cec3ec --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-2~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-3.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3.png Binary files differnew file mode 100644 index 0000000000..919bc9a5a5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-3@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3@2x.png Binary files differnew file mode 100644 index 0000000000..94e642e337 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~dark.png Binary files differnew file mode 100644 index 0000000000..fa54f18673 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~dark@2x.png Binary files differnew file mode 100644 index 0000000000..3151de78fc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~dark~sel.png Binary files differnew file mode 100644 index 0000000000..ec97b5612e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..373547e751 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~sel.png Binary files differnew file mode 100644 index 0000000000..ec97b5612e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~sel@2x.png Binary files differnew file mode 100644 index 0000000000..373547e751 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-3~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-4.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4.png Binary files differnew file mode 100644 index 0000000000..75c3f08084 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-4@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4@2x.png Binary files differnew file mode 100644 index 0000000000..e772abca8a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~dark.png Binary files differnew file mode 100644 index 0000000000..247780d1ba --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7aa539fc3b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~dark~sel.png Binary files differnew file mode 100644 index 0000000000..e56d7b0b94 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f68fa5398c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~sel.png Binary files differnew file mode 100644 index 0000000000..e56d7b0b94 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f68fa5398c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-4~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-5.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5.png Binary files differnew file mode 100644 index 0000000000..82239eb249 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-5@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5@2x.png Binary files differnew file mode 100644 index 0000000000..cdbd458b99 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~dark.png Binary files differnew file mode 100644 index 0000000000..fb950ccd65 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~dark@2x.png Binary files differnew file mode 100644 index 0000000000..c9e9b1e6e5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~dark~sel.png Binary files differnew file mode 100644 index 0000000000..afded3ae22 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f95400575d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~sel.png Binary files differnew file mode 100644 index 0000000000..afded3ae22 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~sel@2x.png Binary files differnew file mode 100644 index 0000000000..f95400575d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-16-5~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-1.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1.png Binary files differindex 13f98ff915..0a0af9366d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-18-1.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-1@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1@2x.png Binary files differindex 519289fc89..56f0b7b5d1 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-18-1@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~dark.png Binary files differnew file mode 100644 index 0000000000..45ae5e8b60 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0a4e184e84 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~dark~sel.png Binary files differnew file mode 100644 index 0000000000..62e66b7f2e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..3006c8a16e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~sel.png Binary files differnew file mode 100644 index 0000000000..62e66b7f2e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~sel@2x.png Binary files differnew file mode 100644 index 0000000000..3006c8a16e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-1~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-2.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2.png Binary files differindex 5c52a0e30c..e708dfa7a4 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-18-2.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-2@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2@2x.png Binary files differindex f0fd719b19..340a4a22e7 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-18-2@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~dark.png Binary files differnew file mode 100644 index 0000000000..9ee8f5a9af --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~dark@2x.png Binary files differnew file mode 100644 index 0000000000..5403de9a59 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~dark~sel.png Binary files differnew file mode 100644 index 0000000000..d358910f68 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c686f492bd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~sel.png Binary files differnew file mode 100644 index 0000000000..d358910f68 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c686f492bd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-2~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-3.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3.png Binary files differindex 951c2ed964..3cf69c3584 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-18-3.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-3@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3@2x.png Binary files differindex 4be02f16ab..dce572171a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-18-3@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~dark.png Binary files differnew file mode 100644 index 0000000000..7e23e5d408 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d2ac747d4b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~dark~sel.png Binary files differnew file mode 100644 index 0000000000..2091a92d9c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..479782bd1a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~sel.png Binary files differnew file mode 100644 index 0000000000..2091a92d9c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~sel@2x.png Binary files differnew file mode 100644 index 0000000000..479782bd1a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-3~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-4.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4.png Binary files differindex eb6291bba3..b46ef657e4 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-18-4.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-4@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4@2x.png Binary files differindex 5a05ec623d..7bb1caf1b3 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-18-4@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~dark.png Binary files differnew file mode 100644 index 0000000000..f2d62a5499 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~dark@2x.png Binary files differnew file mode 100644 index 0000000000..479c8a9296 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~dark~sel.png Binary files differnew file mode 100644 index 0000000000..4e4955d013 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..d40773009f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~sel.png Binary files differnew file mode 100644 index 0000000000..4e4955d013 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~sel@2x.png Binary files differnew file mode 100644 index 0000000000..d40773009f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-4~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-5.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5.png Binary files differindex ed0c2abec5..6c10e087dd 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-18-5.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-5@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5@2x.png Binary files differindex 967eecfee7..e7b9b3ccaa 100644 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-18-5@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~dark.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~dark.png Binary files differnew file mode 100644 index 0000000000..81115587b4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~dark@2x.png Binary files differnew file mode 100644 index 0000000000..c2246c49c3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~dark~sel.png Binary files differnew file mode 100644 index 0000000000..a8e86f66b3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c5b86acf11 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~sel.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~sel.png Binary files differnew file mode 100644 index 0000000000..a8e86f66b3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c5b86acf11 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/spinner-18-5~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-1-16.png b/main/src/core/MonoDevelop.Ide/icons/spinner-normal-1-16.png Binary files differdeleted file mode 100644 index 83c220b5e2..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-1-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-1-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-normal-1-16@2x.png Binary files differdeleted file mode 100644 index de7d0b5071..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-1-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-2-16.png b/main/src/core/MonoDevelop.Ide/icons/spinner-normal-2-16.png Binary files differdeleted file mode 100644 index 568de99d44..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-2-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-2-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-normal-2-16@2x.png Binary files differdeleted file mode 100644 index c22c96c9a1..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-2-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-3-16.png b/main/src/core/MonoDevelop.Ide/icons/spinner-normal-3-16.png Binary files differdeleted file mode 100644 index 2b6b145e9c..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-3-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-3-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-normal-3-16@2x.png Binary files differdeleted file mode 100644 index 0599340f87..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-3-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-4-16.png b/main/src/core/MonoDevelop.Ide/icons/spinner-normal-4-16.png Binary files differdeleted file mode 100644 index a3d2273086..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-4-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-4-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-normal-4-16@2x.png Binary files differdeleted file mode 100644 index 832ea49a74..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-4-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-5-16.png b/main/src/core/MonoDevelop.Ide/icons/spinner-normal-5-16.png Binary files differdeleted file mode 100644 index 11cb8827e4..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-5-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-5-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-normal-5-16@2x.png Binary files differdeleted file mode 100644 index 04723238f8..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-normal-5-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-1-16.png b/main/src/core/MonoDevelop.Ide/icons/spinner-selected-1-16.png Binary files differdeleted file mode 100644 index ba54296b90..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-1-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-1-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-selected-1-16@2x.png Binary files differdeleted file mode 100644 index ae808f4221..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-1-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-2-16.png b/main/src/core/MonoDevelop.Ide/icons/spinner-selected-2-16.png Binary files differdeleted file mode 100644 index c933355f37..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-2-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-2-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-selected-2-16@2x.png Binary files differdeleted file mode 100644 index cecc2e4370..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-2-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-3-16.png b/main/src/core/MonoDevelop.Ide/icons/spinner-selected-3-16.png Binary files differdeleted file mode 100644 index 0713f0a018..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-3-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-3-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-selected-3-16@2x.png Binary files differdeleted file mode 100644 index d0bd23352f..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-3-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-4-16.png b/main/src/core/MonoDevelop.Ide/icons/spinner-selected-4-16.png Binary files differdeleted file mode 100644 index d48b80d110..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-4-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-4-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-selected-4-16@2x.png Binary files differdeleted file mode 100644 index b5014abce9..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-4-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-5-16.png b/main/src/core/MonoDevelop.Ide/icons/spinner-selected-5-16.png Binary files differdeleted file mode 100644 index 480ec10c31..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-5-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-5-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/spinner-selected-5-16@2x.png Binary files differdeleted file mode 100644 index a4d85f145b..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/spinner-selected-5-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/star-16.png b/main/src/core/MonoDevelop.Ide/icons/star-16.png Binary files differindex 9b29779062..084e7dd77e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/star-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/star-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/star-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/star-16@2x.png Binary files differindex b739ad5ae3..e8afdcea29 100644 --- a/main/src/core/MonoDevelop.Ide/icons/star-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/star-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/star-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/star-16~dark.png Binary files differnew file mode 100644 index 0000000000..1591a25153 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/star-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/star-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/star-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f98c7f0a60 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/star-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/star-hover-16.png b/main/src/core/MonoDevelop.Ide/icons/star-hover-16.png Binary files differindex 66cef74855..4bbf523b1e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/star-hover-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/star-hover-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/star-hover-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/star-hover-16@2x.png Binary files differindex 10b3e0107b..011fd239ca 100644 --- a/main/src/core/MonoDevelop.Ide/icons/star-hover-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/star-hover-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/star-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/star-overlay-16.png Binary files differdeleted file mode 100644 index ac634c03b7..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/star-overlay-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/star-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/star-overlay-16@2x.png Binary files differdeleted file mode 100644 index c7d97d3a51..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/star-overlay-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/star-overlay-hover-16.png b/main/src/core/MonoDevelop.Ide/icons/star-overlay-hover-16.png Binary files differdeleted file mode 100644 index 8e20716aac..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/star-overlay-hover-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/star-overlay-hover-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/star-overlay-hover-16@2x.png Binary files differdeleted file mode 100644 index d66150873a..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/star-overlay-hover-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-1-16.png b/main/src/core/MonoDevelop.Ide/icons/status-building-1-16.png Binary files differindex 059299242f..059f5a4773 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-building-1-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-1-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-1-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-building-1-16@2x.png Binary files differindex 9582fb826b..580a935c5c 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-building-1-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-1-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-1-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-building-1-16~dark.png Binary files differnew file mode 100644 index 0000000000..aa4705745e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-1-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-1-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-building-1-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..ae23b85eb0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-1-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-2-16.png b/main/src/core/MonoDevelop.Ide/icons/status-building-2-16.png Binary files differindex 8298833939..e68df7495d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-building-2-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-2-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-2-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-building-2-16@2x.png Binary files differindex 811ac2b60b..7d68090e85 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-building-2-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-2-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-2-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-building-2-16~dark.png Binary files differnew file mode 100644 index 0000000000..58193d5638 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-2-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-2-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-building-2-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..dce762a06b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-2-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-3-16.png b/main/src/core/MonoDevelop.Ide/icons/status-building-3-16.png Binary files differindex fac4715fe2..41e96beef1 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-building-3-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-3-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-3-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-building-3-16@2x.png Binary files differindex 4cbf2b33b9..8c3c6348e0 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-building-3-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-3-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-3-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-building-3-16~dark.png Binary files differnew file mode 100644 index 0000000000..12775c9e5b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-3-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-3-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-building-3-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..24be8e4f7d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-3-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-4-16.png b/main/src/core/MonoDevelop.Ide/icons/status-building-4-16.png Binary files differindex 61d8a58aab..fdb7562bbb 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-building-4-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-4-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-4-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-building-4-16@2x.png Binary files differindex 2c2c5a8c1f..c1c4239cf5 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-building-4-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-4-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-4-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-building-4-16~dark.png Binary files differnew file mode 100644 index 0000000000..572d1afcc0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-4-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-4-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-building-4-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6aa549b176 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-4-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-5-16.png b/main/src/core/MonoDevelop.Ide/icons/status-building-5-16.png Binary files differindex 547dc0cfcd..33dd57ea9c 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-building-5-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-5-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-5-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-building-5-16@2x.png Binary files differindex 03da6159e3..be00292c45 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-building-5-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-5-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-5-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-building-5-16~dark.png Binary files differnew file mode 100644 index 0000000000..0e785d9811 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-5-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-building-5-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-building-5-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..3556df64aa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-building-5-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-1-16.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-1-16.png Binary files differindex 45f37bf4ff..f7b7225e91 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-connecting-1-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-1-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-1-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-1-16@2x.png Binary files differindex c65cd992ef..3a2db39612 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-connecting-1-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-1-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-1-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-1-16~dark.png Binary files differnew file mode 100644 index 0000000000..928b1c9638 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-1-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-1-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-1-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..78a25c79bc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-1-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-2-16.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-2-16.png Binary files differindex 04995742ec..89ae6b2616 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-connecting-2-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-2-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-2-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-2-16@2x.png Binary files differindex 42aa33a05e..581318d863 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-connecting-2-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-2-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-2-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-2-16~dark.png Binary files differnew file mode 100644 index 0000000000..4c43b143f3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-2-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-2-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-2-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..30ae8cb641 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-2-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-3-16.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-3-16.png Binary files differindex a9b2d1fe14..111dd7784a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-connecting-3-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-3-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-3-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-3-16@2x.png Binary files differindex 09f51895a8..ec3a9a6ad2 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-connecting-3-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-3-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-3-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-3-16~dark.png Binary files differnew file mode 100644 index 0000000000..72f18ac8fe --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-3-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-3-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-3-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e734215696 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-3-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-4-16.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-4-16.png Binary files differindex 2375253ba9..0a21c8d19e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-connecting-4-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-4-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-4-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-4-16@2x.png Binary files differindex 40b39d8b82..64d7c6a901 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-connecting-4-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-4-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-4-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-4-16~dark.png Binary files differnew file mode 100644 index 0000000000..86166b86bb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-4-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-4-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-4-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e4b1583d5e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-4-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-5-16.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-5-16.png Binary files differindex 7564cdb511..52ebac5d89 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-connecting-5-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-5-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-5-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-5-16@2x.png Binary files differindex 29eaa5b83f..5d1bc1343d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-connecting-5-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-5-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-5-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-5-16~dark.png Binary files differnew file mode 100644 index 0000000000..abe8744ce8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-5-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-5-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-5-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e1ea5196c8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-5-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-6-16.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-6-16.png Binary files differindex 4b26c3cbea..11ee403bc9 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-connecting-6-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-6-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-6-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-6-16@2x.png Binary files differindex 14358643a3..5f01258c30 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-connecting-6-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-6-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-6-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-6-16~dark.png Binary files differnew file mode 100644 index 0000000000..5a25bd8210 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-6-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-connecting-6-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-connecting-6-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d50a9244da --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-connecting-6-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-error-16.png b/main/src/core/MonoDevelop.Ide/icons/status-error-16.png Binary files differindex ea632d5fcb..0d94aefa1d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-error-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-error-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-error-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-error-16@2x.png Binary files differindex 5fbd3dde4d..8abbf94ae5 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-error-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-error-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-error-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-error-16~dark.png Binary files differnew file mode 100644 index 0000000000..f9be4ff7c1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-error-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-error-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-error-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..4435b130bb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-error-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-error-count-16.png b/main/src/core/MonoDevelop.Ide/icons/status-error-count-16.png Binary files differindex 4a4c3adee3..be5ffca301 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-error-count-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-error-count-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-error-count-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-error-count-16@2x.png Binary files differindex 9623784f39..14f1104dac 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-error-count-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-error-count-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-error-count-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-error-count-16~dark.png Binary files differnew file mode 100644 index 0000000000..45081227a8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-error-count-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-error-count-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-error-count-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b71afddaef --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-error-count-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-instrumentation-16.png b/main/src/core/MonoDevelop.Ide/icons/status-instrumentation-16.png Binary files differnew file mode 100644 index 0000000000..3881148ee0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-instrumentation-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-instrumentation-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-instrumentation-16@2x.png Binary files differnew file mode 100644 index 0000000000..b61e07d523 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-instrumentation-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-instrumentation-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-instrumentation-16~dark.png Binary files differnew file mode 100644 index 0000000000..b57baf33c6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-instrumentation-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-instrumentation-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-instrumentation-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7612141812 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-instrumentation-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-1-16.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-1-16.png Binary files differindex 8fab4fa1ba..2b2e76c928 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-opening-1-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-1-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-1-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-1-16@2x.png Binary files differindex 092cc547dd..0e86d9364c 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-opening-1-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-1-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-1-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-1-16~dark.png Binary files differnew file mode 100644 index 0000000000..f4afe282e6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-1-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-1-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-1-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2651227337 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-1-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-2-16.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-2-16.png Binary files differindex e5005a1af1..89577eef08 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-opening-2-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-2-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-2-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-2-16@2x.png Binary files differindex 2d09645ba6..7ed90db172 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-opening-2-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-2-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-2-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-2-16~dark.png Binary files differnew file mode 100644 index 0000000000..ad2c5f4230 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-2-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-2-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-2-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2a8e3e02d6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-2-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-3-16.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-3-16.png Binary files differindex 53f30de577..13bfe54845 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-opening-3-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-3-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-3-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-3-16@2x.png Binary files differindex 3a979f157c..10aa1371c7 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-opening-3-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-3-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-3-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-3-16~dark.png Binary files differnew file mode 100644 index 0000000000..0fc83a9ae0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-3-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-3-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-3-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..019e79dac0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-3-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-4-16.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-4-16.png Binary files differindex 8b514d62f6..f8908911f7 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-opening-4-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-4-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-4-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-4-16@2x.png Binary files differindex 2a21738802..10fd9a87e1 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-opening-4-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-4-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-4-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-4-16~dark.png Binary files differnew file mode 100644 index 0000000000..9717ffbec6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-4-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-4-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-4-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..ccc5576e5a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-4-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-5-16.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-5-16.png Binary files differindex 0ec801254d..00c81658e4 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-opening-5-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-5-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-5-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-5-16@2x.png Binary files differindex 40ede43e79..44ba8dd197 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-opening-5-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-5-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-5-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-5-16~dark.png Binary files differnew file mode 100644 index 0000000000..a9569d9fc4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-5-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-5-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-5-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..6655b080f7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-5-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-6-16.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-6-16.png Binary files differindex 0ec801254d..00c81658e4 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-opening-6-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-6-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-6-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-6-16@2x.png Binary files differindex eb5c7c4adc..6d2dcaada8 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-opening-6-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-6-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-6-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-6-16~dark.png Binary files differnew file mode 100644 index 0000000000..a9569d9fc4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-6-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-opening-6-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-opening-6-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0c1854c8a8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-opening-6-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-parsing-16.png b/main/src/core/MonoDevelop.Ide/icons/status-parsing-16.png Binary files differindex e05d77a4c0..383aaddf75 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-parsing-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-parsing-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-parsing-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-parsing-16@2x.png Binary files differindex 7d492e434f..07960aec3d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-parsing-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-parsing-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-parsing-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-parsing-16~dark.png Binary files differnew file mode 100644 index 0000000000..5ddc5e40a7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-parsing-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-parsing-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-parsing-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..8ca627e7bf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-parsing-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-1-16.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-1-16.png Binary files differindex 77fba962cb..e270525bfa 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pulling-1-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-1-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-1-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-1-16@2x.png Binary files differindex 67ddbb74c8..08efa15e1b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pulling-1-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-1-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-1-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-1-16~dark.png Binary files differnew file mode 100644 index 0000000000..cec3cd0c90 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-1-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-1-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-1-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e76c5dbd8d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-1-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-2-16.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-2-16.png Binary files differindex 82a0697e90..57f8179ffd 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pulling-2-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-2-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-2-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-2-16@2x.png Binary files differindex a2e57dbdc2..39b3dc3f22 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pulling-2-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-2-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-2-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-2-16~dark.png Binary files differnew file mode 100644 index 0000000000..8d1acd295a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-2-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-2-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-2-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..1193131c24 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-2-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-3-16.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-3-16.png Binary files differindex 524efec497..dec5a5fe22 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pulling-3-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-3-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-3-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-3-16@2x.png Binary files differindex 0b8aea2dfa..113f8e2666 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pulling-3-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-3-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-3-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-3-16~dark.png Binary files differnew file mode 100644 index 0000000000..e79b8f65f8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-3-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-3-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-3-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..9a0ee3e3ad --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-3-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-4-16.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-4-16.png Binary files differindex 1d95a7becd..d1c6bff739 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pulling-4-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-4-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-4-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-4-16@2x.png Binary files differindex b11b9080c5..e7e04944a5 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pulling-4-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-4-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-4-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-4-16~dark.png Binary files differnew file mode 100644 index 0000000000..ac90aafb76 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-4-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-4-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-4-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..130623f775 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-4-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-5-16.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-5-16.png Binary files differindex 0a48211049..87dd053bb8 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pulling-5-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-5-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-5-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-5-16@2x.png Binary files differindex e979f85e05..30b068829a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pulling-5-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-5-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-5-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-5-16~dark.png Binary files differnew file mode 100644 index 0000000000..95b48606d4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-5-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-5-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-5-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..4474e1481c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-5-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-6-16.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-6-16.png Binary files differindex 3a0d47aee2..8fc0639eb6 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pulling-6-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-6-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-6-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-6-16@2x.png Binary files differindex 17ab669215..3bdf86eff5 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pulling-6-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-6-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-6-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-6-16~dark.png Binary files differnew file mode 100644 index 0000000000..100a4229bb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-6-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pulling-6-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pulling-6-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..f0d51cfa64 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pulling-6-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-1-16.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-1-16.png Binary files differindex 6d178e3efa..0b74921b23 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pushing-1-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-1-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-1-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-1-16@2x.png Binary files differindex a3ccfa41bd..590c65631a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pushing-1-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-1-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-1-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-1-16~dark.png Binary files differnew file mode 100644 index 0000000000..f218a36d7f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-1-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-1-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-1-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..5184f65b7c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-1-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-2-16.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-2-16.png Binary files differindex acc8321abb..1164299287 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pushing-2-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-2-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-2-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-2-16@2x.png Binary files differindex cb2d459e32..7f00e81dbe 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pushing-2-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-2-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-2-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-2-16~dark.png Binary files differnew file mode 100644 index 0000000000..929925c2f8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-2-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-2-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-2-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..108f91fde6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-2-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-3-16.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-3-16.png Binary files differindex 5ba6d34aca..6cdbfc45bf 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pushing-3-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-3-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-3-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-3-16@2x.png Binary files differindex f7ae869b34..cac0badc99 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pushing-3-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-3-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-3-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-3-16~dark.png Binary files differnew file mode 100644 index 0000000000..0d7a48188a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-3-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-3-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-3-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..83ff68de21 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-3-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-4-16.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-4-16.png Binary files differindex 8a357cdfb2..9e526ee981 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pushing-4-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-4-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-4-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-4-16@2x.png Binary files differindex c0965d3989..67844b9783 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pushing-4-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-4-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-4-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-4-16~dark.png Binary files differnew file mode 100644 index 0000000000..2e49a3fcb8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-4-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-4-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-4-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..244c1b9dfe --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-4-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-5-16.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-5-16.png Binary files differindex 7a974f18aa..180ae0803b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pushing-5-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-5-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-5-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-5-16@2x.png Binary files differindex 0a2945e01a..07673386d7 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pushing-5-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-5-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-5-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-5-16~dark.png Binary files differnew file mode 100644 index 0000000000..59f87738ed --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-5-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-5-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-5-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2cce78d195 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-5-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-6-16.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-6-16.png Binary files differindex 576d89fbd5..d89bc5cf29 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pushing-6-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-6-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-6-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-6-16@2x.png Binary files differindex bc2c8c16ef..48175d2acf 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-pushing-6-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-6-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-6-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-6-16~dark.png Binary files differnew file mode 100644 index 0000000000..510928c039 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-6-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-pushing-6-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-pushing-6-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..658e72abbb --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-pushing-6-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-ready-16.png b/main/src/core/MonoDevelop.Ide/icons/status-ready-16.png Binary files differindex 04b2716a49..30ec1f5e63 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-ready-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-ready-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-ready-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-ready-16@2x.png Binary files differindex 7feb6bc0bd..8bcc769778 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-ready-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-ready-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-ready-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-ready-16~dark.png Binary files differnew file mode 100644 index 0000000000..d3f5178df2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-ready-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-ready-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-ready-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..1d4591c31d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-ready-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-1-16.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-1-16.png Binary files differindex bc40ce77ae..89fee6dfbc 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-searching-1-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-1-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-1-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-1-16@2x.png Binary files differindex a19aa1ff54..e33f9da7af 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-searching-1-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-1-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-1-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-1-16~dark.png Binary files differnew file mode 100644 index 0000000000..c7c2d8c5c8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-1-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-1-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-1-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7abd404d2a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-1-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-2-16.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-2-16.png Binary files differindex 25b8496839..210b7355f3 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-searching-2-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-2-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-2-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-2-16@2x.png Binary files differindex 9b80f3607a..ec5f11bbec 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-searching-2-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-2-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-2-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-2-16~dark.png Binary files differnew file mode 100644 index 0000000000..fd3513eedc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-2-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-2-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-2-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..a8a8420d47 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-2-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-3-16.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-3-16.png Binary files differindex 67ed69839c..9cb9b069e4 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-searching-3-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-3-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-3-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-3-16@2x.png Binary files differindex 8831b8e26a..b9981b9e05 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-searching-3-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-3-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-3-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-3-16~dark.png Binary files differnew file mode 100644 index 0000000000..d514f40f82 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-3-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-3-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-3-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..bf8aa4458d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-3-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-4-16.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-4-16.png Binary files differindex 67ed69839c..54e2b44607 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-searching-4-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-4-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-4-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-4-16@2x.png Binary files differindex 8dffd2513f..ec729fd00a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-searching-4-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-4-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-4-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-4-16~dark.png Binary files differnew file mode 100644 index 0000000000..4cc5999536 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-4-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-searching-4-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-searching-4-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..9bda36052f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-searching-4-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-success-16.png b/main/src/core/MonoDevelop.Ide/icons/status-success-16.png Binary files differindex 975f275d69..b828726029 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-success-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-success-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-success-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-success-16@2x.png Binary files differindex 14f13da104..ac7b095f29 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-success-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-success-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-success-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-success-16~dark.png Binary files differnew file mode 100644 index 0000000000..162de15c69 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-success-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-success-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-success-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7b8ebdde60 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-success-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-1-16.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-1-16.png Binary files differindex 447e6fa8f9..a625ccee7e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-1-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-1-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-1-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-1-16@2x.png Binary files differindex 254cd96138..e0e1accff8 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-1-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-1-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-1-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-1-16~dark.png Binary files differnew file mode 100644 index 0000000000..60d12b84a4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-1-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-1-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-1-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b99c477e38 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-1-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-2-16.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-2-16.png Binary files differindex ef539a4251..872d66c3cd 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-2-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-2-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-2-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-2-16@2x.png Binary files differindex 21dc539c68..0fabad263a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-2-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-2-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-2-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-2-16~dark.png Binary files differnew file mode 100644 index 0000000000..46e2b31ecd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-2-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-2-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-2-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d68564539e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-2-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-3-16.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-3-16.png Binary files differindex db3a4311e8..87512b1ce9 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-3-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-3-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-3-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-3-16@2x.png Binary files differindex bf9c182ef9..5e4336a3b2 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-3-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-3-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-3-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-3-16~dark.png Binary files differnew file mode 100644 index 0000000000..3f48e5e128 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-3-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-3-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-3-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..eea0df787a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-3-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-4-16.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-4-16.png Binary files differindex b5de8fd925..1d2f81fe12 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-4-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-4-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-4-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-4-16@2x.png Binary files differindex e3b0e2c184..937c6be098 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-4-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-4-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-4-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-4-16~dark.png Binary files differnew file mode 100644 index 0000000000..32c5b195d4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-4-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-4-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-4-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..db00735932 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-4-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-5-16.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-5-16.png Binary files differindex 5d8d062f66..57f844698a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-5-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-5-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-5-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-5-16@2x.png Binary files differindex beb37df09c..0c4578ad5a 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-5-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-5-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-5-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-5-16~dark.png Binary files differnew file mode 100644 index 0000000000..e14037fb40 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-5-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-5-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-5-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..29851f1904 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-5-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-6-16.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-6-16.png Binary files differindex f48e288c6d..fde5bb74b1 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-6-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-6-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-6-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-6-16@2x.png Binary files differindex 3c0fc1eca3..a235860c76 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-6-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-6-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-6-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-6-16~dark.png Binary files differnew file mode 100644 index 0000000000..7567553573 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-6-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-6-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-6-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..08116041b3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-downloading-6-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-paused-16.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-paused-16.png Binary files differindex 916e656ab5..c8801ab470 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-paused-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-paused-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-paused-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-paused-16@2x.png Binary files differindex 999d50106f..5d9c6c13ff 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-paused-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-paused-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-paused-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-paused-16~dark.png Binary files differnew file mode 100644 index 0000000000..725b9f4ee2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-paused-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-paused-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-paused-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..ca9ea59efa --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-paused-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-ready-16.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-ready-16.png Binary files differindex 447e6fa8f9..a625ccee7e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-ready-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-ready-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-ready-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-ready-16@2x.png Binary files differindex 254cd96138..e0e1accff8 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-updates-ready-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-ready-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-ready-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-ready-16~dark.png Binary files differnew file mode 100644 index 0000000000..60d12b84a4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-ready-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-updates-ready-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-updates-ready-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b99c477e38 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-updates-ready-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-1-16.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-1-16.png Binary files differindex 230c52e0e0..db26f18dcc 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-waiting-1-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-1-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-1-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-1-16@2x.png Binary files differindex 51053381ed..a12860f5b8 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-waiting-1-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-1-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-1-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-1-16~dark.png Binary files differnew file mode 100644 index 0000000000..1750dee09f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-1-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-1-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-1-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..76d9056313 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-1-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-2-16.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-2-16.png Binary files differindex 55a46a59d4..e6f03f2340 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-waiting-2-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-2-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-2-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-2-16@2x.png Binary files differindex 376bb83e1e..0b6104e7de 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-waiting-2-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-2-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-2-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-2-16~dark.png Binary files differnew file mode 100644 index 0000000000..9d56a415d0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-2-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-2-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-2-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..3cfbdc4566 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-2-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-3-16.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-3-16.png Binary files differindex 217d819c8a..5654a4e518 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-waiting-3-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-3-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-3-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-3-16@2x.png Binary files differindex 76904d0785..4a9c5a6ccb 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-waiting-3-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-3-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-3-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-3-16~dark.png Binary files differnew file mode 100644 index 0000000000..169aa4f7fd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-3-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-3-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-3-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..8f14b29579 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-3-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-4-16.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-4-16.png Binary files differindex b49a1404b5..c643719b2b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-waiting-4-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-4-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-4-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-4-16@2x.png Binary files differindex e6175c70d7..4db7552a18 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-waiting-4-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-4-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-4-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-4-16~dark.png Binary files differnew file mode 100644 index 0000000000..c3febcf23e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-4-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-4-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-4-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..eaaae45268 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-4-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-5-16.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-5-16.png Binary files differindex 69f9012f3b..c9b2c9538b 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-waiting-5-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-5-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-5-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-5-16@2x.png Binary files differindex a490ba2791..3dc8b372ad 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-waiting-5-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-5-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-5-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-5-16~dark.png Binary files differnew file mode 100644 index 0000000000..a0929a4bde --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-5-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-waiting-5-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-waiting-5-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..85d167a7be --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-waiting-5-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-warning-16.png b/main/src/core/MonoDevelop.Ide/icons/status-warning-16.png Binary files differindex 11d705ea81..a7e776e42f 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-warning-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-warning-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-warning-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-warning-16@2x.png Binary files differindex c8d6e2e0cb..a1fe8c14f2 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-warning-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-warning-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-warning-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-warning-16~dark.png Binary files differnew file mode 100644 index 0000000000..6b9ae34540 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-warning-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-warning-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-warning-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..de6759fe54 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-warning-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-warning-count-16.png b/main/src/core/MonoDevelop.Ide/icons/status-warning-count-16.png Binary files differindex 205f29f277..c6b7bab537 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-warning-count-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-warning-count-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-warning-count-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-warning-count-16@2x.png Binary files differindex ba0bc0a5e1..3007a209bb 100644 --- a/main/src/core/MonoDevelop.Ide/icons/status-warning-count-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/status-warning-count-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-warning-count-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/status-warning-count-16~dark.png Binary files differnew file mode 100644 index 0000000000..f83643f680 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-warning-count-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/status-warning-count-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/status-warning-count-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..394109d861 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/status-warning-count-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/stop-16.png b/main/src/core/MonoDevelop.Ide/icons/stop-16.png Binary files differindex ea37d34b8c..d8ca4c84de 100644 --- a/main/src/core/MonoDevelop.Ide/icons/stop-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/stop-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/stop-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/stop-16@2x.png Binary files differindex d281d4f5be..b153b2253f 100644 --- a/main/src/core/MonoDevelop.Ide/icons/stop-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/stop-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/stop-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/stop-16~dark.png Binary files differnew file mode 100644 index 0000000000..bb75fd9317 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/stop-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/stop-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/stop-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..519db4744c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/stop-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/stop-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/stop-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..efd809bb13 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/stop-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/stop-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/stop-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..3698cb13e3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/stop-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/stop-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/stop-16~disabled.png Binary files differnew file mode 100644 index 0000000000..681e77c03f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/stop-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/stop-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/stop-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..e71b1ee5bf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/stop-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tab-close-9.png b/main/src/core/MonoDevelop.Ide/icons/tab-close-9.png Binary files differnew file mode 100644 index 0000000000..13e13896ae --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tab-close-9.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tab-close-9@2x.png b/main/src/core/MonoDevelop.Ide/icons/tab-close-9@2x.png Binary files differnew file mode 100644 index 0000000000..b33f4ca909 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tab-close-9@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tab-close-9~dark.png b/main/src/core/MonoDevelop.Ide/icons/tab-close-9~dark.png Binary files differnew file mode 100644 index 0000000000..f3fadb1ad9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tab-close-9~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tab-close-9~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/tab-close-9~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d27ac42628 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tab-close-9~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tab-dirty-9.png b/main/src/core/MonoDevelop.Ide/icons/tab-dirty-9.png Binary files differnew file mode 100644 index 0000000000..606d253526 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tab-dirty-9.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tab-dirty-9@2x.png b/main/src/core/MonoDevelop.Ide/icons/tab-dirty-9@2x.png Binary files differnew file mode 100644 index 0000000000..4bfe37a699 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tab-dirty-9@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tab-dirty-9~dark.png b/main/src/core/MonoDevelop.Ide/icons/tab-dirty-9~dark.png Binary files differnew file mode 100644 index 0000000000..c3e997f674 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tab-dirty-9~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tab-dirty-9~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/tab-dirty-9~dark@2x.png Binary files differnew file mode 100644 index 0000000000..016026927d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tab-dirty-9~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-12.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-12.png Binary files differnew file mode 100644 index 0000000000..8af039b705 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-12.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-12@2x.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-12@2x.png Binary files differnew file mode 100644 index 0000000000..44ceec7d3f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-12@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-12~dark.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-12~dark.png Binary files differnew file mode 100644 index 0000000000..63c076ca89 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-12~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-12~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-12~dark@2x.png Binary files differnew file mode 100644 index 0000000000..a094a2328f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-12~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-hover-12.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-hover-12.png Binary files differnew file mode 100644 index 0000000000..8a411fb413 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-hover-12.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-hover-12@2x.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-hover-12@2x.png Binary files differnew file mode 100644 index 0000000000..84b2caa036 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-hover-12@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-hover-12~dark.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-hover-12~dark.png Binary files differnew file mode 100644 index 0000000000..54afcbe1b9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-hover-12~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-hover-12~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-hover-12~dark@2x.png Binary files differnew file mode 100644 index 0000000000..37aea57bb8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-menu-hover-12~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-next-12.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-12.png Binary files differindex 55d4079ff3..2e2d84cd68 100644 --- a/main/src/core/MonoDevelop.Ide/icons/tabbar-next-12.png +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-12.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-next-12@2x.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-12@2x.png Binary files differindex 794071b147..5b80abf2f5 100644 --- a/main/src/core/MonoDevelop.Ide/icons/tabbar-next-12@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-12@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-next-12~dark.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-12~dark.png Binary files differnew file mode 100644 index 0000000000..bac5a45834 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-12~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-next-12~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-12~dark@2x.png Binary files differnew file mode 100644 index 0000000000..b230a74b75 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-12~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-next-hover-12.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-hover-12.png Binary files differnew file mode 100644 index 0000000000..7c6e99f91e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-hover-12.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-next-hover-12@2x.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-hover-12@2x.png Binary files differnew file mode 100644 index 0000000000..aa0a13572b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-hover-12@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-next-hover-12~dark.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-hover-12~dark.png Binary files differnew file mode 100644 index 0000000000..d63b453359 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-hover-12~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-next-hover-12~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-hover-12~dark@2x.png Binary files differnew file mode 100644 index 0000000000..606d753c2a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-next-hover-12~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-12.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-12.png Binary files differindex 80268b5d56..724c1c263c 100644 --- a/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-12.png +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-12.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-12@2x.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-12@2x.png Binary files differindex f8c627257b..9dcd26d387 100644 --- a/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-12@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-12@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-12~dark.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-12~dark.png Binary files differnew file mode 100644 index 0000000000..c3497902c5 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-12~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-12~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-12~dark@2x.png Binary files differnew file mode 100644 index 0000000000..25d259334d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-12~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-hover-12.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-hover-12.png Binary files differnew file mode 100644 index 0000000000..5d137229f8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-hover-12.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-hover-12@2x.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-hover-12@2x.png Binary files differnew file mode 100644 index 0000000000..74ab8a02cd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-hover-12@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-hover-12~dark.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-hover-12~dark.png Binary files differnew file mode 100644 index 0000000000..f20863078c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-hover-12~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-hover-12~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-hover-12~dark@2x.png Binary files differnew file mode 100644 index 0000000000..aeca7ec51f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/tabbar-prev-hover-12~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/toggle-bookmark-16.png b/main/src/core/MonoDevelop.Ide/icons/toggle-bookmark-16.png Binary files differdeleted file mode 100644 index bd2686ed6e..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/toggle-bookmark-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/tree-popup-button-down.png b/main/src/core/MonoDevelop.Ide/icons/tree-popup-button-down.png Binary files differdeleted file mode 100644 index 5e9a7c9af5..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/tree-popup-button-down.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/tree-popup-button-down@2x.png b/main/src/core/MonoDevelop.Ide/icons/tree-popup-button-down@2x.png Binary files differdeleted file mode 100644 index e761190da0..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/tree-popup-button-down@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/tree-popup-button-hover.png b/main/src/core/MonoDevelop.Ide/icons/tree-popup-button-hover.png Binary files differdeleted file mode 100644 index 9d332a8895..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/tree-popup-button-hover.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/tree-popup-button-hover@2x.png b/main/src/core/MonoDevelop.Ide/icons/tree-popup-button-hover@2x.png Binary files differdeleted file mode 100644 index f9be6278cd..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/tree-popup-button-hover@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/tree-popup-button.png b/main/src/core/MonoDevelop.Ide/icons/tree-popup-button.png Binary files differdeleted file mode 100644 index 7736c0afe1..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/tree-popup-button.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/tree-popup-button@2x.png b/main/src/core/MonoDevelop.Ide/icons/tree-popup-button@2x.png Binary files differdeleted file mode 100644 index 7f91e0d448..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/tree-popup-button@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/undo-16.png b/main/src/core/MonoDevelop.Ide/icons/undo-16.png Binary files differindex 8a5836ce43..7d916d7bfb 100644 --- a/main/src/core/MonoDevelop.Ide/icons/undo-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/undo-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/undo-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/undo-16@2x.png Binary files differindex 103f68d4bd..797a0e884e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/undo-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/undo-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/undo-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/undo-16~dark.png Binary files differnew file mode 100644 index 0000000000..b9d4ed2cd8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/undo-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/undo-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/undo-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..dd24aa8dfd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/undo-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/undo-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/undo-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..838eb4808f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/undo-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/undo-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/undo-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..d2eb075a9f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/undo-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/undo-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/undo-16~disabled.png Binary files differnew file mode 100644 index 0000000000..a15f5fd13c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/undo-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/undo-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/undo-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..4650a1f88e --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/undo-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/unindent-16.png b/main/src/core/MonoDevelop.Ide/icons/unindent-16.png Binary files differindex b9ff704c19..a62d09e651 100644 --- a/main/src/core/MonoDevelop.Ide/icons/unindent-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/unindent-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/unindent-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/unindent-16@2x.png Binary files differindex c2e54ac2ff..75db3fea50 100644 --- a/main/src/core/MonoDevelop.Ide/icons/unindent-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/unindent-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/unindent-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/unindent-16~dark.png Binary files differnew file mode 100644 index 0000000000..fa0d183936 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/unindent-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/unindent-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/unindent-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..932c258758 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/unindent-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/unstar-16.png b/main/src/core/MonoDevelop.Ide/icons/unstar-16.png Binary files differindex 39bfa485a2..dfd3f6321e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/unstar-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/unstar-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/unstar-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/unstar-16@2x.png Binary files differindex 0d191beceb..c9db385972 100644 --- a/main/src/core/MonoDevelop.Ide/icons/unstar-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/unstar-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/unstar-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/unstar-16~dark.png Binary files differnew file mode 100644 index 0000000000..602bdb0248 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/unstar-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/unstar-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/unstar-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..c2caa5e045 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/unstar-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/unstar-hover-16.png b/main/src/core/MonoDevelop.Ide/icons/unstar-hover-16.png Binary files differindex ea839f22dd..98da41f29d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/unstar-hover-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/unstar-hover-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/unstar-hover-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/unstar-hover-16@2x.png Binary files differindex 0d95bf65ee..fc2bb00ac6 100644 --- a/main/src/core/MonoDevelop.Ide/icons/unstar-hover-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/unstar-hover-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/unstar-overlay-16.png b/main/src/core/MonoDevelop.Ide/icons/unstar-overlay-16.png Binary files differdeleted file mode 100644 index 88a8a49409..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/unstar-overlay-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/unstar-overlay-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/unstar-overlay-16@2x.png Binary files differdeleted file mode 100644 index d3ee714237..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/unstar-overlay-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/unstar-overlay-hover-16.png b/main/src/core/MonoDevelop.Ide/icons/unstar-overlay-hover-16.png Binary files differdeleted file mode 100644 index 72bef5d614..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/unstar-overlay-hover-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/unstar-overlay-hover-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/unstar-overlay-hover-16@2x.png Binary files differdeleted file mode 100644 index 8130f45dcc..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/unstar-overlay-hover-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/updates-16.png b/main/src/core/MonoDevelop.Ide/icons/updates-16.png Binary files differindex 818f09fb65..97df672bde 100644 --- a/main/src/core/MonoDevelop.Ide/icons/updates-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/updates-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/updates-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/updates-16@2x.png Binary files differindex 0582e35d0c..c7cad401de 100644 --- a/main/src/core/MonoDevelop.Ide/icons/updates-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/updates-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/updates-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/updates-16~dark.png Binary files differnew file mode 100644 index 0000000000..efce32bec9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/updates-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/updates-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/updates-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..90636c76ac --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/updates-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/updates-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/updates-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..19c4501c67 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/updates-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/updates-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/updates-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..b7b53642f9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/updates-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/updates-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/updates-16~disabled.png Binary files differnew file mode 100644 index 0000000000..2696c86328 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/updates-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/updates-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/updates-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..09a8f84eea --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/updates-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-16.png b/main/src/core/MonoDevelop.Ide/icons/warning-16.png Binary files differindex 36e3484d08..0b0b0b1f4d 100644 --- a/main/src/core/MonoDevelop.Ide/icons/warning-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/warning-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-16@2x.png Binary files differindex c457998b0a..8dd44e1912 100644 --- a/main/src/core/MonoDevelop.Ide/icons/warning-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/warning-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/warning-16~dark.png Binary files differnew file mode 100644 index 0000000000..3c7035f038 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..2fd1c15cb9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/warning-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..b4345ae86d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..fec3df50da --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/warning-16~sel.png Binary files differnew file mode 100644 index 0000000000..b4345ae86d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..fec3df50da --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-24.png b/main/src/core/MonoDevelop.Ide/icons/warning-24.png Binary files differindex 433eaa4bea..45558c17a4 100644 --- a/main/src/core/MonoDevelop.Ide/icons/warning-24.png +++ b/main/src/core/MonoDevelop.Ide/icons/warning-24.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-24@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-24@2x.png Binary files differindex a91093e50b..d05d776c65 100644 --- a/main/src/core/MonoDevelop.Ide/icons/warning-24@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/warning-24@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-24~dark.png b/main/src/core/MonoDevelop.Ide/icons/warning-24~dark.png Binary files differnew file mode 100644 index 0000000000..f4a158b26a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-24~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-24~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-24~dark@2x.png Binary files differnew file mode 100644 index 0000000000..142ffe58b2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-24~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-24~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/warning-24~dark~sel.png Binary files differnew file mode 100644 index 0000000000..b847a63a47 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-24~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-24~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-24~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..145afde3a1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-24~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-24~sel.png b/main/src/core/MonoDevelop.Ide/icons/warning-24~sel.png Binary files differnew file mode 100644 index 0000000000..b847a63a47 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-24~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-24~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-24~sel@2x.png Binary files differnew file mode 100644 index 0000000000..145afde3a1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-24~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-32.png b/main/src/core/MonoDevelop.Ide/icons/warning-32.png Binary files differindex c457998b0a..8dd44e1912 100644 --- a/main/src/core/MonoDevelop.Ide/icons/warning-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/warning-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-32@2x.png Binary files differindex 1af1904486..1a83da5135 100644 --- a/main/src/core/MonoDevelop.Ide/icons/warning-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/warning-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/warning-32~dark.png Binary files differnew file mode 100644 index 0000000000..2fd1c15cb9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..c579d44d95 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/warning-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..fec3df50da --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b8b7e11b7a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/warning-32~sel.png Binary files differnew file mode 100644 index 0000000000..fec3df50da --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..b8b7e11b7a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-48.png b/main/src/core/MonoDevelop.Ide/icons/warning-48.png Binary files differindex a91093e50b..d05d776c65 100644 --- a/main/src/core/MonoDevelop.Ide/icons/warning-48.png +++ b/main/src/core/MonoDevelop.Ide/icons/warning-48.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-48@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-48@2x.png Binary files differindex 87fe80f662..33451e9571 100644 --- a/main/src/core/MonoDevelop.Ide/icons/warning-48@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/warning-48@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-48~dark.png b/main/src/core/MonoDevelop.Ide/icons/warning-48~dark.png Binary files differnew file mode 100644 index 0000000000..142ffe58b2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-48~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-48~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-48~dark@2x.png Binary files differnew file mode 100644 index 0000000000..116d965478 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-48~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-48~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/warning-48~dark~sel.png Binary files differnew file mode 100644 index 0000000000..145afde3a1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-48~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-48~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-48~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..cb69a0c91f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-48~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-48~sel.png b/main/src/core/MonoDevelop.Ide/icons/warning-48~sel.png Binary files differnew file mode 100644 index 0000000000..145afde3a1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-48~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-48~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-48~sel@2x.png Binary files differnew file mode 100644 index 0000000000..cb69a0c91f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/warning-48~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-8.png b/main/src/core/MonoDevelop.Ide/icons/warning-8.png Binary files differdeleted file mode 100644 index 888e69f00f..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/warning-8.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-8@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-8@2x.png Binary files differdeleted file mode 100644 index 36e3484d08..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/warning-8@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-overlay-9.png b/main/src/core/MonoDevelop.Ide/icons/warning-overlay-9.png Binary files differdeleted file mode 100644 index dcd12f891c..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/warning-overlay-9.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/warning-overlay-9@2x.png b/main/src/core/MonoDevelop.Ide/icons/warning-overlay-9@2x.png Binary files differdeleted file mode 100644 index 2b640aeaf8..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/warning-overlay-9@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/web-search-16.png b/main/src/core/MonoDevelop.Ide/icons/web-search-16.png Binary files differindex 2cef329e0d..7ff800d40b 100755..100644 --- a/main/src/core/MonoDevelop.Ide/icons/web-search-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/web-search-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/web-search-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/web-search-16@2x.png Binary files differnew file mode 100644 index 0000000000..6fd81ad64d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/web-search-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/web-search-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/web-search-16~dark.png Binary files differnew file mode 100644 index 0000000000..2ac4184d75 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/web-search-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/web-search-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/web-search-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7a0d07118d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/web-search-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/web-search-16~dark~disabled.png b/main/src/core/MonoDevelop.Ide/icons/web-search-16~dark~disabled.png Binary files differnew file mode 100644 index 0000000000..f923f1c3a2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/web-search-16~dark~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/web-search-16~dark~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/web-search-16~dark~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..5577b0dd83 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/web-search-16~dark~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/web-search-16~disabled.png b/main/src/core/MonoDevelop.Ide/icons/web-search-16~disabled.png Binary files differnew file mode 100644 index 0000000000..fe87b409de --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/web-search-16~disabled.png diff --git a/main/src/core/MonoDevelop.Ide/icons/web-search-16~disabled@2x.png b/main/src/core/MonoDevelop.Ide/icons/web-search-16~disabled@2x.png Binary files differnew file mode 100644 index 0000000000..bca664c136 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/web-search-16~disabled@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-16.png b/main/src/core/MonoDevelop.Ide/icons/workspace-16.png Binary files differindex 41551f2dd6..5f3599664e 100644 --- a/main/src/core/MonoDevelop.Ide/icons/workspace-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/workspace-16@2x.png Binary files differindex a882b794f5..2d91a9b7de 100644 --- a/main/src/core/MonoDevelop.Ide/icons/workspace-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/workspace-16~dark.png Binary files differnew file mode 100644 index 0000000000..69ba1115d3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/workspace-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..4e8b63f9a0 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/workspace-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..d5f1a83c76 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/workspace-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c9dee101c6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/workspace-16~sel.png Binary files differnew file mode 100644 index 0000000000..d5f1a83c76 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/workspace-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..c9dee101c6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-32.png b/main/src/core/MonoDevelop.Ide/icons/workspace-32.png Binary files differindex a882b794f5..fca97a0ac5 100644 --- a/main/src/core/MonoDevelop.Ide/icons/workspace-32.png +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-32.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-32@2x.png b/main/src/core/MonoDevelop.Ide/icons/workspace-32@2x.png Binary files differindex 210a597e86..a36618ceb6 100644 --- a/main/src/core/MonoDevelop.Ide/icons/workspace-32@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-32@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-32~dark.png b/main/src/core/MonoDevelop.Ide/icons/workspace-32~dark.png Binary files differnew file mode 100644 index 0000000000..b98c1f2a43 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-32~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-32~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/workspace-32~dark@2x.png Binary files differnew file mode 100644 index 0000000000..c59a3f46a1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-32~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-32~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/workspace-32~dark~sel.png Binary files differnew file mode 100644 index 0000000000..c9dee101c6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-32~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-32~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/workspace-32~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..9d3f476f12 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-32~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-32~sel.png b/main/src/core/MonoDevelop.Ide/icons/workspace-32~sel.png Binary files differnew file mode 100644 index 0000000000..c9dee101c6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-32~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/workspace-32~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/workspace-32~sel@2x.png Binary files differnew file mode 100644 index 0000000000..9d3f476f12 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/workspace-32~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-100-16.png b/main/src/core/MonoDevelop.Ide/icons/zoom-100-16.png Binary files differdeleted file mode 100644 index 92dddd2ea8..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/zoom-100-16.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-100-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/zoom-100-16@2x.png Binary files differdeleted file mode 100644 index 33b069a1b4..0000000000 --- a/main/src/core/MonoDevelop.Ide/icons/zoom-100-16@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16.png b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16.png Binary files differnew file mode 100644 index 0000000000..fe4bde6b69 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16@2x.png Binary files differnew file mode 100644 index 0000000000..3040157d01 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~dark.png Binary files differnew file mode 100644 index 0000000000..90f14ea1f9 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..747f6f7831 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..390cd220f1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..10f99b72bc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~sel.png Binary files differnew file mode 100644 index 0000000000..390cd220f1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..10f99b72bc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-actual-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-in-16.png b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16.png Binary files differindex 74a0653a80..89f96d6eb4 100644 --- a/main/src/core/MonoDevelop.Ide/icons/zoom-in-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-in-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16@2x.png Binary files differindex a92d18dfa0..ea4ebe9b93 100644 --- a/main/src/core/MonoDevelop.Ide/icons/zoom-in-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~dark.png Binary files differnew file mode 100644 index 0000000000..63c1b9583f --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..0c3743b875 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..099e4df0d4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..3da3e51f2d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~sel.png Binary files differnew file mode 100644 index 0000000000..099e4df0d4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..3da3e51f2d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-in-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-out-16.png b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16.png Binary files differindex ea2ea187f3..e62bb360c3 100644 --- a/main/src/core/MonoDevelop.Ide/icons/zoom-out-16.png +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-out-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16@2x.png Binary files differindex 34e563fcce..7a7c751f83 100644 --- a/main/src/core/MonoDevelop.Ide/icons/zoom-out-16@2x.png +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~dark.png Binary files differnew file mode 100644 index 0000000000..ccc5001f47 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e44abcbb96 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..679f582947 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..33dc3c1f58 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~sel.png Binary files differnew file mode 100644 index 0000000000..679f582947 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..33dc3c1f58 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/zoom-out-16~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/resources/padbar-active.9.png b/main/src/core/MonoDevelop.Ide/resources/padbar-active.9.png Binary files differnew file mode 100644 index 0000000000..4e88080bc1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/padbar-active.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/padbar-active@2x.9.png b/main/src/core/MonoDevelop.Ide/resources/padbar-active@2x.9.png Binary files differnew file mode 100644 index 0000000000..a37ce00b0b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/padbar-active@2x.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/padbar-active~dark.9.png b/main/src/core/MonoDevelop.Ide/resources/padbar-active~dark.9.png Binary files differnew file mode 100644 index 0000000000..ace406f87a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/padbar-active~dark.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/padbar-active~dark@2x.9.png b/main/src/core/MonoDevelop.Ide/resources/padbar-active~dark@2x.9.png Binary files differnew file mode 100644 index 0000000000..3b86e914cf --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/padbar-active~dark@2x.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/padbar-back.9.png b/main/src/core/MonoDevelop.Ide/resources/padbar-back.9.png Binary files differnew file mode 100644 index 0000000000..225177e867 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/padbar-back.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/padbar-back@2x.9.png b/main/src/core/MonoDevelop.Ide/resources/padbar-back@2x.9.png Binary files differnew file mode 100644 index 0000000000..8d9fdd04d7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/padbar-back@2x.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/padbar-back~dark.9.png b/main/src/core/MonoDevelop.Ide/resources/padbar-back~dark.9.png Binary files differnew file mode 100644 index 0000000000..b71ec9ba7a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/padbar-back~dark.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/padbar-back~dark@2x.9.png b/main/src/core/MonoDevelop.Ide/resources/padbar-back~dark@2x.9.png Binary files differnew file mode 100644 index 0000000000..90d21b5a70 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/padbar-back~dark@2x.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/padbar-inactive.9.png b/main/src/core/MonoDevelop.Ide/resources/padbar-inactive.9.png Binary files differnew file mode 100644 index 0000000000..7138ae8161 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/padbar-inactive.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/padbar-inactive@2x.9.png b/main/src/core/MonoDevelop.Ide/resources/padbar-inactive@2x.9.png Binary files differnew file mode 100644 index 0000000000..29f2eb74b4 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/padbar-inactive@2x.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/padbar-inactive~dark.9.png b/main/src/core/MonoDevelop.Ide/resources/padbar-inactive~dark.9.png Binary files differnew file mode 100644 index 0000000000..487b6ab6c3 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/padbar-inactive~dark.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/padbar-inactive~dark@2x.9.png b/main/src/core/MonoDevelop.Ide/resources/padbar-inactive~dark@2x.9.png Binary files differnew file mode 100644 index 0000000000..f37bd4cd8d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/padbar-inactive~dark@2x.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/tabbar-active.9.png b/main/src/core/MonoDevelop.Ide/resources/tabbar-active.9.png Binary files differnew file mode 100644 index 0000000000..4897a34497 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/tabbar-active.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/tabbar-active@2x.9.png b/main/src/core/MonoDevelop.Ide/resources/tabbar-active@2x.9.png Binary files differnew file mode 100644 index 0000000000..b5151e049a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/tabbar-active@2x.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/tabbar-active~dark.9.png b/main/src/core/MonoDevelop.Ide/resources/tabbar-active~dark.9.png Binary files differnew file mode 100644 index 0000000000..3bc15da732 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/tabbar-active~dark.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/tabbar-active~dark@2x.9.png b/main/src/core/MonoDevelop.Ide/resources/tabbar-active~dark@2x.9.png Binary files differnew file mode 100644 index 0000000000..60dc5f3248 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/tabbar-active~dark@2x.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/tabbar-back.9.png b/main/src/core/MonoDevelop.Ide/resources/tabbar-back.9.png Binary files differnew file mode 100644 index 0000000000..225177e867 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/tabbar-back.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/tabbar-back@2x.9.png b/main/src/core/MonoDevelop.Ide/resources/tabbar-back@2x.9.png Binary files differnew file mode 100644 index 0000000000..8d9fdd04d7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/tabbar-back@2x.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/tabbar-back~dark.9.png b/main/src/core/MonoDevelop.Ide/resources/tabbar-back~dark.9.png Binary files differnew file mode 100644 index 0000000000..b71ec9ba7a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/tabbar-back~dark.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/tabbar-back~dark@2x.9.png b/main/src/core/MonoDevelop.Ide/resources/tabbar-back~dark@2x.9.png Binary files differnew file mode 100644 index 0000000000..90d21b5a70 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/tabbar-back~dark@2x.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/tabbar-inactive.9.png b/main/src/core/MonoDevelop.Ide/resources/tabbar-inactive.9.png Binary files differnew file mode 100644 index 0000000000..4db47df2e8 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/tabbar-inactive.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/tabbar-inactive@2x.9.png b/main/src/core/MonoDevelop.Ide/resources/tabbar-inactive@2x.9.png Binary files differnew file mode 100644 index 0000000000..3b51031327 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/tabbar-inactive@2x.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/tabbar-inactive~dark.9.png b/main/src/core/MonoDevelop.Ide/resources/tabbar-inactive~dark.9.png Binary files differnew file mode 100644 index 0000000000..2f3222c6da --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/tabbar-inactive~dark.9.png diff --git a/main/src/core/MonoDevelop.Ide/resources/tabbar-inactive~dark@2x.9.png b/main/src/core/MonoDevelop.Ide/resources/tabbar-inactive~dark@2x.9.png Binary files differnew file mode 100644 index 0000000000..fb455a9b6d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/resources/tabbar-inactive~dark@2x.9.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/blank-solution.png b/main/src/core/MonoDevelop.Ide/templates/images/blank-solution.png Binary files differdeleted file mode 100644 index df11fe9877..0000000000 --- a/main/src/core/MonoDevelop.Ide/templates/images/blank-solution.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/templates/images/blank-solution@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/blank-solution@2x.png Binary files differdeleted file mode 100644 index c4d0ed9986..0000000000 --- a/main/src/core/MonoDevelop.Ide/templates/images/blank-solution@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/templates/images/console-project.png b/main/src/core/MonoDevelop.Ide/templates/images/console-project.png Binary files differindex cf1766ba08..801b15a2de 100644 --- a/main/src/core/MonoDevelop.Ide/templates/images/console-project.png +++ b/main/src/core/MonoDevelop.Ide/templates/images/console-project.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/console-project@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/console-project@2x.png Binary files differindex f92dae0e23..27a4b3d18f 100644 --- a/main/src/core/MonoDevelop.Ide/templates/images/console-project@2x.png +++ b/main/src/core/MonoDevelop.Ide/templates/images/console-project@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/console-project~dark.png b/main/src/core/MonoDevelop.Ide/templates/images/console-project~dark.png Binary files differnew file mode 100644 index 0000000000..6d21522132 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/console-project~dark.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/console-project~dark@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/console-project~dark@2x.png Binary files differnew file mode 100644 index 0000000000..1c54434346 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/console-project~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/generic-project.png b/main/src/core/MonoDevelop.Ide/templates/images/generic-project.png Binary files differdeleted file mode 100644 index a2bfc671e9..0000000000 --- a/main/src/core/MonoDevelop.Ide/templates/images/generic-project.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/templates/images/generic-project@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/generic-project@2x.png Binary files differdeleted file mode 100644 index 61d22fa403..0000000000 --- a/main/src/core/MonoDevelop.Ide/templates/images/generic-project@2x.png +++ /dev/null diff --git a/main/src/core/MonoDevelop.Ide/templates/images/gtk2-project.png b/main/src/core/MonoDevelop.Ide/templates/images/gtk2-project.png Binary files differindex b0dde6991b..6492480c5b 100644 --- a/main/src/core/MonoDevelop.Ide/templates/images/gtk2-project.png +++ b/main/src/core/MonoDevelop.Ide/templates/images/gtk2-project.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/gtk2-project@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/gtk2-project@2x.png Binary files differindex e29687e63d..d73b260f27 100644 --- a/main/src/core/MonoDevelop.Ide/templates/images/gtk2-project@2x.png +++ b/main/src/core/MonoDevelop.Ide/templates/images/gtk2-project@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/gtk2-project~dark.png b/main/src/core/MonoDevelop.Ide/templates/images/gtk2-project~dark.png Binary files differnew file mode 100644 index 0000000000..1c8dc96498 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/gtk2-project~dark.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/gtk2-project~dark@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/gtk2-project~dark@2x.png Binary files differnew file mode 100644 index 0000000000..fff2f70f17 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/gtk2-project~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/library-project.png b/main/src/core/MonoDevelop.Ide/templates/images/library-project.png Binary files differindex f6210a7daa..127a22069e 100644 --- a/main/src/core/MonoDevelop.Ide/templates/images/library-project.png +++ b/main/src/core/MonoDevelop.Ide/templates/images/library-project.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/library-project@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/library-project@2x.png Binary files differindex b9c35577c2..3369a1640b 100644 --- a/main/src/core/MonoDevelop.Ide/templates/images/library-project@2x.png +++ b/main/src/core/MonoDevelop.Ide/templates/images/library-project@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/library-project~dark.png b/main/src/core/MonoDevelop.Ide/templates/images/library-project~dark.png Binary files differnew file mode 100644 index 0000000000..948625e8dd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/library-project~dark.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/library-project~dark@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/library-project~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e23a9c7585 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/library-project~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/pcl-project.png b/main/src/core/MonoDevelop.Ide/templates/images/pcl-project.png Binary files differindex 81e7cd51fc..e21a761573 100644 --- a/main/src/core/MonoDevelop.Ide/templates/images/pcl-project.png +++ b/main/src/core/MonoDevelop.Ide/templates/images/pcl-project.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/pcl-project@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/pcl-project@2x.png Binary files differindex f23c248330..c3ab76c325 100644 --- a/main/src/core/MonoDevelop.Ide/templates/images/pcl-project@2x.png +++ b/main/src/core/MonoDevelop.Ide/templates/images/pcl-project@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/pcl-project~dark.png b/main/src/core/MonoDevelop.Ide/templates/images/pcl-project~dark.png Binary files differnew file mode 100644 index 0000000000..72458dffd6 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/pcl-project~dark.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/pcl-project~dark@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/pcl-project~dark@2x.png Binary files differnew file mode 100644 index 0000000000..ec282dd4ac --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/pcl-project~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/project.png b/main/src/core/MonoDevelop.Ide/templates/images/project.png Binary files differnew file mode 100644 index 0000000000..3fc8bfdd51 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/project.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/project@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/project@2x.png Binary files differnew file mode 100644 index 0000000000..60adee9db1 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/project@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/project~dark.png b/main/src/core/MonoDevelop.Ide/templates/images/project~dark.png Binary files differnew file mode 100644 index 0000000000..c91847dd1a --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/project~dark.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/project~dark@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/project~dark@2x.png Binary files differnew file mode 100644 index 0000000000..a6d19fb9ee --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/project~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/shared-project.png b/main/src/core/MonoDevelop.Ide/templates/images/shared-project.png Binary files differindex 1b55f0a651..10188237ed 100644 --- a/main/src/core/MonoDevelop.Ide/templates/images/shared-project.png +++ b/main/src/core/MonoDevelop.Ide/templates/images/shared-project.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/shared-project@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/shared-project@2x.png Binary files differindex fa5f8c3ad9..24f440c804 100644 --- a/main/src/core/MonoDevelop.Ide/templates/images/shared-project@2x.png +++ b/main/src/core/MonoDevelop.Ide/templates/images/shared-project@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/shared-project~dark.png b/main/src/core/MonoDevelop.Ide/templates/images/shared-project~dark.png Binary files differnew file mode 100644 index 0000000000..d654704c8c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/shared-project~dark.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/shared-project~dark@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/shared-project~dark@2x.png Binary files differnew file mode 100644 index 0000000000..d2cdff451c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/shared-project~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/solution.png b/main/src/core/MonoDevelop.Ide/templates/images/solution.png Binary files differnew file mode 100644 index 0000000000..2be1f05714 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/solution.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/solution@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/solution@2x.png Binary files differnew file mode 100644 index 0000000000..e729221eca --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/solution@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/solution~dark.png b/main/src/core/MonoDevelop.Ide/templates/images/solution~dark.png Binary files differnew file mode 100644 index 0000000000..fc067770cc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/solution~dark.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/solution~dark@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/solution~dark@2x.png Binary files differnew file mode 100644 index 0000000000..e94e6d3dca --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/solution~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/workspace.png b/main/src/core/MonoDevelop.Ide/templates/images/workspace.png Binary files differindex 0d46904196..ed707535ca 100644 --- a/main/src/core/MonoDevelop.Ide/templates/images/workspace.png +++ b/main/src/core/MonoDevelop.Ide/templates/images/workspace.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/workspace@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/workspace@2x.png Binary files differindex e3bb3db121..9b87939cf9 100644 --- a/main/src/core/MonoDevelop.Ide/templates/images/workspace@2x.png +++ b/main/src/core/MonoDevelop.Ide/templates/images/workspace@2x.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/workspace~dark.png b/main/src/core/MonoDevelop.Ide/templates/images/workspace~dark.png Binary files differnew file mode 100644 index 0000000000..80b1fb10cc --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/workspace~dark.png diff --git a/main/src/core/MonoDevelop.Ide/templates/images/workspace~dark@2x.png b/main/src/core/MonoDevelop.Ide/templates/images/workspace~dark@2x.png Binary files differnew file mode 100644 index 0000000000..9f454f0641 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/templates/images/workspace~dark@2x.png diff --git a/main/tests/UnitTests/MonoDevelop.VersionControl.Views/EditorCompareWidgetBaseTest.cs b/main/tests/UnitTests/MonoDevelop.VersionControl.Views/EditorCompareWidgetBaseTest.cs index 8ba44f8551..223f904463 100644 --- a/main/tests/UnitTests/MonoDevelop.VersionControl.Views/EditorCompareWidgetBaseTest.cs +++ b/main/tests/UnitTests/MonoDevelop.VersionControl.Views/EditorCompareWidgetBaseTest.cs @@ -58,6 +58,7 @@ namespace MonoDevelop.VersionControl.Views CheckCombinationsAreColor (new Hunk (0, 0, 2, 1), AssertIsBlue); } + [Ignore("No dark border colors with new flat design, borders have the same color")] [Test()] public void TestDarkColorsAreDarker () { diff --git a/version-checks b/version-checks index 9134060c9d..585ade48cb 100755 --- a/version-checks +++ b/version-checks @@ -17,7 +17,7 @@ DEP[0]=md-addins DEP_NAME[0]=MDADDINS DEP_PATH[0]=${top_srcdir}/../md-addins DEP_MODULE[0]=git@github.com:xamarin/md-addins.git -DEP_NEEDED_VERSION[0]=daac8430300ad98c1eceaf019207ce8f216fe48f +DEP_NEEDED_VERSION[0]=3a327396abfac2ad7f3fde39dbbd93c215cbe6aa DEP_BRANCH_AND_REMOTE[0]="master origin/master" # heap-shot |
