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

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLluis Sanchez <lluis@novell.com>2010-03-18 19:39:00 +0300
committerLluis Sanchez <lluis@novell.com>2010-03-18 19:39:00 +0300
commit099e20cde3ae001638e366215885f110cc69ea16 (patch)
tree442be83e80fd12ea5fcc984db5b1117910ceacd1 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons
parenta53e9d46686838f9ab224f2f7e64a9d5f542dd62 (diff)
* Makefile.am:
* MonoDevelop.Ide.csproj: Updated. * MonoDevelop.Ide/Ide.cs: * MonoDevelop.Ide.Gui/StatusProgressMonitor.cs: Use the new status bar model. * MonoDevelop.Ide/ImageService.cs: * MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs: Show error and warning icons in grayscale when there are no errors/warnings. * MonoDevelop.Ide.Commands/ViewCommands.cs: Don't sort layouts by name. Use the order in the extension point. * MonoDevelop.Components.Docking/DockGroup.cs: * MonoDevelop.Components.Docking/DockObject.cs: * MonoDevelop.Components.Docking/DockGroupItem.cs: Impoved the logic that selects a dock bar where to show an autohide item by default. * MonoDevelop.Components.Docking/DockItem.cs: * MonoDevelop.Components.Docking/DockFrame.cs: * MonoDevelop.Components.Docking/DockContainer.cs: Allow setting the dock location of an item. * MonoDevelop.Ide.addin.xml: * MonoDevelop.Ide.Extensions/LayoutExtensionNode.cs: Added extension point for registering stock layous. Assigned default layouts for existing pads. * gtk-gui/objects.xml: * gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs: Flush. * MonoDevelop.Ide.Gui/InternalLog.cs: * MonoDevelop.Ide.Gui/AddinUpdateHandler.cs: * MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs: * MonoDevelop.Ide.Gui/BackgroundProgressMonitor.cs: New status bar model. The status bar widget is hidden behind an interface. Added support for status bar contexts. Status information displayed through a context is cleaned up when the context is disposed. * MonoDevelop.Ide.Gui/Pad.cs: * MonoDevelop.Ide.Gui/Workbench.cs: * MonoDevelop.Ide.Gui/IPadContainer.cs: * MonoDevelop.Ide.Gui/WorkbenchMemento.cs: * MonoDevelop.Ide.Gui/DefaultWorkbench.cs: * MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs: * MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs: Merged SdiWorkspaceLayout into DefaultWorkbench. Removed support for workbench contexts. * MonoDevelop.Ide.Codons/PadCodon.cs: Allow setting the default layout of a pad. * MonoDevelop.Ide.Codons/WorkbenchContextCondition.cs: Not required anymore. * MonoDevelop.Ide.Tasks/TaskStore.cs: Show a better status message when the end of the task list is reached. svn path=/trunk/monodevelop/; revision=153851
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons')
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/PadCodon.cs15
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/WorkbenchContextCondition.cs50
2 files changed, 9 insertions, 56 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/PadCodon.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/PadCodon.cs
index 8d98e73746..d81cc75735 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/PadCodon.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/PadCodon.cs
@@ -36,6 +36,7 @@ using MonoDevelop.Core;
using Mono.Addins;
using MonoDevelop.Ide.Gui;
using MonoDevelop.Components.Docking;
+using System.Collections.Generic;
namespace MonoDevelop.Ide.Codons
{
@@ -72,7 +73,9 @@ namespace MonoDevelop.Ide.Codons
"is docked in auto-hide mode.")]
string dockLabelProvider = null;
- string[] contexts;
+ [NodeAttribute ("defaultLayout", "Name of the layouts (comma separated list) on which this pad should be visible by default")]
+ string[] defaultLayouts;
+
IDockItemLabelProvider cachedDockLabelProvider;
bool initializeCalled;
@@ -104,13 +107,17 @@ namespace MonoDevelop.Ide.Codons
}
public IconId Icon {
- get { return icon; }
+ get { return !string.IsNullOrEmpty (icon) ? icon : "md-output-icon"; }
}
public string ClassName {
get { return className; }
}
+ public IList<string> DefaultLayouts {
+ get { return this.defaultLayouts; }
+ }
+
/// <summary>
/// Returns the default placement of the pad: left, right, top, bottom.
/// Relative positions can be used, for example: "ProjectPad/left"
@@ -127,10 +134,6 @@ namespace MonoDevelop.Ide.Codons
get { return defaultStatus; }
}
- public string[] Contexts {
- get { return contexts; }
- }
-
public bool Initialized {
get {
return content != null;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/WorkbenchContextCondition.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/WorkbenchContextCondition.cs
deleted file mode 100644
index 29e7f243ac..0000000000
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/WorkbenchContextCondition.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// WorkbenchContextCondition.cs
-//
-// Author:
-// Lluis Sanchez Gual <lluis@novell.com>
-//
-// Copyright (c) 2007 Novell, Inc (http://www.novell.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.Xml;
-
-using Mono.Addins;
-using MonoDevelop.Ide.Gui;
-
-namespace MonoDevelop.Ide.Codons
-{
- internal class WorkbenchContextCondition : ConditionType
- {
- public override bool Evaluate (NodeElement condition)
- {
- string context = condition.GetAttribute ("value");
- if (context == "*")
- return true;
-
- if (context == IdeApp.Workbench.Context.Id)
- return true;
-
- return false;
- }
- }
-}