pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed SD2-624: "Configure Sidebar" not shown when right-clicking on the tools pad. 

Add "OK" and "Cancel" buttons to CodeGenerationForm.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@948 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
bfd3512e6b
commit
b483073c64
6 changed files with 286 additions and 199 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      AddIns/ICSharpCode.SharpDevelop.addin
  2. 3
      src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin
  3. 1
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  4. 267
      src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/CodeGenerationForm.cs
  5. 190
      src/Main/Base/Project/Src/TextEditor/Commands/GenerateCodeCommand.cs
  6. 20
      src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs

4
AddIns/ICSharpCode.SharpDevelop.addin
Unescape View File

@ -939,6 +939,8 @@ @@ -939,6 +939,8 @@
label = "${res:SideBarComponent.ContextMenu.MoveTabDown}"
class = "ICSharpCode.SharpDevelop.Commands.SideBarMoveTabDown"/>
</Condition>
<Include id="CommonContextMenu" path="/SharpDevelop/Workbench/SharpDevelopSideBar/CommonContextMenu"/>
</Path>
<Path name = "/SharpDevelop/Workbench/SharpDevelopSideBar/SideTab/ContextMenu">
@ -962,6 +964,8 @@ @@ -962,6 +964,8 @@
class = "ICSharpCode.SharpDevelop.Commands.SideBarMoveActiveItemDown"/>
</Condition>
</Condition>
<Include id="CommonContextMenu" path="/SharpDevelop/Workbench/SharpDevelopSideBar/CommonContextMenu"/>
</Path>
<!-- Main Menu -->

3
src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin
Unescape View File

@ -284,7 +284,8 @@ @@ -284,7 +284,8 @@
</Condition>
</Path>
<Path name = "/SharpDevelop/Workbench/SharpDevelopSideBar/ContextMenu">
<!-- common menu, for both tab captions and tab content -->
<Path name = "/SharpDevelop/Workbench/SharpDevelopSideBar/CommonContextMenu">
<MenuItem id = "CustomizeSideBarSeparator"
insertafter = "MoveTabDown"
type = "Separator" />

1
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
Unescape View File

@ -734,6 +734,7 @@ @@ -734,6 +734,7 @@
<Compile Include="Src\Gui\Pads\TaskList\TaskListPad.cs" />
<Compile Include="Src\Project\MSBuildFile.cs" />
<Compile Include="Src\Gui\FormLocationHelper.cs" />
<Compile Include="Src\TextEditor\Commands\CodeGenerators\CodeGenerationForm.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj">

267
src/Main/Base/Project/Src/TextEditor/Commands/CodeGenerators/CodeGenerationForm.cs
Unescape View File

