diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | code_of_conduct.md | 50 | ||||
| m--------- | main/external/debugger-libs | 0 | ||||
| m--------- | main/external/guiunit | 0 | ||||
| m--------- | main/external/nrefactory | 0 | ||||
| -rw-r--r-- | main/src/addins/MacPlatform/MacPlatform.cs | 12 | ||||
| -rw-r--r-- | main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs | 1 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs | 4 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButton.cs | 3 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OptionsDialog.cs | 2 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs | 2 | ||||
| -rwxr-xr-x | version-checks | 2 |
12 files changed, 63 insertions, 15 deletions
@@ -1,6 +1,6 @@ include main/monodevelop_version -EXTRA_DIST = configure +EXTRA_DIST = configure code_of_conduct.md SPACE := SPACE += AOT_DIRECTORIES:=$(subst $(SPACE),:,$(shell find main/build/* -type d)) diff --git a/code_of_conduct.md b/code_of_conduct.md new file mode 100644 index 0000000000..84bad191c3 --- /dev/null +++ b/code_of_conduct.md @@ -0,0 +1,50 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of +fostering an open and welcoming community, we pledge to respect all people who +contribute through reporting issues, posting feature requests, updating +documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free +experience for everyone, regardless of level of experience, gender, gender +identity and expression, sexual orientation, disability, personal appearance, +body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic + addresses, without explicit permission +* Other unethical or unprofessional conduct + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +By adopting this Code of Conduct, project maintainers commit themselves to +fairly and consistently applying these principles to every aspect of managing +this project. Project maintainers who do not follow or enforce the Code of +Conduct may be permanently removed from the project team. + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting a project maintainer at miguel@xamarin.com. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. Maintainers are +obligated to maintain confidentiality with regard to the reporter of an +incident. + + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 1.3.0, available at +[http://contributor-covenant.org/version/1/3/0/][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/3/0/ diff --git a/main/external/debugger-libs b/main/external/debugger-libs -Subproject 4716081c6d87a397a40786abb6a956deb61efb8 +Subproject 40bbccdf1e3555a7f50eda928cc924b03a13bc9 diff --git a/main/external/guiunit b/main/external/guiunit -Subproject 8496907c2afd3a4977bb3640d8490547445b300 +Subproject ad28ae12928cce579ae2f9450291dd7648dad76 diff --git a/main/external/nrefactory b/main/external/nrefactory -Subproject ab1ad3cae23c657763c7e047531ee40de56d741 +Subproject a2b55de351be2119b6f0c3a17c36b5b9adbd7c5 diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs index b765cc0a06..a8afedd635 100644 --- a/main/src/addins/MacPlatform/MacPlatform.cs +++ b/main/src/addins/MacPlatform/MacPlatform.cs @@ -789,16 +789,8 @@ namespace MonoDevelop.MacIntegration { var toplevels = GtkQuartz.GetToplevels (); - // When we're looking for modal windows that don't belong to GTK, exclude - // NSStatusBarWindow (which is visible on Mavericks when we're in fullscreen) and - // NSToolbarFullscreenWindow (which is visible on Yosemite in fullscreen). - // _NSFullScreenTileDividerWindow (which is visible on El Capitan when two apps share the same fullscreen). - return toplevels.Any (t => t.Key.IsVisible && (t.Value == null || t.Value.Modal) && - !(t.Key.DebugDescription.StartsWith("<NSStatusBarWindow", StringComparison.Ordinal) || - t.Key.DebugDescription.StartsWith ("<NSToolbarFullScreenWindow", StringComparison.Ordinal) || - t.Key.DebugDescription.StartsWith ("<NSCarbonMenuWindow", StringComparison.Ordinal) || - t.Key.DebugDescription.StartsWith ("<_NSFullScreenTileDividerWindow", StringComparison.Ordinal) - )); + // Check GtkWindow's Modal flag or for a visible NSPanel + return toplevels.Any (t => (t.Value != null && t.Value.Modal) || (t.Key.IsVisible && (t.Key is NSPanel))); } public override void AddChildWindow (Gtk.Window parent, Gtk.Window child) diff --git a/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs b/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs index eeaa9dc61c..f11f1c7c65 100644 --- a/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs +++ b/main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs @@ -236,7 +236,6 @@ namespace MonoDevelop.NUnit menuItem.Clicked += new TestRunner (unitTest.UnitTestIdentifier + id, true).Select; submenu.Add (menuItem); - var subMenuItem = new ContextMenuItem (label); // if (!string.IsNullOrEmpty (tooltip)) // subMenuItem.TooltipText = tooltip; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs index 83fe2093bb..8d61a900c2 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/GtkUtil.cs @@ -528,10 +528,14 @@ namespace MonoDevelop.Components paste.Clicked += PasteClicked; context_menu.Items.Add (paste); + context_menu.Items.Add (new SeparatorContextMenuItem ()); + var delete = new ContextMenuItem { Label = GettextCatalog.GetString ("Delete"), Context = entry }; delete.Clicked += DeleteClicked; context_menu.Items.Add (delete); + context_menu.Items.Add (new SeparatorContextMenuItem ()); + var select_all = new ContextMenuItem { Label = GettextCatalog.GetString ("Select All"), Context = entry }; select_all.Clicked += SelectAllClicked; context_menu.Items.Add (select_all); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButton.cs index 50443ef77c..7733cf6ca8 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButton.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/MenuButton.cs @@ -103,8 +103,9 @@ namespace MonoDevelop.Components Gdk.Rectangle rect = this.Allocation; + this.GrabFocus (); // Offset the menu by the height of the rect - ContextMenuExtensionsGtk.ShowContextMenu (this, 0, rect.Height, menu, () => MenuClosed (oldRelief)); + menu.Show (this, 0, rect.Height, () => MenuClosed (oldRelief)); return; } 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 a67b9f3c40..b7996ce62d 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 @@ -459,6 +459,8 @@ namespace MonoDevelop.Ide.Gui.Dialogs if (tree.Selection.GetSelected (out it)) { OptionsDialogSection section = (OptionsDialogSection) store.GetValue (it, 0); ShowPage (section); + + this.UseNativeContextMenus (); } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs index 96b3b6ff30..bca63cfbbb 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs @@ -347,7 +347,7 @@ namespace MonoDevelop.Ide.Gui GettextCatalog.GetString ("Save the changes to document '{0}' before creating a new solution?", doc.Window.ViewContent.IsUntitled ? doc.Window.ViewContent.UntitledName - : System.IO.Path.GetFileName (doc.FileName)), + : System.IO.Path.GetFileName (doc.Window.ViewContent.ContentName)), "", AlertButton.Cancel, doc.Window.ViewContent.IsUntitled ? AlertButton.SaveAs : AlertButton.Save); } diff --git a/version-checks b/version-checks index 136ce72e5c..2b70126d66 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]=ca7c519b05acb8506555ce2df9be588363706aa5 +DEP_NEEDED_VERSION[0]=6db8cecb60db20d2650a02ee5d9295135e976144 DEP_BRANCH_AND_REMOTE[0]="roslyn origin/roslyn" # heap-shot |