Browse Source

fix line endings and formatting in ThumbnailViewPad

pull/31/merge
Siegfried Pammer 12 years ago
parent
commit
63591aceb5
  1. 96
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/ThumbnailViewPad.cs
  2. 27
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.addin

96
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/ThumbnailViewPad.cs

@ -1,57 +1,55 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System; using System;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.WpfDesign.Designer.ThumbnailView; using ICSharpCode.WpfDesign.Designer.ThumbnailView;
namespace ICSharpCode.WpfDesign.AddIn namespace ICSharpCode.WpfDesign.AddIn
{ {
public class ThumbnailViewPad : AbstractPadContent
public class ThumbnailViewPad : AbstractPadContent
{ {
ContentPresenter contentControl = new ContentPresenter(); ContentPresenter contentControl = new ContentPresenter();
ThumbnailView thumbnailView = new ThumbnailView();
TextBlock notAvailableTextBlock = new TextBlock {
Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.OutlinePad.NotAvailable}"),
TextWrapping = TextWrapping.Wrap
};
public ThumbnailViewPad()
{
WorkbenchSingleton.Workbench.ActiveViewContentChanged += WorkbenchActiveViewContentChanged;
WorkbenchActiveViewContentChanged(null, null);
}
ThumbnailView thumbnailView = new ThumbnailView(); void WorkbenchActiveViewContentChanged(object sender, EventArgs e)
{
TextBlock notAvailableTextBlock = new TextBlock {
Text = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Gui.OutlinePad.NotAvailable}"),
TextWrapping = TextWrapping.Wrap
};
public ThumbnailViewPad()
{
WorkbenchSingleton.Workbench.ActiveViewContentChanged += WorkbenchActiveViewContentChanged;
WorkbenchActiveViewContentChanged(null, null);
}
void WorkbenchActiveViewContentChanged(object sender, EventArgs e)
{
WpfViewContent wpfView = WorkbenchSingleton.Workbench.ActiveViewContent as WpfViewContent; WpfViewContent wpfView = WorkbenchSingleton.Workbench.ActiveViewContent as WpfViewContent;
if (wpfView != null) if (wpfView != null)
{ {
thumbnailView.DesignSurface = wpfView.DesignSurface; thumbnailView.DesignSurface = wpfView.DesignSurface;
contentControl.SetContent(thumbnailView); contentControl.SetContent(thumbnailView);
} }
else else
{ {
contentControl.SetContent(notAvailableTextBlock);
contentControl.SetContent(notAvailableTextBlock); }
} }
}
/// <summary>
/// <summary> /// The <see cref="System.Windows.Forms.Control"/> representing the pad
/// The <see cref="System.Windows.Forms.Control"/> representing the pad /// </summary>
/// </summary> public override object Control {
public override object Control { get {
get { return contentControl;
return contentControl; }
} }
} }
} }
}

27
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.addin

@ -1,4 +1,8 @@
<AddIn name="WPF Designer AddIn" author="Daniel Grunwald" copyright="prj:///doc/copyright.txt" description="WPF Designer" addInManagerHidden="preinstalled"> <AddIn name="WPF Designer AddIn"
author="Daniel Grunwald"
copyright="prj:///doc/copyright.txt"
description="WPF Designer"
addInManagerHidden="preinstalled">
<Manifest> <Manifest>
<Identity name="ICSharpCode.WpfDesigner" /> <Identity name="ICSharpCode.WpfDesigner" />
<Dependency addin="ICSharpCode.FormsDesigner" requirePreload="true" /> <Dependency addin="ICSharpCode.FormsDesigner" requirePreload="true" />
@ -21,16 +25,19 @@
insertbefore = "Text" insertbefore = "Text"
fileNamePattern = "\.(xaml)$" fileNamePattern = "\.(xaml)$"
title = "WPF designer"/>--> title = "WPF designer"/>-->
<DisplayBinding id="WPFDesigner" type="Secondary" class="ICSharpCode.WpfDesign.AddIn.WpfSecondaryDisplayBinding" fileNamePattern="\.xaml$" /> <DisplayBinding id="WPFDesigner"
type="Secondary"
class="ICSharpCode.WpfDesign.AddIn.WpfSecondaryDisplayBinding"
fileNamePattern="\.xaml$" />
</Path>
<Path name = "/SharpDevelop/Workbench/Pads">
<Pad id = "ThumbnailViewPad"
category = "Main"
title = "${res:ICSharpCode.WpfDesign.AddIn.ThumbnailViewPad}"
icon = "PadIcons.Toolbar"
class = "ICSharpCode.WpfDesign.AddIn.ThumbnailViewPad"
defaultPosition = "Right, Hidden" />
</Path> </Path>
<Path name = "/SharpDevelop/Workbench/Pads">
<Pad id = "ThumbnailViewPad"
category = "Main"
title = "${res:ICSharpCode.WpfDesign.AddIn.ThumbnailViewPad}"
icon = "PadIcons.Toolbar"
class = "ICSharpCode.WpfDesign.AddIn.ThumbnailViewPad"
defaultPosition = "Right, Hidden" />
</Path>
<!-- <!--
<Path name = "/SharpDevelop/Workbench/Pads"> <Path name = "/SharpDevelop/Workbench/Pads">
<Pad id = "OutlineViewPad" <Pad id = "OutlineViewPad"

Loading…
Cancel
Save