@ -0,0 +1,267 @@ @@ -0,0 +1,267 @@
/*
* Created by SharpDevelop.
* User: Daniel Grunwald
* Date: 29.12.2005
* Time: 14:34
*/
using System;
using System.Collections;
using System.Drawing;
using System.Windows.Forms;
using ICSharpCode.TextEditor;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.Core;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
{
public class CodeGenerationForm : Form
{
private System.Windows.Forms.ListView categoryListView;
private System.Windows.Forms.Label statusLabel;
private System.Windows.Forms.CheckedListBox selectionListBox;
TextEditorControl textEditorControl;
CodeGeneratorBase SelectedCodeGenerator {
get {
if (categoryListView.SelectedItems.Count <= 0) {
return null;
}
return (CodeGeneratorBase)categoryListView.SelectedItems[0].Tag;
}
}
public CodeGenerationForm(TextEditorControl textEditorControl, CodeGeneratorBase[] codeGenerators, IClass currentClass)
{
this.textEditorControl = textEditorControl;
foreach (CodeGeneratorBase generator in codeGenerators) {
generator.Initialize(currentClass);
}
// Must be called for initialization
this.InitializeComponents();
okButton.Text = ResourceService.GetString("Global.OKButtonText");
cancelButton.Text = ResourceService.GetString("Global.CancelButtonText");
// selectionListBox.Sorted = true;
Point caretPos = textEditorControl.ActiveTextAreaControl.Caret.Position;
TextArea textArea = textEditorControl.ActiveTextAreaControl.TextArea;
TextView textView = textArea.TextView;
Point visualPos;
int physicalline = textView.Document.GetVisibleLine(caretPos.Y);
visualPos = new Point(textView.GetDrawingXPos(caretPos.Y, caretPos.X) +
textView.DrawingPosition.X,
(int)((1 + physicalline) * textView.FontHeight) -
textArea.VirtualTop.Y - 1 + textView.DrawingPosition.Y);
Point tempLocation = textEditorControl.ActiveTextAreaControl.TextArea.PointToScreen(visualPos);
tempLocation.Y = (tempLocation.Y + Height) > Screen.FromPoint(tempLocation).WorkingArea.Bottom ?
Screen.FromPoint(tempLocation).WorkingArea.Bottom - Height : tempLocation.Y;
tempLocation.X = (tempLocation.X + Width) > Screen.FromPoint(tempLocation).WorkingArea.Right ?
Screen.FromPoint(tempLocation).WorkingArea.Right - Width : tempLocation.X;
Location = tempLocation;
StartPosition = FormStartPosition.Manual;
categoryListView.SmallImageList = categoryListView.LargeImageList = ClassBrowserIconService.ImageList;
foreach (CodeGeneratorBase codeGenerator in codeGenerators) {
if (codeGenerator.IsActive) {
ListViewItem newItem = new ListViewItem(codeGenerator.CategoryName);
newItem.ImageIndex = codeGenerator.ImageIndex;
newItem.Tag = codeGenerator;
categoryListView.Items.Add(newItem);
}
}
categoryListView.SelectedIndexChanged += new EventHandler(CategoryListViewItemChanged);
}
protected override void OnActivated(EventArgs e)
{
base.OnActivated(e);
if (categoryListView.Items.Count > 0) {
categoryListView.Select();
categoryListView.Focus();
categoryListView.Items[0].Focused = categoryListView.Items[0].Selected = true;
} else {
Close();
}
}
protected override bool ProcessDialogKey(Keys keyData)
{
switch (keyData) {
case Keys.Escape:
Close();
return true;
case Keys.Back:
categoryListView.Focus();
return true;
case Keys.Return:
if (SelectedCodeGenerator != null) {
if (categoryListView.Focused && SelectedCodeGenerator.Content.Count > 0) {
selectionListBox.Focus();
} else {
Close();
SelectedCodeGenerator.GenerateCode(textEditorControl.ActiveTextAreaControl.TextArea, selectionListBox.CheckedItems.Count > 0 ? (IList)selectionListBox.CheckedItems : (IList)selectionListBox.SelectedItems);
}
return true;
} else {
return false;
}
}
return base.ProcessDialogKey(keyData);
}
void CategoryListViewItemChanged(object sender, EventArgs e)
{
CodeGeneratorBase codeGenerator = SelectedCodeGenerator;
if (codeGenerator == null) {
return;
}
statusLabel.Text = codeGenerator.Hint;
selectionListBox.BeginUpdate();
selectionListBox.Items.Clear();
if (codeGenerator.Content.Count > 0) {
Hashtable objs = new Hashtable();
// selectionListBox.Sorted = codeGenerator.Content.Count > 1;
foreach (object o in codeGenerator.Content) {
if (!objs.Contains(o.ToString())) {
selectionListBox.Items.Add(o);
objs.Add(o.ToString(), "");
}
}
selectionListBox.SelectedIndex = 0;
}
selectionListBox.EndUpdate();
selectionListBox.Refresh();
}
/// <summary>
/// This method was autogenerated - do not change the contents manually
/// </summary>
private void InitializeComponents()
{
System.Windows.Forms.ColumnHeader columnHeader1;
System.Windows.Forms.Panel panel1;
this.okButton = new System.Windows.Forms.Button();
this.cancelButton = new System.Windows.Forms.Button();
this.selectionListBox = new System.Windows.Forms.CheckedListBox();
this.statusLabel = new System.Windows.Forms.Label();
this.categoryListView = new System.Windows.Forms.ListView();
columnHeader1 = new System.Windows.Forms.ColumnHeader();
panel1 = new System.Windows.Forms.Panel();
panel1.SuspendLayout();
this.SuspendLayout();
//
// columnHeader1
//
columnHeader1.Width = 258;
//
// panel1
//
panel1.BackColor = System.Drawing.SystemColors.Control;
panel1.Controls.Add(this.okButton);
panel1.Controls.Add(this.cancelButton);
panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
panel1.Location = new System.Drawing.Point(1, 309);
panel1.Name = "panel1";
panel1.Size = new System.Drawing.Size(262, 29);
panel1.TabIndex = 3;
//
// okButton
//
this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.okButton.Location = new System.Drawing.Point(94, 3);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 23);
this.okButton.TabIndex = 0;
this.okButton.Text = "OK";
this.okButton.UseCompatibleTextRendering = true;
this.okButton.UseVisualStyleBackColor = true;
this.okButton.Click += new System.EventHandler(this.OkButtonClick);
//
// cancelButton
//
this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.cancelButton.Location = new System.Drawing.Point(175, 3);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 23);
this.cancelButton.TabIndex = 1;
this.cancelButton.Text = "Cancel";
this.cancelButton.UseCompatibleTextRendering = true;
this.cancelButton.UseVisualStyleBackColor = true;
this.cancelButton.Click += new System.EventHandler(this.CancelButtonClick);
//
// selectionListBox
//
this.selectionListBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.selectionListBox.IntegralHeight = false;
this.selectionListBox.Location = new System.Drawing.Point(1, 129);
this.selectionListBox.Name = "selectionListBox";
this.selectionListBox.Size = new System.Drawing.Size(262, 180);
this.selectionListBox.TabIndex = 2;
this.selectionListBox.UseCompatibleTextRendering = true;
//
// statusLabel
//
this.statusLabel.BackColor = System.Drawing.SystemColors.Control;
this.statusLabel.Dock = System.Windows.Forms.DockStyle.Top;
this.statusLabel.Location = new System.Drawing.Point(1, 113);
this.statusLabel.Name = "statusLabel";
this.statusLabel.Size = new System.Drawing.Size(262, 16);
this.statusLabel.TabIndex = 1;
this.statusLabel.Text = "Choose fields to generate getters and setters";
this.statusLabel.UseCompatibleTextRendering = true;
//
// categoryListView
//
this.categoryListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
columnHeader1});
this.categoryListView.Dock = System.Windows.Forms.DockStyle.Top;
this.categoryListView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.categoryListView.Location = new System.Drawing.Point(1, 1);
this.categoryListView.MultiSelect = false;
this.categoryListView.Name = "categoryListView";
this.categoryListView.Size = new System.Drawing.Size(262, 112);
this.categoryListView.TabIndex = 0;
this.categoryListView.UseCompatibleStateImageBehavior = false;
this.categoryListView.View = System.Windows.Forms.View.Details;
//
// CodeGenerationForm
//
this.AcceptButton = this.okButton;
this.BackColor = System.Drawing.SystemColors.ControlDarkDark;
this.CancelButton = this.cancelButton;
this.ClientSize = new System.Drawing.Size(264, 339);
this.Controls.Add(this.selectionListBox);
this.Controls.Add(this.statusLabel);
this.Controls.Add(this.categoryListView);
this.Controls.Add(panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "CodeGenerationForm";
this.Padding = new System.Windows.Forms.Padding(1);
this.ShowInTaskbar = false;
panel1.ResumeLayout(false);
this.ResumeLayout(false);
}
private System.Windows.Forms.Button cancelButton;
private System.Windows.Forms.Button okButton;
void CancelButtonClick(object sender, EventArgs e)
{
ProcessDialogKey(Keys.Escape);
}
void OkButtonClick(object sender, EventArgs e)
{
ProcessDialogKey(Keys.Return);
}
}
}

