[Monodevelop-patches-list] r883 - in trunk/MonoDevelop: build/data/options gdldock/gdl gdldock/sources gdldock/sources/gdl src/Main/Base/Commands src/Main/Base/Gui/Workbench src/Main/Base/Gui/Workbench/Layouts
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Fri Feb 13 17:05:23 EST 2004
Author: tberman
Date: 2004-02-13 17:05:23 -0500 (Fri, 13 Feb 2004)
New Revision: 883
Modified:
trunk/MonoDevelop/build/data/options/DefaultEditingLayout.xml
trunk/MonoDevelop/gdldock/gdl/gdl-api.xml
trunk/MonoDevelop/gdldock/sources/
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-object.c
trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-object.h
trunk/MonoDevelop/src/Main/Base/Commands/MenuItemBuilders.cs
trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
Log:
the view menu properly works now, so you can bring back closed/hidden pads
Modified: trunk/MonoDevelop/build/data/options/DefaultEditingLayout.xml
===================================================================
--- trunk/MonoDevelop/build/data/options/DefaultEditingLayout.xml 2004-02-13 21:10:45 UTC (rev 882)
+++ trunk/MonoDevelop/build/data/options/DefaultEditingLayout.xml 2004-02-13 22:05:23 UTC (rev 883)
@@ -1,2 +1,2 @@
<?xml version="1.0"?>
-<dock-layout><layout name="__default__"><dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0"><paned orientation="horizontal" locked="no" position="202"><notebook orientation="vertical" locked="no" page="0"><item name="Projects" orientation="vertical" locked="no"/><item name="Classes" orientation="vertical" locked="no"/><item name="Files" orientation="vertical" locked="no"/></notebook><paned orientation="vertical" locked="no" position="268"><item name="Documents" orientation="vertical" locked="yes"/><notebook orientation="vertical" locked="no" page="0"><item name="Output" orientation="vertical" locked="no"/><item name="Task List" orientation="vertical" locked="no"/></notebook></paned></paned></dock></layout></dock-layout>
+<dock-layout><layout name="__default__"><dock name="__dock_1" floating="no" width="-1" height="-1" floatx="0" floaty="0"><paned orientation="horizontal" locked="no" position="202"><notebook orientation="vertical" locked="no" page="0"><item name="ICSharpCode.SharpDevelop.Gui.Pads.FileScout" orientation="vertical" locked="no"/><item name="ICSharpCode.SharpDevelop.Gui.Pads.ClassScout" orientation="vertical" locked="no"/><item name="ICSharpCode.SharpDevelop.Gui.Pads.ProjectBrowser.ProjectBrowserView" orientation="vertical" locked="no"/></notebook><paned orientation="vertical" locked="no" position="268"><item name="Documents" orientation="vertical" locked="yes"/><notebook orientation="vertical" locked="no" page="0"><item name="MonoDevelop.EditorBindings.Gui.Pads.CompilerMessageView" orientation="vertical" locked="no"/><item name="ICSharpCode.SharpDevelop.Gui.Pads.OpenTaskView" orientation="vertical" locked="no"/></notebook></paned></paned></dock></layout></dock-layout>
Modified: trunk/MonoDevelop/gdldock/gdl/gdl-api.xml
===================================================================
--- trunk/MonoDevelop/gdldock/gdl/gdl-api.xml 2004-02-13 21:10:45 UTC (rev 882)
+++ trunk/MonoDevelop/gdldock/gdl/gdl-api.xml 2004-02-13 22:05:23 UTC (rev 883)
@@ -476,6 +476,9 @@
<method name="GetType" cname="gdl_dock_object_get_type" shared="true">
<return-type type="GType" />
</method>
+ <method name="IsAttached" cname="gdl_dock_object_is_attached">
+ <return-type type="gboolean" />
+ </method>
<method name="IsBound" cname="gdl_dock_object_is_bound">
<return-type type="gboolean" />
</method>
Property changes on: trunk/MonoDevelop/gdldock/sources
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
+ Makefile
Makefile.in
GAPI
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-object.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-object.c 2004-02-13 21:10:45 UTC (rev 882)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-object.c 2004-02-13 22:05:23 UTC (rev 883)
@@ -443,6 +443,13 @@
return klass->is_compound;
}
+gboolean
+gdl_dock_object_is_attached (GdlDockObject *object)
+{
+ g_return_val_if_fail (object != NULL, FALSE);
+ return GDL_DOCK_OBJECT_ATTACHED (object);
+}
+
void
gdl_dock_object_detach (GdlDockObject *object,
gboolean recursive)
Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-object.h
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-object.h 2004-02-13 21:10:45 UTC (rev 882)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-object.h 2004-02-13 22:05:23 UTC (rev 883)
@@ -155,6 +155,8 @@
GdlDockObject *gdl_dock_object_get_parent_object (GdlDockObject *object);
+gboolean gdl_dock_object_is_attached (GdlDockObject *object);
+
void gdl_dock_object_freeze (GdlDockObject *object);
void gdl_dock_object_thaw (GdlDockObject *object);
Modified: trunk/MonoDevelop/src/Main/Base/Commands/MenuItemBuilders.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/MenuItemBuilders.cs 2004-02-13 21:10:45 UTC (rev 882)
+++ trunk/MonoDevelop/src/Main/Base/Commands/MenuItemBuilders.cs 2004-02-13 22:05:23 UTC (rev 883)
@@ -313,9 +313,10 @@
{
this.padContent = padContent;
Active = IsPadVisible;
+ Toggled += new EventHandler (OnClick);
}
- protected void OnClick(EventArgs e)
+ protected new void OnClick(object o, EventArgs e)
{
if (IsPadVisible) {
WorkbenchSingleton.Workbench.WorkbenchLayout.HidePad(padContent);
@@ -327,7 +328,6 @@
public override void UpdateStatus()
{
base.UpdateStatus();
- Active = IsPadVisible;
}
}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-02-13 21:10:45 UTC (rev 882)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs 2004-02-13 22:05:23 UTC (rev 883)
@@ -269,7 +269,6 @@
public virtual void ShowPad(IPadContent content)
{
- Console.WriteLine ("ShowPad : {0}", content);
PadContentCollection.Add(content);
if (layout != null) {
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2004-02-13 21:10:45 UTC (rev 882)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2004-02-13 22:05:23 UTC (rev 883)
@@ -146,7 +146,7 @@
foreach (string typeName in leftContents) {
Content c = GetContent (typeName);
if (c != null) {
- DockItem item = new DockItem (c.Title, c.Title, "gtk-execute",
+ DockItem item = new DockItem (typeName, c.Title, "gtk-execute",
DockItemBehavior.Normal);
item.Add (c.Widget);
item.ShowAll ();
@@ -157,7 +157,7 @@
foreach (string typeName in bottomContents) {
Content c = GetContent (typeName);
if (c != null) {
- DockItem item = new DockItem (c.Title, c.Title, "gtk-execute",
+ DockItem item = new DockItem (typeName, c.Title, "gtk-execute",
DockItemBehavior.Normal);
item.Add (c.Widget);
item.ShowAll ();
@@ -168,7 +168,7 @@
foreach (string typeName in rightContents) {
Content c = GetContent (typeName);
if (c != null) {
- DockItem item = new DockItem (c.Title, c.Title, "gtk-execute",
+ DockItem item = new DockItem (typeName, c.Title, "gtk-execute",
DockItemBehavior.Normal);
item.Add (c.Widget);
item.ShowAll ();
@@ -202,7 +202,6 @@
public void ShowPad (IPadContent content)
{
- Console.WriteLine ("ShowPad {0}", content.Title);
if (contentHash[content] == null) {
/*DockItem item = new DockItem (content.Title,
content.Title,
@@ -228,7 +227,8 @@
} else {
Content c = (Content)contentHash[content];
if (c != null) {
- //dockManager.ShowContent(c);
+ DockItem item = dock.GetItemByName (content.ToString ());
+ item.ShowItem ();
}
}
}
@@ -238,7 +238,10 @@
if (padContent != null) {
Content content = (Content)contentHash[padContent];
if (content != null) {
- return content.Visible;
+ DockItem item = dock.GetItemByName (padContent.ToString ());
+ if (item != null) {
+ return item.IsAttached;
+ }
}
}
@@ -252,7 +255,8 @@
if (padContent != null) {
Content content = (Content)contentHash[padContent];
if (content != null) {
- //dockManager.HideContent(content);
+ DockItem item = dock.GetItemByName (padContent.ToString ());
+ item.HideItem ();
}
}
More information about the Monodevelop-patches-list
mailing list