190
src/Main/Base/Project/Src/TextEditor/Commands/GenerateCodeCommand.cs
Unescape View File

@ -58,7 +58,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands @@ -58,7 +58,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
if (currentClass != null) {
ArrayList categories = new ArrayList();
ArrayList generators = AddInTree.BuildItems("/AddIns/DefaultTextEditor/CodeGenerator", this, true);
using (FormVersion1 form = new FormVersion1(textEditorControl, (CodeGeneratorBase[])generators.ToArray(typeof(CodeGeneratorBase)), currentClass)) {
using (CodeGenerationForm form = new CodeGenerationForm(textEditorControl, (CodeGeneratorBase[])generators.ToArray(typeof(CodeGeneratorBase)), currentClass)) {
form.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
}
}
@ -99,192 +99,4 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands @@ -99,192 +99,4 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
// selectionWindow.Show();
}
}
/// <summary>
/// Add summary description for form
/// </summary>
public class FormVersion1 : Form
{
private System.Windows.Forms.ColumnHeader createdObject0;
private System.Windows.Forms.ListView categoryListView;
private System.Windows.Forms.Label statusLabel;
private System.Windows.Forms.CheckedListBox selectionListBox;
TextEditorControl textEditorControl;
CodeGeneratorBase SelectedCodeGenerator {
get {
if (categoryListView.SelectedItems.Count <= 0) {
return null;
}
return (CodeGeneratorBase)categoryListView.SelectedItems[0].Tag;
}
}
public FormVersion1(TextEditorControl textEditorControl, CodeGeneratorBase[] codeGenerators, IClass currentClass)
{
this.textEditorControl = textEditorControl;
foreach (CodeGeneratorBase generator in codeGenerators) {
generator.Initialize(currentClass);
}
// Must be called for initialization
this.InitializeComponents();
// selectionListBox.Sorted = true;
Point caretPos = textEditorControl.ActiveTextAreaControl.Caret.Position;
TextArea textArea = textEditorControl.ActiveTextAreaControl.TextArea;
TextView textView = textArea.TextView;
Point visualPos;
int physicalline = textView.Document.GetVisibleLine(caretPos.Y);
visualPos = new Point(textView.GetDrawingXPos(caretPos.Y, caretPos.X) +
textView.DrawingPosition.X,
(int)((1 + physicalline) * textView.FontHeight) -
textArea.VirtualTop.Y - 1 + textView.DrawingPosition.Y);
Point tempLocation = textEditorControl.ActiveTextAreaControl.TextArea.PointToScreen(visualPos);
tempLocation.Y = (tempLocation.Y + Height) > Screen.FromPoint(tempLocation).WorkingArea.Bottom ?
Screen.FromPoint(tempLocation).WorkingArea.Bottom - Height : tempLocation.Y;
tempLocation.X = (tempLocation.X + Width) > Screen.FromPoint(tempLocation).WorkingArea.Right ?
Screen.FromPoint(tempLocation).WorkingArea.Right - Width : tempLocation.X;
Location = tempLocation;
StartPosition = FormStartPosition.Manual;
categoryListView.SmallImageList = categoryListView.LargeImageList = ClassBrowserIconService.ImageList;
foreach (CodeGeneratorBase codeGenerator in codeGenerators) {
if (codeGenerator.IsActive) {
ListViewItem newItem = new ListViewItem(codeGenerator.CategoryName);
newItem.ImageIndex = codeGenerator.ImageIndex;
newItem.Tag = codeGenerator;
categoryListView.Items.Add(newItem);
}
}
categoryListView.SelectedIndexChanged += new EventHandler(CategoryListViewItemChanged);
}
protected override void OnActivated(EventArgs e)
{
base.OnActivated(e);
if (categoryListView.Items.Count > 0) {
categoryListView.Select();
categoryListView.Focus();
categoryListView.Items[0].Focused = categoryListView.Items[0].Selected = true;
} else {
Close();
}
}
protected override bool ProcessDialogKey(Keys keyData)
{
switch (keyData) {
case Keys.Escape:
Close();
return true;
case Keys.Back:
categoryListView.Focus();
return true;
case Keys.Return:
if (SelectedCodeGenerator != null) {
if (categoryListView.Focused && SelectedCodeGenerator.Content.Count > 0) {
selectionListBox.Focus();
} else {
Close();
SelectedCodeGenerator.GenerateCode(textEditorControl.ActiveTextAreaControl.TextArea, selectionListBox.CheckedItems.Count > 0 ? (IList)selectionListBox.CheckedItems : (IList)selectionListBox.SelectedItems);
}
return true;
} else {
return false;
}
}
return base.ProcessDialogKey(keyData);
}
void CategoryListViewItemChanged(object sender, EventArgs e)
{
CodeGeneratorBase codeGenerator = SelectedCodeGenerator;
if (codeGenerator == null) {
return;
}
statusLabel.Text = codeGenerator.Hint;
selectionListBox.BeginUpdate();
selectionListBox.Items.Clear();
if (codeGenerator.Content.Count > 0) {
Hashtable objs = new Hashtable();
// selectionListBox.Sorted = codeGenerator.Content.Count > 1;
foreach (object o in codeGenerator.Content) {
if (!objs.Contains(o.ToString())) {
selectionListBox.Items.Add(o);
objs.Add(o.ToString(), "");
}
}
selectionListBox.SelectedIndex = 0;
}
selectionListBox.EndUpdate();
selectionListBox.Refresh();
}
/// <summary>
/// This method was autogenerated - do not change the contents manually
/// </summary>
private void InitializeComponents()
{
//
// Set up generated class form
//
this.SuspendLayout();
this.Name = "form";
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Size = new System.Drawing.Size(264, 312);
this.ShowInTaskbar = false;
//
// Set up member selectionListBox
//
selectionListBox = new System.Windows.Forms.CheckedListBox();
selectionListBox.Name = "selectionListBox";
selectionListBox.Location = new System.Drawing.Point(0, 128);
selectionListBox.Size = new System.Drawing.Size(264, 184);
selectionListBox.Dock = System.Windows.Forms.DockStyle.Fill;
selectionListBox.TabIndex = 2;
this.Controls.Add(selectionListBox);
//
// Set up member statusLabel
//
statusLabel = new System.Windows.Forms.Label();
statusLabel.Name = "statusLabel";
statusLabel.Text = "Choose fields to generate getters and setters";
statusLabel.TabIndex = 1;
statusLabel.Size = new System.Drawing.Size(264, 16);
statusLabel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
statusLabel.Location = new System.Drawing.Point(0, 112);
statusLabel.Dock = System.Windows.Forms.DockStyle.Top;
this.Controls.Add(statusLabel);
//
// Set up member categoryListView
//
categoryListView = new System.Windows.Forms.ListView();
categoryListView.Name = "categoryListView";
categoryListView.Dock = System.Windows.Forms.DockStyle.Top;
categoryListView.TabIndex = 0;
categoryListView.View = System.Windows.Forms.View.Details;
categoryListView.Size = new System.Drawing.Size(264, 112);
categoryListView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
categoryListView.MultiSelect = false;
//
// Set up member createdObject0
//
createdObject0 = new System.Windows.Forms.ColumnHeader();
createdObject0.Width = 258;
categoryListView.Columns.Add(createdObject0);
this.Controls.Add(categoryListView);
this.ResumeLayout(false);
}
}
}

20
src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs
Unescape View File

@ -73,9 +73,7 @@ namespace ICSharpCode.Core @@ -73,9 +73,7 @@ namespace ICSharpCode.Core
}
if (!LoadPropertiesFromStream(Path.Combine(configDirectory, propertyFileName))) {
if (!LoadPropertiesFromStream(FileUtility.Combine(DataDirectory, "options", propertyFileName))) {
MessageService.ShowError("Can't load properties file.");
}
LoadPropertiesFromStream(FileUtility.Combine(DataDirectory, "options", propertyFileName));
}
}
@ -84,15 +82,19 @@ namespace ICSharpCode.Core @@ -84,15 +82,19 @@ namespace ICSharpCode.Core
if (!File.Exists(fileName)) {
return false;
}
using (XmlTextReader reader = new XmlTextReader(fileName)) {
while (reader.Read()){
if (reader.IsStartElement()) {
if (reader.LocalName == propertyXmlRootNodeName) {
properties.ReadProperties(reader, propertyXmlRootNodeName);
return true;
try {
using (XmlTextReader reader = new XmlTextReader(fileName)) {
while (reader.Read()){
if (reader.IsStartElement()) {
if (reader.LocalName == propertyXmlRootNodeName) {
properties.ReadProperties(reader, propertyXmlRootNodeName);
return true;
}
}
}
}
} catch (XmlException ex) {
MessageService.ShowError("Error loading properties: " + ex.Message + "\nSettings have been restored to default values.");
}
return false;
}

Write Preview
Loading…
Cancel
Save